From d2ba6d407d5866093e452a5ac0aa28a10bd6c033 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 5 Sep 2023 15:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0boos=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 4 +- bin/json/game_buriedtype.json | 7 + bin/json/game_buzkashilv.json | 12 +- bin/json/game_global.json | 4 +- bin/json/game_mainboss.json | 360 ++++-------- bin/json/game_mainchapter.json | 74 ++- bin/json/game_mainstage.json | 454 ++++++++------ bin/json/game_rdtasknpc.json | 4 +- bin/json/game_skillafteratk.json | 555 ++++++++++++++++-- bin/json/game_skillatk.json | 36 +- bin/json/game_skillbuff.json | 4 +- bin/json/game_skillpassive.json | 413 ++++++++++++- bin/json/game_worldall.json | 2 +- modules/mainline/model_mainline.go | 4 + pb/mainline_db.pb.go | 167 +++--- sys/configure/structs/Game.MainBossData.go | 2 - sys/configure/structs/Game.MainChapterData.go | 17 + sys/configure/structs/game.globalData.go | 4 + 18 files changed, 1506 insertions(+), 617 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index a7da03518..00ae08e5b 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -21391,7 +21391,7 @@ "key": "buried_buried_condi_tasktxt_753", "text": "恢复铁匠铺监控" }, - "type": 70, + "type": 20001, "valid": 0, "head": { "a": "attr", @@ -21401,7 +21401,7 @@ "NPC": 10295, "value": 1, "filter": [ - 111 + 10500 ], "filter2": [ "通关的关卡ID", diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 15fe25e6f..aa0e2f075 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1354,5 +1354,12 @@ "filter": [ "eq" ] + }, + { + "id": 233, + "insert": 1, + "filter": [ + "eq" + ] } ] \ No newline at end of file diff --git a/bin/json/game_buzkashilv.json b/bin/json/game_buzkashilv.json index ca7f65a7c..ca6dc92d7 100644 --- a/bin/json/game_buzkashilv.json +++ b/bin/json/game_buzkashilv.json @@ -1,32 +1,32 @@ [ { "num": 1, - "score": "c", + "score": "gh_img_c", "value": 10 }, { "num": 2, - "score": "b", + "score": "gh_img_b", "value": 20 }, { "num": 3, - "score": "a", + "score": "gh_img_a", "value": 50 }, { "num": 4, - "score": "s", + "score": "gh_img_s", "value": 80 }, { "num": 5, - "score": "ss", + "score": "gh_img_ss", "value": 100 }, { "num": 6, - "score": "sss", + "score": "gh_img_sss", "value": 120 } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 9f5c13573..20d03c4e4 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -740,7 +740,9 @@ "buzkashi_sendtime": 1000, "buzkashi_speedbumptime": 3000, "buzkashi_speedbumphp": 1, - "buzkashi_sprintbumpscore": 10, + "buzkashi_sprintbumpscore": 5, + "buzkashi_goalscore": 5, + "buzkashi_goalteamscore": 10, "buzkashi_bumpdis": 5, "buzkashi_recovertime": 2000, "buzkashi_recoverHp": 1, diff --git a/bin/json/game_mainboss.json b/bin/json/game_mainboss.json index e3a3f1f3b..74ddbbdd1 100644 --- a/bin/json/game_mainboss.json +++ b/bin/json/game_mainboss.json @@ -2,9 +2,8 @@ { "id": 1100101, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -24,9 +23,8 @@ { "id": 1100102, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -46,9 +44,8 @@ { "id": 1100103, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -68,9 +65,8 @@ { "id": 1100104, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -90,9 +86,8 @@ { "id": 1100105, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -112,9 +107,8 @@ { "id": 1100106, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -134,9 +128,8 @@ { "id": 1100107, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -156,9 +149,8 @@ { "id": 1100108, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -178,9 +170,8 @@ { "id": 1100109, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -200,9 +191,8 @@ { "id": 1100110, "monster_chapter": 11001, - "MonsterDisplay_Ip": 1, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -222,9 +212,8 @@ { "id": 1100201, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -244,9 +233,8 @@ { "id": 1100202, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -266,9 +254,8 @@ { "id": 1100203, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -288,9 +275,8 @@ { "id": 1100204, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -310,9 +296,8 @@ { "id": 1100205, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -332,9 +317,8 @@ { "id": 1100206, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -354,9 +338,8 @@ { "id": 1100207, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -376,9 +359,8 @@ { "id": 1100208, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -398,9 +380,8 @@ { "id": 1100209, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -420,9 +401,8 @@ { "id": 1100210, "monster_chapter": 11002, - "MonsterDisplay_Ip": 2, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -442,9 +422,8 @@ { "id": 1100301, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -464,9 +443,8 @@ { "id": 1100302, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -486,9 +464,8 @@ { "id": 1100303, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -508,9 +485,8 @@ { "id": 1100304, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -530,9 +506,8 @@ { "id": 1100305, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -552,9 +527,8 @@ { "id": 1100306, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -574,9 +548,8 @@ { "id": 1100307, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -596,9 +569,8 @@ { "id": 1100308, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -618,9 +590,8 @@ { "id": 1100309, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -640,9 +611,8 @@ { "id": 1100310, "monster_chapter": 11003, - "MonsterDisplay_Ip": 3, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -662,9 +632,8 @@ { "id": 1100401, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -684,9 +653,8 @@ { "id": 1100402, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -706,9 +674,8 @@ { "id": 1100403, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -728,9 +695,8 @@ { "id": 1100404, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -750,9 +716,8 @@ { "id": 1100405, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -772,9 +737,8 @@ { "id": 1100406, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -794,9 +758,8 @@ { "id": 1100407, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -816,9 +779,8 @@ { "id": 1100408, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -838,9 +800,8 @@ { "id": 1100409, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -860,9 +821,8 @@ { "id": 1100410, "monster_chapter": 11004, - "MonsterDisplay_Ip": 4, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -882,9 +842,8 @@ { "id": 1100501, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -904,9 +863,8 @@ { "id": 1100502, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -926,9 +884,8 @@ { "id": 1100503, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -948,9 +905,8 @@ { "id": 1100504, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -970,9 +926,8 @@ { "id": 1100505, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -992,9 +947,8 @@ { "id": 1100506, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1014,9 +968,8 @@ { "id": 1100507, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1036,9 +989,8 @@ { "id": 1100508, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1058,9 +1010,8 @@ { "id": 1100509, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1080,9 +1031,8 @@ { "id": 1100510, "monster_chapter": 11005, - "MonsterDisplay_Ip": 5, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1102,9 +1052,8 @@ { "id": 1100601, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1124,9 +1073,8 @@ { "id": 1100602, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1146,9 +1094,8 @@ { "id": 1100603, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1168,9 +1115,8 @@ { "id": 1100604, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1190,9 +1136,8 @@ { "id": 1100605, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1212,9 +1157,8 @@ { "id": 1100606, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1234,9 +1178,8 @@ { "id": 1100607, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1256,9 +1199,8 @@ { "id": 1100608, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1278,9 +1220,8 @@ { "id": 1100609, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1300,9 +1241,8 @@ { "id": 1100610, "monster_chapter": 11006, - "MonsterDisplay_Ip": 6, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1322,9 +1262,8 @@ { "id": 1100701, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1344,9 +1283,8 @@ { "id": 1100702, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1366,9 +1304,8 @@ { "id": 1100703, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1388,9 +1325,8 @@ { "id": 1100704, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1410,9 +1346,8 @@ { "id": 1100705, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1432,9 +1367,8 @@ { "id": 1100706, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1454,9 +1388,8 @@ { "id": 1100707, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1476,9 +1409,8 @@ { "id": 1100708, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1498,9 +1430,8 @@ { "id": 1100709, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1520,9 +1451,8 @@ { "id": 1100710, "monster_chapter": 11007, - "MonsterDisplay_Ip": 7, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1542,9 +1472,8 @@ { "id": 1100801, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1564,9 +1493,8 @@ { "id": 1100802, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1586,9 +1514,8 @@ { "id": 1100803, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1608,9 +1535,8 @@ { "id": 1100804, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1630,9 +1556,8 @@ { "id": 1100805, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1652,9 +1577,8 @@ { "id": 1100806, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1674,9 +1598,8 @@ { "id": 1100807, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1696,9 +1619,8 @@ { "id": 1100808, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1718,9 +1640,8 @@ { "id": 1100809, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1740,9 +1661,8 @@ { "id": 1100810, "monster_chapter": 11008, - "MonsterDisplay_Ip": 8, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1762,9 +1682,8 @@ { "id": 1100901, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1784,9 +1703,8 @@ { "id": 1100902, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1806,9 +1724,8 @@ { "id": 1100903, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1828,9 +1745,8 @@ { "id": 1100904, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1850,9 +1766,8 @@ { "id": 1100905, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1872,9 +1787,8 @@ { "id": 1100906, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1894,9 +1808,8 @@ { "id": 1100907, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1916,9 +1829,8 @@ { "id": 1100908, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1938,9 +1850,8 @@ { "id": 1100909, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1960,9 +1871,8 @@ { "id": 1100910, "monster_chapter": 11009, - "MonsterDisplay_Ip": 9, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -1982,9 +1892,8 @@ { "id": 1101001, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2004,9 +1913,8 @@ { "id": 1101002, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2026,9 +1934,8 @@ { "id": 1101003, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2048,9 +1955,8 @@ { "id": 1101004, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2070,9 +1976,8 @@ { "id": 1101005, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2092,9 +1997,8 @@ { "id": 1101006, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2114,9 +2018,8 @@ { "id": 1101007, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2136,9 +2039,8 @@ { "id": 1101008, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2158,9 +2060,8 @@ { "id": 1101009, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2180,9 +2081,8 @@ { "id": 1101010, "monster_chapter": 11010, - "MonsterDisplay_Ip": 10, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2202,9 +2102,8 @@ { "id": 1101101, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2224,9 +2123,8 @@ { "id": 1101102, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2246,9 +2144,8 @@ { "id": 1101103, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2268,9 +2165,8 @@ { "id": 1101104, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2290,9 +2186,8 @@ { "id": 1101105, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2312,9 +2207,8 @@ { "id": 1101106, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2334,9 +2228,8 @@ { "id": 1101107, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2356,9 +2249,8 @@ { "id": 1101108, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2378,9 +2270,8 @@ { "id": 1101109, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2400,9 +2291,8 @@ { "id": 1101110, "monster_chapter": 11011, - "MonsterDisplay_Ip": 11, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2422,9 +2312,8 @@ { "id": 1101201, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 1, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2444,9 +2333,8 @@ { "id": 1101202, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 2, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2466,9 +2354,8 @@ { "id": 1101203, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 3, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2488,9 +2375,8 @@ { "id": 1101204, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 4, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2510,9 +2396,8 @@ { "id": 1101205, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 5, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2532,9 +2417,8 @@ { "id": 1101206, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 6, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2554,9 +2438,8 @@ { "id": 1101207, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 7, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2576,9 +2459,8 @@ { "id": 1101208, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 8, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2598,9 +2480,8 @@ { "id": 1101209, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 9, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], @@ -2620,9 +2501,8 @@ { "id": 1101210, "monster_chapter": 11012, - "MonsterDisplay_Ip": 12, "monster_strength": 10, - "battlereadyid": 0, + "battlereadyid": 119, "formatList": [ 101011 ], diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json index e99984dd2..b13d67ace 100644 --- a/bin/json/game_mainchapter.json +++ b/bin/json/game_mainchapter.json @@ -37,7 +37,11 @@ }, "starreward": 11001, "exploreward": 11001, - "bosspro": 1000 + "bosspro": 1000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11002, @@ -77,7 +81,11 @@ }, "starreward": 11002, "exploreward": 11002, - "bosspro": 2000 + "bosspro": 2000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11003, @@ -117,7 +125,11 @@ }, "starreward": 11003, "exploreward": 11003, - "bosspro": 3000 + "bosspro": 3000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11004, @@ -145,7 +157,7 @@ "text": "杜洛克王国" }, "chapter_type": 1, - "map": "scenes_chapter_01", + "map": "scenes_chapter_04", "camera": "", "title": { "key": "mainchapter_main_chapter_title_4", @@ -157,7 +169,11 @@ }, "starreward": 11004, "exploreward": 11004, - "bosspro": 4000 + "bosspro": 4000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11005, @@ -197,7 +213,11 @@ }, "starreward": 11005, "exploreward": 11005, - "bosspro": 5000 + "bosspro": 5000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11006, @@ -237,7 +257,11 @@ }, "starreward": 11006, "exploreward": 11006, - "bosspro": 6000 + "bosspro": 6000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11007, @@ -277,7 +301,11 @@ }, "starreward": 11007, "exploreward": 11007, - "bosspro": 7000 + "bosspro": 7000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11008, @@ -317,7 +345,11 @@ }, "starreward": 11008, "exploreward": 11008, - "bosspro": 8000 + "bosspro": 8000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11009, @@ -357,7 +389,11 @@ }, "starreward": 11009, "exploreward": 11009, - "bosspro": 9000 + "bosspro": 9000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11010, @@ -397,7 +433,11 @@ }, "starreward": 11010, "exploreward": 11010, - "bosspro": 10000 + "bosspro": 10000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11011, @@ -437,7 +477,11 @@ }, "starreward": 11011, "exploreward": 11011, - "bosspro": 11000 + "bosspro": 11000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" }, { "id": 11012, @@ -477,6 +521,10 @@ }, "starreward": 11012, "exploreward": 11012, - "bosspro": 12000 + "bosspro": 12000, + "models": [ + 25001 + ], + "bosspng": "mainboss1" } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index d902e2fce..2d63c8b14 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -7906,6 +7906,82 @@ "star_value": [], "challengeward": 0 }, + { + "id": 1100184, + "chapterid": 11001, + "group_id": 100153, + "previous_group_id": [], + "previoustage": 0, + "Episodetype": 9, + "is_near": 0, + "openlevel": 0, + "EditorStage": 0, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "herocolor": 2, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "main_stage_bubbletext_79", + "text": "测试节点35" + }, + "animation": [], + "hide": 0, + "destroy": 0, + "progress": 0, + "stroyshow": 0, + "frontstoryid": 0, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "mainlineName": { + "key": "mainchapter_main_stage_mainlineName_83", + "text": "1-79" + }, + "title": { + "key": "mainchapter_main_stage_title_83", + "text": "测试34" + }, + "desc": { + "key": "mainchapter_main_stage_desc_79", + "text": "测试34" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 1000000 + } + ], + "lotteryward": 0, + "commonaward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + } + ], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, { "id": 1100200, "chapterid": 11002, @@ -10393,7 +10469,7 @@ "challengeward": 0 }, { - "id": 1100313, + "id": 1100400, "chapterid": 11004, "group_id": 100400, "previous_group_id": [ @@ -10507,7 +10583,7 @@ "challengeward": 0 }, { - "id": 1100314, + "id": 1100401, "chapterid": 11004, "group_id": 100401, "previous_group_id": [ @@ -10536,7 +10612,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -10621,10 +10697,12 @@ "challengeward": 0 }, { - "id": 1100315, + "id": 1100402, "chapterid": 11004, - "group_id": 0, - "previous_group_id": [], + "group_id": 100402, + "previous_group_id": [ + 100401 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -10648,7 +10726,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -10733,10 +10811,12 @@ "challengeward": 0 }, { - "id": 1100316, + "id": 1100403, "chapterid": 11004, - "group_id": 0, - "previous_group_id": [], + "group_id": 100403, + "previous_group_id": [ + 100402 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -10760,7 +10840,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -10845,10 +10925,12 @@ "challengeward": 0 }, { - "id": 1100317, - "chapterid": 11005, - "group_id": 0, - "previous_group_id": [], + "id": 1100404, + "chapterid": 11004, + "group_id": 100404, + "previous_group_id": [ + 100403 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -10872,7 +10954,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -10957,10 +11039,12 @@ "challengeward": 0 }, { - "id": 1100318, - "chapterid": 11005, - "group_id": 0, - "previous_group_id": [], + "id": 1100405, + "chapterid": 11004, + "group_id": 100405, + "previous_group_id": [ + 100404 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -10984,7 +11068,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11069,10 +11153,12 @@ "challengeward": 0 }, { - "id": 1100319, - "chapterid": 11005, - "group_id": 0, - "previous_group_id": [], + "id": 1100406, + "chapterid": 11004, + "group_id": 100406, + "previous_group_id": [ + 100405 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11096,7 +11182,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11181,10 +11267,12 @@ "challengeward": 0 }, { - "id": 1100320, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100407, + "chapterid": 11004, + "group_id": 100407, + "previous_group_id": [ + 100406 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11208,7 +11296,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11293,10 +11381,12 @@ "challengeward": 0 }, { - "id": 1100321, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100408, + "chapterid": 11004, + "group_id": 100408, + "previous_group_id": [ + 100407 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11320,7 +11410,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11405,10 +11495,12 @@ "challengeward": 0 }, { - "id": 1100322, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100409, + "chapterid": 11004, + "group_id": 100409, + "previous_group_id": [ + 100408 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11432,7 +11524,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11517,10 +11609,12 @@ "challengeward": 0 }, { - "id": 1100323, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100410, + "chapterid": 11004, + "group_id": 100410, + "previous_group_id": [ + 100409 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11544,7 +11638,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11629,10 +11723,12 @@ "challengeward": 0 }, { - "id": 1100324, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100411, + "chapterid": 11004, + "group_id": 100411, + "previous_group_id": [ + 100410 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11656,7 +11752,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11741,10 +11837,12 @@ "challengeward": 0 }, { - "id": 1100325, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100412, + "chapterid": 11004, + "group_id": 100412, + "previous_group_id": [ + 100411 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11768,7 +11866,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11853,10 +11951,12 @@ "challengeward": 0 }, { - "id": 1100326, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100413, + "chapterid": 11004, + "group_id": 100413, + "previous_group_id": [ + 100412 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11880,7 +11980,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -11965,10 +12065,12 @@ "challengeward": 0 }, { - "id": 1100327, - "chapterid": 11006, - "group_id": 0, - "previous_group_id": [], + "id": 1100414, + "chapterid": 11005, + "group_id": 100500, + "previous_group_id": [ + 100413 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -11992,7 +12094,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12077,9 +12179,9 @@ "challengeward": 0 }, { - "id": 1100328, - "chapterid": 11007, - "group_id": 0, + "id": 1100415, + "chapterid": 11005, + "group_id": 100501, "previous_group_id": [], "previoustage": 0, "Episodetype": 1, @@ -12104,7 +12206,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12189,9 +12291,9 @@ "challengeward": 0 }, { - "id": 1100329, - "chapterid": 11007, - "group_id": 0, + "id": 1100416, + "chapterid": 11005, + "group_id": 100502, "previous_group_id": [], "previoustage": 0, "Episodetype": 1, @@ -12216,7 +12318,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12301,9 +12403,9 @@ "challengeward": 0 }, { - "id": 1100330, - "chapterid": 11007, - "group_id": 0, + "id": 1100417, + "chapterid": 11005, + "group_id": 100503, "previous_group_id": [], "previoustage": 0, "Episodetype": 1, @@ -12328,7 +12430,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12413,9 +12515,9 @@ "challengeward": 0 }, { - "id": 1100331, - "chapterid": 11007, - "group_id": 0, + "id": 1100418, + "chapterid": 11005, + "group_id": 100504, "previous_group_id": [], "previoustage": 0, "Episodetype": 1, @@ -12440,7 +12542,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12525,9 +12627,9 @@ "challengeward": 0 }, { - "id": 1100332, - "chapterid": 11007, - "group_id": 0, + "id": 1100419, + "chapterid": 11005, + "group_id": 100505, "previous_group_id": [], "previoustage": 0, "Episodetype": 1, @@ -12552,7 +12654,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12637,9 +12739,9 @@ "challengeward": 0 }, { - "id": 1100333, - "chapterid": 11007, - "group_id": 0, + "id": 1100420, + "chapterid": 11005, + "group_id": 100506, "previous_group_id": [], "previoustage": 0, "Episodetype": 1, @@ -12664,7 +12766,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12749,9 +12851,9 @@ "challengeward": 0 }, { - "id": 1100334, - "chapterid": 11007, - "group_id": 0, + "id": 1100421, + "chapterid": 11005, + "group_id": 100507, "previous_group_id": [], "previoustage": 0, "Episodetype": 1, @@ -12776,7 +12878,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12861,7 +12963,7 @@ "challengeward": 0 }, { - "id": 1100335, + "id": 1100422, "chapterid": 11007, "group_id": 0, "previous_group_id": [], @@ -12888,7 +12990,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -12973,7 +13075,7 @@ "challengeward": 0 }, { - "id": 1100336, + "id": 1100423, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13000,7 +13102,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13085,7 +13187,7 @@ "challengeward": 0 }, { - "id": 1100337, + "id": 1100424, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13112,7 +13214,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13197,7 +13299,7 @@ "challengeward": 0 }, { - "id": 1100338, + "id": 1100425, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13224,7 +13326,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13309,7 +13411,7 @@ "challengeward": 0 }, { - "id": 1100339, + "id": 1100426, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13336,7 +13438,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13421,7 +13523,7 @@ "challengeward": 0 }, { - "id": 1100340, + "id": 1100427, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13448,7 +13550,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13533,7 +13635,7 @@ "challengeward": 0 }, { - "id": 1100341, + "id": 1100428, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13560,7 +13662,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13645,7 +13747,7 @@ "challengeward": 0 }, { - "id": 1100342, + "id": 1100429, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13672,7 +13774,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13757,7 +13859,7 @@ "challengeward": 0 }, { - "id": 1100343, + "id": 1100430, "chapterid": 11008, "group_id": 0, "previous_group_id": [], @@ -13784,7 +13886,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13869,7 +13971,7 @@ "challengeward": 0 }, { - "id": 1100344, + "id": 1100431, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -13896,7 +13998,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -13981,7 +14083,7 @@ "challengeward": 0 }, { - "id": 1100345, + "id": 1100432, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -14008,7 +14110,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14093,7 +14195,7 @@ "challengeward": 0 }, { - "id": 1100346, + "id": 1100433, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -14120,7 +14222,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14205,7 +14307,7 @@ "challengeward": 0 }, { - "id": 1100347, + "id": 1100434, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -14232,7 +14334,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14317,7 +14419,7 @@ "challengeward": 0 }, { - "id": 1100348, + "id": 1100435, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -14344,7 +14446,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14429,7 +14531,7 @@ "challengeward": 0 }, { - "id": 1100349, + "id": 1100436, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -14456,7 +14558,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14541,7 +14643,7 @@ "challengeward": 0 }, { - "id": 1100350, + "id": 1100437, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -14568,7 +14670,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14653,7 +14755,7 @@ "challengeward": 0 }, { - "id": 1100351, + "id": 1100438, "chapterid": 11009, "group_id": 0, "previous_group_id": [], @@ -14680,7 +14782,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14765,7 +14867,7 @@ "challengeward": 0 }, { - "id": 1100352, + "id": 1100439, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -14792,7 +14894,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14877,7 +14979,7 @@ "challengeward": 0 }, { - "id": 1100353, + "id": 1100440, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -14904,7 +15006,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -14989,7 +15091,7 @@ "challengeward": 0 }, { - "id": 1100354, + "id": 1100441, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -15016,7 +15118,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15101,7 +15203,7 @@ "challengeward": 0 }, { - "id": 1100355, + "id": 1100442, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -15128,7 +15230,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15213,7 +15315,7 @@ "challengeward": 0 }, { - "id": 1100356, + "id": 1100443, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -15240,7 +15342,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15325,7 +15427,7 @@ "challengeward": 0 }, { - "id": 1100357, + "id": 1100444, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -15352,7 +15454,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15437,7 +15539,7 @@ "challengeward": 0 }, { - "id": 1100358, + "id": 1100445, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -15464,7 +15566,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15549,7 +15651,7 @@ "challengeward": 0 }, { - "id": 1100359, + "id": 1100446, "chapterid": 11010, "group_id": 0, "previous_group_id": [], @@ -15576,7 +15678,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15661,7 +15763,7 @@ "challengeward": 0 }, { - "id": 1100360, + "id": 1100447, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -15688,7 +15790,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15773,7 +15875,7 @@ "challengeward": 0 }, { - "id": 1100361, + "id": 1100448, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -15800,7 +15902,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15885,7 +15987,7 @@ "challengeward": 0 }, { - "id": 1100362, + "id": 1100449, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -15912,7 +16014,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -15997,7 +16099,7 @@ "challengeward": 0 }, { - "id": 1100363, + "id": 1100450, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -16024,7 +16126,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16109,7 +16211,7 @@ "challengeward": 0 }, { - "id": 1100364, + "id": 1100451, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -16136,7 +16238,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16221,7 +16323,7 @@ "challengeward": 0 }, { - "id": 1100365, + "id": 1100452, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -16248,7 +16350,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16333,7 +16435,7 @@ "challengeward": 0 }, { - "id": 1100366, + "id": 1100453, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -16360,7 +16462,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16445,7 +16547,7 @@ "challengeward": 0 }, { - "id": 1100367, + "id": 1100454, "chapterid": 11011, "group_id": 0, "previous_group_id": [], @@ -16472,7 +16574,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16557,7 +16659,7 @@ "challengeward": 0 }, { - "id": 1100368, + "id": 1100455, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -16584,7 +16686,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16669,7 +16771,7 @@ "challengeward": 0 }, { - "id": 1100369, + "id": 1100456, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -16696,7 +16798,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16781,7 +16883,7 @@ "challengeward": 0 }, { - "id": 1100370, + "id": 1100457, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -16808,7 +16910,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -16893,7 +16995,7 @@ "challengeward": 0 }, { - "id": 1100371, + "id": 1100458, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -16920,7 +17022,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -17005,7 +17107,7 @@ "challengeward": 0 }, { - "id": 1100372, + "id": 1100459, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -17032,7 +17134,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -17117,7 +17219,7 @@ "challengeward": 0 }, { - "id": 1100373, + "id": 1100460, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -17144,7 +17246,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -17229,7 +17331,7 @@ "challengeward": 0 }, { - "id": 1100374, + "id": 1100461, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -17256,7 +17358,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -17341,7 +17443,7 @@ "challengeward": 0 }, { - "id": 1100375, + "id": 1100462, "chapterid": 11012, "group_id": 0, "previous_group_id": [], @@ -17368,7 +17470,7 @@ "animation": [], "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "stroyshow": 0, "frontstoryid": 0, "afterstoryid": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 35aa189c7..8d5e29dc0 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -8078,7 +8078,7 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", + "SmithyScene", "打造", "139" ], @@ -8212,7 +8212,7 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", + "CommandScene", "功能入口_主线", "905" ], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index d4ae1c2b5..ad11b1ffc 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6787,9 +6787,7 @@ "Id": 215005314, "EmitPR": 1000, "From": 1, - "Where": [ - "EnemyHasBuff=1" - ], + "Where": [], "Order": "", "Limit": 10, "ExecuteCnt": 1, @@ -6804,9 +6802,9 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 0, + "DpsRevisiType": 300, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyNoBuff=1", "RevisiParams": [] }, { @@ -52382,53 +52380,6 @@ "RevisiCondition": "", "RevisiParams": [] }, - { - "Id": 934002313, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 391000042, - 1000, - 1, - -1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 934002314, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 8, - "Argu": [ - 1, - 2, - 1000 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, { "Id": 824005211, "EmitPR": 1000, @@ -55407,6 +55358,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 924003314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492400331, + -1, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 934006311, "EmitPR": 1000, @@ -55786,6 +55761,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 913002112, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491300211, + -1, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 913002311, "EmitPR": 1000, @@ -56013,9 +56012,9 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "DpsRevisiType": 0, + "DpsRevisiType": 300, "DpsCondition": "", - "RevisiCondition": "", + "RevisiCondition": "EnemyHasBuff=1", "RevisiParams": [] }, { @@ -56043,6 +56042,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 915005315, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491500532, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 915004311, "EmitPR": 1000, @@ -56069,8 +56091,31 @@ }, { "Id": 915004312, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491500431, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 915004313, "EmitPR": 500, - "From": 2, + "From": 12, "Where": [], "Order": "", "Limit": 10, @@ -56092,7 +56137,7 @@ "RevisiParams": [] }, { - "Id": 915004313, + "Id": 915004314, "EmitPR": 1000, "From": 2, "Where": [], @@ -56117,6 +56162,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 915004315, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491500432, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 924002311, "EmitPR": 1000, @@ -56189,6 +56257,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 924002314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492400231, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 914007311, "EmitPR": 1000, @@ -56223,7 +56314,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 414007211, + 491400731, -1, -1 ], @@ -56270,7 +56361,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 414007211, + 491400732, -1, -1 ], @@ -56635,6 +56726,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 913003317, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491300331, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 935005311, "EmitPR": 1000, @@ -57202,6 +57316,52 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 924004314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492400431, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 924004315, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492400432, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 943002311, "EmitPR": 1000, @@ -57388,6 +57548,53 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 934002313, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000042, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 934002314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 8, + "Argu": [ + 1, + 2, + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 924005311, "EmitPR": 1000, @@ -57458,6 +57665,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 924005314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492400531, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 913004311, "EmitPR": 1000, @@ -58242,6 +58472,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 913001317, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491300141, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 914005311, "EmitPR": 1000, @@ -58431,6 +58684,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 933001314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 493300131, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 943003311, "EmitPR": 1000, @@ -58779,6 +59055,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 913005316, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491300533, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 924009311, "EmitPR": 1000, @@ -58943,6 +59242,52 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 924001314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492400131, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 924001315, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492400132, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 933002311, "EmitPR": 1000, @@ -59089,7 +59434,7 @@ { "Id": 914008314, "EmitPR": 1000, - "From": 8, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -59178,6 +59523,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 923004314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492300431, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 915003311, "EmitPR": 1000, @@ -59247,6 +59615,52 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 915003314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491500331, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 915003315, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 491500332, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 923003311, "EmitPR": 1000, @@ -59321,6 +59735,29 @@ { "Id": 923003314, "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 492300332, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 923003315, + "EmitPR": 1000, "From": 1, "Where": [], "Order": "", diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index d2ebd117a..6e93207c2 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -37579,7 +37579,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 913001316 + 913001317 ] }, "passSkill": [], @@ -37759,7 +37759,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 913002111 + 913002112 ] }, "passSkill": [], @@ -37939,7 +37939,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 913003315 + 913003317 ] }, "passSkill": [], @@ -38059,7 +38059,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 813004215 + 913004311 ] }, "passSkill": [], @@ -38270,7 +38270,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 913005313 + 913005316 ] }, "passSkill": [], @@ -38303,9 +38303,7 @@ 913005314 ] }, - "passSkill": [ - 913005314 - ], + "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_913005433_1", "text": "3技能添加攻击提升时若目标身上已有攻击提升效果，减少目标所有技能冷却1回合" @@ -39352,7 +39350,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 915003312 + 915003314 ] }, "passSkill": [], @@ -39382,7 +39380,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 915003313 + 915003315 ] }, "passSkill": [], @@ -39562,7 +39560,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 915004313 + 915004315 ] }, "passSkill": [], @@ -39742,7 +39740,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 915005314 + 915005315 ] }, "passSkill": [], @@ -40252,7 +40250,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 924001312 + 924001314 ] }, "passSkill": [], @@ -40282,7 +40280,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 924001313 + 924001315 ] }, "passSkill": [], @@ -40462,7 +40460,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 924002313 + 924002314 ] }, "passSkill": [], @@ -40642,7 +40640,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 924003313 + 924003314 ] }, "passSkill": [], @@ -40792,7 +40790,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 924004312 + 924004314 ] }, "passSkill": [], @@ -40822,7 +40820,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 924004313 + 924004315 ] }, "passSkill": [], @@ -41003,7 +41001,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 924005313 + 924005314 ] }, "passSkill": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 54e8c5704..b71544f8d 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -3549,9 +3549,9 @@ "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_sl", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 6ff615dca..d37626031 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -4090,7 +4090,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "Target=3", - "MainSkillCheck": "SkillPose=3", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -4110,7 +4110,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "Target=3", - "MainSkillCheck": "SkillPose=3", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7225,7 +7225,7 @@ "When": 2, "FromCheck": "Target=3,Hpproless=500", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=125001311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7240,6 +7240,26 @@ 225004115 ] }, + { + "Id": 491300141, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 913001316 + ] + }, { "Id": 491300311, "When": 2, @@ -7366,7 +7386,7 @@ "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,NoBuff=3", - "MainSkillCheck": "MainSkillID=114005311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7386,7 +7406,7 @@ "When": 16, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=114005311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7446,7 +7466,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=1", - "MainSkillCheck": "MainSkillID=1150025311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7466,7 +7486,7 @@ "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", - "MainSkillCheck": "MainSkillID=1150025311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7486,7 +7506,7 @@ "When": 17, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=1150025311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7506,8 +7526,8 @@ "When": 5, "FromCheck": "Target=3", "TargetCheck": "Target=2,NoBuff=1", - "MainSkillCheck": "", - "AfterSkillCheck": "SkillID=915005313", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", "AddCon": [], @@ -7521,6 +7541,26 @@ 915005313 ] }, + { + "Id": 491500532, + "When": 5, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 915005314 + ] + }, { "Id": 492300331, "When": 7, @@ -7568,8 +7608,8 @@ "When": 10, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "", - "AfterSkillCheck": "SkillID=224009311", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", "AddCon": [], @@ -7629,7 +7669,7 @@ "When": 16, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=133002311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7751,7 +7791,7 @@ "When": 4, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=135004311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -8068,6 +8108,26 @@ 213002212 ] }, + { + "Id": 491300211, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=1", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 99, + "Callback": [ + 913002111 + ] + }, { "Id": 491400231, "When": 16, @@ -8095,8 +8155,8 @@ "When": 20, "FromCheck": "Target=3", "TargetCheck": "Target=1", - "MainSkillCheck": "", - "AfterSkillCheck": "SkillID=213005311", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", "AddCon": [], @@ -8109,5 +8169,326 @@ "Callback": [ 913005312 ] + }, + { + "Id": 491300533, + "When": 20, + "FromCheck": "Target=3", + "TargetCheck": "Target=1", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 913005313 + ] + }, + { + "Id": 491500431, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 915004313 + ] + }, + { + "Id": 491500432, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 915004314 + ] + }, + { + "Id": 492300332, + "When": 20, + "FromCheck": "Target=3", + "TargetCheck": "Target=1", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 923003315 + ] + }, + { + "Id": 491300331, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 913003315, + 913003316 + ] + }, + { + "Id": 491500331, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 915003312 + ] + }, + { + "Id": 491500332, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 915003313 + ] + }, + { + "Id": 492300431, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 923004313 + ] + }, + { + "Id": 492400131, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 924001312 + ] + }, + { + "Id": 492400132, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 924001313 + ] + }, + { + "Id": 492400231, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 924002313 + ] + }, + { + "Id": 492400331, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 924003313 + ] + }, + { + "Id": 492400431, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 924004312 + ] + }, + { + "Id": 492400432, + "When": 3, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 924004313 + ] + }, + { + "Id": 492400531, + "When": 3, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 924005313 + ] + }, + { + "Id": 493300131, + "When": 3, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 933001313 + ] } ] \ No newline at end of file diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index f0341fa72..b669c6094 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -100,7 +100,7 @@ "key": "worldtask_world_all_name_6", "text": "功夫熊猫" }, - "task_icon": "rw_img", + "task_icon": "rw_img_ab", "task_txt": { "key": "", "text": "" diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go index afc3be490..8ccd3d6a5 100644 --- a/modules/mainline/model_mainline.go +++ b/modules/mainline/model_mainline.go @@ -191,6 +191,10 @@ func (this *ModelMline) randomboos(data *pb.DBMainline) (err error) { } index = comm.GetRandW(weight) + if conf, err = this.module.configure.GetMainChapterConf(chapters[index]); err != nil { + return + } + data.Currboosmodel = conf.Models[comm.GetRandW(conf.Models)] data.Currbooschapter = chapters[index] data.Lastboosrefresh = configure.Now().Unix() return diff --git a/pb/mainline_db.pb.go b/pb/mainline_db.pb.go index dc8aa9188..5a6248c82 100644 --- a/pb/mainline_db.pb.go +++ b/pb/mainline_db.pb.go @@ -35,8 +35,9 @@ type DBMainline struct { Ps map[int32]int32 `protobuf:"bytes,8,rep,name=ps,proto3" json:"ps" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 预扣的体力 Chapterboos map[int32]int32 `protobuf:"bytes,9,rep,name=chapterboos,proto3" json:"chapterboos" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //章节boos Currbooschapter int32 `protobuf:"varint,10,opt,name=currbooschapter,proto3" json:"currbooschapter"` //当前boos章节 - Currbooschallengenum int32 `protobuf:"varint,11,opt,name=currbooschallengenum,proto3" json:"currbooschallengenum"` //当日boos挑战次数 - Lastboosrefresh int64 `protobuf:"varint,12,opt,name=lastboosrefresh,proto3" json:"lastboosrefresh"` //上一次boos刷新时间 + Currboosmodel int32 `protobuf:"varint,11,opt,name=currboosmodel,proto3" json:"currboosmodel"` //boos形象 + Currbooschallengenum int32 `protobuf:"varint,12,opt,name=currbooschallengenum,proto3" json:"currbooschallengenum"` //当日boos挑战次数 + Lastboosrefresh int64 `protobuf:"varint,13,opt,name=lastboosrefresh,proto3" json:"lastboosrefresh"` //上一次boos刷新时间 } func (x *DBMainline) Reset() { @@ -141,6 +142,13 @@ func (x *DBMainline) GetCurrbooschapter() int32 { return 0 } +func (x *DBMainline) GetCurrboosmodel() int32 { + if x != nil { + return x.Currboosmodel + } + return 0 +} + func (x *DBMainline) GetCurrbooschallengenum() int32 { if x != nil { return x.Currbooschallengenum @@ -357,7 +365,7 @@ var File_mainline_mainline_db_proto protoreflect.FileDescriptor var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x0a, 0x1a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xac, 0x08, 0x0a, + 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd2, 0x08, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x38, 0x0a, @@ -388,87 +396,90 @@ var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x52, 0x0b, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x32, 0x0a, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, - 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x18, - 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, - 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x6c, - 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, - 0x66, 0x72, 0x65, 0x73, 0x68, 0x1a, 0x3c, 0x0a, 0x0e, 0x4c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, + 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x75, 0x72, 0x72, 0x62, + 0x6f, 0x6f, 0x73, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, + 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x32, 0x0a, + 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, + 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x63, 0x75, 0x72, + 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, + 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, + 0x72, 0x65, 0x73, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, + 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x1a, 0x3c, 0x0a, 0x0e, 0x4c, + 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, - 0x11, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, - 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x1a, 0x51, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, + 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, + 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, + 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4f, 0x0a, 0x0f, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, + 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x35, 0x0a, 0x07, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x1a, 0x4f, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x35, 0x0a, 0x07, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38, + 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x44, 0x42, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x36, 0x0a, + 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, + 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, + 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x62, 0x75, + 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, 0x0c, 0x42, 0x75, + 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, + 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x54, + 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, + 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x52, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x43, - 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f, - 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, - 0x31, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, - 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, - 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, - 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, - 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, - 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, - 0x33, 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, - 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e, - 0x6c, 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, 0x0c, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x1a, 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a, - 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, - 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, - 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d, - 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54, - 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.MainBossData.go b/sys/configure/structs/Game.MainBossData.go index 3bd40fa20..f42cf5c03 100644 --- a/sys/configure/structs/Game.MainBossData.go +++ b/sys/configure/structs/Game.MainBossData.go @@ -13,7 +13,6 @@ import "errors" type GameMainBossData struct { Id int32 MonsterChapter int32 - MonsterDisplayIp int32 MonsterStrength int32 Battlereadyid int32 FormatList []int32 @@ -29,7 +28,6 @@ func (*GameMainBossData) GetTypeId() int32 { func (_v *GameMainBossData)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["monster_chapter"].(float64); !_ok_ { err = errors.New("monster_chapter error"); return }; _v.MonsterChapter = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MonsterDisplay_Ip"].(float64); !_ok_ { err = errors.New("MonsterDisplay_Ip error"); return }; _v.MonsterDisplayIp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_strength"].(float64); !_ok_ { err = errors.New("monster_strength error"); return }; _v.MonsterStrength = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battlereadyid"].(float64); !_ok_ { err = errors.New("battlereadyid error"); return }; _v.Battlereadyid = int32(_tempNum_) } { diff --git a/sys/configure/structs/Game.MainChapterData.go b/sys/configure/structs/Game.MainChapterData.go index 3240e3863..1b23f4636 100644 --- a/sys/configure/structs/Game.MainChapterData.go +++ b/sys/configure/structs/Game.MainChapterData.go @@ -27,6 +27,8 @@ type GameMainChapterData struct { Starreward int32 Exploreward int32 Bosspro int32 + Models []int32 + Bosspng string } const TypeId_GameMainChapterData = 2014963746 @@ -52,6 +54,21 @@ func (_v *GameMainChapterData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starreward"].(float64); !_ok_ { err = errors.New("starreward error"); return }; _v.Starreward = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exploreward"].(float64); !_ok_ { err = errors.New("exploreward error"); return }; _v.Exploreward = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bosspro"].(float64); !_ok_ { err = errors.New("bosspro error"); return }; _v.Bosspro = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["models"].([]interface{}); !_ok_ { err = errors.New("models error"); return } + + _v.Models = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Models = append(_v.Models, _list_v_) + } + } + + { var _ok_ bool; if _v.Bosspng, _ok_ = _buf["bosspng"].(string); !_ok_ { err = errors.New("bosspng error"); return } } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index f62d81e93..38b88de34 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -246,6 +246,8 @@ type GameGlobalData struct { BuzkashiSpeedbumptime int32 BuzkashiSpeedbumphp int32 BuzkashiSprintbumpscore int32 + BuzkashiGoalscore int32 + BuzkashiGoalteamscore int32 BuzkashiBumpdis float32 BuzkashiRecovertime int32 BuzkashiRecoverHp int32 @@ -1009,6 +1011,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumptime"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumptime error"); return }; _v.BuzkashiSpeedbumptime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumphp"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumphp error"); return }; _v.BuzkashiSpeedbumphp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_sprintbumpscore"].(float64); !_ok_ { err = errors.New("buzkashi_sprintbumpscore error"); return }; _v.BuzkashiSprintbumpscore = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalscore"].(float64); !_ok_ { err = errors.New("buzkashi_goalscore error"); return }; _v.BuzkashiGoalscore = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalteamscore"].(float64); !_ok_ { err = errors.New("buzkashi_goalteamscore error"); return }; _v.BuzkashiGoalteamscore = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recovertime"].(float64); !_ok_ { err = errors.New("buzkashi_recovertime error"); return }; _v.BuzkashiRecovertime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recoverHp"].(float64); !_ok_ { err = errors.New("buzkashi_recoverHp error"); return }; _v.BuzkashiRecoverHp = int32(_tempNum_) }