diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index eed7f60a..2f349a01 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -269,7 +269,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["decr"]=1, - ["icon"]="normal_attack_dec" + ["icon"]="high" }, [38]={ ["name"]="block", @@ -343,19 +343,19 @@ local buff = { ["stack"]=1, ["decr"]=2, ["formula"]=4, - ["icon"]="shield" + ["icon"]="burn" }, [49]={ ["name"]="vulnerable", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="vulnerable" }, [50]={ ["name"]="frozen", ["buff_type"]=7, ["decr"]=2, - ["icon"]="shield", + ["icon"]="frozen", ["control_priority"]=1 }, [51]={ @@ -364,59 +364,59 @@ local buff = { ["stack"]=2, ["decr"]=2, ["formula"]=4, - ["icon"]="shield" + ["icon"]="poison" }, [52]={ ["name"]="imprison", ["buff_type"]=7, ["decr"]=2, - ["icon"]="shield", + ["icon"]="imprison", ["control_priority"]=4 }, [53]={ ["name"]="corrupt", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="corrupt" }, [54]={ ["name"]="bleed", ["buff_type"]=7, ["decr"]=2, ["formula"]=4, - ["icon"]="shield" + ["icon"]="bleed" }, [55]={ ["name"]="weaken", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="weaken" }, [56]={ ["name"]="lethargy", ["buff_type"]=8, ["stack"]=1, ["decr"]=2, - ["icon"]="shield", + ["icon"]="lethargy", ["control_priority"]=3 }, [57]={ ["name"]="curse", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="curse" }, [58]={ ["name"]="lock", ["buff_type"]=7, ["decr"]=2, - ["icon"]="shield" + ["icon"]="lock" }, [59]={ ["name"]="first_hand", ["buff_type"]=1, ["decr"]=1, - ["icon"]="shield" + ["icon"]="first_hand" }, [60]={ ["name"]="skill_hurt_add", @@ -428,20 +428,20 @@ local buff = { ["name"]="undead", ["buff_type"]=7, ["decr"]=1, - ["icon"]="shield" + ["icon"]="undead" }, [62]={ ["name"]="counterattack", ["buff_type"]=1, ["stack"]=1, ["decr"]=1, - ["icon"]="shield" + ["icon"]="counterattack" }, [63]={ ["name"]="thorns", ["buff_type"]=1, ["decr"]=1, - ["icon"]="shield" + ["icon"]="thorns" }, [64]={ ["name"]="dmg_dec_red_add", diff --git a/lua/app/config/buff_daily_challenge.lua b/lua/app/config/buff_daily_challenge.lua index 6e3b2c4c..acb758e7 100644 --- a/lua/app/config/buff_daily_challenge.lua +++ b/lua/app/config/buff_daily_challenge.lua @@ -69,10 +69,10 @@ local buff_daily_challenge = { ["buff_type"]=1, ["effect"]={ { - ["type"]="shield", - ["num"]=10000, - ["ratio"]=1000, - ["round"]=999 + ["type"]="wavehealp", + ["num"]=100, + ["ratio"]=10000, + ["round"]=0 } }, ["obj"]=1 @@ -81,27 +81,15 @@ local buff_daily_challenge = { ["buff_type"]=1, ["effect"]={ { - ["type"]="wavehealp", - ["num"]=100, - ["ratio"]=10000, - ["round"]=0 + ["type"]="cured_add", + ["num"]=500, + ["ratio"]=500, + ["round"]=999 } }, ["obj"]=1 }, [8]={ - ["buff_type"]=1, - ["effect"]={ - { - ["type"]="cured_add", - ["num"]=500, - ["ratio"]=500, - ["round"]=999 - } - }, - ["obj"]=1 - }, - [9]={ ["buff_type"]=1, ["effect"]={ { @@ -113,31 +101,7 @@ local buff_daily_challenge = { }, ["obj"]=1 }, - [10]={ - ["buff_type"]=1, - ["effect"]={ - { - ["type"]="cured_add", - ["num"]=500, - ["ratio"]=500, - ["round"]=999 - } - }, - ["obj"]=1 - }, - [11]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="hpp_add", - ["num"]=2000, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [12]={ + [9]={ ["buff_type"]=2, ["effect"]={ { @@ -149,7 +113,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [13]={ + [10]={ ["buff_type"]=2, ["effect"]={ { @@ -161,7 +125,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [14]={ + [11]={ ["buff_type"]=2, ["effect"]={ { @@ -173,7 +137,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [15]={ + [12]={ ["buff_type"]=2, ["effect"]={ { @@ -185,7 +149,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [16]={ + [13]={ ["buff_type"]=2, ["effect"]={ { @@ -197,43 +161,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [17]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="dec_dmg_all_add", - ["num"]=500, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [18]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="cured_dec", - ["num"]=1000, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [19]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="block", - ["num"]=500, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [20]={ + [14]={ ["buff_type"]=2, ["effect"]={ { @@ -247,6 +175,6 @@ local buff_daily_challenge = { } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 9bd76357..0a9bb764 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -456,7 +456,7 @@ local chapter = { }, ["mystery_box"]={ 1, - 3 + 4 }, ["mystery_box_reward"]={ { @@ -856,7 +856,7 @@ local chapter = { }, ["mystery_box"]={ 1, - 4 + 3 }, ["mystery_box_reward"]={ { @@ -1059,7 +1059,7 @@ local chapter = { }, ["mystery_box"]={ 2, - 3 + 4 }, ["mystery_box_reward"]={ { @@ -1277,8 +1277,8 @@ local chapter = { 13001 }, ["mystery_box"]={ - 1, - 4 + 2, + 3 }, ["mystery_box_reward"]={ { @@ -1496,7 +1496,7 @@ local chapter = { 15001 }, ["mystery_box"]={ - 3, + 2, 4 }, ["mystery_box_reward"]={ @@ -1715,8 +1715,8 @@ local chapter = { 17001 }, ["mystery_box"]={ - 2, - 3 + 1, + 4 }, ["mystery_box_reward"]={ { diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index ca0dcc85..c9f67b0a 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -1221,80 +1221,28 @@ local chapter_board = { 0 }, { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 3, 0 }, { 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, 3 }, { - 4, + 0, 2 }, { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 4, + 0, 3 }, { - 4, - 4 + 1, + 0 }, { - 4, - 4 + 1, + 0 }, { 1, @@ -1306,22 +1254,18 @@ local chapter_board = { }, { 0, - 0 + 2 }, { 0, - 0 + 3 }, { 0, - 0 + 2 }, { - 0, - 0 - }, - { - 0, + 3, 0 }, { @@ -1337,15 +1281,43 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { - 3, + 2, 0 }, { - 3, + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, 0 }, { @@ -1377,7 +1349,7 @@ local chapter_board = { 0 }, { - 3, + 1, 0 }, { @@ -1393,17 +1365,243 @@ local chapter_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 1, 0 @@ -1416,30 +1614,6 @@ local chapter_board = { }, [8]={ ["board"]={ - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, { 1, 0 @@ -1450,18 +1624,10 @@ local chapter_board = { }, { 0, - 1 - }, - { - 4, - 2 - }, - { - 4, 3 }, { - 4, + 0, 4 }, { @@ -1481,15 +1647,75 @@ local chapter_board = { 0 }, { - 0, + 1, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -1513,7 +1739,7 @@ local chapter_board = { 0 }, { - 3, + 14, 0 }, { @@ -1580,34 +1806,6 @@ local chapter_board = { 1, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 1, 0 @@ -1620,110 +1818,22 @@ local chapter_board = { 1, 0 }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, { 1, 0 }, - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, 3 }, { 0, - 2 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, 1 }, { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, + 0, 4 }, - { - 4, - 5 - }, { 1, 0 @@ -1732,53 +1842,25 @@ local chapter_board = { 1, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, { 1, 0 }, { 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 + 2 }, { 0, - 0 + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 }, { 1, @@ -1792,6 +1874,90 @@ local chapter_board = { 3, 0 }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 @@ -1804,10 +1970,42 @@ local chapter_board = { 3, 0 }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, { 3, 0 }, + { + 7, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -1820,82 +2018,26 @@ local chapter_board = { 1, 0 }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, { 0, 3 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, + 0, 4 }, { - 4, - 5 + 0, + 4 }, { - 4, - 1 - }, - { - 4, + 0, 2 }, + { + 0, + 1 + }, { 1, 0 @@ -1905,23 +2047,23 @@ local chapter_board = { 0 }, { - 0, + 2, 0 }, { 0, - 0 + 4 }, { 0, - 0 + 2 }, { 0, - 0 + 1 }, { - 0, + 2, 0 }, { @@ -1937,16 +2079,16 @@ local chapter_board = { 0 }, { - 3, - 0 + 0, + 2 }, { - 1, - 0 + 0, + 4 }, { - 3, - 0 + 0, + 1 }, { 2, @@ -1964,6 +2106,22 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 1, 0 @@ -1972,6 +2130,172 @@ local chapter_board = { 1, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -1980,6 +2304,78 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 1, 0 @@ -2022,23 +2418,23 @@ local chapter_board = { }, { 0, - 3 + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 + 2 }, { 1, @@ -2049,111 +2445,55 @@ local chapter_board = { 0 }, { - 0, - 4 + 4, + 1 }, { - 0, + 4, + 1 + }, + { + 4, 3 }, { - 0, - 4 + 4, + 2 }, { - 0, - 4 - }, - { - 0, - 3 + 4, + 2 }, { 1, 0 }, { - 5, + 1, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, 3 }, { - 3, - 0 - }, - { - 5, + 4, 4 }, { - 3, - 0 - }, - { - 5, - 3 - }, - { - 3, - 0 - }, - { - 5, - 3 - }, - { - 3, - 0 - }, - { - 5, + 4, 4 }, { - 3, - 0 - }, - { - 5, - 4 - }, - { - 3, - 0 - }, - { - 5, - 4 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -2189,23 +2529,79 @@ local chapter_board = { 0 }, { - 0, + 3, 0 }, { - 0, + 3, 0 }, { - 0, + 3, 0 }, { - 0, + 3, 0 }, { - 0, + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, 0 }, { @@ -2221,8 +2617,16 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 }, { 0, @@ -2233,40 +2637,36 @@ local chapter_board = { 4 }, { - 0, + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, 2 }, { - 1, - 0 + 4, + 2 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, + 4, 3 }, { - 0, - 2 - }, - { - 0, + 4, 4 }, { - 0, - 3 + 4, + 4 }, { - 0, - 3 + 1, + 0 }, { 1, @@ -2278,23 +2678,15 @@ local chapter_board = { }, { 0, - 4 + 0 }, { 0, - 2 + 0 }, { 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 + 0 }, { 1, @@ -2304,88 +2696,12 @@ local chapter_board = { 1, 0 }, - { - 5, - 2 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, { 1, 0 }, { - 2, - 0 - }, - { - 5, - 4 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 2 - }, - { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -2401,156 +2717,378 @@ local chapter_board = { 0 }, { - 3, + 1, 0 }, { - 3, + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 2, 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 } } }, [13]={ ["board"]={ { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 1 + 1, + 0 }, { 2, 0 }, { - 5, + 0, 2 }, { - 3, - 0 - }, - { - 5, + 0, 3 }, { - 5, - 5 - }, - { - 3, - 0 - }, - { - 5, - 1 + 0, + 2 }, { 2, 0 }, { - 5, + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, 2 }, { - 5, + 0, 3 }, { - 5, - 3 + 2, + 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 1, + 0 }, { - 5, + 2, 1 }, { - 5, + 3, + 2 + }, + { + 3, + 3 + }, + { + 3, 4 }, { - 5, - 4 - }, - { - 5, - 4 + 2, + 5 }, { 1, @@ -2560,28 +3098,80 @@ local chapter_board = { 1, 0 }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 1, + 0 + }, { 1, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 1, 0 }, { - 5, - 4 + 1, + 0 + }, + { + 0, + 0 }, { 3, 0 }, { - 5, - 4 + 3, + 0 }, { - 1, + 3, + 0 + }, + { + 0, 0 }, { @@ -2592,21 +3182,223 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ { 1, 0 }, { - 5, + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 1 + }, + { + 3, + 2 + }, + { + 3, + 3 + }, + { + 3, 4 }, { - 5, - 4 + 2, + 5 }, { - 5, - 4 + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 17, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 1, @@ -2626,35 +3418,7 @@ local chapter_board = { }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 3 + 1 }, { 0, @@ -2677,21 +3441,117 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 + 4, + 1 }, { 4, 2 }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, { 3, 0 }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 @@ -2704,80 +3564,12 @@ local chapter_board = { 1, 0 }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, { 1, 0 }, { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -2826,11 +3618,11 @@ local chapter_board = { }, { 0, - 1 + 4 }, { 0, - 1 + 4 }, { 0, @@ -2844,6 +3636,176 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ { 1, 0 @@ -2854,15 +3816,15 @@ local chapter_board = { }, { 0, - 2 + 4 }, { 0, - 2 + 4 }, { 0, - 2 + 3 }, { 0, @@ -2872,10 +3834,86 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, { 3, 0 }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, { 3, 0 @@ -2885,8 +3923,16 @@ local chapter_board = { 0 }, { - 4, - 1 + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 3, @@ -2933,84 +3979,28 @@ local chapter_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 4, - 1 - }, - { - 3, + 17, 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 }, { 1, 0 - }, - { - 1, - 0 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 2 } } }, @@ -3026,7 +4016,7 @@ local chapter_board = { }, { 0, - 5 + 3 }, { 0, @@ -3034,7 +4024,7 @@ local chapter_board = { }, { 0, - 5 + 2 }, { 1, @@ -3049,8 +4039,12 @@ local chapter_board = { 0 }, { - 2, - 0 + 0, + 3 + }, + { + 0, + 2 }, { 0, @@ -3058,14 +4052,66 @@ local chapter_board = { }, { 0, - 5 + 3 }, { 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, 4 }, { - 2, + 4, + 2 + }, + { + 4, + 4 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -3077,8 +4123,12 @@ local chapter_board = { 0 }, { - 2, - 0 + 5, + 2 + }, + { + 5, + 4 }, { 5, @@ -3101,39 +4151,15 @@ local chapter_board = { 0 }, { - 2, - 0 + 5, + 4 }, { - 3, - 0 + 5, + 2 }, { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 14, 0 }, { @@ -3142,23 +4168,7 @@ local chapter_board = { }, { 5, - 2 - }, - { - 5, - 2 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 + 4 }, { 2, @@ -3173,84 +4183,32 @@ local chapter_board = { 0 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 2, 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 } } }, [17]={ ["board"]={ - { - 1, - 0 - }, { 0, - 4 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 + 3 }, { 0, @@ -3258,7 +4216,7 @@ local chapter_board = { }, { 0, - 5 + 1 }, { 0, @@ -3269,11 +4227,63 @@ local chapter_board = { 3 }, { - 1, + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 2, 0 }, { - 1, + 5, + 2 + }, + { + 3, 0 }, { @@ -3284,132 +4294,310 @@ local chapter_board = { 5, 5 }, + { + 3, + 0 + }, { 5, - 4 + 1 + }, + { + 2, + 0 }, { 5, 2 }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, { 5, 1 }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, { 1, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 1, 0 }, { - 2, + 1, 0 }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 14, + 0 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, { 2, 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 5, + 2 }, { 3, 0 }, { - 2, - 0 + 5, + 3 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 5, + 5 }, { 3, 0 }, { - 2, - 0 + 5, + 1 }, { 2, 0 }, { - 2, + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 1, 0 }, { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 3, + 5, + 4 + }, + { + 17, 0 }, { - 2, + 5, + 4 + }, + { + 1, 0 }, { - 2, + 1, 0 }, { - 2, + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 1, 0 } } @@ -3421,39 +4609,7 @@ local chapter_board = { 0 }, { - 5, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 2, + 3, 0 }, { @@ -3462,94 +4618,130 @@ local chapter_board = { }, { 0, - 3 + 4 }, { 0, - 3 - }, - { - 0, - 1 + 4 }, { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 5, 1 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 5, 2 }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 5, - 1 - }, - { - 2, - 0 - }, { 5, 2 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 + 14, + 3 }, { 5, - 4 - }, - { - 2, - 0 + 3 }, { 5, - 5 + 3 }, { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -3557,27 +4749,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 5, - 5 - }, - { - 2, - 0 - }, - { - 3, + 1, 0 }, { @@ -3593,15 +4765,31 @@ local chapter_board = { 0 }, { - 3, + 1, 0 }, { - 3, + 1, 0 }, { - 3, + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { @@ -3621,47 +4809,23 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 3 }, { 0, - 2 + 1 }, { 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 + 1 }, { 0, - 2 + 3 }, { 0, - 5 - }, - { - 4, 4 }, { @@ -3673,11 +4837,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 4, + 0, 3 }, { @@ -3686,16 +4846,76 @@ local chapter_board = { }, { 0, - 5 + 2 }, { - 4, + 0, + 2 + }, + { + 0, 4 }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -3705,124 +4925,96 @@ local chapter_board = { 0 }, { - 4, - 3 + 3, + 0 }, { 4, 1 }, { - 4, - 1 + 3, + 0 }, { - 4, + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, 5 }, { - 0, - 0 + 5, + 5 }, { - 3, - 0 + 5, + 1 }, { - 3, - 0 + 5, + 3 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 + 5, + 3 }, { 1, 0 }, { - 3, + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 14, 0 }, { - 3, - 0 + 5, + 1 }, { - 3, - 0 + 5, + 3 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 5, + 1 } } }, [20]={ ["board"]={ + { + 1, + 0 + }, { 1, 0 }, { 0, - 3 + 5 }, { 0, @@ -3830,18 +5022,38 @@ local chapter_board = { }, { 0, - 2 + 5 }, { - 0, - 3 + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 }, { 0, 4 }, { - 1, + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, 0 }, { @@ -3849,87 +5061,51 @@ local chapter_board = { 0 }, { - 0, - 2 + 3, + 0 }, { - 0, - 2 + 2, + 0 }, { - 0, + 5, 3 }, { - 0, - 2 - }, - { - 0, + 5, 3 }, { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 4, + 5, 3 }, { - 4, - 2 + 2, + 0 }, { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, - 1 + 3, + 0 }, { 2, 0 }, { - 0, + 3, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, 0 }, { @@ -3937,7 +5113,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -3945,7 +5121,39 @@ local chapter_board = { 0 }, { - 3, + 2, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -3953,35 +5161,11 @@ local chapter_board = { 0 }, { - 0, + 2, 0 }, { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, + 2, 0 }, { @@ -3993,21 +5177,223 @@ local chapter_board = { 0 }, { - 0, + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 1, 0 }, { 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, 0 }, { 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, 0 }, { 1, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, { 1, 0 @@ -4017,25 +5403,29 @@ local chapter_board = { [21]={ ["board"]={ { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 2, + 1, 0 }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, { 1, 0 @@ -4054,15 +5444,15 @@ local chapter_board = { }, { 0, - 4 + 5 }, { 0, 3 }, { - 2, - 0 + 0, + 3 }, { 1, @@ -4073,115 +5463,39 @@ local chapter_board = { 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 5, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, + 0, 3 }, { 0, - 0 + 5 }, { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, + 0, 4 }, { 0, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 3 + 2 }, { 0, + 1 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -4189,7 +5503,55 @@ local chapter_board = { 0 }, { - 1, + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -4197,7 +5559,27 @@ local chapter_board = { 0 }, { - 3, + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -4205,11 +5587,15 @@ local chapter_board = { 0 }, { - 5, - 4 + 2, + 0 }, { - 1, + 2, + 0 + }, + { + 2, 0 } } @@ -4220,13 +5606,45 @@ local chapter_board = { 1, 0 }, + { + 5, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, { 0, 1 }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, { 0, - 3 + 4 }, { 0, @@ -4238,35 +5656,123 @@ local chapter_board = { }, { 0, + 1 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 5, 5 }, { - 1, + 2, + 0 + }, + { + 2, 0 }, { 1, 0 }, - { - 0, - 1 - }, - { - 0, - 2 - }, { 3, 0 }, { - 0, + 5, 4 }, { - 0, - 4 + 14, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 1, @@ -4277,19 +5783,61 @@ local chapter_board = { 0 }, { - 0, + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 5, 2 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 1, 0 }, { - 3, - 0 + 5, + 1 }, { - 3, + 2, 0 }, { @@ -4297,127 +5845,167 @@ local chapter_board = { 4 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 4 - }, - { - 3, - 0 - }, - { - 4, - 4 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 1 + 0, + 3 }, { 0, - 0 - }, - { - 4, - 4 - }, - { - 3, - 0 - }, - { - 4, - 4 + 3 }, { 0, - 0 - }, - { - 4, 1 }, - { - 4, - 1 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, { 3, 0 }, { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, + 5, 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 17, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 } } }, [23]={ ["board"]={ { - 2, + 1, + 0 + }, + { + 1, 0 }, { @@ -4426,78 +6014,18 @@ local chapter_board = { }, { 0, - 3 + 5 }, { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -4506,7 +6034,15 @@ local chapter_board = { }, { 4, - 4 + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 }, { 4, @@ -4516,16 +6052,64 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 3, + 0 + }, { 4, + 3 + }, + { + 0, + 2 + }, + { + 0, 5 }, + { + 4, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, { 4, 5 }, { - 1, + 0, + 0 + }, + { + 3, 0 }, { @@ -4541,7 +6125,7 @@ local chapter_board = { 0 }, { - 3, + 0, 0 }, { @@ -4557,15 +6141,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -4604,6 +6180,14 @@ local chapter_board = { 1, 0 }, + { + 14, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -4621,13 +6205,17 @@ local chapter_board = { 0 }, { - 4, - 2 + 0, + 3 }, { 0, 4 }, + { + 0, + 2 + }, { 0, 3 @@ -4636,138 +6224,340 @@ local chapter_board = { 0, 4 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, { 4, 2 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 2 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, { 4, 1 }, { 4, + 1 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, 2 }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 4, 3 }, { 4, - 4 + 2 }, { 4, - 5 + 1 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 }, { 3, 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 0, 0 }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -4784,20 +6574,12 @@ local chapter_board = { 1, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 0 }, { - 3, + 17, 0 }, { @@ -4817,8 +6599,8 @@ local chapter_board = { [25]={ ["board"]={ { - 1, - 0 + 0, + 3 }, { 0, @@ -4826,7 +6608,27 @@ local chapter_board = { }, { 0, - 2 + 3 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 }, { 0, @@ -4838,7 +6640,43 @@ local chapter_board = { }, { 0, - 2 + 3 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 4 }, { 1, @@ -4852,12 +6690,114 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, { 0, - 2 + 0 }, { - 4, + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, 3 }, { @@ -4865,71 +6805,51 @@ local chapter_board = { 4 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 + 0, + 3 }, { 0, 4 }, { - 4, - 2 + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 }, { 0, 3 }, { - 4, + 0, 4 }, { 0, - 2 + 3 }, { - 3, + 2, 0 }, { - 3, + 1, 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -4937,15 +6857,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 2, 0 }, { @@ -4953,7 +6865,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -4961,28 +6873,8 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 + 5, + 4 }, { 1, @@ -5000,6 +6892,78 @@ local chapter_board = { 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 17, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, { 1, 0 @@ -5008,6 +6972,22 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -5022,15 +7002,11 @@ local chapter_board = { }, { 0, - 5 + 1 }, { 0, - 4 - }, - { - 0, - 3 + 1 }, { 0, @@ -5038,62 +7014,10 @@ local chapter_board = { }, { 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, 3 }, { - 4, - 4 - }, - { - 4, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, + 0, 5 }, { @@ -5106,27 +7030,23 @@ local chapter_board = { }, { 0, + 1 + }, + { + 0, + 2 + }, + { + 3, 0 }, { 0, - 0 + 3 }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 + 5 }, { 1, @@ -5136,32 +7056,16 @@ local chapter_board = { 3, 0 }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, + 2 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -5170,182 +7074,186 @@ local chapter_board = { }, { 0, + 5 + }, + { + 3, 0 }, { 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, { 0, 0 }, { - 1, - 0 - }, - { - 1, - 0 + 4, + 4 }, { 3, 0 }, { - 1, + 4, + 4 + }, + { + 0, 0 }, { - 1, - 0 + 4, + 1 }, { - 1, - 0 + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 3 }, { 3, 0 }, { - 1, - 0 + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 1 } } }, [27]={ ["board"]={ { - 1, + 2, 0 }, { 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 4, - 3 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 4, - 3 - }, - { - 4, 2 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, 0 }, { 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, - { - 4, 2 }, { - 4, - 1 + 0, + 2 }, { - 3, + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -5356,6 +7264,50 @@ local chapter_board = { 2, 0 }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 1, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, { 3, 0 @@ -5368,20 +7320,16 @@ local chapter_board = { 0, 0 }, + { + 14, + 0 + }, { 0, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -5396,6 +7344,38 @@ local chapter_board = { 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -5421,8 +7401,8 @@ local chapter_board = { 0 }, { - 3, - 0 + 4, + 2 }, { 0, @@ -5430,15 +7410,15 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 0, 4 }, { - 3, - 0 + 4, + 2 }, { 1, @@ -5452,81 +7432,191 @@ local chapter_board = { 3, 0 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 3 }, { 0, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, 4 }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 4, + 2 + }, { 0, 4 }, { - 3, - 0 + 0, + 3 }, { - 3, - 0 + 0, + 4 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 + 4, + 2 }, { 1, @@ -5540,14 +7630,130 @@ local chapter_board = { 3, 0 }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, { 3, 0 }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, { 1, 0 @@ -5569,7 +7775,7 @@ local chapter_board = { 0 }, { - 0, + 17, 0 }, { @@ -5580,34 +7786,6 @@ local chapter_board = { 1, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, { 1, 0 @@ -5621,8 +7799,12 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 4 + }, + { + 0, + 2 }, { 0, @@ -5630,51 +7812,67 @@ local chapter_board = { }, { 0, + 4 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 4, 3 }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 4, + 2 + }, { 0, 3 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 4, + 4 }, { 0, - 5 - }, - { - 0, - 5 - }, - { - 5, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 + 2 }, { 3, @@ -5693,19 +7891,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, + 4, 1 }, { @@ -5720,50 +7906,14 @@ local chapter_board = { 3, 0 }, - { - 5, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 }, { - 3, + 2, 0 }, - { - 5, - 4 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 3 - }, { 3, 0 @@ -5777,8 +7927,40 @@ local chapter_board = { 0 }, { - 5, - 5 + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 1, @@ -5797,11 +7979,7 @@ local chapter_board = { 0 }, { - 5, - 2 - }, - { - 3, + 1, 0 }, { @@ -5816,9 +7994,13 @@ local chapter_board = { }, [30]={ ["board"]={ + { + 1, + 0 + }, { 0, - 3 + 5 }, { 0, @@ -5837,13 +8019,187 @@ local chapter_board = { 1 }, { - 5, - 2 + 1, + 0 }, { 1, 0 }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 5 + }, { 0, 4 @@ -5853,19 +8209,43 @@ local chapter_board = { 3 }, { - 5, + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 1 + }, + { + 4, 2 }, { - 2, - 0 + 4, + 3 }, { - 2, - 0 + 4, + 4 }, { - 2, + 4, + 5 + }, + { + 1, 0 }, { @@ -5873,55 +8253,27 @@ local chapter_board = { 0 }, { - 2, - 0 + 4, + 1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, + 4, 2 }, { - 3, + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, 0 }, { @@ -5929,27 +8281,31 @@ local chapter_board = { 0 }, { - 5, - 2 - }, - { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { @@ -5965,19 +8321,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -5988,13 +8332,33 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 5, - 2 + 17, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 1, @@ -6004,13 +8368,25 @@ local chapter_board = { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 }, { - 5, - 2 + 1, + 0 } } }, @@ -6021,23 +8397,23 @@ local chapter_board = { 0 }, { - 2, - 0 + 0, + 3 + }, + { + 0, + 1 }, { 0, 4 }, { - 0, - 2 + 1, + 0 }, { - 0, - 2 - }, - { - 2, + 1, 0 }, { @@ -6049,23 +8425,189 @@ local chapter_board = { 0 }, { - 2, + 3, 0 }, { 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, 2 }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, { 0, 3 }, + { + 0, + 1 + }, { 0, 4 }, { - 2, + 1, 0 }, { @@ -6073,95 +8615,111 @@ local chapter_board = { 0 }, { - 5, - 1 - }, - { - 2, + 1, 0 }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 5, - 1 - }, { 1, 0 }, { - 2, - 0 - }, - { - 2, + 3, 0 }, { 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, 3 }, { - 2, + 3, 0 }, { - 2, - 0 + 0, + 5 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, + 0, 1 }, { - 2, + 0, + 4 + }, + { + 1, 0 }, { - 2, + 3, 0 }, { - 2, + 4, + 3 + }, + { + 4, + 2 + }, + { + 3, 0 }, { - 5, + 0, + 5 + }, + { + 0, 1 }, { - 1, + 0, + 4 + }, + { + 3, 0 }, { - 1, - 0 + 4, + 1 }, { - 1, + 4, + 2 + }, + { + 4, + 1 + }, + { + 3, 0 }, { @@ -6173,7 +8731,19 @@ local chapter_board = { 0 }, { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 17, + 0 + }, + { + 0, 0 }, { @@ -6189,11 +8759,15 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 3, 0 }, { @@ -6224,17 +8798,45 @@ local chapter_board = { 3, 0 }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 }, { 0, - 5 + 4 }, { - 3, - 0 + 0, + 4 + }, + { + 0, + 4 }, { 3, @@ -6245,28 +8847,60 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 5, - 3 + 3, + 0 }, { - 5, + 0, 3 }, { 0, - 5 + 4 }, { - 5, - 3 + 0, + 4 }, { - 5, - 3 + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 1, @@ -6284,72 +8918,36 @@ local chapter_board = { 3, 0 }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 0, - 5 - }, - { - 3, 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 0, - 5 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, + 14, 0 }, { 0, - 5 - }, - { - 3, - 0 - }, - { - 3, 0 }, { @@ -6361,27 +8959,15 @@ local chapter_board = { 0 }, { - 5, - 1 - }, - { - 5, - 1 + 1, + 0 }, { 0, - 5 + 0 }, { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, + 0, 0 }, { @@ -6389,23 +8975,11 @@ local chapter_board = { 0 }, { - 1, + 0, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -6421,51 +8995,23 @@ local chapter_board = { 0 }, { - 2, + 1, 0 }, - { - 0, - 1 - }, { 0, 3 }, { 0, - 4 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 1 + 3 }, { 0, 3 }, { - 0, - 4 - }, - { - 2, + 1, 0 }, { @@ -6473,36 +9019,36 @@ local chapter_board = { 0 }, { - 5, - 1 + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 }, { 5, 5 }, - { - 5, - 1 - }, { 0, - 3 - }, - { - 5, - 4 - }, - { - 5, 5 }, { - 5, - 1 + 0, + 5 }, { - 5, - 2 + 1, + 0 + }, + { + 1, + 0 }, { 3, @@ -6524,84 +9070,112 @@ local chapter_board = { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 5, 2 }, { - 5, - 3 + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 5, 3 }, { - 5, - 4 + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 5, - 4 + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 }, { 5, - 4 + 2 }, { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -6617,64 +9191,16 @@ local chapter_board = { [34]={ ["board"]={ { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 3, + 1, 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { 0, - 1 + 2 }, { 0, @@ -6684,90 +9210,6 @@ local chapter_board = { 0, 4 }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 1, 0 @@ -6780,10 +9222,130 @@ local chapter_board = { 1, 0 }, + { + 5, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 5, + 3 + }, { 1, 0 }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -6804,6 +9366,216 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 17, + 0 + }, + { + 3, + 0 + }, { 1, 0 diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 7549ae23..e3e83f67 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -5,6 +5,7 @@ local func_open = { }, ["bounty_open"]={ ["stage"]=3, + ["pop_ups"]=1, ["icon"]="main_bounty" }, ["task"]={ @@ -16,7 +17,7 @@ local func_open = { ["icon"]="main_act_level_gift" }, ["idle_drop"]={ - ["stage"]=2, + ["stage"]=3, ["icon"]="main_idle_drop" }, ["act_sevenday"]={ @@ -24,7 +25,7 @@ local func_open = { ["icon"]="main_act_sevenday" }, ["mall"]={ - ["stage"]=1, + ["stage"]=2, ["icon"]="main_mall" }, ["mall_daily"]={ @@ -33,10 +34,12 @@ local func_open = { }, ["store_box_open"]={ ["stage"]=2, + ["pop_ups"]=1, ["icon"]="main_store_box" }, ["store_box_3_open"]={ ["stage"]=5, + ["pop_ups"]=1, ["icon"]="main_store_box_3" }, ["daily_challenge"]={ diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 5cb6d0b6..83b4e700 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -113,7 +113,7 @@ local hero = { ["model_id"]="p0014", ["icon"]="6", ["item_id"]=13001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=12, ["is_show"]=1 }, [13002]={ @@ -172,7 +172,7 @@ local hero = { ["model_id"]="p0009", ["icon"]="11", ["item_id"]=13002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=20, ["is_show"]=1 }, [14001]={ @@ -231,7 +231,7 @@ local hero = { ["model_id"]="p0011", ["icon"]="16", ["item_id"]=14001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=25, ["is_show"]=1 }, [22001]={ @@ -348,7 +348,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="12", ["item_id"]=23001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=16, ["is_show"]=1 }, [23002]={ @@ -407,7 +407,7 @@ local hero = { ["model_id"]="p0012", ["icon"]="7", ["item_id"]=23002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=9, ["is_show"]=1 }, [24001]={ @@ -466,7 +466,7 @@ local hero = { ["model_id"]="p0007", ["icon"]="17", ["item_id"]=24001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=21, ["is_show"]=1 }, [32001]={ @@ -583,7 +583,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="8", ["item_id"]=33001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=4, ["is_show"]=1 }, [33002]={ @@ -642,7 +642,7 @@ local hero = { ["model_id"]="p0020", ["icon"]="13", ["item_id"]=33002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=18, ["is_show"]=1 }, [34001]={ @@ -701,7 +701,7 @@ local hero = { ["model_id"]="p0016", ["icon"]="18", ["item_id"]=34001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=2, ["is_show"]=1 }, [42001]={ @@ -818,7 +818,7 @@ local hero = { ["model_id"]="p0022", ["icon"]="9", ["item_id"]=43001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=6, ["is_show"]=1 }, [43002]={ @@ -874,10 +874,10 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0003", + ["model_id"]="p0021", ["icon"]="14", ["item_id"]=43002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=14, ["is_show"]=1 }, [44001]={ @@ -936,7 +936,7 @@ local hero = { ["model_id"]="p0008", ["icon"]="19", ["item_id"]=44001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=10, ["is_show"]=1 }, [52001]={ @@ -995,7 +995,8 @@ local hero = { ["model_id"]="p0004", ["icon"]="5", ["item_id"]=52001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=2, + ["is_show"]=1 }, [53001]={ ["position"]=5, @@ -1053,7 +1054,7 @@ local hero = { ["model_id"]="p0015", ["icon"]="10", ["item_id"]=53001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=22, ["is_show"]=1 }, [53002]={ @@ -1109,10 +1110,10 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0004", + ["model_id"]="p0019", ["icon"]="15", ["item_id"]=53002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=8, ["is_show"]=1 }, [54001]={ @@ -1168,10 +1169,9 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0004", + ["model_id"]="p0023", ["icon"]="20", ["item_id"]=54001, - ["unlock_chapter"]=3, ["is_show"]=1 } } diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 30f40594..9b9b0621 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -145,6 +145,36 @@ local LocalizationGlobalConst = SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", FUNC_UNLOCK = "FUNC_UNLOCK", MAIN_BTN_3 = "MAIN_BTN_3", + SHOP_DESC_1 = "SHOP_DESC_1", + SHOP_DESC_2 = "SHOP_DESC_2", + SHOP_DESC_3 = "SHOP_DESC_3", + SHOP_DESC_4 = "SHOP_DESC_4", + SHOP_DESC_5 = "SHOP_DESC_5", + SHOP_DESC_6 = "SHOP_DESC_6", + SHOP_DESC_7 = "SHOP_DESC_7", + SHOP_DESC_8 = "SHOP_DESC_8", + SHOP_DESC_9 = "SHOP_DESC_9", + SHOP_DESC_10 = "SHOP_DESC_10", + SHOP_DESC_11 = "SHOP_DESC_11", + SHOP_DESC_12 = "SHOP_DESC_12", + SHOP_DESC_13 = "SHOP_DESC_13", + SHOP_DESC_14 = "SHOP_DESC_14", + SHOP_DESC_15 = "SHOP_DESC_15", + SHOP_DESC_16 = "SHOP_DESC_16", + SHOP_DESC_17 = "SHOP_DESC_17", + SHOP_DESC_18 = "SHOP_DESC_18", + SHOP_DESC_19 = "SHOP_DESC_19", + SHOP_DESC_20 = "SHOP_DESC_20", + SHOP_DESC_21 = "SHOP_DESC_21", + SHOP_DESC_22 = "SHOP_DESC_22", + SHOP_DESC_23 = "SHOP_DESC_23", + SHOP_DESC_24 = "SHOP_DESC_24", + SHOP_DESC_25 = "SHOP_DESC_25", + SHOP_DESC_26 = "SHOP_DESC_26", + SHOP_DESC_27 = "SHOP_DESC_27", + SHOP_DESC_28 = "SHOP_DESC_28", + SHOP_DESC_29 = "SHOP_DESC_29", + HERO_DESC_11 = "HERO_DESC_11", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 863abfc9..6122b768 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -395,11 +395,6 @@ local skill = { 2, 3 }, - ["block_time"]={ - 360, - 1360, - 2500 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -488,11 +483,6 @@ local skill = { 2, 3 }, - ["block_time"]={ - 360, - 1360, - 2500 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -711,13 +701,6 @@ local skill = { 4, 6 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1810 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -823,13 +806,6 @@ local skill = { 4, 6 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1810 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -973,10 +949,6 @@ local skill = { 1, 2 }, - ["block_time"]={ - 250, - 1400 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -1439,12 +1411,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510 - }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=5, @@ -1515,12 +1481,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510 - }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=5, @@ -1583,7 +1543,7 @@ local skill = { [2300125]={ ["position"]=2, ["effect_type"]=2, - ["trigger"]=8, + ["trigger"]=10, ["effect"]={ { ["type"]="atkp_yellow_add", @@ -1774,13 +1734,6 @@ local skill = { 4, 5 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1760 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -3963,12 +3916,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1760 - }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4146,12 +4093,29 @@ local skill = { ["effect"]={ { ["type"]="hurt_purple", - ["num"]=50000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=30000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4341,12 +4305,29 @@ local skill = { ["effect"]={ { ["type"]="hurt_purple", - ["num"]=60000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=15000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=35000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4386,12 +4367,29 @@ local skill = { ["effect"]={ { ["type"]="hurt_purple", - ["num"]=60000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=15000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=35000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4405,7 +4403,7 @@ local skill = { ["effect"]={ { ["type"]="skill_hurt_add", - ["num"]=5000, + ["num"]=1000, ["ratio"]=10000, ["round"]=999 } @@ -4925,9 +4923,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=1, ["cd"]=2, ["cd_start"]=0, @@ -4985,13 +4980,6 @@ local skill = { 4, 5 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1760 - }, ["skill_position"]=1, ["cd"]=3, ["cd_start"]=0, @@ -5045,9 +5033,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=2, ["cd"]=3, ["cd_start"]=0, @@ -5158,11 +5143,6 @@ local skill = { 2, 3 }, - ["block_time"]={ - 360, - 1360, - 2500 - }, ["skill_position"]=1, ["cd"]=3, ["cd_start"]=0, @@ -5247,9 +5227,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=2, ["cd"]=2, ["cd_start"]=0, @@ -5308,12 +5285,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510 - }, ["skill_position"]=2, ["cd"]=3, ["cd_start"]=0, @@ -5350,9 +5321,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=2, ["cd"]=2, ["cd_start"]=0, @@ -5488,13 +5456,6 @@ local skill = { 4, 6 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1810 - }, ["skill_position"]=1, ["cd"]=2, ["cd_start"]=0, @@ -5564,12 +5525,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1760 - }, ["skill_position"]=2, ["cd"]=3, ["cd_start"]=0, @@ -5600,9 +5555,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=2, ["name_act"]="skill01" @@ -5626,9 +5578,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5657,9 +5606,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5703,9 +5649,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5745,9 +5688,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5777,9 +5717,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=2, ["cd_start"]=1, ["shake_time"]=200, @@ -5809,9 +5746,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 2500 - }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01" @@ -5856,9 +5790,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 2500 - }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -5916,9 +5847,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5947,9 +5875,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -5979,9 +5904,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6016,9 +5938,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 03c8234e..5d85d128 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -686,7 +686,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=1, - ["icon"]="59" + ["icon"]="171" }, [1200101]={ ["limit_times"]=1, @@ -704,7 +704,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="43" + ["icon"]="31" }, [1200102]={ ["limit_times"]=1, @@ -721,7 +721,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="44" + ["icon"]="32" }, [1200103]={ ["limit_times"]=1, @@ -738,7 +738,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="44" + ["icon"]="33" }, [1200104]={ ["limit_times"]=1, @@ -764,7 +764,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="43" + ["icon"]="34" }, [1200105]={ ["limit_times"]=1, @@ -784,7 +784,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="35" }, [1200106]={ ["limit_times"]=1, @@ -801,7 +801,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="36" }, [1200107]={ ["unlock"]=1200105, @@ -823,7 +823,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="37" }, [1300100]={ ["limit_times"]=1, @@ -831,7 +831,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=1, - ["icon"]="59" + ["icon"]="176" }, [1300101]={ ["limit_times"]=1, @@ -848,7 +848,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="43" + ["icon"]="66" }, [1300102]={ ["limit_times"]=1, @@ -865,7 +865,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="44" + ["icon"]="67" }, [1300103]={ ["limit_times"]=1, @@ -876,7 +876,7 @@ local skill_rogue = { 1300123 }, ["skill_position"]=1, - ["icon"]="44" + ["icon"]="68" }, [1300104]={ ["unlock"]=1300101, @@ -895,7 +895,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="43" + ["icon"]="69" }, [1300105]={ ["limit_times"]=1, @@ -915,7 +915,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="70" }, [1300106]={ ["unlock"]=1300105, @@ -937,7 +937,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="71" }, [1300107]={ ["limit_times"]=1, @@ -954,14 +954,15 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="72" }, [1300200]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=1 + ["skill_position"]=1, + ["icon"]="181" }, [1300201]={ ["limit_times"]=1, @@ -979,7 +980,7 @@ local skill_rogue = { ["range"]=2 } }, - ["icon"]="36" + ["icon"]="101" }, [1300202]={ ["limit_times"]=1, @@ -996,7 +997,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="44" + ["icon"]="102" }, [1300203]={ ["limit_times"]=1, @@ -1007,7 +1008,7 @@ local skill_rogue = { 1300222 }, ["skill_position"]=1, - ["icon"]="36" + ["icon"]="103" }, [1300204]={ ["limit_times"]=1, @@ -1025,9 +1026,10 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="36" + ["icon"]="104" }, [1300205]={ + ["unlock"]=1300203, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1037,7 +1039,7 @@ local skill_rogue = { 5000 }, ["skill_position"]=1, - ["icon"]="36" + ["icon"]="105" }, [1300206]={ ["limit_times"]=1, @@ -1054,7 +1056,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="106" }, [1300207]={ ["limit_times"]=1, @@ -1077,14 +1079,15 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="107" }, [1400100]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=1 + ["skill_position"]=1, + ["icon"]="186" }, [1400101]={ ["limit_times"]=1, @@ -1101,7 +1104,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="136" }, [1400102]={ ["limit_times"]=1, @@ -1118,7 +1121,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="137" }, [1400103]={ ["limit_times"]=1, @@ -1135,7 +1138,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="138" }, [1400104]={ ["limit_times"]=1, @@ -1152,7 +1155,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="139" }, [1400105]={ ["unlock"]=1400101, @@ -1171,7 +1174,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="140" }, [1400106]={ ["limit_times"]=1, @@ -1188,7 +1191,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="141" }, [1400107]={ ["limit_times"]=1, @@ -1208,7 +1211,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="142" }, [2200100]={ ["limit_times"]=1, @@ -1216,7 +1219,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="56" + ["icon"]="172" }, [2200101]={ ["limit_times"]=1, @@ -1228,7 +1231,7 @@ local skill_rogue = { 30000 }, ["skill_position"]=2, - ["icon"]="65" + ["icon"]="38" }, [2200102]={ ["limit_times"]=1, @@ -1239,7 +1242,7 @@ local skill_rogue = { 2200123 }, ["skill_position"]=2, - ["icon"]="34" + ["icon"]="39" }, [2200103]={ ["limit_times"]=1, @@ -1256,7 +1259,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="44" + ["icon"]="40" }, [2200104]={ ["limit_times"]=1, @@ -1273,7 +1276,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="41" }, [2200105]={ ["limit_times"]=1, @@ -1290,7 +1293,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="36" + ["icon"]="42" }, [2200106]={ ["unlock"]=2200102, @@ -1317,7 +1320,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="45" + ["icon"]="43" }, [2200107]={ ["limit_times"]=1, @@ -1334,7 +1337,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="36" + ["icon"]="44" }, [2300100]={ ["limit_times"]=1, @@ -1342,7 +1345,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="56" + ["icon"]="182" }, [2300101]={ ["limit_times"]=1, @@ -1359,7 +1362,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="108" }, [2300102]={ ["limit_times"]=1, @@ -1370,7 +1373,7 @@ local skill_rogue = { 2300122 }, ["skill_position"]=2, - ["icon"]="51" + ["icon"]="109" }, [2300103]={ ["limit_times"]=1, @@ -1387,7 +1390,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="110" }, [2300104]={ ["unlock"]=2300101, @@ -1406,7 +1409,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="49" + ["icon"]="111" }, [2300105]={ ["limit_times"]=1, @@ -1419,11 +1422,11 @@ local skill_rogue = { ["type"]="add_skill", ["num"]=2300125, ["ratio"]=10000, - ["round"]=1 + ["round"]=0 } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="112" }, [2300106]={ ["unlock"]=2300103, @@ -1442,7 +1445,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="113" }, [2300107]={ ["limit_times"]=1, @@ -1459,7 +1462,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="114" }, [2300200]={ ["limit_times"]=1, @@ -1467,7 +1470,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="56" + ["icon"]="177" }, [2300201]={ ["limit_times"]=1, @@ -1493,7 +1496,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="51" + ["icon"]="73" }, [2300202]={ ["limit_times"]=1, @@ -1510,7 +1513,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="74" }, [2300203]={ ["limit_times"]=1, @@ -1527,7 +1530,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="45" + ["icon"]="75" }, [2300204]={ ["limit_times"]=1, @@ -1553,7 +1556,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="49" + ["icon"]="76" }, [2300205]={ ["limit_times"]=1, @@ -1573,7 +1576,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="77" }, [2300206]={ ["unlock"]=2300205, @@ -1595,7 +1598,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="78" }, [2300207]={ ["limit_times"]=1, @@ -1612,7 +1615,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="79" }, [2400100]={ ["limit_times"]=1, @@ -1620,7 +1623,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="61" + ["icon"]="187" }, [2400101]={ ["limit_times"]=1, @@ -1646,7 +1649,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="49" + ["icon"]="143" }, [2400102]={ ["limit_times"]=1, @@ -1663,7 +1666,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="50" + ["icon"]="144" }, [2400103]={ ["unlock"]=2400102, @@ -1682,7 +1685,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="145" }, [2400104]={ ["limit_times"]=1, @@ -1699,7 +1702,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="146" }, [2400105]={ ["limit_times"]=1, @@ -1710,7 +1713,7 @@ local skill_rogue = { 2400123 }, ["skill_position"]=2, - ["icon"]="49" + ["icon"]="147" }, [2400106]={ ["unlock"]=2400105, @@ -1723,7 +1726,7 @@ local skill_rogue = { 2400124 }, ["skill_position"]=2, - ["icon"]="50" + ["icon"]="148" }, [2400107]={ ["limit_times"]=1, @@ -1740,7 +1743,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="149" }, [3200100]={ ["limit_times"]=1, @@ -1748,7 +1751,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="55" + ["icon"]="173" }, [3200101]={ ["limit_times"]=1, @@ -1765,7 +1768,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="63" + ["icon"]="45" }, [3200102]={ ["limit_times"]=1, @@ -1782,7 +1785,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="64" + ["icon"]="46" }, [3200103]={ ["limit_times"]=1, @@ -1795,7 +1798,7 @@ local skill_rogue = { }, ["skill_position"]=3, ["obj"]=5, - ["icon"]="33" + ["icon"]="47" }, [3200104]={ ["limit_times"]=1, @@ -1830,7 +1833,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="55" + ["icon"]="48" }, [3200105]={ ["limit_times"]=1, @@ -1847,7 +1850,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="63" + ["icon"]="49" }, [3200106]={ ["unlock"]=3200105, @@ -1866,7 +1869,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="64" + ["icon"]="50" }, [3200107]={ ["limit_times"]=1, @@ -1883,7 +1886,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="33" + ["icon"]="51" }, [3300100]={ ["limit_times"]=1, @@ -1891,7 +1894,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="60" + ["icon"]="178" }, [3300101]={ ["limit_times"]=1, @@ -1903,7 +1906,7 @@ local skill_rogue = { 500 }, ["skill_position"]=3, - ["icon"]="67" + ["icon"]="80" }, [3300102]={ ["limit_times"]=1, @@ -1920,7 +1923,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="47" + ["icon"]="81" }, [3300103]={ ["limit_times"]=1, @@ -1946,7 +1949,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="67" + ["icon"]="82" }, [3300104]={ ["limit_times"]=1, @@ -1963,7 +1966,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="47" + ["icon"]="83" }, [3300105]={ ["limit_times"]=1, @@ -1980,7 +1983,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="48" + ["icon"]="84" }, [3300106]={ ["unlock"]=3300104, @@ -1999,7 +2002,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="47" + ["icon"]="85" }, [3300107]={ ["limit_times"]=1, @@ -2019,7 +2022,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="48" + ["icon"]="86" }, [3300200]={ ["limit_times"]=1, @@ -2027,7 +2030,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="183" }, [3300201]={ ["limit_times"]=1, @@ -2044,7 +2047,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="38" + ["icon"]="115" }, [3300202]={ ["limit_times"]=1, @@ -2061,7 +2064,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="38" + ["icon"]="116" }, [3300203]={ ["limit_times"]=1, @@ -2073,7 +2076,7 @@ local skill_rogue = { 30000 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="117" }, [3300204]={ ["limit_times"]=1, @@ -2084,7 +2087,7 @@ local skill_rogue = { 3300222 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="118" }, [3300205]={ ["unlock"]=3300204, @@ -2097,7 +2100,7 @@ local skill_rogue = { 5000 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="119" }, [3300206]={ ["limit_times"]=1, @@ -2114,7 +2117,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="38" + ["icon"]="120" }, [3300207]={ ["unlock"]=3300204, @@ -2127,7 +2130,7 @@ local skill_rogue = { 3300223 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="121" }, [3400100]={ ["limit_times"]=1, @@ -2135,7 +2138,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="67" + ["icon"]="188" }, [3400101]={ ["limit_times"]=1, @@ -2152,7 +2155,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="150" }, [3400102]={ ["limit_times"]=1, @@ -2178,7 +2181,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="67" + ["icon"]="151" }, [3400103]={ ["limit_times"]=1, @@ -2195,7 +2198,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="152" }, [3400104]={ ["unlock"]=3400101, @@ -2214,7 +2217,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="153" }, [3400105]={ ["limit_times"]=1, @@ -2231,7 +2234,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="154" }, [3400106]={ ["unlock"]=3400106, @@ -2250,7 +2253,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="155" }, [3400107]={ ["limit_times"]=1, @@ -2270,7 +2273,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="156" }, [4200100]={ ["limit_times"]=1, @@ -2278,7 +2281,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=4, - ["icon"]="57" + ["icon"]="174" }, [4200101]={ ["limit_times"]=1, @@ -2292,7 +2295,7 @@ local skill_rogue = { ["range"]=2 } }, - ["icon"]="39" + ["icon"]="52" }, [4200102]={ ["limit_times"]=1, @@ -2309,7 +2312,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="38" + ["icon"]="53" }, [4200103]={ ["limit_times"]=1, @@ -2326,7 +2329,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="45" + ["icon"]="54" }, [4200104]={ ["limit_times"]=1, @@ -2340,7 +2343,7 @@ local skill_rogue = { ["range"]=2 } }, - ["icon"]="39" + ["icon"]="55" }, [4200105]={ ["limit_times"]=1, @@ -2357,7 +2360,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="56" }, [4200106]={ ["limit_times"]=1, @@ -2374,7 +2377,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="45" + ["icon"]="57" }, [4200107]={ ["unlock"]=4200105, @@ -2393,7 +2396,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="58" }, [4300100]={ ["limit_times"]=1, @@ -2401,7 +2404,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=4, - ["icon"]="57" + ["icon"]="179" }, [4300101]={ ["limit_times"]=1, @@ -2427,7 +2430,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="39" + ["icon"]="87" }, [4300102]={ ["limit_times"]=1, @@ -2444,7 +2447,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="88" }, [4300103]={ ["limit_times"]=1, @@ -2456,7 +2459,7 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="45" + ["icon"]="89" }, [4300104]={ ["limit_times"]=1, @@ -2468,7 +2471,7 @@ local skill_rogue = { 30000 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="90" }, [4300105]={ ["limit_times"]=1, @@ -2485,7 +2488,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="91" }, [4300106]={ ["limit_times"]=1, @@ -2502,7 +2505,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="45" + ["icon"]="92" }, [4300107]={ ["unlock"]=4300106, @@ -2521,14 +2524,15 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="93" }, [4300300]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, + ["type"]=6, ["skill_position"]=4, - ["icon"]="57" + ["icon"]="184" }, [4300301]={ ["limit_times"]=1, @@ -2540,12 +2544,13 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="122" }, [4300302]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2556,7 +2561,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="123" }, [4300303]={ ["limit_times"]=1, @@ -2573,7 +2578,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="45" + ["icon"]="124" }, [4300304]={ ["unlock"]=4300302, @@ -2581,6 +2586,7 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2591,12 +2597,13 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="125" }, [4300305]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2607,7 +2614,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="126" }, [4300306]={ ["limit_times"]=1, @@ -2633,7 +2640,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="45" + ["icon"]="127" }, [4300307]={ ["unlock"]=4300305, @@ -2641,6 +2648,7 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2651,7 +2659,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="128" }, [4400100]={ ["limit_times"]=1, @@ -2659,7 +2667,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=4, - ["icon"]="62" + ["icon"]="189" }, [4400101]={ ["limit_times"]=1, @@ -2671,7 +2679,7 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="157" }, [4400102]={ ["limit_times"]=1, @@ -2688,7 +2696,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="158" }, [4400103]={ ["limit_times"]=1, @@ -2702,7 +2710,7 @@ local skill_rogue = { ["range"]=3 } }, - ["icon"]="39" + ["icon"]="159" }, [4400104]={ ["limit_times"]=1, @@ -2714,7 +2722,7 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="160" }, [4400105]={ ["limit_times"]=1, @@ -2731,7 +2739,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="161" }, [4400106]={ ["limit_times"]=1, @@ -2748,7 +2756,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="162" }, [4400107]={ ["unlock"]=4400105, @@ -2767,7 +2775,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="163" }, [5200100]={ ["limit_times"]=1, @@ -2775,7 +2783,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=5, - ["icon"]="58" + ["icon"]="175" }, [5200101]={ ["limit_times"]=1, @@ -2787,7 +2795,7 @@ local skill_rogue = { 600 }, ["skill_position"]=5, - ["icon"]="41" + ["icon"]="59" }, [5200102]={ ["limit_times"]=1, @@ -2804,7 +2812,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="44" + ["icon"]="60" }, [5200103]={ ["limit_times"]=1, @@ -2816,7 +2824,7 @@ local skill_rogue = { 1 }, ["skill_position"]=5, - ["icon"]="42" + ["icon"]="61" }, [5200104]={ ["limit_times"]=1, @@ -2842,7 +2850,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="67" + ["icon"]="62" }, [5200105]={ ["limit_times"]=1, @@ -2853,7 +2861,7 @@ local skill_rogue = { 5200121 }, ["skill_position"]=5, - ["icon"]="66" + ["icon"]="63" }, [5200106]={ ["limit_times"]=1, @@ -2870,7 +2878,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="64" }, [5200107]={ ["unlock"]=5200105, @@ -2882,7 +2890,7 @@ local skill_rogue = { 5200122 }, ["skill_position"]=5, - ["icon"]="66" + ["icon"]="65" }, [5300100]={ ["limit_times"]=1, @@ -2890,7 +2898,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=5, - ["icon"]="58" + ["icon"]="180" }, [5300101]={ ["limit_times"]=1, @@ -2907,7 +2915,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="41" + ["icon"]="94" }, [5300102]={ ["limit_times"]=1, @@ -2924,7 +2932,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="44" + ["icon"]="95" }, [5300103]={ ["limit_times"]=1, @@ -2941,7 +2949,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="42" + ["icon"]="96" }, [5300104]={ ["unlock"]=5300101, @@ -2960,7 +2968,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="67" + ["icon"]="97" }, [5300105]={ ["limit_times"]=1, @@ -2977,7 +2985,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="98" }, [5300106]={ ["unlock"]=5300105, @@ -2996,7 +3004,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="99" }, [5300107]={ ["limit_times"]=1, @@ -3013,7 +3021,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="100" }, [5300200]={ ["limit_times"]=1, @@ -3021,7 +3029,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=5, - ["icon"]="58" + ["icon"]="185" }, [5300201]={ ["limit_times"]=1, @@ -3047,7 +3055,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="41" + ["icon"]="129" }, [5300202]={ ["limit_times"]=1, @@ -3064,7 +3072,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="44" + ["icon"]="130" }, [5300203]={ ["limit_times"]=1, @@ -3073,10 +3081,10 @@ local skill_rogue = { ["type"]=7, ["parameter"]={ 1, - 30000 + 10000 }, ["skill_position"]=5, - ["icon"]="42" + ["icon"]="131" }, [5300204]={ ["limit_times"]=1, @@ -3093,7 +3101,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="67" + ["icon"]="132" }, [5300205]={ ["limit_times"]=1, @@ -3110,7 +3118,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="133" }, [5300206]={ ["unlock"]=5300202, @@ -3129,7 +3137,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="134" }, [5300207]={ ["unlock"]=5300205, @@ -3148,15 +3156,14 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="135" }, [5400100]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=5, - ["icon"]="58" + ["skill_position"]=5 }, [5400101]={ ["limit_times"]=1, @@ -3165,10 +3172,10 @@ local skill_rogue = { ["type"]=7, ["parameter"]={ 1, - 30000 + 10000 }, ["skill_position"]=5, - ["icon"]="41" + ["icon"]="190" }, [5400102]={ ["limit_times"]=1, @@ -3185,7 +3192,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="44" + ["icon"]="164" }, [5400103]={ ["limit_times"]=1, @@ -3202,7 +3209,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="42" + ["icon"]="165" }, [5400104]={ ["limit_times"]=1, @@ -3219,7 +3226,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="67" + ["icon"]="166" }, [5400105]={ ["limit_times"]=1, @@ -3230,7 +3237,7 @@ local skill_rogue = { 5400123 }, ["skill_position"]=5, - ["icon"]="66" + ["icon"]="167" }, [5400106]={ ["limit_times"]=1, @@ -3247,7 +3254,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="168" }, [5400107]={ ["limit_times"]=1, @@ -3264,7 +3271,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="169" } } local config = { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 308306ae..1ea9e591 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -145,6 +145,36 @@ local localization_global = ["SEVEN_DAY_DESC_2"] = "已完成任务数:{0}/{1}", ["FUNC_UNLOCK"] = "解锁新功能", ["MAIN_BTN_3"] = "商城", + ["SHOP_DESC_1"] = "普通宝箱", + ["SHOP_DESC_2"] = "精致宝箱", + ["SHOP_DESC_3"] = "珍贵宝箱", + ["SHOP_DESC_4"] = "无额外奖励加成", + ["SHOP_DESC_5"] = "开宝箱提升等级,增加宝箱奖励", + ["SHOP_DESC_6"] = "宝箱等级提升!", + ["SHOP_DESC_7"] = "立即打开", + ["SHOP_DESC_8"] = "恭喜获得", + ["SHOP_DESC_9"] = "首充礼包", + ["SHOP_DESC_10"] = "章节礼包", + ["SHOP_DESC_11"] = "新手礼包", + ["SHOP_DESC_12"] = "助力礼包", + ["SHOP_DESC_13"] = "成长礼包", + ["SHOP_DESC_14"] = "金币礼包", + ["SHOP_DESC_15"] = "前往商店", + ["SHOP_DESC_16"] = "特惠商品", + ["SHOP_DESC_17"] = "主要商品", + ["SHOP_DESC_18"] = "限购{0}次", + ["SHOP_DESC_19"] = "第{0}章礼包", + ["SHOP_DESC_20"] = "已购买", + ["SHOP_DESC_21"] = "剩余次数:{0}", + ["SHOP_DESC_22"] = "刷新时间:{0}", + ["SHOP_DESC_23"] = "{0}级助力礼包", + ["SHOP_DESC_24"] = "必出普通英雄", + ["SHOP_DESC_25"] = "必出稀有英雄", + ["SHOP_DESC_26"] = "必出史诗英雄", + ["SHOP_DESC_27"] = "宝箱", + ["SHOP_DESC_28"] = "每日特惠", + ["SHOP_DESC_29"] = "\"每日特惠\"将每日刷新,通过观看广告可以额外刷新", + ["HERO_DESC_11"] = "活动获得", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index d16415e5..2922d3a0 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -30,7 +30,7 @@ local skill = { ["desc"]="急速治疗：使用后本次恢复生命。" }, [3300220]={ - ["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。" + ["desc"]="狼袭瞬杀：使用后本次伤害提升，并造成多次技能伤害。" }, [3400120]={ ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" @@ -42,7 +42,7 @@ local skill = { ["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300220]={ - ["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。" + ["desc"]="腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4400120]={ ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" @@ -51,7 +51,7 @@ local skill = { ["desc"]="护盾术：为团队附加一个护盾，1回合。" }, [5300120]={ - ["desc"]="魔女琪琪：额外造成一次大量技能伤害。" + ["desc"]="魔法扫帚：额外造成一次大量技能伤害。" }, [5300220]={ ["desc"]="灵魂猎手：额外造成一次大量技能伤害。" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 3bdc51a6..3460b2b2 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -468,28 +468,28 @@ local skill_rogue = { ["desc"]="霜冻冰晶附加的冰盾，可反伤400%。" }, [4300300]={ - ["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。" + ["desc"]="解锁腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4300301]={ - ["desc"]="鸦姐技能附加的腐败效果，回合数+1." + ["desc"]="腐败利刃附加的腐败效果，回合数+1." }, [4300302]={ - ["desc"]="鸦姐技能对易伤敌人附加冰霜效果，1回合。" + ["desc"]="腐败利刃对易伤敌人附加冰霜效果，1回合。" }, [4300303]={ - ["desc"]="鸦姐技能使用时本次普攻伤害提升15%。" + ["desc"]="腐败利刃使用时本次普攻伤害提升15%。" }, [4300304]={ - ["desc"]="鸦姐技能附加的冰霜效果，回合数+1。" + ["desc"]="腐败利刃附加的冰霜效果，回合数+1。" }, [4300305]={ - ["desc"]="鸦姐技能附加虚弱效果，2回合。" + ["desc"]="腐败利刃附加虚弱效果，2回合。" }, [4300306]={ - ["desc"]="鸦姐技能沿＋方向可额外消除4格。" + ["desc"]="腐败利刃沿＋方向可额外消除4格。" }, [4300307]={ - ["desc"]="鸦姐技能附加的虚弱效果，回合数+2。" + ["desc"]="腐败利刃附加的虚弱效果，回合数+2。" }, [4400100]={ ["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" @@ -606,7 +606,7 @@ local skill_rogue = { ["desc"]="蝴蝶技能激活所需能量-2。" }, [5400106]={ - ["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升50%。" + ["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升10%。" }, [5400107]={ ["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。" diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 2b27d96a..51d7b38c 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -42,19 +42,25 @@ function HeroCell:refresh(heroEntity, isGray) self.progress:setSprite(GConst.ATLAS_PATH.COMMON, "common_progress_2", nil, self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)) end self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = fragmentCount / needFragmentCount - self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv())) if heroEntity:isUnlock() then - self.lvTx:setVisible(true) + if heroEntity:isActived() then + self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv())) + self.lvTx:setVisible(true) + else + self.lvTx:setVisible(false) + end self.progressBg:setVisible(not heroEntity:isMaxLv()) self.unlockTx:setVisible(false) - if not heroEntity:isActived() then - self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11)) - end else self.lvTx:setVisible(false) self.progressBg:setVisible(false) self.unlockTx:setVisible(true) - self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, heroEntity:getUnlcokChapter())) + local unlcokChapter = heroEntity:getUnlcokChapter() + if unlcokChapter then + self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter)) + else + self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11)) + end end end diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index d0f4da5f..f55e40d6 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -107,7 +107,7 @@ function HeroEntity:getCfgAtk(lv) end function HeroEntity:getUnlcokChapter() - return self.config.unlock_chapter or 0 + return self.config.unlock_chapter end function HeroEntity:updateAllAttr() @@ -165,10 +165,10 @@ function HeroEntity:isUnlock() if self:isActived() then return true end - if self:getUnlcokChapter() <= DataManager.ChapterData:getMaxChapterId() or self:canLvUp() then + local unlockChapter = self:getUnlcokChapter() + if unlockChapter and unlockChapter <= DataManager.ChapterData:getMaxChapterId() then return true end - return false end