From 6272919a6ac1d949e4a3a77459def990312b016d Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 3 Apr 2023 14:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=98=E6=96=97=E8=A7=84=E5=88=99=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 157 ++++++ bin/json/game_dispatch_task.json | 148 ++--- bin/json/game_global.json | 4 +- bin/json/game_hero.json | 18 +- bin/json/game_herostrategy.json | 49 ++ bin/json/game_mainstage.json | 12 +- bin/json/game_monsterformat.json | 30 +- bin/json/game_pandamastj.json | 148 +++++ bin/json/game_teaching.json | 15 + bin/json/game_worldtask.json | 517 ++++++++++++++++-- modules/academy/api_challenge.go | 1 + modules/academy/api_teaching.go | 1 + sys/configure/structs/Game.BattleReadyData.go | 17 + .../structs/Game.HeroStrategyData.go | 2 + sys/configure/structs/Game.PandamasTjData.go | 2 + sys/configure/structs/Game.TeachingData.go | 2 + sys/configure/structs/Game.WorldTaskData.go | 2 + sys/configure/structs/game.globalData.go | 4 + 18 files changed, 992 insertions(+), 137 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index a74bf8aee..edd103ff3 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -3,6 +3,10 @@ "id": 100, "PlayType": "WorldTask", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -14,6 +18,10 @@ "id": 101, "PlayType": "MysteryMoon", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -25,6 +33,10 @@ "id": 102, "PlayType": "MainLine", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -36,6 +48,10 @@ "id": 103, "PlayType": "Pagoda", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -47,6 +63,10 @@ "id": 104, "PlayType": "ViKing", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -58,6 +78,10 @@ "id": 105, "PlayType": "Arena", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -69,6 +93,10 @@ "id": 106, "PlayType": "ArenaDef", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -80,6 +108,10 @@ "id": 107, "PlayType": "Hunting", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -91,6 +123,10 @@ "id": 108, "PlayType": "EnchantBoss", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -102,6 +138,10 @@ "id": 109, "PlayType": "Combat", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -113,6 +153,10 @@ "id": 110, "PlayType": "ArenaNpc", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -124,6 +168,10 @@ "id": 111, "PlayType": "pvp", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -135,11 +183,120 @@ "id": 112, "PlayType": "panda", "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], "DefaultHero": 0, "DisableHero": [], "LockSlots": [], "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 10 + }, + { + "id": 113, + "PlayType": "teaching", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 114, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 115, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_06" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 116, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_07" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 117, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_06" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 118, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_05_01" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 119, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "scenesfight_03_02" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 413664ff5..0eb375407 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 95, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 146, + "tasktime": 64, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 155, + "tasktime": 88, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 131, + "tasktime": 128, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 63, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 112, + "tasktime": 133, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 131, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 164, + "tasktime": 178, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 152, + "tasktime": 123, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 61, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 135, + "tasktime": 128, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 140, + "tasktime": 152, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 149, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 122, + "tasktime": 82, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 102, + "tasktime": 173, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 82, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 91, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 74, + "tasktime": 180, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 96, + "tasktime": 152, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 172, + "tasktime": 126, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 117, + "tasktime": 93, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 97, + "tasktime": 93, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 83, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 115, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 145, + "tasktime": 141, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 67, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 157, + "tasktime": 159, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 145, + "tasktime": 106, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 152, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 136, + "tasktime": 133, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 166, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 64, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 139, + "tasktime": 159, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 83, + "tasktime": 94, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 140, + "tasktime": 152, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 82, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 144, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 160, + "tasktime": 162, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 85, + "tasktime": 113, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 170, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 60, + "tasktime": 172, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 166, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 68, + "tasktime": 121, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 84, + "tasktime": 120, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 73, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 78, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 135, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 114, + "tasktime": 101, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 146, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 118, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 105, + "tasktime": 62, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 106, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 147, + "tasktime": 67, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 173, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 129, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 155, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 65, + "tasktime": 72, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 159, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 76, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 128, + "tasktime": 86, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 156, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 137, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 88, + "tasktime": 139, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 153, + "tasktime": 128, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 134, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 119, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 120, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 114, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 80, + "tasktime": 111, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 159, + "tasktime": 91, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 174, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 72, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 105, + "tasktime": 155, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 152, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 8cdc1f7ff..341dccbf4 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -658,6 +658,8 @@ "pandamas_tiguandiaoxiang_cd": 10, "Max_breakingbad_recipe": 15, "puzzlePromptNum": 5, - "Daily_Tips": 3 + "Daily_Tips": 3, + "Daily_Num": 2, + "Week_Num": 2 } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 2031ef6a6..1d2e79933 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -42,7 +42,7 @@ "key": "atlas_13001", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 50, "camerainterval": 0, "equiprcom": [ "10001", @@ -370,7 +370,7 @@ "key": "atlas_13005", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 10, "camerainterval": 0, "equiprcom": [ "11021", @@ -1682,7 +1682,7 @@ "key": "atlas_24001", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 30, "camerainterval": 0, "equiprcom": [ "10041", @@ -2338,7 +2338,7 @@ "key": "atlas_24009", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 10, "camerainterval": 0, "equiprcom": [ "11021", @@ -2830,7 +2830,7 @@ "key": "atlas_33002", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 40, "camerainterval": 0, "equiprcom": [ "11021", @@ -3404,7 +3404,7 @@ "key": "atlas_34003", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 70, "camerainterval": 0, "equiprcom": [ "11041", @@ -3814,7 +3814,7 @@ "key": "atlas_34008", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 80, "camerainterval": 0, "equiprcom": [ "11021", @@ -4388,7 +4388,7 @@ "key": "atlas_43001", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 90, "camerainterval": 0, "equiprcom": [ "11041", @@ -4798,7 +4798,7 @@ "key": "atlas_43006", "text": "" }, - "enteranivalue": -1, + "enteranivalue": 40, "camerainterval": 0, "equiprcom": [ "11021", diff --git a/bin/json/game_herostrategy.json b/bin/json/game_herostrategy.json index 1fa3860c4..c561c1445 100644 --- a/bin/json/game_herostrategy.json +++ b/bin/json/game_herostrategy.json @@ -1,6 +1,7 @@ [ { "heroid": "14001", + "battleready": 113, "task": [ 1, 2, @@ -22,6 +23,7 @@ }, { "heroid": "14002", + "battleready": 113, "task": [ 1, 2, @@ -43,6 +45,7 @@ }, { "heroid": "14003", + "battleready": 113, "task": [ 1, 2, @@ -64,6 +67,7 @@ }, { "heroid": "14004", + "battleready": 113, "task": [ 1, 2, @@ -85,6 +89,7 @@ }, { "heroid": "14005", + "battleready": 113, "task": [ 1, 2, @@ -106,6 +111,7 @@ }, { "heroid": "14006", + "battleready": 113, "task": [ 1, 2, @@ -127,6 +133,7 @@ }, { "heroid": "14007", + "battleready": 113, "task": [ 1, 2, @@ -148,6 +155,7 @@ }, { "heroid": "15001", + "battleready": 113, "task": [ 1, 2, @@ -169,6 +177,7 @@ }, { "heroid": "15002", + "battleready": 113, "task": [ 1, 2, @@ -190,6 +199,7 @@ }, { "heroid": "15003", + "battleready": 113, "task": [ 1, 2, @@ -211,6 +221,7 @@ }, { "heroid": "15004", + "battleready": 113, "task": [ 1, 2, @@ -232,6 +243,7 @@ }, { "heroid": "24001", + "battleready": 113, "task": [ 1, 2, @@ -253,6 +265,7 @@ }, { "heroid": "24002", + "battleready": 113, "task": [ 1, 2, @@ -274,6 +287,7 @@ }, { "heroid": "24003", + "battleready": 113, "task": [ 1, 2, @@ -295,6 +309,7 @@ }, { "heroid": "24004", + "battleready": 113, "task": [ 1, 2, @@ -316,6 +331,7 @@ }, { "heroid": "24005", + "battleready": 113, "task": [ 1, 2, @@ -337,6 +353,7 @@ }, { "heroid": "24006", + "battleready": 113, "task": [ 1, 2, @@ -358,6 +375,7 @@ }, { "heroid": "24007", + "battleready": 113, "task": [ 1, 2, @@ -379,6 +397,7 @@ }, { "heroid": "24008", + "battleready": 113, "task": [ 1, 2, @@ -400,6 +419,7 @@ }, { "heroid": "24009", + "battleready": 113, "task": [ 1, 2, @@ -421,6 +441,7 @@ }, { "heroid": "25001", + "battleready": 119, "task": [ 1, 2, @@ -442,6 +463,7 @@ }, { "heroid": "25002", + "battleready": 113, "task": [ 1, 2, @@ -463,6 +485,7 @@ }, { "heroid": "25003", + "battleready": 113, "task": [ 1, 2, @@ -484,6 +507,7 @@ }, { "heroid": "25004", + "battleready": 113, "task": [ 1, 2, @@ -505,6 +529,7 @@ }, { "heroid": "34001", + "battleready": 113, "task": [ 1, 2, @@ -526,6 +551,7 @@ }, { "heroid": "34002", + "battleready": 113, "task": [ 1, 2, @@ -547,6 +573,7 @@ }, { "heroid": "34003", + "battleready": 113, "task": [ 1, 2, @@ -568,6 +595,7 @@ }, { "heroid": "34004", + "battleready": 113, "task": [ 1, 2, @@ -589,6 +617,7 @@ }, { "heroid": "34005", + "battleready": 113, "task": [ 1, 2, @@ -610,6 +639,7 @@ }, { "heroid": "34006", + "battleready": 113, "task": [ 1, 2, @@ -631,6 +661,7 @@ }, { "heroid": "34007", + "battleready": 113, "task": [ 1, 2, @@ -652,6 +683,7 @@ }, { "heroid": "34008", + "battleready": 113, "task": [ 1, 2, @@ -673,6 +705,7 @@ }, { "heroid": "35001", + "battleready": 113, "task": [ 1, 2, @@ -694,6 +727,7 @@ }, { "heroid": "35002", + "battleready": 113, "task": [ 1, 2, @@ -715,6 +749,7 @@ }, { "heroid": "35003", + "battleready": 113, "task": [ 1, 2, @@ -736,6 +771,7 @@ }, { "heroid": "35004", + "battleready": 113, "task": [ 1, 2, @@ -757,6 +793,7 @@ }, { "heroid": "35005", + "battleready": 113, "task": [ 1, 2, @@ -778,6 +815,7 @@ }, { "heroid": "35006", + "battleready": 113, "task": [ 1, 2, @@ -799,6 +837,7 @@ }, { "heroid": "44001", + "battleready": 113, "task": [ 1, 2, @@ -820,6 +859,7 @@ }, { "heroid": "44002", + "battleready": 113, "task": [ 1, 2, @@ -841,6 +881,7 @@ }, { "heroid": "44003", + "battleready": 113, "task": [ 1, 2, @@ -862,6 +903,7 @@ }, { "heroid": "44004", + "battleready": 113, "task": [ 1, 2, @@ -883,6 +925,7 @@ }, { "heroid": "44006", + "battleready": 113, "task": [ 1, 2, @@ -904,6 +947,7 @@ }, { "heroid": "45001", + "battleready": 113, "task": [ 1, 2, @@ -925,6 +969,7 @@ }, { "heroid": "45002", + "battleready": 113, "task": [ 1, 2, @@ -946,6 +991,7 @@ }, { "heroid": "45003", + "battleready": 113, "task": [ 1, 2, @@ -967,6 +1013,7 @@ }, { "heroid": "45004", + "battleready": 113, "task": [ 1, 2, @@ -988,6 +1035,7 @@ }, { "heroid": "44005", + "battleready": 113, "task": [ 1, 2, @@ -1009,6 +1057,7 @@ }, { "heroid": "15005", + "battleready": 113, "task": [ 1, 2, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 7234efda2..b4bf4593a 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -149,7 +149,7 @@ ], "BattleReadyID": 102, "FormatList": [ - 101011 + 101021 ], "captainId": 240025, "star": [ @@ -236,7 +236,7 @@ ], "BattleReadyID": 102, "FormatList": [ - 101011 + 101031 ], "captainId": 530013, "star": [ @@ -323,7 +323,7 @@ ], "BattleReadyID": 102, "FormatList": [ - 101011 + 101041 ], "captainId": 530013, "star": [ @@ -347,7 +347,7 @@ "chapterid": 11001, "previoustage": 1100104, "Episodetype": 1, - "openlevel": 10, + "openlevel": 6, "Episodelocation": { "x": 0, "y": 0, @@ -410,7 +410,7 @@ ], "BattleReadyID": 102, "FormatList": [ - 101011 + 101051 ], "captainId": 440053, "star": [ @@ -497,7 +497,7 @@ ], "BattleReadyID": 102, "FormatList": [ - 101011 + 101061 ], "captainId": 440063, "star": [ diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index e9f1d05ca..d5f20e01e 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -7,7 +7,7 @@ "monster": 510023, "lv": 10, "hppro": 0.5, - "atkpro": 10, + "atkpro": 0.6, "defpro": 0.1, "modelsize": 1 }, @@ -19,7 +19,7 @@ "monster": 510053, "lv": 10, "hppro": 0.5, - "atkpro": 10, + "atkpro": 0.6, "defpro": 0.1, "modelsize": 1 }, @@ -31,7 +31,7 @@ "monster": 510043, "lv": 10, "hppro": 0.5, - "atkpro": 10, + "atkpro": 0.6, "defpro": 0.1, "modelsize": 1 }, @@ -43,7 +43,7 @@ "monster": 530013, "lv": 12, "hppro": 0.5, - "atkpro": 10, + "atkpro": 0.6, "defpro": 0.1, "modelsize": 1 }, @@ -55,7 +55,7 @@ "monster": 510033, "lv": 10, "hppro": 0.5, - "atkpro": 10, + "atkpro": 0.6, "defpro": 0.1, "modelsize": 1 }, @@ -66,8 +66,8 @@ "IsBoss": 0, "monster": 510023, "lv": 12, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.6, + "atkpro": 0.8, "defpro": 0.4, "modelsize": 1 }, @@ -78,8 +78,8 @@ "IsBoss": 0, "monster": 510023, "lv": 12, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.6, + "atkpro": 0.8, "defpro": 0.4, "modelsize": 1 }, @@ -90,8 +90,8 @@ "IsBoss": 0, "monster": 510033, "lv": 12, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.6, + "atkpro": 0.8, "defpro": 0.4, "modelsize": 1 }, @@ -102,8 +102,8 @@ "IsBoss": 0, "monster": 510033, "lv": 12, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.6, + "atkpro": 0.8, "defpro": 0.4, "modelsize": 1 }, @@ -114,8 +114,8 @@ "IsBoss": 0, "monster": 510033, "lv": 12, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.6, + "atkpro": 0.8, "defpro": 0.4, "modelsize": 1 }, diff --git a/bin/json/game_pandamastj.json b/bin/json/game_pandamastj.json index eef606ec6..b85c116e2 100644 --- a/bin/json/game_pandamastj.json +++ b/bin/json/game_pandamastj.json @@ -2,6 +2,10 @@ { "id": "100001", "tab_id": 1, + "Name": { + "key": "shirenyu100001", + "text": "一级木桩" + }, "effect_text": { "key": "xiaoguo_1", "text": "道具效果描述" @@ -16,6 +20,10 @@ { "id": "100002", "tab_id": 1, + "Name": { + "key": "shirenyu100002", + "text": "二级木桩" + }, "effect_text": { "key": "xiaoguo_2", "text": "道具效果描述" @@ -30,6 +38,10 @@ { "id": "100003", "tab_id": 1, + "Name": { + "key": "shirenyu100003", + "text": "三级木桩" + }, "effect_text": { "key": "xiaoguo_3", "text": "道具效果描述" @@ -44,6 +56,10 @@ { "id": "100004", "tab_id": 1, + "Name": { + "key": "shirenyu100004", + "text": "四级木桩" + }, "effect_text": { "key": "xiaoguo_4", "text": "道具效果描述" @@ -58,6 +74,10 @@ { "id": "100005", "tab_id": 1, + "Name": { + "key": "shirenyu100005", + "text": "五级木桩" + }, "effect_text": { "key": "xiaoguo_5", "text": "道具效果描述" @@ -72,6 +92,10 @@ { "id": "10001", "tab_id": 2, + "Name": { + "key": "shirenyu10001", + "text": "食人鱼" + }, "effect_text": { "key": "xiaoguo_6", "text": "道具效果描述" @@ -86,6 +110,10 @@ { "id": "10002", "tab_id": 2, + "Name": { + "key": "shirenyu10002", + "text": "闪闪" + }, "effect_text": { "key": "xiaoguo_7", "text": "道具效果描述" @@ -100,6 +128,10 @@ { "id": "10003", "tab_id": 2, + "Name": { + "key": "shirenyu10003", + "text": "蛇先生" + }, "effect_text": { "key": "xiaoguo_8", "text": "道具效果描述" @@ -114,6 +146,10 @@ { "id": "10004", "tab_id": 2, + "Name": { + "key": "shirenyu10004", + "text": "金猴" + }, "effect_text": { "key": "xiaoguo_9", "text": "道具效果描述" @@ -128,6 +164,10 @@ { "id": "10005", "tab_id": 2, + "Name": { + "key": "shirenyu10005", + "text": "鹤大师" + }, "effect_text": { "key": "xiaoguo_10", "text": "道具效果描述" @@ -142,6 +182,10 @@ { "id": "10006", "tab_id": 2, + "Name": { + "key": "shirenyu10006", + "text": "悍娇虎" + }, "effect_text": { "key": "xiaoguo_11", "text": "道具效果描述" @@ -156,6 +200,10 @@ { "id": "10007", "tab_id": 2, + "Name": { + "key": "shirenyu10007", + "text": "盖" + }, "effect_text": { "key": "xiaoguo_12", "text": "道具效果描述" @@ -170,6 +218,10 @@ { "id": "10008", "tab_id": 2, + "Name": { + "key": "shirenyu10008", + "text": "希卡普" + }, "effect_text": { "key": "xiaoguo_13", "text": "道具效果描述" @@ -184,6 +236,10 @@ { "id": "10009", "tab_id": 2, + "Name": { + "key": "shirenyu10009", + "text": "穿靴猫" + }, "effect_text": { "key": "xiaoguo_14", "text": "道具效果描述" @@ -198,6 +254,10 @@ { "id": "10010", "tab_id": 2, + "Name": { + "key": "shirenyu10010", + "text": "师父" + }, "effect_text": { "key": "xiaoguo_15", "text": "道具效果描述" @@ -212,6 +272,10 @@ { "id": "10011", "tab_id": 2, + "Name": { + "key": "shirenyu10011", + "text": "阿宝" + }, "effect_text": { "key": "xiaoguo_16", "text": "道具效果描述" @@ -226,6 +290,10 @@ { "id": "10012", "tab_id": 2, + "Name": { + "key": "shirenyu10012", + "text": "乌龟大师" + }, "effect_text": { "key": "xiaoguo_17", "text": "道具效果描述" @@ -240,6 +308,10 @@ { "id": "20001", "tab_id": 3, + "Name": { + "key": "shirenyu20001", + "text": "石锁" + }, "effect_text": { "key": "xiaoguo_18", "text": "道具效果描述" @@ -254,6 +326,10 @@ { "id": "20002", "tab_id": 3, + "Name": { + "key": "shirenyu20002", + "text": "双头空竹" + }, "effect_text": { "key": "xiaoguo_19", "text": "道具效果描述" @@ -268,6 +344,10 @@ { "id": "20003", "tab_id": 3, + "Name": { + "key": "shirenyu20003", + "text": "木爬架" + }, "effect_text": { "key": "xiaoguo_20", "text": "道具效果描述" @@ -282,6 +362,10 @@ { "id": "20004", "tab_id": 3, + "Name": { + "key": "shirenyu20004", + "text": "不倒翁" + }, "effect_text": { "key": "xiaoguo_21", "text": "道具效果描述" @@ -296,6 +380,10 @@ { "id": "20005", "tab_id": 3, + "Name": { + "key": "shirenyu20005", + "text": "棒槌" + }, "effect_text": { "key": "xiaoguo_22", "text": "道具效果描述" @@ -310,6 +398,10 @@ { "id": "20006", "tab_id": 3, + "Name": { + "key": "shirenyu20006", + "text": "铜铃" + }, "effect_text": { "key": "xiaoguo_23", "text": "道具效果描述" @@ -324,6 +416,10 @@ { "id": "20007", "tab_id": 3, + "Name": { + "key": "shirenyu20007", + "text": "尖刺吊环" + }, "effect_text": { "key": "xiaoguo_24", "text": "道具效果描述" @@ -338,6 +434,10 @@ { "id": "20008", "tab_id": 3, + "Name": { + "key": "shirenyu20008", + "text": "陀螺" + }, "effect_text": { "key": "xiaoguo_25", "text": "道具效果描述" @@ -352,6 +452,10 @@ { "id": "20009", "tab_id": 3, + "Name": { + "key": "shirenyu20009", + "text": "大转轮" + }, "effect_text": { "key": "xiaoguo_26", "text": "道具效果描述" @@ -366,6 +470,10 @@ { "id": "20010", "tab_id": 3, + "Name": { + "key": "shirenyu20010", + "text": "木头牌" + }, "effect_text": { "key": "xiaoguo_27", "text": "道具效果描述" @@ -380,6 +488,10 @@ { "id": "20011", "tab_id": 3, + "Name": { + "key": "shirenyu20011", + "text": "双节棍" + }, "effect_text": { "key": "xiaoguo_28", "text": "道具效果描述" @@ -394,6 +506,10 @@ { "id": "20012", "tab_id": 3, + "Name": { + "key": "shirenyu20012", + "text": "练功带" + }, "effect_text": { "key": "xiaoguo_29", "text": "道具效果描述" @@ -408,6 +524,10 @@ { "id": "20013", "tab_id": 3, + "Name": { + "key": "shirenyu20013", + "text": "七彩花棍" + }, "effect_text": { "key": "xiaoguo_30", "text": "道具效果描述" @@ -422,6 +542,10 @@ { "id": "20014", "tab_id": 3, + "Name": { + "key": "shirenyu20014", + "text": "流星飞镖" + }, "effect_text": { "key": "xiaoguo_31", "text": "道具效果描述" @@ -436,6 +560,10 @@ { "id": "20015", "tab_id": 3, + "Name": { + "key": "shirenyu20015", + "text": "冥想锣" + }, "effect_text": { "key": "xiaoguo_32", "text": "道具效果描述" @@ -450,6 +578,10 @@ { "id": "20016", "tab_id": 3, + "Name": { + "key": "shirenyu20016", + "text": "彩条龙" + }, "effect_text": { "key": "xiaoguo_33", "text": "道具效果描述" @@ -464,6 +596,10 @@ { "id": "20017", "tab_id": 3, + "Name": { + "key": "shirenyu20017", + "text": "孔雀毛扇" + }, "effect_text": { "key": "xiaoguo_34", "text": "道具效果描述" @@ -478,6 +614,10 @@ { "id": "20018", "tab_id": 3, + "Name": { + "key": "shirenyu20018", + "text": "平衡木" + }, "effect_text": { "key": "xiaoguo_35", "text": "道具效果描述" @@ -492,6 +632,10 @@ { "id": "20019", "tab_id": 3, + "Name": { + "key": "shirenyu20019", + "text": "铁环" + }, "effect_text": { "key": "xiaoguo_36", "text": "道具效果描述" @@ -506,6 +650,10 @@ { "id": "20020", "tab_id": 3, + "Name": { + "key": "shirenyu20020", + "text": "太极球" + }, "effect_text": { "key": "xiaoguo_37", "text": "道具效果描述" diff --git a/bin/json/game_teaching.json b/bin/json/game_teaching.json index 41f3296d7..c2a4b84fe 100644 --- a/bin/json/game_teaching.json +++ b/bin/json/game_teaching.json @@ -1,6 +1,7 @@ [ { "id": 10001, + "battleready": 113, "tab": 1, "suittype": 1, "png1": "buff_2", @@ -46,6 +47,7 @@ }, { "id": 10002, + "battleready": 113, "tab": 1, "suittype": 1, "png1": "debuff_1", @@ -91,6 +93,7 @@ }, { "id": 10003, + "battleready": 113, "tab": 1, "suittype": 1, "png1": "buff_2", @@ -136,6 +139,7 @@ }, { "id": 20001, + "battleready": 113, "tab": 1, "suittype": 2, "png1": "buff_2", @@ -181,6 +185,7 @@ }, { "id": 20002, + "battleready": 113, "tab": 1, "suittype": 2, "png1": "buff_2", @@ -226,6 +231,7 @@ }, { "id": 20003, + "battleready": 113, "tab": 1, "suittype": 2, "png1": "buff_2", @@ -271,6 +277,7 @@ }, { "id": 30001, + "battleready": 113, "tab": 1, "suittype": 3, "png1": "buff_2", @@ -316,6 +323,7 @@ }, { "id": 30002, + "battleready": 113, "tab": 1, "suittype": 3, "png1": "buff_2", @@ -361,6 +369,7 @@ }, { "id": 30003, + "battleready": 113, "tab": 1, "suittype": 3, "png1": "buff_2", @@ -406,6 +415,7 @@ }, { "id": 40001, + "battleready": 113, "tab": 1, "suittype": 4, "png1": "buff_2", @@ -451,6 +461,7 @@ }, { "id": 40002, + "battleready": 113, "tab": 1, "suittype": 4, "png1": "buff_2", @@ -496,6 +507,7 @@ }, { "id": 40003, + "battleready": 113, "tab": 1, "suittype": 4, "png1": "buff_2", @@ -541,6 +553,7 @@ }, { "id": 50001, + "battleready": 113, "tab": 1, "suittype": 5, "png1": "buff_2", @@ -586,6 +599,7 @@ }, { "id": 50002, + "battleready": 113, "tab": 1, "suittype": 5, "png1": "buff_2", @@ -631,6 +645,7 @@ }, { "id": 50003, + "battleready": 113, "tab": 1, "suittype": 5, "png1": "buff_2", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 33579aac8..c6619acf1 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -2,9 +2,10 @@ { "key": 20010, "lock": 1, + "lockend": 0, "ontxe": 0, "id_after": 20020, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -39,9 +40,10 @@ { "key": 20020, "lock": 1, + "lockend": 0, "ontxe": 20010, "id_after": 20030, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -76,9 +78,10 @@ { "key": 20030, "lock": 1, + "lockend": 0, "ontxe": 20020, "id_after": 20040, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -111,9 +114,10 @@ { "key": 20040, "lock": 1, + "lockend": 0, "ontxe": 20030, "id_after": 20050, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -146,9 +150,10 @@ { "key": 20050, "lock": 1, + "lockend": 0, "ontxe": 20040, "id_after": 20060, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -181,9 +186,10 @@ { "key": 20060, "lock": 1, + "lockend": 0, "ontxe": 20050, "id_after": 20070, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -216,9 +222,10 @@ { "key": 20070, "lock": 1, + "lockend": 0, "ontxe": 20060, "id_after": 20080, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -251,9 +258,10 @@ { "key": 20080, "lock": 1, + "lockend": 0, "ontxe": 20070, "id_after": 20090, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -286,9 +294,10 @@ { "key": 20090, "lock": 1, + "lockend": 0, "ontxe": 20080, "id_after": 20100, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -321,9 +330,10 @@ { "key": 20100, "lock": 1, + "lockend": 0, "ontxe": 20090, "id_after": 20110, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -356,9 +366,10 @@ { "key": 20110, "lock": 1, + "lockend": 0, "ontxe": 20100, "id_after": 0, - "group": 20010, + "group": 210, "des": 2, "icon": "", "task_Tname": { @@ -391,9 +402,10 @@ { "key": 30010, "lock": 1, + "lockend": 0, "ontxe": 20010, "id_after": 0, - "group": 30010, + "group": 310, "des": 3, "icon": "", "task_Tname": { @@ -426,9 +438,10 @@ { "key": 40010, "lock": 1, + "lockend": 0, "ontxe": 20020, "id_after": 40020, - "group": 30020, + "group": 320, "des": 3, "icon": "", "task_Tname": { @@ -461,9 +474,10 @@ { "key": 40020, "lock": 1, + "lockend": 0, "ontxe": 40010, "id_after": 0, - "group": 30020, + "group": 320, "des": 3, "icon": "", "task_Tname": { @@ -496,9 +510,10 @@ { "key": 50010, "lock": 1, + "lockend": 0, "ontxe": 20030, "id_after": 50011, - "group": 30030, + "group": 330, "des": 3, "icon": "", "task_Tname": { @@ -531,9 +546,10 @@ { "key": 50011, "lock": 1, + "lockend": 0, "ontxe": 50010, "id_after": 0, - "group": 30030, + "group": 330, "des": 3, "icon": "", "task_Tname": { @@ -566,9 +582,10 @@ { "key": 60010, "lock": 1, + "lockend": 0, "ontxe": 20040, "id_after": 0, - "group": 30040, + "group": 340, "des": 3, "icon": "", "task_Tname": { @@ -601,9 +618,10 @@ { "key": 70010, "lock": 1, + "lockend": 0, "ontxe": 20050, "id_after": 0, - "group": 30050, + "group": 350, "des": 3, "icon": "", "task_Tname": { @@ -636,9 +654,10 @@ { "key": 80010, "lock": 1, + "lockend": 0, "ontxe": 20060, "id_after": 0, - "group": 30060, + "group": 360, "des": 3, "icon": "", "task_Tname": { @@ -669,11 +688,12 @@ "module": [] }, { - "key": 400010, + "key": 100010, "lock": 1, - "ontxe": 20050, + "lockend": 5, + "ontxe": 20010, "id_after": 0, - "group": 10010, + "group": 110, "des": 1, "icon": "", "task_Tname": { @@ -681,19 +701,235 @@ "text": "1" }, "task_name": { - "key": "Daily_tasks", + "key": "Daily_tasks1", "text": "1" }, "task_display": { "key": "story_80", "text": "1" }, - "npc": 0, + "npc": 10010, "completetask": [ 0 ], - "deliver_npc": 0, - "auto_accept": 1, + "deliver_npc": 10012, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 999 + } + ], + "module": [] + }, + { + "key": 100020, + "lock": 1, + "lockend": 5, + "ontxe": 20010, + "id_after": 0, + "group": 110, + "des": 1, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Daily_tasks2", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10010, + "completetask": [ + 0 + ], + "deliver_npc": 10012, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 999 + } + ], + "module": [] + }, + { + "key": 100030, + "lock": 1, + "lockend": 5, + "ontxe": 20010, + "id_after": 0, + "group": 110, + "des": 1, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Daily_tasks3", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10010, + "completetask": [ + 0 + ], + "deliver_npc": 10012, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 999 + } + ], + "module": [] + }, + { + "key": 100040, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 110, + "des": 1, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Daily_tasks4", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10010, + "completetask": [ + 0 + ], + "deliver_npc": 10012, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 999 + } + ], + "module": [] + }, + { + "key": 100050, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 110, + "des": 1, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Daily_tasks5", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10010, + "completetask": [ + 0 + ], + "deliver_npc": 10012, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 999 + } + ], + "module": [] + }, + { + "key": 100060, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 110, + "des": 1, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Daily_tasks6", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10010, + "completetask": [ + 0 + ], + "deliver_npc": 10012, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 999 + } + ], + "module": [] + }, + { + "key": 100070, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 110, + "des": 1, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Daily_tasks7", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10010, + "completetask": [ + 0 + ], + "deliver_npc": 10012, + "auto_accept": 0, "reword": [ { "a": "item", @@ -706,9 +942,10 @@ { "key": 500010, "lock": 1, - "ontxe": 20050, + "lockend": 5, + "ontxe": 20010, "id_after": 0, - "group": 40010, + "group": 410, "des": 4, "icon": "", "task_Tname": { @@ -716,19 +953,235 @@ "text": "1" }, "task_name": { - "key": "Weekly_Tasks", + "key": "Weekly_Tasks1", "text": "1" }, "task_display": { "key": "story_80", "text": "1" }, - "npc": 0, + "npc": 10040, "completetask": [ 0 ], - "deliver_npc": 0, - "auto_accept": 1, + "deliver_npc": 10082, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 888 + } + ], + "module": [] + }, + { + "key": 500020, + "lock": 1, + "lockend": 5, + "ontxe": 20010, + "id_after": 0, + "group": 410, + "des": 4, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Weekly_Tasks2", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10040, + "completetask": [ + 0 + ], + "deliver_npc": 10082, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 888 + } + ], + "module": [] + }, + { + "key": 500030, + "lock": 1, + "lockend": 5, + "ontxe": 20010, + "id_after": 0, + "group": 410, + "des": 4, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Weekly_Tasks3", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10040, + "completetask": [ + 0 + ], + "deliver_npc": 10082, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 888 + } + ], + "module": [] + }, + { + "key": 500040, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 410, + "des": 4, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Weekly_Tasks4", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10040, + "completetask": [ + 0 + ], + "deliver_npc": 10082, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 888 + } + ], + "module": [] + }, + { + "key": 500050, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 410, + "des": 4, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Weekly_Tasks5", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10040, + "completetask": [ + 0 + ], + "deliver_npc": 10082, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 888 + } + ], + "module": [] + }, + { + "key": 500060, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 410, + "des": 4, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Weekly_Tasks6", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10040, + "completetask": [ + 0 + ], + "deliver_npc": 10082, + "auto_accept": 0, + "reword": [ + { + "a": "item", + "t": "110001", + "n": 888 + } + ], + "module": [] + }, + { + "key": 500070, + "lock": 6, + "lockend": 20, + "ontxe": 20010, + "id_after": 0, + "group": 410, + "des": 4, + "icon": "", + "task_Tname": { + "key": "story_80", + "text": "1" + }, + "task_name": { + "key": "Weekly_Tasks7", + "text": "1" + }, + "task_display": { + "key": "story_80", + "text": "1" + }, + "npc": 10040, + "completetask": [ + 0 + ], + "deliver_npc": 10082, + "auto_accept": 0, "reword": [ { "a": "item", diff --git a/modules/academy/api_challenge.go b/modules/academy/api_challenge.go index e7e48cea8..b0f535d0b 100644 --- a/modules/academy/api_challenge.go +++ b/modules/academy/api_challenge.go @@ -27,6 +27,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallen session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: cd, Level: req.Level, Info: &pb.BattleInfo{ Id: record.Id, Title: record.Title, + Rulesid: level.Battleready, Btype: record.Btype, Ptype: record.Ptype, RedCompId: record.RedCompId, diff --git a/modules/academy/api_teaching.go b/modules/academy/api_teaching.go index d2f3f89ad..1d28f0166 100644 --- a/modules/academy/api_teaching.go +++ b/modules/academy/api_teaching.go @@ -27,6 +27,7 @@ func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeaching session.SendMsg(string(this.module.GetType()), "teaching", &pb.AcademyTeachingResp{Code: cd, HeroId: req.HeroId, Info: &pb.BattleInfo{ Id: record.Id, Title: record.Title, + Rulesid: level.Battleready, Btype: record.Btype, Ptype: record.Ptype, RedCompId: record.RedCompId, diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index e3b84ff4e..00b3ce40f 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -14,6 +14,8 @@ type GameBattleReadyData struct { Id int32 PlayType string HeroCount int32 + ReadyScene string + BattleScenes []string DefaultHero int32 DisableHero []string LockSlots []int32 @@ -32,6 +34,21 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro { 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; if _v.PlayType, _ok_ = _buf["PlayType"].(string); !_ok_ { err = errors.New("PlayType error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HeroCount"].(float64); !_ok_ { err = errors.New("HeroCount error"); return }; _v.HeroCount = int32(_tempNum_) } + { var _ok_ bool; if _v.ReadyScene, _ok_ = _buf["readyScene"].(string); !_ok_ { err = errors.New("readyScene error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["battleScenes"].([]interface{}); !_ok_ { err = errors.New("battleScenes error"); return } + + _v.BattleScenes = 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.BattleScenes = append(_v.BattleScenes, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.HeroStrategyData.go b/sys/configure/structs/Game.HeroStrategyData.go index e1ac07bdb..d2f260c0a 100644 --- a/sys/configure/structs/Game.HeroStrategyData.go +++ b/sys/configure/structs/Game.HeroStrategyData.go @@ -12,6 +12,7 @@ import "errors" type GameHeroStrategyData struct { Heroid string + Battleready int32 Task []int32 UsFormatList []int32 FormatList []int32 @@ -26,6 +27,7 @@ func (*GameHeroStrategyData) GetTypeId() int32 { func (_v *GameHeroStrategyData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Heroid, _ok_ = _buf["heroid"].(string); !_ok_ { err = errors.New("heroid error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battleready"].(float64); !_ok_ { err = errors.New("battleready error"); return }; _v.Battleready = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.PandamasTjData.go b/sys/configure/structs/Game.PandamasTjData.go index 609f4b814..b6d32811f 100644 --- a/sys/configure/structs/Game.PandamasTjData.go +++ b/sys/configure/structs/Game.PandamasTjData.go @@ -13,6 +13,7 @@ import "errors" type GamePandamasTjData struct { Id string TabId int32 + Name string EffectText string ContentText string Icon string @@ -28,6 +29,7 @@ func (*GamePandamasTjData) GetTypeId() int32 { func (_v *GamePandamasTjData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab_id"].(float64); !_ok_ { err = errors.New("tab_id error"); return }; _v.TabId = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["effect_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.EffectText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.EffectText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } diff --git a/sys/configure/structs/Game.TeachingData.go b/sys/configure/structs/Game.TeachingData.go index 4b223aae2..86d83a17d 100644 --- a/sys/configure/structs/Game.TeachingData.go +++ b/sys/configure/structs/Game.TeachingData.go @@ -12,6 +12,7 @@ import "errors" type GameTeachingData struct { Id int32 + Battleready int32 Tab int32 Suittype int32 Png1 string @@ -35,6 +36,7 @@ func (*GameTeachingData) GetTypeId() int32 { func (_v *GameTeachingData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battleready"].(float64); !_ok_ { err = errors.New("battleready error"); return }; _v.Battleready = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) } { var _ok_ bool; if _v.Png1, _ok_ = _buf["png1"].(string); !_ok_ { err = errors.New("png1 error"); return } } diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index 7c1c9ba28..e2934bcef 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -13,6 +13,7 @@ import "errors" type GameWorldTaskData struct { Key int32 Lock int32 + Lockend int32 Ontxe int32 IdAfter int32 Group int32 @@ -38,6 +39,7 @@ func (*GameWorldTaskData) GetTypeId() int32 { func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lockend"].(float64); !_ok_ { err = errors.New("lockend error"); return }; _v.Lockend = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ontxe"].(float64); !_ok_ { err = errors.New("ontxe error"); return }; _v.Ontxe = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_after"].(float64); !_ok_ { err = errors.New("id_after error"); return }; _v.IdAfter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 6f8d022cc..0aae368df 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -200,6 +200,8 @@ type GameGlobalData struct { MaxBreakingbadRecipe int32 PuzzlePromptNum int32 DailyTips int32 + DailyNum int32 + WeekNum int32 } const TypeId_GameGlobalData = 477542761 @@ -814,6 +816,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Max_breakingbad_recipe"].(float64); !_ok_ { err = errors.New("Max_breakingbad_recipe error"); return }; _v.MaxBreakingbadRecipe = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["puzzlePromptNum"].(float64); !_ok_ { err = errors.New("puzzlePromptNum error"); return }; _v.PuzzlePromptNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Daily_Tips"].(float64); !_ok_ { err = errors.New("Daily_Tips error"); return }; _v.DailyTips = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Daily_Num"].(float64); !_ok_ { err = errors.New("Daily_Num error"); return }; _v.DailyNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Week_Num"].(float64); !_ok_ { err = errors.New("Week_Num error"); return }; _v.WeekNum = int32(_tempNum_) } return }