From 0ef46c2ebc2b59a26fb38c8a6936543043725081 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 1 Feb 2024 17:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86BOSS=E4=BB=BB=E6=84=8F?= =?UTF-8?q?=E9=9A=BE=E5=BA=A6=E7=B4=AF=E8=AE=A1=E5=87=BB=E6=9D=80BOSS{0}?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 234 ++++++++++++++++++ bin/json/game_buriedcondi.json | 10 +- bin/json/game_buriedtype.json | 8 +- bin/json/game_combatlevel.json | 2 +- bin/json/game_equip.json | 96 +++---- bin/json/game_gamesummarytab.json | 8 +- bin/json/game_mainstage.json | 2 +- bin/json/game_monsterformat.json | 18 +- bin/json/game_playerlv.json | 108 ++++---- bin/json/game_rdtasknpc.json | 47 ++-- bin/json/game_worldtask.json | 2 +- modules/integral/api_challengeover.go | 8 + sys/configure/structs/Game.BattleReadyData.go | 4 + sys/configure/structs/TEnum.EBagType.go | 1 + 14 files changed, 400 insertions(+), 148 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 9fa154a5c..03e4b953b 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -32,6 +32,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -68,6 +70,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -104,6 +108,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -140,6 +146,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -176,6 +184,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -212,6 +222,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -248,6 +260,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -284,6 +298,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -320,6 +336,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -356,6 +374,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -392,6 +412,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -428,6 +450,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -464,6 +488,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 10, "BossRounds": 0 }, @@ -500,6 +526,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -536,6 +564,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -572,6 +602,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -608,6 +640,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -646,6 +680,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 60, "BossRounds": 0 }, @@ -682,6 +718,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -718,6 +756,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -754,6 +794,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -790,6 +832,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 100, "BossRounds": 0 }, @@ -826,6 +870,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -862,6 +908,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -898,6 +946,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -934,6 +984,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -970,6 +1022,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1006,6 +1060,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1042,6 +1098,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1078,6 +1136,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 100, "BossRounds": 0 }, @@ -1114,6 +1174,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 100, "BossRounds": 0 }, @@ -1150,6 +1212,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 100, "BossRounds": 0 }, @@ -1186,6 +1250,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 100, "BossRounds": 0 }, @@ -1222,6 +1288,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1258,6 +1326,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1296,6 +1366,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 50, "BossRounds": 0 }, @@ -1332,6 +1404,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1371,6 +1445,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1407,6 +1483,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1443,6 +1521,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1479,6 +1559,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1515,6 +1597,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1553,6 +1637,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1591,6 +1677,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1633,6 +1721,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 720016, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1671,6 +1761,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1707,6 +1799,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1743,6 +1837,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1779,6 +1875,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1817,6 +1915,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1853,6 +1953,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1889,6 +1991,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1927,6 +2031,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -1968,6 +2074,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2011,6 +2119,8 @@ "RedAssistTeam": 720004, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2047,6 +2157,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2090,6 +2202,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2128,6 +2242,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2170,6 +2286,8 @@ "RedAssistTeam": 720003, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2206,6 +2324,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2242,6 +2362,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2282,6 +2404,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2318,6 +2442,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2354,6 +2480,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2390,6 +2518,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2426,6 +2556,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2462,6 +2594,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2511,6 +2645,8 @@ "RedAssistTeam": 720019, "BlueAssistTeam": 720020, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2547,6 +2683,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2587,6 +2725,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2623,6 +2763,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2659,6 +2801,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2695,6 +2839,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2731,6 +2877,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2767,6 +2915,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2803,6 +2953,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2839,6 +2991,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2875,6 +3029,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2911,6 +3067,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2947,6 +3105,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -2983,6 +3143,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3019,6 +3181,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3055,6 +3219,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3091,6 +3257,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3129,6 +3297,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3165,6 +3335,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3201,6 +3373,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3237,6 +3411,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3273,6 +3449,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3309,6 +3487,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3345,6 +3525,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3381,6 +3563,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3417,6 +3601,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3453,6 +3639,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3489,6 +3677,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3525,6 +3715,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 60, "BossRounds": 0 }, @@ -3561,6 +3753,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": true, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3597,6 +3791,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3633,6 +3829,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3669,6 +3867,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3705,6 +3905,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 60, "BossRounds": 0 }, @@ -3741,6 +3943,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 60, "BossRounds": 0 }, @@ -3777,6 +3981,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3813,6 +4019,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3849,6 +4057,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3885,6 +4095,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3921,6 +4133,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3957,6 +4171,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -3993,6 +4209,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -4029,6 +4247,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -4065,6 +4285,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -4101,6 +4323,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -4137,6 +4361,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -4173,6 +4399,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 0 }, @@ -4209,6 +4437,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 7 }, @@ -4245,6 +4475,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 7 }, @@ -4281,6 +4513,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, + "ShowSweep": false, + "ShowAutoBattle": false, "Numrounds": 0, "BossRounds": 7 } diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index acfffe0f5..4c7a5c92e 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -12075,7 +12075,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_369", - "text": "找平先生聊聊" + "text": "送信给戴安狐" }, "type": 20001, "valid": 0, @@ -32665,9 +32665,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1067", - "text": "主线关卡通关达到第5章的第4关开启" + "text": "世界任务20352完成后开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -32681,7 +32681,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20352 + ], "filter2": [] }, { diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 4a0c68923..ae82541dd 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1502,16 +1502,12 @@ { "id": 257, "insert": 2, - "filter": [ - "eq" - ] + "filter": [] }, { "id": 258, "insert": 2, - "filter": [ - "eq" - ] + "filter": [] }, { "id": 259, diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 6ea25a72e..923beb37e 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -361,7 +361,7 @@ }, { "id": 10011, - "scene": "leveldemo_island_1", + "scene": "leveldemo_chapter_4", "levelname": "Save the holy tree", "maintask": [ 11187001 diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json index a0ef9efdc..a908f2c61 100644 --- a/bin/json/game_equip.json +++ b/bin/json/game_equip.json @@ -31753,7 +31753,7 @@ }, { "id": "20001", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_649", "text": "平先生祖传菜刀" @@ -31802,7 +31802,7 @@ }, { "id": "20002", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_650", "text": "戈伯陈年铁内裤" @@ -31851,7 +31851,7 @@ }, { "id": "20011", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_651", "text": "王子皇家口水巾" @@ -31900,7 +31900,7 @@ }, { "id": "20012", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_652", "text": "宝贝老板黄金马桶" @@ -31949,7 +31949,7 @@ }, { "id": "20021", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_653", "text": "平先生祖传菜刀" @@ -31998,7 +31998,7 @@ }, { "id": "20022", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_654", "text": "戈伯陈年铁内裤" @@ -32047,7 +32047,7 @@ }, { "id": "20031", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_655", "text": "王子皇家口水巾" @@ -32096,7 +32096,7 @@ }, { "id": "20032", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_656", "text": "宝贝老板黄金马桶" @@ -32145,7 +32145,7 @@ }, { "id": "20041", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_657", "text": "平先生祖传菜刀" @@ -32194,7 +32194,7 @@ }, { "id": "20042", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_658", "text": "戈伯陈年铁内裤" @@ -32243,7 +32243,7 @@ }, { "id": "20051", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_659", "text": "王子皇家口水巾" @@ -32292,7 +32292,7 @@ }, { "id": "20052", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_660", "text": "宝贝老板黄金马桶" @@ -32341,7 +32341,7 @@ }, { "id": "21001", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_661", "text": "平先生祖传菜刀" @@ -32390,7 +32390,7 @@ }, { "id": "21002", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_662", "text": "戈伯陈年铁内裤" @@ -32439,7 +32439,7 @@ }, { "id": "21011", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_663", "text": "王子皇家口水巾" @@ -32488,7 +32488,7 @@ }, { "id": "21012", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_664", "text": "宝贝老板黄金马桶" @@ -32537,7 +32537,7 @@ }, { "id": "21021", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_665", "text": "平先生祖传菜刀" @@ -32584,7 +32584,7 @@ }, { "id": "21022", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_666", "text": "戈伯陈年铁内裤" @@ -32631,7 +32631,7 @@ }, { "id": "21031", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_667", "text": "王子皇家口水巾" @@ -32678,7 +32678,7 @@ }, { "id": "21032", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_668", "text": "宝贝老板黄金马桶" @@ -32725,7 +32725,7 @@ }, { "id": "21041", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_669", "text": "平先生祖传菜刀" @@ -32772,7 +32772,7 @@ }, { "id": "21042", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_670", "text": "戈伯陈年铁内裤" @@ -32819,7 +32819,7 @@ }, { "id": "21051", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_671", "text": "王子皇家口水巾" @@ -32866,7 +32866,7 @@ }, { "id": "21052", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_672", "text": "宝贝老板黄金马桶" @@ -32913,7 +32913,7 @@ }, { "id": "30001", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_673", "text": "火的热情护身符" @@ -32962,7 +32962,7 @@ }, { "id": "30002", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_674", "text": "林的感观护身符" @@ -33011,7 +33011,7 @@ }, { "id": "30011", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_675", "text": "水的包容护身符" @@ -33060,7 +33060,7 @@ }, { "id": "30012", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_676", "text": "光的荣耀护身符" @@ -33109,7 +33109,7 @@ }, { "id": "30021", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_677", "text": "火的热情护身符" @@ -33158,7 +33158,7 @@ }, { "id": "30022", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_678", "text": "林的感观护身符" @@ -33207,7 +33207,7 @@ }, { "id": "30031", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_679", "text": "水的包容护身符" @@ -33256,7 +33256,7 @@ }, { "id": "30032", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_680", "text": "光的荣耀护身符" @@ -33305,7 +33305,7 @@ }, { "id": "30041", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_681", "text": "火的热情护身符" @@ -33354,7 +33354,7 @@ }, { "id": "30042", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_682", "text": "林的感观护身符" @@ -33403,7 +33403,7 @@ }, { "id": "30051", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_683", "text": "水的包容护身符" @@ -33452,7 +33452,7 @@ }, { "id": "30052", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_684", "text": "光的荣耀护身符" @@ -33501,7 +33501,7 @@ }, { "id": "31001", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_685", "text": "火的热情护身符" @@ -33550,7 +33550,7 @@ }, { "id": "31002", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_686", "text": "林的感观护身符" @@ -33599,7 +33599,7 @@ }, { "id": "31011", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_687", "text": "水的包容护身符" @@ -33648,7 +33648,7 @@ }, { "id": "31012", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_688", "text": "光的荣耀护身符" @@ -33697,7 +33697,7 @@ }, { "id": "31021", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_689", "text": "火的热情护身符" @@ -33744,7 +33744,7 @@ }, { "id": "31022", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_690", "text": "林的感观护身符" @@ -33791,7 +33791,7 @@ }, { "id": "31031", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_691", "text": "水的包容护身符" @@ -33838,7 +33838,7 @@ }, { "id": "31032", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_692", "text": "光的荣耀护身符" @@ -33885,7 +33885,7 @@ }, { "id": "31041", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_693", "text": "火的热情护身符" @@ -33932,7 +33932,7 @@ }, { "id": "31042", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_694", "text": "林的感观护身符" @@ -33979,7 +33979,7 @@ }, { "id": "31051", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_695", "text": "水的包容护身符" @@ -34026,7 +34026,7 @@ }, { "id": "31052", - "equip_id": 2, + "equip_id": 3, "name": { "key": "equip_equip_name_696", "text": "光的荣耀护身符" diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index f64591c9f..c6829e5c2 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -14,7 +14,7 @@ "scale": 1.3, "usetext": { "key": "gamesummary_fathernode_usetext_1", - "text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。" + "text": "博克岛位于极北之地，那里是希卡普等人的故乡。据说维京人生来热情好客，更是与龙群生活在一起，希望这能是一场精彩的[color=#ffcc00]冒险之旅[/color]！" } }, { @@ -32,7 +32,7 @@ "scale": 1.3, "usetext": { "key": "gamesummary_fathernode_usetext_2", - "text": "探险！这是永远不会停歇的主题！开始你的[color=#ffcc00]冒险之旅[/color]吧！" + "text": "原始人聚集地充满着各种凶猛神奇的原始生物，环境恶劣、危机四伏。看来这趟[color=#ffcc00]冒险之旅[/color]注定不会一帆风顺。" } }, { @@ -50,7 +50,7 @@ "scale": 1.3, "usetext": { "key": "gamesummary_fathernode_usetext_3", - "text": "坏蛋联盟打算设计一场大骗局，让世人都以为他们是真的洗心革面、改邪归正…" + "text": "罪恶都市，一座繁华、独特而充满活力的现代化城市。它是月之大陆的娱乐和艺术中心，坏蛋联盟生活的地方。" } }, { @@ -68,7 +68,7 @@ "scale": 1.3, "usetext": { "key": "gamesummary_fathernode_usetext_4", - "text": "很久很久以前，在遥远的大沼泽里住着一个叫史瑞克的绿色怪物…" + "text": "童话王国，一个充满奇幻色彩与冒险元素的国度。匹诺曹、姜饼人等童话人物们生活在这里，而我们即将面对的或许是一场神秘而又危险的旅途。" } } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 797214608..5059e5094 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -6177,7 +6177,7 @@ "n": 1 } ], - "BattleReadyID": 10103001, + "BattleReadyID": 10500003, "FormatList": [ 1104008 ], diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 89c9ee58c..e30d1c213 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -267371,18 +267371,18 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 55007, + "heroid": -1, "star": 3, "equip": [], "newskill": [], "lv": 18, - "hppro": 3, + "hppro": 1, "atkpro": 1, - "defpro": 3, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 85, + "speed": -1, "modelsize": 1, "skillSequence": [] }, @@ -267432,20 +267432,20 @@ "Id": 1104008, "pos": 4, "captainId": 0, - "IsBoss": false, + "IsBoss": true, "bossHpCnt": 0, - "heroid": -1, + "heroid": 55007, "star": 3, "equip": [], "newskill": [], "lv": 18, - "hppro": 1, + "hppro": 3, "atkpro": 1, - "defpro": 1, + "defpro": 3, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": -1, + "speed": 85, "modelsize": 1, "skillSequence": [] }, diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json index d62568554..05a393bbc 100644 --- a/bin/json/game_playerlv.json +++ b/bin/json/game_playerlv.json @@ -15,7 +15,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -30,7 +30,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -45,7 +45,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -60,7 +60,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -75,7 +75,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -90,7 +90,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -105,7 +105,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -120,7 +120,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -135,7 +135,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -150,7 +150,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -165,7 +165,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -180,7 +180,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, @@ -195,12 +195,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 20, + "hero_lv": 25, "guild_boss_ceiling": 1 }, { @@ -210,12 +210,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 20 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 30, + "hero_lv": 25, "guild_boss_ceiling": 1 }, { @@ -230,7 +230,7 @@ ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 30, + "hero_lv": 25, "guild_boss_ceiling": 1 }, { @@ -290,7 +290,7 @@ ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 40, + "hero_lv": 35, "guild_boss_ceiling": 1 }, { @@ -305,7 +305,7 @@ ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 40, + "hero_lv": 35, "guild_boss_ceiling": 1 }, { @@ -320,7 +320,7 @@ ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 40, + "hero_lv": 35, "guild_boss_ceiling": 1 }, { @@ -365,7 +365,7 @@ ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 50, + "hero_lv": 40, "guild_boss_ceiling": 1 }, { @@ -375,12 +375,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 50, + "hero_lv": 45, "guild_boss_ceiling": 1 }, { @@ -390,12 +390,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 50, + "hero_lv": 45, "guild_boss_ceiling": 1 }, { @@ -405,12 +405,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 50, + "hero_lv": 45, "guild_boss_ceiling": 1 }, { @@ -420,7 +420,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, @@ -435,12 +435,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 60, + "hero_lv": 50, "guild_boss_ceiling": 1 }, { @@ -450,12 +450,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 60, + "hero_lv": 50, "guild_boss_ceiling": 1 }, { @@ -465,12 +465,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 60, + "hero_lv": 55, "guild_boss_ceiling": 1 }, { @@ -480,12 +480,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 60, + "hero_lv": 55, "guild_boss_ceiling": 1 }, { @@ -495,12 +495,12 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, "cops_ps_ceiling": 60, - "hero_lv": 60, + "hero_lv": 55, "guild_boss_ceiling": 1 }, { @@ -510,7 +510,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 40 } ], "ps_ceiling": 240, @@ -525,7 +525,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -540,7 +540,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -555,7 +555,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -570,7 +570,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -585,7 +585,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -600,7 +600,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -615,7 +615,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -630,7 +630,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -645,7 +645,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -660,7 +660,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 50 } ], "ps_ceiling": 240, @@ -675,7 +675,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 60 } ], "ps_ceiling": 240, @@ -690,7 +690,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 60 } ], "ps_ceiling": 240, @@ -705,7 +705,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 60 } ], "ps_ceiling": 240, @@ -720,7 +720,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 60 } ], "ps_ceiling": 240, @@ -735,7 +735,7 @@ { "a": "attr", "t": "ps", - "n": 30 + "n": 60 } ], "ps_ceiling": 240, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index fc7848fe6..a08ccd0bd 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -3108,7 +3108,7 @@ }, { "id": 110300, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -3123,7 +3123,7 @@ }, { "id": 110310, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -3138,7 +3138,7 @@ }, { "id": 110320, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -3168,7 +3168,7 @@ }, { "id": 110330, - "heroid": 25001, + "heroid": 35001, "Levelid": 0, "datas": [ "GameMain", @@ -3198,7 +3198,7 @@ }, { "id": 110340, - "heroid": 25001, + "heroid": 35001, "Levelid": 0, "datas": [], "event": [], @@ -3221,7 +3221,7 @@ }, { "id": 110345, - "heroid": 25001, + "heroid": 35001, "Levelid": 0, "datas": [ "GameMain", @@ -3251,7 +3251,7 @@ }, { "id": 110349, - "heroid": 25001, + "heroid": 35001, "Levelid": 0, "datas": [ "GameMain", @@ -3266,7 +3266,7 @@ }, { "id": 110350, - "heroid": 25001, + "heroid": 44006, "Levelid": 0, "datas": [ "GameMain", @@ -3281,7 +3281,7 @@ }, { "id": 110351, - "heroid": 25001, + "heroid": 44006, "Levelid": 0, "datas": [ "GameMain", @@ -3296,7 +3296,7 @@ }, { "id": 110352, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [], "event": [], @@ -3319,7 +3319,7 @@ }, { "id": 110359, - "heroid": 25001, + "heroid": 25002, "Levelid": 0, "datas": [ "GameMain", @@ -3364,7 +3364,7 @@ }, { "id": 110370, - "heroid": 25001, + "heroid": 25002, "Levelid": 0, "datas": [ "GuildScene", @@ -9060,7 +9060,7 @@ }, { "id": 60088, - "heroid": 25001, + "heroid": 34001, "Levelid": 0, "datas": [ "GameMain", @@ -9278,7 +9278,7 @@ }, { "id": 60138, - "heroid": 25001, + "heroid": 25004, "Levelid": 0, "datas": [ "GameMain", @@ -9316,7 +9316,7 @@ }, { "id": 60148, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", @@ -10226,7 +10226,7 @@ "Levelid": 0, "datas": [ "GameMain", - "跑环-连环-狐狸女", + "跑环-连环-沃尔夫", "901" ], "event": [ @@ -10241,12 +10241,12 @@ "Levelid": 0, "datas": [ "GameMain", - "氛围npc-警长", + "跑环-连环-狐狸女", "901" ], "event": [ 2, - 10000200 + 10000191 ], "goto": 0 }, @@ -10254,8 +10254,15 @@ "id": 60388, "heroid": 25001, "Levelid": 0, - "datas": [], - "event": [], + "datas": [ + "GameMain", + "跑环-复合-警长", + "901" + ], + "event": [ + 2, + 10000200 + ], "goto": 0 }, { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 5c08c18fc..afa12c54c 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -12551,7 +12551,7 @@ "completetask": [ 50000048 ], - "deliver_npc": 0, + "deliver_npc": 60388, "taskend_removeitem": [], "auto_accept": 0, "tasktips": true, diff --git a/modules/integral/api_challengeover.go b/modules/integral/api_challengeover.go index f04f57d20..c2dc78e2f 100644 --- a/modules/integral/api_challengeover.go +++ b/modules/integral/api_challengeover.go @@ -211,6 +211,14 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh } } } + for _, v := range req.Report.Completetask { + if v == 144 { // 临时数据 等配置来 + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype257, 1)) + } + if v == 145 { + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype258, 1)) + } + } if skillgroup != 0 { // 统计型任务 来统计积分boss难度对应的异化值 tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype259, strconv.Itoa(int(req.Nandu)), skillgroup)) } diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index 6b8e6e7c9..abc4d3a2e 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -35,6 +35,8 @@ type GameBattleReadyData struct { RedAssistTeam int32 BlueAssistTeam int32 CanFriendHelp bool + ShowSweep bool + ShowAutoBattle bool Numrounds int32 BossRounds int32 } @@ -174,6 +176,8 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RedAssistTeam"].(float64); !_ok_ { err = errors.New("RedAssistTeam error"); return }; _v.RedAssistTeam = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BlueAssistTeam"].(float64); !_ok_ { err = errors.New("BlueAssistTeam error"); return }; _v.BlueAssistTeam = int32(_tempNum_) } { var _ok_ bool; if _v.CanFriendHelp, _ok_ = _buf["CanFriendHelp"].(bool); !_ok_ { err = errors.New("CanFriendHelp error"); return } } + { var _ok_ bool; if _v.ShowSweep, _ok_ = _buf["ShowSweep"].(bool); !_ok_ { err = errors.New("ShowSweep error"); return } } + { var _ok_ bool; if _v.ShowAutoBattle, _ok_ = _buf["ShowAutoBattle"].(bool); !_ok_ { err = errors.New("ShowAutoBattle error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BossRounds"].(float64); !_ok_ { err = errors.New("BossRounds error"); return }; _v.BossRounds = int32(_tempNum_) } return diff --git a/sys/configure/structs/TEnum.EBagType.go b/sys/configure/structs/TEnum.EBagType.go index c54857260..57e4e7d7f 100644 --- a/sys/configure/structs/TEnum.EBagType.go +++ b/sys/configure/structs/TEnum.EBagType.go @@ -20,5 +20,6 @@ const ( TEnumEBagType_Money = 1000 TEnumEBagType_Equip = 1001 TEnumEBagType_Hero = 1002 + TEnumEBagType_Artifact = 1003 TEnumEBagType_Null = 9999 )