From f93f6de715c03d764a9adc7a92259482318afd9b Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 18:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 57 +++++++- bin/json/game_mainstage.json | 67 +++++----- bin/json/game_monsterformat.json | 20 +++ bin/json/game_namelibrary.json | 2 +- bin/json/game_reddot.json | 160 +++++++++++------------ sys/configure/structs/Game.RedDotData.go | 4 +- 6 files changed, 192 insertions(+), 118 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index bffecd295..a7cde10e8 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -446,7 +446,7 @@ "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], - "DefaultHero": 0, + "DefaultHero": 720015, "ChoseHero": [], "DisableHero": [], "LockSlots": [], @@ -870,5 +870,60 @@ "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 50 + }, + { + "id": 136, + "PlayType": 0, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_03", + "battleScenes": [ + "scenesfight_05_01" + ], + "HideAlienSpace": 1, + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 720015, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [ + "13002" + ], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 137, + "PlayType": 0, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_03", + "battleScenes": [ + "scenesfight_05_01" + ], + "HideAlienSpace": 1, + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 0, + "ChoseHero": [], + "DisableHero": [ + "44005", + "34004" + ], + "LockSlots": [], + "HeroCheck": [ + "13002" + ], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 8e686c932..48a09588f 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -132,12 +132,8 @@ "FormatList": [ 101011 ], - "helphero": [ - "25001" - ], - "banhero": [ - "13004" - ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -235,11 +231,9 @@ 101021 ], "helphero": [ - "25001" - ], - "banhero": [ - "13004" + "44005" ], + "banhero": [], "star": [ 1, 1, @@ -337,11 +331,9 @@ 101031 ], "helphero": [ - "25001" - ], - "banhero": [ - "13004" + "44005" ], + "banhero": [], "star": [ 1, 1, @@ -444,11 +436,9 @@ 101041 ], "helphero": [ - "25001" - ], - "banhero": [ - "13004" + "44005" ], + "banhero": [], "star": [ 1, 1, @@ -607,12 +597,13 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 136, "FormatList": [ 101051 ], "helphero": [ - "25001" + "13002", + "44005" ], "banhero": [], "star": [ @@ -678,7 +669,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -759,7 +756,7 @@ "chapterid": 11001, "group_id": 100109, "previous_group_id": [ - 100107 + 100108 ], "previoustage": 0, "Episodetype": 7, @@ -823,7 +820,7 @@ "chapterid": 11001, "group_id": 100110, "previous_group_id": [ - 100107 + 100109 ], "previoustage": 0, "Episodetype": 7, @@ -887,9 +884,7 @@ "chapterid": 11001, "group_id": 100111, "previous_group_id": [ - 100110, - 100108, - 100109 + 100110 ], "previoustage": 0, "Episodetype": 3, @@ -1073,15 +1068,16 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 137, "FormatList": [ 101061 ], "helphero": [ - "25001" + "13002" ], "banhero": [ - "44005" + "44005", + "34004" ], "star": [ 1, @@ -1178,15 +1174,16 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 137, "FormatList": [ 101071 ], "helphero": [ - "25001" + "13002" ], "banhero": [ - "44005" + "44005", + "34004" ], "star": [ 1, @@ -1538,11 +1535,13 @@ "n": 6000 } ], - "BattleReadyID": 122, + "BattleReadyID": 137, "FormatList": [ 101081 ], - "helphero": [], + "helphero": [ + "13002" + ], "banhero": [ "44005", "34004" diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index fef30bb01..7627a3183 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -238239,6 +238239,26 @@ "speed": 80, "modelsize": 1 }, + { + "Id": 720015, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 44005, + "star": 4, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 80, + "modelsize": 1 + }, { "Id": 800001, "pos": 1, diff --git a/bin/json/game_namelibrary.json b/bin/json/game_namelibrary.json index 6880ecbb1..7723b6555 100644 --- a/bin/json/game_namelibrary.json +++ b/bin/json/game_namelibrary.json @@ -487,7 +487,7 @@ }, "name": { "key": "name_name_name_41", - "text": "巴雷特" + "text": "吉吉亚" }, "sex": 2 }, diff --git a/bin/json/game_reddot.json b/bin/json/game_reddot.json index 1ec10993a..b33243cd9 100644 --- a/bin/json/game_reddot.json +++ b/bin/json/game_reddot.json @@ -4,7 +4,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Task", "header": "" }, @@ -13,7 +13,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Daily", "header": "赵长远" }, @@ -22,7 +22,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Week", "header": "赵长远" }, @@ -31,7 +31,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Achievement", "header": "赵长远" }, @@ -40,7 +40,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Task|Daily", "header": "" }, @@ -49,7 +49,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Daily|Active", "header": "" }, @@ -58,7 +58,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Task|Week", "header": "" }, @@ -67,7 +67,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Week|Active", "header": "" }, @@ -76,7 +76,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "mail", "path": "Root|Email", "header": "" }, @@ -85,7 +85,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "mail", "path": "Root|Email|Btn", "header": "" }, @@ -94,7 +94,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "mail", "path": "Root|Email|UnreadBtn", "header": "" }, @@ -103,7 +103,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|ViKingExpedition", "header": "" }, @@ -112,7 +112,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|ViKingExpedition|MainPage", "header": "" }, @@ -121,7 +121,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|ViKingExpedition|MainPage|Btn", "header": "" }, @@ -130,7 +130,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hunting", "header": "" }, @@ -139,7 +139,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hunting|MainPage", "header": "" }, @@ -148,7 +148,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hunting|MainPage|Btn", "header": "" }, @@ -157,7 +157,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1", "header": "" }, @@ -166,7 +166,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Heroup", "header": "" }, @@ -175,7 +175,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Awake", "header": "" }, @@ -184,7 +184,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Resonance", "header": "" }, @@ -193,7 +193,7 @@ "msg_type": 0, "show_type": 2, "count_type": 1, - "group": "", + "opencond_id": "", "path": "Root|Hero", "header": "" }, @@ -202,7 +202,7 @@ "msg_type": 1, "show_type": 2, "count_type": 1, - "group": "", + "opencond_id": "", "path": "Root|Hero|NewHero", "header": "" }, @@ -211,7 +211,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Equip", "header": "" }, @@ -220,7 +220,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Equip|Wear", "header": "" }, @@ -229,7 +229,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild", "header": "赵长远" }, @@ -238,7 +238,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main", "header": "赵长远" }, @@ -247,7 +247,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main|Btn", "header": "赵长远" }, @@ -256,7 +256,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main|Apply", "header": "" }, @@ -265,7 +265,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main|Apply|Btn", "header": "" }, @@ -274,7 +274,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "guild", "path": "Root|Guild|Main|Task", "header": "" }, @@ -283,7 +283,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag", "header": "赵长远" }, @@ -292,7 +292,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag|Item", "header": "赵长远" }, @@ -301,7 +301,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag|Equip", "header": "赵长远" }, @@ -310,7 +310,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag|Shard", "header": "赵长远" }, @@ -319,7 +319,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy", "header": "" }, @@ -328,7 +328,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble", "header": "" }, @@ -337,7 +337,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page1", "header": "" }, @@ -346,7 +346,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page2", "header": "" }, @@ -355,7 +355,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page3", "header": "" }, @@ -364,7 +364,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page4", "header": "" }, @@ -373,7 +373,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Reward", "header": "" }, @@ -382,7 +382,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy", "header": "" }, @@ -391,7 +391,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu", "header": "" }, @@ -400,7 +400,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|Pillar", "header": "" }, @@ -409,7 +409,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "", "header": "" }, @@ -418,7 +418,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "", "header": "" }, @@ -427,7 +427,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|Dispatch", "header": "" }, @@ -436,7 +436,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|Dispatch|Reward", "header": "" }, @@ -445,7 +445,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|DailyFitness", "header": "" }, @@ -454,7 +454,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble", "header": "" }, @@ -463,7 +463,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble|Page1", "header": "" }, @@ -472,7 +472,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble|Page2", "header": "" }, @@ -481,7 +481,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble|Page3", "header": "" }, @@ -490,7 +490,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability", "header": "" }, @@ -499,7 +499,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble", "header": "" }, @@ -508,7 +508,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List", "header": "" }, @@ -517,7 +517,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List|Reward", "header": "" }, @@ -526,7 +526,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List|Biography", "header": "" }, @@ -535,7 +535,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List|Biography|Reward", "header": "" }, @@ -544,7 +544,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters", "header": "" }, @@ -553,7 +553,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters|ListPage", "header": "" }, @@ -562,7 +562,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters|ListPage|Activation", "header": "" }, @@ -571,7 +571,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters|ListPage|UpLv", "header": "" }, @@ -580,7 +580,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "cooking", "path": "Root|Gourmet", "header": "" }, @@ -589,7 +589,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "cooking", "path": "Root|Gourmet|Atlas", "header": "" }, @@ -598,7 +598,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "friend", "path": "Root|Friend", "header": "" }, @@ -607,7 +607,7 @@ "msg_type": 2, "show_type": 1, "count_type": 0, - "group": "", + "opencond_id": "friend", "path": "Root|Friend|Apply", "header": "" }, @@ -616,16 +616,16 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena", "header": "" }, { "id": 22101, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena|Num", "header": "" }, @@ -634,7 +634,7 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "", "header": "" }, @@ -643,7 +643,7 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena|ChallengeNpc", "header": "" }, @@ -652,7 +652,7 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena|ChallengeNpc|Page", "header": "" }, @@ -661,7 +661,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "trials1", "path": "Root|MLine", "header": "" }, @@ -670,7 +670,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "trials1", "path": "Root|MLine|Reward", "header": "" }, @@ -679,7 +679,7 @@ "msg_type": 0, "show_type": 1, "count_type": 1, - "group": "", + "opencond_id": "", "path": "", "header": "" }, @@ -688,16 +688,16 @@ "msg_type": 0, "show_type": 1, "count_type": 1, - "group": "", + "opencond_id": "", "path": "", - "header": "红点出现:当聊天系统中公会,私聊,跨服,系统存在玩家未接受消息时,触发聊天红点。" + "header": "" }, { "id": 29101, "msg_type": 2, "show_type": 1, "count_type": 1, - "group": "", + "opencond_id": "RacePagoda", "path": "", "header": "" } diff --git a/sys/configure/structs/Game.RedDotData.go b/sys/configure/structs/Game.RedDotData.go index f62bf7c3b..ecd2b829b 100644 --- a/sys/configure/structs/Game.RedDotData.go +++ b/sys/configure/structs/Game.RedDotData.go @@ -15,7 +15,7 @@ type GameRedDotData struct { MsgType int32 ShowType int32 CountType int32 - Group string + OpencondId string Path string Header string } @@ -31,7 +31,7 @@ func (_v *GameRedDotData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["msg_type"].(float64); !_ok_ { err = errors.New("msg_type error"); return }; _v.MsgType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show_type"].(float64); !_ok_ { err = errors.New("show_type error"); return }; _v.ShowType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count_type"].(float64); !_ok_ { err = errors.New("count_type error"); return }; _v.CountType = int32(_tempNum_) } - { var _ok_ bool; if _v.Group, _ok_ = _buf["group"].(string); !_ok_ { err = errors.New("group error"); return } } + { var _ok_ bool; if _v.OpencondId, _ok_ = _buf["opencond_id"].(string); !_ok_ { err = errors.New("opencond_id error"); return } } { var _ok_ bool; if _v.Path, _ok_ = _buf["path"].(string); !_ok_ { err = errors.New("path error"); return } } { var _ok_ bool; if _v.Header, _ok_ = _buf["header"].(string); !_ok_ { err = errors.New("header error"); return } } return