diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index df5cdb740..061412474 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -2283,6 +2283,42 @@ "Numrounds": 0, "BossRounds": 0 }, + { + "id": 10105004, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_14" + ], + "BGMusic": "", + "LoadingId": 0, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 0, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0, + "BossRounds": 0 + }, { "id": 10106001, "PlayType": 1, @@ -4172,7 +4208,7 @@ "BlueAssistTeam": 0, "CanFriendHelp": false, "Numrounds": 60, - "BossRounds": 0 + "BossRounds": 7 }, { "id": 4201, @@ -4208,7 +4244,7 @@ "BlueAssistTeam": 0, "CanFriendHelp": false, "Numrounds": 60, - "BossRounds": 0 + "BossRounds": 7 }, { "id": 4301, @@ -4244,6 +4280,6 @@ "BlueAssistTeam": 0, "CanFriendHelp": false, "Numrounds": 60, - "BossRounds": 0 + "BossRounds": 7 } ] \ No newline at end of file diff --git a/bin/json/game_expeditionboss.json b/bin/json/game_expeditionboss.json index 03875a5e1..487eeb535 100644 --- a/bin/json/game_expeditionboss.json +++ b/bin/json/game_expeditionboss.json @@ -2,13 +2,13 @@ { "boss_id": 50000001, "boss_name": { - "key": "guild_guild_boss_boss_name_1", - "text": "格里斯特王子" + "key": "guild_expedition_boss_name_1", + "text": "沃尔夫先生" }, "boss_lv": 1, "serial": 1, "fighting": 1000, - "boss_img": 14007, + "boss_img": 25002, "kill_reward": 1004, "fail_reward": [ { @@ -54,7 +54,7 @@ { "boss_id": 50000002, "boss_name": { - "key": "guild_guild_boss_boss_name_2", + "key": "guild_expedition_boss_name_2", "text": "吉姆·莱克" }, "boss_lv": 1, @@ -106,7 +106,7 @@ { "boss_id": 50000003, "boss_name": { - "key": "guild_guild_boss_boss_name_3", + "key": "guild_expedition_boss_name_3", "text": "船长" }, "boss_lv": 1, @@ -158,13 +158,13 @@ { "boss_id": 50000004, "boss_name": { - "key": "guild_guild_boss_boss_name_4", - "text": "希沙窦斯" + "key": "guild_expedition_boss_name_4", + "text": "小欧" }, "boss_lv": 1, "serial": 4, "fighting": 1728, - "boss_img": 15003, + "boss_img": 15004, "kill_reward": 1007, "fail_reward": [ { @@ -210,13 +210,13 @@ { "boss_id": 50000005, "boss_name": { - "key": "guild_guild_boss_boss_name_5", - "text": "小欧" + "key": "guild_expedition_boss_name_5", + "text": "羊仙姑" }, "boss_lv": 1, "serial": 5, "fighting": 2073, - "boss_img": 15004, + "boss_img": 25003, "kill_reward": 1008, "fail_reward": [ { @@ -262,13 +262,13 @@ { "boss_id": 50000006, "boss_name": { - "key": "guild_guild_boss_boss_name_6", - "text": "警长" + "key": "guild_expedition_boss_name_6", + "text": "幸运·普雷斯科特" }, "boss_lv": 1, "serial": 6, "fighting": 2487, - "boss_img": 24001, + "boss_img": 35005, "kill_reward": 1009, "fail_reward": [ { @@ -314,13 +314,13 @@ { "boss_id": 50000007, "boss_name": { - "key": "guild_guild_boss_boss_name_7", - "text": "牙仙" + "key": "guild_expedition_boss_name_7", + "text": "乌龟大师" }, "boss_lv": 1, "serial": 7, "fighting": 2984, - "boss_img": 24002, + "boss_img": 45001, "kill_reward": 1010, "fail_reward": [ { @@ -366,13 +366,13 @@ { "boss_id": 50000008, "boss_name": { - "key": "guild_guild_boss_boss_name_8", - "text": "睡神沙人" + "key": "guild_expedition_boss_name_8", + "text": "沃尔夫先生" }, "boss_lv": 2, "serial": 1, "fighting": 3580, - "boss_img": 24003, + "boss_img": 25002, "kill_reward": 1011, "fail_reward": [ { @@ -418,13 +418,13 @@ { "boss_id": 50000009, "boss_name": { - "key": "guild_guild_boss_boss_name_9", - "text": "邦尼兔" + "key": "guild_expedition_boss_name_9", + "text": "吉姆·莱克" }, "boss_lv": 2, "serial": 2, "fighting": 4296, - "boss_img": 24004, + "boss_img": 15001, "kill_reward": 1012, "fail_reward": [ { @@ -470,13 +470,13 @@ { "boss_id": 50000010, "boss_name": { - "key": "guild_guild_boss_boss_name_10", - "text": "金猴" + "key": "guild_expedition_boss_name_10", + "text": "船长" }, "boss_lv": 2, "serial": 3, "fighting": 5155, - "boss_img": 24005, + "boss_img": 15002, "kill_reward": 1013, "fail_reward": [ { @@ -522,13 +522,13 @@ { "boss_id": 50000011, "boss_name": { - "key": "guild_guild_boss_boss_name_11", - "text": "睡神沙人" + "key": "guild_expedition_boss_name_11", + "text": "小欧" }, "boss_lv": 2, "serial": 4, "fighting": 6186, - "boss_img": 24003, + "boss_img": 15004, "kill_reward": 1014, "fail_reward": [ { @@ -574,13 +574,13 @@ { "boss_id": 50000012, "boss_name": { - "key": "guild_guild_boss_boss_name_12", - "text": "邦尼兔" + "key": "guild_expedition_boss_name_12", + "text": "羊仙姑" }, "boss_lv": 2, "serial": 5, "fighting": 7423, - "boss_img": 24004, + "boss_img": 25003, "kill_reward": 1015, "fail_reward": [ { @@ -626,13 +626,13 @@ { "boss_id": 50000013, "boss_name": { - "key": "guild_guild_boss_boss_name_13", - "text": "金猴" + "key": "guild_expedition_boss_name_13", + "text": "幸运·普雷斯科特" }, "boss_lv": 2, "serial": 6, "fighting": 8907, - "boss_img": 24005, + "boss_img": 35005, "kill_reward": 1016, "fail_reward": [ { @@ -674,5 +674,1149 @@ "n": 1 } ] + }, + { + "boss_id": 50000014, + "boss_name": { + "key": "guild_expedition_boss_name_14", + "text": "乌龟大师" + }, + "boss_lv": 2, + "serial": 7, + "fighting": 0, + "boss_img": 45001, + "kill_reward": 1010, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 54 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000015, + "boss_name": { + "key": "guild_expedition_boss_name_15", + "text": "沃尔夫先生" + }, + "boss_lv": 3, + "serial": 1, + "fighting": 0, + "boss_img": 25002, + "kill_reward": 1011, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 55 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000016, + "boss_name": { + "key": "guild_expedition_boss_name_16", + "text": "吉姆·莱克" + }, + "boss_lv": 3, + "serial": 2, + "fighting": 0, + "boss_img": 15001, + "kill_reward": 1012, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 56 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000017, + "boss_name": { + "key": "guild_expedition_boss_name_17", + "text": "船长" + }, + "boss_lv": 3, + "serial": 3, + "fighting": 0, + "boss_img": 15002, + "kill_reward": 1013, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 57 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000018, + "boss_name": { + "key": "guild_expedition_boss_name_18", + "text": "小欧" + }, + "boss_lv": 3, + "serial": 4, + "fighting": 0, + "boss_img": 15004, + "kill_reward": 1014, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 58 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000019, + "boss_name": { + "key": "guild_expedition_boss_name_19", + "text": "羊仙姑" + }, + "boss_lv": 3, + "serial": 5, + "fighting": 0, + "boss_img": 25003, + "kill_reward": 1015, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 59 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000020, + "boss_name": { + "key": "guild_expedition_boss_name_20", + "text": "幸运·普雷斯科特" + }, + "boss_lv": 3, + "serial": 6, + "fighting": 0, + "boss_img": 35005, + "kill_reward": 1016, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 60 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000021, + "boss_name": { + "key": "guild_expedition_boss_name_21", + "text": "乌龟大师" + }, + "boss_lv": 3, + "serial": 7, + "fighting": 0, + "boss_img": 45001, + "kill_reward": 1010, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 54 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000022, + "boss_name": { + "key": "guild_expedition_boss_name_22", + "text": "沃尔夫先生" + }, + "boss_lv": 4, + "serial": 1, + "fighting": 0, + "boss_img": 25002, + "kill_reward": 1011, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 55 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000023, + "boss_name": { + "key": "guild_expedition_boss_name_23", + "text": "吉姆·莱克" + }, + "boss_lv": 4, + "serial": 2, + "fighting": 0, + "boss_img": 15001, + "kill_reward": 1012, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 56 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000024, + "boss_name": { + "key": "guild_expedition_boss_name_24", + "text": "船长" + }, + "boss_lv": 4, + "serial": 3, + "fighting": 0, + "boss_img": 15002, + "kill_reward": 1013, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 57 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000025, + "boss_name": { + "key": "guild_expedition_boss_name_25", + "text": "小欧" + }, + "boss_lv": 4, + "serial": 4, + "fighting": 0, + "boss_img": 15004, + "kill_reward": 1014, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 58 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000026, + "boss_name": { + "key": "guild_expedition_boss_name_26", + "text": "羊仙姑" + }, + "boss_lv": 4, + "serial": 5, + "fighting": 0, + "boss_img": 25003, + "kill_reward": 1015, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 59 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000027, + "boss_name": { + "key": "guild_expedition_boss_name_27", + "text": "幸运·普雷斯科特" + }, + "boss_lv": 4, + "serial": 6, + "fighting": 0, + "boss_img": 35005, + "kill_reward": 1016, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 60 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000028, + "boss_name": { + "key": "guild_expedition_boss_name_28", + "text": "乌龟大师" + }, + "boss_lv": 4, + "serial": 7, + "fighting": 0, + "boss_img": 45001, + "kill_reward": 1010, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 54 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000029, + "boss_name": { + "key": "guild_expedition_boss_name_29", + "text": "沃尔夫先生" + }, + "boss_lv": 5, + "serial": 1, + "fighting": 0, + "boss_img": 25002, + "kill_reward": 1011, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 55 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000030, + "boss_name": { + "key": "guild_expedition_boss_name_30", + "text": "吉姆·莱克" + }, + "boss_lv": 5, + "serial": 2, + "fighting": 0, + "boss_img": 15001, + "kill_reward": 1012, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 56 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000031, + "boss_name": { + "key": "guild_expedition_boss_name_31", + "text": "船长" + }, + "boss_lv": 5, + "serial": 3, + "fighting": 0, + "boss_img": 15002, + "kill_reward": 1013, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 57 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000032, + "boss_name": { + "key": "guild_expedition_boss_name_32", + "text": "小欧" + }, + "boss_lv": 5, + "serial": 4, + "fighting": 0, + "boss_img": 15004, + "kill_reward": 1014, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 58 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000033, + "boss_name": { + "key": "guild_expedition_boss_name_33", + "text": "羊仙姑" + }, + "boss_lv": 5, + "serial": 5, + "fighting": 0, + "boss_img": 25003, + "kill_reward": 1015, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 59 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000034, + "boss_name": { + "key": "guild_expedition_boss_name_34", + "text": "幸运·普雷斯科特" + }, + "boss_lv": 5, + "serial": 6, + "fighting": 0, + "boss_img": 35005, + "kill_reward": 1016, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 60 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "boss_id": 50000035, + "boss_name": { + "key": "guild_expedition_boss_name_35", + "text": "乌龟大师" + }, + "boss_lv": 5, + "serial": 7, + "fighting": 0, + "boss_img": 45001, + "kill_reward": 1010, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 54 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50, + "preview_reward": [ + { + "a": "item", + "t": "13000005", + "n": 1 + }, + { + "a": "attr", + "t": "guildcoin", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json index 14c6c0947..27d4085b9 100644 --- a/bin/json/game_horoscope.json +++ b/bin/json/game_horoscope.json @@ -2,6 +2,7 @@ { "id": 100101, "type": 1, + "subtype": 1, "node_id": 1001, "front": [ 0 @@ -35,6 +36,7 @@ { "id": 100102, "type": 1, + "subtype": 1, "node_id": 1001, "front": [ 0 @@ -68,6 +70,7 @@ { "id": 100103, "type": 1, + "subtype": 1, "node_id": 1001, "front": [ 0 @@ -101,6 +104,7 @@ { "id": 100104, "type": 1, + "subtype": 1, "node_id": 1001, "front": [ 0 @@ -134,6 +138,7 @@ { "id": 100105, "type": 1, + "subtype": 1, "node_id": 1001, "front": [ 0 @@ -161,6 +166,7 @@ { "id": 100201, "type": 1, + "subtype": 1, "node_id": 1002, "front": [ 100105 @@ -194,6 +200,7 @@ { "id": 100202, "type": 1, + "subtype": 1, "node_id": 1002, "front": [ 0 @@ -227,6 +234,7 @@ { "id": 100203, "type": 1, + "subtype": 1, "node_id": 1002, "front": [ 0 @@ -260,6 +268,7 @@ { "id": 100204, "type": 1, + "subtype": 1, "node_id": 1002, "front": [ 0 @@ -287,6 +296,7 @@ { "id": 100301, "type": 1, + "subtype": 1, "node_id": 1003, "front": [ 100204 @@ -320,6 +330,7 @@ { "id": 100302, "type": 1, + "subtype": 1, "node_id": 1003, "front": [ 0 @@ -353,6 +364,7 @@ { "id": 100303, "type": 1, + "subtype": 1, "node_id": 1003, "front": [ 0 @@ -386,6 +398,7 @@ { "id": 100304, "type": 1, + "subtype": 1, "node_id": 1003, "front": [ 0 @@ -413,6 +426,7 @@ { "id": 100401, "type": 1, + "subtype": 1, "node_id": 1004, "front": [ 100304 @@ -446,6 +460,7 @@ { "id": 100402, "type": 1, + "subtype": 1, "node_id": 1004, "front": [ 0 @@ -479,6 +494,7 @@ { "id": 100403, "type": 1, + "subtype": 1, "node_id": 1004, "front": [ 0 @@ -512,6 +528,7 @@ { "id": 100404, "type": 1, + "subtype": 1, "node_id": 1004, "front": [ 0 @@ -539,6 +556,7 @@ { "id": 100501, "type": 1, + "subtype": 1, "node_id": 1005, "front": [ 100404 @@ -572,6 +590,7 @@ { "id": 100502, "type": 1, + "subtype": 1, "node_id": 1005, "front": [ 0 @@ -605,6 +624,7 @@ { "id": 100503, "type": 1, + "subtype": 1, "node_id": 1005, "front": [ 0 @@ -632,6 +652,7 @@ { "id": 100601, "type": 1, + "subtype": 1, "node_id": 1006, "front": [ 100404 @@ -665,6 +686,7 @@ { "id": 100602, "type": 1, + "subtype": 1, "node_id": 1006, "front": [ 0 @@ -698,6 +720,7 @@ { "id": 100603, "type": 1, + "subtype": 1, "node_id": 1006, "front": [ 0 @@ -725,6 +748,7 @@ { "id": 100701, "type": 1, + "subtype": 1, "node_id": 1007, "front": [ 100404 @@ -758,6 +782,7 @@ { "id": 100702, "type": 1, + "subtype": 1, "node_id": 1007, "front": [ 0 @@ -791,6 +816,7 @@ { "id": 100703, "type": 1, + "subtype": 1, "node_id": 1007, "front": [ 0 @@ -818,6 +844,7 @@ { "id": 100801, "type": 1, + "subtype": 1, "node_id": 1008, "front": [ 100104 @@ -851,6 +878,7 @@ { "id": 100802, "type": 1, + "subtype": 1, "node_id": 1008, "front": [ 0 @@ -884,6 +912,7 @@ { "id": 100803, "type": 1, + "subtype": 1, "node_id": 1008, "front": [ 0 @@ -917,6 +946,7 @@ { "id": 100804, "type": 1, + "subtype": 1, "node_id": 1008, "front": [ 0 @@ -944,6 +974,7 @@ { "id": 100901, "type": 1, + "subtype": 1, "node_id": 1009, "front": [ 100804 @@ -977,6 +1008,7 @@ { "id": 100902, "type": 1, + "subtype": 1, "node_id": 1009, "front": [ 0 @@ -1010,6 +1042,7 @@ { "id": 100903, "type": 1, + "subtype": 1, "node_id": 1009, "front": [ 0 @@ -1043,6 +1076,7 @@ { "id": 100904, "type": 1, + "subtype": 1, "node_id": 1009, "front": [ 0 @@ -1070,6 +1104,7 @@ { "id": 101001, "type": 1, + "subtype": 1, "node_id": 1010, "front": [ 100904 @@ -1103,6 +1138,7 @@ { "id": 101002, "type": 1, + "subtype": 1, "node_id": 1010, "front": [ 0 @@ -1136,6 +1172,7 @@ { "id": 101003, "type": 1, + "subtype": 1, "node_id": 1010, "front": [ 0 @@ -1169,6 +1206,7 @@ { "id": 101004, "type": 1, + "subtype": 1, "node_id": 1010, "front": [ 0 @@ -1196,6 +1234,7 @@ { "id": 101101, "type": 1, + "subtype": 2, "node_id": 1011, "front": [ 101004 @@ -1229,6 +1268,7 @@ { "id": 101102, "type": 1, + "subtype": 2, "node_id": 1011, "front": [ 0 @@ -1262,6 +1302,7 @@ { "id": 101103, "type": 1, + "subtype": 2, "node_id": 1011, "front": [ 0 @@ -1289,6 +1330,7 @@ { "id": 101201, "type": 1, + "subtype": 2, "node_id": 1012, "front": [ 101004 @@ -1322,6 +1364,7 @@ { "id": 101202, "type": 1, + "subtype": 2, "node_id": 1012, "front": [ 0 @@ -1355,6 +1398,7 @@ { "id": 101203, "type": 1, + "subtype": 2, "node_id": 1012, "front": [ 0 @@ -1382,6 +1426,7 @@ { "id": 101301, "type": 1, + "subtype": 2, "node_id": 1013, "front": [ 101004 @@ -1415,6 +1460,7 @@ { "id": 101302, "type": 1, + "subtype": 2, "node_id": 1013, "front": [ 0 @@ -1448,6 +1494,7 @@ { "id": 101303, "type": 1, + "subtype": 2, "node_id": 1013, "front": [ 0 @@ -1475,6 +1522,7 @@ { "id": 101401, "type": 1, + "subtype": 2, "node_id": 1014, "front": [ 100104 @@ -1508,6 +1556,7 @@ { "id": 101402, "type": 1, + "subtype": 2, "node_id": 1014, "front": [ 0 @@ -1541,6 +1590,7 @@ { "id": 101403, "type": 1, + "subtype": 2, "node_id": 1014, "front": [ 0 @@ -1574,6 +1624,7 @@ { "id": 101404, "type": 1, + "subtype": 2, "node_id": 1014, "front": [ 0 @@ -1601,6 +1652,7 @@ { "id": 101501, "type": 1, + "subtype": 2, "node_id": 1015, "front": [ 101404 @@ -1634,6 +1686,7 @@ { "id": 101502, "type": 1, + "subtype": 2, "node_id": 1015, "front": [ 0 @@ -1667,6 +1720,7 @@ { "id": 101503, "type": 1, + "subtype": 2, "node_id": 1015, "front": [ 0 @@ -1700,6 +1754,7 @@ { "id": 101504, "type": 1, + "subtype": 2, "node_id": 1015, "front": [ 0 @@ -1727,6 +1782,7 @@ { "id": 101601, "type": 1, + "subtype": 2, "node_id": 1016, "front": [ 101504 @@ -1760,6 +1816,7 @@ { "id": 101602, "type": 1, + "subtype": 2, "node_id": 1016, "front": [ 0 @@ -1793,6 +1850,7 @@ { "id": 101603, "type": 1, + "subtype": 2, "node_id": 1016, "front": [ 0 @@ -1826,6 +1884,7 @@ { "id": 101604, "type": 1, + "subtype": 2, "node_id": 1016, "front": [ 0 @@ -1853,6 +1912,7 @@ { "id": 101701, "type": 1, + "subtype": 2, "node_id": 1017, "front": [ 101604 @@ -1886,6 +1946,7 @@ { "id": 101702, "type": 1, + "subtype": 2, "node_id": 1017, "front": [ 0 @@ -1919,6 +1980,7 @@ { "id": 101703, "type": 1, + "subtype": 2, "node_id": 1017, "front": [ 0 @@ -1946,6 +2008,7 @@ { "id": 101801, "type": 1, + "subtype": 2, "node_id": 1018, "front": [ 101604 @@ -1979,6 +2042,7 @@ { "id": 101802, "type": 1, + "subtype": 2, "node_id": 1018, "front": [ 0 @@ -2012,6 +2076,7 @@ { "id": 101803, "type": 1, + "subtype": 2, "node_id": 1018, "front": [ 0 @@ -2039,6 +2104,7 @@ { "id": 101901, "type": 1, + "subtype": 2, "node_id": 1019, "front": [ 101604 @@ -2072,6 +2138,7 @@ { "id": 101902, "type": 1, + "subtype": 2, "node_id": 1019, "front": [ 0 @@ -2105,6 +2172,7 @@ { "id": 101903, "type": 1, + "subtype": 2, "node_id": 1019, "front": [ 0 @@ -2132,6 +2200,7 @@ { "id": 102001, "type": 1, + "subtype": 2, "node_id": 1020, "front": [ 100104 @@ -2165,6 +2234,7 @@ { "id": 102002, "type": 1, + "subtype": 2, "node_id": 1020, "front": [ 0 @@ -2198,6 +2268,7 @@ { "id": 102003, "type": 1, + "subtype": 2, "node_id": 1020, "front": [ 0 @@ -2231,6 +2302,7 @@ { "id": 102004, "type": 1, + "subtype": 2, "node_id": 1020, "front": [ 0 @@ -2254,536 +2326,5 @@ "n": 60 } ] - }, - { - "id": 102101, - "type": 1, - "node_id": 1021, - "front": [ - 102004 - ], - "node_type": 1, - "pre_node": 1020, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_73", - "text": "荣耀之光属性防御提升" - }, - "comicon": "js_jx_img_icon02", - "lv": 0, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 59, - "n": 0 - } - ] - }, - { - "id": 102102, - "type": 1, - "node_id": 1021, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1020, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_74", - "text": "荣耀之光属性防御提升" - }, - "comicon": "js_jx_img_icon02", - "lv": 1, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 59, - "n": 15 - } - ] - }, - { - "id": 102103, - "type": 1, - "node_id": 1021, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1020, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_75", - "text": "荣耀之光属性防御提升" - }, - "comicon": "js_jx_img_icon02", - "lv": 2, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 59, - "n": 30 - } - ] - }, - { - "id": 102104, - "type": 1, - "node_id": 1021, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1020, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_76", - "text": "荣耀之光属性防御提升" - }, - "comicon": "js_jx_img_icon02", - "lv": 3, - "cost_item": [], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 59, - "n": 45 - } - ] - }, - { - "id": 102201, - "type": 1, - "node_id": 1022, - "front": [ - 102104 - ], - "node_type": 1, - "pre_node": 1021, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_77", - "text": "荣耀之光属性生命提升" - }, - "comicon": "js_jx_img_icon03", - "lv": 0, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 53, - "n": 0 - } - ] - }, - { - "id": 102202, - "type": 1, - "node_id": 1022, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1021, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_78", - "text": "荣耀之光属性生命提升" - }, - "comicon": "js_jx_img_icon03", - "lv": 1, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 53, - "n": 200 - } - ] - }, - { - "id": 102203, - "type": 1, - "node_id": 1022, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1021, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_79", - "text": "荣耀之光属性生命提升" - }, - "comicon": "js_jx_img_icon03", - "lv": 2, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 53, - "n": 400 - } - ] - }, - { - "id": 102204, - "type": 1, - "node_id": 1022, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1021, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_80", - "text": "荣耀之光属性生命提升" - }, - "comicon": "js_jx_img_icon03", - "lv": 3, - "cost_item": [], - "AddGroup": 2, - "AddClassify": 4, - "upgrade": [ - { - "a": 53, - "n": 600 - } - ] - }, - { - "id": 102301, - "type": 1, - "node_id": 1023, - "front": [ - 102204 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_81", - "text": "全体属性攻击百分比提升" - }, - "comicon": "js_jx_img_icon05", - "lv": 0, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 57, - "n": 0 - } - ] - }, - { - "id": 102302, - "type": 1, - "node_id": 1023, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_82", - "text": "全体属性攻击百分比提升" - }, - "comicon": "js_jx_img_icon05", - "lv": 1, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 57, - "n": 20 - } - ] - }, - { - "id": 102303, - "type": 1, - "node_id": 1023, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 0, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_83", - "text": "全体属性攻击百分比提升" - }, - "comicon": "js_jx_img_icon05", - "lv": 2, - "cost_item": [], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 57, - "n": 40 - } - ] - }, - { - "id": 102401, - "type": 1, - "node_id": 1024, - "front": [ - 102204 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 90, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_84", - "text": "全体属性防御百分比提升" - }, - "comicon": "js_jx_img_icon09", - "lv": 0, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 60, - "n": 0 - } - ] - }, - { - "id": 102402, - "type": 1, - "node_id": 1024, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 90, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_85", - "text": "全体属性防御百分比提升" - }, - "comicon": "js_jx_img_icon09", - "lv": 1, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 60, - "n": 20 - } - ] - }, - { - "id": 102403, - "type": 1, - "node_id": 1024, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 90, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_86", - "text": "全体属性防御百分比提升" - }, - "comicon": "js_jx_img_icon09", - "lv": 2, - "cost_item": [], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 60, - "n": 40 - } - ] - }, - { - "id": 102501, - "type": 1, - "node_id": 1025, - "front": [ - 102204 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 270, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_87", - "text": "全体属性生命百分比提升" - }, - "comicon": "js_jx_img_icon10", - "lv": 0, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 54, - "n": 0 - } - ] - }, - { - "id": 102502, - "type": 1, - "node_id": 1025, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 270, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_88", - "text": "全体属性生命百分比提升" - }, - "comicon": "js_jx_img_icon10", - "lv": 1, - "cost_item": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 54, - "n": 20 - } - ] - }, - { - "id": 102503, - "type": 1, - "node_id": 1025, - "front": [ - 0 - ], - "node_type": 1, - "pre_node": 1022, - "node_direction": 270, - "node_long": 120, - "name": { - "key": "horoscope_horoscope_name_89", - "text": "全体属性生命百分比提升" - }, - "comicon": "js_jx_img_icon10", - "lv": 2, - "cost_item": [], - "AddGroup": 1, - "AddClassify": 0, - "upgrade": [ - { - "a": 54, - "n": 40 - } - ] } ] \ No newline at end of file diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 85bfa2730..7f7e5840d 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -3612,8 +3612,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.8, - "atkpro": 2, + "hppro": 0.5, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3632,8 +3632,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.8, - "atkpro": 2, + "hppro": 0.5, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3652,8 +3652,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.8, - "atkpro": 2, + "hppro": 0.5, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3672,8 +3672,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.8, - "atkpro": 2, + "hppro": 0.5, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3692,8 +3692,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.8, - "atkpro": 2, + "hppro": 0.5, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3812,8 +3812,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.2, - "atkpro": 3, + "hppro": 1, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3832,8 +3832,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.88, - "atkpro": 2, + "hppro": 0.4, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3852,8 +3852,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.88, - "atkpro": 2, + "hppro": 0.4, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3872,8 +3872,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.88, - "atkpro": 2, + "hppro": 0.4, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -3892,8 +3892,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 0.88, - "atkpro": 2, + "hppro": 0.4, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4012,8 +4012,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.2, - "atkpro": 2.5, + "hppro": 0.6, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4032,8 +4032,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.2, - "atkpro": 2.5, + "hppro": 0.6, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4052,8 +4052,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.2, - "atkpro": 2.5, + "hppro": 0.6, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4072,8 +4072,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.2, - "atkpro": 2.5, + "hppro": 0.6, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4092,8 +4092,8 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 1.2, - "atkpro": 2.5, + "hppro": 0.6, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4213,7 +4213,7 @@ "newskill": [], "lv": 60, "hppro": 1.3, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4233,7 +4233,7 @@ "newskill": [], "lv": 60, "hppro": 1.3, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4253,7 +4253,7 @@ "newskill": [], "lv": 60, "hppro": 1.3, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4273,7 +4273,7 @@ "newskill": [], "lv": 60, "hppro": 1.3, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4293,7 +4293,7 @@ "newskill": [], "lv": 60, "hppro": 1.3, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4413,7 +4413,7 @@ "newskill": [], "lv": 60, "hppro": 1.4, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4433,7 +4433,7 @@ "newskill": [], "lv": 60, "hppro": 1.4, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4453,7 +4453,7 @@ "newskill": [], "lv": 60, "hppro": 1.4, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4473,7 +4473,7 @@ "newskill": [], "lv": 60, "hppro": 1.4, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4493,7 +4493,7 @@ "newskill": [], "lv": 60, "hppro": 1.4, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4633,7 +4633,7 @@ "newskill": [], "lv": 60, "hppro": 3.2, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4653,7 +4653,7 @@ "newskill": [], "lv": 60, "hppro": 3.2, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4673,7 +4673,7 @@ "newskill": [], "lv": 60, "hppro": 3.2, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4693,7 +4693,7 @@ "newskill": [], "lv": 60, "hppro": 3.2, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4813,7 +4813,7 @@ "newskill": [], "lv": 60, "hppro": 1.6, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4833,7 +4833,7 @@ "newskill": [], "lv": 60, "hppro": 1.6, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4853,7 +4853,7 @@ "newskill": [], "lv": 60, "hppro": 1.6, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4873,7 +4873,7 @@ "newskill": [], "lv": 60, "hppro": 1.6, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -4893,7 +4893,7 @@ "newskill": [], "lv": 60, "hppro": 1.6, - "atkpro": 3, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -373503,9 +373503,9 @@ "equip": [], "newskill": [], "lv": 100, - "hppro": 0.75, - "atkpro": 0.35, - "defpro": 0.5, + "hppro": 750, + "atkpro": 1, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -373603,9 +373603,9 @@ "equip": [], "newskill": [], "lv": 100, - "hppro": 0.75, - "atkpro": 0.35, - "defpro": 0.5, + "hppro": 750, + "atkpro": 1, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -373703,9 +373703,9 @@ "equip": [], "newskill": [], "lv": 100, - "hppro": 0.75, - "atkpro": 0.35, - "defpro": 0.5, + "hppro": 750, + "atkpro": 1, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, diff --git a/bin/json/game_plunderdevelop.json b/bin/json/game_plunderdevelop.json index 7af50cb3f..e355cbd9c 100644 --- a/bin/json/game_plunderdevelop.json +++ b/bin/json/game_plunderdevelop.json @@ -15,10 +15,16 @@ "icon": "jn_24004_1", "place": 0, "type": 101, + "skilleffect": [], "buffID": 1, "txt": { "key": "plunder_plunder_develop_txt_01", - "text": "货船免费刷新次数+{0}" + "text": "货船免费刷新次数+1" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -39,10 +45,21 @@ "icon": "jn_24004_1", "place": 1, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 57, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_02", - "text": "全队攻击增加{0}%" + "text": "全队攻击增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -63,10 +80,21 @@ "icon": "jn_24004_1", "place": 3, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 60, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_03", - "text": "全队防御增加{0}%" + "text": "全队防御增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -87,10 +115,21 @@ "icon": "jn_24004_1", "place": 2, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 54, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_04", - "text": "全队生命增加{0}%" + "text": "全队生命增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -111,10 +150,21 @@ "icon": "jn_24004_1", "place": 4, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 63, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_05", - "text": "全队速度增加{0}%" + "text": "全队速度增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -136,10 +186,21 @@ "icon": "jn_24004_1", "place": 5, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 65, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_06", - "text": "全队暴击率增加{0}%" + "text": "全队暴击率增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -160,10 +221,16 @@ "icon": "jn_43003_1", "place": 0, "type": 101, + "skilleffect": [], "buffID": 1, "txt": { "key": "plunder_plunder_develop_txt_07", - "text": "货船免费刷新次数+{0}" + "text": "货船免费刷新次数+1" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -184,10 +251,21 @@ "icon": "jn_43003_1", "place": 1, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 57, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_08", - "text": "全队攻击增加{0}%" + "text": "全队攻击增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -208,10 +286,21 @@ "icon": "jn_43003_1", "place": 2, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 60, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_09", - "text": "全队防御增加{0}%" + "text": "全队防御增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -232,10 +321,21 @@ "icon": "jn_43003_1", "place": 3, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 54, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_10", - "text": "全队生命增加{0}%" + "text": "全队生命增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -256,10 +356,21 @@ "icon": "jn_43003_1", "place": 4, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 63, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_11", - "text": "全队速度增加{0}%" + "text": "全队速度增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -281,10 +392,21 @@ "icon": "jn_43003_1", "place": 5, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 65, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_12", - "text": "全队暴击率增加{0}%" + "text": "全队暴击率增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -305,10 +427,16 @@ "icon": "jn_35005_2", "place": 0, "type": 101, + "skilleffect": [], "buffID": 1, "txt": { "key": "plunder_plunder_develop_txt_13", - "text": "货船免费刷新次数+{0}" + "text": "货船免费刷新次数+1" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -329,10 +457,21 @@ "icon": "jn_35005_2", "place": 1, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 57, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_14", - "text": "全队攻击增加{0}%" + "text": "全队攻击增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -353,10 +492,21 @@ "icon": "jn_35005_2", "place": 2, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 60, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_15", - "text": "全队防御增加{0}%" + "text": "全队防御增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -377,10 +527,21 @@ "icon": "jn_35005_2", "place": 3, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 54, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_16", - "text": "全队生命增加{0}%" + "text": "全队生命增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -401,10 +562,21 @@ "icon": "jn_35005_2", "place": 4, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 63, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_17", - "text": "全队速度增加{0}%" + "text": "全队速度增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } }, { @@ -426,10 +598,21 @@ "icon": "jn_35005_2", "place": 5, "type": 1, - "buffID": 300, + "skilleffect": [ + { + "a": 65, + "n": 300 + } + ], + "buffID": 0, "txt": { "key": "plunder_plunder_develop_txt_18", - "text": "全队暴击伤害增加{0}%" + "text": "全队暴击伤害增加3%" + }, + "consume": { + "a": "item", + "t": "plundercollege", + "n": 3 } } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index c57b891e4..23c1fbf59 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -1723,7 +1723,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 4, "Where": [], "Target": 2, "ChildSkill": { @@ -1756,7 +1756,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 4, "Where": [], "Target": 2, "ChildSkill": { @@ -1789,7 +1789,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 4, "Where": [], "Target": 2, "ChildSkill": { @@ -1822,7 +1822,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 4, "Where": [], "Target": 2, "ChildSkill": { @@ -1888,7 +1888,7 @@ "IsMelee": 1, "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 5, "Where": [], "Target": 2, "ChildSkill": { @@ -1924,7 +1924,7 @@ "IsMelee": 1, "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 5, "Where": [], "Target": 2, "ChildSkill": { @@ -1960,7 +1960,7 @@ "IsMelee": 1, "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 5, "Where": [], "Target": 2, "ChildSkill": { @@ -1996,7 +1996,7 @@ "IsMelee": 1, "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 5, "Where": [], "Target": 2, "ChildSkill": { @@ -2032,7 +2032,7 @@ "IsMelee": 1, "act": "Skill_3", "Type": 1, - "CD": 3, + "CD": 4, "Where": [], "Target": 2, "ChildSkill": { diff --git a/modules/plunder/api_pvpchallenge.go b/modules/plunder/api_pvpchallenge.go index 9a99c6f62..f377f8247 100644 --- a/modules/plunder/api_pvpchallenge.go +++ b/modules/plunder/api_pvpchallenge.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/lego/sys/redis" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" ) // 参数校验 @@ -36,11 +37,13 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC var ( record *pb.DBBattleRecord err error + devconf *cfg.GamePlunderDevelopData land *pb.DBPlunderLand // 岛屿数据 list *pb.DBPlunder lock *redis.RedisMutex users []string changeShip map[string]*pb.ShipData + attrs map[int32]int32 = make(map[int32]int32) heros []*pb.DBHero ) if errdata = this.PvpChallengeCheck(session, req); errdata != nil { @@ -128,6 +131,29 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC return } + for k, v := range list.Develop { + if v == 1 { + if devconf, err = this.module.configure.getPlunderDevelopById(k); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + for _, v := range devconf.Skilleffect { + attrs[v.A] += v.N + } + } + } + + for _, v := range heros { + if v != nil { + for attr, value := range attrs { + v.AddProperty[attr] += value + } + } + } + if errdata, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{ Rulesid: 105, Ptype: pb.PlayType_arena, diff --git a/sys/configure/structs/Game.HoroscopeData.go b/sys/configure/structs/Game.HoroscopeData.go index 0f33a1e11..50f558b05 100644 --- a/sys/configure/structs/Game.HoroscopeData.go +++ b/sys/configure/structs/Game.HoroscopeData.go @@ -13,6 +13,7 @@ import "errors" type GameHoroscopeData struct { Id int32 Type int32 + Subtype int32 NodeId int32 Front []int32 NodeType int32 @@ -37,6 +38,7 @@ func (*GameHoroscopeData) GetTypeId() int32 { func (_v *GameHoroscopeData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subtype"].(float64); !_ok_ { err = errors.New("subtype error"); return }; _v.Subtype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_id"].(float64); !_ok_ { err = errors.New("node_id error"); return }; _v.NodeId = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.PlunderDevelopData.go b/sys/configure/structs/Game.PlunderDevelopData.go index e444b9e2e..2cc77bee6 100644 --- a/sys/configure/structs/Game.PlunderDevelopData.go +++ b/sys/configure/structs/Game.PlunderDevelopData.go @@ -20,8 +20,10 @@ type GamePlunderDevelopData struct { Icon string Place int32 Type int32 + Skilleffect []*Gameatr BuffID int32 Txt string + Consume *Gameatn } const TypeId_GamePlunderDevelopData = -2120757465 @@ -66,8 +68,23 @@ func (_v *GamePlunderDevelopData)Deserialize(_buf map[string]interface{}) (err e { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["skilleffect"].([]interface{}); !_ok_ { err = errors.New("skilleffect error"); return } + + _v.Skilleffect = make([]*Gameatr, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatr + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatr(_x_); err != nil { return } } + _v.Skilleffect = append(_v.Skilleffect, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buffID"].(float64); !_ok_ { err = errors.New("buffID error"); return }; _v.BuffID = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["consume"].(map[string]interface{}); !_ok_ { err = errors.New("consume error"); return }; if _v.Consume, err = DeserializeGameatn(_x_); err != nil { return } } return }