diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index fd947a339..6a741fc73 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -339,7 +339,7 @@ "LockSlots": [], "AssistTeam": 0, "CanFriendHelp": 0, - "Numrounds": 0 + "Numrounds": 100 }, { "id": 118, @@ -480,7 +480,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_chef_02" + "bossfight_translate_01" ], "disableAiCamera": 1, "ChoseCamp": [], diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json index 5f0e5cab6..62b3a81fb 100644 --- a/bin/json/game_cardpool.json +++ b/bin/json/game_cardpool.json @@ -1648,5 +1648,521 @@ "card_pool_type": "camp4_pool", "id": "45004", "weight": 1000 + }, + { + "key": 277, + "card_pool_type": "pro_pool70003", + "id": "24002", + "weight": 36 + }, + { + "key": 278, + "card_pool_type": "pro_pool70003", + "id": "13003", + "weight": 36 + }, + { + "key": 279, + "card_pool_type": "pro_pool70003", + "id": "43006", + "weight": 9 + }, + { + "key": 280, + "card_pool_type": "pro_pool70003", + "id": "43001", + "weight": 9 + }, + { + "key": 281, + "card_pool_type": "pro_pool70003", + "id": "13001", + "weight": 36 + }, + { + "key": 282, + "card_pool_type": "pro_pool70003", + "id": "33002", + "weight": 36 + }, + { + "key": 283, + "card_pool_type": "pro_pool70003", + "id": "13005", + "weight": 36 + }, + { + "key": 284, + "card_pool_type": "pro_pool70003", + "id": "23004", + "weight": 36 + }, + { + "key": 285, + "card_pool_type": "pro_pool70003", + "id": "13004", + "weight": 36 + }, + { + "key": 286, + "card_pool_type": "pro_pool70003", + "id": "43003", + "weight": 9 + }, + { + "key": 287, + "card_pool_type": "pro_pool70003", + "id": "13002", + "weight": 36 + }, + { + "key": 288, + "card_pool_type": "pro_pool70003", + "id": "33003", + "weight": 36 + }, + { + "key": 289, + "card_pool_type": "pro_pool70003", + "id": "43002", + "weight": 9 + }, + { + "key": 290, + "card_pool_type": "pro_pool70004", + "id": "24004", + "weight": 27 + }, + { + "key": 291, + "card_pool_type": "pro_pool70004", + "id": "24008", + "weight": 27 + }, + { + "key": 292, + "card_pool_type": "pro_pool70004", + "id": "24003", + "weight": 27 + }, + { + "key": 293, + "card_pool_type": "pro_pool70004", + "id": "24005", + "weight": 27 + }, + { + "key": 294, + "card_pool_type": "pro_pool70004", + "id": "14001", + "weight": 27 + }, + { + "key": 295, + "card_pool_type": "pro_pool70004", + "id": "34007", + "weight": 27 + }, + { + "key": 296, + "card_pool_type": "pro_pool70004", + "id": "14003", + "weight": 27 + }, + { + "key": 297, + "card_pool_type": "pro_pool70004", + "id": "14007", + "weight": 27 + }, + { + "key": 298, + "card_pool_type": "pro_pool70004", + "id": "34006", + "weight": 27 + }, + { + "key": 299, + "card_pool_type": "pro_pool70004", + "id": "34002", + "weight": 27 + }, + { + "key": 300, + "card_pool_type": "pro_pool70004", + "id": "44005", + "weight": 16 + }, + { + "key": 301, + "card_pool_type": "pro_pool70004", + "id": "44006", + "weight": 16 + }, + { + "key": 302, + "card_pool_type": "pro_pool70004", + "id": "14005", + "weight": 27 + }, + { + "key": 303, + "card_pool_type": "pro_pool70004", + "id": "24001", + "weight": 27 + }, + { + "key": 304, + "card_pool_type": "pro_pool70004", + "id": "34008", + "weight": 27 + }, + { + "key": 305, + "card_pool_type": "pro_pool70004", + "id": "34003", + "weight": 27 + }, + { + "key": 306, + "card_pool_type": "pro_pool70004", + "id": "24009", + "weight": 27 + }, + { + "key": 307, + "card_pool_type": "pro_pool70004", + "id": "34005", + "weight": 27 + }, + { + "key": 308, + "card_pool_type": "pro_pool70004", + "id": "44004", + "weight": 16 + }, + { + "key": 309, + "card_pool_type": "pro_pool70005", + "id": "25001", + "weight": 100 + }, + { + "key": 310, + "card_pool_type": "pro_pool70005", + "id": "25004", + "weight": 100 + }, + { + "key": 311, + "card_pool_type": "pro_pool70005", + "id": "15005", + "weight": 100 + }, + { + "key": 312, + "card_pool_type": "pro_pool70005", + "id": "35006", + "weight": 100 + }, + { + "key": 313, + "card_pool_type": "pro_pool70005", + "id": "45003", + "weight": 0 + }, + { + "key": 314, + "card_pool_type": "pro_pool70005", + "id": "35001", + "weight": 100 + }, + { + "key": 315, + "card_pool_type": "pro_pool70005", + "id": "15004", + "weight": 100 + }, + { + "key": 316, + "card_pool_type": "pro_pool70005", + "id": "45001", + "weight": 0 + }, + { + "key": 317, + "card_pool_type": "pro_pool70005", + "id": "35005", + "weight": 100 + }, + { + "key": 318, + "card_pool_type": "pro_pool70005", + "id": "15002", + "weight": 100 + }, + { + "key": 319, + "card_pool_type": "pro_pool70005", + "id": "15003", + "weight": 100 + }, + { + "key": 320, + "card_pool_type": "base_pool70003", + "id": "24002", + "weight": 36 + }, + { + "key": 321, + "card_pool_type": "base_pool70003", + "id": "13003", + "weight": 36 + }, + { + "key": 322, + "card_pool_type": "base_pool70003", + "id": "43006", + "weight": 9 + }, + { + "key": 323, + "card_pool_type": "base_pool70003", + "id": "43001", + "weight": 9 + }, + { + "key": 324, + "card_pool_type": "base_pool70003", + "id": "13001", + "weight": 36 + }, + { + "key": 325, + "card_pool_type": "base_pool70003", + "id": "33002", + "weight": 36 + }, + { + "key": 326, + "card_pool_type": "base_pool70003", + "id": "13005", + "weight": 36 + }, + { + "key": 327, + "card_pool_type": "base_pool70003", + "id": "23004", + "weight": 36 + }, + { + "key": 328, + "card_pool_type": "base_pool70003", + "id": "13004", + "weight": 36 + }, + { + "key": 329, + "card_pool_type": "base_pool70003", + "id": "43003", + "weight": 9 + }, + { + "key": 330, + "card_pool_type": "base_pool70003", + "id": "13002", + "weight": 36 + }, + { + "key": 331, + "card_pool_type": "base_pool70003", + "id": "33003", + "weight": 36 + }, + { + "key": 332, + "card_pool_type": "base_pool70003", + "id": "43002", + "weight": 9 + }, + { + "key": 333, + "card_pool_type": "base_pool70004", + "id": "24004", + "weight": 27 + }, + { + "key": 334, + "card_pool_type": "base_pool70004", + "id": "24008", + "weight": 27 + }, + { + "key": 335, + "card_pool_type": "base_pool70004", + "id": "24003", + "weight": 27 + }, + { + "key": 336, + "card_pool_type": "base_pool70004", + "id": "24005", + "weight": 27 + }, + { + "key": 337, + "card_pool_type": "base_pool70004", + "id": "14001", + "weight": 27 + }, + { + "key": 338, + "card_pool_type": "base_pool70004", + "id": "34007", + "weight": 27 + }, + { + "key": 339, + "card_pool_type": "base_pool70004", + "id": "14003", + "weight": 27 + }, + { + "key": 340, + "card_pool_type": "base_pool70004", + "id": "14007", + "weight": 27 + }, + { + "key": 341, + "card_pool_type": "base_pool70004", + "id": "34006", + "weight": 27 + }, + { + "key": 342, + "card_pool_type": "base_pool70004", + "id": "34002", + "weight": 27 + }, + { + "key": 343, + "card_pool_type": "base_pool70004", + "id": "44005", + "weight": 16 + }, + { + "key": 344, + "card_pool_type": "base_pool70004", + "id": "44006", + "weight": 16 + }, + { + "key": 345, + "card_pool_type": "base_pool70004", + "id": "14005", + "weight": 27 + }, + { + "key": 346, + "card_pool_type": "base_pool70004", + "id": "24001", + "weight": 27 + }, + { + "key": 347, + "card_pool_type": "base_pool70004", + "id": "34008", + "weight": 27 + }, + { + "key": 348, + "card_pool_type": "base_pool70004", + "id": "34003", + "weight": 27 + }, + { + "key": 349, + "card_pool_type": "base_pool70004", + "id": "24009", + "weight": 27 + }, + { + "key": 350, + "card_pool_type": "base_pool70004", + "id": "34005", + "weight": 27 + }, + { + "key": 351, + "card_pool_type": "base_pool70004", + "id": "44004", + "weight": 16 + }, + { + "key": 352, + "card_pool_type": "base_pool70005", + "id": "25001", + "weight": 18 + }, + { + "key": 353, + "card_pool_type": "base_pool70005", + "id": "25004", + "weight": 18 + }, + { + "key": 354, + "card_pool_type": "base_pool70005", + "id": "15005", + "weight": 18 + }, + { + "key": 355, + "card_pool_type": "base_pool70005", + "id": "35006", + "weight": 18 + }, + { + "key": 356, + "card_pool_type": "base_pool70005", + "id": "45003", + "weight": 9 + }, + { + "key": 357, + "card_pool_type": "base_pool70005", + "id": "35001", + "weight": 18 + }, + { + "key": 358, + "card_pool_type": "base_pool70005", + "id": "15004", + "weight": 18 + }, + { + "key": 359, + "card_pool_type": "base_pool70005", + "id": "45001", + "weight": 9 + }, + { + "key": 360, + "card_pool_type": "base_pool70005", + "id": "35005", + "weight": 18 + }, + { + "key": 361, + "card_pool_type": "base_pool70005", + "id": "15002", + "weight": 18 + }, + { + "key": 362, + "card_pool_type": "base_pool70005", + "id": "15003", + "weight": 18 } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 807ed7b7c..b0d432f51 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -43,7 +43,7 @@ "load_chat": 10, "channel_allocation_max": 2000, "channel_switching_max": 3000, - "draw_toplimit": 20, + "draw_toplimit": 9999, "draw10_star4_max": 8, "draw10_star5_max": 2, "draw_floor_star4": 20, diff --git a/bin/json/game_guildboss.json b/bin/json/game_guildboss.json index 5351fdb1b..aa4666deb 100644 --- a/bin/json/game_guildboss.json +++ b/bin/json/game_guildboss.json @@ -4,7 +4,7 @@ "group": 1, "boss_name": { "key": "guild_guild_boss_boss_name_1", - "text": "希卡普" + "text": "格里斯特王子" }, "boss_lv": 1, "hp": 10, @@ -32,9 +32,9 @@ "group": 1, "boss_name": { "key": "guild_guild_boss_boss_name_2", - "text": "波比" + "text": "格里斯特王子" }, - "boss_lv": 1, + "boss_lv": 2, "hp": 10, "BattleReadyID": 121, "boss_img": 11009, @@ -60,9 +60,9 @@ "group": 1, "boss_name": { "key": "guild_guild_boss_boss_name_3", - "text": "阿宝" + "text": "格里斯特王子" }, - "boss_lv": 1, + "boss_lv": 3, "hp": 10, "BattleReadyID": 121, "boss_img": 11009, @@ -82,5 +82,1461 @@ "key": "guild_guild_boss_boss_name_3", "text": "大家集中火力,优先攻打希卡普" } + }, + { + "boss_id": 50000004, + "group": 1, + "boss_name": { + "key": "guild_guild_boss_boss_name_4", + "text": "格里斯特王子" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000004, + "boss_des": { + "key": "guild_guild_boss_boss_name_4", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000005, + "group": 1, + "boss_name": { + "key": "guild_guild_boss_boss_name_5", + "text": "格里斯特王子" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000005, + "boss_des": { + "key": "guild_guild_boss_boss_name_5", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000006, + "group": 2, + "boss_name": { + "key": "guild_guild_boss_boss_name_6", + "text": "船长" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000006, + "boss_des": { + "key": "guild_guild_boss_boss_name_6", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000007, + "group": 2, + "boss_name": { + "key": "guild_guild_boss_boss_name_7", + "text": "船长" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000007, + "boss_des": { + "key": "guild_guild_boss_boss_name_7", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000008, + "group": 2, + "boss_name": { + "key": "guild_guild_boss_boss_name_8", + "text": "船长" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000008, + "boss_des": { + "key": "guild_guild_boss_boss_name_8", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000009, + "group": 2, + "boss_name": { + "key": "guild_guild_boss_boss_name_9", + "text": "船长" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000009, + "boss_des": { + "key": "guild_guild_boss_boss_name_9", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000010, + "group": 2, + "boss_name": { + "key": "guild_guild_boss_boss_name_10", + "text": "船长" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000010, + "boss_des": { + "key": "guild_guild_boss_boss_name_10", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000011, + "group": 3, + "boss_name": { + "key": "guild_guild_boss_boss_name_11", + "text": "希沙窦斯" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000011, + "boss_des": { + "key": "guild_guild_boss_boss_name_11", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000012, + "group": 3, + "boss_name": { + "key": "guild_guild_boss_boss_name_12", + "text": "希沙窦斯" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000012, + "boss_des": { + "key": "guild_guild_boss_boss_name_12", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000013, + "group": 3, + "boss_name": { + "key": "guild_guild_boss_boss_name_13", + "text": "希沙窦斯" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000013, + "boss_des": { + "key": "guild_guild_boss_boss_name_13", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000014, + "group": 3, + "boss_name": { + "key": "guild_guild_boss_boss_name_14", + "text": "希沙窦斯" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000014, + "boss_des": { + "key": "guild_guild_boss_boss_name_14", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000015, + "group": 3, + "boss_name": { + "key": "guild_guild_boss_boss_name_15", + "text": "希沙窦斯" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000015, + "boss_des": { + "key": "guild_guild_boss_boss_name_15", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000016, + "group": 4, + "boss_name": { + "key": "guild_guild_boss_boss_name_16", + "text": "小欧" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000016, + "boss_des": { + "key": "guild_guild_boss_boss_name_16", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000017, + "group": 4, + "boss_name": { + "key": "guild_guild_boss_boss_name_17", + "text": "小欧" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000017, + "boss_des": { + "key": "guild_guild_boss_boss_name_17", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000018, + "group": 4, + "boss_name": { + "key": "guild_guild_boss_boss_name_18", + "text": "小欧" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000018, + "boss_des": { + "key": "guild_guild_boss_boss_name_18", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000019, + "group": 4, + "boss_name": { + "key": "guild_guild_boss_boss_name_19", + "text": "小欧" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000019, + "boss_des": { + "key": "guild_guild_boss_boss_name_19", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000020, + "group": 4, + "boss_name": { + "key": "guild_guild_boss_boss_name_20", + "text": "小欧" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000020, + "boss_des": { + "key": "guild_guild_boss_boss_name_20", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000021, + "group": 5, + "boss_name": { + "key": "guild_guild_boss_boss_name_21", + "text": "吉姆·普雷斯科特" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000021, + "boss_des": { + "key": "guild_guild_boss_boss_name_21", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000022, + "group": 5, + "boss_name": { + "key": "guild_guild_boss_boss_name_22", + "text": "吉姆·普雷斯科特" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000022, + "boss_des": { + "key": "guild_guild_boss_boss_name_22", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000023, + "group": 5, + "boss_name": { + "key": "guild_guild_boss_boss_name_23", + "text": "吉姆·普雷斯科特" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000023, + "boss_des": { + "key": "guild_guild_boss_boss_name_23", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000024, + "group": 5, + "boss_name": { + "key": "guild_guild_boss_boss_name_24", + "text": "吉姆·普雷斯科特" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000024, + "boss_des": { + "key": "guild_guild_boss_boss_name_24", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000025, + "group": 5, + "boss_name": { + "key": "guild_guild_boss_boss_name_25", + "text": "吉姆·普雷斯科特" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000025, + "boss_des": { + "key": "guild_guild_boss_boss_name_25", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000026, + "group": 6, + "boss_name": { + "key": "guild_guild_boss_boss_name_26", + "text": "牙仙" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000026, + "boss_des": { + "key": "guild_guild_boss_boss_name_26", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000027, + "group": 6, + "boss_name": { + "key": "guild_guild_boss_boss_name_27", + "text": "牙仙" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000027, + "boss_des": { + "key": "guild_guild_boss_boss_name_27", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000028, + "group": 6, + "boss_name": { + "key": "guild_guild_boss_boss_name_28", + "text": "牙仙" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000028, + "boss_des": { + "key": "guild_guild_boss_boss_name_28", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000029, + "group": 6, + "boss_name": { + "key": "guild_guild_boss_boss_name_29", + "text": "牙仙" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000029, + "boss_des": { + "key": "guild_guild_boss_boss_name_29", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000030, + "group": 6, + "boss_name": { + "key": "guild_guild_boss_boss_name_30", + "text": "牙仙" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000030, + "boss_des": { + "key": "guild_guild_boss_boss_name_30", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000031, + "group": 7, + "boss_name": { + "key": "guild_guild_boss_boss_name_31", + "text": "睡神沙人" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000031, + "boss_des": { + "key": "guild_guild_boss_boss_name_31", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000032, + "group": 7, + "boss_name": { + "key": "guild_guild_boss_boss_name_32", + "text": "睡神沙人" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000032, + "boss_des": { + "key": "guild_guild_boss_boss_name_32", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000033, + "group": 7, + "boss_name": { + "key": "guild_guild_boss_boss_name_33", + "text": "睡神沙人" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000033, + "boss_des": { + "key": "guild_guild_boss_boss_name_33", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000034, + "group": 7, + "boss_name": { + "key": "guild_guild_boss_boss_name_34", + "text": "睡神沙人" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000034, + "boss_des": { + "key": "guild_guild_boss_boss_name_34", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000035, + "group": 7, + "boss_name": { + "key": "guild_guild_boss_boss_name_35", + "text": "睡神沙人" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000035, + "boss_des": { + "key": "guild_guild_boss_boss_name_35", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000036, + "group": 8, + "boss_name": { + "key": "guild_guild_boss_boss_name_36", + "text": "邦尼兔" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000036, + "boss_des": { + "key": "guild_guild_boss_boss_name_36", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000037, + "group": 8, + "boss_name": { + "key": "guild_guild_boss_boss_name_37", + "text": "邦尼兔" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000037, + "boss_des": { + "key": "guild_guild_boss_boss_name_37", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000038, + "group": 8, + "boss_name": { + "key": "guild_guild_boss_boss_name_38", + "text": "邦尼兔" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000038, + "boss_des": { + "key": "guild_guild_boss_boss_name_38", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000039, + "group": 8, + "boss_name": { + "key": "guild_guild_boss_boss_name_39", + "text": "邦尼兔" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000039, + "boss_des": { + "key": "guild_guild_boss_boss_name_39", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000040, + "group": 8, + "boss_name": { + "key": "guild_guild_boss_boss_name_40", + "text": "邦尼兔" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000040, + "boss_des": { + "key": "guild_guild_boss_boss_name_40", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000041, + "group": 9, + "boss_name": { + "key": "guild_guild_boss_boss_name_41", + "text": "金猴" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000041, + "boss_des": { + "key": "guild_guild_boss_boss_name_41", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000042, + "group": 9, + "boss_name": { + "key": "guild_guild_boss_boss_name_42", + "text": "金猴" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000042, + "boss_des": { + "key": "guild_guild_boss_boss_name_42", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000043, + "group": 9, + "boss_name": { + "key": "guild_guild_boss_boss_name_43", + "text": "金猴" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000043, + "boss_des": { + "key": "guild_guild_boss_boss_name_43", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000044, + "group": 9, + "boss_name": { + "key": "guild_guild_boss_boss_name_44", + "text": "金猴" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000044, + "boss_des": { + "key": "guild_guild_boss_boss_name_44", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000045, + "group": 9, + "boss_name": { + "key": "guild_guild_boss_boss_name_45", + "text": "金猴" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000045, + "boss_des": { + "key": "guild_guild_boss_boss_name_45", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000046, + "group": 10, + "boss_name": { + "key": "guild_guild_boss_boss_name_46", + "text": "暴芙那特" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000046, + "boss_des": { + "key": "guild_guild_boss_boss_name_46", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000047, + "group": 10, + "boss_name": { + "key": "guild_guild_boss_boss_name_47", + "text": "暴芙那特" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000047, + "boss_des": { + "key": "guild_guild_boss_boss_name_47", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000048, + "group": 10, + "boss_name": { + "key": "guild_guild_boss_boss_name_48", + "text": "暴芙那特" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000048, + "boss_des": { + "key": "guild_guild_boss_boss_name_48", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000049, + "group": 10, + "boss_name": { + "key": "guild_guild_boss_boss_name_49", + "text": "暴芙那特" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000049, + "boss_des": { + "key": "guild_guild_boss_boss_name_49", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000050, + "group": 10, + "boss_name": { + "key": "guild_guild_boss_boss_name_50", + "text": "暴芙那特" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000050, + "boss_des": { + "key": "guild_guild_boss_boss_name_50", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000051, + "group": 11, + "boss_name": { + "key": "guild_guild_boss_boss_name_51", + "text": "云朵先生" + }, + "boss_lv": 1, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000051, + "boss_des": { + "key": "guild_guild_boss_boss_name_51", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000052, + "group": 11, + "boss_name": { + "key": "guild_guild_boss_boss_name_52", + "text": "云朵先生" + }, + "boss_lv": 2, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000052, + "boss_des": { + "key": "guild_guild_boss_boss_name_52", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000053, + "group": 11, + "boss_name": { + "key": "guild_guild_boss_boss_name_53", + "text": "云朵先生" + }, + "boss_lv": 3, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301016 + ], + "score": 1, + "buff": 50000053, + "boss_des": { + "key": "guild_guild_boss_boss_name_53", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000054, + "group": 11, + "boss_name": { + "key": "guild_guild_boss_boss_name_54", + "text": "云朵先生" + }, + "boss_lv": 4, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301019 + ], + "score": 1, + "buff": 50000054, + "boss_des": { + "key": "guild_guild_boss_boss_name_54", + "text": "大家集中火力,优先攻打希卡普" + } + }, + { + "boss_id": 50000055, + "group": 11, + "boss_name": { + "key": "guild_guild_boss_boss_name_55", + "text": "云朵先生" + }, + "boss_lv": 5, + "hp": 10, + "BattleReadyID": 121, + "boss_img": 11009, + "kill_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "boss": [ + 301013 + ], + "score": 1, + "buff": 50000055, + "boss_des": { + "key": "guild_guild_boss_boss_name_55", + "text": "大家集中火力,优先攻打希卡普" + } } ] \ No newline at end of file diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index 53bd3efc7..5ffb8160c 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -7,7 +7,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -25,7 +25,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -43,7 +43,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -68,7 +68,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -86,7 +86,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -104,7 +104,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -118,13 +118,7 @@ "key": 8, "id": "13002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -135,7 +129,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -153,7 +147,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -171,7 +165,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -185,13 +179,7 @@ "key": 12, "id": "13003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -202,7 +190,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -220,7 +208,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -238,7 +226,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -252,13 +240,7 @@ "key": 16, "id": "13004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -269,7 +251,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -287,7 +269,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -305,7 +287,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -319,13 +301,7 @@ "key": 20, "id": "13005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -336,7 +312,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -354,7 +330,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -368,13 +344,7 @@ "key": 23, "id": "14001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -385,7 +355,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -403,7 +373,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -417,13 +387,7 @@ "key": 26, "id": "14002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -434,7 +398,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -452,7 +416,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -466,13 +430,7 @@ "key": 29, "id": "14003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -483,7 +441,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -501,7 +459,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -515,13 +473,7 @@ "key": 32, "id": "14004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -532,7 +484,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -550,7 +502,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -564,13 +516,7 @@ "key": 35, "id": "14005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -581,7 +527,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -599,7 +545,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -613,13 +559,7 @@ "key": 38, "id": "14006", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -630,7 +570,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -648,7 +588,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -662,13 +602,7 @@ "key": 41, "id": "14007", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -679,7 +613,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -693,13 +627,7 @@ "key": 43, "id": "15001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -710,7 +638,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -724,13 +652,7 @@ "key": 45, "id": "15002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -741,7 +663,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -755,13 +677,7 @@ "key": 47, "id": "15003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -772,7 +688,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -786,13 +702,7 @@ "key": 49, "id": "15004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -803,7 +713,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -821,7 +731,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -839,7 +749,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -853,13 +763,7 @@ "key": 53, "id": "23001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -870,7 +774,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -888,7 +792,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -906,7 +810,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -920,13 +824,7 @@ "key": 57, "id": "23002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -937,7 +835,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -955,7 +853,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -973,7 +871,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -987,13 +885,7 @@ "key": 61, "id": "23003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1004,7 +896,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -1022,7 +914,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1040,7 +932,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1054,13 +946,7 @@ "key": 65, "id": "23004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1071,7 +957,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1089,7 +975,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1103,13 +989,7 @@ "key": 68, "id": "24001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1120,7 +1000,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -1138,7 +1018,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1156,7 +1036,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1181,7 +1061,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1199,7 +1079,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1213,13 +1093,7 @@ "key": 75, "id": "24003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1230,7 +1104,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1248,7 +1122,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1262,13 +1136,7 @@ "key": 78, "id": "24004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1279,7 +1147,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1297,7 +1165,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1311,13 +1179,7 @@ "key": 81, "id": "24005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1328,7 +1190,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1346,7 +1208,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1360,13 +1222,7 @@ "key": 84, "id": "24006", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1377,7 +1233,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1395,7 +1251,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1409,13 +1265,7 @@ "key": 87, "id": "24007", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1426,7 +1276,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1444,7 +1294,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1458,13 +1308,7 @@ "key": 90, "id": "24008", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1475,7 +1319,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1493,7 +1337,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1507,13 +1351,7 @@ "key": 93, "id": "24009", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1524,7 +1362,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1538,13 +1376,7 @@ "key": 95, "id": "25001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1555,7 +1387,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1569,13 +1401,7 @@ "key": 97, "id": "25002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1586,7 +1412,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1600,13 +1426,7 @@ "key": 99, "id": "25003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1617,7 +1437,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1631,13 +1451,7 @@ "key": 101, "id": "25004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1648,7 +1462,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -1666,7 +1480,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1684,7 +1498,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1698,13 +1512,7 @@ "key": 105, "id": "33001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1715,7 +1523,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -1733,7 +1541,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1751,7 +1559,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1765,13 +1573,7 @@ "key": 109, "id": "33002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1782,7 +1584,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -1800,7 +1602,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1818,7 +1620,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1832,13 +1634,7 @@ "key": 113, "id": "33003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1849,7 +1645,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -1867,7 +1663,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1885,7 +1681,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1899,13 +1695,7 @@ "key": 117, "id": "33004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1916,7 +1706,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -1934,7 +1724,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -1952,7 +1742,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -1966,13 +1756,7 @@ "key": 121, "id": "33005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -1983,7 +1767,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -2001,7 +1785,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2019,7 +1803,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2033,13 +1817,7 @@ "key": 125, "id": "33006", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2050,7 +1828,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2068,7 +1846,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2082,13 +1860,7 @@ "key": 128, "id": "34001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2099,7 +1871,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2117,7 +1889,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2131,13 +1903,7 @@ "key": 131, "id": "34002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2148,7 +1914,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2166,7 +1932,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2180,13 +1946,7 @@ "key": 134, "id": "34003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2197,7 +1957,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2215,7 +1975,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2229,13 +1989,7 @@ "key": 137, "id": "34004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2246,7 +2000,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2264,7 +2018,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2278,13 +2032,7 @@ "key": 140, "id": "34005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2295,7 +2043,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2313,7 +2061,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2327,13 +2075,7 @@ "key": 143, "id": "34006", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2344,7 +2086,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2362,7 +2104,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2376,13 +2118,7 @@ "key": 146, "id": "34007", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2393,7 +2129,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2411,7 +2147,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2425,13 +2161,7 @@ "key": 149, "id": "34008", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2442,7 +2172,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2456,13 +2186,7 @@ "key": 151, "id": "35001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2473,7 +2197,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2487,13 +2211,7 @@ "key": 153, "id": "35002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2504,7 +2222,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2518,13 +2236,7 @@ "key": 155, "id": "35003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2535,7 +2247,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2549,13 +2261,7 @@ "key": 157, "id": "35004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2566,7 +2272,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2580,13 +2286,7 @@ "key": 159, "id": "35005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2597,7 +2297,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2611,13 +2311,7 @@ "key": 161, "id": "35006", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2628,7 +2322,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -2646,7 +2340,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2664,7 +2358,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2678,13 +2372,7 @@ "key": 165, "id": "43001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2695,7 +2383,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -2713,7 +2401,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2731,7 +2419,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2745,13 +2433,7 @@ "key": 169, "id": "43002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2762,7 +2444,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -2780,7 +2462,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2798,7 +2480,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2812,13 +2494,7 @@ "key": 173, "id": "43003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2829,7 +2505,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -2847,7 +2523,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2865,7 +2541,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2879,13 +2555,7 @@ "key": 177, "id": "43004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2896,7 +2566,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -2914,7 +2584,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2932,7 +2602,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -2946,13 +2616,7 @@ "key": 181, "id": "43005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -2963,7 +2627,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -2981,7 +2645,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -2999,7 +2663,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3013,13 +2677,7 @@ "key": 185, "id": "43006", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3030,7 +2688,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 50000 }, { "a": "item", @@ -3048,7 +2706,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -3066,7 +2724,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3080,13 +2738,7 @@ "key": 189, "id": "43007", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3097,7 +2749,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -3115,7 +2767,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3129,13 +2781,7 @@ "key": 192, "id": "44001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3146,7 +2792,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -3164,7 +2810,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3178,13 +2824,7 @@ "key": 195, "id": "44002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3195,7 +2835,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -3213,7 +2853,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3227,13 +2867,7 @@ "key": 198, "id": "44003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3244,7 +2878,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -3262,7 +2896,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3276,13 +2910,7 @@ "key": 201, "id": "44004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3293,7 +2921,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -3311,7 +2939,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3325,13 +2953,7 @@ "key": 204, "id": "44006", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3342,7 +2964,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3356,13 +2978,7 @@ "key": 206, "id": "45001", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3373,7 +2989,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3387,13 +3003,7 @@ "key": 208, "id": "45002", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3404,7 +3014,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3418,13 +3028,7 @@ "key": 210, "id": "45003", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3435,7 +3039,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3449,13 +3053,7 @@ "key": 212, "id": "45004", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3466,7 +3064,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 150000 }, { "a": "item", @@ -3484,7 +3082,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3498,13 +3096,7 @@ "key": 215, "id": "44005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] }, { @@ -3515,7 +3107,7 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 300000 }, { "a": "item", @@ -3529,13 +3121,7 @@ "key": 217, "id": "15005", "star": 6, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], + "needrace": [], "starup": [] } ] \ No newline at end of file diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json index d41f36eec..ed7d79925 100644 --- a/bin/json/game_mail.json +++ b/bin/json/game_mail.json @@ -319,5 +319,26 @@ }, "reword": [], "duration": 720 + }, + { + "id": "PeackReward", + "title": { + "key": "", + "text": "" + }, + "recipient": { + "key": "", + "text": "" + }, + "content": { + "key": "mail_mail_content_16", + "text": "这是圣桃抽卡没有领取的奖励。" + }, + "sender": { + "key": "", + "text": "" + }, + "reword": [], + "duration": 720 } ] \ No newline at end of file diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index b5901b90b..6dd8b3adf 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -130,5 +130,11 @@ "open": true, "routrules": "~/worker", "describe": "好友排行" + }, + { + "msgid": "uniongve", + "open": true, + "routrules": "~/worker", + "describe": "工会boos战" } ] \ No newline at end of file diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index a260fbfb2..9de568279 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -5251,7 +5251,8 @@ "heroid": 25001, "datas": [ "WuGuanScene", - "武馆的老虎" + "武馆的老虎", + "137" ], "event": [ 2, @@ -5263,7 +5264,8 @@ "id": 300018, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5274,7 +5276,8 @@ "id": 300019, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5286,7 +5289,8 @@ "heroid": 25001, "datas": [ "GameMain", - "烹饪处的阿宝" + "烹饪处的阿宝", + "901" ], "event": [ 2, @@ -5299,7 +5303,8 @@ "heroid": 25001, "datas": [ "WuGuanScene", - "武馆的老虎" + "武馆的老虎", + "137" ], "event": [ 2, @@ -5312,7 +5317,8 @@ "heroid": 25001, "datas": [ "WuGuanScene", - "武馆的老虎" + "武馆的老虎", + "137" ], "event": [ 2, @@ -5325,7 +5331,8 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征" + "功能入口-维京远征", + "901" ], "event": [ 2, @@ -5338,7 +5345,8 @@ "heroid": 25001, "datas": [ "GameMain", - "装木炭的箱子" + "装木炭的箱子", + "901" ], "event": [], "goto": 0 @@ -5348,7 +5356,8 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征" + "功能入口-维京远征", + "901" ], "event": [ 2, @@ -5361,7 +5370,8 @@ "heroid": 25001, "datas": [ "GameMain", - "希卡普旁的亚丝翠" + "希卡普旁的亚丝翠", + "901" ], "event": [ 2, @@ -5374,7 +5384,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 1, @@ -5386,7 +5397,8 @@ "id": 300049, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5398,7 +5410,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 2, @@ -5411,7 +5424,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 1, @@ -5423,7 +5437,8 @@ "id": 300059, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5435,7 +5450,8 @@ "heroid": 25001, "datas": [ "GameMain", - "亚丝翠旁的鼻涕粗" + "亚丝翠旁的鼻涕粗", + "901" ], "event": [ 2, @@ -5447,7 +5463,8 @@ "id": 300068, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5458,7 +5475,8 @@ "id": 300069, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5470,7 +5488,8 @@ "heroid": 25001, "datas": [ "GameMain", - "车站旁的鼻涕粗" + "车站旁的鼻涕粗", + "901" ], "event": [ 2, @@ -5482,7 +5501,8 @@ "id": 300618, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5493,7 +5513,8 @@ "id": 300619, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5505,7 +5526,8 @@ "heroid": 25001, "datas": [ "GameMain", - "希卡普旁的亚丝翠" + "希卡普旁的亚丝翠", + "901" ], "event": [ 2, @@ -5517,7 +5539,8 @@ "id": 300628, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5528,7 +5551,8 @@ "id": 300629, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5540,7 +5564,8 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪" + "功能入口-烹饪", + "901" ], "event": [ 2, @@ -5552,7 +5577,8 @@ "id": 300078, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5563,7 +5589,8 @@ "id": 300079, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5575,7 +5602,8 @@ "heroid": 25001, "datas": [ "GameMain", - "铁匠铺门口的暴芙那特" + "铁匠铺门口的暴芙那特", + "901" ], "event": [ 2, @@ -5587,7 +5615,8 @@ "id": 300088, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 @@ -5598,7 +5627,8 @@ "id": 300089, "heroid": 25001, "datas": [ - "GameMain" + "GameMain", + "901" ], "event": [ 0 diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 9d583b0ee..f3d681fdb 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -6,7 +6,7 @@ "text": "[color=#37d8a9]攻击提升[/color] " }, "Desc": { - "key": "skill_skill_buff_Desc_390001001", + "key": "780002904", "text": "攻击提升60%。" }, "BuffType": 1, @@ -324,7 +324,7 @@ }, "BuffType": 30, "EffectArgu": [ - -1, + 14, 100 ], "BufParNum": 1, diff --git a/comm/const.go b/comm/const.go index 9c9ab3833..5c1d126c0 100644 --- a/comm/const.go +++ b/comm/const.go @@ -295,6 +295,8 @@ const ( TableUniongve = "uniongve" ///工会轮盘 TableUnionroulette = "unionroulette" + ///工会排行榜 + TableUnionrank = "unionrank" //全局表 TableGlobal = "global" ) diff --git a/comm/imodule.go b/comm/imodule.go index 77864e11f..8a702939e 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -367,7 +367,7 @@ type ( // 获取我的公会成员 MembersByUid(uid string) (list []*pb.SociatyMemberInfo) // 获取公会成员 - MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo) + MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo, errdata *pb.ErrorData) // 设置工会经验 BingoSetExp(session IUserSession, exp int32) error // 设置工会活跃度 diff --git a/modules/comp_model.go b/modules/comp_model.go index f3d0e54e8..a859fdcf7 100644 --- a/modules/comp_model.go +++ b/modules/comp_model.go @@ -113,6 +113,11 @@ func (this *MCompModel) Get(id string, data interface{}, opt ...db.DBOption) (er return this.DBModel.Get(id, data, opt...) } +// 读取全部数据 +func (this *MCompModel) GetByID(id string, data interface{}, opt ...db.DBOption) (err error) { + return this.DBModel.GetByID(id, data, opt...) +} + // 读取多个数据对象 func (this *MCompModel) Gets(ids []string, data interface{}, opt ...db.DBOption) (onfound []string, err error) { return this.DBModel.Gets(ids, data, opt...) diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index ac51a97e8..e5261b2fb 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -23,17 +23,22 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.SociatyApplyR } func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (errdata *pb.ErrorData) { + var ( + sociaty *pb.DBSociaty + err error + ) + if errdata = this.ApplyCheck(session, req); errdata != nil { return } uid := session.GetUserId() - sociaty := this.module.modelSociaty.getSociaty(req.SociatyId) - if sociaty == nil { + if sociaty, err = this.module.modelSociaty.getSociaty(req.SociatyId); err != nil { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_SociatyNoFound, - Title: pb.ErrorCode_SociatyNoFound.ToString(), + Code: pb.ErrorCode_SociatyNoFound, + Title: pb.ErrorCode_SociatyNoFound.ToString(), + Message: err.Error(), } return } diff --git a/modules/sociaty/api_cross_applycancel.go b/modules/sociaty/api_cross_applycancel.go index 2b81bc904..e79130eb0 100644 --- a/modules/sociaty/api_cross_applycancel.go +++ b/modules/sociaty/api_cross_applycancel.go @@ -20,17 +20,22 @@ func (this *apiComp) ApplyCancelCheck(session comm.IUserSession, req *pb.Sociaty } func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (errdata *pb.ErrorData) { + var ( + uid string + sociaty *pb.DBSociaty + + err error + ) + if errdata = this.ApplyCancelCheck(session, req); errdata != nil { return } - - uid := session.GetUserId() - - sociaty := this.module.modelSociaty.getSociaty(req.SociatyId) - if sociaty != nil && sociaty.Id == "" { + uid = session.GetUserId() + if sociaty, err = this.module.modelSociaty.getSociaty(req.SociatyId); err != nil { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_SociatyNoFound, - Title: pb.ErrorCode_SociatyNoFound.ToString(), + Code: pb.ErrorCode_SociatyNoFound, + Title: pb.ErrorCode_SociatyNoFound.ToString(), + Message: err.Error(), } return } diff --git a/modules/sociaty/api_cross_applylist.go b/modules/sociaty/api_cross_applylist.go index 4c83d36a7..77a8a1f53 100644 --- a/modules/sociaty/api_cross_applylist.go +++ b/modules/sociaty/api_cross_applylist.go @@ -20,16 +20,22 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.SociatyAp } func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.SociatyApplyListReq) (errdata *pb.ErrorData) { + var ( + uid string + sociaty *pb.DBSociaty + + err error + ) + if errdata = this.ApplyListCheck(session, req); errdata != nil { return } - - uid := session.GetUserId() - sociaty := this.module.modelSociaty.getSociaty(req.SociatyId) - if sociaty == nil { + uid = session.GetUserId() + if sociaty, err = this.module.modelSociaty.getSociaty(req.SociatyId); err != nil { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_SociatyNoFound, - Title: pb.ErrorCode_SociatyNoFound.ToString(), + Code: pb.ErrorCode_SociatyNoFound, + Title: pb.ErrorCode_SociatyNoFound.ToString(), + Message: err.Error(), } return } diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index a77c2bbd6..c4697bc25 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -62,9 +62,13 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) user := this.module.ModuleUser.GetUser(uid) if user == nil { this.module.Error("GetRmoteUser not found", log.Field{Key: "uid", Value: uid}) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: fmt.Sprintf("not found user: %s", uid), + } return } - userExpand, err := this.module.ModuleUser.GetUserExpand(uid) if err != nil { errdata = &pb.ErrorData{ diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go index c5bbe55a0..4fe2935dc 100644 --- a/modules/sociaty/model_sociaty.go +++ b/modules/sociaty/model_sociaty.go @@ -167,14 +167,11 @@ func (this *ModelSociaty) findByName(name string) *pb.DBSociaty { } // 获取公会 -func (this *ModelSociaty) getSociaty(sociatyId string) (sociaty *pb.DBSociaty) { +func (this *ModelSociaty) getSociaty(sociatyId string) (sociaty *pb.DBSociaty, err error) { sociaty = &pb.DBSociaty{} - if err := this.GetListObj(comm.RDS_EMPTY, sociatyId, sociaty); err != nil { - log.Error("GetListObj", log.Field{Key: "sociatyId", Value: sociatyId}) - return nil - } - if sociaty.Id == "" { - return nil + if err = this.GetListObj(comm.RDS_EMPTY, sociatyId, sociaty); err != nil { + this.module.Error("获取工会信息 失败", log.Field{Key: "sociatyId", Value: sociatyId}, log.Field{Key: "err", Value: err.Error()}) + return } return } @@ -217,7 +214,7 @@ func (this *ModelSociaty) getUserSociaty(uid string) (sociaty *pb.DBSociaty) { return } if userEx.SociatyId != "" { - sociaty = this.getSociaty(userEx.SociatyId) + sociaty, _ = this.getSociaty(userEx.SociatyId) if sociaty != nil { //验证是否解散 if this.isDismiss(sociaty) { diff --git a/modules/sociaty/module.go b/modules/sociaty/module.go index 0b3259146..80b948f5c 100644 --- a/modules/sociaty/module.go +++ b/modules/sociaty/module.go @@ -115,7 +115,7 @@ func (this *Sociaty) ProcessAccuse(uid, sociatyId string) { if t == 0 { return } - sociaty := this.modelSociaty.getSociaty(sociatyId) + sociaty, _ := this.modelSociaty.getSociaty(sociatyId) if sociaty != nil { if sociaty.AccuseTime > 0 { now := configure.Now().Unix() @@ -142,9 +142,20 @@ func (this *Sociaty) MembersByUid(uid string) (list []*pb.SociatyMemberInfo) { } // 获取公会成员 -func (this *Sociaty) MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo) { - sociaty := this.modelSociaty.getSociaty(sociatyId) - return this.modelSociaty.members(sociaty) +func (this *Sociaty) MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo, errdata *pb.ErrorData) { + var ( + sociaty *pb.DBSociaty + err error + ) + if sociaty, err = this.modelSociaty.getSociaty(sociatyId); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + return this.modelSociaty.members(sociaty), nil } // 批量获取公户信息 @@ -212,7 +223,11 @@ func (this *Sociaty) Reddot(session comm.IUserSession, rid ...comm.ReddotType) ( // 跨服获取公会 func (this *Sociaty) RpcGetSociaty(ctx context.Context, req *pb.RPCGeneralReqA1, reply *pb.DBSociaty) error { this.Debug("Rpc_ModuleSociaty", log.Field{Key: "req", Value: req.String()}) - sociaty := this.modelSociaty.getSociaty(req.Param1) + var ( + sociaty *pb.DBSociaty + err error + ) + sociaty, err = this.modelSociaty.getSociaty(req.Param1) reply.Id = sociaty.Id reply.Lv = sociaty.Lv reply.Exp = sociaty.Exp @@ -229,7 +244,7 @@ func (this *Sociaty) RpcGetSociaty(ctx context.Context, req *pb.RPCGeneralReqA1, reply.Activity = sociaty.Activity reply.AccuseTime = sociaty.AccuseTime reply.ApplyRecord = sociaty.ApplyRecord - return nil + return err } type SociatyUpdateParam struct { diff --git a/modules/timer/module.go b/modules/timer/module.go index 54d0eab8b..171dc8ea5 100644 --- a/modules/timer/module.go +++ b/modules/timer/module.go @@ -29,11 +29,12 @@ type Timer struct { //season *SeasonPagoda forum *ForumComp arena *ArenaComp + sociaty *SociatyComp parkour *ParkourComp caravan *CaravanRank } -//模块名 +// 模块名 func (this *Timer) GetType() core.M_Modules { return comm.ModuleTimer } @@ -43,7 +44,7 @@ func (this *Timer) NewOptions() (options core.IModuleOptions) { return new(Options) } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Timer) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) this.service = service.(base.IRPCXService) @@ -62,11 +63,12 @@ func (this *Timer) OnInstallComp() { this.chat = this.RegisterComp(new(ChatComp)).(*ChatComp) //this.season = this.RegisterComp(new(SeasonPagoda)).(*SeasonPagoda) this.arena = this.RegisterComp(new(ArenaComp)).(*ArenaComp) + this.sociaty = this.RegisterComp(new(SociatyComp)).(*SociatyComp) this.parkour = this.RegisterComp(new(ParkourComp)).(*ParkourComp) this.caravan = this.RegisterComp(new(CaravanRank)).(*CaravanRank) } -//跨服对象获取数据操作对象 +// 跨服对象获取数据操作对象 func (this *Timer) getDBModelByUid(uid, tableName string) (model *db.DBModel, err error) { var ( stag string @@ -88,7 +90,7 @@ func (this *Timer) getDBModelByUid(uid, tableName string) (model *db.DBModel, er return } -//日志 +// 日志 func (this *Timer) Enabled(lvl log.Loglevel) bool { return this.options.GetLog().Enabled(lvl) } @@ -96,7 +98,7 @@ func (this *Timer) SetName(name string) { this.options.GetLog().SetName(name) } -//日志接口 +// 日志接口 func (this *Timer) Debug(msg string, args ...log.Field) { this.options.GetLog().Debug(msg, args...) } diff --git a/modules/timer/sociaty.go b/modules/timer/sociaty.go new file mode 100644 index 000000000..166b38ef6 --- /dev/null +++ b/modules/timer/sociaty.go @@ -0,0 +1,54 @@ +package timer + +import ( + "context" + "go_dreamfactory/comm" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + "go_dreamfactory/sys/db" + + "go_dreamfactory/lego/base" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/cron" +) + +/* +工会结算计时器 +*/ +type SociatyComp struct { + modules.MCompConfigure + service base.IRPCXService + module *Timer + takes []cron.EntryID +} + +// 组件初始化接口 +func (this *SociatyComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.MCompConfigure.Init(service, module, comp, options) + this.service = service.(base.IRPCXService) + this.module = module.(*Timer) + this.takes = make([]cron.EntryID, 0) + return +} + +// 自由跨服环境下开启此功能 +func (this *SociatyComp) Start() (err error) { + err = this.MCompConfigure.Start() + if db.IsCross() { + if _, err = cron.AddFunc("0 0 1 ? * 1", this.timer); err != nil { + this.module.Errorf("cron.AddFunc err:%v", err) + } + } + return +} + +func (this *SociatyComp) timer() { + if _, err := this.service.RpcGo(context.Background(), + comm.Service_Worker, + string(comm.Rpc_ModuleGuildBossSettlement), + pb.EmptyReq{}, + nil, + ); err != nil { + this.module.Errorln(err) + } +} diff --git a/modules/tools/modelGlobal.go b/modules/tools/modelGlobal.go index bd6220fef..902b49c7f 100644 --- a/modules/tools/modelGlobal.go +++ b/modules/tools/modelGlobal.go @@ -33,7 +33,7 @@ func (this *modelGlobal) GetGlobalData(key string, v interface{}) (err error) { // 更新全局配置 func (this *modelGlobal) UpdateGlobalData(key string, v interface{}) (err error) { - if _, err = this.DBModel.DB.UpdateOne(core.SqlTable(this.TableName), bson.M{"_id": key}, v, options.Update().SetUpsert(true)); err != nil { + if _, err = this.DBModel.DB.UpdateOne(core.SqlTable(this.TableName), bson.M{"_id": key}, bson.M{"$set": v}, options.Update().SetUpsert(true)); err != nil { this.module.Error("GetGlobalData err", log.Field{Key: "key", Value: key}, log.Field{Key: "err", Value: err.Error()}) } return diff --git a/modules/uniongve/api_roulette.go b/modules/uniongve/api_roulette.go index 55d70f422..3aab57e34 100644 --- a/modules/uniongve/api_roulette.go +++ b/modules/uniongve/api_roulette.go @@ -58,7 +58,7 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.UniongveRoulett } if confs[index].Push == 1 { //推送通知 - go this.module.modelUnionroulette.roulettechangePush(session.GetUserId(), req.Unionid, award) + go this.module.modelUnionroulette.roulettechangePush(req.Unionid, session.GetUserId(), award) } session.SendMsg(string(this.module.GetType()), "roulette", &pb.UniongveRouletteResp{Cid: confs[index].Id, Award: award}) diff --git a/modules/uniongve/modelUnionRoulette.go b/modules/uniongve/modelUnionRoulette.go index c75103749..78229bf53 100644 --- a/modules/uniongve/modelUnionRoulette.go +++ b/modules/uniongve/modelUnionRoulette.go @@ -60,7 +60,7 @@ func (this *ModelUnionroulette) updateUnionRoulette(data *pb.DBUnionRouletteReco // 分布式锁 func (this *ModelUnionroulette) userlock(id string) (result *redis.RedisMutex, err error) { - return this.DBModel.Redis.NewRedisMutex(fmt.Sprintf("unionroulette:%s", id)) + return this.DBModel.Redis.NewRedisMutex(fmt.Sprintf("lockunionroulette:%s", id)) } // boos 信息变化推送 @@ -69,11 +69,11 @@ func (this *ModelUnionroulette) roulettechangePush(unionid string, uid string, a info *pb.DBUnionRouletteRecord members []*pb.SociatyMemberInfo users []string = make([]string, 0) + errdata *pb.ErrorData err error ) - members = this.module.sociaty.MembersBySociatyId(unionid) - if members == nil || len(members) == 0 { - this.module.Error("MembersBySociatyId is nil !") + if members, errdata = this.module.sociaty.MembersBySociatyId(unionid); errdata != nil { + this.module.Debug("获取工会成员列表!", log.Field{Key: "errdata", Value: errdata}) return } for _, v := range members { diff --git a/modules/uniongve/modelUniongve.go b/modules/uniongve/modelUniongve.go index f7f8eecb5..eb03a0198 100644 --- a/modules/uniongve/modelUniongve.go +++ b/modules/uniongve/modelUniongve.go @@ -46,8 +46,10 @@ func (this *ModelUniongve) getUnionGve(unionid string) (results *pb.DBUnionGve, confs *pb.DBUnionGveBossConf conf *cfg.GameGuildBossData ) - results = &pb.DBUnionGve{} - if err = this.Get(unionid, results); err != nil && err != mgo.MongodbNil { + results = &pb.DBUnionGve{ + Boos: make([]*pb.DBUnionGveBoss, 0), + } + if err = this.GetByID(unionid, results); err != nil && err != mgo.MongodbNil { this.module.Errorln(err) return } @@ -120,12 +122,16 @@ func (this *ModelUniongve) getGlobalBoos() (conf *pb.DBUnionGveBossConf, err err ) this.conflock.RLock() bossconf = this.bossconf - this.conflock.Unlock() + this.conflock.RUnlock() if bossconf == nil || !utils.IsSameWeek(bossconf.Rtime) { if bossconf, err = this.refreshGlobalBoos(); err != nil { return } + this.conflock.Lock() + this.bossconf = bossconf + this.conflock.Unlock() } + conf = bossconf return } @@ -154,13 +160,16 @@ func (this *ModelUniongve) refreshGlobalBoos() (conf *pb.DBUnionGveBossConf, err this.conflock.Lock() this.bossconf = conf this.conflock.Unlock() - this.module.ModuleTools.UpdateGlobalData(UnionGveBoosCoonfKey, conf) + this.module.ModuleTools.UpdateGlobalData(UnionGveBoosCoonfKey, map[string]interface{}{ + "rtime": conf.Rtime, + "boos": conf.Boos, + }) return } // 分布式锁 func (this *ModelUniongve) userlock(id string) (result *redis.RedisMutex, err error) { - return this.DBModel.Redis.NewRedisMutex(fmt.Sprintf("uniongve:%s", id)) + return this.DBModel.Redis.NewRedisMutex(fmt.Sprintf("lockuniongve:%s", id)) } // boos 血量变化推送 @@ -168,10 +177,10 @@ func (this *ModelUniongve) booshpchangepush(unionid string, info *pb.DBUnionGve) var ( members []*pb.SociatyMemberInfo users []string = make([]string, 0) + errdata *pb.ErrorData ) - members = this.module.sociaty.MembersBySociatyId(unionid) - if members == nil || len(members) == 0 { - this.module.Error("MembersBySociatyId is nil !") + if members, errdata = this.module.sociaty.MembersBySociatyId(unionid); errdata != nil { + this.module.Debug("获取工会成员列表!", log.Field{Key: "errdata", Value: errdata}) return } for _, v := range members { @@ -189,15 +198,15 @@ func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBUni conf *cfg.GameGuildBossData members []*pb.SociatyMemberInfo users []string = make([]string, 0) + errdata *pb.ErrorData err error ) if conf, err = this.module.configure.getguildbossByid(boosid); err != nil { this.module.Errorln(err) return } - members = this.module.sociaty.MembersBySociatyId(unionid) - if members == nil || len(members) == 0 { - this.module.Error("MembersBySociatyId is nil !") + if members, errdata = this.module.sociaty.MembersBySociatyId(unionid); errdata != nil { + this.module.Debug("获取工会成员列表!", log.Field{Key: "errdata", Value: errdata}) return } for _, v := range members { @@ -246,10 +255,10 @@ func (this *ModelUniongve) infochangepush(unionid string, info *pb.DBUnionGve) { var ( members []*pb.SociatyMemberInfo users []string = make([]string, 0) + errdata *pb.ErrorData ) - members = this.module.sociaty.MembersBySociatyId(unionid) - if members == nil || len(members) == 0 { - this.module.Error("MembersBySociatyId is nil !") + if members, errdata = this.module.sociaty.MembersBySociatyId(unionid); errdata != nil { + this.module.Debug("获取工会成员列表!", log.Field{Key: "errdata", Value: errdata}) return } for _, v := range members { @@ -258,5 +267,5 @@ func (this *ModelUniongve) infochangepush(unionid string, info *pb.DBUnionGve) { } this.module.SendMsgToUsers(string(this.module.GetType()), "infochange", &pb.UniongveInfoChangePush{ Info: info, - }) + }, users...) } diff --git a/modules/uniongve/modelrank.go b/modules/uniongve/modelrank.go index 45cb54206..8c479331d 100644 --- a/modules/uniongve/modelrank.go +++ b/modules/uniongve/modelrank.go @@ -25,7 +25,7 @@ type modelRank struct { func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompModel.Init(service, module, comp, options) - this.TableName = comm.TableUnionroulette + this.TableName = comm.TableUnionrank this.module = module.(*UnionGve) return } @@ -121,12 +121,13 @@ func (this *modelRank) rankRewardPush(unionid string, reward []*cfg.Gameatn) { var ( members []*pb.SociatyMemberInfo users []string = make([]string, 0) + errdata *pb.ErrorData ) - members = this.module.sociaty.MembersBySociatyId(unionid) - if members == nil || len(members) == 0 { - this.module.Error("MembersBySociatyId is nil !") + if members, errdata = this.module.sociaty.MembersBySociatyId(unionid); errdata != nil { + this.module.Debug("获取工会成员列表!", log.Field{Key: "errdata", Value: errdata}) return } + for _, v := range members { users = append(users, v.Uid) } diff --git a/pb/uniongve_db.pb.go b/pb/uniongve_db.pb.go index a6a3c587c..c5144b331 100644 --- a/pb/uniongve_db.pb.go +++ b/pb/uniongve_db.pb.go @@ -26,7 +26,7 @@ type DBUnionGveBossConf struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key" bson:"_id"` //刷新时间 //唯一ID + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key" bson:"_id"` //唯一ID Rtime int64 `protobuf:"varint,2,opt,name=rtime,proto3" json:"rtime"` //刷新时间 Boos []int32 `protobuf:"varint,3,rep,packed,name=boos,proto3" json:"boos"` //boosid } @@ -90,7 +90,7 @@ type DBUnionGve struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"` //工会id + Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid" bson:"_id"` // 背包格子Id Notice string `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"` //公告 Fire int32 `protobuf:"varint,3,opt,name=fire,proto3" json:"fire"` //火力 Currstage int32 `protobuf:"varint,4,opt,name=currstage,proto3" json:"currstage"` //当前第几阶段 diff --git a/sys/db/dbmodel.go b/sys/db/dbmodel.go index df2a04b6a..38a87f483 100644 --- a/sys/db/dbmodel.go +++ b/sys/db/dbmodel.go @@ -386,6 +386,27 @@ func (this *DBModel) Get(uid string, data interface{}, opt ...DBOption) (err err return } +// 读取全部数据 +func (this *DBModel) GetByID(id string, data interface{}, opt ...DBOption) (err error) { + //defer log.Debug("DBModel Get", log.Field{Key: "TableName", Value: this.TableName}, log.Field{Key: "uid", Value: uid}, log.Field{Key: "data", Value: data}) + if err = this.Redis.HGetAll(this.ukey(id), data); err != nil && err != lgredis.RedisNil { + log.Error("HGetAll 错误!", log.Field{Key: "ukey", Value: this.ukey(id)}, log.Field{Key: "err", Value: err.Error()}) + return + } + if err == lgredis.RedisNil { + if err = this.DB.FindOne(core.SqlTable(this.TableName), bson.M{"_id": id}).Decode(data); err != nil { + return + } + err = this.Redis.HMSet(this.ukey(id), data) + } + // option := newDBOption(opt...) + if this.Expired > 0 { + // this.Redis.Expire(this.ukey(uid), option.Expire) + this.conn.UpDateModelExpired(this.ukey(id), nil, this.Expired) + } + return +} + // 读取多个数据对象 func (this *DBModel) Gets(ids []string, data interface{}, opt ...DBOption) (onfound []string, err error) { //defer log.Debug("DBModel GetListObjs", log.Field{Key: "TableName", Value: this.TableName}, log.Field{Key: "uid", Value: uid}, log.Field{Key: "ids", Value: ids}, log.Field{Key: "data", Value: data})