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/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 }