From 83e26c898633f004192a481ff7ef2617cdcff2c2 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 26 Apr 2023 20:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E4=BB=BB=E5=8A=A1=20=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E5=A5=96=E5=8A=B1=E5=90=8E=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E5=AE=9D=E7=AE=B1=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_activereward.json | 24 +- bin/json/game_drawcard.json | 374 +++------- bin/json/game_hero.json | 74 +- bin/json/game_monsterformat.json | 502 ++++++------- bin/json/game_newsmithy.json | 150 ++-- bin/json/game_opencond.json | 50 +- bin/json/game_playerinfor.json | 30 +- bin/json/game_potions.json | 60 ++ bin/json/game_rdtaskcondi.json | 4 +- bin/json/game_rdtasknpc.json | 28 +- bin/json/game_skillafteratk.json | 102 +-- bin/json/game_skillatk.json | 665 +++++++++++++----- bin/json/game_skillbuff.json | 12 +- bin/json/game_taskactivereward.json | 24 +- bin/json/game_taskround.json | 6 +- bin/json/game_worldtask.json | 22 +- modules/task/api_receive.go | 51 ++ pb/task_msg.pb.go | 92 ++- .../structs/Game.LinestoryMainTaskData.go | 14 +- 19 files changed, 1279 insertions(+), 1005 deletions(-) diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json index b8480e807..03935fad3 100644 --- a/bin/json/game_activereward.json +++ b/bin/json/game_activereward.json @@ -6,11 +6,11 @@ "reword": [ { "a": "item", - "t": "60001", + "t": "60002", "n": 1 } ], - "action": "Skill_2", + "action": "25004_cheer_act", "stage": 1 }, { @@ -24,7 +24,7 @@ "n": 2 } ], - "action": "Skill_2", + "action": "25004_cheer_act", "stage": 2 }, { @@ -34,25 +34,11 @@ "reword": [ { "a": "item", - "t": "60003", + "t": "60002", "n": 3 } ], - "action": "Skill_2", + "action": "25004_cheer_act", "stage": 3 - }, - { - "key": 4, - "id_tag": 2, - "active": 160, - "reword": [ - { - "a": "item", - "t": "60003", - "n": 4 - } - ], - "action": "Skill_2", - "stage": 4 } ] \ No newline at end of file diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index cff99b96c..77c51eb0c 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -4,8 +4,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool1", "star": 3, - "rece": 1, - "id": "24001", + "rece": 2, + "id": "24004", "weight": 1000 }, { @@ -13,8 +13,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool1", "star": 4, - "rece": 1, - "id": "25001", + "rece": 2, + "id": "24004", "weight": 1000 }, { @@ -22,8 +22,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool1", "star": 5, - "rece": 1, - "id": "25001", + "rece": 2, + "id": "24004", "weight": 1000 }, { @@ -31,8 +31,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 3, - "rece": 1, - "id": "44006", + "rece": 2, + "id": "25001", "weight": 1000 }, { @@ -40,8 +40,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 4, - "rece": 1, - "id": "44006", + "rece": 2, + "id": "25001", "weight": 1000 }, { @@ -49,8 +49,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 5, - "rece": 1, - "id": "44006", + "rece": 2, + "id": "25001", "weight": 1000 }, { @@ -58,8 +58,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 3, - "rece": 1, - "id": "14003", + "rece": 2, + "id": "25004", "weight": 1000 }, { @@ -67,8 +67,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 4, - "rece": 1, - "id": "14003", + "rece": 2, + "id": "25004", "weight": 1000 }, { @@ -76,8 +76,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 5, - "rece": 1, - "id": "14003", + "rece": 2, + "id": "25004", "weight": 1000 }, { @@ -85,8 +85,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, - "rece": 1, - "id": "34006", + "rece": 2, + "id": "24008", "weight": 1000 }, { @@ -94,8 +94,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 4, - "rece": 1, - "id": "34006", + "rece": 2, + "id": "24008", "weight": 1000 }, { @@ -103,8 +103,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 5, - "rece": 1, - "id": "34006", + "rece": 2, + "id": "24008", "weight": 1000 }, { @@ -112,7 +112,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool5", "star": 3, - "rece": 1, + "rece": 2, "id": "24003", "weight": 1000 }, @@ -121,7 +121,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool5", "star": 4, - "rece": 1, + "rece": 2, "id": "24003", "weight": 1000 }, @@ -130,7 +130,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool5", "star": 5, - "rece": 1, + "rece": 2, "id": "24003", "weight": 1000 }, @@ -167,182 +167,56 @@ "card_pool_type": "base_pool7", "star": 4, "rece": 2, - "id": "24008", + "id": "24004", "weight": 1000 }, { "key": 20, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "rece": 2, - "id": "24001", - "weight": 1000 - }, - { - "key": 21, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 3, - "rece": 4, - "id": "43006", - "weight": 1000 - }, - { - "key": 22, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 3, - "rece": 4, - "id": "43001", - "weight": 1000 - }, - { - "key": 23, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 3, - "id": "34008", - "weight": 1000 - }, - { - "key": 24, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 3, - "id": "34003", - "weight": 1000 - }, - { - "key": 25, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 3, - "rece": 1, - "id": "13001", - "weight": 1000 - }, - { - "key": 26, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 3, - "rece": 2, - "id": "33002", - "weight": 1000 - }, - { - "key": 27, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 2, - "id": "24009", - "weight": 1000 - }, - { - "key": 28, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 3, - "rece": 1, - "id": "13005", - "weight": 1000 - }, - { - "key": 29, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 30, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 31, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 3, - "id": "34006", - "weight": 1000 - }, - { - "key": 32, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 33, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 1, - "id": "15004", - "weight": 1000 - }, - { - "key": 34, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 3, - "rece": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 35, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 36, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 37, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 3, - "id": "35002", - "weight": 1000 - }, - { - "key": 38, - "recruitment_type": 1, - "card_pool_type": "base_pool7", "star": 5, "rece": 2, "id": "25001", "weight": 1000 }, { - "key": 39, + "key": 21, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "rece": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 22, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "rece": 2, + "id": "24008", + "weight": 1000 + }, + { + "key": 23, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "rece": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 24, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "rece": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 25, "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, @@ -351,61 +225,7 @@ "weight": 1000 }, { - "key": 40, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 4, - "id": "44006", - "weight": 1000 - }, - { - "key": 41, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 3, - "id": "35006", - "weight": 1000 - }, - { - "key": 42, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 2, - "id": "24005", - "weight": 1000 - }, - { - "key": 43, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 3, - "rece": 1, - "id": "13003", - "weight": 1000 - }, - { - "key": 44, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 4, - "rece": 3, - "id": "34002", - "weight": 1000 - }, - { - "key": 45, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 4, - "id": "45001", - "weight": 1000 - }, - { - "key": 46, + "key": 26, "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, @@ -414,66 +234,66 @@ "weight": 1000 }, { - "key": 47, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 3, - "id": "35003", - "weight": 1000 - }, - { - "key": 48, - "recruitment_type": 1, - "card_pool_type": "base_pool7", - "star": 5, - "rece": 3, - "id": "35005", - "weight": 1000 - }, - { - "key": 49, + "key": 27, "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, - "rece": 1, - "id": "14005", + "rece": 3, + "id": "34006", "weight": 1000 }, { - "key": 50, + "key": 28, "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, + "rece": 3, + "id": "34002", + "weight": 1000 + }, + { + "key": 29, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, "rece": 2, - "id": "24004", + "id": "24002", "weight": 1000 }, { - "key": 51, + "key": 30, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "rece": 1, - "id": "14007", + "star": 5, + "rece": 2, + "id": "35001", "weight": 1000 }, { - "key": 52, + "key": 31, "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 5, "rece": 1, - "id": "15002", + "id": "15004", "weight": 1000 }, { - "key": 53, + "key": 32, "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, "rece": 4, - "id": "44002", + "id": "44005", + "weight": 1000 + }, + { + "key": 33, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "rece": 4, + "id": "44006", "weight": 1000 }, { diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index c77cd3e77..f46459823 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -42,7 +42,7 @@ "key": "atlas_13001", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10001", @@ -176,7 +176,7 @@ "type": 1, "ip": 7, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "13003", "rotation": "0|0|0", "revolve": 0, @@ -206,7 +206,7 @@ "key": "atlas_13003", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10041", @@ -370,7 +370,7 @@ "key": "atlas_13005", "text": "" }, - "enteranivalue": 10, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11021", @@ -750,7 +750,7 @@ "type": 1, "ip": 4, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "14005", "rotation": "0|0|0", "revolve": 0, @@ -780,7 +780,7 @@ "key": "atlas_14005", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11001", @@ -914,7 +914,7 @@ "type": 1, "ip": 9, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "14007", "rotation": "0|0|0", "revolve": 0, @@ -944,7 +944,7 @@ "key": "atlas_14007", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11041", @@ -1078,7 +1078,7 @@ "type": 1, "ip": 8, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "15002", "rotation": "0|0|0", "revolve": 0, @@ -1108,7 +1108,7 @@ "key": "atlas_15002", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10021", @@ -1682,7 +1682,7 @@ "key": "atlas_24001", "text": "" }, - "enteranivalue": 30, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10041", @@ -1980,7 +1980,7 @@ "type": 1, "ip": 4, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "24005", "rotation": "0|0|0", "revolve": 0, @@ -2010,7 +2010,7 @@ "key": "atlas_24005", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10001", @@ -2338,7 +2338,7 @@ "key": "atlas_24009", "text": "" }, - "enteranivalue": 10, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11021", @@ -2830,7 +2830,7 @@ "key": "atlas_33002", "text": "" }, - "enteranivalue": 40, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11021", @@ -3404,7 +3404,7 @@ "key": "atlas_34003", "text": "" }, - "enteranivalue": 70, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11041", @@ -3702,7 +3702,7 @@ "type": 1, "ip": 5, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "34007", "rotation": "0|0|0", "revolve": 0, @@ -3732,7 +3732,7 @@ "key": "atlas_34007", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11001", @@ -3814,7 +3814,7 @@ "key": "atlas_34008", "text": "" }, - "enteranivalue": 80, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11021", @@ -3948,7 +3948,7 @@ "type": 1, "ip": 11, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "35002", "rotation": "0|0|0", "revolve": 0, @@ -3978,7 +3978,7 @@ "key": "atlas_35002", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10001", @@ -4030,7 +4030,7 @@ "type": 1, "ip": 10, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "35003", "rotation": "0|0|0", "revolve": 0, @@ -4060,7 +4060,7 @@ "key": "atlas_35003", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10021", @@ -4194,7 +4194,7 @@ "type": 1, "ip": 12, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "35005", "rotation": "0|0|0", "revolve": 0, @@ -4224,7 +4224,7 @@ "key": "atlas_35005", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11001", @@ -4276,7 +4276,7 @@ "type": 1, "ip": 4, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "35006", "rotation": "0|0|0", "revolve": 0, @@ -4306,7 +4306,7 @@ "key": "atlas_35006", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11021", @@ -4388,7 +4388,7 @@ "key": "atlas_43001", "text": "" }, - "enteranivalue": 90, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11041", @@ -4798,7 +4798,7 @@ "key": "atlas_43006", "text": "" }, - "enteranivalue": 40, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11021", @@ -5014,7 +5014,7 @@ "type": 1, "ip": 6, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "44002", "rotation": "0|0|0", "revolve": 0, @@ -5044,7 +5044,7 @@ "key": "atlas_44002", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10021", @@ -5260,7 +5260,7 @@ "type": 1, "ip": 4, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "44006", "rotation": "0|0|0", "revolve": 0, @@ -5290,7 +5290,7 @@ "key": "atlas_44006", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11021", @@ -5342,7 +5342,7 @@ "type": 1, "ip": 4, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "45001", "rotation": "0|0|0", "revolve": 0, @@ -5372,7 +5372,7 @@ "key": "atlas_45001", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "11041", @@ -9280,7 +9280,7 @@ "type": 1, "ip": 7, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "13003", "rotation": "0|0|0", "revolve": 0, @@ -9310,7 +9310,7 @@ "key": "atlas_99999", "text": "" }, - "enteranivalue": 50, + "enteranivalue": -1, "camerainterval": 0, "equiprcom": [ "10041", diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 1cbb44c01..750d4023a 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -15111,7 +15111,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -15126,7 +15126,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 35, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -15137,7 +15137,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -15306,7 +15306,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -15321,7 +15321,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 40, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -15332,7 +15332,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -15501,7 +15501,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -15516,7 +15516,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 45, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -15527,7 +15527,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -15696,7 +15696,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -15711,7 +15711,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 50, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -15722,7 +15722,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -15891,7 +15891,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -15906,7 +15906,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 55, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -15917,7 +15917,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -16086,7 +16086,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -16101,7 +16101,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -16112,7 +16112,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -16281,7 +16281,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -16296,7 +16296,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 65, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -16307,7 +16307,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -16476,7 +16476,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -16491,7 +16491,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 70, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -16502,7 +16502,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -16671,7 +16671,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -16686,7 +16686,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 75, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -16697,7 +16697,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -16866,7 +16866,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -16881,7 +16881,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -16892,7 +16892,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240025, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -17061,7 +17061,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -17076,7 +17076,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 35, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -17087,7 +17087,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -17256,7 +17256,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -17271,7 +17271,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 40, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -17282,7 +17282,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -17451,7 +17451,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -17466,7 +17466,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 45, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -17477,7 +17477,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -17646,7 +17646,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -17661,7 +17661,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 50, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -17672,7 +17672,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -17841,7 +17841,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -17856,7 +17856,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 55, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -17867,7 +17867,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -18036,7 +18036,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -18051,7 +18051,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -18062,7 +18062,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -18231,7 +18231,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -18246,7 +18246,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 65, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -18257,7 +18257,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -18426,7 +18426,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -18441,7 +18441,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 70, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -18452,7 +18452,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -18621,7 +18621,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -18636,7 +18636,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 75, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -18647,7 +18647,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -18816,7 +18816,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -18831,7 +18831,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 80, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -18842,7 +18842,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -19011,7 +19011,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -19026,7 +19026,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 35, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -19037,7 +19037,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -19206,7 +19206,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -19221,7 +19221,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 40, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -19232,7 +19232,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -19401,7 +19401,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -19416,7 +19416,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 45, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -19427,7 +19427,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -19596,7 +19596,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -19611,7 +19611,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 50, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -19622,7 +19622,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -19791,7 +19791,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -19806,7 +19806,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 55, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -19817,7 +19817,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -19986,7 +19986,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -20001,7 +20001,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -20012,7 +20012,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -20181,7 +20181,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -20196,7 +20196,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 65, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -20207,7 +20207,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -20376,7 +20376,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -20391,7 +20391,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 70, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -20402,7 +20402,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -20571,7 +20571,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -20586,7 +20586,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 75, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -20597,7 +20597,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -20766,7 +20766,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -20781,7 +20781,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 80, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -20792,7 +20792,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -20961,7 +20961,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -20974,9 +20974,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 35, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -20987,7 +20987,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -21156,7 +21156,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -21169,9 +21169,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 40, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -21182,7 +21182,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -21351,7 +21351,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -21364,9 +21364,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 45, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -21377,7 +21377,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -21546,7 +21546,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -21559,9 +21559,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 50, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -21572,7 +21572,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -21741,7 +21741,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -21754,9 +21754,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 55, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -21767,7 +21767,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -21936,7 +21936,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -21949,9 +21949,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -21962,7 +21962,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -22131,7 +22131,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -22144,9 +22144,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 65, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -22157,7 +22157,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -22326,7 +22326,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -22339,9 +22339,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 70, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -22352,7 +22352,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -22521,7 +22521,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -22534,9 +22534,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 75, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -22547,7 +22547,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -22716,7 +22716,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -22729,9 +22729,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 80, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -22742,7 +22742,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -22911,7 +22911,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -22924,9 +22924,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 35, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -22937,7 +22937,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -23106,7 +23106,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -23119,9 +23119,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 40, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -23132,7 +23132,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -23301,7 +23301,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -23314,9 +23314,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 45, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -23327,7 +23327,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -23496,7 +23496,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -23509,9 +23509,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 50, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -23522,7 +23522,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -23691,7 +23691,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -23704,9 +23704,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 55, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -23717,7 +23717,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -23886,7 +23886,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -23899,9 +23899,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -23912,7 +23912,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -24081,7 +24081,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -24094,9 +24094,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 65, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -24107,7 +24107,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -24276,7 +24276,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -24289,9 +24289,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 70, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -24302,7 +24302,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -24471,7 +24471,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -24484,9 +24484,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 75, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -24497,7 +24497,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -24666,7 +24666,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -24679,9 +24679,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 80, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -24692,7 +24692,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 340065, + "monster": 510035, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -24861,7 +24861,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -24874,9 +24874,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 35, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -24887,7 +24887,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -25056,7 +25056,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -25069,9 +25069,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 40, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -25082,7 +25082,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -25251,7 +25251,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -25264,9 +25264,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 45, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -25277,7 +25277,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -25446,7 +25446,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -25459,9 +25459,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 50, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -25472,7 +25472,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -25641,7 +25641,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -25654,9 +25654,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 55, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -25667,7 +25667,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -25836,7 +25836,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -25849,9 +25849,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -25862,7 +25862,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -26031,7 +26031,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -26044,9 +26044,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 65, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -26057,7 +26057,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -26226,7 +26226,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -26239,9 +26239,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 70, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -26252,7 +26252,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -26421,7 +26421,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -26434,9 +26434,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 75, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -26447,7 +26447,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -26616,7 +26616,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -26629,9 +26629,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 80, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -26642,7 +26642,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -26811,7 +26811,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -26824,9 +26824,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 35, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -26837,7 +26837,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -27006,7 +27006,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -27019,9 +27019,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 40, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -27032,7 +27032,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -27201,7 +27201,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -27214,9 +27214,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 45, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -27227,7 +27227,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -27396,7 +27396,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -27409,9 +27409,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 50, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -27422,7 +27422,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -27591,7 +27591,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -27604,9 +27604,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 55, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -27617,7 +27617,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -27786,7 +27786,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -27799,9 +27799,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -27812,7 +27812,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -27981,7 +27981,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -27994,9 +27994,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 65, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -28007,7 +28007,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -28176,7 +28176,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -28189,9 +28189,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 70, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -28202,7 +28202,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -28371,7 +28371,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -28384,9 +28384,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 75, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -28397,7 +28397,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -28566,7 +28566,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 240045, + "monster": 510025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -28579,9 +28579,9 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 350015, + "monster": 550025, "lv": 80, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 @@ -28592,7 +28592,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "monster": 140035, + "monster": 510035, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -89317,7 +89317,7 @@ "bossHpCnt": 4, "monster": 550025, "lv": 60, - "hppro": 0.6, + "hppro": 5, "atkpro": 1, "defpro": 0.8, "modelsize": 1 diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json index 183b442c0..2871994c7 100644 --- a/bin/json/game_newsmithy.json +++ b/bin/json/game_newsmithy.json @@ -16,7 +16,7 @@ "key": "newsmithy_make_quality_text1", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_2", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -68,7 +68,7 @@ "key": "newsmithy_make_quality_text2", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -121,7 +121,7 @@ "key": "newsmithy_make_quality_text3", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -175,7 +175,7 @@ "key": "newsmithy_make_quality_text4", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -228,7 +228,7 @@ "key": "newsmithy_make_quality_text5", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -282,7 +282,7 @@ "key": "newsmithy_make_quality_text6", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -335,7 +335,7 @@ "key": "newsmithy_make_quality_text7", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -389,7 +389,7 @@ "key": "newsmithy_make_quality_text8", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -442,7 +442,7 @@ "key": "newsmithy_make_quality_text9", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -496,7 +496,7 @@ "key": "newsmithy_make_quality_text10", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -554,7 +554,7 @@ "key": "newsmithy_make_quality_text11", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -611,7 +611,7 @@ "key": "newsmithy_make_quality_text12", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -668,7 +668,7 @@ "key": "newsmithy_make_quality_text13", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -725,7 +725,7 @@ "key": "newsmithy_make_quality_text14", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -782,7 +782,7 @@ "key": "newsmithy_make_quality_text15", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -839,7 +839,7 @@ "key": "newsmithy_make_quality_text16", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -896,7 +896,7 @@ "key": "newsmithy_make_quality_text17", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -953,7 +953,7 @@ "key": "newsmithy_make_quality_text18", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1010,7 +1010,7 @@ "key": "newsmithy_make_quality_text19", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1067,7 +1067,7 @@ "key": "newsmithy_make_quality_text20", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1129,7 +1129,7 @@ "key": "newsmithy_make_quality_text21", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1191,7 +1191,7 @@ "key": "newsmithy_make_quality_text22", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1253,7 +1253,7 @@ "key": "newsmithy_make_quality_text23", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1315,7 +1315,7 @@ "key": "newsmithy_make_quality_text24", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1377,7 +1377,7 @@ "key": "newsmithy_make_quality_text25", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_6", + "drawing_png": "tj_img_gjtz", "basic_drop": 1004, "basic_cos": [ { @@ -1439,7 +1439,7 @@ "key": "newsmithy_make_quality_text26", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_11", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1491,7 +1491,7 @@ "key": "newsmithy_make_quality_text27", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_4", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1544,7 +1544,7 @@ "key": "newsmithy_make_quality_text28", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1598,7 +1598,7 @@ "key": "newsmithy_make_quality_text29", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1651,7 +1651,7 @@ "key": "newsmithy_make_quality_text30", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1705,7 +1705,7 @@ "key": "newsmithy_make_quality_text31", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1758,7 +1758,7 @@ "key": "newsmithy_make_quality_text32", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1812,7 +1812,7 @@ "key": "newsmithy_make_quality_text33", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1865,7 +1865,7 @@ "key": "newsmithy_make_quality_text34", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1919,7 +1919,7 @@ "key": "newsmithy_make_quality_text35", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -1977,7 +1977,7 @@ "key": "newsmithy_make_quality_text36", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2034,7 +2034,7 @@ "key": "newsmithy_make_quality_text37", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2091,7 +2091,7 @@ "key": "newsmithy_make_quality_text38", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2148,7 +2148,7 @@ "key": "newsmithy_make_quality_text39", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2205,7 +2205,7 @@ "key": "newsmithy_make_quality_text40", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2262,7 +2262,7 @@ "key": "newsmithy_make_quality_text41", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2319,7 +2319,7 @@ "key": "newsmithy_make_quality_text42", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2376,7 +2376,7 @@ "key": "newsmithy_make_quality_text43", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2433,7 +2433,7 @@ "key": "newsmithy_make_quality_text44", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2490,7 +2490,7 @@ "key": "newsmithy_make_quality_text45", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2552,7 +2552,7 @@ "key": "newsmithy_make_quality_text46", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2614,7 +2614,7 @@ "key": "newsmithy_make_quality_text47", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2676,7 +2676,7 @@ "key": "newsmithy_make_quality_text48", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2738,7 +2738,7 @@ "key": "newsmithy_make_quality_text49", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2800,7 +2800,7 @@ "key": "newsmithy_make_quality_text50", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_03", + "drawing_png": "tj_img_fytz", "basic_drop": 1004, "basic_cos": [ { @@ -2862,7 +2862,7 @@ "key": "newsmithy_make_quality_text51", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_8", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -2914,7 +2914,7 @@ "key": "newsmithy_make_quality_text52", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -2967,7 +2967,7 @@ "key": "newsmithy_make_quality_text53", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3021,7 +3021,7 @@ "key": "newsmithy_make_quality_text54", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3074,7 +3074,7 @@ "key": "newsmithy_make_quality_text55", "text": "普通-稀有" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3128,7 +3128,7 @@ "key": "newsmithy_make_quality_text56", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3181,7 +3181,7 @@ "key": "newsmithy_make_quality_text57", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3235,7 +3235,7 @@ "key": "newsmithy_make_quality_text58", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3288,7 +3288,7 @@ "key": "newsmithy_make_quality_text59", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3342,7 +3342,7 @@ "key": "newsmithy_make_quality_text60", "text": "普通-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3400,7 +3400,7 @@ "key": "newsmithy_make_quality_text61", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3457,7 +3457,7 @@ "key": "newsmithy_make_quality_text62", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3514,7 +3514,7 @@ "key": "newsmithy_make_quality_text63", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3571,7 +3571,7 @@ "key": "newsmithy_make_quality_text64", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3628,7 +3628,7 @@ "key": "newsmithy_make_quality_text65", "text": "稀有-史诗" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3685,7 +3685,7 @@ "key": "newsmithy_make_quality_text66", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3742,7 +3742,7 @@ "key": "newsmithy_make_quality_text67", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3799,7 +3799,7 @@ "key": "newsmithy_make_quality_text68", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3856,7 +3856,7 @@ "key": "newsmithy_make_quality_text69", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3913,7 +3913,7 @@ "key": "newsmithy_make_quality_text70", "text": "稀有-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -3975,7 +3975,7 @@ "key": "newsmithy_make_quality_text71", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -4037,7 +4037,7 @@ "key": "newsmithy_make_quality_text72", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -4099,7 +4099,7 @@ "key": "newsmithy_make_quality_text73", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -4161,7 +4161,7 @@ "key": "newsmithy_make_quality_text74", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { @@ -4223,7 +4223,7 @@ "key": "newsmithy_make_quality_text75", "text": "史诗-传说" }, - "drawing_png": "tjp_zb_12", + "drawing_png": "tj_img_fztz", "basic_drop": 1004, "basic_cos": [ { diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index e00a74276..936494166 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -1638,7 +1638,7 @@ ] }, { - "id": "practice_Kick", + "id": "practice_kick", "name": { "key": "", "text": "" @@ -1679,5 +1679,53 @@ "uiid": 10005, "activateType": 0, "notify": [] + }, + { + "id": "heroic_teaching", + "name": { + "key": "panda_1002", + "text": "英雄教习" + }, + "main": [ + { + "key": 1, + "param": 10 + } + ], + "optional": "", + "wkqbx": 2, + "kqbx": 0, + "img": "", + "prompt": { + "key": "", + "text": "" + }, + "uiid": 0, + "activateType": 0, + "notify": [] + }, + { + "id": "pavilion_kick", + "name": { + "key": "panda_1003", + "text": "踢馆" + }, + "main": [ + { + "key": 1, + "param": 10 + } + ], + "optional": "", + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "", + "text": "" + }, + "uiid": 0, + "activateType": 0, + "notify": [] } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor.json b/bin/json/game_playerinfor.json index 7f4ffd91d..f5580e02c 100644 --- a/bin/json/game_playerinfor.json +++ b/bin/json/game_playerinfor.json @@ -2,35 +2,7 @@ { "id": 1, "type": 1, - "url": "tx_js_24004", - "backname": "", - "isOpen": true - }, - { - "id": 2, - "type": 1, - "url": "tx_js_25004", - "backname": "", - "isOpen": true - }, - { - "id": 3, - "type": 1, - "url": "tx_js_34006", - "backname": "", - "isOpen": false - }, - { - "id": 4, - "type": 1, - "url": "tx_js_35001", - "backname": "", - "isOpen": false - }, - { - "id": 5, - "type": 1, - "url": "tx_js_25001", + "url": "ty_tx_nz", "backname": "", "isOpen": true }, diff --git a/bin/json/game_potions.json b/bin/json/game_potions.json index 6dff9b960..44dd62cd5 100644 --- a/bin/json/game_potions.json +++ b/bin/json/game_potions.json @@ -57,6 +57,11 @@ "a": "item", "t": "14010101", "n": 1 + }, + { + "a": "item", + "t": "14010102", + "n": 1 } ], "standard_yield": [ @@ -139,6 +144,11 @@ "a": "item", "t": "14010203", "n": 1 + }, + { + "a": "item", + "t": "14010204", + "n": 1 } ], "standard_yield": [ @@ -221,6 +231,11 @@ "a": "item", "t": "14010305", "n": 1 + }, + { + "a": "item", + "t": "14010306", + "n": 1 } ], "standard_yield": [ @@ -303,6 +318,11 @@ "a": "item", "t": "14010407", "n": 1 + }, + { + "a": "item", + "t": "14010408", + "n": 1 } ], "standard_yield": [ @@ -385,6 +405,11 @@ "a": "item", "t": "14020101", "n": 1 + }, + { + "a": "item", + "t": "14020102", + "n": 1 } ], "standard_yield": [ @@ -467,6 +492,11 @@ "a": "item", "t": "14020203", "n": 1 + }, + { + "a": "item", + "t": "14020204", + "n": 1 } ], "standard_yield": [ @@ -549,6 +579,11 @@ "a": "item", "t": "14020305", "n": 1 + }, + { + "a": "item", + "t": "14020306", + "n": 1 } ], "standard_yield": [ @@ -631,6 +666,11 @@ "a": "item", "t": "14020407", "n": 1 + }, + { + "a": "item", + "t": "14020408", + "n": 1 } ], "standard_yield": [ @@ -713,6 +753,11 @@ "a": "item", "t": "14030101", "n": 1 + }, + { + "a": "item", + "t": "14030102", + "n": 1 } ], "standard_yield": [ @@ -795,6 +840,11 @@ "a": "item", "t": "14030203", "n": 1 + }, + { + "a": "item", + "t": "14030204", + "n": 1 } ], "standard_yield": [ @@ -877,6 +927,11 @@ "a": "item", "t": "14030305", "n": 1 + }, + { + "a": "item", + "t": "14030306", + "n": 1 } ], "standard_yield": [ @@ -959,6 +1014,11 @@ "a": "item", "t": "14030407", "n": 1 + }, + { + "a": "item", + "t": "14030408", + "n": 1 } ], "standard_yield": [ diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index c7a2ce306..3fa215bcd 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -3107,8 +3107,8 @@ "id": 3024001, "type_sp": 0, "tasktxt": { - "key": "", - "text": "" + "key": "task_taskcond_tasktxt_3024001", + "text": "为任意英雄提升等级" }, "type": 24, "valid": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 46316871c..e47dfb5b4 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -59,9 +59,9 @@ "id": 10010, "heroid": 25001, "datas": [ - "GameMain", + "CommandScene", "20010_熊猫_1", - "901" + "905" ], "event": [ 2, @@ -73,9 +73,9 @@ "id": 10011, "heroid": 44004, "datas": [ - "GameMain", + "CommandScene", "20010_骇客蛛_1", - "901" + "905" ], "event": [ 2, @@ -87,9 +87,9 @@ "id": 10012, "heroid": 25001, "datas": [ - "GameMain", - "20010_箱子_1", - "901" + "CommandScene", + "主线入口_原石", + "905" ], "event": [ 2, @@ -214,7 +214,7 @@ "heroid": 24004, "datas": [ "WuGuanScene", - "20020_邦尼兔_1", + "20050_邦尼兔_1", "137" ], "event": [ @@ -256,8 +256,8 @@ "heroid": 44004, "datas": [ "GameMain", - "20010_骇客蛛_1", - "901" + "20070_骇客蛛_1", + "905" ], "event": [ 2, @@ -297,9 +297,9 @@ "id": 10090, "heroid": 44004, "datas": [ - "GameMain", + "CommandScene", "20010_骇客蛛_1", - "901" + "905" ], "event": [ 2, @@ -311,9 +311,9 @@ "id": 10100, "heroid": 44004, "datas": [ - "GameMain", + "CommandScene", "20010_骇客蛛_1", - "901" + "905" ], "event": [ 2, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 43c0d3dea..9e1f1afef 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -8203,19 +8203,17 @@ "Where": [], "Order": "", "Limit": 1, - "ExecuteCnt": 2, + "ExecuteCnt": 1, "Type": 1, "Argu": [ 1, 4, - 300 + 1000 ], "FollowSK": [ 215004112 ], - "SucFollowSK": [ - 215004113 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -8231,31 +8229,6 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 400 - ], - "FollowSK": [], - "SucFollowSK": [ - 215004113 - ], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 215004113, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, "Type": 14, "Argu": [ 100 @@ -8283,10 +8256,10 @@ 4, 400 ], - "FollowSK": [], - "SucFollowSK": [ - 215004113 + "FollowSK": [ + 215004112 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -8308,10 +8281,10 @@ 4, 400 ], - "FollowSK": [], - "SucFollowSK": [ - 215004113 + "FollowSK": [ + 215004112 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -8333,10 +8306,10 @@ 4, 400 ], - "FollowSK": [], - "SucFollowSK": [ - 215004113 + "FollowSK": [ + 215004112 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -8358,7 +8331,9 @@ 4, 700 ], - "FollowSK": [], + "FollowSK": [ + 215004212 + ], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -8405,7 +8380,9 @@ 4, 750 ], - "FollowSK": [], + "FollowSK": [ + 215004222 + ], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -8452,7 +8429,9 @@ 4, 750 ], - "FollowSK": [], + "FollowSK": [ + 215004232 + ], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -8499,7 +8478,9 @@ 4, 800 ], - "FollowSK": [], + "FollowSK": [ + 215004242 + ], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -8539,15 +8520,15 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 2, + "ExecuteCnt": 1, "Type": 1, "Argu": [ 1, 4, - 300 + 1000 ], "FollowSK": [ - 215004313 + 215004312 ], "SucFollowSK": [], "FailFollowSK": [], @@ -8565,31 +8546,6 @@ "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 300 - ], - "FollowSK": [ - 215004313 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 215004313, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, "Type": 8, "Argu": [ 0, @@ -13978,12 +13934,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 3, + "ExecuteCnt": 1, "Type": 1, "Argu": [ 1, 4, - 450 + 900 ], "FollowSK": [], "SucFollowSK": [ diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 1b71c6c60..1d66871f1 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -82,7 +82,9 @@ "key": "skill_1250041112", "text": "伤害提升至35%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -110,7 +112,9 @@ "key": "skill_1250041113", "text": "概率触发概率提升至50%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -138,7 +142,9 @@ "key": "skill_1250041114", "text": "伤害提升至40%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -166,7 +172,9 @@ "key": "skill_1250041115", "text": "概率触发概率提升至60%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -194,7 +202,9 @@ "key": "skill_1250041116", "text": "伤害提升至45%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -256,7 +266,9 @@ "key": "skill_1250042112", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001001 + ], "map": "" }, { @@ -286,7 +298,9 @@ "key": "skill_1250042113", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001001 + ], "map": "" }, { @@ -344,7 +358,9 @@ "key": "skill_1250043112", "text": "恢复量提升至22%" }, - "buffid": [], + "buffid": [ + 390001208 + ], "map": "" }, { @@ -372,7 +388,9 @@ "key": "skill_1250043113", "text": "恢复量提升至24%" }, - "buffid": [], + "buffid": [ + 390001208 + ], "map": "" }, { @@ -400,7 +418,9 @@ "key": "skill_1250043114", "text": "恢复量提升至26%" }, - "buffid": [], + "buffid": [ + 390001208 + ], "map": "" }, { @@ -428,7 +448,9 @@ "key": "skill_1250043115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001208 + ], "map": "" }, { @@ -516,7 +538,9 @@ "key": "skill_1350021112", "text": "第二段伤害提升至90%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -545,7 +569,9 @@ "key": "skill_1350021113", "text": "效果触发几率提升至60%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -574,7 +600,9 @@ "key": "skill_1350021114", "text": "第二段伤害提升至100%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -603,7 +631,9 @@ "key": "skill_1350021115", "text": "效果触发几率提升至70%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -632,7 +662,9 @@ "key": "skill_1350021116", "text": "第二段伤害提升至110%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -1085,7 +1117,9 @@ "key": "skill_1240031112", "text": "伤害提升至100%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1114,7 +1148,9 @@ "key": "skill_1240031113", "text": "效果触发几率提升至60%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1143,7 +1179,9 @@ "key": "skill_1240031114", "text": "伤害提升至110%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1172,7 +1210,9 @@ "key": "skill_1240031115", "text": "效果触发几率提升至70%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1232,7 +1272,9 @@ "key": "skill_1240032112", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001003 + ], "map": "" }, { @@ -1294,7 +1336,9 @@ "key": "skill_1240033112", "text": "降低的行动值提升至25%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1324,7 +1368,9 @@ "key": "skill_1240033113", "text": "效果触发几率提升至90%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1354,7 +1400,9 @@ "key": "skill_1240033114", "text": "降低的行动值提升至30%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1384,7 +1432,9 @@ "key": "skill_1240033115", "text": "效果触发几率提升至100%" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1412,7 +1462,9 @@ "key": "skill_1240033116", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001118 + ], "map": "" }, { @@ -1475,7 +1527,10 @@ "key": "skill_9240034112", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001003, + 390001002 + ], "map": "" }, { @@ -1561,7 +1616,9 @@ "key": "skill_1340061112", "text": "伤害提升至55%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -1589,7 +1646,9 @@ "key": "skill_1340061113", "text": "效果触发几率提升至70%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -1617,7 +1676,9 @@ "key": "skill_1340061114", "text": "伤害提升至60%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -1645,7 +1706,9 @@ "key": "skill_1340061115", "text": "效果触发几率提升至80%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -1844,7 +1907,10 @@ "key": "skill_1340063112", "text": "伤害提升至105%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001106 + ], "map": "" }, { @@ -1872,7 +1938,10 @@ "key": "skill_1340063113", "text": "效果触发几率提升至100%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001106 + ], "map": "" }, { @@ -1900,7 +1969,10 @@ "key": "skill_1340063114", "text": "伤害提升至110%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001106 + ], "map": "" }, { @@ -1928,7 +2000,10 @@ "key": "skill_1340063115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001008, + 390001106 + ], "map": "" }, { @@ -1986,7 +2061,9 @@ "key": "skill_9340064112", "text": "伤害提升至75%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -2014,7 +2091,9 @@ "key": "skill_9340064113", "text": "效果触发几率提升至80%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -2042,7 +2121,9 @@ "key": "skill_9340064114", "text": "伤害提升至80%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -2070,7 +2151,9 @@ "key": "skill_9340064115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -2098,7 +2181,9 @@ "key": "skill_1250010111", "text": "我方全体防御增加30%" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -2156,7 +2241,9 @@ "key": "skill_1250011112", "text": "防御伤害比例提升至60%" }, - "buffid": [], + "buffid": [ + 390001006 + ], "map": "" }, { @@ -2184,7 +2271,9 @@ "key": "skill_1250011113", "text": "效果触发几率提升至60%" }, - "buffid": [], + "buffid": [ + 390001006 + ], "map": "" }, { @@ -2212,7 +2301,9 @@ "key": "skill_1250011114", "text": "防御伤害比例提升至70%" }, - "buffid": [], + "buffid": [ + 390001006 + ], "map": "" }, { @@ -2240,7 +2331,9 @@ "key": "skill_1250011115", "text": "效果触发几率提升至75%" }, - "buffid": [], + "buffid": [ + 390001006 + ], "map": "" }, { @@ -2300,7 +2393,9 @@ "key": "skill_1250012112", "text": "防御伤害比例提升至95%" }, - "buffid": [], + "buffid": [ + 390001211 + ], "map": "" }, { @@ -2329,7 +2424,9 @@ "key": "skill_1250012113", "text": "防御伤害比例提升至100%" }, - "buffid": [], + "buffid": [ + 390001212 + ], "map": "" }, { @@ -2358,7 +2455,9 @@ "key": "skill_1250012114", "text": "防御伤害比例提升至110%" }, - "buffid": [], + "buffid": [ + 390001213 + ], "map": "" }, { @@ -2387,7 +2486,9 @@ "key": "skill_1250012115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001214 + ], "map": "" }, { @@ -2590,7 +2691,10 @@ "key": "skill_1250013112", "text": "防御伤害比例提升至110%" }, - "buffid": [], + "buffid": [ + 390001002, + 390001111 + ], "map": "" }, { @@ -2620,7 +2724,10 @@ "key": "skill_1250013113", "text": "防御伤害比例提升至120%" }, - "buffid": [], + "buffid": [ + 390001002, + 390001111 + ], "map": "" }, { @@ -2650,7 +2757,10 @@ "key": "skill_1250013114", "text": "防御伤害比例提升至140%" }, - "buffid": [], + "buffid": [ + 390001002, + 390001111 + ], "map": "" }, { @@ -2680,7 +2790,10 @@ "key": "skill_1250013115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001002, + 390001111 + ], "map": "" }, { @@ -2740,7 +2853,9 @@ "key": "skill_9250014112", "text": "防御伤害比例提升至95%" }, - "buffid": [], + "buffid": [ + 390001210 + ], "map": "" }, { @@ -2769,7 +2884,9 @@ "key": "skill_9250014113", "text": "防御伤害比例提升至100%" }, - "buffid": [], + "buffid": [ + 390001210 + ], "map": "" }, { @@ -2798,7 +2915,9 @@ "key": "skill_9250014114", "text": "防御伤害比例提升至110%" }, - "buffid": [], + "buffid": [ + 390001210 + ], "map": "" }, { @@ -2827,7 +2946,9 @@ "key": "skill_9250014115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001210 + ], "map": "" }, { @@ -3053,7 +3174,9 @@ "key": "skill_1440052112", "text": "伤害提升至47%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -3081,7 +3204,9 @@ "key": "skill_1440052113", "text": "效果触发几率提升至40%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -3109,7 +3234,9 @@ "key": "skill_1440052114", "text": "伤害提升至50%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -3137,7 +3264,9 @@ "key": "skill_1440052115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -3503,7 +3632,8 @@ "buffid": [ 390001119, 390001120, - 390001121 + 390001121, + 390001007 ], "map": "" }, @@ -3534,7 +3664,12 @@ "key": "skill_1350011112", "text": "造成的伤害提升105%" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3564,7 +3699,12 @@ "key": "skill_1350011113", "text": "对额外目标的伤害提升至70%" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3594,7 +3734,12 @@ "key": "skill_1350011114", "text": "造成的伤害提升至110%" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3624,7 +3769,12 @@ "key": "skill_1350011115", "text": "对额外目标的伤害提升至80%" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3654,7 +3804,12 @@ "key": "skill_1350011116", "text": "造成的伤害提升至120%" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3833,7 +3988,8 @@ "buffid": [ 390001119, 390001120, - 390001121 + 390001121, + 390001007 ], "map": "" }, @@ -3865,7 +4021,12 @@ "key": "skill_1350013112", "text": "伤害提升至55%" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3896,7 +4057,12 @@ "key": "skill_1350013113", "text": "伤害提升至60%" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3927,7 +4093,12 @@ "key": "skill_1350013114", "text": "冷却减少1回合" }, - "buffid": [], + "buffid": [ + 390001119, + 390001120, + 390001121, + 390001007 + ], "map": "" }, { @@ -3991,7 +4162,9 @@ "key": "skill_9350014112", "text": "伤害提升至180%" }, - "buffid": [], + "buffid": [ + 390001112 + ], "map": "" }, { @@ -4022,7 +4195,9 @@ "key": "skill_9350014113", "text": "伤害提升至190%" }, - "buffid": [], + "buffid": [ + 390001112 + ], "map": "" }, { @@ -4053,7 +4228,9 @@ "key": "skill_9350014114", "text": "伤害提升至200%" }, - "buffid": [], + "buffid": [ + 390001112 + ], "map": "" }, { @@ -4082,7 +4259,9 @@ "key": "skill_9350014115", "text": "冷却时间减少至1回合" }, - "buffid": [], + "buffid": [ + 390001112 + ], "map": "" }, { @@ -4168,7 +4347,9 @@ "key": "skill_1240041112", "text": "伤害提升至110%" }, - "buffid": [], + "buffid": [ + 390001107 + ], "map": "" }, { @@ -4196,7 +4377,9 @@ "key": "skill_1240041113", "text": "效果触发几率提升至70%" }, - "buffid": [], + "buffid": [ + 390001107 + ], "map": "" }, { @@ -4224,7 +4407,9 @@ "key": "skill_1240041114", "text": "伤害提升至120%" }, - "buffid": [], + "buffid": [ + 390001107 + ], "map": "" }, { @@ -4252,7 +4437,9 @@ "key": "skill_1240041115", "text": "效果触发几率提升至80%" }, - "buffid": [], + "buffid": [ + 390001107 + ], "map": "" }, { @@ -4280,7 +4467,9 @@ "key": "skill_1240042111", "text": "攻击时为目标附加2回合【中毒】。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -4343,7 +4532,10 @@ "key": "skill_1240043112", "text": "伤害提升至105%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001401 + ], "map": "" }, { @@ -4373,7 +4565,10 @@ "key": "skill_1240043113", "text": "伤害提升至110%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001401 + ], "map": "" }, { @@ -4403,7 +4598,10 @@ "key": "skill_1240043114", "text": "伤害提升至115%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001401 + ], "map": "" }, { @@ -4433,7 +4631,10 @@ "key": "skill_1240043115", "text": "伤害提升至120%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001401 + ], "map": "" }, { @@ -4463,7 +4664,10 @@ "key": "skill_1240043116", "text": "伤害提升至130%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001401 + ], "map": "" }, { @@ -4493,7 +4697,10 @@ "key": "skill_1240043117", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001008, + 390001401 + ], "map": "" }, { @@ -4814,7 +5021,10 @@ "key": "skill_1440063112", "text": "伤害提升至240%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -4846,7 +5056,10 @@ "key": "skill_1440063113", "text": "伤害提升至250%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -4878,7 +5091,10 @@ "key": "skill_1440063114", "text": "伤害提升至260%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -4910,7 +5126,10 @@ "key": "skill_1440063115", "text": "伤害提升至270%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -4942,7 +5161,10 @@ "key": "skill_1440063116", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -5017,7 +5239,10 @@ "key": "skill_9440064112", "text": "伤害提升至240%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -5053,7 +5278,10 @@ "key": "skill_9440064113", "text": "伤害提升至250%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -5089,7 +5317,10 @@ "key": "skill_9440064114", "text": "伤害提升至260%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -5125,7 +5356,10 @@ "key": "skill_9440064115", "text": "伤害提升至270%" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -5161,7 +5395,10 @@ "key": "skill_9440064116", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001001, + 390001004 + ], "map": "" }, { @@ -5426,7 +5663,9 @@ "key": "skill_1150053112", "text": "治疗量提升至28%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -5457,7 +5696,9 @@ "key": "skill_1150053113", "text": "治疗量提升至31%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -5488,7 +5729,9 @@ "key": "skill_1150053114", "text": "治疗量提升至35%" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -5519,7 +5762,9 @@ "key": "skill_1150053115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001111 + ], "map": "" }, { @@ -5568,8 +5813,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004111, - 215004112 + 215004111 ] }, "Desc": { @@ -5597,8 +5841,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004111, - 215004122 + 215004111 ] }, "Desc": { @@ -5626,8 +5869,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004111, - 215004132 + 215004111 ] }, "Desc": { @@ -5655,8 +5897,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004111, - 215004142 + 215004111 ] }, "Desc": { @@ -5684,15 +5925,16 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004211, - 215004212 + 215004211 ] }, "Desc": { "key": "skill_1150042111", "text": "攻击全体敌方，伤害为自身攻击力70%，85%概率为目标附加1回合【眩晕】。" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -5713,15 +5955,16 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004221, - 215004222 + 215004221 ] }, "Desc": { "key": "skill_1150042112", "text": "伤害提升至75%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -5742,15 +5985,16 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004231, - 215004232 + 215004231 ] }, "Desc": { "key": "skill_1150042113", "text": "效果触发几率提升至85%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -5771,15 +6015,16 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004241, - 215004242 + 215004241 ] }, "Desc": { "key": "skill_1150042114", "text": "伤害提升至80%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -5800,15 +6045,16 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004241, - 215004242 + 215004241 ] }, "Desc": { "key": "skill_1150042115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -5829,8 +6075,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004311, - 215004312 + 215004311 ] }, "Desc": { @@ -5858,8 +6103,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004311, - 215004322 + 215004311 ] }, "Desc": { @@ -5887,8 +6131,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004311, - 215004332 + 215004311 ] }, "Desc": { @@ -5916,8 +6159,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004311, - 215004332 + 215004311 ] }, "Desc": { @@ -5945,8 +6187,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004311, - 215004342 + 215004311 ] }, "Desc": { @@ -5974,8 +6215,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215004311, - 215004342 + 215004311 ] }, "Desc": { @@ -6011,7 +6251,9 @@ "key": "skill_9150042111", "text": "攻击全体敌方，伤害为自身攻击力70%，每次有85%概率为目标附加1回合【眩晕】。每个被【眩晕】的目标提升自身15%行动值。" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -6040,7 +6282,9 @@ "key": "skill_9150042112", "text": "伤害提升至75%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -6069,7 +6313,9 @@ "key": "skill_9150042113", "text": "效果触发几率提升至85%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -6098,7 +6344,9 @@ "key": "skill_9150042114", "text": "伤害提升至80%" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -6127,7 +6375,9 @@ "key": "skill_9150042115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -6213,7 +6463,9 @@ "key": "skill_1240021112", "text": "伤害提升至60%" }, - "buffid": [], + "buffid": [ + 390001211 + ], "map": "" }, { @@ -6241,7 +6493,9 @@ "key": "skill_1240021113", "text": "伤害提升至65%" }, - "buffid": [], + "buffid": [ + 390001211 + ], "map": "" }, { @@ -6269,7 +6523,9 @@ "key": "skill_1240021114", "text": "伤害提升至70%" }, - "buffid": [], + "buffid": [ + 390001211 + ], "map": "" }, { @@ -6297,7 +6553,9 @@ "key": "skill_1240021115", "text": "伤害提升至75%" }, - "buffid": [], + "buffid": [ + 390001211 + ], "map": "" }, { @@ -6325,7 +6583,9 @@ "key": "skill_1240021116", "text": "伤害提升至80%" }, - "buffid": [], + "buffid": [ + 390001211 + ], "map": "" }, { @@ -6385,7 +6645,10 @@ "key": "skill_1240023111", "text": "攻击全体敌方3次，总伤害为自身攻击力90%。" }, - "buffid": [], + "buffid": [ + 390001211, + 390001008 + ], "map": "" }, { @@ -6414,7 +6677,10 @@ "key": "skill_1240023112", "text": "伤害提升至95%" }, - "buffid": [], + "buffid": [ + 390001211, + 390001008 + ], "map": "" }, { @@ -6443,7 +6709,10 @@ "key": "skill_1240023113", "text": "伤害提升至100%" }, - "buffid": [], + "buffid": [ + 390001211, + 390001008 + ], "map": "" }, { @@ -6472,7 +6741,10 @@ "key": "skill_1240023114", "text": "伤害提升至105%" }, - "buffid": [], + "buffid": [ + 390001211, + 390001008 + ], "map": "" }, { @@ -6501,7 +6773,10 @@ "key": "skill_1240023115", "text": "伤害提升至110%" }, - "buffid": [], + "buffid": [ + 390001211, + 390001008 + ], "map": "" }, { @@ -6530,7 +6805,10 @@ "key": "skill_1240023116", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001211, + 390001008 + ], "map": "" }, { @@ -6616,7 +6894,9 @@ "key": "skill_1140071112", "text": "防御比例伤害提升至60%" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -6644,7 +6924,9 @@ "key": "skill_1140071113", "text": "效果触发几率提升至60%" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -6672,7 +6954,9 @@ "key": "skill_1140071114", "text": "防御比例伤害提升至70%" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -6700,7 +6984,9 @@ "key": "skill_1140071115", "text": "效果触发几率提升至70%" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -6728,7 +7014,9 @@ "key": "skill_1140071116", "text": "防御比例伤害提升至80%" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -6788,7 +7076,9 @@ "key": "skill_1140072112", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001104 + ], "map": "" }, { @@ -6817,7 +7107,9 @@ "key": "skill_1140072113", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001104 + ], "map": "" }, { @@ -6881,7 +7173,9 @@ "key": "skill_1140073112", "text": "防御比例伤害提升至85%" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -6912,7 +7206,9 @@ "key": "skill_1140073113", "text": "效果触发几率提升至40%" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -6943,7 +7239,9 @@ "key": "skill_1140073114", "text": "防御比例伤害提升至90%" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -6974,7 +7272,9 @@ "key": "skill_1140073115", "text": "效果触发几率提升至50%" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -7005,7 +7305,9 @@ "key": "skill_1140073116", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -7234,7 +7536,10 @@ "key": "skill_1140032112", "text": "伤害提升至160%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001003 + ], "map": "" }, { @@ -7263,7 +7568,10 @@ "key": "skill_1140032113", "text": "效果触发几率提升至100%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001003 + ], "map": "" }, { @@ -7292,7 +7600,10 @@ "key": "skill_1140032114", "text": "伤害提升至180%" }, - "buffid": [], + "buffid": [ + 390001008, + 390001003 + ], "map": "" }, { @@ -7321,7 +7632,10 @@ "key": "skill_1140032115", "text": "冷却时间减少1回合" }, - "buffid": [], + "buffid": [ + 390001008, + 390001003 + ], "map": "" }, { @@ -8011,8 +8325,10 @@ "key": "skill_1510052111", "text": "对敌方1个目标发起攻击，造成攻击力180%的伤害，并附加2回合【攻击下降】状态。" }, - "buffid": [], - "map": "390001006" + "buffid": [ + 390001006 + ], + "map": "" }, { "id": 113003011, @@ -9297,7 +9613,9 @@ "key": "skill_1340021111", "text": "蒂姆·邓普顿对敌方1个目标造成攻击力110%的伤害，并为生命比例最低的队友附加1回合【复苏】状态。" }, - "buffid": [], + "buffid": [ + 390001127 + ], "map": "" }, { @@ -9326,7 +9644,9 @@ "key": "skill_1340022111", "text": "蒂姆·邓普顿为我方1名队友增加100%行动值，并附加2回合【攻击提升】状态。" }, - "buffid": [], + "buffid": [ + 390001001 + ], "map": "" }, { @@ -9355,7 +9675,10 @@ "key": "skill_1340023111", "text": "蒂姆·邓普顿为我方1名队友附加1回合【无敌】状态，同时为我方全体附加2回合【免疫】状态。" }, - "buffid": [], + "buffid": [ + 390001103, + 390001111 + ], "map": "" }, { diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 43954aa9a..4219d1d93 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -3224,7 +3224,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, - "golbalbufficon": "", + "golbalbufficon": "buff_gj_ts", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3251,7 +3251,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, - "golbalbufficon": "", + "golbalbufficon": "buff_fy_ts", "buffIcon": "ty_zd_buff_z003", "buffeffect": "", "buffpos": "根节点" @@ -3278,7 +3278,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, - "golbalbufficon": "", + "golbalbufficon": "buff_bj_ts", "buffIcon": "ty_zd_buff_z006", "buffeffect": "", "buffpos": "根节点" @@ -3305,7 +3305,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, - "golbalbufficon": "", + "golbalbufficon": "buff_bj_dk", "buffIcon": "ty_zd_buff_z008", "buffeffect": "", "buffpos": "根节点" @@ -3332,7 +3332,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, - "golbalbufficon": "", + "golbalbufficon": "buff_mz_ts", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3359,7 +3359,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, - "golbalbufficon": "", + "golbalbufficon": "buff_dk_ts", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json index b8480e807..03935fad3 100644 --- a/bin/json/game_taskactivereward.json +++ b/bin/json/game_taskactivereward.json @@ -6,11 +6,11 @@ "reword": [ { "a": "item", - "t": "60001", + "t": "60002", "n": 1 } ], - "action": "Skill_2", + "action": "25004_cheer_act", "stage": 1 }, { @@ -24,7 +24,7 @@ "n": 2 } ], - "action": "Skill_2", + "action": "25004_cheer_act", "stage": 2 }, { @@ -34,25 +34,11 @@ "reword": [ { "a": "item", - "t": "60003", + "t": "60002", "n": 3 } ], - "action": "Skill_2", + "action": "25004_cheer_act", "stage": 3 - }, - { - "key": 4, - "id_tag": 2, - "active": 160, - "reword": [ - { - "a": "item", - "t": "60003", - "n": 4 - } - ], - "action": "Skill_2", - "stage": 4 } ] \ No newline at end of file diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index 9cc5440a3..15bff18f8 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -5,7 +5,7 @@ "id_tag": 2, "task_display": { "key": "task_20001", - "text": "进行10次普通招募" + "text": "进行5次普通招募" }, "type_id": 3018001, "active": 40, @@ -26,7 +26,7 @@ "id_tag": 2, "task_display": { "key": "task_20002", - "text": "为任意英雄提升10次等级" + "text": "为任意英雄提升5次等级" }, "type_id": 3024001, "active": 40, @@ -47,7 +47,7 @@ "id_tag": 2, "task_display": { "key": "task_20003", - "text": "强化任意装备成功6次" + "text": "强化任意装备成功7次" }, "type_id": 3047001, "active": 40, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index b314aa1bb..4aba89abb 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -18,7 +18,7 @@ }, "npctxt": { "key": "Mainline_Tasks1_1_Receiving", - "text": "寻找熊猫" + "text": "和阿宝聊聊" }, "npc": 10010, "completetasktxt": { @@ -62,7 +62,7 @@ }, "npctxt": { "key": "Mainline_Tasks1_2_Receiving", - "text": "美好的风景总是让人流连，忍不住心向往之，倾心守护。" + "text": "去路口寻找阿宝" }, "npc": 10020, "completetasktxt": { @@ -238,7 +238,7 @@ }, "npctxt": { "key": "Mainline_Tasks1_6_Receiving", - "text": "被月中人选中之人，终将为守护而生。" + "text": "和阿宝聊聊" }, "npc": 10060, "completetasktxt": { @@ -424,7 +424,7 @@ }, "npctxt": { "key": "Mainline_Tasks1_10_Receiving", - "text": "月光原石回到了它应该在的位置。" + "text": "骇客蛛会教我怎么做" }, "npc": 10100, "completetasktxt": { @@ -556,7 +556,7 @@ }, "npctxt": { "key": "Mainline_Tasks1_13_Receiving", - "text": "梦魇消失了，虽然危险的根源并未被根除，但至少现在我们安全了，暂时的。" + "text": "找骇客蛛指定战术" }, "npc": 10130, "completetasktxt": { @@ -673,7 +673,7 @@ "key": 40010, "lock": 1, "lockend": 0, - "ontxe": 20020, + "ontxe": 20090, "id_after": 40020, "group": 320, "des": 3, @@ -761,7 +761,7 @@ "key": 50010, "lock": 1, "lockend": 0, - "ontxe": 20030, + "ontxe": 200600, "id_after": 50011, "group": 330, "des": 3, @@ -849,7 +849,7 @@ "key": 60010, "lock": 1, "lockend": 0, - "ontxe": 20040, + "ontxe": 20100, "id_after": 0, "group": 340, "des": 3, @@ -893,7 +893,7 @@ "key": 70010, "lock": 1, "lockend": 0, - "ontxe": 20050, + "ontxe": 20120, "id_after": 0, "group": 350, "des": 3, @@ -981,7 +981,7 @@ "key": 100040, "lock": 5, "lockend": 20, - "ontxe": 20030, + "ontxe": 20110, "id_after": 0, "group": 113, "des": 1, @@ -1025,7 +1025,7 @@ "key": 500010, "lock": 9, "lockend": 15, - "ontxe": 20090, + "ontxe": 20120, "id_after": 0, "group": 410, "des": 4, diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index 10e5e69af..849731728 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) //任务奖励领取 @@ -85,6 +86,56 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) ue.Activeweek = ue.Activeweek + conf.Active update["activeweek"] = ue.Activeweek } + // 周任务 自动领取奖励 + if comm.TaskTag(req.TaskTag) == comm.TASK_WEEKLY { + TaskActive := make(map[string]interface{}) + activeList := this.moduleTask.modelTaskActive.getActiveList(uid) + var rewards []*cfg.Gameatn + var maxTaskId int32 + for _, v := range activeList { + if v.Received != 1 { + conf := this.moduleTask.configure.getTaskActiveById(v.TaskId) + if conf == nil { + code = pb.ErrorCode_ConfigNoFound + return + } + if ue.Activeweek < conf.Active { + continue + } + v.Received = 1 + rewards = append(rewards, conf.Reword...) + } + + maxTaskId = v.TaskId + + } + + if len(rewards) > 0 { + TaskActive["activityList"] = activeList + + if err := this.moduleTask.modelTaskActive.Change(session.GetUserId(), TaskActive); err != nil { + this.moduleTask.Errorf("updateReceive err %v", err) + code = pb.ErrorCode_DBError + return + } + //派发奖励 + if code = this.moduleTask.DispenseRes(session, rewards, true); code != pb.ErrorCode_Success { + this.moduleTask.Error("活跃度奖励", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "rewards", Value: rewards}, + log.Field{Key: "code", Value: code}, + ) + } + err := session.SendMsg(string(this.moduleTask.GetType()), "activereceive", &pb.TaskActiveReceivePush{ + TaskTag: int32(comm.TASK_WEEKLY), + Id: maxTaskId, + }) + if err != nil { + code = pb.ErrorCode_SystemError + return + } + } + } } if len(update) > 0 { diff --git a/pb/task_msg.pb.go b/pb/task_msg.pb.go index 382354f25..8f83358fa 100644 --- a/pb/task_msg.pb.go +++ b/pb/task_msg.pb.go @@ -668,6 +668,61 @@ func (x *TaskFinishedPush) GetTaskId() int32 { return 0 } +type TaskActiveReceivePush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskTag int32 `protobuf:"varint,1,opt,name=taskTag,proto3" json:"taskTag"` + Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id"` +} + +func (x *TaskActiveReceivePush) Reset() { + *x = TaskActiveReceivePush{} + if protoimpl.UnsafeEnabled { + mi := &file_task_task_msg_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TaskActiveReceivePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TaskActiveReceivePush) ProtoMessage() {} + +func (x *TaskActiveReceivePush) ProtoReflect() protoreflect.Message { + mi := &file_task_task_msg_proto_msgTypes[13] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TaskActiveReceivePush.ProtoReflect.Descriptor instead. +func (*TaskActiveReceivePush) Descriptor() ([]byte, []int) { + return file_task_task_msg_proto_rawDescGZIP(), []int{13} +} + +func (x *TaskActiveReceivePush) GetTaskTag() int32 { + if x != nil { + return x.TaskTag + } + return 0 +} + +func (x *TaskActiveReceivePush) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + var File_task_task_msg_proto protoreflect.FileDescriptor var file_task_task_msg_proto_rawDesc = []byte{ @@ -716,8 +771,12 @@ var file_task_task_msg_proto_rawDesc = []byte{ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x10, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x41, 0x0a, 0x15, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, + 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -732,7 +791,7 @@ func file_task_task_msg_proto_rawDescGZIP() []byte { return file_task_task_msg_proto_rawDescData } -var file_task_task_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_task_task_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14) var file_task_task_msg_proto_goTypes = []interface{}{ (*TaskGetrecordReq)(nil), // 0: TaskGetrecordReq (*TaskGetrecordResp)(nil), // 1: TaskGetrecordResp @@ -747,14 +806,15 @@ var file_task_task_msg_proto_goTypes = []interface{}{ (*TaskActiveReceiveReq)(nil), // 10: TaskActiveReceiveReq (*TaskActiveReceiveResp)(nil), // 11: TaskActiveReceiveResp (*TaskFinishedPush)(nil), // 12: TaskFinishedPush - (*DBRtaskRecord)(nil), // 13: DBRtaskRecord - (*TaskData)(nil), // 14: TaskData - (*ActivityData)(nil), // 15: ActivityData + (*TaskActiveReceivePush)(nil), // 13: TaskActiveReceivePush + (*DBRtaskRecord)(nil), // 14: DBRtaskRecord + (*TaskData)(nil), // 15: TaskData + (*ActivityData)(nil), // 16: ActivityData } var file_task_task_msg_proto_depIdxs = []int32{ - 13, // 0: TaskGetrecordResp.record:type_name -> DBRtaskRecord - 14, // 1: TaskListResp.list:type_name -> TaskData - 15, // 2: TaskActiveListResp.list:type_name -> ActivityData + 14, // 0: TaskGetrecordResp.record:type_name -> DBRtaskRecord + 15, // 1: TaskListResp.list:type_name -> TaskData + 16, // 2: TaskActiveListResp.list:type_name -> ActivityData 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -925,6 +985,18 @@ func file_task_task_msg_proto_init() { return nil } } + file_task_task_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TaskActiveReceivePush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -932,7 +1004,7 @@ func file_task_task_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_task_task_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 13, + NumMessages: 14, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.LinestoryMainTaskData.go b/sys/configure/structs/Game.LinestoryMainTaskData.go index 7eef56631..59af9f5aa 100644 --- a/sys/configure/structs/Game.LinestoryMainTaskData.go +++ b/sys/configure/structs/Game.LinestoryMainTaskData.go @@ -25,7 +25,7 @@ type GameLinestoryMainTaskData struct { const TypeId_GameLinestoryMainTaskData = 1251904205 func (*GameLinestoryMainTaskData) GetTypeId() int32 { - return 1251904205 + return 1251904205 } func (_v *GameLinestoryMainTaskData)Deserialize(_buf map[string]interface{}) (err error) { @@ -42,10 +42,10 @@ func (_v *GameLinestoryMainTaskData)Deserialize(_buf map[string]interface{}) (er } func DeserializeGameLinestoryMainTaskData(_buf map[string]interface{}) (*GameLinestoryMainTaskData, error) { - v := &GameLinestoryMainTaskData{} - if err := v.Deserialize(_buf); err == nil { - return v, nil - } else { - return nil, err - } + v := &GameLinestoryMainTaskData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } }