From 7a42659bf31bc6b262977e31747f2212186dd916 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 7 Feb 2024 16:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 7 +- bin/json/game_buriedcondi.json | 166 ++--- bin/json/game_equippos.json | 30 + bin/json/game_item.json | 78 +-- bin/json/game_mainstage.json | 8 +- bin/json/game_monsterformat.json | 805 +++++++++++----------- bin/json/game_moontask.json | 52 +- bin/json/game_opencond.json | 138 ++-- bin/json/game_rdtasknpc.json | 16 +- bin/json/game_repeatall.json | 34 +- bin/json/game_skillafteratk.json | 49 ++ bin/json/game_skillatk.json | 33 + bin/json/game_skillbuff.json | 38 + bin/json/game_skillpassive.json | 26 + bin/json/game_worldtask.json | 16 +- sys/configure/structs/TEnum.EWkqbxType.go | 5 +- 16 files changed, 858 insertions(+), 643 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 09b5d62c5..69e969623 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -4270,7 +4270,12 @@ "propertyGroupID": 0, "disableAiCamera": false, "ChoseCamp": [], - "DisableCamp": [], + "DisableCamp": [ + 1, + 2, + 3, + 4 + ], "DefaultHero": 101662, "ChoseHero": [], "DisableHero": [], diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 1f927fc86..951fc6935 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -325,7 +325,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_10", - "text": "击败黑暗掠夺者！" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -362,7 +362,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_11", - "text": "搜集{0}/{1}个碎片，有完美通关奖励！" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -399,7 +399,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_12", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -436,7 +436,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_13", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -473,7 +473,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_14", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -510,7 +510,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_15", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -547,7 +547,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_16", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -584,7 +584,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_17", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -621,7 +621,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_18", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -658,7 +658,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_19", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -695,7 +695,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_20", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -732,7 +732,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_21", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -769,7 +769,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_22", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -805,7 +805,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_23", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -842,7 +842,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_24", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -879,7 +879,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_25", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -916,7 +916,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_26", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -953,7 +953,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_27", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -990,7 +990,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_28", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}" }, "type": 187, "valid": 0, @@ -1027,7 +1027,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_29", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1064,7 +1064,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_30", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1101,7 +1101,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_31", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1138,7 +1138,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_32", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1175,7 +1175,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_33", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1212,7 +1212,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_34", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1249,7 +1249,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_35", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1286,7 +1286,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_36", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1323,7 +1323,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_37", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1360,7 +1360,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_38", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1397,7 +1397,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_39", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1434,7 +1434,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_40", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1471,7 +1471,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_41", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1508,7 +1508,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_42", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1545,7 +1545,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_43", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1582,7 +1582,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_44", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1619,7 +1619,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_45", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1656,7 +1656,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_46", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1693,7 +1693,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_47", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1730,7 +1730,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_48", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1767,7 +1767,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_49", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1804,7 +1804,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_50", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1841,7 +1841,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_51", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1878,7 +1878,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_52", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1915,7 +1915,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_53", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1952,7 +1952,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_54", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -1989,7 +1989,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_55", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2026,7 +2026,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_56", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2063,7 +2063,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_57", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2100,7 +2100,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_58", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2137,7 +2137,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_59", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2174,7 +2174,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_60", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2211,7 +2211,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_61", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2248,7 +2248,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_62", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2285,7 +2285,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_63", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2322,7 +2322,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_64", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2359,7 +2359,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_65", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2396,7 +2396,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_66", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2433,7 +2433,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_67", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2470,7 +2470,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_68", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2507,7 +2507,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_69", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2544,7 +2544,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_70", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2581,7 +2581,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_71", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2618,7 +2618,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_72", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2655,7 +2655,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_73", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2692,7 +2692,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_74", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2729,7 +2729,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_75", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2766,7 +2766,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_76", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2803,7 +2803,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_77", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2840,7 +2840,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_78", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2877,7 +2877,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_79", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2914,7 +2914,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_80", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2951,7 +2951,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_81", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -2988,7 +2988,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_82", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -3025,7 +3025,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_83", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -3062,7 +3062,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_84", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -3099,7 +3099,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_85", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -3136,7 +3136,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_86", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -3173,7 +3173,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_87", - "text": "搜集{1}{0}个" + "text": "搜集{0}个{1}宝箱" }, "type": 187, "valid": 0, @@ -34108,7 +34108,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1114", - "text": "辉月等级达到2级" + "text": "辉月等级达到1级" }, "type": 242, "valid": 0, @@ -34138,7 +34138,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1115", - "text": "辉月等级达到3级" + "text": "辉月等级达到2级" }, "type": 242, "valid": 0, @@ -34168,7 +34168,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1116", - "text": "辉月等级达到4级" + "text": "辉月等级达到3级" }, "type": 242, "valid": 0, @@ -34198,7 +34198,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1117", - "text": "辉月等级达到5级" + "text": "辉月等级达到4级" }, "type": 242, "valid": 0, @@ -34228,7 +34228,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1118", - "text": "辉月等级达到6级" + "text": "辉月等级达到5级" }, "type": 242, "valid": 0, diff --git a/bin/json/game_equippos.json b/bin/json/game_equippos.json index f7389ab3d..cb486062b 100644 --- a/bin/json/game_equippos.json +++ b/bin/json/game_equippos.json @@ -1,4 +1,34 @@ [ + { + "pos": 0, + "suitnum": 4, + "leadlibrary": [ + 56, + 59, + 53, + 57, + 60, + 54, + 62, + 65, + 68, + 71, + 74 + ], + "addlibrary": [ + 56, + 59, + 53, + 57, + 60, + 54, + 62, + 65, + 68, + 71, + 74 + ] + }, { "pos": 1, "suitnum": 4, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index c9613aee2..71112e4da 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -13339,7 +13339,7 @@ "id": "16001001", "name": { "key": "item_item_name_16001001", - "text": "记忆碎片第1章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13388,7 +13388,7 @@ "id": "16001002", "name": { "key": "item_item_name_16001002", - "text": "记忆碎片第1章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13437,7 +13437,7 @@ "id": "16001003", "name": { "key": "item_item_name_16001003", - "text": "记忆碎片第1章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13486,7 +13486,7 @@ "id": "16002001", "name": { "key": "item_item_name_16002001", - "text": "记忆碎片第2章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13535,7 +13535,7 @@ "id": "16002002", "name": { "key": "item_item_name_16002002", - "text": "记忆碎片第2章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13584,7 +13584,7 @@ "id": "16002003", "name": { "key": "item_item_name_16002003", - "text": "记忆碎片第2章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13633,7 +13633,7 @@ "id": "16003001", "name": { "key": "item_item_name_16003001", - "text": "记忆碎片第3章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13682,7 +13682,7 @@ "id": "16003002", "name": { "key": "item_item_name_16003002", - "text": "记忆碎片第3章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13731,7 +13731,7 @@ "id": "16003003", "name": { "key": "item_item_name_16003003", - "text": "记忆碎片第3章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13780,7 +13780,7 @@ "id": "16004001", "name": { "key": "item_item_name_16004001", - "text": "记忆碎片第4章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13829,7 +13829,7 @@ "id": "16004002", "name": { "key": "item_item_name_16004002", - "text": "记忆碎片第4章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13878,7 +13878,7 @@ "id": "16004003", "name": { "key": "item_item_name_16004003", - "text": "记忆碎片第4章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13927,7 +13927,7 @@ "id": "16005001", "name": { "key": "item_item_name_16005001", - "text": "记忆碎片第5章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -13976,7 +13976,7 @@ "id": "16005002", "name": { "key": "item_item_name_16005002", - "text": "记忆碎片第5章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14025,7 +14025,7 @@ "id": "16005003", "name": { "key": "item_item_name_16005003", - "text": "记忆碎片第5章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14074,7 +14074,7 @@ "id": "16006001", "name": { "key": "item_item_name_16006001", - "text": "记忆碎片第6章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14123,7 +14123,7 @@ "id": "16006002", "name": { "key": "item_item_name_16006002", - "text": "记忆碎片第6章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14172,7 +14172,7 @@ "id": "16006003", "name": { "key": "item_item_name_16006003", - "text": "记忆碎片第6章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14221,7 +14221,7 @@ "id": "16007001", "name": { "key": "item_item_name_16007001", - "text": "记忆碎片第7章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14270,7 +14270,7 @@ "id": "16007002", "name": { "key": "item_item_name_16007002", - "text": "记忆碎片第7章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14319,7 +14319,7 @@ "id": "16007003", "name": { "key": "item_item_name_16007003", - "text": "记忆碎片第7章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14368,7 +14368,7 @@ "id": "16008001", "name": { "key": "item_item_name_16008001", - "text": "记忆碎片第8章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14417,7 +14417,7 @@ "id": "16008002", "name": { "key": "item_item_name_16008002", - "text": "记忆碎片第8章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14466,7 +14466,7 @@ "id": "16008003", "name": { "key": "item_item_name_16008003", - "text": "记忆碎片第8章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14515,7 +14515,7 @@ "id": "16009001", "name": { "key": "item_item_name_16009001", - "text": "记忆碎片第9章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14564,7 +14564,7 @@ "id": "16009002", "name": { "key": "item_item_name_16009002", - "text": "记忆碎片第9章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14613,7 +14613,7 @@ "id": "16009003", "name": { "key": "item_item_name_16009003", - "text": "记忆碎片第9章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14662,7 +14662,7 @@ "id": "16010001", "name": { "key": "item_item_name_16010001", - "text": "记忆碎片第10章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14711,7 +14711,7 @@ "id": "16010002", "name": { "key": "item_item_name_16010002", - "text": "记忆碎片第10章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14760,7 +14760,7 @@ "id": "16010003", "name": { "key": "item_item_name_16010003", - "text": "记忆碎片第10章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14809,7 +14809,7 @@ "id": "16011001", "name": { "key": "item_item_name_16011001", - "text": "记忆碎片第11章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14858,7 +14858,7 @@ "id": "16011002", "name": { "key": "item_item_name_16011002", - "text": "记忆碎片第11章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14907,7 +14907,7 @@ "id": "16011003", "name": { "key": "item_item_name_16011003", - "text": "记忆碎片第11章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -14956,7 +14956,7 @@ "id": "16012001", "name": { "key": "item_item_name_16012001", - "text": "记忆碎片第12章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -15005,7 +15005,7 @@ "id": "16012002", "name": { "key": "item_item_name_16012002", - "text": "记忆碎片第12章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -15054,7 +15054,7 @@ "id": "16012003", "name": { "key": "item_item_name_16012003", - "text": "记忆碎片第12章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -15103,7 +15103,7 @@ "id": "16013001", "name": { "key": "item_item_name_16013001", - "text": "记忆碎片第13章第1关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -15152,7 +15152,7 @@ "id": "16013002", "name": { "key": "item_item_name_16013002", - "text": "记忆碎片第13章第2关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, @@ -15201,7 +15201,7 @@ "id": "16013003", "name": { "key": "item_item_name_16013003", - "text": "记忆碎片第13章第3关" + "text": "记忆碎片" }, "usetype": 1, "color": 4, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 285ab14ed..47f356cdc 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -20392,7 +20392,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, @@ -20478,7 +20478,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, @@ -20612,7 +20612,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, @@ -20746,7 +20746,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 64860dbe2..3a818cdbd 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -1899,7 +1899,8 @@ "star": 3, "equip": [], "newskill": [ - 100000004 + 100000004, + 100000007 ], "lv": 30, "hppro": 100, @@ -4739,7 +4740,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.5, + "hppro": 1.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4760,7 +4761,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.5, + "hppro": 1.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4781,7 +4782,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.5, + "hppro": 1.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4844,7 +4845,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2, + "hppro": 2.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4865,7 +4866,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2, + "hppro": 2.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4886,7 +4887,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2, + "hppro": 2.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -141033,7 +141034,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141054,7 +141055,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141075,7 +141076,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141096,7 +141097,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141117,7 +141118,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141138,7 +141139,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141159,7 +141160,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141180,7 +141181,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141201,7 +141202,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141222,7 +141223,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141243,7 +141244,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141264,7 +141265,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141285,7 +141286,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141306,7 +141307,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.8, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141327,7 +141328,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141348,7 +141349,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141369,7 +141370,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141390,7 +141391,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141411,7 +141412,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141432,7 +141433,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141453,7 +141454,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141474,7 +141475,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141495,7 +141496,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141516,7 +141517,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141537,7 +141538,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141558,7 +141559,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141579,7 +141580,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141600,7 +141601,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141621,7 +141622,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 1.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141642,7 +141643,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141663,7 +141664,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141684,7 +141685,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141705,7 +141706,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141726,7 +141727,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141747,7 +141748,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141768,7 +141769,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141789,7 +141790,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141810,7 +141811,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141831,7 +141832,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141852,7 +141853,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141873,7 +141874,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141894,7 +141895,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141915,7 +141916,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141936,7 +141937,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 1.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -144812,7 +144813,7 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, @@ -144833,9 +144834,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144854,9 +144855,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144875,9 +144876,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144896,9 +144897,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144917,9 +144918,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144938,9 +144939,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144959,9 +144960,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144980,9 +144981,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145001,9 +145002,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145022,9 +145023,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145043,9 +145044,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145064,9 +145065,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145085,9 +145086,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 2, + "hppro": 0.3, "atkpro": 1, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145106,9 +145107,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145127,9 +145128,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145148,9 +145149,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145169,9 +145170,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145190,9 +145191,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145211,9 +145212,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145232,9 +145233,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145253,9 +145254,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145274,9 +145275,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145295,9 +145296,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145316,9 +145317,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145337,9 +145338,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145358,9 +145359,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145379,9 +145380,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145400,9 +145401,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2.5, + "hppro": 0.3, "atkpro": 1.2, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145421,9 +145422,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145442,9 +145443,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145463,9 +145464,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145484,9 +145485,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145505,9 +145506,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145526,9 +145527,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145547,9 +145548,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145568,9 +145569,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145589,9 +145590,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145610,9 +145611,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145631,9 +145632,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145652,9 +145653,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145673,9 +145674,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145694,9 +145695,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145715,9 +145716,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 3, + "hppro": 0.3, "atkpro": 1.3, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145736,9 +145737,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148592,7 +148593,7 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, @@ -148613,9 +148614,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148634,9 +148635,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148655,9 +148656,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148676,9 +148677,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148697,9 +148698,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148718,9 +148719,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148739,9 +148740,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148760,9 +148761,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148781,9 +148782,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148802,9 +148803,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148823,9 +148824,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148844,9 +148845,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148865,9 +148866,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.3, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148886,9 +148887,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148907,9 +148908,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148928,9 +148929,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148949,9 +148950,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148970,9 +148971,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148991,9 +148992,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149012,9 +149013,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149033,9 +149034,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149054,9 +149055,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149075,9 +149076,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149096,9 +149097,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149117,9 +149118,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149138,9 +149139,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149159,9 +149160,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149180,9 +149181,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149201,9 +149202,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149222,9 +149223,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149243,9 +149244,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149264,9 +149265,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149285,9 +149286,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149306,9 +149307,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149327,9 +149328,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149348,9 +149349,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149369,9 +149370,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149390,9 +149391,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149411,9 +149412,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149432,9 +149433,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149453,9 +149454,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149474,9 +149475,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149495,9 +149496,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, + "hppro": 0.3, "atkpro": 0.9, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149516,9 +149517,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152372,9 +152373,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152393,9 +152394,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152414,9 +152415,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152435,9 +152436,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152456,9 +152457,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152477,9 +152478,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152498,9 +152499,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152519,9 +152520,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152540,9 +152541,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152561,9 +152562,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152582,9 +152583,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152603,9 +152604,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152624,9 +152625,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152645,7 +152646,7 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.4, "defpro": 0.3, "skill1": 1, @@ -152666,9 +152667,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152687,9 +152688,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152708,9 +152709,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152729,9 +152730,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152750,9 +152751,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152771,9 +152772,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152792,9 +152793,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152813,9 +152814,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152834,9 +152835,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152855,9 +152856,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152876,9 +152877,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152897,9 +152898,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152918,9 +152919,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152939,9 +152940,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152960,7 +152961,7 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 3, + "hppro": 0.3, "atkpro": 0.4, "defpro": 0.3, "skill1": 1, @@ -152981,9 +152982,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153002,9 +153003,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153023,9 +153024,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153044,9 +153045,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153065,9 +153066,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153086,9 +153087,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153107,9 +153108,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153128,9 +153129,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153149,9 +153150,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153170,9 +153171,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153191,9 +153192,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153212,9 +153213,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153233,9 +153234,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153254,9 +153255,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153275,7 +153276,7 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, + "hppro": 0.3, "atkpro": 0.5, "defpro": 0.3, "skill1": 1, @@ -156152,9 +156153,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156173,9 +156174,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156194,9 +156195,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156215,9 +156216,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156236,9 +156237,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156257,9 +156258,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156278,9 +156279,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156299,9 +156300,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156320,9 +156321,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156341,9 +156342,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156362,9 +156363,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156383,9 +156384,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156404,9 +156405,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156425,9 +156426,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156446,9 +156447,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156467,9 +156468,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156488,9 +156489,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156509,9 +156510,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156530,9 +156531,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156551,9 +156552,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156572,9 +156573,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156593,9 +156594,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156614,9 +156615,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156635,9 +156636,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156656,9 +156657,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156677,9 +156678,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156698,9 +156699,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156719,9 +156720,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156740,9 +156741,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156761,9 +156762,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156782,9 +156783,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156803,9 +156804,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156824,9 +156825,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156845,9 +156846,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156866,9 +156867,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156887,9 +156888,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156908,9 +156909,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156929,9 +156930,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156950,9 +156951,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156971,9 +156972,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156992,9 +156993,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -157013,9 +157014,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -157034,9 +157035,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 3, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -157055,9 +157056,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.6, - "defpro": 3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, diff --git a/bin/json/game_moontask.json b/bin/json/game_moontask.json index a1ef71852..788fcc2e2 100644 --- a/bin/json/game_moontask.json +++ b/bin/json/game_moontask.json @@ -33,7 +33,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 127 }, { "Id": 3, @@ -51,7 +51,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10036 }, { "Id": 4, @@ -69,7 +69,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10013 }, { "Id": 5, @@ -105,7 +105,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 7, @@ -123,7 +123,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10042 }, { "Id": 8, @@ -141,7 +141,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10042 }, { "Id": 9, @@ -159,7 +159,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 115 }, { "Id": 10, @@ -177,7 +177,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 115 }, { "Id": 11, @@ -195,7 +195,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10022 }, { "Id": 12, @@ -213,7 +213,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10020 }, { "Id": 13, @@ -231,7 +231,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10021 }, { "Id": 14, @@ -249,7 +249,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 11012 }, { "Id": 15, @@ -285,7 +285,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10013 }, { "Id": 17, @@ -303,7 +303,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 18, @@ -321,7 +321,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 168 }, { "Id": 19, @@ -339,7 +339,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 168 }, { "Id": 20, @@ -357,7 +357,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 155 }, { "Id": 21, @@ -375,7 +375,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10001 }, { "Id": 22, @@ -393,7 +393,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 906 }, { "Id": 23, @@ -411,7 +411,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 24, @@ -429,7 +429,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 906 }, { "Id": 25, @@ -447,7 +447,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 26, @@ -465,7 +465,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 906 }, { "Id": 27, @@ -483,7 +483,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10015 }, { "Id": 28, @@ -501,7 +501,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10015 }, { "Id": 29, @@ -519,6 +519,6 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10015 } ] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 6c0d80b89..5f42f8f7a 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -8,7 +8,7 @@ "opencondi": [ 18000001 ], - "wkqbx": 2, + "wkqbx": 0, "img": "ty_icon_shz", "prompt": { "key": "opencond_opencond_prompt_1", @@ -33,7 +33,7 @@ "opencondi": [ 18000002 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -58,7 +58,7 @@ "opencondi": [ 18000003 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -83,7 +83,7 @@ "opencondi": [ 18000004 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -108,7 +108,7 @@ "opencondi": [ 18000005 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -133,7 +133,7 @@ "opencondi": [ 18000006 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -158,7 +158,7 @@ "opencondi": [ 18000007 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_icon_08_ct", "prompt": { "key": "opencond_opencond_prompt_2", @@ -183,7 +183,7 @@ "opencondi": [ 18000008 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sd", "prompt": { "key": "opencond_opencond_prompt_3", @@ -208,7 +208,7 @@ "opencondi": [ 18000009 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_shuru02", "prompt": { "key": "opencond_opencond_prompt_4", @@ -233,7 +233,7 @@ "opencondi": [ 18000010 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sd", "prompt": { "key": "opencond_opencond_prompt_5", @@ -258,7 +258,7 @@ "opencondi": [ 18000011 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_6", @@ -308,7 +308,7 @@ "opencondi": [ 18000022 ], - "wkqbx": 2, + "wkqbx": 3, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_8", @@ -333,7 +333,7 @@ "opencondi": [ 18000014 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_rw", "prompt": { "key": "opencond_opencond_prompt_9", @@ -358,7 +358,7 @@ "opencondi": [ 18000015 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_icon_05_ct", "prompt": { "key": "opencond_opencond_prompt_10", @@ -383,7 +383,7 @@ "opencondi": [ 18000016 ], - "wkqbx": 2, + "wkqbx": 0, "img": "ty_icon_zh", "prompt": { "key": "opencond_opencond_prompt_11", @@ -408,7 +408,7 @@ "opencondi": [ 18000017 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_12", @@ -458,7 +458,7 @@ "opencondi": [ 18000019 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_14", @@ -483,7 +483,7 @@ "opencondi": [ 18000020 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_15", @@ -608,7 +608,7 @@ "opencondi": [ 18000025 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_20", @@ -633,7 +633,7 @@ "opencondi": [ 18000026 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_21", @@ -658,7 +658,7 @@ "opencondi": [ 18000027 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_22", @@ -683,7 +683,7 @@ "opencondi": [ 18000028 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_23", @@ -708,7 +708,7 @@ "opencondi": [ 18000029 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_24", @@ -733,7 +733,7 @@ "opencondi": [ 18000030 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_25", @@ -758,7 +758,7 @@ "opencondi": [ 18000031 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_26", @@ -783,7 +783,7 @@ "opencondi": [ 18000032 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_27", @@ -883,7 +883,7 @@ "opencondi": [ 18000036 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_31", @@ -1033,7 +1033,7 @@ "opencondi": [ 18000042 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_37", @@ -1083,7 +1083,7 @@ "opencondi": [ 18000044 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_39", @@ -1133,7 +1133,7 @@ "opencondi": [ 18000046 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_41", @@ -1158,7 +1158,7 @@ "opencondi": [ 18000047 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_42", @@ -1183,7 +1183,7 @@ "opencondi": [ 18000048 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_43", @@ -1208,7 +1208,7 @@ "opencondi": [ 18000049 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -1233,7 +1233,7 @@ "opencondi": [ 18000050 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_44", @@ -1308,7 +1308,7 @@ "opencondi": [ 18000053 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_47", @@ -1508,7 +1508,7 @@ "opencondi": [ 18000061 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_shuru01", "prompt": { "key": "opencond_opencond_prompt_55", @@ -1533,7 +1533,7 @@ "opencondi": [ 18000062 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_56", @@ -1558,7 +1558,7 @@ "opencondi": [ 18000063 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_57", @@ -1583,7 +1583,7 @@ "opencondi": [ 18000064 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_58", @@ -1914,7 +1914,7 @@ "opencondi": [ 18000077 ], - "wkqbx": 3, + "wkqbx": 2, "img": "ty_qp_jx", "prompt": { "key": "opencond_opencond_prompt_71", @@ -2214,7 +2214,7 @@ "opencondi": [ 18000089 ], - "wkqbx": 2, + "wkqbx": 0, "img": "cgt_icon_hfsj", "prompt": { "key": "opencond_opencond_prompt_83", @@ -2239,7 +2239,7 @@ "opencondi": [ 18000090 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_84", @@ -2264,7 +2264,7 @@ "opencondi": [ 18000022 ], - "wkqbx": 2, + "wkqbx": 3, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_84", @@ -2289,7 +2289,7 @@ "opencondi": [ 18000092 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_85", @@ -2316,7 +2316,7 @@ "opencondi": [ 18000093 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_86", @@ -2341,7 +2341,7 @@ "opencondi": [ 18000094 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_87", @@ -2366,7 +2366,7 @@ "opencondi": [ 18000095 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2391,7 +2391,7 @@ "opencondi": [ 18000096 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2416,7 +2416,7 @@ "opencondi": [ 18000097 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2441,7 +2441,7 @@ "opencondi": [ 18000098 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2466,7 +2466,7 @@ "opencondi": [ 18000099 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2491,7 +2491,7 @@ "opencondi": [ 18000100 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2516,7 +2516,7 @@ "opencondi": [ 18000101 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2541,7 +2541,7 @@ "opencondi": [ 18000102 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2566,7 +2566,7 @@ "opencondi": [ 18000103 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2591,7 +2591,7 @@ "opencondi": [ 18000104 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2616,7 +2616,7 @@ "opencondi": [ 18000105 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2641,7 +2641,7 @@ "opencondi": [ 18000106 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2666,7 +2666,7 @@ "opencondi": [ 18000107 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2691,7 +2691,7 @@ "opencondi": [ 18000108 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2716,7 +2716,7 @@ "opencondi": [ 18000109 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2741,7 +2741,7 @@ "opencondi": [ 18000110 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2766,7 +2766,7 @@ "opencondi": [ 18000111 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2841,7 +2841,7 @@ "opencondi": [ 18000114 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zm_icon_shzl", "prompt": { "key": "", @@ -2891,7 +2891,7 @@ "opencondi": [ 18000116 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -2941,7 +2941,7 @@ "opencondi": [ 18000118 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -2966,7 +2966,7 @@ "opencondi": [ 18000119 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -2991,7 +2991,7 @@ "opencondi": [ 12070430 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -3041,7 +3041,7 @@ "opencondi": [ 18000118 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 63e215416..7cda86564 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -481,7 +481,7 @@ }, { "id": 10030, - "heroid": 45001, + "heroid": 45002, "Levelid": 0, "datas": [ "GameMain", @@ -8496,7 +8496,7 @@ }, { "id": 320310, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", @@ -8508,7 +8508,7 @@ }, { "id": 320320, - "heroid": 25001, + "heroid": 13001, "Levelid": 0, "datas": [ "GameMain", @@ -8520,7 +8520,7 @@ }, { "id": 320330, - "heroid": 25001, + "heroid": 33005, "Levelid": 0, "datas": [ "GameMain", @@ -8532,7 +8532,7 @@ }, { "id": 320340, - "heroid": 25001, + "heroid": 53001, "Levelid": 0, "datas": [ "GameMain", @@ -8556,7 +8556,7 @@ }, { "id": 320360, - "heroid": 25001, + "heroid": 14003, "Levelid": 0, "datas": [ "GameMain", @@ -8568,7 +8568,7 @@ }, { "id": 320370, - "heroid": 25001, + "heroid": 14003, "Levelid": 0, "datas": [ "GameMain", @@ -8580,7 +8580,7 @@ }, { "id": 320380, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", diff --git a/bin/json/game_repeatall.json b/bin/json/game_repeatall.json index 0637a088a..54a0362c3 100644 --- a/bin/json/game_repeatall.json +++ b/bin/json/game_repeatall.json @@ -1 +1,33 @@ -[] \ No newline at end of file +[ + { + "key": 101, + "optionName": { + "key": "optionName_01", + "text": "薅羊毛" + }, + "model": "彩蛋-薅羊毛-羊", + "actionType": 1, + "actionParam": "1#explore", + "num": 1, + "triggerWeight": [ + 100, + 0 + ], + "triggerOne": [ + 7000050 + ], + "triggerTwo": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ], + "triggerThree": 0, + "cdText": { + "key": "cdText_01", + "text": "羊毛需要一点时间生长" + }, + "cdtime": 10 + } +] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 7ed3f995f..40604dc7b 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -41841,6 +41841,55 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 200000007, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 2, + "Argu": [ + 400000007, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 200000008, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 3, + "Argu": [ + 390001562, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 211021011, "EmitPR": 1000, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 7260a44a8..853fd4534 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -62035,6 +62035,39 @@ "buffid": [], "map": "" }, + { + "id": 100000007, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Priority": 0, + "Name": { + "key": "skill_skill_atk_Name_100000007", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 200000007 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_100000007_1", + "text": "伤害增加" + }, + "buffid": [], + "map": "" + }, { "id": 185001001, "level": 1, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 062e06ad3..60bc4a127 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -9730,6 +9730,44 @@ "forbidFloat": 0, "ReplaceBuffID": 0 }, + { + "Id": 390001562, + "Name": { + "key": "skill_skill_buff_Name_390001562", + "text": "[color=#37d8a9]伤害提升[/color]" + }, + "Desc": { + "key": "skill_skill_buff_Desc_390001562", + "text": "造成伤害提升。" + }, + "BuffType": 33, + "EffectArgu": [ + 0, + 500 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 10, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", + "AddTrigger": 0, + "TriggerEffect": "", + "TriggerPos": "", + "TriggerAnim": "", + "forbidFloat": 0, + "ReplaceBuffID": 0 + }, { "Id": 391000000, "Name": { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index e208422e6..7d304aac2 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -3988,6 +3988,32 @@ 200001702 ] }, + { + "Id": 400000007, + "Name": { + "key": "skill_skill_passive_Name_400000007", + "text": "" + }, + "icon": "", + "When": 21, + "FromCheck": "Target=3", + "TargetCheck": "Target=3", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "TriggerAnim": "", + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 200000008 + ] + }, { "Id": 400001901, "Name": { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 85ac3ef4f..4b4355d3f 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -9030,7 +9030,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 35002, "lock_add": false, "finish": [], "finishparameter": "", @@ -9073,7 +9073,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 13001, "lock_add": false, "finish": [], "finishparameter": "", @@ -9116,7 +9116,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 33005, "lock_add": false, "finish": [], "finishparameter": "", @@ -9159,7 +9159,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 53001, "lock_add": false, "finish": [], "finishparameter": "", @@ -9202,7 +9202,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 25001, "lock_add": false, "finish": [], "finishparameter": "", @@ -9245,7 +9245,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 14003, "lock_add": false, "finish": [], "finishparameter": "", @@ -9288,7 +9288,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 14003, "lock_add": false, "finish": [], "finishparameter": "", @@ -9331,7 +9331,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 35002, "lock_add": false, "finish": [], "finishparameter": "", diff --git a/sys/configure/structs/TEnum.EWkqbxType.go b/sys/configure/structs/TEnum.EWkqbxType.go index 77568a6cc..2230ddbcb 100644 --- a/sys/configure/structs/TEnum.EWkqbxType.go +++ b/sys/configure/structs/TEnum.EWkqbxType.go @@ -11,6 +11,7 @@ package cfg const ( TEnumEWkqbxType_Hide = 0 TEnumEWkqbxType_Display = 1 - TEnumEWkqbxType_DoNotDisplay = 2 - TEnumEWkqbxType_Ash = 3 + TEnumEWkqbxType_Ash = 2 + TEnumEWkqbxType_NotOpen = 3 + TEnumEWkqbxType_None = 4 )