liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传配置

Browse Source
This commit is contained in:
liwei1dao 2024-01-22 16:52:47 +08:00
parent 3f27c55ce1
commit db66582ce2
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_monsterformat.json
View File

@ -123801,7 +123801,7 @@
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 165, "speed": 155,
"modelsize": 1 "modelsize": 1
}, },
{ {

6
bin/json/game_skillpassive.json
View File

@ -13431,7 +13431,7 @@
"icon": "", "icon": "",
"When": 16, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000116,OverlayNum=25", "TargetCheck": "Target=2,HasBuff=391000116,OverlayNum=25",
"MainSkillCheck": "SkillPos=5", "MainSkillCheck": "SkillPos=5",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
@ -13457,7 +13457,7 @@
"icon": "", "icon": "",
"When": 16, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000123,OverlayNum=25", "TargetCheck": "Target=2,HasBuff=391000123,OverlayNum=25",
"MainSkillCheck": "SkillPos=5", "MainSkillCheck": "SkillPos=5",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
@ -13483,7 +13483,7 @@
"icon": "", "icon": "",
"When": 16, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000127,OverlayNum=25", "TargetCheck": "Target=2,HasBuff=391000127,OverlayNum=25",
"MainSkillCheck": "SkillPos=5", "MainSkillCheck": "SkillPos=5",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",

6
sys/configure/structs/Tables.go
View File

@ -344,10 +344,7 @@ type Tables struct {
FightingSkilllv *GameFightingSkilllv FightingSkilllv *GameFightingSkilllv
FightingSkill *GameFightingSkill FightingSkill *GameFightingSkill
FightingSkillStar *GameFightingSkillStar FightingSkillStar *GameFightingSkillStar
<<<<<<< HEAD
ExpeditionBoos *GameExpeditionBoos ExpeditionBoos *GameExpeditionBoos
=======
>>>>>>> aa8ed334061993a5bd1bbe28c4fa53dc67763781
} }
func NewTables(loader JsonLoader) (*Tables, error) { func NewTables(loader JsonLoader) (*Tables, error) {
@ -2353,14 +2350,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.FightingSkillStar, err = NewGameFightingSkillStar(buf) ; err != nil { if tables.FightingSkillStar, err = NewGameFightingSkillStar(buf) ; err != nil {
return nil, err return nil, err
} }
<<<<<<< HEAD
if buf, err = loader("game_expeditionboos") ; err != nil { if buf, err = loader("game_expeditionboos") ; err != nil {
return nil, err return nil, err
} }
if tables.ExpeditionBoos, err = NewGameExpeditionBoos(buf) ; err != nil { if tables.ExpeditionBoos, err = NewGameExpeditionBoos(buf) ; err != nil {
return nil, err return nil, err
} }
=======
>>>>>>> aa8ed334061993a5bd1bbe28c4fa53dc67763781
return tables, nil return tables, nil
} }