From 942babfcdbc2a5fbdaf4a6391edca509cff64eb1 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 5 Jan 2024 16:50:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_block.json | 196 ++--- bin/json/game_coin.json | 8 +- bin/json/game_gm.json | 10 + bin/json/game_huntingopentime.json | 8 +- bin/json/game_item.json | 4 +- bin/json/game_monsterformat.json | 308 +++---- bin/json/game_recharge.json | 128 ++- bin/json/game_shopcenterfund.json | 94 +- bin/json/game_skillatk.json | 12 +- bin/json/game_tdcard.json | 362 ++++++++ bin/json/game_tdhero.json | 3 - bin/json/game_tdmonsterappear.json | 825 ++++++++++++++++-- modules/shopcenter/api_Info.go | 5 +- modules/shopcenter/api_receive.go | 83 +- pb/combat_msg.pb.go | 146 ++-- pb/shopcenter_db.pb.go | 43 +- pb/shopcenter_msg.pb.go | 48 +- pb/user_db.pb.go | 12 +- sys/configure/structs/Game.TDCard.go | 42 + sys/configure/structs/Game.TDCardData.go | 60 ++ sys/configure/structs/Game.TDHeroData.go | 2 - sys/configure/structs/Game.TDMonsterAppear.go | 2 +- .../structs/Game.TDMonsterAppearData.go | 40 +- .../structs/Story.EStoryClickType.go | 15 + .../structs/TD.EAppearTriggerType.go | 16 + sys/configure/structs/TD.ECardEventType.go | 17 + sys/configure/structs/TEnum.EArenaOpenType.go | 13 + .../structs/TEnum.EAskLibraryType.go | 14 + sys/configure/structs/TEnum.EBubbleType.go | 14 + .../structs/TEnum.EChapterGameType.go | 19 + sys/configure/structs/TEnum.EChatDataType.go | 16 + sys/configure/structs/TEnum.ECirculateType.go | 14 + sys/configure/structs/TEnum.EColor.go | 19 + .../structs/TEnum.ECombatMansterType.go | 14 + .../structs/TEnum.EDrawcardPoolType.go | 14 + sys/configure/structs/TEnum.EEquipPos.go | 22 + sys/configure/structs/TEnum.EEquipType.go | 15 + sys/configure/structs/TEnum.EEventType.go | 14 + sys/configure/structs/TEnum.EFmType.go | 19 + sys/configure/structs/TEnum.EMatchType.go | 14 + sys/configure/structs/TEnum.EMountType.go | 15 + sys/configure/structs/TEnum.ENewSpaperType.go | 14 + sys/configure/structs/TEnum.ETaskQuality.go | 15 + sys/configure/structs/TEnum.ETrackMoveType.go | 17 + sys/configure/structs/TEnum.ETrackType.go | 14 + sys/configure/structs/Tables.go | 7 + 46 files changed, 2200 insertions(+), 592 deletions(-) create mode 100644 bin/json/game_tdcard.json create mode 100644 sys/configure/structs/Game.TDCard.go create mode 100644 sys/configure/structs/Game.TDCardData.go create mode 100644 sys/configure/structs/Story.EStoryClickType.go create mode 100644 sys/configure/structs/TD.EAppearTriggerType.go create mode 100644 sys/configure/structs/TD.ECardEventType.go create mode 100644 sys/configure/structs/TEnum.EArenaOpenType.go create mode 100644 sys/configure/structs/TEnum.EAskLibraryType.go create mode 100644 sys/configure/structs/TEnum.EBubbleType.go create mode 100644 sys/configure/structs/TEnum.EChapterGameType.go create mode 100644 sys/configure/structs/TEnum.EChatDataType.go create mode 100644 sys/configure/structs/TEnum.ECirculateType.go create mode 100644 sys/configure/structs/TEnum.EColor.go create mode 100644 sys/configure/structs/TEnum.ECombatMansterType.go create mode 100644 sys/configure/structs/TEnum.EDrawcardPoolType.go create mode 100644 sys/configure/structs/TEnum.EEquipPos.go create mode 100644 sys/configure/structs/TEnum.EEquipType.go create mode 100644 sys/configure/structs/TEnum.EEventType.go create mode 100644 sys/configure/structs/TEnum.EFmType.go create mode 100644 sys/configure/structs/TEnum.EMatchType.go create mode 100644 sys/configure/structs/TEnum.EMountType.go create mode 100644 sys/configure/structs/TEnum.ENewSpaperType.go create mode 100644 sys/configure/structs/TEnum.ETaskQuality.go create mode 100644 sys/configure/structs/TEnum.ETrackMoveType.go create mode 100644 sys/configure/structs/TEnum.ETrackType.go diff --git a/bin/json/game_block.json b/bin/json/game_block.json index 25d02f5b1..c36c0cd08 100644 --- a/bin/json/game_block.json +++ b/bin/json/game_block.json @@ -99,10 +99,7 @@ "key": 7, "color": 1, "excolor": 7, - "direction": [ - 3, - 4 - ], + "direction": [], "belongto": 1, "open": 2, "icon": "sx_sjt_dhs", @@ -118,10 +115,7 @@ "key": 8, "color": 1, "excolor": 7, - "direction": [ - 1, - 2 - ], + "direction": [], "belongto": 1, "open": 3, "icon": "sx_hjt_dhs", @@ -137,10 +131,7 @@ "key": 9, "color": 2, "excolor": 7, - "direction": [ - 3, - 4 - ], + "direction": [], "belongto": 1, "open": 4, "icon": "sx_sjt_ls", @@ -156,10 +147,7 @@ "key": 10, "color": 2, "excolor": 7, - "direction": [ - 1, - 2 - ], + "direction": [], "belongto": 1, "open": 5, "icon": "sx_hjt_ls", @@ -175,10 +163,7 @@ "key": 11, "color": 3, "excolor": 7, - "direction": [ - 3, - 4 - ], + "direction": [], "belongto": 1, "open": 6, "icon": "sx_sjt_lvs", @@ -194,10 +179,7 @@ "key": 12, "color": 3, "excolor": 7, - "direction": [ - 1, - 2 - ], + "direction": [], "belongto": 1, "open": 7, "icon": "sx_hjt_lvs", @@ -213,10 +195,7 @@ "key": 13, "color": 4, "excolor": 7, - "direction": [ - 3, - 4 - ], + "direction": [], "belongto": 1, "open": 8, "icon": "sx_sjt_zs", @@ -232,10 +211,7 @@ "key": 14, "color": 4, "excolor": 7, - "direction": [ - 1, - 2 - ], + "direction": [], "belongto": 1, "open": 9, "icon": "sx_hjt_zs", @@ -251,10 +227,7 @@ "key": 15, "color": 5, "excolor": 7, - "direction": [ - 3, - 4 - ], + "direction": [], "belongto": 1, "open": 10, "icon": "sx_sjt_hs", @@ -270,10 +243,7 @@ "key": 16, "color": 5, "excolor": 7, - "direction": [ - 1, - 2 - ], + "direction": [], "belongto": 1, "open": 11, "icon": "sx_hjt_hs", @@ -289,10 +259,7 @@ "key": 17, "color": 6, "excolor": 7, - "direction": [ - 3, - 4 - ], + "direction": [], "belongto": 1, "open": 12, "icon": "sx_sjt_fhs", @@ -308,10 +275,7 @@ "key": 18, "color": 6, "excolor": 7, - "direction": [ - 1, - 2 - ], + "direction": [], "belongto": 1, "open": 13, "icon": "sx_hjt_fhs", @@ -535,15 +499,13 @@ "key": 32, "color": 1, "excolor": 11, - "direction": [ - 3 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_syh_dhs", "icon2": "sx_syh_ls", "weight": 1000, - "effect": "effect_sx_yanhuo_dhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_dhs", "score": 1, "type": 5, @@ -553,15 +515,13 @@ "key": 33, "color": 1, "excolor": 11, - "direction": [ - 4 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_xyh_dhs", "icon2": "sx_xyh_ls", "weight": 1000, - "effect": "effect_sx_yanhuo_dhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_dhs", "score": 1, "type": 6, @@ -571,15 +531,13 @@ "key": 34, "color": 1, "excolor": 11, - "direction": [ - 1 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_zyh_dhs", "icon2": "sx_zyh_ls", "weight": 1000, - "effect": "effect_sx_yanhuo_dhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_dhs", "score": 1, "type": 7, @@ -589,15 +547,13 @@ "key": 35, "color": 1, "excolor": 11, - "direction": [ - 2 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_yyh_dhs", "icon2": "sx_yyh_ls", "weight": 1000, - "effect": "effect_sx_yanhuo_dhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_dhs", "score": 1, "type": 8, @@ -607,15 +563,13 @@ "key": 36, "color": 2, "excolor": 11, - "direction": [ - 3 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_syh_ls", "icon2": "sx_syh_dhs", "weight": 1000, - "effect": "effect_sx_yanhuo_ls", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_ls", "score": 1, "type": 5, @@ -625,15 +579,13 @@ "key": 37, "color": 2, "excolor": 11, - "direction": [ - 4 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_xyh_ls", "icon2": "sx_xyh_dhs", "weight": 1000, - "effect": "effect_sx_yanhuo_ls", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_ls", "score": 1, "type": 6, @@ -643,15 +595,13 @@ "key": 38, "color": 2, "excolor": 11, - "direction": [ - 1 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_zyh_ls", "icon2": "sx_zyh_dhs", "weight": 1000, - "effect": "effect_sx_yanhuo_ls", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_ls", "score": 1, "type": 7, @@ -661,15 +611,13 @@ "key": 39, "color": 2, "excolor": 11, - "direction": [ - 2 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_yyh_ls", "icon2": "sx_yyh_dhs", "weight": 1000, - "effect": "effect_sx_yanhuo_ls", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_ls", "score": 1, "type": 8, @@ -679,15 +627,13 @@ "key": 40, "color": 3, "excolor": 11, - "direction": [ - 3 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_syh_lvs", "icon2": "sx_syh_lvs", "weight": 1000, - "effect": "effect_sx_yanhuo_lvs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_lvs", "score": 1, "type": 5, @@ -697,15 +643,13 @@ "key": 41, "color": 3, "excolor": 11, - "direction": [ - 4 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_xyh_lvs", "icon2": "sx_xyh_lvs", "weight": 1000, - "effect": "effect_sx_yanhuo_lvs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_lvs", "score": 1, "type": 6, @@ -715,15 +659,13 @@ "key": 42, "color": 3, "excolor": 11, - "direction": [ - 1 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_zyh_lvs", "icon2": "sx_zyh_lvs", "weight": 1000, - "effect": "effect_sx_yanhuo_lvs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_lvs", "score": 1, "type": 7, @@ -733,15 +675,13 @@ "key": 43, "color": 3, "excolor": 11, - "direction": [ - 2 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_yyh_lvs", "icon2": "sx_yyh_lvs", "weight": 1000, - "effect": "effect_sx_yanhuo_lvs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_lvs", "score": 1, "type": 8, @@ -751,15 +691,13 @@ "key": 44, "color": 4, "excolor": 11, - "direction": [ - 3 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_syh_zs", "icon2": "sx_syh_zs", "weight": 1000, - "effect": "effect_sx_yanhuo_zs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_zs", "score": 1, "type": 5, @@ -769,15 +707,13 @@ "key": 45, "color": 4, "excolor": 11, - "direction": [ - 4 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_xyh_zs", "icon2": "sx_xyh_zs", "weight": 1000, - "effect": "effect_sx_yanhuo_zs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_zs", "score": 1, "type": 6, @@ -787,15 +723,13 @@ "key": 46, "color": 4, "excolor": 11, - "direction": [ - 1 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_zyh_zs", "icon2": "sx_zyh_zs", "weight": 1000, - "effect": "effect_sx_yanhuo_zs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_zs", "score": 1, "type": 7, @@ -805,15 +739,13 @@ "key": 47, "color": 4, "excolor": 11, - "direction": [ - 2 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_yyh_zs", "icon2": "sx_yyh_zs", "weight": 1000, - "effect": "effect_sx_yanhuo_zs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_zs", "score": 1, "type": 8, @@ -823,9 +755,7 @@ "key": 48, "color": 5, "excolor": 11, - "direction": [ - 3 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_syh_hs", @@ -841,9 +771,7 @@ "key": 49, "color": 5, "excolor": 11, - "direction": [ - 4 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_xyh_hs", @@ -859,9 +787,7 @@ "key": 50, "color": 5, "excolor": 11, - "direction": [ - 1 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_zyh_hs", @@ -877,9 +803,7 @@ "key": 51, "color": 5, "excolor": 11, - "direction": [ - 2 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_yyh_hs", @@ -895,15 +819,13 @@ "key": 52, "color": 6, "excolor": 11, - "direction": [ - 3 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_syh_fhs", "icon2": "sx_syh_fhs", "weight": 1000, - "effect": "effect_sx_yanhuo_fhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_fhs", "score": 1, "type": 5, @@ -913,15 +835,13 @@ "key": 53, "color": 6, "excolor": 11, - "direction": [ - 4 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_xyh_fhs", "icon2": "sx_xyh_fhs", "weight": 1000, - "effect": "effect_sx_yanhuo_fhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_fhs", "score": 1, "type": 6, @@ -931,15 +851,13 @@ "key": 54, "color": 6, "excolor": 11, - "direction": [ - 1 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_zyh_fhs", "icon2": "sx_zyh_fhs", "weight": 1000, - "effect": "effect_sx_yanhuo_fhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_fhs", "score": 1, "type": 7, @@ -949,15 +867,13 @@ "key": 55, "color": 6, "excolor": 11, - "direction": [ - 2 - ], + "direction": [], "belongto": 4, "open": 1, "icon": "sx_yyh_fhs", "icon2": "sx_yyh_fhs", "weight": 1000, - "effect": "effect_sx_yanhuo_fhs", + "effect": "effect_sx_yanhuo_hs", "pointeffect": "effect_sx_liuguang_fhs", "score": 1, "type": 8, diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index 7dc9ba64a..754c6874f 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -461,7 +461,7 @@ "keyint": 18, "name": { "key": "item_coin_name_18", - "text": "三消玩法币" + "text": "王国货币" }, "hold": 1, "color": 4, @@ -469,7 +469,7 @@ "access": [ 158 ], - "img": "wp_icon_10024", + "img": "attr_sxmoney", "intr": { "key": "item_coin_intr_18", "text": "用于在三消玩法内消耗的货币" @@ -488,7 +488,7 @@ "keyint": 19, "name": { "key": "item_coin_name_19", - "text": "三消玩法积分" + "text": "知名度" }, "hold": 1, "color": 5, @@ -496,7 +496,7 @@ "access": [ 158 ], - "img": "wp_icon_10021", + "img": "attr_sxintegral", "intr": { "key": "item_coin_intr_19", "text": "三消的积分道具，增加可以获得进度奖励" diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index 72ca56a7d..3dd987dde 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -838,5 +838,15 @@ }, "data": "3", "prefix": "bingo:moonlv,{0}" + }, + { + "id": 85, + "type": 2, + "text": { + "key": "GM_GM_text_132", + "text": "开始一段剧情" + }, + "data": "剧情组id", + "prefix": "" } ] \ No newline at end of file diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json index 2d273af6d..c61107ce0 100644 --- a/bin/json/game_huntingopentime.json +++ b/bin/json/game_huntingopentime.json @@ -21,7 +21,7 @@ }, "bg": "hl_img_bg", "icon": "hkz_wftj_sl02", - "bossIcon": "sl_rk_boss04" + "bossIcon": "gl_img_55002" }, { "type": 2, @@ -45,7 +45,7 @@ }, "bg": "fb_pt_hl", "icon": "hkz_wftj_sl04", - "bossIcon": "sl_rk_boss02" + "bossIcon": "gl_img_55001" }, { "type": 3, @@ -69,7 +69,7 @@ }, "bg": "fb_pt_dc", "icon": "hkz_wftj_sl01", - "bossIcon": "sl_rk_boss01" + "bossIcon": "gl_img_55004" }, { "type": 4, @@ -93,6 +93,6 @@ }, "bg": "fb_pt_tkhx", "icon": "hkz_wftj_sl03", - "bossIcon": "sl_rk_boss03" + "bossIcon": "gl_img_55003" } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 26a02d91f..d1e2486bb 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -21503,7 +21503,7 @@ "text": "石阵旁的藏宝图" }, "usetype": 0, - "color": 0, + "color": 1, "bagtype": 0, "index": 0, "special_type": 0, @@ -21544,7 +21544,7 @@ "text": "捉虫子游玩次数" }, "usetype": 0, - "color": 0, + "color": 1, "bagtype": 0, "index": 0, "special_type": 0, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 5db5166a3..bbbaafa97 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -5113,12 +5113,12 @@ "newskill": [], "lv": 11, "hppro": 2, - "atkpro": 1.2, + "atkpro": 5, "defpro": 0.83, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 100, + "speed": 180, "modelsize": 1 }, { @@ -5133,12 +5133,12 @@ "newskill": [], "lv": 11, "hppro": 2, - "atkpro": 1.2, + "atkpro": 2.4, "defpro": 0.73, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 75, + "speed": 80, "modelsize": 1 }, { @@ -5153,12 +5153,12 @@ "newskill": [], "lv": 11, "hppro": 2, - "atkpro": 1.2, + "atkpro": 2.4, "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": -1, + "speed": 90, "modelsize": 1 }, { @@ -5173,12 +5173,12 @@ "newskill": [], "lv": 11, "hppro": 2, - "atkpro": 1.2, + "atkpro": 2.4, "defpro": 0.85, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 98, + "speed": 78, "modelsize": 1 }, { @@ -5198,7 +5198,7 @@ "skill1": 1, "skill2": 1, "skill3": 1, - "speed": -1, + "speed": 78, "modelsize": 1 }, { @@ -14750,7 +14750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -17150,7 +17150,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -18950,7 +18950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -19250,7 +19250,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -21050,7 +21050,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -26750,7 +26750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -29150,7 +29150,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -30650,7 +30650,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -36930,7 +36930,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -37230,7 +37230,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -37570,7 +37570,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -43850,7 +43850,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -46250,7 +46250,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -48050,7 +48050,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -48350,7 +48350,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -50150,7 +50150,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -55850,7 +55850,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -58250,7 +58250,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -59750,7 +59750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -65730,7 +65730,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -66030,7 +66030,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -66370,7 +66370,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -72650,7 +72650,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -75050,7 +75050,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -76850,7 +76850,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -77150,7 +77150,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -78950,7 +78950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -84650,7 +84650,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -87050,7 +87050,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -88550,7 +88550,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -94530,7 +94530,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -94830,7 +94830,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -95170,7 +95170,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -101450,7 +101450,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -103850,7 +103850,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -105650,7 +105650,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -105950,7 +105950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -107750,7 +107750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -113450,7 +113450,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -115850,7 +115850,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -117350,7 +117350,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -147450,7 +147450,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -149950,7 +149950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -150350,7 +150350,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -151250,7 +151250,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -153150,7 +153150,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -154650,7 +154650,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -154750,7 +154750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -154850,7 +154850,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -154950,7 +154950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -155950,7 +155950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -156950,7 +156950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -157050,7 +157050,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -158750,7 +158750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -160150,7 +160150,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -162650,7 +162650,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -162750,7 +162750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -163250,7 +163250,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -164750,7 +164750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -166750,7 +166750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -169050,7 +169050,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -170950,7 +170950,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -171250,7 +171250,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -171750,7 +171750,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -173050,7 +173050,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -173250,7 +173250,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -174550,7 +174550,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -174850,7 +174850,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -238030,7 +238030,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 4, "equip": [], "newskill": [], @@ -238130,7 +238130,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -238330,7 +238330,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -238430,7 +238430,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 3, "equip": [], "newskill": [], @@ -257078,7 +257078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -258578,7 +258578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -259078,7 +259078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -260578,7 +260578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -260778,7 +260778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -260878,7 +260878,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -261078,7 +261078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -261778,7 +261778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -262678,7 +262678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -264678,7 +264678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -267978,7 +267978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -269978,7 +269978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -271678,7 +271678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -273178,7 +273178,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -274278,7 +274278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -275978,7 +275978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -280478,7 +280478,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -283578,7 +283578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -286278,7 +286278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -286978,7 +286978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -288278,7 +288278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -289078,7 +289078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -291078,7 +291078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -291778,7 +291778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -293378,7 +293378,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -293678,7 +293678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -293978,7 +293978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -294578,7 +294578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -294778,7 +294778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -297778,7 +297778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -297978,7 +297978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -299778,7 +299778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -301278,7 +301278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -302578,7 +302578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -303478,7 +303478,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -303578,7 +303578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -304278,7 +304278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -308978,7 +308978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -310578,7 +310578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -312478,7 +312478,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -312778,7 +312778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -313478,7 +313478,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -314978,7 +314978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -316078,7 +316078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -316978,7 +316978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -317678,7 +317678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -322278,7 +322278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -325278,7 +325278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -325578,7 +325578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -326578,7 +326578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -327078,7 +327078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -328378,7 +328378,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -332178,7 +332178,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -336578,7 +336578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -337078,7 +337078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -338678,7 +338678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -342378,7 +342378,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -345078,7 +345078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -345578,7 +345578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -346778,7 +346778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -347578,7 +347578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -347678,7 +347678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -347778,7 +347778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -352078,7 +352078,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -352578,7 +352578,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -353278,7 +353278,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -354678,7 +354678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -354978,7 +354978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -356678,7 +356678,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -357478,7 +357478,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -362978,7 +362978,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -363778,7 +363778,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], @@ -364478,7 +364478,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 53002, "star": 5, "equip": [], "newskill": [], diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index c0ec6ddc5..75df8f7b9 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -5,8 +5,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 600, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 120 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 120 + } + ], "channel": "0", "text": "0", "show": "6元", @@ -19,8 +31,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 3000, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 600 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 600 + } + ], "channel": "0", "text": "0", "show": "30元", @@ -33,8 +57,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 6800, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 1360 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 1360 + } + ], "channel": "0", "text": "0", "show": "68元", @@ -47,8 +83,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 9800, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 1960 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 1960 + } + ], "channel": "0", "text": "0", "show": "98元", @@ -61,8 +109,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 12800, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 2560 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 2560 + } + ], "channel": "0", "text": "0", "show": "128元", @@ -75,8 +135,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 19800, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 3960 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 3960 + } + ], "channel": "0", "text": "0", "show": "198元", @@ -89,8 +161,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 32800, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 6560 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 6560 + } + ], "channel": "0", "text": "0", "show": "328元", @@ -103,8 +187,20 @@ "editionid": "debug", "monetaryunit": "￥", "amount": 64800, - "vipexp": [], - "diamond_num_double": [], + "vipexp": [ + { + "a": "attr", + "t": "diamond", + "n": 12960 + } + ], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 12960 + } + ], "channel": "0", "text": "0", "show": "648元", diff --git a/bin/json/game_shopcenterfund.json b/bin/json/game_shopcenterfund.json index 8ed42bd3b..be89a6aaf 100644 --- a/bin/json/game_shopcenterfund.json +++ b/bin/json/game_shopcenterfund.json @@ -4,329 +4,329 @@ "type": 2, "unlock": 5, "group": 22002001, - "position": 1 + "position": 0 }, { "id": 200002, "type": 2, "unlock": 10, "group": 22002002, - "position": 2 + "position": 0 }, { "id": 200003, "type": 2, "unlock": 15, "group": 22002002, - "position": 3 + "position": 0 }, { "id": 200004, "type": 2, "unlock": 20, "group": 22002002, - "position": 4 + "position": 0 }, { "id": 200005, "type": 2, "unlock": 25, "group": 22002002, - "position": 5 + "position": 0 }, { "id": 200006, "type": 2, "unlock": 30, "group": 22002002, - "position": 6 + "position": 0 }, { "id": 200007, "type": 2, "unlock": 35, "group": 22002002, - "position": 7 + "position": 0 }, { "id": 200008, "type": 2, "unlock": 40, "group": 22002002, - "position": 8 + "position": 0 }, { "id": 200009, "type": 2, "unlock": 45, "group": 22002002, - "position": 9 + "position": 0 }, { "id": 200010, "type": 2, "unlock": 50, "group": 22002002, - "position": 10 + "position": 0 }, { "id": 200011, "type": 2, "unlock": 55, "group": 22002002, - "position": 11 + "position": 0 }, { "id": 200013, "type": 3, "unlock": 1, "group": 19100004, - "position": 1 + "position": 0 }, { "id": 200014, "type": 3, "unlock": 2, "group": 19100004, - "position": 2 + "position": 0 }, { "id": 200015, "type": 3, "unlock": 3, "group": 19100004, - "position": 3 + "position": 0 }, { "id": 200016, "type": 3, "unlock": 4, "group": 19100004, - "position": 4 + "position": 0 }, { "id": 200017, "type": 3, "unlock": 5, "group": 19100004, - "position": 5 + "position": 0 }, { "id": 200018, "type": 3, "unlock": 6, "group": 19100004, - "position": 6 + "position": 0 }, { "id": 200019, "type": 3, "unlock": 7, "group": 19100004, - "position": 7 + "position": 0 }, { "id": 200020, "type": 3, "unlock": 8, "group": 19100004, - "position": 8 + "position": 0 }, { "id": 200021, "type": 3, "unlock": 9, "group": 19100004, - "position": 9 + "position": 0 }, { "id": 200022, "type": 3, "unlock": 10, "group": 19100004, - "position": 10 + "position": 0 }, { "id": 200023, "type": 3, "unlock": 11, "group": 19100004, - "position": 11 + "position": 0 }, { "id": 200024, "type": 3, "unlock": 12, "group": 19100004, - "position": 12 + "position": 0 }, { "id": 200025, "type": 4, "unlock": 1, "group": 19100004, - "position": 1 + "position": 0 }, { "id": 200026, "type": 4, "unlock": 2, "group": 19100004, - "position": 2 + "position": 0 }, { "id": 200027, "type": 4, "unlock": 3, "group": 19100004, - "position": 3 + "position": 0 }, { "id": 200028, "type": 4, "unlock": 4, "group": 19100004, - "position": 4 + "position": 0 }, { "id": 200029, "type": 4, "unlock": 5, "group": 19100004, - "position": 5 + "position": 0 }, { "id": 200030, "type": 4, "unlock": 6, "group": 19100004, - "position": 6 + "position": 0 }, { "id": 200031, "type": 4, "unlock": 7, "group": 19100004, - "position": 7 + "position": 0 }, { "id": 200032, "type": 4, "unlock": 8, "group": 19100004, - "position": 8 + "position": 0 }, { "id": 200033, "type": 4, "unlock": 9, "group": 19100004, - "position": 9 + "position": 0 }, { "id": 200034, "type": 4, "unlock": 10, "group": 19100004, - "position": 10 + "position": 0 }, { "id": 200035, "type": 4, "unlock": 11, "group": 19100004, - "position": 11 + "position": 0 }, { "id": 200036, "type": 4, "unlock": 12, "group": 19100004, - "position": 12 + "position": 0 }, { "id": 200037, "type": 5, "unlock": 1, "group": 19100004, - "position": 1 + "position": 0 }, { "id": 200038, "type": 5, "unlock": 2, "group": 19100004, - "position": 2 + "position": 0 }, { "id": 200039, "type": 5, "unlock": 3, "group": 19100004, - "position": 3 + "position": 0 }, { "id": 200040, "type": 5, "unlock": 4, "group": 19100004, - "position": 4 + "position": 0 }, { "id": 200041, "type": 5, "unlock": 5, "group": 19100004, - "position": 5 + "position": 0 }, { "id": 200042, "type": 5, "unlock": 6, "group": 19100004, - "position": 6 + "position": 0 }, { "id": 200043, "type": 5, "unlock": 7, "group": 19100004, - "position": 7 + "position": 0 }, { "id": 200044, "type": 5, "unlock": 8, "group": 19100004, - "position": 8 + "position": 0 }, { "id": 200045, "type": 5, "unlock": 9, "group": 19100004, - "position": 9 + "position": 0 }, { "id": 200046, "type": 5, "unlock": 10, "group": 19100004, - "position": 10 + "position": 0 }, { "id": 200047, "type": 5, "unlock": 11, "group": 19100004, - "position": 11 + "position": 0 }, { "id": 200048, "type": 5, "unlock": 12, "group": 19100004, - "position": 12 + "position": 0 }, { "id": 300001, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index f26ae8e2a..0d536e874 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -57072,7 +57072,7 @@ "key": "skill_skill_atk_Name_151054111", "text": "三连电击" }, - "ico": "jn_53003_2", + "ico": "jn_51054_1", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_1", @@ -57105,7 +57105,7 @@ "key": "skill_skill_atk_Name_151054211", "text": "电光笼罩" }, - "ico": "jn_53003_3", + "ico": "jn_51054_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -59146,7 +59146,7 @@ "key": "skill_skill_atk_Name_151056111", "text": "鼠眩" }, - "ico": "jn_24007_1", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -59179,7 +59179,7 @@ "key": "skill_skill_atk_Name_151056211", "text": "加速鼠窜" }, - "ico": "jn_24007_2", + "ico": "jn_51056_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -59212,7 +59212,7 @@ "key": "skill_skill_atk_Name_151057111", "text": "层层电刑" }, - "ico": "jn_51006_2", + "ico": "jn_51057_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -59245,7 +59245,7 @@ "key": "skill_skill_atk_Name_151057211", "text": "百万伏特" }, - "ico": "jn_51006_3", + "ico": "jn_51057_2", "CorrectPos": 0, "IsMelee": 1, "act": "Skill_3", diff --git a/bin/json/game_tdcard.json b/bin/json/game_tdcard.json new file mode 100644 index 000000000..95567b0b2 --- /dev/null +++ b/bin/json/game_tdcard.json @@ -0,0 +1,362 @@ +[ + { + "eventid": 1001001, + "type": 1, + "preevent": 0, + "andcondition": [ + 0 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1001002, + "type": 1, + "preevent": 1001001, + "andcondition": [ + 0 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1001003, + "type": 1, + "preevent": 1001002, + "andcondition": [ + 0 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1001004, + "type": 1, + "preevent": 1001003, + "andcondition": [ + 0 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1002001, + "type": 1, + "preevent": 0, + "andcondition": [ + 1 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1002002, + "type": 1, + "preevent": 1002001, + "andcondition": [ + 1 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1002003, + "type": 1, + "preevent": 1002002, + "andcondition": [ + 1 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1002004, + "type": 1, + "preevent": 1002003, + "andcondition": [ + 1 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1003001, + "type": 1, + "preevent": 0, + "andcondition": [ + 2 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1003002, + "type": 1, + "preevent": 1003001, + "andcondition": [ + 2 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1003003, + "type": 1, + "preevent": 1003002, + "andcondition": [ + 2 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 1003004, + "type": 1, + "preevent": 1003003, + "andcondition": [ + 2 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2001, + "type": 2, + "preevent": 0, + "andcondition": [], + "must": 0, + "maxnum": 5, + "weight": 50 + }, + { + "eventid": 2002, + "type": 2, + "preevent": 0, + "andcondition": [], + "must": 0, + "maxnum": 5, + "weight": 50 + }, + { + "eventid": 2003, + "type": 2, + "preevent": 0, + "andcondition": [], + "must": 0, + "maxnum": 5, + "weight": 50 + }, + { + "eventid": 2001001, + "type": 3, + "preevent": 0, + "andcondition": [ + 11001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2001002, + "type": 3, + "preevent": 0, + "andcondition": [ + 11001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2001003, + "type": 3, + "preevent": 0, + "andcondition": [ + 11001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2001004, + "type": 3, + "preevent": 0, + "andcondition": [ + 11001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2001005, + "type": 3, + "preevent": 0, + "andcondition": [ + 11001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2002001, + "type": 3, + "preevent": 0, + "andcondition": [ + 10000 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2002002, + "type": 3, + "preevent": 0, + "andcondition": [ + 10000 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2002003, + "type": 3, + "preevent": 0, + "andcondition": [ + 10000 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2002004, + "type": 3, + "preevent": 0, + "andcondition": [ + 10000 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2002005, + "type": 3, + "preevent": 0, + "andcondition": [ + 10000 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2003001, + "type": 3, + "preevent": 0, + "andcondition": [ + 21001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2003002, + "type": 3, + "preevent": 0, + "andcondition": [ + 21001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2003003, + "type": 3, + "preevent": 0, + "andcondition": [ + 21001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2003004, + "type": 3, + "preevent": 0, + "andcondition": [ + 21001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 2003005, + "type": 3, + "preevent": 0, + "andcondition": [ + 21001 + ], + "must": 0, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 3001, + "type": 4, + "preevent": 1001004, + "andcondition": [ + 5, + 1 + ], + "must": 1, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 3002, + "type": 4, + "preevent": 1002004, + "andcondition": [ + 5, + 1 + ], + "must": 1, + "maxnum": 1, + "weight": 50 + }, + { + "eventid": 3003, + "type": 4, + "preevent": 1003004, + "andcondition": [ + 5, + 1 + ], + "must": 1, + "maxnum": 1, + "weight": 50 + } +] \ No newline at end of file diff --git a/bin/json/game_tdhero.json b/bin/json/game_tdhero.json index 8b063fcc3..9eb5aa985 100644 --- a/bin/json/game_tdhero.json +++ b/bin/json/game_tdhero.json @@ -29,7 +29,6 @@ "height": 10, "hp": 200, "atk": 100, - "atk_speed1": 100, "atk_speed": 8000, "atk_range": 0 }, @@ -63,7 +62,6 @@ "height": 10, "hp": 200, "atk": 100, - "atk_speed1": 100, "atk_speed": 10000, "atk_range": 0 }, @@ -97,7 +95,6 @@ "height": 10, "hp": 200, "atk": 100, - "atk_speed1": 100, "atk_speed": 10000, "atk_range": 0 } diff --git a/bin/json/game_tdmonsterappear.json b/bin/json/game_tdmonsterappear.json index 19c378596..7ff16e5bf 100644 --- a/bin/json/game_tdmonsterappear.json +++ b/bin/json/game_tdmonsterappear.json @@ -1,110 +1,767 @@ [ { - "id": 1, - "copy_id": 1, - "num": 1, - "time": 20, - "count": 300, - "monster_id": 1011, - "hp_multiple": 1000 + "subwave": 1101, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 0, + "triggerval": 0, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 2, - "copy_id": 1, - "num": 2, - "time": 20, - "count": 200, - "monster_id": 1011, - "hp_multiple": 1000 + "subwave": 1102, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 3, + "triggerval": 1101, + "subtriggerval": 10, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 3, - "copy_id": 1, - "num": 2, - "time": 20, - "count": 100, - "monster_id": 1021, - "hp_multiple": 1000 + "subwave": 1103, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1102, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 4, - "copy_id": 1, - "num": 3, - "time": 20, - "count": 200, - "monster_id": 1011, - "hp_multiple": 1000 + "subwave": 1104, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1103, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 5, - "copy_id": 1, - "num": 3, - "time": 20, - "count": 100, - "monster_id": 1021, - "hp_multiple": 1000 + "subwave": 1105, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1104, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 6, - "copy_id": 1, - "num": 4, - "time": 20, - "count": 300, - "monster_id": 1011, - "hp_multiple": 1000 + "subwave": 1106, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1105, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 7, - "copy_id": 1, - "num": 4, - "time": 20, - "count": 200, - "monster_id": 1021, - "hp_multiple": 1000 + "subwave": 1107, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1106, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 8, - "copy_id": 1, - "num": 5, - "time": 20, - "count": 300, - "monster_id": 1011, - "hp_multiple": 1000 + "subwave": 1108, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1107, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 9, - "copy_id": 1, - "num": 5, - "time": 20, - "count": 200, - "monster_id": 1021, - "hp_multiple": 1000 + "subwave": 1109, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1108, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 10, - "copy_id": 1, - "num": 6, - "time": 20, - "count": 500, - "monster_id": 1011, - "hp_multiple": 1000 + "subwave": 1110, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1109, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 }, { - "id": 11, - "copy_id": 1, - "num": 6, - "time": 20, - "count": 200, - "monster_id": 1021, - "hp_multiple": 1000 + "subwave": 1111, + "wave": 2, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 }, { - "id": 12, - "copy_id": 1, - "num": 7, - "time": 20, - "count": 200, - "monster_id": 3011, - "hp_multiple": 1000 + "subwave": 1112, + "wave": 2, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1113, + "wave": 2, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1114, + "wave": 2, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1113, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1115, + "wave": 2, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1114, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1116, + "wave": 2, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1115, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1117, + "wave": 2, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 1, + "monsterid": 25001, + "isboss": 1, + "trigger": 2, + "triggerval": 1116, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1118, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 0, + "triggerval": 0, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1119, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 3, + "triggerval": 1101, + "subtriggerval": 10, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1120, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1119, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1121, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1120, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1122, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1121, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1123, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1122, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1124, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1123, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1125, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1124, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1126, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1125, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1127, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1126, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1128, + "wave": 2, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1129, + "wave": 2, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1130, + "wave": 2, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1131, + "wave": 2, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1130, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1132, + "wave": 2, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1131, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1133, + "wave": 2, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1132, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1134, + "wave": 2, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 2, + "monsterid": 25001, + "isboss": 1, + "trigger": 2, + "triggerval": 1133, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1135, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 0, + "triggerval": 0, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1136, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 3, + "triggerval": 1101, + "subtriggerval": 10, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1137, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1136, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1138, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1137, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1139, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1138, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1140, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1139, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1141, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1140, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1142, + "wave": 1, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1141, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1143, + "wave": 1, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1142, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1144, + "wave": 1, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1143, + "subtriggerval": 0, + "hpgrow": 1, + "atkgrow": 1 + }, + { + "subwave": 1145, + "wave": 2, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1146, + "wave": 2, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1147, + "wave": 2, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 1, + "triggerval": 1, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1148, + "wave": 2, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1147, + "subtriggerval": 0, + "hpgrow": 10, + "atkgrow": 1.2 + }, + { + "subwave": 1149, + "wave": 2, + "monsternum": 80, + "subwavetime": 20, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1148, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1150, + "wave": 2, + "monsternum": 80, + "subwavetime": 30, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 0, + "trigger": 2, + "triggerval": 1149, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 + }, + { + "subwave": 1151, + "wave": 2, + "monsternum": 80, + "subwavetime": 40, + "stagetype": 100, + "stageid": 3, + "monsterid": 25001, + "isboss": 1, + "trigger": 2, + "triggerval": 1150, + "subtriggerval": 0, + "hpgrow": 50000000, + "atkgrow": 20000 } ] \ No newline at end of file diff --git a/modules/shopcenter/api_Info.go b/modules/shopcenter/api_Info.go index b7628a39d..cf9720dd0 100644 --- a/modules/shopcenter/api_Info.go +++ b/modules/shopcenter/api_Info.go @@ -54,14 +54,17 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ShopCenterInfoReq) } if _, ok = activitys[pb.HdType_XSFundPhysical]; ok && v.Type == 3 { activity.Open = true + activity.Opemtime = activitys[pb.HdType_XSFundPhysical].Stime continue } if _, ok = activitys[pb.HdType_XSFundRecruit]; ok && v.Type == 4 { activity.Open = true + activity.Opemtime = activitys[pb.HdType_XSFundRecruit].Stime continue } - if _, ok = activitys[pb.HdType_XSFundRecruit]; ok && v.Type == 5 { + if _, ok = activitys[pb.HdType_XSFundExp]; ok && v.Type == 5 { activity.Open = true + activity.Opemtime = activitys[pb.HdType_XSFundExp].Stime continue } } diff --git a/modules/shopcenter/api_receive.go b/modules/shopcenter/api_receive.go index 20785fcb2..9ab7d901b 100644 --- a/modules/shopcenter/api_receive.go +++ b/modules/shopcenter/api_receive.go @@ -127,15 +127,17 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv } level := this.module.mainline.InquireMainLinePassLevel(session.GetUserId()) for _, v := range pconfs { - if _, ok = item.Record[v.Id]; !ok { - if _, ok = level[v.Mianlevel]; ok { - drop = append(drop, pconf.Group) - item.Record[v.Id] = true + if v.Index == conf.Index { + if _, ok = item.Record[v.Id]; !ok { + if _, ok = level[v.Mianlevel]; ok { + drop = append(drop, pconf.Group) + item.Record[v.Id] = true + } } } } } - case 2, 3, 4, 5: + case 2: if req.Pid != 0 { if _, ok = item.Record[req.Pid]; ok { errdata = &pb.ErrorData{ @@ -175,10 +177,10 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv return } for _, v := range fconfs { - if _, ok = item.Record[v.Id]; !ok { - if conf.Type == 2 { //等级基金 + if conf.Type == v.Type && v.Position == conf.Index { + if _, ok = item.Record[v.Id]; !ok { if user.Lv >= v.Unlock { //没有达到目标等级 - drop = append(drop, fconf.Group) + drop = append(drop, v.Group) item.Record[v.Id] = true } } @@ -186,7 +188,58 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv } } break - case 6, 7, 8: + case 3, 4, 5: + if req.Pid != 0 { + if _, ok = item.Record[req.Pid]; ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "Received!", + } + return + } + if fconf, err = this.module.configure.getGameShopCenterFund(req.Pid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + days := int32(utils.DiffDays(configure.Now().Unix(), item.Opemtime)) + 1 + if days < fconf.Unlock { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("days:%d no achieve", days), + } + return + } + drop = append(drop, fconf.Group) + item.Record[req.Pid] = true + } else { + if fconfs, err = this.module.configure.getGameShopCenterFunds(); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + days := int32(utils.DiffDays(configure.Now().Unix(), item.Buytime)) + 1 + for _, v := range fconfs { + if conf.Type == v.Type && v.Position == conf.Index { + if _, ok = item.Record[v.Id]; !ok { + if days >= v.Unlock { //没有达到目标等级 + drop = append(drop, v.Group) + item.Record[v.Id] = true + } + } + } + } + } + break + case 6: if req.Pid != 0 { if _, ok = item.Record[req.Pid]; ok { errdata = &pb.ErrorData{ @@ -226,10 +279,12 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv } days := int32(utils.DiffDays(configure.Now().Unix(), item.Buytime)) + 1 for _, v := range fconfs { - if _, ok = item.Record[v.Id]; !ok { - if days >= v.Unlock { //没有达到目标等级 - drop = append(drop, fconf.Group) - item.Record[v.Id] = true + if conf.Type == v.Type && v.Position == conf.Index { + if _, ok = item.Record[v.Id]; !ok { + if days >= v.Unlock { //没有达到目标等级 + drop = append(drop, v.Group) + item.Record[v.Id] = true + } } } } @@ -262,7 +317,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv Message: err.Error(), } } - session.SendMsg(string(this.module.GetType()), "receive", &pb.ShopCenterReceiveResp{Fid: req.Fid, Pid: req.Pid, Award: award}) + session.SendMsg(string(this.module.GetType()), "receive", &pb.ShopCenterReceiveResp{Fid: req.Fid, Pid: req.Pid, Item: item, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ShopCenterReceiveReq", award) }) diff --git a/pb/combat_msg.pb.go b/pb/combat_msg.pb.go index cf6db8b51..c8eb7e7e3 100644 --- a/pb/combat_msg.pb.go +++ b/pb/combat_msg.pb.go @@ -511,9 +511,10 @@ type CombatChallengeReceiveResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //管卡id - Manster int32 `protobuf:"varint,2,opt,name=manster,proto3" json:"manster"` - Atns []*UserAssets `protobuf:"bytes,3,rep,name=atns,proto3" json:"atns"` //获取物品 + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //管卡id + Manster int32 `protobuf:"varint,2,opt,name=manster,proto3" json:"manster"` + Atns []*UserAssets `protobuf:"bytes,3,rep,name=atns,proto3" json:"atns"` //获取物品 + Heroexp map[string]int32 `protobuf:"bytes,4,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验 } func (x *CombatChallengeReceiveResp) Reset() { @@ -569,6 +570,13 @@ func (x *CombatChallengeReceiveResp) GetAtns() []*UserAssets { return nil } +func (x *CombatChallengeReceiveResp) GetHeroexp() map[string]int32 { + if x != nil { + return x.Heroexp + } + return nil +} + //宝箱获取请求 type CombatDropReq struct { state protoimpl.MessageState @@ -880,44 +888,52 @@ var file_combat_combat_msg_proto_rawDesc = []byte{ 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, - 0x72, 0x74, 0x22, 0x6d, 0x0a, 0x1a, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, + 0x72, 0x74, 0x22, 0xed, 0x01, 0x0a, 0x1a, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, + 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, + 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, + 0x72, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, + 0x6e, 0x73, 0x12, 0x42, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, - 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, - 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, - 0x73, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, - 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, 0x70, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x22, 0x47, 0x0a, 0x0e, - 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, - 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, - 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, - 0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x91, 0x02, 0x0a, 0x11, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, - 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6c, - 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, - 0x6c, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73, - 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, - 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, - 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2f, 0x0a, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74, - 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, - 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, - 0x72, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, - 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, - 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, - 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, - 0x12, 0x27, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, - 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x40, 0x0a, 0x12, 0x43, 0x6f, 0x6d, - 0x62, 0x61, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, - 0x2a, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, + 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, + 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, + 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, + 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x22, 0x47, 0x0a, + 0x0e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, + 0x52, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x91, 0x02, 0x0a, 0x11, 0x4c, 0x65, 0x76, 0x65, 0x6c, + 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, + 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, + 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, + 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, + 0x6e, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2f, 0x0a, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, + 0x74, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, + 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, + 0x65, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, + 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, + 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, + 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x12, 0x27, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, + 0x52, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x40, 0x0a, 0x12, 0x43, 0x6f, + 0x6d, 0x62, 0x61, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, + 0x49, 0x74, 0x65, 0x6d, 0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -932,7 +948,7 @@ func file_combat_combat_msg_proto_rawDescGZIP() []byte { return file_combat_combat_msg_proto_rawDescData } -var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_combat_combat_msg_proto_goTypes = []interface{}{ (*CombatInReq)(nil), // 0: CombatInReq (*CombatInResp)(nil), // 1: CombatInResp @@ -949,32 +965,34 @@ var file_combat_combat_msg_proto_goTypes = []interface{}{ (*LevelProgressItem)(nil), // 12: LevelProgressItem (*CombatProgressPush)(nil), // 13: CombatProgressPush nil, // 14: CombatUpdateLevelReq.DataEntry - (*DBCombatLevel)(nil), // 15: DBCombatLevel - (*BattleFormation)(nil), // 16: BattleFormation - (*BattleInfo)(nil), // 17: BattleInfo - (*BattleReport)(nil), // 18: BattleReport - (*UserAssets)(nil), // 19: UserAssets - (*ConIProgress)(nil), // 20: ConIProgress + nil, // 15: CombatChallengeReceiveResp.HeroexpEntry + (*DBCombatLevel)(nil), // 16: DBCombatLevel + (*BattleFormation)(nil), // 17: BattleFormation + (*BattleInfo)(nil), // 18: BattleInfo + (*BattleReport)(nil), // 19: BattleReport + (*UserAssets)(nil), // 20: UserAssets + (*ConIProgress)(nil), // 21: ConIProgress } var file_combat_combat_msg_proto_depIdxs = []int32{ - 15, // 0: CombatInResp.level:type_name -> DBCombatLevel + 16, // 0: CombatInResp.level:type_name -> DBCombatLevel 12, // 1: CombatAskResp.level:type_name -> LevelProgressItem 14, // 2: CombatUpdateLevelReq.data:type_name -> CombatUpdateLevelReq.DataEntry - 16, // 3: CombatChallengeReq.battle:type_name -> BattleFormation - 17, // 4: CombatChallengeResp.info:type_name -> BattleInfo - 18, // 5: CombatChallengeReceiveReq.report:type_name -> BattleReport - 19, // 6: CombatChallengeReceiveResp.atns:type_name -> UserAssets - 19, // 7: CombatDropResp.atns:type_name -> UserAssets - 20, // 8: LevelProgressItem.passmaintask:type_name -> ConIProgress - 20, // 9: LevelProgressItem.passpertask:type_name -> ConIProgress - 19, // 10: LevelProgressItem.mainaward:type_name -> UserAssets - 19, // 11: LevelProgressItem.peraward:type_name -> UserAssets - 12, // 12: CombatProgressPush.levels:type_name -> LevelProgressItem - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 17, // 3: CombatChallengeReq.battle:type_name -> BattleFormation + 18, // 4: CombatChallengeResp.info:type_name -> BattleInfo + 19, // 5: CombatChallengeReceiveReq.report:type_name -> BattleReport + 20, // 6: CombatChallengeReceiveResp.atns:type_name -> UserAssets + 15, // 7: CombatChallengeReceiveResp.heroexp:type_name -> CombatChallengeReceiveResp.HeroexpEntry + 20, // 8: CombatDropResp.atns:type_name -> UserAssets + 21, // 9: LevelProgressItem.passmaintask:type_name -> ConIProgress + 21, // 10: LevelProgressItem.passpertask:type_name -> ConIProgress + 20, // 11: LevelProgressItem.mainaward:type_name -> UserAssets + 20, // 12: LevelProgressItem.peraward:type_name -> UserAssets + 12, // 13: CombatProgressPush.levels:type_name -> LevelProgressItem + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_combat_combat_msg_proto_init() } @@ -1162,7 +1180,7 @@ func file_combat_combat_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_combat_combat_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/shopcenter_db.pb.go b/pb/shopcenter_db.pb.go index 30ed2fe62..7ba89dfc7 100644 --- a/pb/shopcenter_db.pb.go +++ b/pb/shopcenter_db.pb.go @@ -90,11 +90,12 @@ type DBShopCenterItem struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //基金id - Vip bool `protobuf:"varint,2,opt,name=vip,proto3" json:"vip"` //是否已购买 - Open bool `protobuf:"varint,3,opt,name=open,proto3" json:"open"` //是否开放 - Buytime int64 `protobuf:"varint,4,opt,name=buytime,proto3" json:"buytime"` //购买时间 - Record map[int32]bool `protobuf:"bytes,5,rep,name=record,proto3" json:"record" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //领取记录 + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //基金id + Vip bool `protobuf:"varint,2,opt,name=vip,proto3" json:"vip"` //是否已购买 + Open bool `protobuf:"varint,3,opt,name=open,proto3" json:"open"` //是否开放 + Opemtime int64 `protobuf:"varint,4,opt,name=opemtime,proto3" json:"opemtime"` //开启时间 + Buytime int64 `protobuf:"varint,5,opt,name=buytime,proto3" json:"buytime"` //购买时间 + Record map[int32]bool `protobuf:"bytes,6,rep,name=record,proto3" json:"record" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //领取记录 } func (x *DBShopCenterItem) Reset() { @@ -150,6 +151,13 @@ func (x *DBShopCenterItem) GetOpen() bool { return false } +func (x *DBShopCenterItem) GetOpemtime() int64 { + if x != nil { + return x.Opemtime + } + return 0 +} + func (x *DBShopCenterItem) GetBuytime() int64 { if x != nil { return x.Buytime @@ -179,22 +187,23 @@ var file_shopcenter_shopcenter_db_proto_rawDesc = []byte{ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x49, 0x74, 0x65, - 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd4, 0x01, 0x0a, + 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf0, 0x01, 0x0a, 0x10, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x04, 0x6f, 0x70, 0x65, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, - 0x65, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x08, 0x52, 0x04, 0x6f, 0x70, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6d, 0x74, + 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6d, 0x74, + 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x35, 0x0a, + 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, + 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/shopcenter_msg.pb.go b/pb/shopcenter_msg.pb.go index 0f3eeff1e..9574538ae 100644 --- a/pb/shopcenter_msg.pb.go +++ b/pb/shopcenter_msg.pb.go @@ -165,9 +165,10 @@ type ShopCenterReceiveResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Fid int32 `protobuf:"varint,1,opt,name=fid,proto3" json:"fid"` //基金id - Pid int32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid"` //进度id - Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励 + Fid int32 `protobuf:"varint,1,opt,name=fid,proto3" json:"fid"` //基金id + Pid int32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid"` //进度id + Item *DBShopCenterItem `protobuf:"bytes,3,opt,name=item,proto3" json:"item"` + Award []*UserAtno `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励 } func (x *ShopCenterReceiveResp) Reset() { @@ -216,6 +217,13 @@ func (x *ShopCenterReceiveResp) GetPid() int32 { return 0 } +func (x *ShopCenterReceiveResp) GetItem() *DBShopCenterItem { + if x != nil { + return x.Item + } + return nil +} + func (x *ShopCenterReceiveResp) GetAward() []*UserAtno { if x != nil { return x.Award @@ -239,14 +247,16 @@ var file_shopcenter_shopcenter_msg_proto_rawDesc = []byte{ 0x68, 0x6f, 0x70, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x66, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x5c, 0x0a, 0x15, 0x53, 0x68, 0x6f, 0x70, 0x43, - 0x65, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x66, - 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x70, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, - 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x83, 0x01, 0x0a, 0x15, 0x53, 0x68, 0x6f, 0x70, + 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x66, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x12, 0x1f, 0x0a, 0x05, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -268,16 +278,18 @@ var file_shopcenter_shopcenter_msg_proto_goTypes = []interface{}{ (*ShopCenterReceiveReq)(nil), // 2: ShopCenterReceiveReq (*ShopCenterReceiveResp)(nil), // 3: ShopCenterReceiveResp (*DBShopCenter)(nil), // 4: DBShopCenter - (*UserAtno)(nil), // 5: UserAtno + (*DBShopCenterItem)(nil), // 5: DBShopCenterItem + (*UserAtno)(nil), // 6: UserAtno } var file_shopcenter_shopcenter_msg_proto_depIdxs = []int32{ 4, // 0: ShopCenterInfoResp.info:type_name -> DBShopCenter - 5, // 1: ShopCenterReceiveResp.award:type_name -> UserAtno - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 5, // 1: ShopCenterReceiveResp.item:type_name -> DBShopCenterItem + 6, // 2: ShopCenterReceiveResp.award:type_name -> UserAtno + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_shopcenter_shopcenter_msg_proto_init() } diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 0b5d01dd8..5bf8e545d 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -160,6 +160,7 @@ type DBUser struct { Titles []string `protobuf:"bytes,47,rep,name=titles,proto3" json:"titles"` // 称号 Curtitle string `protobuf:"bytes,48,opt,name=curtitle,proto3" json:"curtitle"` // 默认称号 Curaframe string `protobuf:"bytes,49,opt,name=curaframe,proto3" json:"curaframe"` //默认头像框 + Consumeexp int32 `protobuf:"varint,50,opt,name=consumeexp,proto3" json:"consumeexp"` //消消乐赛季进度积分 Consumemoney int32 `protobuf:"varint,51,opt,name=consumemoney,proto3" json:"consumemoney"` //三消专属货币 Ban bool `protobuf:"varint,52,opt,name=ban,proto3" json:"ban"` // 封号标识 Prohibition int32 `protobuf:"varint,53,opt,name=prohibition,proto3" json:"prohibition"` // 禁言 @@ -528,6 +529,13 @@ func (x *DBUser) GetCuraframe() string { return "" } +func (x *DBUser) GetConsumeexp() int32 { + if x != nil { + return x.Consumeexp + } + return 0 +} + func (x *DBUser) GetConsumemoney() int32 { if x != nil { return x.Consumemoney @@ -896,7 +904,7 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x88, 0x0b, 0x0a, + 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xa8, 0x0b, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, @@ -971,6 +979,8 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x65, 0x18, 0x30, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x31, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x12, + 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x32, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x33, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x61, 0x6e, 0x18, 0x34, 0x20, 0x01, 0x28, 0x08, diff --git a/sys/configure/structs/Game.TDCard.go b/sys/configure/structs/Game.TDCard.go new file mode 100644 index 000000000..145c68bee --- /dev/null +++ b/sys/configure/structs/Game.TDCard.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameTDCard struct { + _dataMap map[int32]*GameTDCardData + _dataList []*GameTDCardData +} + +func NewGameTDCard(_buf []map[string]interface{}) (*GameTDCard, error) { + _dataList := make([]*GameTDCardData, 0, len(_buf)) + dataMap := make(map[int32]*GameTDCardData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameTDCardData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Eventid] = _v + } + } + return &GameTDCard{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameTDCard) GetDataMap() map[int32]*GameTDCardData { + return table._dataMap +} + +func (table *GameTDCard) GetDataList() []*GameTDCardData { + return table._dataList +} + +func (table *GameTDCard) Get(key int32) *GameTDCardData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.TDCardData.go b/sys/configure/structs/Game.TDCardData.go new file mode 100644 index 000000000..edc245081 --- /dev/null +++ b/sys/configure/structs/Game.TDCardData.go @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameTDCardData struct { + Eventid int32 + Type int32 + Preevent int32 + Andcondition []int32 + Must int32 + Maxnum int32 + Weight int32 +} + +const TypeId_GameTDCardData = 1719129286 + +func (*GameTDCardData) GetTypeId() int32 { + return 1719129286 +} + +func (_v *GameTDCardData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventid"].(float64); !_ok_ { err = errors.New("eventid error"); return }; _v.Eventid = int32(_tempNum_) } + { 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["preevent"].(float64); !_ok_ { err = errors.New("preevent error"); return }; _v.Preevent = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["andcondition"].([]interface{}); !_ok_ { err = errors.New("andcondition error"); return } + + _v.Andcondition = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Andcondition = append(_v.Andcondition, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["must"].(float64); !_ok_ { err = errors.New("must error"); return }; _v.Must = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxnum"].(float64); !_ok_ { err = errors.New("maxnum error"); return }; _v.Maxnum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } + return +} + +func DeserializeGameTDCardData(_buf map[string]interface{}) (*GameTDCardData, error) { + v := &GameTDCardData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.TDHeroData.go b/sys/configure/structs/Game.TDHeroData.go index 6403b5dae..0d835557a 100644 --- a/sys/configure/structs/Game.TDHeroData.go +++ b/sys/configure/structs/Game.TDHeroData.go @@ -24,7 +24,6 @@ type GameTDHeroData struct { Height float32 Hp int32 Atk int32 - AtkSpeed1 int32 AtkSpeed int32 AtkRange float32 } @@ -88,7 +87,6 @@ func (_v *GameTDHeroData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["height"].(float64); !_ok_ { err = errors.New("height error"); return }; _v.Height = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk_speed1"].(float64); !_ok_ { err = errors.New("atk_speed1 error"); return }; _v.AtkSpeed1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk_speed"].(float64); !_ok_ { err = errors.New("atk_speed error"); return }; _v.AtkSpeed = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk_range"].(float64); !_ok_ { err = errors.New("atk_range error"); return }; _v.AtkRange = float32(_tempNum_) } return diff --git a/sys/configure/structs/Game.TDMonsterAppear.go b/sys/configure/structs/Game.TDMonsterAppear.go index 1b573be96..e9c867436 100644 --- a/sys/configure/structs/Game.TDMonsterAppear.go +++ b/sys/configure/structs/Game.TDMonsterAppear.go @@ -21,7 +21,7 @@ func NewGameTDMonsterAppear(_buf []map[string]interface{}) (*GameTDMonsterAppear return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v + dataMap[_v.Subwave] = _v } } return &GameTDMonsterAppear{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/Game.TDMonsterAppearData.go b/sys/configure/structs/Game.TDMonsterAppearData.go index df9225ab1..252b6c96e 100644 --- a/sys/configure/structs/Game.TDMonsterAppearData.go +++ b/sys/configure/structs/Game.TDMonsterAppearData.go @@ -11,13 +11,19 @@ package cfg import "errors" type GameTDMonsterAppearData struct { - Id int32 - CopyId int32 - Num int32 - Time int32 - Count int32 - MonsterId int32 - HpMultiple int32 + Subwave int32 + Wave int32 + Monsternum int32 + Subwavetime int32 + Stagetype int32 + Stageid int32 + Monsterid int32 + Isboss int32 + Trigger int32 + Triggerval int32 + Subtriggerval int32 + Hpgrow float32 + Atkgrow float32 } const TypeId_GameTDMonsterAppearData = 44623341 @@ -27,13 +33,19 @@ func (*GameTDMonsterAppearData) GetTypeId() int32 { } func (_v *GameTDMonsterAppearData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["copy_id"].(float64); !_ok_ { err = errors.New("copy_id error"); return }; _v.CopyId = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count"].(float64); !_ok_ { err = errors.New("count error"); return }; _v.Count = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_id"].(float64); !_ok_ { err = errors.New("monster_id error"); return }; _v.MonsterId = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp_multiple"].(float64); !_ok_ { err = errors.New("hp_multiple error"); return }; _v.HpMultiple = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subwave"].(float64); !_ok_ { err = errors.New("subwave error"); return }; _v.Subwave = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["wave"].(float64); !_ok_ { err = errors.New("wave error"); return }; _v.Wave = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monsternum"].(float64); !_ok_ { err = errors.New("monsternum error"); return }; _v.Monsternum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subwavetime"].(float64); !_ok_ { err = errors.New("subwavetime error"); return }; _v.Subwavetime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stagetype"].(float64); !_ok_ { err = errors.New("stagetype error"); return }; _v.Stagetype = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stageid"].(float64); !_ok_ { err = errors.New("stageid error"); return }; _v.Stageid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monsterid"].(float64); !_ok_ { err = errors.New("monsterid error"); return }; _v.Monsterid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isboss"].(float64); !_ok_ { err = errors.New("isboss error"); return }; _v.Isboss = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger"].(float64); !_ok_ { err = errors.New("trigger error"); return }; _v.Trigger = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["triggerval"].(float64); !_ok_ { err = errors.New("triggerval error"); return }; _v.Triggerval = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subtriggerval"].(float64); !_ok_ { err = errors.New("subtriggerval error"); return }; _v.Subtriggerval = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hpgrow"].(float64); !_ok_ { err = errors.New("hpgrow error"); return }; _v.Hpgrow = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atkgrow"].(float64); !_ok_ { err = errors.New("atkgrow error"); return }; _v.Atkgrow = float32(_tempNum_) } return } diff --git a/sys/configure/structs/Story.EStoryClickType.go b/sys/configure/structs/Story.EStoryClickType.go new file mode 100644 index 000000000..827c9fb66 --- /dev/null +++ b/sys/configure/structs/Story.EStoryClickType.go @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + StoryEStoryClickType_ClickNext = 0 + StoryEStoryClickType_LongPress = 1 + StoryEStoryClickType_ClickNextUI = 2 +) diff --git a/sys/configure/structs/TD.EAppearTriggerType.go b/sys/configure/structs/TD.EAppearTriggerType.go new file mode 100644 index 000000000..e38e99a24 --- /dev/null +++ b/sys/configure/structs/TD.EAppearTriggerType.go @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TDEAppearTriggerType_GameStart = 0 + TDEAppearTriggerType_WaveEnd = 1 + TDEAppearTriggerType_SubWaveEnd = 2 + TDEAppearTriggerType_SubWaveProEnd = 3 +) diff --git a/sys/configure/structs/TD.ECardEventType.go b/sys/configure/structs/TD.ECardEventType.go new file mode 100644 index 000000000..51361f8f8 --- /dev/null +++ b/sys/configure/structs/TD.ECardEventType.go @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TDECardEventType_None = 0 + TDECardEventType_HeroLvUp = 1 + TDECardEventType_Equip = 2 + TDECardEventType_EquipUp = 3 + TDECardEventType_AwakeSkill = 4 +) diff --git a/sys/configure/structs/TEnum.EArenaOpenType.go b/sys/configure/structs/TEnum.EArenaOpenType.go new file mode 100644 index 000000000..bf5eb4835 --- /dev/null +++ b/sys/configure/structs/TEnum.EArenaOpenType.go @@ -0,0 +1,13 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEArenaOpenType_Lv = 0 +) diff --git a/sys/configure/structs/TEnum.EAskLibraryType.go b/sys/configure/structs/TEnum.EAskLibraryType.go new file mode 100644 index 000000000..92047a828 --- /dev/null +++ b/sys/configure/structs/TEnum.EAskLibraryType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEAskLibraryType_Radio = 1 + TEnumEAskLibraryType_Multiple = 2 +) diff --git a/sys/configure/structs/TEnum.EBubbleType.go b/sys/configure/structs/TEnum.EBubbleType.go new file mode 100644 index 000000000..c133bfed8 --- /dev/null +++ b/sys/configure/structs/TEnum.EBubbleType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEBubbleType_NPC = 1 + TEnumEBubbleType_UI = 2 +) diff --git a/sys/configure/structs/TEnum.EChapterGameType.go b/sys/configure/structs/TEnum.EChapterGameType.go new file mode 100644 index 000000000..4c3b9e8c9 --- /dev/null +++ b/sys/configure/structs/TEnum.EChapterGameType.go @@ -0,0 +1,19 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEChapterGameType_FlyPark = 0 + TEnumEChapterGameType_Dragon = 1 + TEnumEChapterGameType_Stonehenge = 2 + TEnumEChapterGameType_Catchbug = 3 + TEnumEChapterGameType_Monkey = 4 + TEnumEChapterGameType_Donkey = 5 + TEnumEChapterGameType_TD = 6 +) diff --git a/sys/configure/structs/TEnum.EChatDataType.go b/sys/configure/structs/TEnum.EChatDataType.go new file mode 100644 index 000000000..5fe219be4 --- /dev/null +++ b/sys/configure/structs/TEnum.EChatDataType.go @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEChatDataType_Null = 0 + TEnumEChatDataType_One = 1 + TEnumEChatDataType_Two = 3 + TEnumEChatDataType_Three = 4 +) diff --git a/sys/configure/structs/TEnum.ECirculateType.go b/sys/configure/structs/TEnum.ECirculateType.go new file mode 100644 index 000000000..e3c81009b --- /dev/null +++ b/sys/configure/structs/TEnum.ECirculateType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumECirculateType_Circulating = 1 + TEnumECirculateType_Camp = 2 +) diff --git a/sys/configure/structs/TEnum.EColor.go b/sys/configure/structs/TEnum.EColor.go new file mode 100644 index 000000000..edb5cdf91 --- /dev/null +++ b/sys/configure/structs/TEnum.EColor.go @@ -0,0 +1,19 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEColor_None = 0 + TEnumEColor_Green = 1 + TEnumEColor_Blue = 2 + TEnumEColor_Purple = 3 + TEnumEColor_Orange = 4 + TEnumEColor_Red = 5 + TEnumEColor_Color = 6 +) diff --git a/sys/configure/structs/TEnum.ECombatMansterType.go b/sys/configure/structs/TEnum.ECombatMansterType.go new file mode 100644 index 000000000..f2fbf5841 --- /dev/null +++ b/sys/configure/structs/TEnum.ECombatMansterType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumECombatMansterType_Hostile = 1 + TEnumECombatMansterType_Neutrality = 2 +) diff --git a/sys/configure/structs/TEnum.EDrawcardPoolType.go b/sys/configure/structs/TEnum.EDrawcardPoolType.go new file mode 100644 index 000000000..6fcd670de --- /dev/null +++ b/sys/configure/structs/TEnum.EDrawcardPoolType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEDrawcardPoolType_Hostile = 1 + TEnumEDrawcardPoolType_Neutrality = 2 +) diff --git a/sys/configure/structs/TEnum.EEquipPos.go b/sys/configure/structs/TEnum.EEquipPos.go new file mode 100644 index 000000000..3b93b08e2 --- /dev/null +++ b/sys/configure/structs/TEnum.EEquipPos.go @@ -0,0 +1,22 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEEquipPos_None = -1 + TEnumEEquipPos_Zero = 0 + TEnumEEquipPos_One = 1 + TEnumEEquipPos_Two = 2 + TEnumEEquipPos_Three = 3 + TEnumEEquipPos_Four = 4 + TEnumEEquipPos_Five = 5 + TEnumEEquipPos_Six = 6 + TEnumEEquipPos_Seven = 7 + TEnumEEquipPos_Eight = 8 +) diff --git a/sys/configure/structs/TEnum.EEquipType.go b/sys/configure/structs/TEnum.EEquipType.go new file mode 100644 index 000000000..7c77fdb7c --- /dev/null +++ b/sys/configure/structs/TEnum.EEquipType.go @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEEquipType_Ordinary = 1 + TEnumEEquipType_Weapon = 2 + TEnumEEquipType_Artifact = 3 +) diff --git a/sys/configure/structs/TEnum.EEventType.go b/sys/configure/structs/TEnum.EEventType.go new file mode 100644 index 000000000..0f56c4281 --- /dev/null +++ b/sys/configure/structs/TEnum.EEventType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEEventType_Disposable = 0 + TEnumEEventType_Recycling = 1 +) diff --git a/sys/configure/structs/TEnum.EFmType.go b/sys/configure/structs/TEnum.EFmType.go new file mode 100644 index 000000000..ce9f6302e --- /dev/null +++ b/sys/configure/structs/TEnum.EFmType.go @@ -0,0 +1,19 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEFmType_Collision = 1 + TEnumEFmType_Dodge = 2 + TEnumEFmType_Success = 3 + TEnumEFmType_Fail = 4 + TEnumEFmType_Sprint = 5 + TEnumEFmType_Death = 6 + TEnumEFmType_Cast = 7 +) diff --git a/sys/configure/structs/TEnum.EMatchType.go b/sys/configure/structs/TEnum.EMatchType.go new file mode 100644 index 000000000..2a9a2a370 --- /dev/null +++ b/sys/configure/structs/TEnum.EMatchType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEMatchType_Convention = 1 + TEnumEMatchType_Rank = 2 +) diff --git a/sys/configure/structs/TEnum.EMountType.go b/sys/configure/structs/TEnum.EMountType.go new file mode 100644 index 000000000..e340a5bd1 --- /dev/null +++ b/sys/configure/structs/TEnum.EMountType.go @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumEMountType_Eggs = 1 + TEnumEMountType_Young = 2 + TEnumEMountType_Accomplish = 3 +) diff --git a/sys/configure/structs/TEnum.ENewSpaperType.go b/sys/configure/structs/TEnum.ENewSpaperType.go new file mode 100644 index 000000000..cab4af4bb --- /dev/null +++ b/sys/configure/structs/TEnum.ENewSpaperType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumENewSpaperType_Text = 1 + TEnumENewSpaperType_Picture = 2 +) diff --git a/sys/configure/structs/TEnum.ETaskQuality.go b/sys/configure/structs/TEnum.ETaskQuality.go new file mode 100644 index 000000000..23b523fe0 --- /dev/null +++ b/sys/configure/structs/TEnum.ETaskQuality.go @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumETaskQuality_Simple = 0 + TEnumETaskQuality_Ordinary = 1 + TEnumETaskQuality_Difficulty = 2 +) diff --git a/sys/configure/structs/TEnum.ETrackMoveType.go b/sys/configure/structs/TEnum.ETrackMoveType.go new file mode 100644 index 000000000..eba4ca60f --- /dev/null +++ b/sys/configure/structs/TEnum.ETrackMoveType.go @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumETrackMoveType_Accelerate = 0 + TEnumETrackMoveType_Moderate = 1 + TEnumETrackMoveType_Restore = 2 + TEnumETrackMoveType_ContinuousAccelerate = 3 + TEnumETrackMoveType_ContinuousModerate = 4 +) diff --git a/sys/configure/structs/TEnum.ETrackType.go b/sys/configure/structs/TEnum.ETrackType.go new file mode 100644 index 000000000..cbf5a4134 --- /dev/null +++ b/sys/configure/structs/TEnum.ETrackType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TEnumETrackType_Normal = 1 + TEnumETrackType_Guide = 2 +) diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index c7d481626..8ce298cec 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -296,6 +296,7 @@ type Tables struct { TDHero *GameTDHero TDHeroGrowup *GameTDHeroGrowup TDBuff *GameTDBuff + TDCard *GameTDCard PuggsyIsLand *GamePuggsyIsLand PuggsyEvent *GamePuggsyEvent PuggsyFight *GamePuggsyFight @@ -2043,6 +2044,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.TDBuff, err = NewGameTDBuff(buf) ; err != nil { return nil, err } + if buf, err = loader("game_tdcard") ; err != nil { + return nil, err + } + if tables.TDCard, err = NewGameTDCard(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_puggsyisland") ; err != nil { return nil, err }