From 017be0ef1cfaf9e9362cbf932ca7b7ff9c710284 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 22 Aug 2023 11:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=AE=E8=82=A4=E6=8A=A5?= =?UTF-8?q?=E9=94=99fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 486 ++++- lua/app/config/arena_gift.lua | 88 +- lua/app/config/bounty_level.lua | 1622 ++++++++++++++++- lua/app/config/bounty_time.lua | 7 +- lua/app/config/chapter_board.lua | 48 +- lua/app/config/hero.lua | 3 +- lua/app/config/item.lua | 7 +- .../localization_global_const.lua | 14 +- lua/app/config/skill.lua | 70 +- lua/app/config/skill_rogue.lua | 15 +- lua/app/config/skin.lua | 28 +- lua/app/config/skin_skill.lua | 76 +- lua/app/config/strings/cn/global.lua | 7 +- lua/app/config/strings/cn/skill_rogue.lua | 4 +- lua/app/config/strings/en/skill_rogue.lua | 2 +- lua/app/config/strings/es/skill_rogue.lua | 2 +- lua/app/config/strings/id/skill_rogue.lua | 2 +- lua/app/config/strings/ja/skill_rogue.lua | 2 +- lua/app/config/strings/ko/skill_rogue.lua | 2 +- lua/app/config/strings/pt/skill_rogue.lua | 2 +- lua/app/config/strings/th/skill_rogue.lua | 2 +- lua/app/config/strings/vi/skill_rogue.lua | 2 +- lua/app/config/strings/zh/skill_rogue.lua | 2 +- lua/app/module/tips/tips_manager.lua | 2 +- 24 files changed, 2372 insertions(+), 123 deletions(-) diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 1b5cb023..f41bbdf3 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -429,8 +429,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=53001, + ["id_for_nothing"]="UwtcA2Q=", ["num"]=20, ["num_for_nothing"]="VAg=" }, @@ -1568,16 +1568,6 @@ local act_gift = { ["cd"]=1, ["value"]=1000 }, - [140403]={ - ["type"]=14, - ["recharge_id"]=11, - ["limit"]=1 - }, - [140404]={ - ["type"]=14, - ["recharge_id"]=12, - ["limit"]=1 - }, [130002]={ ["type"]=13, ["recharge_id"]=11, @@ -1685,9 +1675,479 @@ local act_gift = { }, ["limit"]=1, ["value"]=1100 + }, + [140403]={ + ["type"]=14, + ["recharge_id"]=11, + ["limit"]=1 + }, + [140404]={ + ["type"]=14, + ["recharge_id"]=12, + ["limit"]=1 + }, + [150102]={ + ["type"]=15, + ["parameter_pro"]={ + 0, + 10 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1001, + ["id_for_nothing"]="VwhcAg==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150202]={ + ["type"]=15, + ["parameter_pro"]={ + 20, + 30 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1001, + ["id_for_nothing"]="VwhcAg==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150302]={ + ["type"]=15, + ["parameter_pro"]={ + 40, + 50 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6800, + ["num_for_nothing"]="UABcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150402]={ + ["type"]=15, + ["parameter_pro"]={ + 60, + 70 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6800, + ["num_for_nothing"]="UABcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150502]={ + ["type"]=15, + ["parameter_pro"]={ + 80, + 90 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=7200, + ["num_for_nothing"]="UQpcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160102]={ + ["type"]=16, + ["parameter_pro"]={ + 0, + 10 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=38, + ["id_for_nothing"]="VQA=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160202]={ + ["type"]=16, + ["parameter_pro"]={ + 20, + 30 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=38, + ["id_for_nothing"]="VQA=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160302]={ + ["type"]=16, + ["parameter_pro"]={ + 40, + 50 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6800, + ["num_for_nothing"]="UABcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160402]={ + ["type"]=16, + ["parameter_pro"]={ + 60, + 70 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6800, + ["num_for_nothing"]="UABcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160502]={ + ["type"]=16, + ["parameter_pro"]={ + 80, + 90 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=7200, + ["num_for_nothing"]="UQpcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 } } local config = { -data=act_gift,count=56 +data=act_gift,count=66 } return config \ No newline at end of file diff --git a/lua/app/config/arena_gift.lua b/lua/app/config/arena_gift.lua index 2aa1aa44..f1b0a5d8 100644 --- a/lua/app/config/arena_gift.lua +++ b/lua/app/config/arena_gift.lua @@ -1,5 +1,5 @@ local arena_gift = { - [101]={ + [1]={ ["score"]=950, ["reward"]={ { @@ -12,7 +12,7 @@ local arena_gift = { } } }, - [102]={ + [2]={ ["score"]=1000, ["reward"]={ { @@ -25,7 +25,7 @@ local arena_gift = { } } }, - [103]={ + [3]={ ["score"]=1050, ["reward"]={ { @@ -38,7 +38,7 @@ local arena_gift = { } } }, - [104]={ + [4]={ ["score"]=1100, ["reward"]={ { @@ -54,7 +54,7 @@ local arena_gift = { 54003 } }, - [105]={ + [5]={ ["score"]=1150, ["reward"]={ { @@ -67,7 +67,7 @@ local arena_gift = { } } }, - [106]={ + [6]={ ["score"]=1200, ["reward"]={ { @@ -83,7 +83,7 @@ local arena_gift = { 34003 } }, - [107]={ + [7]={ ["score"]=1250, ["reward"]={ { @@ -96,7 +96,7 @@ local arena_gift = { } } }, - [108]={ + [8]={ ["score"]=1300, ["reward"]={ { @@ -109,7 +109,7 @@ local arena_gift = { } } }, - [109]={ + [9]={ ["score"]=1350, ["reward"]={ { @@ -122,7 +122,7 @@ local arena_gift = { } } }, - [110]={ + [10]={ ["score"]=1400, ["reward"]={ { @@ -138,7 +138,7 @@ local arena_gift = { 24003 } }, - [111]={ + [11]={ ["score"]=1450, ["reward"]={ { @@ -151,7 +151,7 @@ local arena_gift = { } } }, - [112]={ + [12]={ ["score"]=1500, ["reward"]={ { @@ -164,7 +164,7 @@ local arena_gift = { } } }, - [113]={ + [13]={ ["score"]=1550, ["reward"]={ { @@ -177,7 +177,7 @@ local arena_gift = { } } }, - [114]={ + [14]={ ["score"]=1600, ["reward"]={ { @@ -190,7 +190,7 @@ local arena_gift = { } } }, - [115]={ + [15]={ ["score"]=1650, ["reward"]={ { @@ -203,7 +203,7 @@ local arena_gift = { } } }, - [116]={ + [16]={ ["score"]=1700, ["reward"]={ { @@ -216,7 +216,7 @@ local arena_gift = { } } }, - [117]={ + [17]={ ["score"]=1750, ["reward"]={ { @@ -229,7 +229,7 @@ local arena_gift = { } } }, - [118]={ + [18]={ ["score"]=1800, ["reward"]={ { @@ -242,7 +242,7 @@ local arena_gift = { } } }, - [119]={ + [19]={ ["score"]=1850, ["reward"]={ { @@ -255,7 +255,7 @@ local arena_gift = { } } }, - [120]={ + [20]={ ["score"]=1900, ["reward"]={ { @@ -268,7 +268,7 @@ local arena_gift = { } } }, - [121]={ + [21]={ ["score"]=1950, ["reward"]={ { @@ -281,7 +281,7 @@ local arena_gift = { } } }, - [122]={ + [22]={ ["score"]=2000, ["reward"]={ { @@ -294,7 +294,7 @@ local arena_gift = { } } }, - [123]={ + [23]={ ["score"]=2050, ["reward"]={ { @@ -307,7 +307,7 @@ local arena_gift = { } } }, - [124]={ + [24]={ ["score"]=2100, ["reward"]={ { @@ -320,7 +320,7 @@ local arena_gift = { } } }, - [125]={ + [25]={ ["score"]=2150, ["reward"]={ { @@ -333,7 +333,7 @@ local arena_gift = { } } }, - [126]={ + [26]={ ["score"]=2200, ["reward"]={ { @@ -346,7 +346,7 @@ local arena_gift = { } } }, - [127]={ + [27]={ ["score"]=2250, ["reward"]={ { @@ -359,7 +359,7 @@ local arena_gift = { } } }, - [128]={ + [28]={ ["score"]=2300, ["reward"]={ { @@ -372,7 +372,7 @@ local arena_gift = { } } }, - [129]={ + [29]={ ["score"]=2350, ["reward"]={ { @@ -385,7 +385,7 @@ local arena_gift = { } } }, - [130]={ + [30]={ ["score"]=2400, ["reward"]={ { @@ -398,7 +398,7 @@ local arena_gift = { } } }, - [131]={ + [31]={ ["score"]=2450, ["reward"]={ { @@ -411,7 +411,7 @@ local arena_gift = { } } }, - [132]={ + [32]={ ["score"]=2500, ["reward"]={ { @@ -424,7 +424,7 @@ local arena_gift = { } } }, - [133]={ + [33]={ ["score"]=2550, ["reward"]={ { @@ -437,7 +437,7 @@ local arena_gift = { } } }, - [134]={ + [34]={ ["score"]=2600, ["reward"]={ { @@ -450,7 +450,7 @@ local arena_gift = { } } }, - [135]={ + [35]={ ["score"]=2650, ["reward"]={ { @@ -463,7 +463,7 @@ local arena_gift = { } } }, - [136]={ + [36]={ ["score"]=2700, ["reward"]={ { @@ -476,7 +476,7 @@ local arena_gift = { } } }, - [137]={ + [37]={ ["score"]=2750, ["reward"]={ { @@ -489,7 +489,7 @@ local arena_gift = { } } }, - [138]={ + [38]={ ["score"]=2800, ["reward"]={ { @@ -502,7 +502,7 @@ local arena_gift = { } } }, - [139]={ + [39]={ ["score"]=2850, ["reward"]={ { @@ -515,7 +515,7 @@ local arena_gift = { } } }, - [140]={ + [40]={ ["score"]=2900, ["reward"]={ { @@ -528,7 +528,7 @@ local arena_gift = { } } }, - [141]={ + [41]={ ["score"]=2950, ["reward"]={ { @@ -541,7 +541,7 @@ local arena_gift = { } } }, - [142]={ + [42]={ ["score"]=3000, ["reward"]={ { @@ -554,7 +554,7 @@ local arena_gift = { } } }, - [143]={ + [43]={ ["score"]=3050, ["reward"]={ { @@ -567,7 +567,7 @@ local arena_gift = { } } }, - [144]={ + [44]={ ["score"]=3100, ["reward"]={ { diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua index a600c933..60b263ba 100644 --- a/lua/app/config/bounty_level.lua +++ b/lua/app/config/bounty_level.lua @@ -3238,9 +3238,1629 @@ local bounty_level = { ["num"]=1, ["num_for_nothing"]="Vw==" } + }, + [301]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [302]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [303]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [304]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [305]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [306]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [307]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [308]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [309]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [310]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_type"]=1 + }, + [311]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [312]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [313]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [314]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [315]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [316]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [317]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [318]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [319]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [320]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [321]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [322]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [323]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [324]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [325]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [326]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [327]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [328]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [329]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [330]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [331]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [332]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [333]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [334]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [335]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [336]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [337]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [338]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [339]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [340]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [341]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [342]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [343]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [344]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [345]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [346]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [347]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [348]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [349]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [350]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [351]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [352]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [353]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [354]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [355]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [356]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [357]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [358]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [359]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [360]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [361]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [362]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [363]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [364]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [365]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [366]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [367]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [368]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [369]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [370]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [371]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [372]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [373]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [374]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [375]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [376]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [377]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [378]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [379]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [380]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [381]={ + ["season"]=3, + ["exp"]=1000, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } } } local config = { -data=bounty_level,count=162 +data=bounty_level,count=243 } return config \ No newline at end of file diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua index a16f5d16..c254d8db 100644 --- a/lua/app/config/bounty_time.lua +++ b/lua/app/config/bounty_time.lua @@ -8,9 +8,14 @@ local bounty_time = { ["season"]=2, ["start_time"]="2023-8-1 00:00:00", ["end_time"]="2023-9-1 00:00:00" + }, + [3]={ + ["season"]=3, + ["start_time"]="2023-9-1 00:00:00", + ["end_time"]="2023-10-1 00:00:00" } } local config = { -data=bounty_time,count=2 +data=bounty_time,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index d909fea0..6630644e 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -16459,8 +16459,8 @@ local chapter_board = { 1 }, { - 22, - 1 + 0, + 0 }, { 0, @@ -16657,8 +16657,8 @@ local chapter_board = { 1 }, { - 22, - 1 + 0, + 0 }, { 0, @@ -17097,8 +17097,8 @@ local chapter_board = { 2 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17125,8 +17125,8 @@ local chapter_board = { 1 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17153,8 +17153,8 @@ local chapter_board = { 0 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17295,8 +17295,8 @@ local chapter_board = { 2 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17323,8 +17323,8 @@ local chapter_board = { 1 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17351,8 +17351,8 @@ local chapter_board = { 0 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -24575,8 +24575,8 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 1 }, { 0, @@ -24591,8 +24591,8 @@ local chapter_board = { 2 }, { - 1, - 0 + 0, + 1 }, { 1, @@ -24631,8 +24631,8 @@ local chapter_board = { 5 }, { - 0, - 0 + 23, + 5 }, { 27, @@ -24647,8 +24647,8 @@ local chapter_board = { 3 }, { - 0, - 0 + 23, + 5 }, { 23, diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 7c971e28..04f6c483 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -247,7 +247,8 @@ local hero = { ["is_show"]=1, ["collection_point"]=5, ["skin"]={ - 14001 + 14001, + 1400101 } }, [14002]={ diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 2ca8cd81..1340e41f 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1439,9 +1439,10 @@ local item = { } }, [44]={ - ["type"]=9, - ["qlt"]=5, - ["icon"]="44" + ["type"]=12, + ["parameter"]=1400101, + ["qlt"]=3, + ["icon"]="1400101" }, [45]={ ["type"]=10, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 594150ae..fbef534f 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -449,14 +449,12 @@ local LocalizationGlobalConst = ARENA_DESC_35 = "ARENA_DESC_35", ARENA_DESC_36 = "ARENA_DESC_36", ONE_KEY_GET_DESC = "ONE_KEY_GET_DESC", - - ["ACTIVITY_OVER_EDSC"] = "ACTIVITY_OVER_EDSC", - ["PART_IN_DESC"] = "PART_IN_DESC", - - ["HERO_FUND_DESCC_1"] = "HERO_FUND_DESCC_1", - ["HERO_FUND_DESCC_2"] = "HERO_FUND_DESCC_2", - ["HERO_FUND_DESCC_3"] = "HERO_FUND_DESCC_3", - ["HERO_FUND_DESCC_4"] = "HERO_FUND_DESCC_4" + ACTIVITY_OVER_EDSC = "ACTIVITY_OVER_EDSC", + PART_IN_DESC = "PART_IN_DESC", + HERO_FUND_DESCC_1 = "HERO_FUND_DESCC_1", + HERO_FUND_DESCC_2 = "HERO_FUND_DESCC_2", + HERO_FUND_DESCC_3 = "HERO_FUND_DESCC_3", + HERO_FUND_DESCC_4 = "HERO_FUND_DESCC_4", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 1d965735..82745a78 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -4571,7 +4571,7 @@ local skill = { ["type"]="lethargy", ["num"]=0, ["ratio"]=5000, - ["round"]=2 + ["round"]=1 } }, ["obj"]=2, @@ -4694,7 +4694,71 @@ local skill = { { ["type"]="lethargy", ["num"]=0, - ["ratio"]=5000, + ["ratio"]=8000, + ["round"]=2 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 4 + }, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound"]=34002200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=300109, + ["bullet_time"]={ + 1000, + 3000, + 400 + }, + ["fx_self_mirror"]=400109 + }, + [3400224]={ + ["buff_id"]={ + "lethargy" + }, + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=1, + ["skill_type"]=4, + ["boardrange"]={ + + }, + ["battle_icon"]="23", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=13000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=13000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=24000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="lethargy", + ["num"]=0, + ["ratio"]=8000, ["round"]=2 } }, @@ -27380,6 +27444,6 @@ local skill = { } } local config = { -data=skill,count=984 +data=skill,count=985 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index fdcb36c9..172f03d4 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -2223,11 +2223,11 @@ local skill_rogue = { ["skill_position"]=2, ["boardrange"]={ { - ["type"]=1, + ["type"]=3, ["range"]=2 }, { - ["type"]=2, + ["type"]=4, ["range"]=2 } }, @@ -2277,11 +2277,11 @@ local skill_rogue = { ["skill_position"]=2, ["boardrange"]={ { - ["type"]=3, + ["type"]=1, ["range"]=2 }, { - ["type"]=4, + ["type"]=2, ["range"]=2 } }, @@ -2967,10 +2967,9 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=16, + ["type"]=1, ["parameter"]={ - 4, - 3000 + 3400224 }, ["skill_position"]=3, ["icon"]="213" @@ -3013,6 +3012,8 @@ local skill_rogue = { ["icon"]="215" }, [3400207]={ + ["unlock"]=3400204, + ["cover_unlock"]=3400204, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 62a1eb9d..7a7e8837 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -23,6 +23,32 @@ local skin = { ["skin_point"]=0, ["hero_id"]=14001 }, + [1400101]={ + ["model_id"]="p0036", + ["qlt"]=3, + ["bonus"]={ + { + ["type"]="attr_skill_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_red", + ["num"]=1000 + } + }, + ["icon"]="skin_5", + ["got"]=1, + ["skin_point"]=10, + ["hero_id"]=14001, + ["item_id"]=44, + ["skill_show"]={ + 14001011, + 14001012, + 14001013, + 14001014, + 14001015 + } + }, [14002]={ ["model_id"]="p0018", ["qlt"]=1, @@ -285,6 +311,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index 4b309225..e972a867 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -302,9 +302,83 @@ local skin_skill = { ["fx_bg"]=300148, ["fx_self_mirror"]=400144, ["fx_bg_mirror"]=400148 + }, + [14001011]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300045, + ["fx_self_mirror"]=400078 + }, + [14001012]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300046, + ["fx_self_mirror"]=400079 + }, + [14001013]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=4, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300047, + ["fx_self_mirror"]=400080 + }, + [14001014]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300048, + ["fx_self_mirror"]=400081 + }, + [14001015]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound"]=14001200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=300049, + ["bullet_time"]={ + 1166, + 3000, + 200 + }, + ["fx_self_mirror"]=400082 } } local config = { -data=skin_skill,count=20 +data=skin_skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 6f0816b1..fc77a15e 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -449,13 +449,12 @@ local localization_global = ["ARENA_DESC_35"] = "可能出史诗哦~", ["ARENA_DESC_36"] = "试试手气", ["ONE_KEY_GET_DESC"] = "一键领取", - ["ACTIVITY_OVER_EDSC"] = "活动已结束", ["PART_IN_DESC"] = "参与", ["HERO_FUND_DESCC_1"] = "新活动月之祝福开启", - ["HERO_FUND_DESCC_2"] = "月之祝福标题", - ["HERO_FUND_DESCC_3"] = "月之祝福描述", - ["HERO_FUND_DESCC_4"] = "月之祝福前往14天乐描述" + ["HERO_FUND_DESCC_2"] = "月之祝福", + ["HERO_FUND_DESCC_3"] = "拥有月之祝福后，在战斗中累计通过波次可获得丰厚奖励。", + ["HERO_FUND_DESCC_4"] = "新活动14日达标开启", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 690c8169..33cc7e7d 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="流星追月链接4个元素或以上时，流星追月攻击将释放2次。" }, [3400200]={ - ["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，2回合。" + ["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，1回合。" }, [3400201]={ ["desc"]="美丽梦魇沿X方向可额外消除4格。" @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="美丽梦魇沿X方向可额外消除4格。" }, [3400204]={ - ["desc"]="美丽梦魇附加的昏睡效果，概率提升到80%。" + ["desc"]="美丽梦魇附加的昏睡效果，概率提升到80%，回合数+1。" }, [3400205]={ ["desc"]="Combo:梦魔普攻昏睡敌人将附加禁锢效果，2回合。" diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 3d1ab122..ba060ff9 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="When Moonchaser links to 4 or more elements, it will be cast 2 times." }, [3400200]={ - ["desc"]="Unlock Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict Drowsy that lasts 2 turns." + ["desc"]="Unlock Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict Drowsy that lasts 1 turns." }, [3400201]={ ["desc"]="Alluring Nightmare can clear additional 4 grids in the X direction." diff --git a/lua/app/config/strings/es/skill_rogue.lua b/lua/app/config/strings/es/skill_rogue.lua index 952a9129..ee4092ef 100644 --- a/lua/app/config/strings/es/skill_rogue.lua +++ b/lua/app/config/strings/es/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Cuando Espada de Fantasía enlaza 4 o más elementos, lanzará 2 ataques." }, [3400200]={ - ["desc"]="Desbloquea Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar Dormido durante 2 rondas." + ["desc"]="Desbloquea Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar Dormido durante 1 rondas." }, [3400201]={ ["desc"]="Pesadilla Hermosa elimina 4 bloques extras en direcciones de X." diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 3db100cd..ebc45b9f 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Saat Pemburu Bulan menautkan 4 atau lebih banyak elemen, maka ATK Pemburu Bulan akan dilepaskan sebanyak 2 kali." }, [3400200]={ - ["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek Kantuk selama 2 giliran." + ["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek Kantuk selama 1 giliran." }, [3400201]={ ["desc"]="Nightmare Z dapat menghapus 4 grid tambahan pada arah X." diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index ec9efe93..b41a523a 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="「ムーンチェイサー」は4つ以上の元素と繋がった時、ムーンチェイサーが2回発動する。" }, [3400200]={ - ["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に2ターン昏睡効果を付与する。" + ["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に1ターン昏睡効果を付与する。" }, [3400201]={ ["desc"]="「アリュールナイトメア」は追加でX方向4マスを消す。" diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 9f896f7e..c1373c46 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="유성과 달의 숨바꼭질이 4개 또는 그 이상의 원소를 연결하면 스킬 공격을 2번 방출합니다." }, [3400200]={ - ["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 2턴 동안 수면효과를 부여합니다." + ["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 1턴 동안 수면효과를 부여합니다." }, [3400201]={ ["desc"]="아름다운 악몽이 X 방향을 따라 추가로 4개의 그리드를 소멸합니다." diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index e7a6d536..cb57ab9b 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Ao conectar 4 ou mais elementos com a Disparada do Meteoro, esta habilidade é lançada 2 vezes." }, [3400200]={ - ["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito sono por 2 turnos." + ["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito sono por 1 turnos." }, [3400201]={ ["desc"]="Belo Pesadelo pode eliminar 4 quadrados adicionais na direção X." diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 6cd74a74..79af2a70 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="เมื่อดาวตกไล่ดวงจันทร์เชื่อมโยงธาตุ4อันหรือขึ้นไป การโจมตีของดาวตกไล่ดวงจันทร์จะปล่อย2ครั้ง" }, [3400200]={ - ["desc"]="ปลดล็อคฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์หลับ 2รอบ" + ["desc"]="ปลดล็อคฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์หลับ 1รอบ" }, [3400201]={ ["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม4ช่องตามทิศทาง X" diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 87cc582e..077ac6b4 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Sao Băng Siêu Tốc liên kết 4 Nguyên Tố trở lên, Sao Băng Siêu Tốc tấn công sẽ thi triển 2 lần." }, [3400200]={ - ["desc"]="Mở khóa Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều sát thương kỹ năng, 50% kèm hiệu quả Ngủ Say, 2 hiệp." + ["desc"]="Mở khóa Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều sát thương kỹ năng, 50% kèm hiệu quả Ngủ Say, 1 hiệp." }, [3400201]={ ["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm 4 ô." diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index db6ab76d..be561498 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="流星追月連接4個元素或以上時，流星追月攻擊將釋放2次。" }, [3400200]={ - ["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶昏睡效果，2回合。" + ["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶昏睡效果，1回合。" }, [3400201]={ ["desc"]="美麗夢魘沿X方向可額外消除4格。" diff --git a/lua/app/module/tips/tips_manager.lua b/lua/app/module/tips/tips_manager.lua index acbc13aa..059bfd01 100644 --- a/lua/app/module/tips/tips_manager.lua +++ b/lua/app/module/tips/tips_manager.lua @@ -48,7 +48,7 @@ function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignTyp return elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then -- 英雄皮肤 - ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(rewardId), true, nil, rewardId) + ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(info.parameter), true, nil, info.parameter) return elseif info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_BOX_ITEM or info.type == GConst.ItemConst.ITEM_TYPE.FIXED_BOX_ITEM then self:showBoxItemTips(rewardId)