diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index 7b7a2a5b7..c6be690c0 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -29,7 +29,8 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 0 + "maxenergy": 0, + "offsetspeed": 0 }, { "id": "20030001", @@ -61,7 +62,8 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 0 + "maxenergy": 0, + "offsetspeed": 0 }, { "id": "20030001", @@ -93,7 +95,8 @@ "caddtime": 10, "csubtime": 10, "energyrecover": 30, - "maxenergy": 100 + "maxenergy": 100, + "offsetspeed": 15 }, { "id": "20030002", @@ -125,7 +128,8 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 0 + "maxenergy": 0, + "offsetspeed": 0 }, { "id": "20030002", @@ -157,7 +161,8 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 0 + "maxenergy": 0, + "offsetspeed": 0 }, { "id": "20030002", @@ -189,7 +194,8 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 30, - "maxenergy": 100 + "maxenergy": 100, + "offsetspeed": 15 }, { "id": "20030003", @@ -221,7 +227,8 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 0 + "maxenergy": 0, + "offsetspeed": 0 }, { "id": "20030003", @@ -253,7 +260,8 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 0 + "maxenergy": 0, + "offsetspeed": 0 }, { "id": "20030003", @@ -285,6 +293,7 @@ "caddtime": 0, "csubtime": 0, "energyrecover": 30, - "maxenergy": 100 + "maxenergy": 100, + "offsetspeed": 15 } ] \ No newline at end of file diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json index 98f702633..7214ad867 100644 --- a/bin/json/game_consumehero.json +++ b/bin/json/game_consumehero.json @@ -3,6 +3,7 @@ "key": "33003", "type": 1, "herocolor": 1, + "skilldestructiontype": 2, "herotitel": { "key": "consume_consume_hero_herotitel_01", "text": "酒吧新人" @@ -61,6 +62,7 @@ "key": "44003", "type": 1, "herocolor": 1, + "skilldestructiontype": 2, "herotitel": { "key": "consume_consume_hero_herotitel_02", "text": "酒吧新人" @@ -119,6 +121,7 @@ "key": "43004", "type": 1, "herocolor": 1, + "skilldestructiontype": 1, "herotitel": { "key": "consume_consume_hero_herotitel_03", "text": "酒吧新人" @@ -177,6 +180,7 @@ "key": "13004", "type": 2, "herocolor": 2, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_04", "text": "老手" @@ -241,6 +245,7 @@ "key": "13005", "type": 2, "herocolor": 2, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_05", "text": "老手" @@ -305,6 +310,7 @@ "key": "15002", "type": 2, "herocolor": 2, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_06", "text": "老手" @@ -369,6 +375,7 @@ "key": "24001", "type": 2, "herocolor": 2, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_07", "text": "老手" @@ -433,6 +440,7 @@ "key": "25001", "type": 2, "herocolor": 3, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_08", "text": "靠谱的家伙" @@ -497,6 +505,7 @@ "key": "35001", "type": 2, "herocolor": 3, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_09", "text": "靠谱的家伙" @@ -561,6 +570,7 @@ "key": "44004", "type": 2, "herocolor": 3, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_10", "text": "靠谱的家伙" @@ -625,6 +635,7 @@ "key": "44006", "type": 2, "herocolor": 3, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_11", "text": "靠谱的家伙" @@ -689,6 +700,7 @@ "key": "45003", "type": 2, "herocolor": 4, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_12", "text": "身怀绝技" @@ -753,6 +765,7 @@ "key": "34007", "type": 2, "herocolor": 4, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_13", "text": "身怀绝技" @@ -817,6 +830,7 @@ "key": "45004", "type": 2, "herocolor": 4, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_14", "text": "身怀绝技" @@ -881,6 +895,7 @@ "key": "45001", "type": 2, "herocolor": 5, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_15", "text": "传奇牌手!" @@ -945,6 +960,7 @@ "key": "34006", "type": 2, "herocolor": 5, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_16", "text": "传奇牌手!" @@ -1009,6 +1025,7 @@ "key": "35003", "type": 2, "herocolor": 5, + "skilldestructiontype": 0, "herotitel": { "key": "consume_consume_hero_herotitel_17", "text": "传奇牌手!" diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 55aef083d..0399bbc8c 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -1143,6 +1143,47 @@ "sale": [], "gm": 0 }, + { + "id": "10000041", + "name": { + "key": "item_item_name_10000041", + "text": "魔法扫帚" + }, + "usetype": 2, + "color": 3, + "bagtype": 1, + "index": 99, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 999, + "img": "item_10000041", + "intr": { + "key": "item_item_intr_10000041", + "text": "横扫的消耗道具，使用可以进行横扫功能。" + }, + "describe": { + "key": "item_item_describe_10000041", + "text": "梅林大师首席弟子希沙窦斯倾情推荐，妖精匠心的艺术杰作。帮你扫平一切烦恼和阻碍，让你微笑面对每一天。" + }, + "dialogue": { + "key": "item_item_dialogue_10000041", + "text": "" + }, + "sale": [], + "gm": 0 + }, { "id": "11013001", "name": { @@ -46384,5 +46425,99 @@ } ], "gm": 0 + }, + { + "id": "29000001", + "name": { + "key": "item_item_name_29000001", + "text": "史莱克沼泽清洁泥" + }, + "usetype": 1, + "color": 3, + "bagtype": 3, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "sq_icon_qh", + "intr": { + "key": "item_item_intr_29000001", + "text": "用来强化秘宝的消耗道具。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 0 + }, + { + "id": "29000002", + "name": { + "key": "item_item_name_29000002", + "text": "元素石" + }, + "usetype": 1, + "color": 3, + "bagtype": 3, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "sp_icon_qh", + "intr": { + "key": "item_item_intr_29000002", + "text": "用来强化护身符的消耗道具。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index c3c126ccb..8820dca92 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -40331,8 +40331,8 @@ "TriggerAnim": "Passive", "Type": 8, "Argu": [ + 6, 1, - 1000, 1000 ], "FollowSK": [ diff --git a/sys/configure/structs/Game.BuzkashiMountData.go b/sys/configure/structs/Game.BuzkashiMountData.go index 68e162c02..dab94cdce 100644 --- a/sys/configure/structs/Game.BuzkashiMountData.go +++ b/sys/configure/structs/Game.BuzkashiMountData.go @@ -33,6 +33,7 @@ type GameBuzkashiMountData struct { Csubtime int32 Energyrecover int32 Maxenergy int32 + Offsetspeed float32 } const TypeId_GameBuzkashiMountData = 1598069936 @@ -77,6 +78,7 @@ func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["csubtime"].(float64); !_ok_ { err = errors.New("csubtime error"); return }; _v.Csubtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["energyrecover"].(float64); !_ok_ { err = errors.New("energyrecover error"); return }; _v.Energyrecover = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxenergy"].(float64); !_ok_ { err = errors.New("maxenergy error"); return }; _v.Maxenergy = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["offsetspeed"].(float64); !_ok_ { err = errors.New("offsetspeed error"); return }; _v.Offsetspeed = float32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.ConsumeHeroData.go b/sys/configure/structs/Game.ConsumeHeroData.go index 44d6cf108..4a262fdb8 100644 --- a/sys/configure/structs/Game.ConsumeHeroData.go +++ b/sys/configure/structs/Game.ConsumeHeroData.go @@ -14,6 +14,7 @@ type GameConsumeHeroData struct { Key string Type int32 Herocolor int32 + Skilldestructiontype int32 Herotitel string Hero int32 Iconimg string @@ -47,6 +48,7 @@ func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["herocolor"].(float64); !_ok_ { err = errors.New("herocolor error"); return }; _v.Herocolor = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilldestructiontype"].(float64); !_ok_ { err = errors.New("skilldestructiontype error"); return }; _v.Skilldestructiontype = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["herotitel"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Herotitel error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Herotitel, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) } { var _ok_ bool; if _v.Iconimg, _ok_ = _buf["iconimg"].(string); !_ok_ { err = errors.New("iconimg error"); return } } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 8959beadc..aca39037a 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -330,6 +330,7 @@ type Tables struct { IntegralReward *GameIntegralReward IntegralCondition *GameIntegralCondition IntegralTime *GameIntegralTime + Restore *GameRestore CatchbugSetstage *GameCatchbugSetstage BuzkashiCombo *GameBuzkashiCombo } @@ -2253,6 +2254,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.IntegralTime, err = NewGameIntegralTime(buf) ; err != nil { return nil, err } + if buf, err = loader("game_restore") ; err != nil { + return nil, err + } + if tables.Restore, err = NewGameRestore(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_catchbugsetstage") ; err != nil { return nil, err }