diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 0a17ddfee..baa0e6b8c 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -7,6 +7,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -14,6 +17,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -26,6 +30,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -33,6 +40,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -45,6 +53,9 @@ "battleScenes": [ "scenesfight_05_01" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -52,6 +63,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -64,6 +76,9 @@ "battleScenes": [ "scenesfight_06" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -71,6 +86,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -83,6 +99,9 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -90,6 +109,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -102,6 +122,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -109,6 +132,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -121,6 +145,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -128,6 +155,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -140,6 +168,9 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -147,6 +178,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -159,6 +191,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -166,6 +201,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -178,6 +214,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -185,6 +224,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -197,6 +237,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -204,6 +247,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -216,6 +260,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -223,6 +270,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -235,6 +283,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -242,6 +293,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 10 @@ -254,6 +306,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -261,6 +316,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -273,6 +329,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -280,6 +339,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -292,6 +352,9 @@ "battleScenes": [ "scenesfight_06" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -299,6 +362,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -311,6 +375,9 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -318,6 +385,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -330,6 +398,9 @@ "battleScenes": [ "scenesfight_06" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -337,6 +408,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 @@ -349,6 +421,9 @@ "battleScenes": [ "scenesfight_05_01" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -356,6 +431,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -368,6 +444,9 @@ "battleScenes": [ "scenesfight_03_02" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -375,6 +454,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -387,6 +467,9 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -394,6 +477,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -406,6 +490,9 @@ "battleScenes": [ "bossfight_naturetitan_01" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -413,6 +500,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 @@ -425,6 +513,9 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -432,6 +523,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -444,6 +536,9 @@ "battleScenes": [ "bossfight_chef_01" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -451,6 +546,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -463,6 +559,9 @@ "battleScenes": [ "bossfight_spinymandrilla_03" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 1, "ChoseCamp": [], "DisableCamp": [], @@ -470,6 +569,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -482,6 +582,9 @@ "battleScenes": [ "bossfight_translate_01" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 1, "ChoseCamp": [], "DisableCamp": [], @@ -489,6 +592,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -501,6 +605,9 @@ "battleScenes": [ "scenesfight_08" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -508,6 +615,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -520,6 +628,9 @@ "battleScenes": [ "scenesfight_08" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -527,6 +638,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -539,6 +651,9 @@ "battleScenes": [ "bossfight_dragon_01" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 1, "ChoseCamp": [], "DisableCamp": [], @@ -546,6 +661,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -558,6 +674,9 @@ "battleScenes": [ "scenesfight_06" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -565,6 +684,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 @@ -577,6 +697,9 @@ "battleScenes": [ "scenesfight_06" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [ 1 @@ -586,6 +709,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 @@ -598,6 +722,9 @@ "battleScenes": [ "scenesfight_06" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [ 2 @@ -607,6 +734,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 @@ -619,6 +747,9 @@ "battleScenes": [ "scenesfight_06" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [ 3 @@ -628,6 +759,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 @@ -640,6 +772,9 @@ "battleScenes": [ "bossfight_naturetitan_02" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -647,6 +782,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -659,6 +795,9 @@ "battleScenes": [ "bossfight_naturetitan_03" ], + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -666,6 +805,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 @@ -678,6 +818,11 @@ "battleScenes": [ "scenesfight_07" ], + "ShowBuff": 1, + "battleEvents": [ + 14 + ], + "ScoreGroupID": 0, "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], @@ -685,6 +830,7 @@ "ChoseHero": [], "DisableHero": [], "LockSlots": [], + "HeroCheck": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 50 diff --git a/bin/json/game_battlescore.json b/bin/json/game_battlescore.json new file mode 100644 index 000000000..888f440a1 --- /dev/null +++ b/bin/json/game_battlescore.json @@ -0,0 +1,112 @@ +[ + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_1", + "text": "sss" + }, + "rank_low": 0, + "rank_up": 1500000, + "grade": "gh_img_a", + "score": 1 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_2", + "text": "ss" + }, + "rank_low": 1500001, + "rank_up": 3000000, + "grade": "gh_img_b", + "score": 2 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_3", + "text": "s" + }, + "rank_low": 3000001, + "rank_up": 4500000, + "grade": "gh_img_c", + "score": 3 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_4", + "text": "s" + }, + "rank_low": 4500001, + "rank_up": 6000000, + "grade": "gh_img_d", + "score": 4 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_5", + "text": "s" + }, + "rank_low": 6000001, + "rank_up": 9000000, + "grade": "gh_img_e", + "score": 5 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_6", + "text": "s" + }, + "rank_low": 9000001, + "rank_up": 12000000, + "grade": "gh_img_ex3", + "score": 6 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_7", + "text": "s" + }, + "rank_low": 12000001, + "rank_up": 15000000, + "grade": "gh_img_s", + "score": 7 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_8", + "text": "s" + }, + "rank_low": 15000001, + "rank_up": 18000000, + "grade": "gh_img_ss", + "score": 8 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_9", + "text": "s" + }, + "rank_low": 18000001, + "rank_up": 21000000, + "grade": "gh_img_sss", + "score": 9 + }, + { + "id": 1, + "score_name": { + "key": "guild_guild_boss_score_name_10", + "text": "s" + }, + "rank_low": 21000001, + "rank_up": -1, + "grade": "gh_img_sss1", + "score": 10 + } +] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 89059eff3..11d46ee27 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -20808,7 +20808,7 @@ "NPC": 10104, "value": 1, "filter": [ - 1100103 + 1100104 ], "filter2": [ "关卡ID", @@ -20866,7 +20866,7 @@ "NPC": 10124, "value": 1, "filter": [ - 1100107 + 1100113 ], "filter2": [ "关卡ID", @@ -21010,7 +21010,7 @@ "NPC": 10174, "value": 1, "filter": [ - 1100108 + 1100115 ], "filter2": [ "关卡ID", diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json index 62b3a81fb..aad44b3f6 100644 --- a/bin/json/game_cardpool.json +++ b/bin/json/game_cardpool.json @@ -2,13 +2,13 @@ { "key": 1, "card_pool_type": "inevitable_20001", - "id": "13002", + "id": "13005", "weight": 1000 }, { "key": 2, "card_pool_type": "inevitable_20010", - "id": "15003", + "id": "35001", "weight": 1000 }, { diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json index 6bbcb4c50..2d609b7fd 100644 --- a/bin/json/game_gamesummary.json +++ b/bin/json/game_gamesummary.json @@ -340,7 +340,7 @@ "id": 10, "name": { "key": "gamesummary_node_name_10", - "text": "经验副本" + "text": "梦境回廊" }, "tabId": 5, "mapPos": { @@ -352,7 +352,7 @@ "jumpId": 10013, "introduce": { "key": "gamesummary_node_introdunce_10", - "text": "经验副本" + "text": "梦境回廊" }, "bg": "hkz_wftj_jyfb", "icon": "wjyz_img011", @@ -518,7 +518,7 @@ "id": 16, "name": { "key": "gamesummary_node_name_16", - "text": "迷宫玩法" + "text": "石阵秘境" }, "tabId": 11, "mapPos": { diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index 5b1c1ee37..eb9caf047 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -17,7 +17,7 @@ "layer": 1, "name": { "key": "gamesummary_fathernode_name_2", - "text": "主线探险" + "text": "冒险关卡" }, "mapPos": { "x": -100, @@ -43,7 +43,7 @@ "layer": 1, "name": { "key": "gamesummary_fathernode_name_4", - "text": "狩猎副本" + "text": "狩猎挑战" }, "mapPos": { "x": 0, @@ -56,7 +56,7 @@ "layer": 1, "name": { "key": "gamesummary_fathernode_name_5", - "text": "经验副本" + "text": "梦境回廊" }, "mapPos": { "x": -2000, @@ -95,7 +95,7 @@ "layer": 1, "name": { "key": "gamesummary_fathernode_name_8", - "text": "循环塔" + "text": "功夫大师循环塔" }, "mapPos": { "x": -2000, @@ -108,7 +108,7 @@ "layer": 1, "name": { "key": "gamesummary_fathernode_name_9", - "text": "阵营塔" + "text": "功夫大师阵营塔" }, "mapPos": { "x": -2000, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index c2f40ed11..190350850 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -789,6 +789,16 @@ "t": "gold", "n": 1000 } + ], + "compass_distansces": [ + 4, + 40, + 80 + ], + "compass_angle_offsets": [ + 10, + 30, + 50 ] } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 9af82ac02..6820efeb8 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -10139,6 +10139,154 @@ ], "expitemnum": 7 }, + { + "hid": "54015", + "name": { + "key": "hero_main_name_137", + "text": "伪装老太太" + }, + "star": 3, + "color": 2, + "race": 4, + "job": 1, + "type": 2, + "ip": 1, + "sd": 1, + "handbook": -1, + "prefab": "54015", + "rotation": "0|0|0", + "revolve": 0, + "icon": "54015", + "vocal": "54015", + "tujing": [ + 107 + ], + "detailwindow": "effect_chezhan", + "intr": { + "key": "", + "text": "" + }, + "events": "hero_54005", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": -0.69, + "z": 0 + }, + "capskillrule": 101, + "skill": 0, + "skill1": 0, + "skill2": 0, + "skill3": 0, + "txt": { + "key": "atlas_54015", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0, + "equiprcom": [ + 1, + 2, + 10 + ], + "angle": 0, + "deviation": 0, + "show": 2, + "herofrag": [ + { + "a": "item", + "t": "12025001", + "n": 1 + } + ], + "herofragnum": 6, + "heroskillup": [ + "10000004" + ], + "expitem": [ + { + "a": "item", + "t": "10000011", + "n": 1 + } + ], + "expitemnum": 7 + }, + { + "hid": "54016", + "name": { + "key": "hero_main_name_137", + "text": "黑袍人" + }, + "star": 3, + "color": 2, + "race": 4, + "job": 1, + "type": 2, + "ip": 1, + "sd": 1, + "handbook": -1, + "prefab": "54016", + "rotation": "0|0|0", + "revolve": 0, + "icon": "54016", + "vocal": "54016", + "tujing": [ + 107 + ], + "detailwindow": "effect_chezhan", + "intr": { + "key": "", + "text": "" + }, + "events": "hero_54005", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": -0.69, + "z": 0 + }, + "capskillrule": 101, + "skill": 0, + "skill1": 0, + "skill2": 0, + "skill3": 0, + "txt": { + "key": "atlas_54016", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0, + "equiprcom": [ + 1, + 2, + 10 + ], + "angle": 0, + "deviation": 0, + "show": 2, + "herofrag": [ + { + "a": "item", + "t": "12025001", + "n": 1 + } + ], + "herofragnum": 6, + "heroskillup": [ + "10000004" + ], + "expitem": [ + { + "a": "item", + "t": "10000011", + "n": 1 + } + ], + "expitemnum": 7 + }, { "hid": "51050", "name": { diff --git a/bin/json/game_herolevelgrow.json b/bin/json/game_herolevelgrow.json index 30537f6fb..2fd15dd6d 100644 --- a/bin/json/game_herolevelgrow.json +++ b/bin/json/game_herolevelgrow.json @@ -2859,6 +2859,50 @@ "defgrow": 1250, "speedgrow": 0 }, + { + "id": "54015", + "hp": 0, + "atk": 0, + "def": 0, + "speed": 183, + "cri": 100, + "cridam": 1500, + "effhit": 0, + "effre": 200, + "losthold": 0, + "understand": 0, + "damre": 0, + "causedam": 0, + "treadd": 0, + "betreadd": 0, + "suckblood": 0, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, + "speedgrow": 0 + }, + { + "id": "54016", + "hp": 0, + "atk": 0, + "def": 0, + "speed": 183, + "cri": 100, + "cridam": 1500, + "effhit": 0, + "effre": 200, + "losthold": 0, + "understand": 0, + "damre": 0, + "causedam": 0, + "treadd": 0, + "betreadd": 0, + "suckblood": 0, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, + "speedgrow": 0 + }, { "id": "51050", "hp": 0, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index d3d8a5ccd..9541de95b 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -9,12 +9,8 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, - "ventureavatar": [ - "Person/44004/44004_exhibition.prefab", - "Person/34004/34004_exhibition.prefab", - "Person/13005/13005_exhibition.prefab" - ], + "venturetype": 0, + "ventureavatar": [], "herocolor": 1, "heroimg": "zxgq_js_34004", "bubbletext": { @@ -119,9 +115,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/45003/45003_exhibition.prefab" ], "herocolor": 1, "heroimg": "attr_diamond", @@ -227,9 +223,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/45003/45003_exhibition.prefab" ], "herocolor": 1, "heroimg": "attr_diamond", @@ -335,9 +331,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/45003/45003_exhibition.prefab" ], "herocolor": 1, "heroimg": "zxgq_js_33001", @@ -350,7 +346,7 @@ "destroy": 1, "progress": 1, "frontstoryid": 10243, - "afterstoryid": 10250, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -401,9 +397,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/45003/45003_exhibition.prefab" ], "herocolor": 1, "heroimg": "attr_diamond", @@ -467,9 +463,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/45003/45003_exhibition.prefab" ], "herocolor": 1, "heroimg": "zxgq_js_51004", @@ -481,8 +477,8 @@ "hide": 0, "destroy": 1, "progress": 1, - "frontstoryid": 10251, - "afterstoryid": 10252, + "frontstoryid": 10250, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -569,9 +565,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "zxgq_js_13002", @@ -677,9 +673,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "zxgq_js_44005", @@ -691,8 +687,8 @@ "hide": 0, "destroy": 1, "progress": 1, - "frontstoryid": 10255, - "afterstoryid": 10256, + "frontstoryid": 10256, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -780,9 +776,9 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/34004/34004_exhibition.prefab", + "Person/44005/44005_exhibition.prefab", + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "attr_diamond", @@ -840,9 +836,7 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "zxgq_js_44005", @@ -948,9 +942,7 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "attr_diamond", @@ -1014,9 +1006,7 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "attr_gold", @@ -1074,9 +1064,7 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "zxgq_js_13002", @@ -1140,9 +1128,7 @@ "venturemodel": "", "venturetype": 1, "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" + "Person/13002/13002_exhibition.prefab" ], "herocolor": 1, "heroimg": "zxgq_js_55002", @@ -1154,7 +1140,7 @@ "hide": 0, "destroy": 1, "progress": 1, - "frontstoryid": 0, + "frontstoryid": 10321, "afterstoryid": 0, "maingroupName": { "key": "", @@ -1246,12 +1232,8 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, - "ventureavatar": [ - "Person/15004/15004_exhibition.prefab", - "Person/15002/15002_exhibition.prefab", - "Person/15003/15003_exhibition.prefab" - ], + "venturetype": 0, + "ventureavatar": [], "herocolor": 1, "heroimg": "attr_diamond", "bubbletext": { @@ -1336,7 +1318,7 @@ }, "title": { "key": "mainchapter_main_stage_title_16", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_16", @@ -1440,7 +1422,7 @@ }, "title": { "key": "mainchapter_main_stage_title_17", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_17", @@ -1544,7 +1526,7 @@ }, "title": { "key": "mainchapter_main_stage_title_18", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_18", @@ -1648,7 +1630,7 @@ }, "title": { "key": "mainchapter_main_stage_title_19", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_19", @@ -1752,7 +1734,7 @@ }, "title": { "key": "mainchapter_main_stage_title_20", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_20", @@ -1856,7 +1838,7 @@ }, "title": { "key": "mainchapter_main_stage_title_21", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_21", @@ -1960,7 +1942,7 @@ }, "title": { "key": "mainchapter_main_stage_title_22", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_22", @@ -2064,7 +2046,7 @@ }, "title": { "key": "mainchapter_main_stage_title_23", - "text": "精英关卡" + "text": "食物争夺战" }, "desc": { "key": "mainchapter_main_stage_desc_23", @@ -2168,7 +2150,7 @@ }, "title": { "key": "mainchapter_main_stage_title_24", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_24", @@ -2272,7 +2254,7 @@ }, "title": { "key": "mainchapter_main_stage_title_25", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_25", @@ -2376,7 +2358,7 @@ }, "title": { "key": "mainchapter_main_stage_title_26", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_26", @@ -2480,7 +2462,7 @@ }, "title": { "key": "mainchapter_main_stage_title_27", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_27", @@ -2584,7 +2566,7 @@ }, "title": { "key": "mainchapter_main_stage_title_28", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_28", @@ -2688,7 +2670,7 @@ }, "title": { "key": "mainchapter_main_stage_title_29", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_29", @@ -2792,7 +2774,7 @@ }, "title": { "key": "mainchapter_main_stage_title_30", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_30", @@ -2896,7 +2878,7 @@ }, "title": { "key": "mainchapter_main_stage_title_31", - "text": "困难关卡" + "text": "洞穴危机，潜藏在黑暗中的猎人" }, "desc": { "key": "mainchapter_main_stage_desc_31", @@ -3000,7 +2982,7 @@ }, "title": { "key": "mainchapter_main_stage_title_32", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_32", @@ -3104,7 +3086,7 @@ }, "title": { "key": "mainchapter_main_stage_title_33", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_33", @@ -3208,7 +3190,7 @@ }, "title": { "key": "mainchapter_main_stage_title_34", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_34", @@ -3312,7 +3294,7 @@ }, "title": { "key": "mainchapter_main_stage_title_35", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_35", @@ -3416,7 +3398,7 @@ }, "title": { "key": "mainchapter_main_stage_title_36", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_36", @@ -3520,7 +3502,7 @@ }, "title": { "key": "mainchapter_main_stage_title_37", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_37", @@ -3624,7 +3606,7 @@ }, "title": { "key": "mainchapter_main_stage_title_38", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_38", @@ -3728,7 +3710,7 @@ }, "title": { "key": "mainchapter_main_stage_title_39", - "text": "地狱关卡" + "text": "巨怪猩猩的复仇" }, "desc": { "key": "mainchapter_main_stage_desc_39", @@ -3808,10 +3790,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51004", "bubbletext": { "key": "main_stage_bubbletext_40", "text": "测试节点1" @@ -3912,10 +3894,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_10000005", "bubbletext": { "key": "main_stage_bubbletext_41", "text": "测试节点2" @@ -3975,10 +3957,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_10000006", "bubbletext": { "key": "main_stage_bubbletext_42", "text": "测试节点3" @@ -4037,10 +4019,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_10000013", "bubbletext": { "key": "main_stage_bubbletext_43", "text": "测试节点4" @@ -4099,10 +4081,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_10000001", "bubbletext": { "key": "main_stage_bubbletext_44", "text": "测试节点5" @@ -4161,10 +4143,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_10000001", "bubbletext": { "key": "main_stage_bubbletext_45", "text": "测试节点6" @@ -4225,10 +4207,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "ty_icon_buff_wfxd", "bubbletext": { "key": "main_stage_bubbletext_46", "text": "测试节点7" @@ -4283,10 +4265,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "gh_icon_ssx", "bubbletext": { "key": "main_stage_bubbletext_47", "text": "测试节点8" @@ -4341,10 +4323,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_10000001", "bubbletext": { "key": "main_stage_bubbletext_48", "text": "测试节点9" @@ -4375,7 +4357,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 10 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -4399,10 +4387,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "gh_icon_ssx", "bubbletext": { "key": "main_stage_bubbletext_49", "text": "测试节点10" @@ -4457,10 +4445,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51004", "bubbletext": { "key": "main_stage_bubbletext_50", "text": "测试节点11" @@ -4472,8 +4460,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_27", + "text": "测试战斗组1" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_50", @@ -4563,10 +4551,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51005", "bubbletext": { "key": "main_stage_bubbletext_51", "text": "测试节点12" @@ -4578,8 +4566,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_28", + "text": "测试战斗组2" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_51", @@ -4669,10 +4657,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51006", "bubbletext": { "key": "main_stage_bubbletext_52", "text": "测试节点13" @@ -4684,8 +4672,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_29", + "text": "测试战斗组3" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_52", @@ -4775,10 +4763,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51007", "bubbletext": { "key": "main_stage_bubbletext_53", "text": "测试节点14" @@ -4790,8 +4778,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_30", + "text": "测试战斗组4" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_53", @@ -4881,10 +4869,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51008", "bubbletext": { "key": "main_stage_bubbletext_54", "text": "测试节点15" @@ -4896,8 +4884,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_31", + "text": "测试战斗组5" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_54", @@ -4987,10 +4975,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51009", "bubbletext": { "key": "main_stage_bubbletext_55", "text": "测试节点16" @@ -5002,8 +4990,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_32", + "text": "测试战斗组6" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_55", @@ -5093,10 +5081,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51010", "bubbletext": { "key": "main_stage_bubbletext_56", "text": "测试节点17" @@ -5108,8 +5096,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_33", + "text": "测试战斗组7" }, "mainlineName": { "key": "mainchapter_main_stage_mainlineName_56", @@ -5199,10 +5187,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13001001", "bubbletext": { "key": "main_stage_bubbletext_57", "text": "测试节点18" @@ -5263,10 +5251,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13001002", "bubbletext": { "key": "main_stage_bubbletext_58", "text": "测试节点19" @@ -5327,10 +5315,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13001003", "bubbletext": { "key": "main_stage_bubbletext_59", "text": "测试节点20" @@ -5391,10 +5379,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13001004", "bubbletext": { "key": "main_stage_bubbletext_60", "text": "测试节点21" @@ -5455,10 +5443,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13002001", "bubbletext": { "key": "main_stage_bubbletext_61", "text": "测试节点22" @@ -5519,10 +5507,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13002002", "bubbletext": { "key": "main_stage_bubbletext_62", "text": "测试节点23" @@ -5583,10 +5571,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13002003", "bubbletext": { "key": "main_stage_bubbletext_63", "text": "测试节点24" @@ -5647,10 +5635,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13002004", "bubbletext": { "key": "main_stage_bubbletext_64", "text": "测试节点25" @@ -5711,10 +5699,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13003001", "bubbletext": { "key": "main_stage_bubbletext_65", "text": "测试节点26" @@ -5775,10 +5763,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13003002", "bubbletext": { "key": "main_stage_bubbletext_66", "text": "测试节点27" @@ -5839,10 +5827,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13003003", "bubbletext": { "key": "main_stage_bubbletext_67", "text": "测试节点28" @@ -5903,10 +5891,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "ty_icon_buff_wfxd", "bubbletext": { "key": "main_stage_bubbletext_68", "text": "测试节点29" @@ -5961,10 +5949,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_js_51004", "bubbletext": { "key": "main_stage_bubbletext_69", "text": "测试节点30" @@ -6067,10 +6055,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "gh_icon_ssx", "bubbletext": { "key": "main_stage_bubbletext_70", "text": "测试节点31" @@ -6125,10 +6113,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13003004", "bubbletext": { "key": "main_stage_bubbletext_71", "text": "测试节点32" @@ -6189,10 +6177,10 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "item_13001001", "bubbletext": { "key": "main_stage_bubbletext_72", "text": "测试节点33" @@ -6253,7 +6241,7 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, + "venturetype": 0, "ventureavatar": [], "herocolor": 0, "heroimg": "", diff --git a/bin/json/game_stonebattle.json b/bin/json/game_stonebattle.json index 03b89aa52..5eac53b49 100644 --- a/bin/json/game_stonebattle.json +++ b/bin/json/game_stonebattle.json @@ -11,7 +11,7 @@ "FormatList": [ 101011 ], - "RewardLottery": 0 + "RewardLottery": 21141101 }, { "BattleStageId": 110102, @@ -25,7 +25,7 @@ "FormatList": [ 101012 ], - "RewardLottery": 0 + "RewardLottery": 21141101 }, { "BattleStageId": 110103, @@ -39,7 +39,7 @@ "FormatList": [ 101013 ], - "RewardLottery": 0 + "RewardLottery": 21141101 }, { "BattleStageId": 110104, @@ -53,7 +53,7 @@ "FormatList": [ 101021 ], - "RewardLottery": 0 + "RewardLottery": 21141101 }, { "BattleStageId": 110105, @@ -65,9 +65,9 @@ "EffreValue": 0, "BattleReadyID": 118, "FormatList": [ - 101022 + 101051 ], - "RewardLottery": 0 + "RewardLottery": 21141101 }, { "BattleStageId": 110501, @@ -79,8 +79,8 @@ "EffreValue": 0, "BattleReadyID": 118, "FormatList": [ - 101022 + 101061 ], - "RewardLottery": 0 + "RewardLottery": 21141101 } ] \ No newline at end of file diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json index 8e16779b4..bbc7e6366 100644 --- a/bin/json/game_stoneevent.json +++ b/bin/json/game_stoneevent.json @@ -12,8 +12,8 @@ "Value3": 0, "Value4": 0, "CostItem": [], - "PostEvent": 0, - "probability": 0 + "PostEvent": 25100001, + "probability": 1000 }, { "EventId": 14110101, diff --git a/bin/json/game_stoneroom.json b/bin/json/game_stoneroom.json index 5c09515be..8fef3ee31 100644 --- a/bin/json/game_stoneroom.json +++ b/bin/json/game_stoneroom.json @@ -132,7 +132,7 @@ "text": "结算" }, "SceneName": "", - "PortalName": "", + "PortalName": "portal_1", "EventrewardGroup": 0, "EventBattleGroup": 0, "EventStoryNpcGroup": 0, diff --git a/comm/imodule.go b/comm/imodule.go index 6950ce075..172d9ae3e 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -319,6 +319,8 @@ type ( ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorData) //校验战报 CheckBattleReport(session IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool) + ///创建石阵秘境战斗 + CreateStoneBattle(session IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) } IGm interface { CreateCmd(session IUserSession, cmd string) (errdata *pb.ErrorData) diff --git a/modules/battle/module.go b/modules/battle/module.go index a04c8552c..5bbaeb01e 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -470,3 +470,55 @@ func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.Batt return nil, false } } + +// 创建石阵秘境战斗 +func (this *Battle) CreateStoneBattle(session comm.IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { + var ( + conn *db.DBConn + err error + ) + if !this.IsCross() { + conn, err = db.Local() + } else { + conn, err = db.ServerDBConn(session.GetServiecTag()) + } + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + this.Errorf("session:%v err:", session, err) + return + } + if req.Format == nil || req.Format.Format == nil || len(req.Format.Format) != 5 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + if req.Format.Friendformat != nil && len(req.Format.Friendformat) != 5 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + var flag bool + for _, v := range req.Format.Friendformat { + if v != "" { + flag = true + // this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1) + go this.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype108, 1)) + break + } + } + + if record, errdata = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req); errdata != nil { + return + } + if flag { + go this.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype12, 1)) + } + return +} diff --git a/modules/stonehenge/api_challenge.go b/modules/stonehenge/api_challenge.go index b57e1a6c1..ee0f70a65 100644 --- a/modules/stonehenge/api_challenge.go +++ b/modules/stonehenge/api_challenge.go @@ -55,9 +55,9 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.StonehengeBattleR if errdata = this.BattleCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } - // - errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{ - Ptype: pb.PlayType_mainline, + // 石阵秘境战斗前准备 + errdata, record := this.module.battle.CreateStoneBattle(session, &pb.BattlePVEReq{ + Ptype: pb.PlayType_stone, Title: "", Format: req.Battle, Mformat: battleConf.FormatList, diff --git a/modules/stonehenge/api_challengeover.go b/modules/stonehenge/api_challengeover.go index aa3cd6fe7..b3699d690 100644 --- a/modules/stonehenge/api_challengeover.go +++ b/modules/stonehenge/api_challengeover.go @@ -89,21 +89,7 @@ func (this *apiComp) BattleOver(session comm.IUserSession, req *pb.StonehengeBat break } } - // 掉落奖励 - if conf, err := this.module.configure.GetStoneEventDataById(req.Eventid); err == nil { - if battleConf, err := this.module.configure.GetBattleConfById(conf.Value1); err == nil { - user := this.module.ModuleUser.GetUser(session.GetUserId()) - if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(battleConf.RewardLottery, user.Vip, user.Lv); len(lotteryward) > 0 { - if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil { - this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward) - } - } - } - } - // 战斗结束更新英雄信息 - for _, v := range req.Report.Alive { - stone.Hero[v.HeroID] = v - } + update["hero"] = stone.Hero update["rooms"] = stone.Rooms this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update) @@ -112,6 +98,7 @@ func (this *apiComp) BattleOver(session comm.IUserSession, req *pb.StonehengeBat NewEvent: newEvent, Room: stone.Rooms, Reward: reward, + Hero: stone.Hero, }) // 数据推送 return diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go index bd3286f4e..90fcf25af 100644 --- a/modules/stonehenge/api_event.go +++ b/modules/stonehenge/api_event.go @@ -86,13 +86,52 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq stone.Rooms.Selectbuff = []int32{} stone.Userbuff[stone.Rooms.Selectbuff[req.Param1]] = 1 update["userbuff"] = stone.Userbuff + } else if eventConf.EventType == EventType14 { // 战斗事件合并 + if req.Report == nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("BattleReport is nil"), + } + return + } + bWin := false + errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report) + if errdata != nil { + return + } + if !bWin { // 战斗失败直接返回 + return + } + // 掉落奖励 + if conf, err := this.module.configure.GetStoneEventDataById(req.Eventid); err == nil { + if battleConf, err := this.module.configure.GetBattleConfById(conf.Value1); err == nil { + user := this.module.ModuleUser.GetUser(session.GetUserId()) + if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(battleConf.RewardLottery, user.Vip, user.Lv); len(lotteryward) > 0 { + if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil { + this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward) + } + } + } + } + + for _, v := range req.Report.Alive { // 注意 阵亡英雄不在存货列表内 + stone.Hero[v.Oid] = v + } } stone.Rooms.Eventid[req.Eventid] = true // // 校验事件有后续事件 if eventConf.Probability >= comm.GetRandNum(0, 1000) { // 命中 newEvent = eventConf.PostEvent stone.Rooms.Eventid[newEvent] = false // - + if newEventConf, err = this.module.configure.GetStoneEventDataById(newEvent); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } // 如果新的事件是3选1 if newEventConf.EventType == EventType25 { for _, v := range stone.Addweight { @@ -100,29 +139,23 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq for k := range stone.Userbuff { ownerbuff[k] = struct{}{} } - stone.Rooms.Selectbuff = this.module.configure.GetBuffGroupDataByLottery(eventConf.Value1, v, ownerbuff) + stone.Rooms.Selectbuff = this.module.configure.GetBuffGroupDataByLottery(newEventConf.Value1, v, ownerbuff) } } } - - // 校验是否通关 + stone.Rooms.Complete = true for _, v := range roomConf.Condition { - if v == eventConf.EventType { - stone.Rooms.Complete = true - if newEventConf, err = this.module.configure.GetStoneEventDataById(req.Eventid); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } - for _, v := range roomConf.Condition { - if v == newEventConf.EventType { - stone.Rooms.Complete = false // 判断新的事件导致传送门关闭 - break + for k, ok := range stone.Rooms.Eventid { + if !ok { + if eventConf, err = this.module.configure.GetStoneEventDataById(k); err == nil { + if eventConf.EventType == v { + stone.Rooms.Complete = false + break + } } } + } + if !stone.Rooms.Complete { break } } @@ -135,6 +168,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq NewEvent: newEvent, Room: stone.Rooms, Reward: reward, + Hero: stone.Hero, }) return } diff --git a/modules/stonehenge/core.go b/modules/stonehenge/core.go index 3fe212b0e..663b07bf2 100644 --- a/modules/stonehenge/core.go +++ b/modules/stonehenge/core.go @@ -1,6 +1,7 @@ package stonehenge const ( + EventType14 = 14 // 战斗事件 EventType16 = 16 // 捡垃圾事件 EventType25 = 25 // buff三选一 ) diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go index 762c0f69d..f8953cc6a 100644 --- a/pb/battle_db.pb.go +++ b/pb/battle_db.pb.go @@ -103,6 +103,7 @@ const ( PlayType_race PlayType = 15 // 阵营 塔 PlayType_cycle PlayType = 16 // 循环塔 PlayType_guildgve PlayType = 17 //工会gve + PlayType_stone PlayType = 18 // 石阵秘境 ) // Enum value maps for PlayType. @@ -126,6 +127,7 @@ var ( 15: "race", 16: "cycle", 17: "guildgve", + 18: "stone", } PlayType_value = map[string]int32{ "null": 0, @@ -146,6 +148,7 @@ var ( "race": 15, "cycle": 16, "guildgve": 17, + "stone": 18, } ) @@ -273,33 +276,98 @@ func (DBBattleComp) EnumDescriptor() ([]byte, []int) { return file_battle_battle_db_proto_rawDescGZIP(), []int{3} } +//动态技能 +type DySkillData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + SkillID int32 `protobuf:"varint,1,opt,name=skillID,proto3" json:"skillID"` + SkillLv int32 `protobuf:"varint,2,opt,name=skillLv,proto3" json:"skillLv"` + Param int32 `protobuf:"varint,3,opt,name=param,proto3" json:"param"` +} + +func (x *DySkillData) Reset() { + *x = DySkillData{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DySkillData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DySkillData) ProtoMessage() {} + +func (x *DySkillData) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_db_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DySkillData.ProtoReflect.Descriptor instead. +func (*DySkillData) Descriptor() ([]byte, []int) { + return file_battle_battle_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DySkillData) GetSkillID() int32 { + if x != nil { + return x.SkillID + } + return 0 +} + +func (x *DySkillData) GetSkillLv() int32 { + if x != nil { + return x.SkillLv + } + return 0 +} + +func (x *DySkillData) GetParam() int32 { + if x != nil { + return x.Param + } + return 0 +} + type BattleRole struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` // 临时id - Oid string `protobuf:"bytes,2,opt,name=oid,proto3" json:"oid"` // 玩家英雄数据库id - Pos int32 `protobuf:"varint,3,opt,name=pos,proto3" json:"pos"` // 站位坐标 - HeroID string `protobuf:"bytes,4,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` //英雄的配置表ID - Star int32 `protobuf:"varint,5,opt,name=star,proto3" json:"star"` // 英雄星级 - Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"` // 英雄等级 - CaptainSkill int32 `protobuf:"varint,7,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能 - MainSuitSkill int32 `protobuf:"varint,8,opt,name=mainSuitSkill,proto3" json:"mainSuitSkill" bson:"mainSuitSkill"` /// 主套装技能 - SubSuitSkill int32 `protobuf:"varint,9,opt,name=subSuitSkill,proto3" json:"subSuitSkill" bson:"subSuitSkill"` /// 副套装技能 - NormalSkill []*SkillData `protobuf:"bytes,10,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能 - EquipSkill []*SkillData `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"` //普通技能 - Property map[int32]int32 `protobuf:"bytes,13,rep,name=property,proto3" json:"property" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //基础属性 - Ishelp bool `protobuf:"varint,14,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄 - Isboos int32 `protobuf:"varint,15,opt,name=isboos,proto3" json:"isboos"` //是否是boos - Monsterid int32 `protobuf:"varint,16,opt,name=monsterid,proto3" json:"monsterid"` //怪物id - Currhp int32 `protobuf:"varint,17,opt,name=currhp,proto3" json:"currhp"` //当前血量 + Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` // 临时id + Oid string `protobuf:"bytes,2,opt,name=oid,proto3" json:"oid"` // 玩家英雄数据库id + Pos int32 `protobuf:"varint,3,opt,name=pos,proto3" json:"pos"` // 站位坐标 + HeroID string `protobuf:"bytes,4,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` //英雄的配置表ID + Star int32 `protobuf:"varint,5,opt,name=star,proto3" json:"star"` // 英雄星级 + Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"` // 英雄等级 + CaptainSkill int32 `protobuf:"varint,7,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能 + MainSuitSkill int32 `protobuf:"varint,8,opt,name=mainSuitSkill,proto3" json:"mainSuitSkill" bson:"mainSuitSkill"` /// 主套装技能 + SubSuitSkill int32 `protobuf:"varint,9,opt,name=subSuitSkill,proto3" json:"subSuitSkill" bson:"subSuitSkill"` /// 副套装技能 + NormalSkill []*SkillData `protobuf:"bytes,10,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能 + EquipSkill []*SkillData `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"` //装备技能 + BattleBeforeSkill []*DySkillData `protobuf:"bytes,12,rep,name=battleBeforeSkill,proto3" json:"battleBeforeSkill" bson:"battleBeforeSkill"` //战前技能 + Property map[int32]int32 `protobuf:"bytes,13,rep,name=property,proto3" json:"property" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //基础属性 + Ishelp bool `protobuf:"varint,14,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄 + Isboos int32 `protobuf:"varint,15,opt,name=isboos,proto3" json:"isboos"` //是否是boos + Monsterid int32 `protobuf:"varint,16,opt,name=monsterid,proto3" json:"monsterid"` //怪物id + Currhp int32 `protobuf:"varint,17,opt,name=currhp,proto3" json:"currhp"` //当前血量 } func (x *BattleRole) Reset() { *x = BattleRole{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_db_proto_msgTypes[0] + mi := &file_battle_battle_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -312,7 +380,7 @@ func (x *BattleRole) String() string { func (*BattleRole) ProtoMessage() {} func (x *BattleRole) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_db_proto_msgTypes[0] + mi := &file_battle_battle_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -325,7 +393,7 @@ func (x *BattleRole) ProtoReflect() protoreflect.Message { // Deprecated: Use BattleRole.ProtoReflect.Descriptor instead. func (*BattleRole) Descriptor() ([]byte, []int) { - return file_battle_battle_db_proto_rawDescGZIP(), []int{0} + return file_battle_battle_db_proto_rawDescGZIP(), []int{1} } func (x *BattleRole) GetTid() int32 { @@ -405,6 +473,13 @@ func (x *BattleRole) GetEquipSkill() []*SkillData { return nil } +func (x *BattleRole) GetBattleBeforeSkill() []*DySkillData { + if x != nil { + return x.BattleBeforeSkill + } + return nil +} + func (x *BattleRole) GetProperty() map[int32]int32 { if x != nil { return x.Property @@ -455,7 +530,7 @@ type DBBattleFormt struct { func (x *DBBattleFormt) Reset() { *x = DBBattleFormt{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_db_proto_msgTypes[1] + mi := &file_battle_battle_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -468,7 +543,7 @@ func (x *DBBattleFormt) String() string { func (*DBBattleFormt) ProtoMessage() {} func (x *DBBattleFormt) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_db_proto_msgTypes[1] + mi := &file_battle_battle_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -481,7 +556,7 @@ func (x *DBBattleFormt) ProtoReflect() protoreflect.Message { // Deprecated: Use DBBattleFormt.ProtoReflect.Descriptor instead. func (*DBBattleFormt) Descriptor() ([]byte, []int) { - return file_battle_battle_db_proto_rawDescGZIP(), []int{1} + return file_battle_battle_db_proto_rawDescGZIP(), []int{2} } func (x *DBBattleFormt) GetLeadpos() int32 { @@ -536,7 +611,7 @@ type DBBattleRecord struct { func (x *DBBattleRecord) Reset() { *x = DBBattleRecord{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_db_proto_msgTypes[2] + mi := &file_battle_battle_db_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -549,7 +624,7 @@ func (x *DBBattleRecord) String() string { func (*DBBattleRecord) ProtoMessage() {} func (x *DBBattleRecord) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_db_proto_msgTypes[2] + mi := &file_battle_battle_db_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -562,7 +637,7 @@ func (x *DBBattleRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DBBattleRecord.ProtoReflect.Descriptor instead. func (*DBBattleRecord) Descriptor() ([]byte, []int) { - return file_battle_battle_db_proto_rawDescGZIP(), []int{2} + return file_battle_battle_db_proto_rawDescGZIP(), []int{3} } func (x *DBBattleRecord) GetId() string { @@ -661,100 +736,110 @@ var File_battle_battle_db_proto protoreflect.FileDescriptor var file_battle_battle_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa0, 0x04, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, - 0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, - 0x6f, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, - 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70, - 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x69, - 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, - 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, - 0x6c, 0x12, 0x2a, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, - 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x35, 0x0a, - 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x0e, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x12, 0x16, 0x0a, 0x06, - 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x73, - 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x69, - 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, - 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x11, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9e, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, - 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, - 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, - 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, - 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x2b, 0x0a, 0x0a, 0x62, - 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x0a, 0x62, 0x61, - 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xbd, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, - 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, - 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, - 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, - 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, - 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, - 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, - 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, - 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, - 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, - 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, - 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, - 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, - 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2a, 0x4e, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, - 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, - 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, - 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76, 0x70, 0x10, 0x05, 0x12, 0x08, - 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xf8, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, - 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, - 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, - 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, - 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, - 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, - 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, - 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x61, 0x63, 0x61, - 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x65, - 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, - 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x10, - 0x0b, 0x12, 0x0b, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x10, 0x0c, 0x12, 0x0f, - 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x6d, 0x65, 0x65, 0x74, 0x10, 0x0d, 0x12, - 0x0f, 0x0a, 0x0b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x6e, 0x70, 0x63, 0x10, 0x0e, - 0x12, 0x08, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x10, 0x0f, 0x12, 0x09, 0x0a, 0x05, 0x63, 0x79, - 0x63, 0x6c, 0x65, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x67, 0x76, - 0x65, 0x10, 0x11, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x57, 0x0a, 0x0b, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, + 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xdc, 0x04, + 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, + 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, + 0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, + 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, + 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, + 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, + 0x69, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, + 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x53, + 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, + 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x0b, + 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2a, 0x0a, 0x0a, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, + 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, + 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x3a, 0x0a, 0x11, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x11, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x12, 0x35, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0d, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, + 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, + 0x65, 0x6c, 0x70, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, + 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x6f, 0x6e, + 0x73, 0x74, 0x65, 0x72, 0x69, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x6f, + 0x6e, 0x73, 0x74, 0x65, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, + 0x70, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x1a, + 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, + 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9e, 0x01, 0x0a, + 0x0d, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, + 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, + 0x12, 0x2b, 0x0a, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, + 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xbd, 0x03, + 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, + 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, + 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, + 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, + 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, + 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, + 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, + 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, + 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, + 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, + 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, + 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, + 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, + 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, + 0x18, 0x0d, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2a, 0x4e, 0x0a, + 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, + 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, + 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, + 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76, + 0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0x83, 0x02, + 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, + 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, + 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, + 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, + 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, + 0x0a, 0x07, 0x61, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, + 0x65, 0x72, 0x6f, 0x74, 0x65, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, + 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, + 0x68, 0x61, 0x6e, 0x74, 0x10, 0x0b, 0x12, 0x0b, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x6d, 0x65, + 0x65, 0x74, 0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, + 0x6e, 0x70, 0x63, 0x10, 0x0e, 0x12, 0x08, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x10, 0x0f, 0x12, + 0x09, 0x0a, 0x05, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x10, 0x11, 0x12, 0x09, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x6e, + 0x65, 0x10, 0x12, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, @@ -776,37 +861,39 @@ func file_battle_battle_db_proto_rawDescGZIP() []byte { } var file_battle_battle_db_proto_enumTypes = make([]protoimpl.EnumInfo, 4) -var file_battle_battle_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_battle_battle_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_battle_battle_db_proto_goTypes = []interface{}{ (BattleType)(0), // 0: BattleType (PlayType)(0), // 1: PlayType (BBattleState)(0), // 2: BBattleState (DBBattleComp)(0), // 3: DBBattleComp - (*BattleRole)(nil), // 4: BattleRole - (*DBBattleFormt)(nil), // 5: DBBattleFormt - (*DBBattleRecord)(nil), // 6: DBBattleRecord - nil, // 7: BattleRole.PropertyEntry - (*SkillData)(nil), // 8: SkillData + (*DySkillData)(nil), // 4: DySkillData + (*BattleRole)(nil), // 5: BattleRole + (*DBBattleFormt)(nil), // 6: DBBattleFormt + (*DBBattleRecord)(nil), // 7: DBBattleRecord + nil, // 8: BattleRole.PropertyEntry + (*SkillData)(nil), // 9: SkillData } var file_battle_battle_db_proto_depIdxs = []int32{ - 8, // 0: BattleRole.normalSkill:type_name -> SkillData - 8, // 1: BattleRole.equipSkill:type_name -> SkillData - 7, // 2: BattleRole.property:type_name -> BattleRole.PropertyEntry - 4, // 3: DBBattleFormt.team:type_name -> BattleRole - 4, // 4: DBBattleFormt.systeam:type_name -> BattleRole - 4, // 5: DBBattleFormt.backupteam:type_name -> BattleRole - 0, // 6: DBBattleRecord.btype:type_name -> BattleType - 1, // 7: DBBattleRecord.ptype:type_name -> PlayType - 2, // 8: DBBattleRecord.state:type_name -> BBattleState - 5, // 9: DBBattleRecord.redflist:type_name -> DBBattleFormt - 5, // 10: DBBattleRecord.buleflist:type_name -> DBBattleFormt - 3, // 11: DBBattleRecord.roundresult:type_name -> DBBattleComp - 3, // 12: DBBattleRecord.result:type_name -> DBBattleComp - 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 + 9, // 0: BattleRole.normalSkill:type_name -> SkillData + 9, // 1: BattleRole.equipSkill:type_name -> SkillData + 4, // 2: BattleRole.battleBeforeSkill:type_name -> DySkillData + 8, // 3: BattleRole.property:type_name -> BattleRole.PropertyEntry + 5, // 4: DBBattleFormt.team:type_name -> BattleRole + 5, // 5: DBBattleFormt.systeam:type_name -> BattleRole + 5, // 6: DBBattleFormt.backupteam:type_name -> BattleRole + 0, // 7: DBBattleRecord.btype:type_name -> BattleType + 1, // 8: DBBattleRecord.ptype:type_name -> PlayType + 2, // 9: DBBattleRecord.state:type_name -> BBattleState + 6, // 10: DBBattleRecord.redflist:type_name -> DBBattleFormt + 6, // 11: DBBattleRecord.buleflist:type_name -> DBBattleFormt + 3, // 12: DBBattleRecord.roundresult:type_name -> DBBattleComp + 3, // 13: DBBattleRecord.result:type_name -> DBBattleComp + 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_battle_battle_db_proto_init() } @@ -817,7 +904,7 @@ func file_battle_battle_db_proto_init() { file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_battle_battle_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleRole); i { + switch v := v.(*DySkillData); i { case 0: return &v.state case 1: @@ -829,7 +916,7 @@ func file_battle_battle_db_proto_init() { } } file_battle_battle_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBBattleFormt); i { + switch v := v.(*BattleRole); i { case 0: return &v.state case 1: @@ -841,6 +928,18 @@ func file_battle_battle_db_proto_init() { } } file_battle_battle_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBBattleFormt); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_battle_battle_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBBattleRecord); i { case 0: return &v.state @@ -859,7 +958,7 @@ func file_battle_battle_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_db_proto_rawDesc, NumEnums: 4, - NumMessages: 4, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go index 9c246d4d4..bb6850a09 100644 --- a/pb/stonehenge_msg.pb.go +++ b/pb/stonehenge_msg.pb.go @@ -342,10 +342,11 @@ type StonehengeEventReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id - Param1 int32 `protobuf:"varint,2,opt,name=param1,proto3" json:"param1"` - Param2 int32 `protobuf:"varint,3,opt,name=param2,proto3" json:"param2"` - Param3 int32 `protobuf:"varint,4,opt,name=param3,proto3" json:"param3"` + Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id + Param1 int32 `protobuf:"varint,2,opt,name=param1,proto3" json:"param1"` + Param2 int32 `protobuf:"varint,3,opt,name=param2,proto3" json:"param2"` + Param3 int32 `protobuf:"varint,4,opt,name=param3,proto3" json:"param3"` + Report *BattleReport `protobuf:"bytes,5,opt,name=report,proto3" json:"report"` //战报 } func (x *StonehengeEventReq) Reset() { @@ -408,15 +409,23 @@ func (x *StonehengeEventReq) GetParam3() int32 { return 0 } +func (x *StonehengeEventReq) GetReport() *BattleReport { + if x != nil { + return x.Report + } + return nil +} + type StonehengeEventResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id - NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id - Room *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"` - Reward []*UserAtno `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"` // 完成事件获得的奖励 + Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id + NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id + Room *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"` + Reward []*UserAtno `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"` // 完成事件获得的奖励 + Hero map[string]*BattleRole `protobuf:"bytes,5,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 英雄信息 } func (x *StonehengeEventResp) Reset() { @@ -479,6 +488,13 @@ func (x *StonehengeEventResp) GetReward() []*UserAtno { return nil } +func (x *StonehengeEventResp) GetHero() map[string]*BattleRole { + if x != nil { + return x.Hero + } + return nil +} + //获取房间信息 type StonehengeGetRoomInfoReq struct { state protoimpl.MessageState @@ -823,10 +839,11 @@ type StonehengeBattleOverResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id - NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id - Room *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"` - Reward []*UserAtno `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"` // 完成事件获得的奖励 + Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id + NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id + Room *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"` + Reward []*UserAtno `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"` // 完成事件获得的奖励 + Hero map[string]*BattleRole `protobuf:"bytes,5,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 英雄信息 } func (x *StonehengeBattleOverResp) Reset() { @@ -889,6 +906,13 @@ func (x *StonehengeBattleOverResp) GetReward() []*UserAtno { return nil } +func (x *StonehengeBattleOverResp) GetHero() map[string]*BattleRole { + if x != nil { + return x.Hero + } + return nil +} + var File_stonehenge_stonehenge_msg_proto protoreflect.FileDescriptor var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ @@ -933,61 +957,79 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6f, - 0x72, 0x74, 0x61, 0x6c, 0x22, 0x76, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, - 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, - 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, - 0x6e, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x8d, 0x01, 0x0a, - 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, - 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, - 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, - 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x1a, 0x0a, 0x18, - 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, - 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, - 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, - 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, - 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x53, - 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, - 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, - 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x22, 0x51, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, - 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, - 0x74, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5a, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, - 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, + 0x72, 0x74, 0x61, 0x6c, 0x22, 0x9d, 0x01, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, + 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, + 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, + 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x25, 0x0a, + 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 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, 0x87, 0x02, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, + 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, + 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, + 0x6d, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x12, 0x32, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x05, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x1a, 0x44, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x1a, + 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, + 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x19, 0x53, 0x74, + 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, + 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, + 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, + 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, + 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x18, 0x02, 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, 0x92, 0x01, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, - 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, - 0x6f, 0x6d, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x22, 0x51, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, + 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, + 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5a, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, + 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 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, 0x91, 0x02, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, + 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, + 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x37, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, + 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, + 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x1a, 0x44, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 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 ( @@ -1002,7 +1044,7 @@ func file_stonehenge_stonehenge_msg_proto_rawDescGZIP() []byte { return file_stonehenge_stonehenge_msg_proto_rawDescData } -var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) +var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19) var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*StonehengeGetListReq)(nil), // 0: StonehengeGetListReq (*StonehengeGetListResp)(nil), // 1: StonehengeGetListResp @@ -1021,36 +1063,43 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*StonehengeBattleOverReq)(nil), // 14: StonehengeBattleOverReq (*StonehengeBattleOverResp)(nil), // 15: StonehengeBattleOverResp nil, // 16: StonehengeEnterLevelResp.HeroEntry - (*DBStonehenge)(nil), // 17: DBStonehenge - (*DBStoneBoss)(nil), // 18: DBStoneBoss - (*RoomData)(nil), // 19: RoomData - (*UserAtno)(nil), // 20: UserAtno - (*BattleFormation)(nil), // 21: BattleFormation - (*BattleInfo)(nil), // 22: BattleInfo - (*BattleReport)(nil), // 23: BattleReport - (*BattleRole)(nil), // 24: BattleRole + nil, // 17: StonehengeEventResp.HeroEntry + nil, // 18: StonehengeBattleOverResp.HeroEntry + (*DBStonehenge)(nil), // 19: DBStonehenge + (*DBStoneBoss)(nil), // 20: DBStoneBoss + (*RoomData)(nil), // 21: RoomData + (*BattleReport)(nil), // 22: BattleReport + (*UserAtno)(nil), // 23: UserAtno + (*BattleFormation)(nil), // 24: BattleFormation + (*BattleInfo)(nil), // 25: BattleInfo + (*BattleRole)(nil), // 26: BattleRole } var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{ - 17, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge - 18, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss + 19, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge + 20, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss 16, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry - 19, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData - 19, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData - 19, // 5: StonehengeEventResp.room:type_name -> RoomData - 20, // 6: StonehengeEventResp.reward:type_name -> UserAtno - 19, // 7: StonehengeGetRoomInfoResp.room:type_name -> RoomData - 17, // 8: StonehengeFinishResp.data:type_name -> DBStonehenge - 21, // 9: StonehengeBattleReq.battle:type_name -> BattleFormation - 22, // 10: StonehengeBattleResp.info:type_name -> BattleInfo - 23, // 11: StonehengeBattleOverReq.report:type_name -> BattleReport - 19, // 12: StonehengeBattleOverResp.room:type_name -> RoomData - 20, // 13: StonehengeBattleOverResp.reward:type_name -> UserAtno - 24, // 14: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 21, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData + 21, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData + 22, // 5: StonehengeEventReq.report:type_name -> BattleReport + 21, // 6: StonehengeEventResp.room:type_name -> RoomData + 23, // 7: StonehengeEventResp.reward:type_name -> UserAtno + 17, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry + 21, // 9: StonehengeGetRoomInfoResp.room:type_name -> RoomData + 19, // 10: StonehengeFinishResp.data:type_name -> DBStonehenge + 24, // 11: StonehengeBattleReq.battle:type_name -> BattleFormation + 25, // 12: StonehengeBattleResp.info:type_name -> BattleInfo + 22, // 13: StonehengeBattleOverReq.report:type_name -> BattleReport + 21, // 14: StonehengeBattleOverResp.room:type_name -> RoomData + 23, // 15: StonehengeBattleOverResp.reward:type_name -> UserAtno + 18, // 16: StonehengeBattleOverResp.hero:type_name -> StonehengeBattleOverResp.HeroEntry + 26, // 17: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole + 26, // 18: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole + 26, // 19: StonehengeBattleOverResp.HeroEntry.value:type_name -> BattleRole + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_stonehenge_stonehenge_msg_proto_init() } @@ -1262,7 +1311,7 @@ func file_stonehenge_stonehenge_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_stonehenge_stonehenge_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 17, + NumMessages: 19, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index eed85cef1..ddafc7a63 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -16,6 +16,9 @@ type GameBattleReadyData struct { HeroCount int32 ReadyScene string BattleScenes []string + ShowBuff int32 + BattleEvents []int32 + ScoreGroupID int32 DisableAiCamera int32 ChoseCamp []int32 DisableCamp []int32 @@ -23,6 +26,7 @@ type GameBattleReadyData struct { ChoseHero []string DisableHero []string LockSlots []int32 + HeroCheck []string AssistTeam int32 CanFriendHelp int32 Numrounds int32 @@ -53,6 +57,22 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ShowBuff"].(float64); !_ok_ { err = errors.New("ShowBuff error"); return }; _v.ShowBuff = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["battleEvents"].([]interface{}); !_ok_ { err = errors.New("battleEvents error"); return } + + _v.BattleEvents = 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.BattleEvents = append(_v.BattleEvents, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ScoreGroupID"].(float64); !_ok_ { err = errors.New("ScoreGroupID error"); return }; _v.ScoreGroupID = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) } { var _arr_ []interface{} @@ -125,6 +145,20 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["HeroCheck"].([]interface{}); !_ok_ { err = errors.New("HeroCheck error"); return } + + _v.HeroCheck = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.HeroCheck = append(_v.HeroCheck, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.BattleScore.go b/sys/configure/structs/Game.BattleScore.go new file mode 100644 index 000000000..281c89a66 --- /dev/null +++ b/sys/configure/structs/Game.BattleScore.go @@ -0,0 +1,34 @@ +//------------------------------------------------------------------------------ +// +// 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 GameBattleScore struct { + _dataList []*GameBattleScoreData +} + +func NewGameBattleScore(_buf []map[string]interface{}) (*GameBattleScore, error) { + _dataList := make([]*GameBattleScoreData, 0, len(_buf)) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameBattleScoreData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + } + } + return &GameBattleScore{_dataList:_dataList}, nil +} + +func (table *GameBattleScore) GetDataList() []*GameBattleScoreData { + return table._dataList +} + +func (table *GameBattleScore) Get(index int) *GameBattleScoreData { + return table._dataList[index] +} + diff --git a/sys/configure/structs/Game.BattleScoreData.go b/sys/configure/structs/Game.BattleScoreData.go new file mode 100644 index 000000000..f59ccee87 --- /dev/null +++ b/sys/configure/structs/Game.BattleScoreData.go @@ -0,0 +1,45 @@ +//------------------------------------------------------------------------------ +// +// 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 GameBattleScoreData struct { + Id int32 + ScoreName string + RankLow int32 + RankUp int32 + Grade string + Score int32 +} + +const TypeId_GameBattleScoreData = -1341711992 + +func (*GameBattleScoreData) GetTypeId() int32 { + return -1341711992 +} + +func (_v *GameBattleScoreData)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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["score_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ScoreName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ScoreName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) } + { var _ok_ bool; if _v.Grade, _ok_ = _buf["grade"].(string); !_ok_ { err = errors.New("grade error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) } + return +} + +func DeserializeGameBattleScoreData(_buf map[string]interface{}) (*GameBattleScoreData, error) { + v := &GameBattleScoreData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 5b03cd40a..b060e6bc2 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -123,6 +123,7 @@ type Tables struct { Battletasktesting *GameBattletasktesting BattleReady *GameBattleReady Battleready_capskill *GameBattleready_capskill + BattleScore *GameBattleScore NewSmithy *GameNewSmithy SmithyProficiency *GameSmithyProficiency SmithyStoveV1 *GameSmithyStoveV1 @@ -893,6 +894,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Battleready_capskill, err = NewGameBattleready_capskill(buf) ; err != nil { return nil, err } + if buf, err = loader("game_battlescore") ; err != nil { + return nil, err + } + if tables.BattleScore, err = NewGameBattleScore(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_newsmithy") ; err != nil { return nil, err } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index c475c0c36..82bb51d5b 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -251,6 +251,8 @@ type GameGlobalData struct { GuildbossRoulette *Gameatn GuildbossKillPreview []*Gameatn GuildbossChallengePreview []*Gameatn + CompassDistansces []int32 + CompassAngleOffsets []int32 } const TypeId_GameGlobalData = 477542761 @@ -1033,6 +1035,34 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["compass_distansces"].([]interface{}); !_ok_ { err = errors.New("compass_distansces error"); return } + + _v.CompassDistansces = 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.CompassDistansces = append(_v.CompassDistansces, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["compass_angle_offsets"].([]interface{}); !_ok_ { err = errors.New("compass_angle_offsets error"); return } + + _v.CompassAngleOffsets = 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.CompassAngleOffsets = append(_v.CompassAngleOffsets, _list_v_) + } + } + return }