diff --git a/bin/json/game_arenaactivereward.json b/bin/json/game_arenaactivereward.json index 6f55f8053..b2348ebe3 100644 --- a/bin/json/game_arenaactivereward.json +++ b/bin/json/game_arenaactivereward.json @@ -3,7 +3,7 @@ "lv_id": 1, "score_low": 0, "score_up": 799, - "human_num": 1, + "human_num": 0, "name": { "key": "arena_active_reward_name_1", "text": "黑铁" @@ -12,22 +12,17 @@ { "a": "attr", "t": "arenacoin", - "n": 6 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 10 } ], "png": "wp_icon_bydw02", - "k_value": 32 + "k_value": 30 }, { "lv_id": 2, "score_low": 800, - "score_up": 1199, - "human_num": 1, + "score_up": 1299, + "human_num": 2, "name": { "key": "arena_active_reward_name_2", "text": "青铜" @@ -36,22 +31,17 @@ { "a": "attr", "t": "arenacoin", - "n": 8 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 12 } ], "png": "wp_icon_bydw02", - "k_value": 64 + "k_value": 30 }, { "lv_id": 3, - "score_low": 1200, + "score_low": 1300, "score_up": 1599, - "human_num": 2, + "human_num": 3, "name": { "key": "arena_active_reward_name_3", "text": "白银" @@ -60,22 +50,17 @@ { "a": "attr", "t": "arenacoin", - "n": 10 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 14 } ], "png": "wp_icon_bydw02", - "k_value": 32 + "k_value": 30 }, { "lv_id": 4, "score_low": 1600, - "score_up": 1999, - "human_num": 2, + "score_up": 2199, + "human_num": 4, "name": { "key": "arena_active_reward_name_4", "text": "黄金" @@ -84,22 +69,17 @@ { "a": "attr", "t": "arenacoin", - "n": 12 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 16 } ], "png": "wp_icon_bydw02", - "k_value": 16 + "k_value": 30 }, { "lv_id": 5, - "score_low": 2000, - "score_up": 2399, - "human_num": 3, + "score_low": 2200, + "score_up": 2799, + "human_num": 5, "name": { "key": "arena_active_reward_name_5", "text": "铂金" @@ -108,22 +88,17 @@ { "a": "attr", "t": "arenacoin", - "n": 14 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 18 } ], "png": "wp_icon_bydw02", - "k_value": 8 + "k_value": 30 }, { "lv_id": 6, - "score_low": 2400, - "score_up": 2799, - "human_num": 3, + "score_low": 2800, + "score_up": 3699, + "human_num": 5, "name": { "key": "arena_active_reward_name_6", "text": "钻石" @@ -132,22 +107,17 @@ { "a": "attr", "t": "arenacoin", - "n": 16 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 20 } ], "png": "wp_icon_bydw02", - "k_value": 8 + "k_value": 30 }, { "lv_id": 7, - "score_low": 2800, - "score_up": 3199, - "human_num": 4, + "score_low": 3700, + "score_up": 4599, + "human_num": 5, "name": { "key": "arena_active_reward_name_7", "text": "大师" @@ -156,22 +126,17 @@ { "a": "attr", "t": "arenacoin", - "n": 18 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 22 } ], "png": "wp_icon_bydw02", - "k_value": 8 + "k_value": 30 }, { "lv_id": 8, - "score_low": 3200, - "score_up": 99999999, - "human_num": 4, + "score_low": 4600, + "score_up": 999999, + "human_num": 5, "name": { "key": "arena_active_reward_name_8", "text": "王者" @@ -180,15 +145,10 @@ { "a": "attr", "t": "arenacoin", - "n": 20 - }, - { - "a": "attr", - "t": "diamond", - "n": 5 + "n": 22 } ], "png": "wp_icon_bydw02", - "k_value": 8 + "k_value": 30 } ] \ No newline at end of file diff --git a/bin/json/game_arenachallengenpc.json b/bin/json/game_arenachallengenpc.json index e53a5d404..a23dbbf06 100644 --- a/bin/json/game_arenachallengenpc.json +++ b/bin/json/game_arenachallengenpc.json @@ -2,10 +2,10 @@ { "id": 1, "open_cond": 1, - "open_value": 10, + "open_value": 6, "BattleReadyID": 110, "monsterformat_id": [ - 101011, + 801010, 301027 ], "stroy_id_front": 201, @@ -18,22 +18,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 10 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 2, "open_cond": 1, - "open_value": 11, + "open_value": 8, "BattleReadyID": 110, "monsterformat_id": [ 101021 @@ -48,22 +53,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 10 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 3, "open_cond": 1, - "open_value": 12, + "open_value": 10, "BattleReadyID": 110, "monsterformat_id": [ 101031 @@ -78,22 +88,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 12 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 4, "open_cond": 1, - "open_value": 13, + "open_value": 12, "BattleReadyID": 110, "monsterformat_id": [ 101032 @@ -108,15 +123,20 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 12 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, @@ -138,22 +158,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 14 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 6, "open_cond": 1, - "open_value": 15, + "open_value": 16, "BattleReadyID": 110, "monsterformat_id": [ 101041 @@ -168,22 +193,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 14 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 7, "open_cond": 1, - "open_value": 16, + "open_value": 18, "BattleReadyID": 110, "monsterformat_id": [ 101041 @@ -198,22 +228,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 16 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 8, "open_cond": 1, - "open_value": 17, + "open_value": 20, "BattleReadyID": 110, "monsterformat_id": [ 101041 @@ -228,22 +263,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 16 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 9, "open_cond": 1, - "open_value": 18, + "open_value": 22, "BattleReadyID": 110, "monsterformat_id": [ 101041 @@ -258,22 +298,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 18 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 10, "open_cond": 1, - "open_value": 19, + "open_value": 24, "BattleReadyID": 110, "monsterformat_id": [ 101041 @@ -288,22 +333,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 18 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 11, "open_cond": 1, - "open_value": 20, + "open_value": 27, "BattleReadyID": 110, "monsterformat_id": [ 101041 @@ -318,22 +368,27 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 20 } ], "new_npc_reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] }, { "id": 12, "open_cond": 1, - "open_value": 21, + "open_value": 30, "BattleReadyID": 110, "monsterformat_id": [ 101041 @@ -348,135 +403,20 @@ "npc_reward": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "arenacoin", + "n": 20 } ], "new_npc_reward": [ { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 13, - "open_cond": 1, - "open_value": 22, - "BattleReadyID": 110, - "monsterformat_id": [ - 101041 - ], - "stroy_id_front": 201, - "stroy_id_after": 201, - "name": { - "key": "arena_challenge_npc_name_13", - "text": "王者守护者" - }, - "revive_cd": 24, - "npc_reward": [ + "a": "item", + "t": "10000001", + "n": 1 + }, { "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "new_npc_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 14, - "open_cond": 1, - "open_value": 23, - "BattleReadyID": 110, - "monsterformat_id": [ - 101041 - ], - "stroy_id_front": 201, - "stroy_id_after": 201, - "name": { - "key": "arena_challenge_npc_name_14", - "text": "隐秘守护者" - }, - "revive_cd": 24, - "npc_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "new_npc_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 15, - "open_cond": 1, - "open_value": 24, - "BattleReadyID": 110, - "monsterformat_id": [ - 101041 - ], - "stroy_id_front": 201, - "stroy_id_after": 201, - "name": { - "key": "arena_challenge_npc_name_15", - "text": "传说守护者" - }, - "revive_cd": 24, - "npc_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "new_npc_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 16, - "open_cond": 1, - "open_value": 25, - "BattleReadyID": 110, - "monsterformat_id": [ - 101041 - ], - "stroy_id_front": 201, - "stroy_id_after": 201, - "name": { - "key": "arena_challenge_npc_name_16", - "text": "神话守护者" - }, - "revive_cd": 24, - "npc_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ], - "new_npc_reward": [ - { - "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 30 } ] } diff --git a/bin/json/game_arenarankreward.json b/bin/json/game_arenarankreward.json index 1b708afdc..0247ba2e8 100644 --- a/bin/json/game_arenarankreward.json +++ b/bin/json/game_arenarankreward.json @@ -2,231 +2,210 @@ { "id": 1, "rank_low": 1, - "rank_up": 2, + "rank_up": 3, "rank_display": { "key": "arena_rank_reward_rank_display_1", - "text": "1-1名" + "text": "1-2名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 30000 + "t": "arenacoin", + "n": 800 }, { "a": "attr", "t": "diamond", - "n": 250 + "n": 600 } ] }, { "id": 2, - "rank_low": 2, - "rank_up": 3, + "rank_low": 4, + "rank_up": 10, "rank_display": { "key": "arena_rank_reward_rank_display_2", - "text": "2-2名" + "text": "4-9名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 28000 + "t": "arenacoin", + "n": 750 }, { "a": "attr", "t": "diamond", - "n": 230 + "n": 500 } ] }, { "id": 3, - "rank_low": 3, - "rank_up": 4, + "rank_low": 11, + "rank_up": 20, "rank_display": { "key": "arena_rank_reward_rank_display_3", - "text": "3-3名" + "text": "11-19名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 26000 + "t": "arenacoin", + "n": 700 }, { "a": "attr", "t": "diamond", - "n": 210 + "n": 400 } ] }, { "id": 4, - "rank_low": 4, - "rank_up": 11, + "rank_low": 21, + "rank_up": 50, "rank_display": { "key": "arena_rank_reward_rank_display_4", - "text": "4-10名" + "text": "21-49名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 24000 + "t": "arenacoin", + "n": 650 }, { "a": "attr", "t": "diamond", - "n": 190 + "n": 300 } ] }, { "id": 5, - "rank_low": 11, - "rank_up": 21, + "rank_low": 51, + "rank_up": 100, "rank_display": { "key": "arena_rank_reward_rank_display_5", - "text": "11-20名" + "text": "51-99名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 22000 + "t": "arenacoin", + "n": 600 }, { "a": "attr", "t": "diamond", - "n": 170 + "n": 280 } ] }, { "id": 6, - "rank_low": 21, - "rank_up": 51, + "rank_low": 101, + "rank_up": 200, "rank_display": { "key": "arena_rank_reward_rank_display_6", - "text": "21-50名" + "text": "101-199名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 20000 + "t": "arenacoin", + "n": 550 }, { "a": "attr", "t": "diamond", - "n": 150 + "n": 260 } ] }, { "id": 7, - "rank_low": 51, - "rank_up": 101, + "rank_low": 201, + "rank_up": 500, "rank_display": { "key": "arena_rank_reward_rank_display_7", - "text": "51-100名" + "text": "201-499名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 18000 + "t": "arenacoin", + "n": 500 }, { "a": "attr", "t": "diamond", - "n": 130 + "n": 240 } ] }, { "id": 8, - "rank_low": 101, - "rank_up": 201, + "rank_low": 501, + "rank_up": 1000, "rank_display": { "key": "arena_rank_reward_rank_display_8", - "text": "101-200名" + "text": "501-999名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 16000 + "t": "arenacoin", + "n": 450 }, { "a": "attr", "t": "diamond", - "n": 110 + "n": 220 } ] }, { "id": 9, - "rank_low": 201, - "rank_up": 501, + "rank_low": 1001, + "rank_up": 2000, "rank_display": { "key": "arena_rank_reward_rank_display_9", - "text": "201-500名" + "text": "1001-1999名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 14000 + "t": "arenacoin", + "n": 400 }, { "a": "attr", "t": "diamond", - "n": 90 + "n": 200 } ] }, { "id": 10, - "rank_low": 501, - "rank_up": 1001, + "rank_low": 2001, + "rank_up": 9999, "rank_display": { "key": "arena_rank_reward_rank_display_10", - "text": "501-1000名" + "text": "2001-9998名" }, "rank_reward": [ { "a": "attr", - "t": "gold", - "n": 12000 + "t": "arenacoin", + "n": 350 }, { "a": "attr", "t": "diamond", - "n": 70 - } - ] - }, - { - "id": 11, - "rank_low": 1001, - "rank_up": 100000000, - "rank_display": { - "key": "arena_rank_reward_rank_display_11", - "text": "1000+" - }, - "rank_reward": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 + "n": 180 } ] } diff --git a/bin/json/game_breakingbad.json b/bin/json/game_breakingbad.json index 108fe3211..33473205a 100644 --- a/bin/json/game_breakingbad.json +++ b/bin/json/game_breakingbad.json @@ -3,179 +3,983 @@ "delicacies": "14020000", "recipe": [], "Type": -1, - "flame": 1, + "flame": 10, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 } }, { "delicacies": "14020001", "recipe": [ { - "a": "14010005", - "n": 10 - }, - { - "a": "14010004", - "n": 10 + "a": "14010001", + "n": 20 } ], - "Type": 1, - "flame": 10, + "Type": 5, + "flame": 20, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 } }, { "delicacies": "14020002", "recipe": [ { - "a": "14010001", - "n": 10 - }, - { - "a": "14010005", - "n": 5 - } - ], - "Type": 2, - "flame": 10, - "unlockreward": { - "a": "attr", - "t": "diamond", - "n": 10 - } - }, - { - "delicacies": "14020003", - "recipe": [ - { - "a": "14010003", - "n": 10 - }, - { - "a": "14010005", - "n": 5 - } - ], - "Type": 2, - "flame": 5, - "unlockreward": { - "a": "attr", - "t": "diamond", - "n": 10 - } - }, - { - "delicacies": "14020004", - "recipe": [ - { - "a": "14010003", + "a": "14010011", "n": 20 } ], - "Type": 2, - "flame": 5, + "Type": 5, + "flame": 20, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 + } + }, + { + "delicacies": "14020020", + "recipe": [ + { + "a": "14010014", + "n": 20 + } + ], + "Type": 3, + "flame": 20, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 } }, { "delicacies": "14020005", "recipe": [ { - "a": "14010004", + "a": "14010008", "n": 20 } ], "Type": 1, - "flame": 5, + "flame": 20, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 + } + }, + { + "delicacies": "14020024", + "recipe": [ + { + "a": "14010012", + "n": 20 + } + ], + "Type": 5, + "flame": 20, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020025", + "recipe": [ + { + "a": "14010016", + "n": 20 + } + ], + "Type": 2, + "flame": 20, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020036", + "recipe": [ + { + "a": "14010006", + "n": 20 + } + ], + "Type": 4, + "flame": 20, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020040", + "recipe": [ + { + "a": "14010009", + "n": 20 + } + ], + "Type": 5, + "flame": 20, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020045", + "recipe": [ + { + "a": "14010015", + "n": 20 + } + ], + "Type": 3, + "flame": 20, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020048", + "recipe": [ + { + "a": "14010003", + "n": 20 + } + ], + "Type": 5, + "flame": 20, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020046", + "recipe": [ + { + "a": "14010001", + "n": 10 + }, + { + "a": "14010011", + "n": 10 + } + ], + "Type": 6, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020004", + "recipe": [ + { + "a": "14010001", + "n": 10 + }, + { + "a": "14010012", + "n": 10 + } + ], + "Type": 6, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020022", + "recipe": [ + { + "a": "14010016", + "n": 10 + }, + { + "a": "14010002", + "n": 10 + } + ], + "Type": 2, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020003", + "recipe": [ + { + "a": "14010011", + "n": 10 + }, + { + "a": "14010002", + "n": 10 + } + ], + "Type": 5, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 } }, { "delicacies": "14020006", "recipe": [ { - "a": "14010005", + "a": "14010014", + "n": 10 + }, + { + "a": "14010011", + "n": 10 + } + ], + "Type": 3, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020010", + "recipe": [ + { + "a": "14010015", + "n": 10 + }, + { + "a": "14010001", + "n": 10 + } + ], + "Type": 6, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020021", + "recipe": [ + { + "a": "14010014", "n": 10 }, { "a": "14010004", "n": 10 - }, - { - "a": "14010002", - "n": 5 } ], - "Type": 2, - "flame": 5, + "Type": 3, + "flame": 40, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 + } + }, + { + "delicacies": "14020016", + "recipe": [ + { + "a": "14010013", + "n": 10 + }, + { + "a": "14010001", + "n": 10 + } + ], + "Type": 6, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020026", + "recipe": [ + { + "a": "14010008", + "n": 10 + }, + { + "a": "14010013", + "n": 10 + } + ], + "Type": 1, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020028", + "recipe": [ + { + "a": "14010004", + "n": 10 + }, + { + "a": "14010008", + "n": 10 + } + ], + "Type": 4, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020030", + "recipe": [ + { + "a": "14010008", + "n": 10 + }, + { + "a": "14010001", + "n": 10 + } + ], + "Type": 5, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020031", + "recipe": [ + { + "a": "14010002", + "n": 10 + }, + { + "a": "14010001", + "n": 10 + } + ], + "Type": 1, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020032", + "recipe": [ + { + "a": "14010006", + "n": 10 + }, + { + "a": "14010001", + "n": 10 + } + ], + "Type": 3, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020033", + "recipe": [ + { + "a": "14010006", + "n": 10 + }, + { + "a": "14010011", + "n": 10 + } + ], + "Type": 3, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020034", + "recipe": [ + { + "a": "14010001", + "n": 10 + }, + { + "a": "14010008", + "n": 10 + } + ], + "Type": 6, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020035", + "recipe": [ + { + "a": "14010008", + "n": 10 + }, + { + "a": "14010012", + "n": 10 + } + ], + "Type": 1, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020042", + "recipe": [ + { + "a": "14010007", + "n": 10 + }, + { + "a": "14010008", + "n": 10 + } + ], + "Type": 4, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020043", + "recipe": [ + { + "a": "14010010", + "n": 10 + }, + { + "a": "14010015", + "n": 10 + } + ], + "Type": 2, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020049", + "recipe": [ + { + "a": "14010014", + "n": 10 + }, + { + "a": "14010007", + "n": 10 + } + ], + "Type": 4, + "flame": 40, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 } }, { "delicacies": "14020007", "recipe": [ { - "a": "14010005", - "n": 20 + "a": "14010015", + "n": 7 + }, + { + "a": "14010001", + "n": 7 + }, + { + "a": "14010011", + "n": 6 } ], - "Type": 1, - "flame": 5, + "Type": 6, + "flame": 60, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 + } + }, + { + "delicacies": "14020017", + "recipe": [ + { + "a": "14010015", + "n": 7 + }, + { + "a": "14010001", + "n": 7 + }, + { + "a": "14010006", + "n": 6 + } + ], + "Type": 6, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020018", + "recipe": [ + { + "a": "14010015", + "n": 7 + }, + { + "a": "14010001", + "n": 7 + }, + { + "a": "14010010", + "n": 6 + } + ], + "Type": 6, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020019", + "recipe": [ + { + "a": "14010015", + "n": 7 + }, + { + "a": "14010004", + "n": 7 + }, + { + "a": "14010001", + "n": 6 + } + ], + "Type": 6, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020023", + "recipe": [ + { + "a": "14010013", + "n": 7 + }, + { + "a": "14010008", + "n": 7 + }, + { + "a": "14010001", + "n": 6 + } + ], + "Type": 1, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 } }, { "delicacies": "14020008", "recipe": [ { - "a": "14010002", - "n": 10 + "a": "14010015", + "n": 7 }, { - "a": "14010005", - "n": 10 + "a": "14010001", + "n": 7 + }, + { + "a": "14010013", + "n": 6 } ], - "Type": 1, - "flame": 5, + "Type": 6, + "flame": 60, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 } }, { "delicacies": "14020009", "recipe": [ { - "a": "14010001", - "n": 20 + "a": "14010015", + "n": 7 + }, + { + "a": "14010002", + "n": 7 + }, + { + "a": "14010011", + "n": 6 } ], - "Type": 1, - "flame": 5, + "Type": 3, + "flame": 60, "unlockreward": { "a": "attr", "t": "diamond", - "n": 5 + "n": 30 + } + }, + { + "delicacies": "14020011", + "recipe": [ + { + "a": "14010011", + "n": 7 + }, + { + "a": "14010013", + "n": 7 + }, + { + "a": "14010001", + "n": 6 + } + ], + "Type": 1, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020012", + "recipe": [ + { + "a": "14010007", + "n": 7 + }, + { + "a": "14010006", + "n": 7 + }, + { + "a": "14010015", + "n": 6 + } + ], + "Type": 4, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020013", + "recipe": [ + { + "a": "14010001", + "n": 7 + }, + { + "a": "14010016", + "n": 7 + }, + { + "a": "14010004", + "n": 6 + } + ], + "Type": 3, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020014", + "recipe": [ + { + "a": "14010015", + "n": 7 + }, + { + "a": "14010005", + "n": 7 + }, + { + "a": "14010001", + "n": 6 + } + ], + "Type": 3, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020015", + "recipe": [ + { + "a": "14010016", + "n": 7 + }, + { + "a": "14010001", + "n": 7 + }, + { + "a": "14010006", + "n": 6 + } + ], + "Type": 6, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020037", + "recipe": [ + { + "a": "14010007", + "n": 7 + }, + { + "a": "14010008", + "n": 7 + }, + { + "a": "14010001", + "n": 6 + } + ], + "Type": 2, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020038", + "recipe": [ + { + "a": "14010007", + "n": 7 + }, + { + "a": "14010009", + "n": 7 + }, + { + "a": "14010008", + "n": 6 + } + ], + "Type": 4, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020039", + "recipe": [ + { + "a": "14010010", + "n": 7 + }, + { + "a": "14010001", + "n": 7 + }, + { + "a": "14010008", + "n": 6 + } + ], + "Type": 3, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020041", + "recipe": [ + { + "a": "14010011", + "n": 7 + }, + { + "a": "14010016", + "n": 7 + }, + { + "a": "14010012", + "n": 6 + } + ], + "Type": 3, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020044", + "recipe": [ + { + "a": "14010010", + "n": 7 + }, + { + "a": "14010005", + "n": 7 + }, + { + "a": "14010006", + "n": 6 + } + ], + "Type": 4, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 + } + }, + { + "delicacies": "14020047", + "recipe": [ + { + "a": "14010013", + "n": 7 + }, + { + "a": "14010010", + "n": 7 + }, + { + "a": "14010005", + "n": 6 + } + ], + "Type": 2, + "flame": 60, + "unlockreward": { + "a": "attr", + "t": "diamond", + "n": 30 } } ] \ No newline at end of file diff --git a/bin/json/game_breakingbadtag.json b/bin/json/game_breakingbadtag.json index ca9d8546e..25d36dfb4 100644 --- a/bin/json/game_breakingbadtag.json +++ b/bin/json/game_breakingbadtag.json @@ -2,15 +2,43 @@ { "Type": 1, "TagName": { - "key": "breakingbad_gourmettag_TagName_1", - "text": "主食" + "key": "breakingbad_gourmet_TagName_1", + "text": "点心" } }, { "Type": 2, "TagName": { - "key": "breakingbad_gourmettag_TagName_2", - "text": "炒菜" + "key": "breakingbad_gourmet_TagName_2", + "text": "凉菜" + } + }, + { + "Type": 3, + "TagName": { + "key": "breakingbad_gourmet_TagName_3", + "text": "热菜" + } + }, + { + "Type": 4, + "TagName": { + "key": "breakingbad_gourmet_TagName_4", + "text": "汤" + } + }, + { + "Type": 5, + "TagName": { + "key": "breakingbad_gourmet_TagName_5", + "text": "饮料" + } + }, + { + "Type": 6, + "TagName": { + "key": "breakingbad_gourmet_TagName_6", + "text": "主食" } } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index fc4415028..33985c781 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -733,6 +733,18 @@ "buzkashi_bumpdis": 5, "stamina_potion": 10000003, "fight_ps": 3, - "player_bodychange": 20170 + "player_bodychange": 20160, + "mryl_reward": [ + { + "a": "attr", + "t": "ps", + "n": 30 + }, + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 95e98c299..c4f5a445f 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -4546,7 +4546,7 @@ "race": 4, "job": 3, "type": 1, - "ip": 7, + "ip": 6, "sd": 1, "handbook": -1, "prefab": "44004", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index c5bdffdcb..8a0be1be1 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -28911,7 +28911,7 @@ "Argu": [ 1, 4, - 2600 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -29205,7 +29205,7 @@ "Argu": [ 1, 4, - 12000 + 1500 ], "FollowSK": [], "SucFollowSK": [], @@ -29263,30 +29263,6 @@ "RevisiCondition": "", "RevisiParams": [] }, - { - "Id": 255007215, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001451, - 1000, - 1, - -1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, { "Id": 255007311, "EmitPR": 1000, @@ -29373,8 +29349,8 @@ "Type": 2, "Argu": [ 455007314, - 1, - 1 + -1, + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -29459,6 +29435,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 255007318, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001451, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 253003111, "EmitPR": 1000, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index e2c043bf2..fbf66cf7f 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -22010,8 +22010,7 @@ "ChildSkill": { "Id": [ 255007211, - 255007213, - 255007215 + 255007213 ] }, "Desc": { @@ -22043,12 +22042,13 @@ 255007311, 255007312, 255007313, - 255007314 + 255007314, + 255007318 ] }, "Desc": { "key": "skill_skill_atk_Desc_155007311_1", - "text": "冰霜泰坦拥有多层生命值,且[color=#37d8a9]免疫[/color]行动值下降效果,自身每次受到的伤害不会超过自身最大生命值的35%[/color]。并且冰霜泰坦损失一层生命值时,会获得[color=#37d8a9]冰霜宝石[/color],同时锁定最后一次对自身造成伤害的目标,对其施加[color=#c84a32]灾祸冰原[/color]状态,随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时,自身拥有增益状态,则降低目标25%生命上限。" + "text": "冰霜泰坦拥有多层生命值,且[color=#37d8a9]免疫[/color]行动值下降效果,自身每次受到的伤害不会超过自身最大生命值的25%[/color]。并且冰霜泰坦损失一层生命值时,会获得[color=#37d8a9]冰霜宝石[/color],同时锁定最后一次对自身造成伤害的目标,对其施加[color=#c84a32]灾祸冰原[/color]状态,随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时,自身拥有增益状态,则降低目标25%生命上限。" }, "buffid": [], "map": "" diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index eb69f50c6..534e8beaf 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -1547,7 +1547,7 @@ "Effect": [ 3 ], - "AddEffect": false, + "AddEffect": true, "RemoveType": false, "NotOverlay": 1, "OverlayTimes": 5, @@ -3077,7 +3077,7 @@ }, "BuffType": 0, "EffectArgu": [ - 350 + 250 ], "BufParNum": 0, "RelyCheckArgu": [], @@ -3238,7 +3238,7 @@ "AddEffect": false, "RemoveType": false, "NotOverlay": 0, - "OverlayTimes": 0, + "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", "buffIcon": "", diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index e14963ae9..a41cf396d 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -236,6 +236,7 @@ type GameGlobalData struct { StaminaPotion int32 FightPs int32 PlayerBodychange int32 + MrylReward []*Gameatn } const TypeId_GameGlobalData = 477542761 @@ -951,6 +952,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stamina_potion"].(float64); !_ok_ { err = errors.New("stamina_potion error"); return }; _v.StaminaPotion = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight_ps"].(float64); !_ok_ { err = errors.New("fight_ps error"); return }; _v.FightPs = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["player_bodychange"].(float64); !_ok_ { err = errors.New("player_bodychange error"); return }; _v.PlayerBodychange = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["mryl_reward"].([]interface{}); !_ok_ { err = errors.New("mryl_reward error"); return } + + _v.MrylReward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { 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 = DeserializeGameatn(_x_); err != nil { return } } + _v.MrylReward = append(_v.MrylReward, _list_v_) + } + } + return }