diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index b659acfd..0fae5301 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -68,6 +68,8 @@ BIReport.ITEM_GET_TYPE = { RECOVERY_TIME = "RecoveryTime", ADS_BUY_VIT = "AdsBuyVit", GEM_BUY_VIT = "GemBuyVit", + ADS_BUY_ARENA_TICKET = "AdsBuyArenaTicket", + GEM_BUY_ARENA_TICKET = "GemBuyArenaTicket", TASK_DAILY_REFRESH = "TaskDailyRefresh", TASK_DAILY_REWARD = "TaskDailyReward", BOUNTY_UNLOCK_LEVEL = "BountyUnlockLevel", @@ -119,6 +121,7 @@ BIReport.ADS_CLICK_TYPE = { TASK_DAILY_REFRESH = "TaskDailyRefresh", TASK_DAILY_TASK = "TaskDailyTask", IDLE_QUICK_DROP = "IdleQuickDrop", + ARENA_TICKET = "ArenaTicket", MALL_DAILY = "MallDaily", MALL_DAILY_RESET = "MallDailyReset", diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index e6091ab2..8a666810 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -10,6 +10,7 @@ function DataManager:init() self:initManager("ChapterData", "app/userdata/chapter/chapter_data") self:initManager("DailyChallengeData", "app/userdata/daily_challenge/daily_challenge_data") self:initManager("DungeonData", "app/userdata/dungeon/dungeon_data") + self:initManager("ArenaData", "app/userdata/arena/arena_data") self:initManager("HeroData", "app/userdata/hero/hero_data") self:initManager("BagData", "app/userdata/bag/bag_data") self:initManager("BattleData", "app/userdata/battle/battle_data") @@ -89,6 +90,7 @@ function DataManager:clear() self.ChapterData:clear() self.DailyChallengeData:clear() self.DungeonData:clear() + self.ArenaData:clear() self.HeroData:clear() self.BagData:clear() self.FormationData:clear() @@ -156,6 +158,7 @@ function DataManager:initWithServerData(data) self.TaskData:init() self:scheduleGlobal() self:checkDataBind() + ModuleManager.ArenaManager:reqArenaInfo() -- 写在最后，防止某些数据还未初始化，就被bi访问报错 self.initWithServer = true diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index f91b8c3c..87585509 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -55,6 +55,8 @@ local MODULE_PATHS = { AccountManager= "app/module/account/account_manager", -- 活动副本 DungeonManager = "app/module/dungeon/dungeon_manager", + -- 竞技场 + ArenaManager = "app/module/arena/arena_manager", } -- 这里的key对应func_open里的id @@ -76,6 +78,7 @@ ModuleManager.MODULE_KEY = { MAIL = "mail_open", -- 邮件 DUNGEON_SHARDS = "dungeon_shards_open", -- 碎片副本 DUNGEON_GOLD = "dungeon_gold_open", -- 金币副本 + ARENA = "arena", -- 竞技场 } local _moduleMgrs = {} diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 4dd90263..2e6fcea6 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -512,9 +512,214 @@ local act_gift = { ["recharge_id"]=14, ["time_type"]=3, ["value"]=2000 + }, + [30102]={ + ["type"]=3, + ["recharge_id"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=1, + ["limit_time"]=72, + ["limit"]=1 + }, + [90102]={ + ["type"]=9, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=1, + ["limit_time"]=24, + ["cd"]=48, + ["limit"]=1, + ["value"]=200 + }, + [90202]={ + ["type"]=9, + ["recharge_id"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=1, + ["limit_time"]=24, + ["cd"]=48, + ["limit"]=1, + ["value"]=260 + }, + [90302]={ + ["type"]=9, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=1, + ["limit_time"]=24, + ["cd"]=48, + ["limit"]=1, + ["value"]=400 + }, + [90402]={ + ["type"]=9, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=1, + ["limit_time"]=24, + ["cd"]=48, + ["limit"]=1, + ["value"]=800 } } local config = { -data=act_gift,count=22 +data=act_gift,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/arena_board.lua b/lua/app/config/arena_board.lua index 771bc4ff..5a6f6c34 100644 --- a/lua/app/config/arena_board.lua +++ b/lua/app/config/arena_board.lua @@ -2,199 +2,283 @@ local arena_board = { [1]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, 0 }, { - 1, + 3, 0 }, { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 4 + 0 }, { 0, - 3 + 0 }, { 0, - 3 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -202,7 +286,7 @@ local arena_board = { [2]={ ["board"]={ { - 1, + 3, 0 }, { @@ -211,66 +295,26 @@ local arena_board = { }, { 0, - 1 + 0 }, { 0, - 2 + 0 }, { 0, - 1 + 0 }, { 2, 0 }, { - 1, + 3, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, + 3, 0 }, { @@ -279,18 +323,14 @@ local arena_board = { }, { 0, - 1 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { @@ -298,7 +338,71 @@ local arena_board = { 0 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -306,19 +410,7 @@ local arena_board = { 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -326,7 +418,19 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -334,67 +438,131 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -402,11 +570,7 @@ local arena_board = { [3]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -415,22 +579,30 @@ local arena_board = { }, { 0, - 2 + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { @@ -439,26 +611,6 @@ local arena_board = { }, { 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { @@ -467,30 +619,22 @@ local arena_board = { }, { 0, - 3 + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 0, - 2 + 0 }, { 0, - 3 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { @@ -499,31 +643,23 @@ local arena_board = { }, { 0, - 4 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 1 + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 }, { 2, @@ -531,70 +667,186 @@ local arena_board = { }, { 0, - 1 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -602,35 +854,27 @@ local arena_board = { [4]={ ["board"]={ { - 1, - 0 - }, - { - 2, + 3, 0 }, { 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -639,58 +883,10 @@ local arena_board = { }, { 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, 0 }, { 0, - 5 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, 0 }, { @@ -699,54 +895,6 @@ local arena_board = { }, { 0, - 5 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { @@ -755,46 +903,234 @@ local arena_board = { }, { 0, - 5 + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 }, { 2, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 14, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -802,65 +1138,141 @@ local arena_board = { [5]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 3 + 0 }, { 0, - 2 + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 0, - 2 + 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -870,11 +1282,23 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -882,7 +1306,11 @@ local arena_board = { 0 }, { - 3, + 2, + 0 + }, + { + 0, 0 }, { @@ -890,47 +1318,43 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 3, - 0 - }, - { - 3, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, { - 3, + 0, 0 }, { - 1, - 0 - }, - { - 3, + 0, 0 }, { @@ -938,7 +1362,11 @@ local arena_board = { 0 }, { - 3, + 2, + 0 + }, + { + 0, 0 }, { @@ -946,23 +1374,7 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, + 0, 0 }, { @@ -970,95 +1382,51 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { 3, 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 } } }, [6]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 5 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { @@ -1067,26 +1435,46 @@ local arena_board = { }, { 0, - 5 + 0 }, { 2, - 3 + 0 }, { 0, - 5 - }, - { - 2, 0 }, { - 1, + 3, 0 }, { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -1098,7 +1486,15 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -1109,10 +1505,118 @@ local arena_board = { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -1122,15 +1626,15 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 14, + 0, 0 }, { - 3, + 0, 0 }, { @@ -1142,19 +1646,47 @@ local arena_board = { 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, { - 3, + 0, 0 }, { @@ -1162,105 +1694,17 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { 3, 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 } } }, [7]={ ["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 @@ -1270,35 +1714,15 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { - 2, + 0, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 14, + 0, 0 }, { @@ -1309,14 +1733,6 @@ local arena_board = { 3, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 @@ -1326,53 +1742,25 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 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 @@ -1390,11 +1778,211 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -1402,123 +1990,27 @@ local arena_board = { [8]={ ["board"]={ { - 1, + 3, 0 }, { - 1, + 2, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 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 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -1526,7 +2018,27 @@ local arena_board = { 0 }, { - 14, + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -1534,19 +2046,15 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -1554,7 +2062,23 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -1562,39 +2086,187 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -1602,59 +2274,27 @@ local arena_board = { [9]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -1663,18 +2303,10 @@ local arena_board = { }, { 0, - 2 + 0 }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 7, 0 }, { @@ -1682,7 +2314,19 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -1691,110 +2335,222 @@ local arena_board = { }, { 0, - 2 + 0 }, { 0, - 3 - }, - { - 2, 0 }, { - 2, + 0, 0 }, { - 14, + 0, 0 }, { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 7, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { 3, 0 }, - { - 2, - 0 - }, { 3, 0 }, { - 7, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 7, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -1802,35 +2558,31 @@ local arena_board = { [10]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 1, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -1839,26 +2591,6 @@ local arena_board = { }, { 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { @@ -1867,38 +2599,98 @@ local arena_board = { }, { 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 1 + 0 }, { 2, 0 }, { - 1, - 0 - }, - { - 1, + 0, 0 }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, { - 7, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -1910,11 +2702,19 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -1926,7 +2726,11 @@ local arena_board = { 0 }, { - 14, + 2, + 0 + }, + { + 0, 0 }, { @@ -1938,11 +2742,23 @@ local arena_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -1954,7 +2770,15 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -1966,35 +2790,51 @@ local arena_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 } } @@ -2002,19 +2842,11 @@ local arena_board = { [11]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 1 - }, - { - 2, - 0 - }, - { - 2, 0 }, { @@ -2023,70 +2855,22 @@ local arena_board = { }, { 0, - 2 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, - 3 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 4, - 4 - }, - { - 4, - 4 - }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -2109,14 +2893,6 @@ local arena_board = { 0, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 @@ -2125,36 +2901,20 @@ local arena_board = { 3, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, { 2, 0 }, { - 14, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -2166,15 +2926,27 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -2185,148 +2957,192 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } }, [12]={ ["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 }, { - 14, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -2334,67 +3150,259 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -2402,7 +3410,7 @@ local arena_board = { [13]={ ["board"]={ { - 1, + 3, 0 }, { @@ -2411,26 +3419,30 @@ local arena_board = { }, { 0, - 2 + 0 }, { 0, - 3 + 0 }, { 0, - 2 + 0 }, { 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 0, 0 }, { @@ -2439,110 +3451,66 @@ local arena_board = { }, { 0, - 3 + 0 + }, + { + 2, + 0 }, { 0, - 2 + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 0, - 3 + 0 + }, + { + 0, + 0 }, { 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { 2, - 1 + 0 }, { - 3, - 2 - }, - { - 3, - 3 - }, - { - 3, - 4 + 0, + 0 }, { 2, - 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 }, { @@ -2557,6 +3525,58 @@ local arena_board = { 3, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -2566,11 +3586,19 @@ local arena_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -2582,7 +3610,23 @@ local arena_board = { 0 }, { - 14, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -2594,7 +3638,55 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -2602,7 +3694,27 @@ local arena_board = { [14]={ ["board"]={ { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -2611,126 +3723,18 @@ local arena_board = { }, { 0, - 1 - }, - { - 0, - 3 - }, - { - 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, - 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, 0 }, { @@ -2738,11 +3742,11 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { @@ -2750,15 +3754,23 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -2766,35 +3778,199 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -2802,119 +3978,27 @@ local arena_board = { [15]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 5, - 3 - }, - { - 2, - 0 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 5, - 3 - }, - { - 2, 0 }, { 0, - 3 - }, - { - 2, 0 }, { - 5, - 4 - }, - { - 2, + 0, 0 }, { - 5, - 4 - }, - { - 2, - 0 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 2, + 0, 0 }, { @@ -2926,13 +4010,53 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -2942,7 +4066,31 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -2966,11 +4114,11 @@ local arena_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 3, 0 }, { @@ -2982,7 +4130,7 @@ local arena_board = { 0 }, { - 14, + 0, 0 }, { @@ -2994,7 +4142,119 @@ local arena_board = { 0 }, { - 1, + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 } } @@ -3002,115 +4262,11 @@ local arena_board = { [16]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 4 - }, - { - 4, - 2 - }, - { - 4, - 4 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, 0 }, { @@ -3118,27 +4274,7 @@ local arena_board = { 0 }, { - 5, - 2 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 2, + 0, 0 }, { @@ -3146,29 +4282,61 @@ local arena_board = { 0 }, { - 5, - 4 - }, - { - 5, - 2 - }, - { - 14, + 0, 0 }, { - 5, - 2 + 3, + 0 }, { - 5, - 4 + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -3181,6 +4349,26 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 @@ -3189,6 +4377,86 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -3196,269 +4464,393 @@ local arena_board = { { 2, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 } } }, [17]={ ["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 + 3, + 0 }, { 2, 0 }, { - 5, - 2 - }, - { - 3, + 0, 0 }, { - 5, - 3 - }, - { - 5, - 5 - }, - { - 3, + 0, 0 }, { - 5, - 1 + 0, + 0 }, { 2, 0 }, { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 1 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 5, - 4 - }, - { - 14, + 0, 0 }, { - 5, - 4 - }, - { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 5, - 4 + 0, + 0 }, { - 5, - 4 + 0, + 0 }, { - 5, - 4 + 0, + 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } }, [18]={ ["board"]={ - { - 1, - 0 - }, { 3, 0 }, { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, + 2, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 2, 0 }, { @@ -3470,8 +4862,24 @@ local arena_board = { 0 }, { - 4, - 2 + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 }, { 3, @@ -3482,11 +4890,15 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 2, 0 }, { @@ -3498,8 +4910,44 @@ local arena_board = { 0 }, { - 5, - 1 + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 0, @@ -3510,91 +4958,155 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 5, - 2 - }, - { - 5, - 2 - }, - { - 14, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -3602,59 +5114,83 @@ local arena_board = { [19]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 3 + 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 + }, + { + 3, + 0 }, { 0, - 4 + 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -3666,29 +5202,29 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 4, - 1 + 2, + 0 }, { - 3, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { 3, 0 }, - { - 3, - 0 - }, - { - 1, - 0 - }, { 0, 0 @@ -3710,11 +5246,63 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -3726,11 +5314,23 @@ local arena_board = { 0 }, { - 4, - 1 + 0, + 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -3738,99 +5338,119 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, + 2, 0 }, { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 14, + 0, 0 }, { - 5, - 1 + 2, + 0 }, { - 5, - 3 + 0, + 0 }, { - 5, - 1 + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 } } }, [20]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -3839,26 +5459,22 @@ local arena_board = { }, { 0, - 4 + 0 }, { 0, - 5 + 0 + }, + { + 2, + 0 }, { 0, - 4 - }, - { - 3, 0 }, { - 1, - 0 - }, - { - 3, + 0, 0 }, { @@ -3866,25 +5482,57 @@ local arena_board = { 0 }, { - 5, - 3 + 2, + 0 }, { - 5, - 3 - }, - { - 5, - 3 + 0, + 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -3894,263 +5542,199 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { - 14, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 2, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 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, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 2, 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 } } }, [21]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 4 + 0 }, { - 0, - 5 - }, - { - 1, + 2, 0 }, { 0, - 5 - }, - { - 0, - 4 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, 0 }, { - 1, + 3, + 0 + }, + { + 3, 0 }, { 0, - 3 + 0 }, { 0, - 5 + 0 }, { 0, - 4 + 0 }, { 0, - 2 + 0 }, { 0, - 1 - }, - { - 1, 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 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, + 3, 0 }, { @@ -4162,19 +5746,15 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { - 2, + 0, 0 }, { - 2, - 0 - }, - { - 2, + 0, 0 }, { @@ -4186,197 +5766,229 @@ local arena_board = { 0 }, { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 } } }, [22]={ ["board"]={ - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 2, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, { 3, 0 }, - { - 5, - 1 - }, { 2, 0 }, { - 5, - 2 - }, - { - 2, + 0, 0 }, { - 3, + 0, 0 }, { - 1, - 0 - }, - { - 3, - 0 - }, - { - 5, - 1 - }, - { - 2, - 0 - }, - { - 5, - 2 - }, - { - 2, + 0, 0 }, { 2, 0 }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 5, - 5 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 5, - 4 - }, - { - 14, - 0 - }, - { - 5, - 5 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 @@ -4385,16 +5997,252 @@ local arena_board = { 3, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, { 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -4402,108 +6250,52 @@ local arena_board = { [23]={ ["board"]={ { - 1, + 3, 0 }, { - 1, + 2, 0 }, { 0, - 2 + 0 }, { 0, - 5 - }, - { - 1, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, { 0, - 2 - }, - { - 0, - 5 - }, - { - 4, - 4 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { 3, 0 }, - { - 4, - 3 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 4, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, { 3, 0 }, { - 4, - 3 + 0, + 0 }, { - 4, - 1 + 2, + 0 }, { - 4, - 1 + 0, + 0 }, { - 4, - 5 + 2, + 0 }, { 0, @@ -4526,7 +6318,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -4542,7 +6334,27 @@ local arena_board = { 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -4553,6 +6365,26 @@ local arena_board = { 3, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, { 3, 0 @@ -4562,39 +6394,139 @@ local arena_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 14, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -4602,69 +6534,85 @@ local arena_board = { [24]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 3 + 0 }, { 0, - 2 + 0 + }, + { + 3, + 0 }, { 0, - 3 + 0 }, { - 1, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, { 2, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 @@ -4673,12 +6621,92 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -4686,29 +6714,9 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, - { - 4, - 3 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, { 2, 0 @@ -4726,15 +6734,15 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { @@ -4750,15 +6758,31 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -4770,11 +6794,7 @@ local arena_board = { 0 }, { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -4782,7 +6802,7 @@ local arena_board = { 0 }, { - 14, + 0, 0 }, { @@ -4790,11 +6810,7 @@ local arena_board = { 0 }, { - 1, - 0 - }, - { - 1, + 3, 0 } } @@ -4802,59 +6818,27 @@ local arena_board = { [25]={ ["board"]={ { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -4865,6 +6849,54 @@ local arena_board = { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -4873,50 +6905,26 @@ local arena_board = { 2, 0 }, + { + 0, + 0 + }, { 2, 0 }, { - 5, - 4 - }, - { - 1, + 0, 0 }, { - 1, + 2, 0 }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 3 - }, { 0, 0 }, - { - 1, - 0 - }, { 3, 0 @@ -4925,56 +6933,80 @@ local arena_board = { 3, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 4 - }, { 0, 0 }, { - 1, + 0, 0 }, - { - 14, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 3 - }, { 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -4985,88 +7017,112 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 5, - 4 + 3, + 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 } } }, [26]={ ["board"]={ - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, { 3, 0 }, { 0, - 3 - }, - { - 0, - 5 - }, - { - 1, 0 }, { - 3, + 2, 0 }, { 0, - 2 + 0 }, { - 3, + 2, + 0 + }, + { + 0, 0 }, { @@ -5079,154 +7135,258 @@ local arena_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 }, { - 4, - 4 - }, - { - 3, + 0, 0 }, - { - 4, - 4 - }, { 0, 0 }, { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, - 3 - }, - { - 4, - 3 + 0, + 0 }, { 3, 0 }, { - 4, - 3 + 3, + 0 }, { - 4, - 3 + 2, + 0 }, { - 4, - 1 + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 } } }, [27]={ ["board"]={ { - 2, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 2, + 3, 0 }, { @@ -5235,26 +7395,42 @@ local arena_board = { }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { - 2, + 0, 0 }, { @@ -5262,55 +7438,7 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 1, - 0 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 1, + 3, 0 }, { @@ -5326,7 +7454,7 @@ local arena_board = { 0 }, { - 14, + 0, 0 }, { @@ -5346,7 +7474,23 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -5358,7 +7502,23 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -5370,189 +7530,173 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } }, [28]={ ["board"]={ - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 }, { - 0, - 3 + 2, + 0 }, { 0, - 4 + 0 }, { 0, - 3 + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 }, { 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 @@ -5562,19 +7706,7 @@ local arena_board = { 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -5582,7 +7714,7 @@ local arena_board = { 0 }, { - 14, + 2, 0 }, { @@ -5590,11 +7722,231 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -5602,87 +7954,27 @@ local arena_board = { [29]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 2 - }, - { - 4, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 4 - }, - { - 4, - 2 + 0 }, { 0, - 3 - }, - { - 4, - 4 + 0 }, { 0, - 2 - }, - { - 1, 0 }, { @@ -5690,31 +7982,11 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, - 0 - }, - { - 4, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 0, 0 }, { @@ -5722,15 +7994,7 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 0, 0 }, { @@ -5738,11 +8002,11 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 2, + 0, 0 }, { @@ -5750,35 +8014,51 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { - 14, + 0, 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { @@ -5786,163 +8066,223 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } }, [30]={ ["board"]={ - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 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, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 }, { - 1, + 0, 0 }, { - 3, + 0, 0 }, { - 1, + 0, 0 }, { - 3, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -5954,7 +8294,59 @@ local arena_board = { 0 }, { - 14, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -5966,11 +8358,23 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -5978,15 +8382,51 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -5994,7 +8434,87 @@ local arena_board = { 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 } } @@ -6002,59 +8522,27 @@ local arena_board = { [31]={ ["board"]={ { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 4, - 3 + 2, + 0 }, { 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 4, - 3 - }, - { - 1, 0 }, { @@ -6066,16 +8554,220 @@ local arena_board = { 0 }, { - 4, - 2 + 0, + 0 }, { - 4, - 3 + 0, + 0 }, { - 4, - 4 + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 3, @@ -6097,14 +8789,6 @@ local arena_board = { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, { 2, 0 @@ -6113,212 +8797,20 @@ local arena_board = { 0, 0 }, - { - 0, - 0 - }, - { - 2, - 0 - }, { 3, 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 } } }, [32]={ ["board"]={ { - 1, + 3, 0 }, { - 1, - 0 - }, - { - 4, - 1 - }, - { - 0, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 9, - 0 - }, - { - 4, - 1 - }, - { - 0, - 3 - }, - { - 4, - 4 - }, - { - 9, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 4, - 2 - }, - { - 0, - 3 - }, - { - 4, - 4 - }, - { - 7, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, - 2 - }, - { - 7, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 7, + 2, 0 }, { @@ -6334,19 +8826,19 @@ local arena_board = { 0 }, { - 7, + 2, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 7, + 2, 0 }, { @@ -6362,39 +8854,235 @@ local arena_board = { 0 }, { - 7, + 2, 0 }, { - 1, + 3, 0 }, { - 14, + 3, 0 }, { - 10, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 11, + 0, 0 }, { - 14, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -6402,35 +9090,7 @@ local arena_board = { [33]={ ["board"]={ { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, + 3, 0 }, { @@ -6438,7 +9098,15 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -6446,49 +9114,33 @@ local arena_board = { 0 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, { 2, 0 }, - { - 1, - 0 - }, { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 9, - 0 - }, { 3, 0 @@ -6497,30 +9149,6 @@ local arena_board = { 3, 0 }, - { - 3, - 0 - }, - { - 10, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, { 0, 0 @@ -6530,7 +9158,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -6538,11 +9166,7 @@ local arena_board = { 0 }, { - 1, - 0 - }, - { - 11, + 0, 0 }, { @@ -6553,6 +9177,26 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 @@ -6562,19 +9206,7 @@ local arena_board = { 0 }, { - 14, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -6589,64 +9221,212 @@ local arena_board = { 0, 0 }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, { 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } }, [34]={ ["board"]={ - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { 0, - 1 + 0 }, { - 3, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -6655,22 +9435,22 @@ local arena_board = { }, { 0, - 1 + 0 }, { 0, - 1 - }, - { - 3, 0 }, { - 3, + 0, 0 }, { - 7, + 0, + 0 + }, + { + 0, 0 }, { @@ -6683,26 +9463,22 @@ local arena_board = { }, { 0, - 1 + 0 + }, + { + 2, + 0 }, { 0, - 1 - }, - { - 3, 0 }, { - 7, + 2, 0 }, { - 14, - 0 - }, - { - 7, + 0, 0 }, { @@ -6711,22 +9487,58 @@ local arena_board = { }, { 0, - 1 - }, - { - 1, 0 }, { 0, - 1 - }, - { - 3, 0 }, { - 7, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -6735,23 +9547,27 @@ local arena_board = { }, { 0, - 1 - }, - { - 1, 0 }, { - 1, - 0 - }, - { - 1, + 2, 0 }, { 0, - 1 + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 }, { 3, @@ -6759,178 +9575,110 @@ local arena_board = { }, { 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 1 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } }, [35]={ ["board"]={ - { - 1, - 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 }, { 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 3, 0 }, { - 4, - 1 + 0, + 0 }, { - 4, - 2 - }, - { - 4, - 1 - }, - { - 3, + 0, 0 }, { @@ -6941,6 +9689,114 @@ local arena_board = { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, { 3, 0 @@ -6950,7 +9806,7 @@ local arena_board = { 0 }, { - 14, + 0, 0 }, { @@ -6958,15 +9814,39 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -6977,84 +9857,112 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 } } }, [36]={ ["board"]={ - { - 1, - 0 - }, { 3, 0 }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, + 2, 0 }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, 0 }, { - 1, + 2, + 0 + }, + { + 0, 0 }, { @@ -7067,110 +9975,6 @@ local arena_board = { }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { @@ -7182,7 +9986,23 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, 0 }, { @@ -7194,7 +10014,211 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -7202,63 +10226,55 @@ local arena_board = { [37]={ ["board"]={ { - 1, + 3, 0 }, { - 1, + 2, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 5 + 0 }, { 0, - 5 + 0 }, { - 5, - 5 + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 0, - 5 + 0 }, { 0, - 5 - }, - { - 1, 0 }, { - 1, + 0, + 0 + }, + { + 2, 0 }, { @@ -7270,7 +10286,23 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -7282,19 +10314,23 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 5, - 1 + 0, + 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 }, { @@ -7306,15 +10342,23 @@ local arena_board = { 0 }, { - 5, - 2 - }, - { - 1, + 0, 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -7326,7 +10370,23 @@ local arena_board = { 0 }, { - 14, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -7338,19 +10398,23 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 }, { @@ -7362,19 +10426,23 @@ local arena_board = { 0 }, { - 5, - 5 - }, - { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -7382,19 +10450,59 @@ local arena_board = { 0 }, { - 5, - 2 + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 }, { 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -7402,63 +10510,7 @@ local arena_board = { [38]={ ["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, + 3, 0 }, { @@ -7467,54 +10519,14 @@ local arena_board = { }, { 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, 0 }, { @@ -7525,9 +10537,89 @@ local arena_board = { 3, 0 }, + { + 3, + 0 + }, { 0, - 2 + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 }, { 3, @@ -7538,19 +10630,19 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { - 3, + 2, 0 }, { @@ -7562,19 +10654,23 @@ local arena_board = { 0 }, { - 5, - 5 - }, - { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -7582,7 +10678,27 @@ local arena_board = { 0 }, { - 14, + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -7590,11 +10706,87 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -7602,15 +10794,39 @@ local arena_board = { [39]={ ["board"]={ { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -7619,54 +10835,6 @@ local arena_board = { }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 13, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 13, - 1 - }, - { - 2, 0 }, { @@ -7675,26 +10843,46 @@ local arena_board = { }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, 0 }, { - 13, - 2 + 0, + 0 }, { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -7703,26 +10891,82 @@ local arena_board = { }, { 0, - 1 + 0 + }, + { + 2, + 0 }, { 0, - 1 + 0 + }, + { + 3, + 0 }, { 0, - 1 - }, - { - 14, 0 }, { - 13, - 3 + 0, + 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -7730,7 +10974,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -7738,19 +10982,47 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { - 1, + 3, 0 }, { - 13, - 4 + 3, + 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -7758,7 +11030,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -7766,155 +11038,67 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 13, - 5 - }, - { - 13, - 1 - }, - { - 13, - 2 - }, - { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } }, [40]={ ["board"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, { 3, 0 }, { 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 14, 0 }, { 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, 0 }, { 0, - 3 - }, - { - 3, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { @@ -7926,13 +11110,25 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 @@ -7942,59 +11138,223 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 13, - 1 - }, - { - 13, - 2 - }, - { - 13, - 3 - }, - { - 13, - 4 - }, - { - 13, - 5 - }, - { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 13, - 5 + 0, + 0 }, { - 13, - 4 + 0, + 0 }, { - 13, - 3 + 2, + 0 }, { - 13, - 2 + 2, + 0 }, { - 13, - 1 + 0, + 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 } } @@ -8002,31 +11362,11 @@ local arena_board = { [41]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 1, 0 }, { @@ -8035,26 +11375,50 @@ local arena_board = { }, { 0, - 3 + 0 + }, + { + 2, + 0 }, { 0, - 1 + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 0, - 1 + 0 }, { 0, - 1 + 0 }, { 0, - 3 + 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -8062,7 +11426,15 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -8070,7 +11442,47 @@ local arena_board = { 0 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -8078,7 +11490,27 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -8086,7 +11518,47 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -8094,19 +11566,15 @@ local arena_board = { 0 }, { - 13, - 1 - }, - { - 2, + 0, 0 }, { - 13, - 2 + 0, + 0 }, { - 2, + 0, 0 }, { @@ -8114,15 +11582,43 @@ local arena_board = { 0 }, { - 2, + 3, 0 }, { - 13, - 3 + 3, + 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -8130,51 +11626,7 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 13, - 3 - }, - { - 2, - 0 - }, - { - 13, - 2 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 2, - 0 - }, - { - 13, - 5 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 1, - 0 - }, - { - 14, + 0, 0 }, { @@ -8182,19 +11634,11 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { - 2, - 0 - }, - { - 14, - 0 - }, - { - 1, + 3, 0 } } @@ -8202,63 +11646,27 @@ local arena_board = { [42]={ ["board"]={ { - 1, + 3, + 0 + }, + { + 2, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, 0 }, { - 1, + 0, + 0 + }, + { + 2, 0 }, { @@ -8270,55 +11678,23 @@ local arena_board = { 0 }, { - 3, + 2, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 13, - 5 - }, { 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 13, - 5 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 14, + 0, + 0 + }, + { + 2, 0 }, { @@ -8329,72 +11705,224 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 14, + 3, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 13, - 2 - }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 2 - }, - { - 13, - 2 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -8402,65 +11930,25 @@ local arena_board = { [43]={ ["board"]={ { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 4 + 3, + 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -8473,6 +11961,86 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -8482,31 +12050,43 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 2, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 2, 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 1 - }, - { - 2, 0 }, { @@ -8514,7 +12094,15 @@ local arena_board = { 0 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -8523,18 +12111,6 @@ local arena_board = { }, { 0, - 4 - }, - { - 14, - 0 - }, - { - 0, - 1 - }, - { - 2, 0 }, { @@ -8542,59 +12118,95 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 0, - 5 - }, - { - 13, - 5 - }, - { - 13, - 5 - }, - { - 13, - 5 + 0 }, { 0, - 5 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -8602,7 +12214,39 @@ local arena_board = { [44]={ ["board"]={ { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -8611,26 +12255,6 @@ local arena_board = { }, { 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, 0 }, { @@ -8639,26 +12263,46 @@ local arena_board = { }, { 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 2, 0 }, { - 2, + 0, 0 }, { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -8667,26 +12311,6 @@ local arena_board = { }, { 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, 0 }, { @@ -8695,18 +12319,74 @@ local arena_board = { }, { 0, - 1 + 0 + }, + { + 3, + 0 }, { 0, - 3 + 0 }, { 0, - 4 + 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -8714,7 +12394,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -8722,19 +12402,47 @@ local arena_board = { 0 }, { - 13, - 1 + 0, + 0 }, { - 13, - 3 + 3, + 0 }, { - 13, - 3 + 3, + 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -8742,7 +12450,7 @@ local arena_board = { 0 }, { - 14, + 0, 0 }, { @@ -8750,51 +12458,39 @@ local arena_board = { 0 }, { - 13, - 5 - }, - { - 13, - 5 - }, - { - 13, - 3 - }, - { - 2, + 0, 0 }, { - 14, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, { - 13, - 5 - }, - { - 13, - 3 - }, - { - 13, - 5 - }, - { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -8802,39 +12498,27 @@ local arena_board = { [45]={ ["board"]={ { - 2, + 3, 0 }, { 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 2, 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -8847,34 +12531,50 @@ local arena_board = { }, { 0, - 3 + 0 + }, + { + 2, + 0 }, { 0, - 3 + 0 + }, + { + 2, + 0 }, { 0, - 2 - }, - { - 14, 0 }, { - 13, - 1 + 3, + 0 }, { - 13, - 4 + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 2, 0 }, { - 2, + 0, + 0 + }, + { + 0, 0 }, { @@ -8886,13 +12586,81 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -8902,13 +12670,53 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -8918,7 +12726,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -8926,7 +12734,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -8934,80 +12742,52 @@ local arena_board = { 0 }, { - 13, - 4 + 0, + 0 }, { - 13, - 1 + 3, + 0 }, { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 2, 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 13, - 4 - }, - { - 13, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 } } }, [46]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 5 + 0 }, { 2, @@ -9015,7 +12795,7 @@ local arena_board = { }, { 0, - 1 + 0 }, { 2, @@ -9023,19 +12803,43 @@ local arena_board = { }, { 0, - 5 - }, - { - 1, 0 }, { - 1, + 3, + 0 + }, + { + 3, 0 }, { 0, - 2 + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 2, @@ -9043,7 +12847,63 @@ local arena_board = { }, { 0, - 1 + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 2, @@ -9051,19 +12911,27 @@ local arena_board = { }, { 0, - 2 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 5 + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 2, @@ -9071,7 +12939,47 @@ local arena_board = { }, { 0, - 1 + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 2, @@ -9079,14 +12987,14 @@ local arena_board = { }, { 0, - 5 - }, - { - 1, 0 }, { - 1, + 0, + 0 + }, + { + 0, 0 }, { @@ -9094,7 +13002,43 @@ local arena_board = { 0 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -9102,7 +13046,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -9110,91 +13054,11 @@ local arena_board = { 0 }, { - 1, + 0, 0 }, { - 1, - 0 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 13, - 4 - }, - { - 13, - 5 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 13, - 4 - }, - { - 13, - 5 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 13, - 1 - }, - { - 13, - 1 - }, - { - 13, - 2 - }, - { - 14, - 0 - }, - { - 1, + 3, 0 } } @@ -9202,91 +13066,27 @@ local arena_board = { [47]={ ["board"]={ { - 0, - 2 + 3, + 0 + }, + { + 2, + 0 }, { 0, - 4 + 0 }, { 0, - 4 + 0 }, { 0, - 1 + 0 }, { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, + 2, 0 }, { @@ -9297,92 +13097,16 @@ local arena_board = { 3, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 21, - 2 - }, { 2, 0 }, - { - 21, - 4 - }, - { - 2, - 0 - }, - { - 21, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 0 }, { - 14, + 0, 0 }, { @@ -9390,11 +13114,235 @@ local arena_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -9402,59 +13350,7 @@ local arena_board = { [48]={ ["board"]={ { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 0, - 4 - }, - { - 2, + 3, 0 }, { @@ -9463,26 +13359,30 @@ local arena_board = { }, { 0, - 3 + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 2, 0 }, { - 0, - 1 + 3, + 0 }, { - 2, + 3, 0 }, { 0, - 4 - }, - { - 2, 0 }, { @@ -9491,7 +13391,7 @@ local arena_board = { }, { 0, - 3 + 0 }, { 2, @@ -9499,7 +13399,23 @@ local arena_board = { }, { 0, - 1 + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 2, @@ -9507,10 +13423,22 @@ local arena_board = { }, { 0, - 4 + 0 }, { - 2, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -9518,27 +13446,7 @@ local arena_board = { 0 }, { - 21, - 5 - }, - { - 2, - 0 - }, - { - 21, - 5 - }, - { - 2, - 0 - }, - { - 21, - 5 - }, - { - 2, + 0, 0 }, { @@ -9546,7 +13454,15 @@ local arena_board = { 0 }, { - 14, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -9554,15 +13470,15 @@ local arena_board = { 0 }, { - 21, - 5 - }, - { - 2, + 0, 0 }, { - 14, + 0, + 0 + }, + { + 0, 0 }, { @@ -9570,31 +13486,147 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -9602,35 +13634,39 @@ local arena_board = { [49]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -9639,54 +13675,54 @@ local arena_board = { }, { 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 2, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, { 2, 0 }, { 0, - 5 - }, - { - 2, 0 }, { - 21, - 4 - }, - { - 1, + 0, 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -9694,31 +13730,7 @@ local arena_board = { 0 }, { - 21, - 4 - }, - { - 2, - 0 - }, - { - 21, - 3 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 14, + 0, 0 }, { @@ -9726,7 +13738,75 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -9734,15 +13814,7 @@ local arena_board = { 0 }, { - 14, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -9750,27 +13822,47 @@ local arena_board = { 0 }, { - 21, - 4 - }, - { - 21, - 5 - }, - { - 21, - 3 - }, - { - 2, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -9778,15 +13870,7 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 21, - 5 - }, - { - 2, + 0, 0 }, { @@ -9794,7 +13878,39 @@ local arena_board = { 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -9802,35 +13918,39 @@ local arena_board = { [50]={ ["board"]={ { - 0, - 4 + 3, + 0 }, { 0, - 4 + 0 }, { 0, - 4 + 0 }, { 0, - 2 + 0 }, { 0, - 1 + 0 }, { 0, - 1 + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 0, - 1 - }, - { - 9, 0 }, { @@ -9838,7 +13958,7 @@ local arena_board = { 0 }, { - 9, + 0, 0 }, { @@ -9846,7 +13966,23 @@ local arena_board = { 0 }, { - 9, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -9854,7 +13990,11 @@ local arena_board = { 0 }, { - 9, + 0, + 0 + }, + { + 0, 0 }, { @@ -9866,7 +14006,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -9874,13 +14014,45 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -9890,27 +14062,23 @@ local arena_board = { 0 }, { - 21, - 2 - }, - { - 3, + 0, 0 }, { - 21, - 2 - }, - { - 3, + 0, 0 }, { - 21, - 2 + 0, + 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 }, { @@ -9922,7 +14090,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -9930,7 +14098,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -9938,45 +14106,37 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 14, - 0 - }, - { - 21, - 2 - }, - { - 3, - 0 - }, - { - 21, - 2 - }, - { - 3, - 0 - }, - { - 21, - 2 - }, - { - 14, + 0, 0 }, { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -9986,73 +14146,61 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 } } }, [51]={ ["board"]={ - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 3, - 0 - }, - { - 9, - 0 - }, - { - 3, - 0 - }, - { - 9, - 0 - }, - { - 3, - 0 - }, - { - 9, - 0 - }, { 3, 0 @@ -10061,122 +14209,6 @@ local arena_board = { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 21, - 1 - }, - { - 0, - 0 - }, - { - 21, - 1 - }, - { - 0, - 0 - }, - { - 21, - 1 - }, - { - 0, - 0 - }, - { - 21, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, { 2, 0 @@ -10190,47 +14222,271 @@ local arena_board = { 0 }, { - 14, + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 2, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 } } }, [52]={ ["board"]={ { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, + 3, 0 }, { @@ -10239,34 +14495,46 @@ local arena_board = { }, { 0, - 2 + 0 }, { 0, - 3 + 0 }, { 0, - 2 + 0 }, { 2, 0 }, { - 9, - 4 - }, - { - 21, - 3 + 3, + 0 }, { 3, 0 }, { - 3, + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -10278,71 +14546,23 @@ local arena_board = { 0 }, { - 3, - 4 - }, - { - 21, - 4 - }, - { - 11, + 0, 0 }, { - 21, - 3 - }, - { - 21, - 3 - }, - { - 9, + 0, 0 }, { - 1, + 0, 0 }, { - 21, - 3 - }, - { - 21, - 3 - }, - { - 1, + 0, 0 }, { - 3, - 0 - }, - { - 14, - 0 - }, - { - 21, - 2 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 21, - 3 - }, - { - 1, + 0, 0 }, { @@ -10354,199 +14574,223 @@ local arena_board = { 0 }, { - 21, - 2 + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 3, 0 }, { - 14, + 3, 0 }, { - 21, - 3 - }, - { - 1, + 0, 0 }, { - 21, - 1 + 2, + 0 }, { - 21, - 1 + 0, + 0 }, { - 21, - 2 + 2, + 0 }, { - 21, - 1 + 0, + 0 }, { - 21, - 1 + 3, + 0 }, { - 10, + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } }, [53]={ ["board"]={ - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 21, - 3 - }, - { - 21, - 5 - }, { 3, 0 }, { - 3, - 0 - }, - { - 14, + 2, 0 }, { 0, - 1 - }, - { - 0, - 4 - }, - { - 21, - 3 - }, - { - 21, - 5 - }, - { - 3, 0 }, { - 9, + 0, 0 }, - { - 21, - 3 - }, { 0, - 1 - }, - { - 0, - 3 - }, - { - 21, - 2 - }, - { - 21, - 5 - }, - { - 9, 0 }, { - 21, - 2 - }, - { - 21, - 3 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 21, - 2 - }, - { - 8, - 0 - }, - { - 21, - 1 - }, - { - 21, - 2 - }, - { - 21, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 8, - 0 - }, - { - 3, - 0 - }, - { - 21, - 1 - }, - { - 21, - 2 - }, - { - 21, - 3 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -10558,23 +14802,23 @@ local arena_board = { 0 }, { - 21, - 1 - }, - { - 21, - 2 - }, - { - 8, + 0, 0 }, { - 1, + 2, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -10586,15 +14830,223 @@ local arena_board = { 0 }, { - 21, - 1 - }, - { - 14, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -10602,63 +15054,83 @@ local arena_board = { [54]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 9, 0 }, { 0, - 1 + 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 2 + 0 + }, + { + 3, + 0 }, { 0, - 2 + 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -10669,6 +15141,110 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 @@ -10677,28 +15253,48 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 1, + 0, 0 }, - { - 21, - 3 - }, - { - 21, - 3 - }, { 0, 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -10710,17 +15306,9 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, - { - 1, - 0 - }, - { - 21, - 3 - }, { 0, 0 @@ -10742,59 +15330,7 @@ local arena_board = { 0 }, { - 1, - 0 - }, - { - 11, - 0 - }, - { - 21, - 1 - }, - { - 21, - 3 - }, - { - 21, - 3 - }, - { - 21, - 2 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 21, - 1 - }, - { - 21, - 1 - }, - { - 21, - 2 - }, - { - 21, - 2 - }, - { - 1, + 3, 0 } } @@ -10802,199 +15338,283 @@ local arena_board = { [55]={ ["board"]={ { - 18, + 3, 0 }, { 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, 0 }, { 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 10, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 1, 0 }, { 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, 0 }, { 0, - 2 - }, - { - 22, - 2 + 0 }, { 0, - 2 + 0 }, { - 22, - 3 + 2, + 0 + }, + { + 2, + 0 }, { 0, - 3 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { - 22, - 2 - }, - { - 14, + 0, 0 }, { - 22, - 3 - }, - { - 14, + 2, 0 }, { - 22, - 3 - }, - { - 1, + 0, 0 }, { - 1, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 } } @@ -11002,199 +15622,283 @@ local arena_board = { [56]={ ["board"]={ { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 1 + 0 + }, + { + 2, + 0 }, { 0, - 1 + 0 + }, + { + 2, + 0 }, { 0, - 3 + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 0, - 4 + 0 }, { 0, - 4 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 22, - 3 - }, - { - 22, - 3 - }, - { - 22, - 2 - }, - { - 22, - 2 - }, - { - 22, - 1 - }, - { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 22, - 5 - }, - { - 22, - 4 - }, - { - 22, - 4 - }, - { - 1, + 3, 0 }, { - 1, + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -11202,91 +15906,63 @@ local arena_board = { [57]={ ["board"]={ { - 19, + 3, 0 }, { - 19, + 2, 0 }, { 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, 0 }, { 0, - 2 + 0 }, { 0, - 5 + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 0, - 2 - }, - { - 19, 0 }, { - 19, + 0, 0 }, { - 19, + 0, 0 }, { - 19, + 2, 0 }, { - 4, - 4 - }, - { - 4, - 2 - }, - { - 4, - 5 - }, - { - 19, + 3, 0 }, { - 19, - 0 - }, - { - 1, + 3, 0 }, { @@ -11310,91 +15986,203 @@ local arena_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 22, - 3 - }, - { - 22, - 3 - }, - { - 22, - 3 - }, - { - 22, - 2 - }, - { - 22, - 5 - }, - { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 22, - 2 - }, - { - 22, - 1 - }, - { - 22, - 5 - }, - { - 22, - 2 - }, - { - 22, - 1 - }, - { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 14, + 0, 0 }, { - 22, - 1 - }, - { - 22, - 5 - }, - { - 22, - 2 - }, - { - 14, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -11402,97 +16190,13 @@ local arena_board = { [58]={ ["board"]={ { - 1, + 3, 0 }, { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 1, + 2, 0 }, - { - 1, - 0 - }, - { - 19, - 0 - }, - { - 4, - 4 - }, - { - 4, - 1 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 5 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 22, - 1 - }, - { - 22, - 1 - }, { 0, 0 @@ -11506,20 +16210,104 @@ local arena_board = { 0 }, { - 19, + 2, 0 }, { - 19, + 3, 0 }, { - 14, + 3, 0 }, { - 22, - 1 + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 0, @@ -11534,67 +16322,151 @@ local arena_board = { 0 }, { - 19, + 2, 0 }, { - 19, + 3, 0 }, { - 22, - 1 - }, - { - 22, - 1 - }, - { - 22, - 2 - }, - { - 22, - 2 - }, - { - 22, - 2 - }, - { - 19, + 3, 0 }, { - 1, + 2, 0 }, { - 14, + 0, 0 }, { - 22, - 1 - }, - { - 22, - 1 - }, - { - 22, - 1 - }, - { - 22, - 1 - }, - { - 19, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -11602,91 +16474,7 @@ local arena_board = { [59]={ ["board"]={ { - 19, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, - 3 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -11710,91 +16498,259 @@ local arena_board = { 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { 0, - 1 - }, - { - 0, - 3 - }, - { - 14, 0 }, { 0, - 4 + 0 + }, + { + 2, + 0 }, { 0, - 5 - }, - { - 1, 0 }, { - 1, + 2, 0 }, { - 1, + 0, 0 }, { - 22, - 1 - }, - { - 22, - 3 - }, - { - 22, - 5 - }, - { - 1, + 0, 0 }, { - 1, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 } } @@ -11802,115 +16758,7 @@ local arena_board = { [60]={ ["board"]={ { - 1, - 0 - }, - { - 1, - 5 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 19, - 0 - }, - { - 1, - 0 - }, - { - 19, - 0 - }, - { - 19, - 5 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -11925,56 +16773,20 @@ local arena_board = { 0, 0 }, - { - 4, - 2 - }, { 0, 0 }, - { - 22, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, { 0, 0 }, { - 4, - 1 - }, - { - 0, + 2, 0 }, { - 22, - 4 - }, - { - 22, - 4 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -11982,7 +16794,7 @@ local arena_board = { 0 }, { - 14, + 2, 0 }, { @@ -11990,12 +16802,240 @@ local arena_board = { 0 }, { - 22, - 4 + 2, + 0 }, { - 22, - 4 + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 } } } diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index f7247712..203c1bef 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -71,7 +71,8 @@ local arena_rank = { ["rank_icon"]="1", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_1" }, [102]={ ["season"]=1, @@ -153,7 +154,8 @@ local arena_rank = { ["rank_icon"]="2", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_2" }, [103]={ ["season"]=1, @@ -235,7 +237,8 @@ local arena_rank = { ["rank_icon"]="3", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_3" }, [104]={ ["season"]=1, @@ -325,7 +328,8 @@ local arena_rank = { ["rank_icon"]="4", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_4" }, [105]={ ["season"]=1, @@ -415,7 +419,8 @@ local arena_rank = { ["rank_icon"]="5", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_5" }, [106]={ ["season"]=1, @@ -505,7 +510,8 @@ local arena_rank = { ["rank_icon"]="6", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_6" }, [107]={ ["season"]=1, @@ -595,7 +601,8 @@ local arena_rank = { ["rank_icon"]="7", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_7" }, [108]={ ["season"]=1, @@ -685,7 +692,8 @@ local arena_rank = { ["rank_icon"]="8", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_8" }, [109]={ ["season"]=1, @@ -775,7 +783,8 @@ local arena_rank = { ["rank_icon"]="9", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_9" }, [110]={ ["season"]=1, @@ -865,7 +874,8 @@ local arena_rank = { ["rank_icon"]="10", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_10" }, [111]={ ["season"]=1, @@ -955,7 +965,8 @@ local arena_rank = { ["rank_icon"]="11", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_11" }, [112]={ ["season"]=1, @@ -1045,7 +1056,8 @@ local arena_rank = { ["rank_icon"]="12", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_12" }, [201]={ ["season"]=2, @@ -1117,7 +1129,8 @@ local arena_rank = { ["rank_icon"]="1", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_1" }, [202]={ ["season"]=2, @@ -1197,7 +1210,8 @@ local arena_rank = { ["rank_icon"]="2", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_2" }, [203]={ ["season"]=2, @@ -1277,7 +1291,8 @@ local arena_rank = { ["rank_icon"]="3", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_3" }, [204]={ ["season"]=2, @@ -1365,7 +1380,8 @@ local arena_rank = { ["rank_icon"]="4", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_4" }, [205]={ ["season"]=2, @@ -1453,7 +1469,8 @@ local arena_rank = { ["rank_icon"]="5", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_5" }, [206]={ ["season"]=2, @@ -1541,7 +1558,8 @@ local arena_rank = { ["rank_icon"]="6", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_6" }, [207]={ ["season"]=2, @@ -1629,7 +1647,8 @@ local arena_rank = { ["rank_icon"]="7", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_7" }, [208]={ ["season"]=2, @@ -1717,7 +1736,8 @@ local arena_rank = { ["rank_icon"]="8", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_8" }, [209]={ ["season"]=2, @@ -1805,7 +1825,8 @@ local arena_rank = { ["rank_icon"]="9", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_9" }, [210]={ ["season"]=2, @@ -1893,7 +1914,8 @@ local arena_rank = { ["rank_icon"]="10", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_10" }, [211]={ ["season"]=2, @@ -1981,7 +2003,8 @@ local arena_rank = { ["rank_icon"]="11", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_11" }, [212]={ ["season"]=2, @@ -2069,7 +2092,8 @@ local arena_rank = { ["rank_icon"]="12", ["scene"]="bg_1", ["block_icon"]="battle_hinder_2", - ["chess_board"]="chessboard_1" + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_12" } } local config = { diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index d0f17b90..9ab1e136 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -313,9 +313,12 @@ local const = { }, ["arena_bounty_senior_rise"]={ ["value"]=10 + }, + ["arena_matching_limit_number"]={ + ["value"]=5 } } local config = { -data=const,count=63 +data=const,count=64 } return config \ No newline at end of file diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 5b145f42..3910d3f7 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -70,9 +70,13 @@ local func_open = { ["arena_open"]={ ["stage"]=10, ["pop_ups"]=1 + }, + ["act_arena_gift"]={ + ["stage"]=10, + ["pop_ups"]=1 } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 72321066..382f6bf0 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -258,6 +258,40 @@ local LocalizationGlobalConst = NOTICE_TITLE = "NOTICE_TITLE", MAINTENANCE_NOTICE_DEFAULT = "MAINTENANCE_NOTICE_DEFAULT", CANNOT_RENAME_DESC_5 = "CANNOT_RENAME_DESC_5", + ARENA_DESC_1 = "ARENA_DESC_1", + ARENA_DESC_2 = "ARENA_DESC_2", + ARENA_DESC_3 = "ARENA_DESC_3", + ARENA_DESC_4 = "ARENA_DESC_4", + ARENA_DESC_5 = "ARENA_DESC_5", + ARENA_DESC_6 = "ARENA_DESC_6", + ARENA_DESC_7 = "ARENA_DESC_7", + ARENA_DESC_8 = "ARENA_DESC_8", + ARENA_DESC_9 = "ARENA_DESC_9", + ARENA_DESC_10 = "ARENA_DESC_10", + ARENA_DESC_11 = "ARENA_DESC_11", + ARENA_DESC_12 = "ARENA_DESC_12", + ARENA_DESC_13 = "ARENA_DESC_13", + ARENA_DESC_14 = "ARENA_DESC_14", + ARENA_DESC_15 = "ARENA_DESC_15", + ARENA_DESC_16 = "ARENA_DESC_16", + ARENA_DESC_17 = "ARENA_DESC_17", + ARENA_DESC_18 = "ARENA_DESC_18", + ARENA_DESC_19 = "ARENA_DESC_19", + ARENA_DESC_20 = "ARENA_DESC_20", + ARENA_RANKNAME_1 = "ARENA_RANKNAME_1", + ARENA_RANKNAME_2 = "ARENA_RANKNAME_2", + ARENA_RANKNAME_3 = "ARENA_RANKNAME_3", + ARENA_RANKNAME_4 = "ARENA_RANKNAME_4", + ARENA_RANKNAME_5 = "ARENA_RANKNAME_5", + ARENA_RANKNAME_6 = "ARENA_RANKNAME_6", + ARENA_RANKNAME_7 = "ARENA_RANKNAME_7", + ARENA_RANKNAME_8 = "ARENA_RANKNAME_8", + ARENA_RANKNAME_9 = "ARENA_RANKNAME_9", + ARENA_RANKNAME_10 = "ARENA_RANKNAME_10", + ARENA_RANKNAME_11 = "ARENA_RANKNAME_11", + ARENA_RANKNAME_12 = "ARENA_RANKNAME_12", + SHOP_DESC_38 = "SHOP_DESC_38", + SHOP_DESC_39 = "SHOP_DESC_39", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 239378b5..ebb80910 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -126,7 +126,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300018 + ["fx_self"]=400068, + ["fx_self"]=400068 }, [1200111]={ ["position"]=1, @@ -151,7 +152,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300019 + ["fx_self"]=400069, + ["fx_self"]=400069 }, [1200112]={ ["position"]=1, @@ -176,7 +178,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300020 + ["fx_self"]=400070, + ["fx_self"]=400070 }, [1200113]={ ["position"]=1, @@ -201,7 +204,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300021 + ["fx_self"]=400071, + ["fx_self"]=400071 }, [1200120]={ ["energy"]=10, @@ -240,12 +244,13 @@ local skill = { ["sound"]=12001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300022, + ["fx_self"]=400072, ["bullet_time"]={ 1167, 3000, 300 - } + }, + ["fx_self"]=400072 }, [1200121]={ ["position"]=1, @@ -361,7 +366,8 @@ local skill = { 1000011 }, ["name_act"]="attack01", - ["fx_self"]=300055 + ["fx_self"]=400005, + ["fx_self"]=400005 }, [1300111]={ ["position"]=1, @@ -386,7 +392,8 @@ local skill = { 1000012 }, ["name_act"]="attack02", - ["fx_self"]=300056 + ["fx_self"]=400006, + ["fx_self"]=400006 }, [1300112]={ ["position"]=1, @@ -411,7 +418,8 @@ local skill = { 1000013 }, ["name_act"]="attack03", - ["fx_self"]=300057 + ["fx_self"]=400007, + ["fx_self"]=400007 }, [1300113]={ ["position"]=1, @@ -436,7 +444,8 @@ local skill = { 1000014 }, ["name_act"]="attack04", - ["fx_self"]=300058 + ["fx_self"]=400008, + ["fx_self"]=400008 }, [1300120]={ ["energy"]=10, @@ -484,12 +493,13 @@ local skill = { 13001203 }, ["name_act"]="skill01", - ["fx_self"]=300059, + ["fx_self"]=400009, ["bullet_time"]={ 1900, 3000, 400 - } + }, + ["fx_self"]=400009 }, [1300121]={ ["position"]=1, @@ -583,12 +593,13 @@ local skill = { 13001203 }, ["name_act"]="skill01", - ["fx_self"]=300059, + ["fx_self"]=400009, ["bullet_time"]={ 1900, 3000, 400 - } + }, + ["fx_self"]=400009 }, [1300124]={ ["position"]=1, @@ -669,7 +680,8 @@ local skill = { 1000011 }, ["name_act"]="attack01", - ["fx_self"]=300035 + ["fx_self"]=400020, + ["fx_self"]=400020 }, [1300211]={ ["position"]=1, @@ -694,7 +706,8 @@ local skill = { 1000012 }, ["name_act"]="attack02", - ["fx_self"]=300036 + ["fx_self"]=400021, + ["fx_self"]=400021 }, [1300212]={ ["position"]=1, @@ -719,7 +732,8 @@ local skill = { 1000013 }, ["name_act"]="attack03", - ["fx_self"]=300037 + ["fx_self"]=400022, + ["fx_self"]=400022 }, [1300213]={ ["position"]=1, @@ -744,7 +758,8 @@ local skill = { 1000014 }, ["name_act"]="attack04", - ["fx_self"]=300038 + ["fx_self"]=400023, + ["fx_self"]=400023 }, [1300220]={ ["energy"]=10, @@ -825,12 +840,13 @@ local skill = { 130022203 }, ["name_act"]="skill01", - ["fx_self"]=300039, + ["fx_self"]=400024, ["bullet_time"]={ 1500, 3000, 400 - } + }, + ["fx_self"]=400024 }, [1300221]={ ["position"]=1, @@ -943,12 +959,13 @@ local skill = { 130022203 }, ["name_act"]="skill01", - ["fx_self"]=300039, + ["fx_self"]=400024, ["bullet_time"]={ 1500, 3000, 400 - } + }, + ["fx_self"]=400024 }, [1400110]={ ["position"]=1, @@ -973,7 +990,8 @@ local skill = { 1000011 }, ["name_act"]="attack01", - ["fx_self"]=300045 + ["fx_self"]=400078, + ["fx_self"]=400078 }, [1400111]={ ["position"]=1, @@ -998,7 +1016,8 @@ local skill = { 1000012 }, ["name_act"]="attack02", - ["fx_self"]=300046 + ["fx_self"]=400079, + ["fx_self"]=400079 }, [1400112]={ ["position"]=1, @@ -1023,7 +1042,8 @@ local skill = { 1000013 }, ["name_act"]="attack03", - ["fx_self"]=300047 + ["fx_self"]=400080, + ["fx_self"]=400080 }, [1400113]={ ["position"]=1, @@ -1048,7 +1068,8 @@ local skill = { 1000014 }, ["name_act"]="attack04", - ["fx_self"]=300048 + ["fx_self"]=400081, + ["fx_self"]=400081 }, [1400120]={ ["energy"]=10, @@ -1126,12 +1147,13 @@ local skill = { ["sound"]=14001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300049, + ["fx_self"]=400082, ["bullet_time"]={ 1166, 3000, 200 - } + }, + ["fx_self"]=400082 }, [1400121]={ ["position"]=1, @@ -1213,6 +1235,7 @@ local skill = { } }, ["obj"]=2, + ["fx_target"]=4, ["fx_target"]=4 }, [1400210]={ @@ -1238,7 +1261,8 @@ local skill = { 1000023 }, ["name_act"]="attack01", - ["fx_self"]=300100 + ["fx_self"]=400100, + ["fx_self"]=400100 }, [1400211]={ ["position"]=1, @@ -1263,7 +1287,8 @@ local skill = { 1000024 }, ["name_act"]="attack02", - ["fx_self"]=300101 + ["fx_self"]=400101, + ["fx_self"]=400101 }, [1400212]={ ["position"]=1, @@ -1288,7 +1313,8 @@ local skill = { 1000021 }, ["name_act"]="attack03", - ["fx_self"]=300102 + ["fx_self"]=400102, + ["fx_self"]=400102 }, [1400213]={ ["position"]=1, @@ -1313,7 +1339,8 @@ local skill = { 1000022 }, ["name_act"]="attack04", - ["fx_self"]=300103 + ["fx_self"]=400103, + ["fx_self"]=400103 }, [1400220]={ ["energy"]=10, @@ -1342,12 +1369,13 @@ local skill = { ["sound"]=14002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300104, + ["fx_self"]=400104, ["bullet_time"]={ 1466, 3000, 400 - } + }, + ["fx_self"]=400104 }, [1400221]={ ["position"]=1, @@ -1432,12 +1460,13 @@ local skill = { ["sound"]=14002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300104, + ["fx_self"]=400104, ["bullet_time"]={ 1466, 3000, 400 - } + }, + ["fx_self"]=400104 }, [1400224]={ ["position"]=1, @@ -1507,7 +1536,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300005 + ["fx_self"]=400054, + ["fx_self"]=400054 }, [2200111]={ ["position"]=2, @@ -1532,7 +1562,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300006 + ["fx_self"]=400055, + ["fx_self"]=400055 }, [2200112]={ ["position"]=2, @@ -1557,7 +1588,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300007 + ["fx_self"]=400056, + ["fx_self"]=400056 }, [2200113]={ ["position"]=2, @@ -1582,7 +1614,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300008 + ["fx_self"]=400057, + ["fx_self"]=400057 }, [2200120]={ ["energy"]=10, @@ -1610,12 +1643,13 @@ local skill = { ["sound"]=22001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300009, + ["fx_self"]=400058, ["bullet_time"]={ 800, 3000, 400 - } + }, + ["fx_self"]=400058 }, [2200121]={ ["position"]=2, @@ -1708,12 +1742,13 @@ local skill = { ["sound"]=22001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300009, + ["fx_self"]=400058, ["bullet_time"]={ 800, 3000, 400 - } + }, + ["fx_self"]=400058 }, [2300110]={ ["position"]=2, @@ -1738,7 +1773,8 @@ local skill = { 1000011 }, ["name_act"]="attack01", - ["fx_self"]=300040 + ["fx_self"]=400010, + ["fx_self"]=400010 }, [2300111]={ ["position"]=2, @@ -1763,7 +1799,8 @@ local skill = { 1000012 }, ["name_act"]="attack02", - ["fx_self"]=300041 + ["fx_self"]=400011, + ["fx_self"]=400011 }, [2300112]={ ["position"]=2, @@ -1788,7 +1825,8 @@ local skill = { 1000013 }, ["name_act"]="attack03", - ["fx_self"]=300042 + ["fx_self"]=400012, + ["fx_self"]=400012 }, [2300113]={ ["position"]=2, @@ -1813,7 +1851,8 @@ local skill = { 1000014 }, ["name_act"]="attack04", - ["fx_self"]=300043 + ["fx_self"]=400013, + ["fx_self"]=400013 }, [2300120]={ ["energy"]=10, @@ -1867,12 +1906,13 @@ local skill = { 2300120 }, ["name_act"]="skill01", - ["fx_self"]=300044, + ["fx_self"]=400014, ["bullet_time"]={ 1400, 3000, 400 - } + }, + ["fx_self"]=400014 }, [2300121]={ ["position"]=2, @@ -1940,12 +1980,13 @@ local skill = { 2300120 }, ["name_act"]="skill01", - ["fx_self"]=300044, + ["fx_self"]=400014, ["bullet_time"]={ 1400, 3000, 400 - } + }, + ["fx_self"]=400014 }, [2300123]={ ["position"]=2, @@ -2060,7 +2101,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300050 + ["fx_self"]=400000, + ["fx_self"]=400000 }, [2300211]={ ["position"]=2, @@ -2085,7 +2127,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300051 + ["fx_self"]=400001, + ["fx_self"]=400001 }, [2300212]={ ["position"]=2, @@ -2110,7 +2153,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300052 + ["fx_self"]=400002, + ["fx_self"]=400002 }, [2300213]={ ["position"]=2, @@ -2135,7 +2179,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300053 + ["fx_self"]=400003, + ["fx_self"]=400003 }, [2300220]={ ["energy"]=10, @@ -2194,12 +2239,13 @@ local skill = { 2300220 }, ["name_act"]="skill01", - ["fx_self"]=300054, + ["fx_self"]=400004, ["bullet_time"]={ 800, 3000, 400 - } + }, + ["fx_self"]=400004 }, [2300221]={ ["position"]=2, @@ -2283,7 +2329,8 @@ local skill = { 1000011 }, ["name_act"]="attack01", - ["fx_self"]=300028 + ["fx_self"]=400073, + ["fx_self"]=400073 }, [2400111]={ ["position"]=2, @@ -2308,7 +2355,8 @@ local skill = { 1000012 }, ["name_act"]="attack02", - ["fx_self"]=300029 + ["fx_self"]=400074, + ["fx_self"]=400074 }, [2400112]={ ["position"]=2, @@ -2333,7 +2381,8 @@ local skill = { 1000013 }, ["name_act"]="attack03", - ["fx_self"]=300030 + ["fx_self"]=400075, + ["fx_self"]=400075 }, [2400113]={ ["position"]=2, @@ -2358,7 +2407,8 @@ local skill = { 1000014 }, ["name_act"]="attack04", - ["fx_self"]=300031 + ["fx_self"]=400076, + ["fx_self"]=400076 }, [2400120]={ ["energy"]=10, @@ -2390,12 +2440,13 @@ local skill = { ["sound"]=24001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300032, + ["fx_self"]=400077, ["bullet_time"]={ 2033, 3000, 400 - } + }, + ["fx_self"]=400077 }, [2400121]={ ["position"]=2, @@ -2533,12 +2584,13 @@ local skill = { ["sound"]=24001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300032, + ["fx_self"]=400077, ["bullet_time"]={ 2033, 3000, 400 - } + }, + ["fx_self"]=400077 }, [2400124]={ ["energy"]=10, @@ -2576,12 +2628,13 @@ local skill = { ["sound"]=24001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300032, + ["fx_self"]=400077, ["bullet_time"]={ 2033, 3000, 400 - } + }, + ["fx_self"]=400077 }, [2400125]={ ["position"]=2, @@ -2620,7 +2673,8 @@ local skill = { 2300114 }, ["name_act"]="attack01", - ["fx_self"]=300095 + ["fx_self"]=400095, + ["fx_self"]=400095 }, [2400211]={ ["position"]=2, @@ -2645,7 +2699,8 @@ local skill = { 4200111 }, ["name_act"]="attack02", - ["fx_self"]=300096 + ["fx_self"]=400096, + ["fx_self"]=400096 }, [2400212]={ ["position"]=2, @@ -2670,7 +2725,8 @@ local skill = { 4200112 }, ["name_act"]="attack03", - ["fx_self"]=300097 + ["fx_self"]=400097, + ["fx_self"]=400097 }, [2400213]={ ["position"]=2, @@ -2695,7 +2751,8 @@ local skill = { 4200113 }, ["name_act"]="attack04", - ["fx_self"]=300098 + ["fx_self"]=400098, + ["fx_self"]=400098 }, [2400220]={ ["energy"]=10, @@ -2727,12 +2784,13 @@ local skill = { ["sound"]=24002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300099, + ["fx_self"]=400099, ["bullet_time"]={ 633, 3000, 400 - } + }, + ["fx_self"]=400099 }, [2400221]={ ["position"]=2, @@ -2771,6 +2829,14 @@ local skill = { ["round"]=2 } }, + ["pvp_effect"]={ + { + ["type"]="shield_rebound_200", + ["num"]=333, + ["ratio"]=10000, + ["round"]=2 + } + }, ["obj"]=1 }, [2400224]={ @@ -2799,6 +2865,14 @@ local skill = { ["round"]=2 } }, + ["pvp_effect"]={ + { + ["type"]="shield_rebound_400", + ["num"]=333, + ["ratio"]=10000, + ["round"]=2 + } + }, ["obj"]=1 }, [3200110]={ @@ -2824,7 +2898,8 @@ local skill = { 1000011 }, ["name_act"]="attack01", - ["fx_self"]=300000 + ["fx_self"]=400049, + ["fx_self"]=400049 }, [3200111]={ ["position"]=3, @@ -2849,7 +2924,8 @@ local skill = { 1000012 }, ["name_act"]="attack02", - ["fx_self"]=300001 + ["fx_self"]=400050, + ["fx_self"]=400050 }, [3200112]={ ["position"]=3, @@ -2874,7 +2950,8 @@ local skill = { 1000013 }, ["name_act"]="attack03", - ["fx_self"]=300002 + ["fx_self"]=400051, + ["fx_self"]=400051 }, [3200113]={ ["position"]=3, @@ -2899,7 +2976,8 @@ local skill = { 1000014 }, ["name_act"]="attack04", - ["fx_self"]=300003 + ["fx_self"]=400052, + ["fx_self"]=400052 }, [3200120]={ ["energy"]=10, @@ -2931,12 +3009,13 @@ local skill = { ["sound"]=32001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300004, + ["fx_self"]=400053, ["bullet_time"]={ 966, 5000, 400 - } + }, + ["fx_self"]=400053 }, [3200121]={ ["position"]=3, @@ -3035,7 +3114,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_target"]=300023 + ["fx_target"]=400015, + ["fx_target"]=400015 }, [3300111]={ ["position"]=3, @@ -3060,7 +3140,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_target"]=300024 + ["fx_target"]=400016, + ["fx_target"]=400016 }, [3300112]={ ["position"]=3, @@ -3085,7 +3166,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_target"]=300025 + ["fx_target"]=400017, + ["fx_target"]=400017 }, [3300113]={ ["position"]=3, @@ -3110,7 +3192,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_target"]=300026 + ["fx_target"]=400018, + ["fx_target"]=400018 }, [3300120]={ ["energy"]=10, @@ -3137,7 +3220,8 @@ local skill = { 3300120 }, ["name_act"]="skill01", - ["fx_self"]=300027 + ["fx_self"]=400019, + ["fx_self"]=400019 }, [3300121]={ ["position"]=3, @@ -3231,7 +3315,8 @@ local skill = { 3300120 }, ["name_act"]="skill01", - ["fx_self"]=300027 + ["fx_self"]=400019, + ["fx_self"]=400019 }, [3300210]={ ["position"]=3, @@ -3256,7 +3341,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300070 + ["fx_self"]=400035, + ["fx_self"]=400035 }, [3300211]={ ["position"]=3, @@ -3281,7 +3367,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300071 + ["fx_self"]=400036, + ["fx_self"]=400036 }, [3300212]={ ["position"]=3, @@ -3306,7 +3393,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300072 + ["fx_self"]=400037, + ["fx_self"]=400037 }, [3300213]={ ["position"]=3, @@ -3331,7 +3419,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300073 + ["fx_self"]=400038, + ["fx_self"]=400038 }, [3300220]={ ["energy"]=10, @@ -3386,12 +3475,13 @@ local skill = { 3300220 }, ["name_act"]="skill01", - ["fx_self"]=300074, + ["fx_self"]=400039, ["bullet_time"]={ 1500, 3000, 400 - } + }, + ["fx_self"]=400039 }, [3300221]={ ["effect_type"]=2, @@ -3482,12 +3572,13 @@ local skill = { 3300220 }, ["name_act"]="skill01", - ["fx_self"]=300074, + ["fx_self"]=400039, ["bullet_time"]={ 1500, 3000, 400 - } + }, + ["fx_self"]=400039 }, [3300223]={ ["energy"]=10, @@ -3565,12 +3656,13 @@ local skill = { 3300220 }, ["name_act"]="skill01", - ["fx_self"]=300074, + ["fx_self"]=400039, ["bullet_time"]={ 1500, 3000, 400 - } + }, + ["fx_self"]=400039 }, [3400110]={ ["position"]=3, @@ -3595,7 +3687,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300091 + ["fx_self"]=400093, + ["fx_self"]=400093 }, [3400111]={ ["position"]=3, @@ -3620,7 +3713,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300091 + ["fx_self"]=400093, + ["fx_self"]=400093 }, [3400112]={ ["position"]=3, @@ -3645,7 +3739,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300091 + ["fx_self"]=400093, + ["fx_self"]=400093 }, [3400113]={ ["position"]=3, @@ -3670,7 +3765,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300091 + ["fx_self"]=400093, + ["fx_self"]=400093 }, [3400120]={ ["energy"]=10, @@ -3725,12 +3821,13 @@ local skill = { ["sound"]=34001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300092, + ["fx_self"]=400094, ["bullet_time"]={ 1600, 3000, 200 - } + }, + ["fx_self"]=400094 }, [3400121]={ ["position"]=3, @@ -3852,12 +3949,13 @@ local skill = { 3400120 }, ["name_act"]="skill01", - ["fx_self"]=300092, + ["fx_self"]=400094, ["bullet_time"]={ 1600, 3000, 200 - } + }, + ["fx_self"]=400094 }, [3400210]={ ["position"]=3, @@ -3882,7 +3980,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300105 + ["fx_self"]=400105, + ["fx_self"]=400105 }, [3400211]={ ["position"]=3, @@ -3907,7 +4006,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300106 + ["fx_self"]=400106, + ["fx_self"]=400106 }, [3400212]={ ["position"]=3, @@ -3932,7 +4032,8 @@ local skill = { 10049 }, ["name_act"]="attack03", - ["fx_self"]=300107 + ["fx_self"]=400107, + ["fx_self"]=400107 }, [3400213]={ ["position"]=3, @@ -3957,7 +4058,8 @@ local skill = { 10048 }, ["name_act"]="attack04", - ["fx_self"]=300108 + ["fx_self"]=400108, + ["fx_self"]=400108 }, [3400220]={ ["energy"]=10, @@ -4012,12 +4114,13 @@ local skill = { ["sound"]=34002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300109, + ["fx_self"]=400109, ["bullet_time"]={ 1000, 3000, 400 - } + }, + ["fx_self"]=400109 }, [3400221]={ ["position"]=3, @@ -4135,12 +4238,13 @@ local skill = { ["sound"]=34002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300109, + ["fx_self"]=400109, ["bullet_time"]={ 1000, 3000, 400 - } + }, + ["fx_self"]=400109 }, [4200110]={ ["position"]=4, @@ -4165,7 +4269,8 @@ local skill = { 4200111 }, ["name_act"]="attack01", - ["fx_target"]=300010 + ["fx_target"]=400059, + ["fx_target"]=400059 }, [4200111]={ ["position"]=4, @@ -4190,7 +4295,8 @@ local skill = { 4200112 }, ["name_act"]="attack02", - ["fx_target"]=300011 + ["fx_target"]=400060, + ["fx_target"]=400060 }, [4200112]={ ["position"]=4, @@ -4215,7 +4321,8 @@ local skill = { 4200113 }, ["name_act"]="attack03", - ["fx_target"]=300012 + ["fx_target"]=400061, + ["fx_target"]=400061 }, [4200113]={ ["position"]=4, @@ -4240,7 +4347,8 @@ local skill = { 4200114 }, ["name_act"]="attack04", - ["fx_target"]=300013 + ["fx_target"]=400062, + ["fx_target"]=400062 }, [4200120]={ ["energy"]=10, @@ -4275,12 +4383,13 @@ local skill = { ["sound"]=42001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_target"]=300014, + ["fx_target"]=400063, ["bullet_time"]={ 1066, 3000, 400 - } + }, + ["fx_target"]=400063 }, [4200121]={ ["position"]=4, @@ -4381,7 +4490,8 @@ local skill = { 1000021 }, ["name_act"]="attack01", - ["fx_self"]=300080 + ["fx_self"]=400040, + ["fx_self"]=400040 }, [4300111]={ ["position"]=4, @@ -4406,7 +4516,8 @@ local skill = { 1000022 }, ["name_act"]="attack02", - ["fx_self"]=300081 + ["fx_self"]=400041, + ["fx_self"]=400041 }, [4300112]={ ["position"]=4, @@ -4431,7 +4542,8 @@ local skill = { 1000023 }, ["name_act"]="attack03", - ["fx_self"]=300082 + ["fx_self"]=400042, + ["fx_self"]=400042 }, [4300113]={ ["position"]=4, @@ -4456,7 +4568,8 @@ local skill = { 1000024 }, ["name_act"]="attack04", - ["fx_self"]=300083 + ["fx_self"]=400043, + ["fx_self"]=400043 }, [4300120]={ ["energy"]=10, @@ -4494,12 +4607,13 @@ local skill = { 42001203 }, ["name_act"]="skill01", - ["fx_self"]=300084, + ["fx_self"]=400044, ["bullet_time"]={ 200, 3000, 400 - } + }, + ["fx_self"]=400044 }, [4300121]={ ["position"]=4, @@ -4560,6 +4674,14 @@ local skill = { ["effect_type"]=2, ["trigger"]=6, ["effect"]={ + { + ["type"]="shield_ice", + ["num"]=3000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["pvp_effect"]={ { ["type"]="shield_ice", ["num"]=1000, @@ -4580,8 +4702,16 @@ local skill = { ["effect"]={ { ["type"]="shield_ice_rebound_400", - ["num"]=10000, - ["ratio"]=5000, + ["num"]=3000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["pvp_effect"]={ + { + ["type"]="shield_ice_rebound_400", + ["num"]=1000, + ["ratio"]=10000, ["round"]=2 } }, @@ -4637,12 +4767,13 @@ local skill = { 42001203 }, ["name_act"]="skill01", - ["fx_self"]=300084, + ["fx_self"]=400044, ["bullet_time"]={ 200, 3000, 400 - } + }, + ["fx_self"]=400044 }, [4300210]={ ["position"]=4, @@ -4667,7 +4798,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300075 + ["fx_self"]=400083, + ["fx_self"]=400083 }, [4300211]={ ["position"]=4, @@ -4692,7 +4824,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300076 + ["fx_self"]=400084, + ["fx_self"]=400084 }, [4300212]={ ["position"]=4, @@ -4717,7 +4850,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300077 + ["fx_self"]=400085, + ["fx_self"]=400085 }, [4300213]={ ["position"]=4, @@ -4742,7 +4876,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300078 + ["fx_self"]=400086, + ["fx_self"]=400086 }, [4300220]={ ["energy"]=10, @@ -4798,12 +4933,13 @@ local skill = { 4300220 }, ["name_act"]="skill01", - ["fx_self"]=300079, + ["fx_self"]=400087, ["bullet_time"]={ 1833, 3000, 400 - } + }, + ["fx_self"]=400087 }, [4300221]={ ["position"]=4, @@ -4918,7 +5054,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300033 + ["fx_self"]=400045, + ["fx_self"]=400045 }, [4400111]={ ["position"]=4, @@ -4943,7 +5080,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300033 + ["fx_self"]=400045, + ["fx_self"]=400045 }, [4400112]={ ["position"]=4, @@ -4968,7 +5106,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300093 + ["fx_self"]=400046, + ["fx_self"]=400046 }, [4400113]={ ["position"]=4, @@ -4993,7 +5132,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300094 + ["fx_self"]=400047, + ["fx_self"]=400047 }, [4400120]={ ["energy"]=10, @@ -5034,12 +5174,13 @@ local skill = { ["sound"]=44001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_target"]=300034, + ["fx_target"]=400048, ["bullet_time"]={ 633, 3000, 400 - } + }, + ["fx_target"]=400048 }, [4400121]={ ["position"]=4, @@ -5124,7 +5265,8 @@ local skill = { 10005 }, ["name_act"]="attack01", - ["fx_self"]=300110 + ["fx_self"]=400110, + ["fx_self"]=400110 }, [4400211]={ ["position"]=4, @@ -5149,7 +5291,8 @@ local skill = { 10006 }, ["name_act"]="attack02", - ["fx_self"]=300110 + ["fx_self"]=400110, + ["fx_self"]=400110 }, [4400212]={ ["position"]=4, @@ -5174,7 +5317,8 @@ local skill = { 10023 }, ["name_act"]="attack03", - ["fx_self"]=300110 + ["fx_self"]=400110, + ["fx_self"]=400110 }, [4400213]={ ["position"]=4, @@ -5199,7 +5343,8 @@ local skill = { 10048 }, ["name_act"]="attack04", - ["fx_self"]=300110 + ["fx_self"]=400110, + ["fx_self"]=400110 }, [4400220]={ ["energy"]=10, @@ -5258,12 +5403,13 @@ local skill = { ["sound"]=44002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300111, + ["fx_self"]=400111, ["bullet_time"]={ 1333, 3000, 400 - } + }, + ["fx_self"]=400111 }, [4400221]={ ["energy"]=10, @@ -5332,12 +5478,13 @@ local skill = { ["sound"]=44002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300111, + ["fx_self"]=400111, ["bullet_time"]={ 1333, 3000, 400 - } + }, + ["fx_self"]=400111 }, [4400222]={ ["position"]=4, @@ -5390,7 +5537,8 @@ local skill = { 1000021 }, ["name_act"]="attack01", - ["fx_self"]=300015 + ["fx_self"]=400064, + ["fx_self"]=400064 }, [5200111]={ ["position"]=5, @@ -5415,7 +5563,8 @@ local skill = { 1000022 }, ["name_act"]="attack02", - ["fx_self"]=300015 + ["fx_self"]=400064, + ["fx_self"]=400064 }, [5200112]={ ["position"]=5, @@ -5440,7 +5589,8 @@ local skill = { 1000023 }, ["name_act"]="attack03", - ["fx_self"]=300016 + ["fx_self"]=400065, + ["fx_self"]=400065 }, [5200113]={ ["position"]=5, @@ -5465,7 +5615,8 @@ local skill = { 1000024 }, ["name_act"]="attack04", - ["fx_self"]=300090 + ["fx_self"]=400066, + ["fx_self"]=400066 }, [5200120]={ ["energy"]=10, @@ -5487,6 +5638,14 @@ local skill = { ["round"]=1 } }, + ["pvp_effect"]={ + { + ["type"]="shield", + ["num"]=333, + ["ratio"]=10000, + ["round"]=1 + } + }, ["obj"]=1, ["skill_position"]={ 2, @@ -5496,7 +5655,8 @@ local skill = { 5200120 }, ["name_act"]="skill01", - ["fx_self"]=300017 + ["fx_self"]=400067, + ["fx_self"]=400067 }, [5200121]={ ["energy"]=10, @@ -5518,6 +5678,14 @@ local skill = { ["round"]=1 } }, + ["pvp_effect"]={ + { + ["type"]="shield_rebound_200", + ["num"]=333, + ["ratio"]=10000, + ["round"]=1 + } + }, ["obj"]=1, ["skill_position"]={ 2, @@ -5527,7 +5695,8 @@ local skill = { 5200120 }, ["name_act"]="skill01", - ["fx_self"]=300017 + ["fx_self"]=400067, + ["fx_self"]=400067 }, [5200122]={ ["energy"]=10, @@ -5549,6 +5718,14 @@ local skill = { ["round"]=1 } }, + ["pvp_effect"]={ + { + ["type"]="shield_rebound_400", + ["num"]=333, + ["ratio"]=10000, + ["round"]=1 + } + }, ["obj"]=1, ["skill_position"]={ 2, @@ -5558,7 +5735,8 @@ local skill = { 5200120 }, ["name_act"]="skill01", - ["fx_self"]=300017 + ["fx_self"]=400067, + ["fx_self"]=400067 }, [5200123]={ ["position"]=5, @@ -5597,7 +5775,8 @@ local skill = { 1000021 }, ["name_act"]="attack01", - ["fx_self"]=300060 + ["fx_self"]=400025, + ["fx_self"]=400025 }, [5300111]={ ["position"]=5, @@ -5622,7 +5801,8 @@ local skill = { 1000022 }, ["name_act"]="attack02", - ["fx_self"]=300061 + ["fx_self"]=400026, + ["fx_self"]=400026 }, [5300112]={ ["position"]=5, @@ -5647,7 +5827,8 @@ local skill = { 1000023 }, ["name_act"]="attack03", - ["fx_self"]=300062 + ["fx_self"]=400027, + ["fx_self"]=400027 }, [5300113]={ ["position"]=5, @@ -5672,7 +5853,8 @@ local skill = { 1000024 }, ["name_act"]="attack04", - ["fx_self"]=300063 + ["fx_self"]=400028, + ["fx_self"]=400028 }, [5300120]={ ["energy"]=10, @@ -5729,12 +5911,13 @@ local skill = { 53001204 }, ["name_act"]="skill01", - ["fx_self"]=300064, + ["fx_self"]=400029, ["bullet_time"]={ 2066, 3000, 400 - } + }, + ["fx_self"]=400029 }, [5300121]={ ["position"]=5, @@ -5837,7 +6020,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300065 + ["fx_self"]=400030, + ["fx_self"]=400030 }, [5300211]={ ["position"]=5, @@ -5862,7 +6046,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300066 + ["fx_self"]=400031, + ["fx_self"]=400031 }, [5300212]={ ["position"]=5, @@ -5887,7 +6072,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300067 + ["fx_self"]=400032, + ["fx_self"]=400032 }, [5300213]={ ["position"]=5, @@ -5912,7 +6098,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300068 + ["fx_self"]=400033, + ["fx_self"]=400033 }, [5300220]={ ["energy"]=10, @@ -5960,12 +6147,13 @@ local skill = { 5300220 }, ["name_act"]="skill01", - ["fx_self"]=300069, + ["fx_self"]=400034, ["bullet_time"]={ 1133, 3000, 400 - } + }, + ["fx_self"]=400034 }, [5300221]={ ["position"]=5, @@ -6114,12 +6302,13 @@ local skill = { 5300220 }, ["name_act"]="skill01", - ["fx_self"]=300069, + ["fx_self"]=400034, ["bullet_time"]={ 1133, 3000, 400 - } + }, + ["fx_self"]=400034 }, [5400110]={ ["position"]=5, @@ -6144,7 +6333,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300085 + ["fx_self"]=400088, + ["fx_self"]=400088 }, [5400111]={ ["position"]=5, @@ -6169,7 +6359,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300086 + ["fx_self"]=400089, + ["fx_self"]=400089 }, [5400112]={ ["position"]=5, @@ -6194,7 +6385,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300087 + ["fx_self"]=400090, + ["fx_self"]=400090 }, [5400113]={ ["position"]=5, @@ -6219,7 +6411,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300088 + ["fx_self"]=400091, + ["fx_self"]=400091 }, [5400120]={ ["energy"]=10, @@ -6265,12 +6458,13 @@ local skill = { ["sound"]=54001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300089, + ["fx_self"]=400092, ["bullet_time"]={ 1800, 3000, 400 - } + }, + ["fx_self"]=400092 }, [5400121]={ ["position"]=5, @@ -6338,12 +6532,13 @@ local skill = { ["sound"]=54001200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300089, + ["fx_self"]=400092, ["bullet_time"]={ 1800, 3000, 400 - } + }, + ["fx_self"]=400092 }, [5400124]={ ["position"]=5, @@ -6393,7 +6588,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300112 + ["fx_self"]=400112, + ["fx_self"]=400112 }, [5400211]={ ["position"]=5, @@ -6418,7 +6614,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300113 + ["fx_self"]=400113, + ["fx_self"]=400113 }, [5400212]={ ["position"]=5, @@ -6443,7 +6640,8 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300114 + ["fx_self"]=400114, + ["fx_self"]=400114 }, [5400213]={ ["position"]=5, @@ -6468,7 +6666,8 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300115 + ["fx_self"]=400115, + ["fx_self"]=400115 }, [5400220]={ ["energy"]=10, @@ -6534,12 +6733,13 @@ local skill = { ["sound"]=54002200, ["sound_delay"]=0, ["name_act"]="skill01", - ["fx_self"]=300116, + ["fx_self"]=400116, ["bullet_time"]={ 3166, 3000, 400 - } + }, + ["fx_self"]=400116 }, [5400221]={ ["position"]=5, @@ -6973,7 +7173,8 @@ local skill = { 500, 3000, 400 - } + }, + ["fx_self"]=200045 }, [10017]={ ["effect_type"]=1, @@ -7010,7 +7211,8 @@ local skill = { 1500, 3000, 400 - } + }, + ["fx_self"]=200037 }, [10018]={ ["skill_type"]=3, @@ -7052,7 +7254,8 @@ local skill = { 500, 3000, 400 - } + }, + ["fx_self"]=200117 }, [10019]={ ["effect_type"]=1, @@ -7089,7 +7292,8 @@ local skill = { 666, 3000, 400 - } + }, + ["fx_self"]=200002 }, [10020]={ ["effect_type"]=1, @@ -7126,7 +7330,8 @@ local skill = { 666, 3000, 400 - } + }, + ["fx_self"]=200005 }, [10021]={ ["effect_type"]=1, @@ -7165,7 +7370,8 @@ local skill = { 200, 3000, 400 - } + }, + ["fx_self"]=400044 }, [10022]={ ["effect_type"]=1, @@ -7220,7 +7426,8 @@ local skill = { 700, 3000, 400 - } + }, + ["fx_self"]=200076 }, [10024]={ ["skill_type"]=6, @@ -7272,7 +7479,8 @@ local skill = { 333, 3000, 400 - } + }, + ["fx_self"]=200016 }, [10025]={ ["effect_type"]=1, @@ -7334,7 +7542,8 @@ local skill = { 800, 3000, 400 - } + }, + ["fx_self"]=400004 }, [10026]={ ["effect_type"]=1, @@ -7394,7 +7603,8 @@ local skill = { 566, 3000, 400 - } + }, + ["fx_self"]=200057 }, [10029]={ ["effect_type"]=1, @@ -7437,7 +7647,8 @@ local skill = { 366, 3000, 400 - } + }, + ["fx_self"]=200009 }, [10031]={ ["effect_type"]=1, @@ -7493,7 +7704,8 @@ local skill = { 1900, 3000, 400 - } + }, + ["fx_self"]=400009 }, [10032]={ ["skill_type"]=7, @@ -7525,7 +7737,8 @@ local skill = { 466, 3000, 400 - } + }, + ["fx_self"]=200024 }, [10033]={ ["effect_type"]=1, @@ -7549,6 +7762,7 @@ local skill = { 10033 }, ["name_act"]="skill01", + ["fx_self"]=200020, ["fx_self"]=200020 }, [10034]={ @@ -7585,7 +7799,8 @@ local skill = { 1100, 3000, 400 - } + }, + ["fx_self"]=200073 }, [10035]={ ["effect_type"]=1, @@ -7646,7 +7861,8 @@ local skill = { 1400, 3000, 400 - } + }, + ["fx_self"]=400014 }, [10036]={ ["skill_type"]=3, @@ -7699,7 +7915,8 @@ local skill = { 533, 2000, 200 - } + }, + ["fx_self"]=200053 }, [10037]={ ["effect_type"]=2, @@ -7734,6 +7951,7 @@ local skill = { 3300120 }, ["name_act"]="skill01", + ["fx_self"]=400019, ["fx_self"]=400019 }, [10039]={ @@ -7770,7 +7988,8 @@ local skill = { 500, 3000, 400 - } + }, + ["fx_self"]=200028 }, [10040]={ ["skill_type"]=8, @@ -7846,7 +8065,8 @@ local skill = { 1500, 3000, 400 - } + }, + ["fx_self"]=400024 }, [10041]={ ["effect_type"]=1, @@ -7875,7 +8095,8 @@ local skill = { 666, 3000, 400 - } + }, + ["fx_self"]=200120 }, [10042]={ ["effect_type"]=1, @@ -7939,7 +8160,8 @@ local skill = { 2066, 3000, 400 - } + }, + ["fx_self"]=400029 }, [10043]={ ["effect_type"]=1, @@ -7970,7 +8192,8 @@ local skill = { 533, 3000, 400 - } + }, + ["fx_self"]=200084 }, [10044]={ ["skill_type"]=6, @@ -8025,7 +8248,8 @@ local skill = { 1233, 3000, 400 - } + }, + ["fx_self"]=200085 }, [10045]={ ["skill_type"]=10, @@ -8061,7 +8285,8 @@ local skill = { 666, 3000, 400 - } + }, + ["fx_self"]=200065 }, [10046]={ ["effect_type"]=2, @@ -8112,7 +8337,8 @@ local skill = { 666, 3000, 400 - } + }, + ["fx_self"]=200069 }, [10048]={ ["effect_type"]=2, @@ -8178,7 +8404,8 @@ local skill = { 600, 3000, 400 - } + }, + ["fx_self"]=200041 }, [10050]={ ["effect_type"]=1, @@ -8239,7 +8466,8 @@ local skill = { 1166, 3000, 400 - } + }, + ["fx_self"]=200121 }, [10051]={ ["effect_type"]=1, @@ -8271,7 +8499,8 @@ local skill = { 566, 3000, 400 - } + }, + ["fx_self"]=200061 }, [10052]={ ["skill_type"]=7, @@ -8303,7 +8532,8 @@ local skill = { 1333, 3000, 400 - } + }, + ["fx_self"]=200118 }, [10053]={ ["skill_type"]=6, @@ -8362,7 +8592,8 @@ local skill = { 2000, 3000, 400 - } + }, + ["fx_self"]=200119 }, [10054]={ ["effect_type"]=1, @@ -8454,7 +8685,8 @@ local skill = { 833, 3000, 400 - } + }, + ["fx_self"]=200107 }, [10057]={ ["skill_type"]=3, @@ -8532,7 +8764,8 @@ local skill = { 600, 3000, 400 - } + }, + ["fx_self"]=200108 }, [10058]={ ["effect_type"]=1, @@ -8588,7 +8821,8 @@ local skill = { 566, 3000, 400 - } + }, + ["fx_self"]=200113 }, [10059]={ ["skill_type"]=3, @@ -8631,7 +8865,8 @@ local skill = { 566, 3000, 400 - } + }, + ["fx_self"]=200113 }, [10060]={ ["effect_type"]=1, @@ -8711,7 +8946,8 @@ local skill = { 700, 3000, 400 - } + }, + ["fx_self"]=200092 }, [10063]={ ["effect_type"]=1, @@ -8748,7 +8984,8 @@ local skill = { 1100, 3000, 400 - } + }, + ["fx_self"]=200080 }, [10064]={ ["effect_type"]=1, @@ -8791,7 +9028,8 @@ local skill = { 1100, 3000, 400 - } + }, + ["fx_self"]=200092 }, [10065]={ ["skill_type"]=3, @@ -8833,7 +9071,8 @@ local skill = { 500, 3000, 400 - } + }, + ["fx_self"]=200103 }, [10066]={ ["effect_type"]=1, @@ -8900,7 +9139,8 @@ local skill = { 1133, 3000, 400 - } + }, + ["fx_self"]=400034 }, [10068]={ ["effect_type"]=1, @@ -8979,7 +9219,8 @@ local skill = { 1500, 3000, 400 - } + }, + ["fx_self"]=400039 }, [10070]={ ["effect_type"]=1, @@ -9010,7 +9251,8 @@ local skill = { 500, 3000, 400 - } + }, + ["fx_self"]=200049 }, [10071]={ ["effect_type"]=1, @@ -9048,6 +9290,7 @@ local skill = { 10063 }, ["name_act"]="skill01", + ["fx_self"]=200092, ["fx_self"]=200092 }, [10072]={ @@ -9143,7 +9386,8 @@ local skill = { 500, 3000, 400 - } + }, + ["fx_self"]=200126 }, [10075]={ ["buff_condition"]={ @@ -9217,7 +9461,8 @@ local skill = { 966, 3000, 400 - } + }, + ["fx_self"]=200132 }, [10077]={ ["effect_type"]=1, @@ -9254,7 +9499,8 @@ local skill = { 433, 3000, 400 - } + }, + ["fx_self"]=200136 }, [10078]={ ["skill_type"]=7, @@ -9305,7 +9551,8 @@ local skill = { 1200, 3000, 400 - } + }, + ["fx_self"]=200137 }, [10079]={ ["effect_type"]=1, @@ -9361,7 +9608,8 @@ local skill = { 975, 3000, 400 - } + }, + ["fx_self"]=200141 }, [10080]={ ["effect_type"]=1, @@ -9398,7 +9646,8 @@ local skill = { 666, 3000, 400 - } + }, + ["fx_self"]=200146 }, [10081]={ ["effect_type"]=1, @@ -9433,7 +9682,8 @@ local skill = { 533, 3000, 400 - } + }, + ["fx_self"]=200147 }, [10082]={ ["effect_type"]=1, @@ -9463,6 +9713,7 @@ local skill = { 10033 }, ["name_act"]="skill01", + ["fx_self"]=200020, ["fx_self"]=200020 }, [10083]={ @@ -9551,6 +9802,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100001, ["fx_self"]=100001 }, [20002]={ @@ -9575,6 +9827,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100002, ["fx_self"]=100002 }, [20003]={ @@ -9599,6 +9852,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100003, ["fx_self"]=100003 }, [20004]={ @@ -9623,6 +9877,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=100004, ["fx_self"]=100004 }, [20005]={ @@ -9647,6 +9902,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=100005, ["fx_self"]=100005 }, [20006]={ @@ -9671,6 +9927,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=100006, ["fx_self"]=100006 }, [20007]={ @@ -9695,6 +9952,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100007, ["fx_self"]=100007 }, [20008]={ @@ -9719,6 +9977,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100008, ["fx_self"]=100008 }, [20009]={ @@ -9743,6 +10002,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100009, ["fx_self"]=100009 }, [20010]={ @@ -9767,6 +10027,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=100010, ["fx_self"]=100010 }, [20011]={ @@ -9791,6 +10052,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=100011, ["fx_self"]=100011 }, [20012]={ @@ -9815,6 +10077,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=100012, ["fx_self"]=100012 }, [20013]={ @@ -9839,6 +10102,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20014]={ @@ -9863,6 +10127,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20015]={ @@ -9887,6 +10152,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20016]={ @@ -9911,6 +10177,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20017]={ @@ -9935,6 +10202,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20018]={ @@ -9959,6 +10227,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20019]={ @@ -9983,6 +10252,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20020]={ @@ -10007,6 +10277,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20021]={ @@ -10031,6 +10302,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20022]={ @@ -10055,6 +10327,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20023]={ @@ -10079,6 +10352,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20024]={ @@ -10103,6 +10377,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100013, ["fx_self"]=100013 }, [20025]={ @@ -10127,6 +10402,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100014, ["fx_self"]=100014 }, [20026]={ @@ -10151,6 +10427,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100015, ["fx_self"]=100015 }, [20027]={ @@ -10175,6 +10452,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100016, ["fx_self"]=100016 }, [20028]={ @@ -10199,6 +10477,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100017, ["fx_self"]=100017 }, [20029]={ @@ -10223,6 +10502,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100018, ["fx_self"]=100018 }, [20030]={ @@ -10247,6 +10527,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100019, ["fx_self"]=100019 }, [20031]={ @@ -10271,6 +10552,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100020, ["fx_self"]=100020 }, [20032]={ @@ -10295,6 +10577,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100021, ["fx_self"]=100021 }, [20033]={ @@ -10319,6 +10602,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100020, ["fx_self"]=100020 }, [20034]={ @@ -10343,6 +10627,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100022, ["fx_self"]=100022 }, [20035]={ @@ -10367,6 +10652,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100023, ["fx_self"]=100023 }, [20036]={ @@ -10391,6 +10677,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100022, ["fx_self"]=100022 }, [20037]={ @@ -10415,6 +10702,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100024, ["fx_self"]=100024 }, [20038]={ @@ -10439,6 +10727,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100025, ["fx_self"]=100025 }, [20039]={ @@ -10463,6 +10752,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100024, ["fx_self"]=100024 }, [20040]={ @@ -10487,6 +10777,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100026, ["fx_self"]=100026 }, [20041]={ @@ -10511,6 +10802,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100027, ["fx_self"]=100027 }, [20042]={ @@ -10535,6 +10827,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100026, ["fx_self"]=100026 }, [20043]={ @@ -10559,6 +10852,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100028, ["fx_self"]=100028 }, [20044]={ @@ -10583,6 +10877,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100029, ["fx_self"]=100029 }, [20045]={ @@ -10607,6 +10902,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100030, ["fx_self"]=100030 }, [20046]={ @@ -10631,6 +10927,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100028, ["fx_self"]=100028 }, [20047]={ @@ -10655,6 +10952,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100029, ["fx_self"]=100029 }, [20048]={ @@ -10679,6 +10977,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100030, ["fx_self"]=100030 }, [20049]={ @@ -10703,6 +11002,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100028, ["fx_self"]=100028 }, [20050]={ @@ -10727,6 +11027,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100029, ["fx_self"]=100029 }, [20051]={ @@ -10751,6 +11052,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100030, ["fx_self"]=100030 }, [20052]={ @@ -10775,6 +11077,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100028, ["fx_self"]=100028 }, [20053]={ @@ -10799,6 +11102,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100029, ["fx_self"]=100029 }, [20054]={ @@ -10823,6 +11127,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100030, ["fx_self"]=100030 }, [20055]={ @@ -10847,6 +11152,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100031, ["fx_self"]=100031 }, [20056]={ @@ -10871,6 +11177,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100032, ["fx_self"]=100032 }, [20057]={ @@ -10895,6 +11202,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100033, ["fx_self"]=100033 }, [20058]={ @@ -10919,6 +11227,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100034, ["fx_self"]=100034 }, [20059]={ @@ -10943,6 +11252,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100035, ["fx_self"]=100035 }, [20060]={ @@ -10967,6 +11277,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100036, ["fx_self"]=100036 }, [20061]={ @@ -10991,6 +11302,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100037, ["fx_self"]=100037 }, [20062]={ @@ -11015,6 +11327,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100038, ["fx_self"]=100038 }, [20063]={ @@ -11039,6 +11352,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100039, ["fx_self"]=100039 }, [20064]={ @@ -11063,6 +11377,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100040, ["fx_self"]=100040 }, [20065]={ @@ -11087,6 +11402,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100041, ["fx_self"]=100041 }, [20066]={ @@ -11111,6 +11427,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100042, ["fx_self"]=100042 }, [20067]={ @@ -11135,6 +11452,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100043, ["fx_self"]=100043 }, [20068]={ @@ -11159,6 +11477,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100043, ["fx_self"]=100043 }, [20069]={ @@ -11183,6 +11502,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100043, ["fx_self"]=100043 }, [20070]={ @@ -11207,6 +11527,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100044, ["fx_self"]=100044 }, [20071]={ @@ -11231,6 +11552,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100044, ["fx_self"]=100044 }, [20072]={ @@ -11255,6 +11577,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100044, ["fx_self"]=100044 }, [20073]={ @@ -11279,6 +11602,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100045, ["fx_self"]=100045 }, [20074]={ @@ -11303,6 +11627,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100045, ["fx_self"]=100045 }, [20075]={ @@ -11327,6 +11652,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100045, ["fx_self"]=100045 }, [20076]={ @@ -11351,6 +11677,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100046, ["fx_self"]=100046 }, [20077]={ @@ -11375,6 +11702,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100046, ["fx_self"]=100046 }, [20078]={ @@ -11399,6 +11727,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100046, ["fx_self"]=100046 }, [20079]={ @@ -11423,6 +11752,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=100047, ["fx_self"]=100047 }, [20080]={ @@ -11447,6 +11777,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=100048, ["fx_self"]=100048 }, [20081]={ @@ -11471,6 +11802,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=100049, ["fx_self"]=100049 }, [20082]={ @@ -11495,6 +11827,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=100047, ["fx_self"]=100047 }, [20083]={ @@ -11519,6 +11852,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=100048, ["fx_self"]=100048 }, [20084]={ @@ -11543,6 +11877,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=100049, ["fx_self"]=100049 }, [20085]={ @@ -11567,6 +11902,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100050, ["fx_self"]=100050 }, [20086]={ @@ -11591,6 +11927,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100051, ["fx_self"]=100051 }, [20087]={ @@ -11615,6 +11952,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100052, ["fx_self"]=100052 }, [20088]={ @@ -11639,6 +11977,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100050, ["fx_self"]=100050 }, [20089]={ @@ -11663,6 +12002,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100051, ["fx_self"]=100051 }, [20090]={ @@ -11687,6 +12027,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100052, ["fx_self"]=100052 }, [20091]={ @@ -11711,6 +12052,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100053, ["fx_self"]=100053 }, [20092]={ @@ -11735,6 +12077,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100053, ["fx_self"]=100053 }, [20093]={ @@ -11759,6 +12102,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100053, ["fx_self"]=100053 }, [20094]={ @@ -11783,6 +12127,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100055, ["fx_self"]=100055 }, [20095]={ @@ -11807,6 +12152,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100055, ["fx_self"]=100055 }, [20096]={ @@ -11831,6 +12177,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100055, ["fx_self"]=100055 }, [20097]={ @@ -11855,6 +12202,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100057, ["fx_self"]=100057 }, [20098]={ @@ -11879,6 +12227,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100058, ["fx_self"]=100058 }, [20099]={ @@ -11903,6 +12252,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100059, ["fx_self"]=100059 }, [20100]={ @@ -11927,6 +12277,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100057, ["fx_self"]=100057 }, [20101]={ @@ -11951,6 +12302,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100058, ["fx_self"]=100058 }, [20102]={ @@ -11975,6 +12327,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100059, ["fx_self"]=100059 }, [20103]={ @@ -11999,6 +12352,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100060, ["fx_self"]=100060 }, [20104]={ @@ -12023,6 +12377,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100060, ["fx_self"]=100060 }, [20105]={ @@ -12047,6 +12402,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100060, ["fx_self"]=100060 }, [20106]={ @@ -12071,6 +12427,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100060, ["fx_self"]=100060 }, [20107]={ @@ -12095,6 +12452,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100060, ["fx_self"]=100060 }, [20108]={ @@ -12119,6 +12477,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100060, ["fx_self"]=100060 }, [20109]={ @@ -12143,6 +12502,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100061, ["fx_self"]=100061 }, [20110]={ @@ -12167,6 +12527,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100062, ["fx_self"]=100062 }, [20111]={ @@ -12191,6 +12552,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100062, ["fx_self"]=100062 }, [20112]={ @@ -12215,6 +12577,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100063, ["fx_self"]=100063 }, [20113]={ @@ -12239,6 +12602,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100064, ["fx_self"]=100064 }, [20114]={ @@ -12263,6 +12627,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100065, ["fx_self"]=100065 }, [20115]={ @@ -12287,6 +12652,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100066, ["fx_self"]=100066 }, [20116]={ @@ -12311,6 +12677,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100066, ["fx_self"]=100066 }, [20117]={ @@ -12335,6 +12702,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100066, ["fx_self"]=100066 }, [20118]={ @@ -12359,6 +12727,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100067, ["fx_self"]=100067 }, [20119]={ @@ -12383,6 +12752,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100067, ["fx_self"]=100067 }, [20120]={ @@ -12407,6 +12777,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100067, ["fx_self"]=100067 }, [20121]={ @@ -12431,6 +12802,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100068, ["fx_self"]=100068 }, [20122]={ @@ -12455,6 +12827,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100068, ["fx_self"]=100068 }, [20123]={ @@ -12479,6 +12852,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100068, ["fx_self"]=100068 }, [20124]={ @@ -12503,6 +12877,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100069, ["fx_self"]=100069 }, [20125]={ @@ -12527,6 +12902,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100069, ["fx_self"]=100069 }, [20126]={ @@ -12551,6 +12927,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100069, ["fx_self"]=100069 }, [20127]={ @@ -12575,6 +12952,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100071, ["fx_self"]=100071 }, [20128]={ @@ -12599,6 +12977,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100071, ["fx_self"]=100071 }, [20129]={ @@ -12623,6 +13002,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100071, ["fx_self"]=100071 }, [20130]={ @@ -12647,6 +13027,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100073, ["fx_self"]=100073 }, [20131]={ @@ -12671,6 +13052,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100073, ["fx_self"]=100073 }, [20132]={ @@ -12695,6 +13077,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100073, ["fx_self"]=100073 }, [20133]={ @@ -12719,6 +13102,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100074, ["fx_self"]=100074 }, [20134]={ @@ -12743,6 +13127,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100074, ["fx_self"]=100074 }, [20135]={ @@ -12767,6 +13152,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100074, ["fx_self"]=100074 }, [20136]={ @@ -12791,6 +13177,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100075, ["fx_self"]=100075 }, [20137]={ @@ -12815,6 +13202,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100076, ["fx_self"]=100076 }, [20138]={ @@ -12839,6 +13227,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100077, ["fx_self"]=100077 }, [20139]={ @@ -12863,6 +13252,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100078, ["fx_self"]=100078 }, [20140]={ @@ -12887,6 +13277,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100079, ["fx_self"]=100079 }, [20141]={ @@ -12911,6 +13302,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100080, ["fx_self"]=100080 }, [20142]={ @@ -12935,6 +13327,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100081, ["fx_self"]=100081 }, [20143]={ @@ -12959,6 +13352,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100082, ["fx_self"]=100082 }, [20144]={ @@ -12983,6 +13377,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100083, ["fx_self"]=100083 }, [20145]={ @@ -13007,6 +13402,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100085, ["fx_self"]=100085 }, [20146]={ @@ -13031,6 +13427,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100086, ["fx_self"]=100086 }, [20147]={ @@ -13055,6 +13452,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100087, ["fx_self"]=100087 }, [20148]={ @@ -13079,6 +13477,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100089, ["fx_self"]=100089 }, [20149]={ @@ -13103,6 +13502,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100089, ["fx_self"]=100089 }, [20150]={ @@ -13127,6 +13527,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100089, ["fx_self"]=100089 }, [20151]={ @@ -13151,6 +13552,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100090, ["fx_self"]=100090 }, [20152]={ @@ -13175,6 +13577,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100090, ["fx_self"]=100090 }, [20153]={ @@ -13199,6 +13602,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100090, ["fx_self"]=100090 }, [20154]={ @@ -13223,6 +13627,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100091, ["fx_self"]=100091 }, [20155]={ @@ -13247,6 +13652,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100091, ["fx_self"]=100091 }, [20156]={ @@ -13271,6 +13677,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100091, ["fx_self"]=100091 }, [20157]={ @@ -13295,6 +13702,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100092, ["fx_self"]=100092 }, [20158]={ @@ -13319,6 +13727,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100092, ["fx_self"]=100092 }, [20159]={ @@ -13343,6 +13752,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100092, ["fx_self"]=100092 }, [20160]={ @@ -13367,6 +13777,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100093, ["fx_self"]=100093 }, [20161]={ @@ -13391,6 +13802,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100093, ["fx_self"]=100093 }, [20162]={ @@ -13415,6 +13827,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100093, ["fx_self"]=100093 }, [20163]={ @@ -13439,6 +13852,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100094, ["fx_self"]=100094 }, [20164]={ @@ -13463,6 +13877,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100094, ["fx_self"]=100094 }, [20165]={ @@ -13487,6 +13902,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100094, ["fx_self"]=100094 }, [20166]={ @@ -13511,6 +13927,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100095, ["fx_self"]=100095 }, [20167]={ @@ -13535,6 +13952,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100096, ["fx_self"]=100096 }, [20168]={ @@ -13559,6 +13977,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100096, ["fx_self"]=100096 }, [20169]={ @@ -13583,6 +14002,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=100097, ["fx_self"]=100097 }, [20170]={ @@ -13607,6 +14027,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=100098, ["fx_self"]=100098 }, [20171]={ @@ -13631,6 +14052,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=100098, ["fx_self"]=100098 }, [20172]={ @@ -13655,6 +14077,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100099, ["fx_self"]=100099 }, [20173]={ @@ -13679,6 +14102,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100100, ["fx_self"]=100100 }, [20174]={ @@ -13703,6 +14127,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100101, ["fx_self"]=100101 }, [20175]={ @@ -13727,6 +14152,7 @@ local skill = { 1000013 }, ["name_act"]="attack01", + ["fx_self"]=100103, ["fx_self"]=100103 }, [20176]={ @@ -13751,6 +14177,7 @@ local skill = { 1000011 }, ["name_act"]="attack02", + ["fx_self"]=100104, ["fx_self"]=100104 }, [20177]={ @@ -13775,6 +14202,7 @@ local skill = { 1000012 }, ["name_act"]="attack03", + ["fx_self"]=100105, ["fx_self"]=100105 }, [20178]={ @@ -13799,6 +14227,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=100106, ["fx_self"]=100106 }, [20179]={ @@ -13823,6 +14252,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100107, ["fx_self"]=100107 }, [20180]={ @@ -13847,6 +14277,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100108, ["fx_self"]=100108 }, [20181]={ @@ -13871,6 +14302,7 @@ local skill = { 1000002 }, ["name_act"]="attack01", + ["fx_self"]=100109, ["fx_self"]=100109 }, [20182]={ @@ -13895,6 +14327,7 @@ local skill = { 1000003 }, ["name_act"]="attack02", + ["fx_self"]=100110, ["fx_self"]=100110 }, [20183]={ @@ -13919,6 +14352,7 @@ local skill = { 1000004 }, ["name_act"]="attack03", + ["fx_self"]=100111, ["fx_self"]=100111 }, [20184]={ @@ -13943,6 +14377,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=100112, ["fx_self"]=100112 }, [20185]={ @@ -13967,6 +14402,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=100113, ["fx_self"]=100113 }, [20186]={ @@ -13991,6 +14427,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=100114, ["fx_self"]=100114 }, [20187]={ @@ -14015,6 +14452,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=100112, ["fx_self"]=100112 }, [20188]={ @@ -14039,6 +14477,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=100113, ["fx_self"]=100113 }, [20189]={ @@ -14063,6 +14502,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=100114, ["fx_self"]=100114 }, [20190]={ @@ -14087,6 +14527,7 @@ local skill = { 1000024 }, ["name_act"]="attack01", + ["fx_self"]=100115, ["fx_self"]=100115 }, [20191]={ @@ -14111,6 +14552,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=100115, ["fx_self"]=100115 }, [20192]={ @@ -14135,6 +14577,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=100115, ["fx_self"]=100115 }, [30001]={ @@ -14159,6 +14602,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200000, ["fx_self"]=200000 }, [30002]={ @@ -14183,6 +14627,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200000, ["fx_self"]=200000 }, [30003]={ @@ -14207,6 +14652,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200000, ["fx_self"]=200000 }, [30004]={ @@ -14231,6 +14677,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200003, ["fx_self"]=200003 }, [30005]={ @@ -14255,6 +14702,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200003, ["fx_self"]=200003 }, [30006]={ @@ -14279,6 +14727,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200003, ["fx_self"]=200003 }, [30007]={ @@ -14303,6 +14752,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200006, ["fx_self"]=200006 }, [30008]={ @@ -14327,6 +14777,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200007, ["fx_self"]=200007 }, [30009]={ @@ -14351,6 +14802,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200008, ["fx_self"]=200008 }, [30010]={ @@ -14375,6 +14827,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200010, ["fx_self"]=200010 }, [30011]={ @@ -14399,6 +14852,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200011, ["fx_self"]=200011 }, [30012]={ @@ -14423,6 +14877,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200012, ["fx_self"]=200012 }, [30013]={ @@ -14447,6 +14902,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200013, ["fx_self"]=200013 }, [30014]={ @@ -14471,6 +14927,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200014, ["fx_self"]=200014 }, [30015]={ @@ -14495,6 +14952,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200015, ["fx_self"]=200015 }, [30016]={ @@ -14519,6 +14977,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200017, ["fx_self"]=200017 }, [30017]={ @@ -14543,6 +15002,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200018, ["fx_self"]=200018 }, [30018]={ @@ -14567,6 +15027,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200019, ["fx_self"]=200019 }, [30019]={ @@ -14591,6 +15052,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200010, ["fx_self"]=200010 }, [30020]={ @@ -14615,6 +15077,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200011, ["fx_self"]=200011 }, [30021]={ @@ -14639,6 +15102,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200012, ["fx_self"]=200012 }, [30022]={ @@ -14663,6 +15127,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200021, ["fx_self"]=200021 }, [30023]={ @@ -14687,6 +15152,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200022, ["fx_self"]=200022 }, [30024]={ @@ -14711,6 +15177,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200023, ["fx_self"]=200023 }, [30025]={ @@ -14735,6 +15202,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200025, ["fx_self"]=200025 }, [30026]={ @@ -14759,6 +15227,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200026, ["fx_self"]=200026 }, [30027]={ @@ -14783,6 +15252,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200027, ["fx_self"]=200027 }, [30028]={ @@ -14807,6 +15277,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200029, ["fx_self"]=200029 }, [30029]={ @@ -14831,6 +15302,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200122, ["fx_self"]=200122 }, [30030]={ @@ -14855,6 +15327,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200030, ["fx_self"]=200030 }, [30031]={ @@ -14879,6 +15352,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200031, ["fx_self"]=200031 }, [30032]={ @@ -14903,6 +15377,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200032, ["fx_self"]=200032 }, [30033]={ @@ -14927,6 +15402,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200033, ["fx_self"]=200033 }, [30034]={ @@ -14951,6 +15427,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200034, ["fx_self"]=200034 }, [30035]={ @@ -14975,6 +15452,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200035, ["fx_self"]=200035 }, [30036]={ @@ -14999,6 +15477,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200036, ["fx_self"]=200036 }, [30037]={ @@ -15023,6 +15502,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=200038, ["fx_self"]=200038 }, [30038]={ @@ -15047,6 +15527,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=200039, ["fx_self"]=200039 }, [30039]={ @@ -15071,6 +15552,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=200040, ["fx_self"]=200040 }, [30040]={ @@ -15095,6 +15577,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200042, ["fx_self"]=200042 }, [30041]={ @@ -15119,6 +15602,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200043, ["fx_self"]=200043 }, [30042]={ @@ -15143,6 +15627,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200044, ["fx_self"]=200044 }, [30043]={ @@ -15167,6 +15652,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200046, ["fx_self"]=200046 }, [30044]={ @@ -15191,6 +15677,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200047, ["fx_self"]=200047 }, [30045]={ @@ -15215,6 +15702,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200048, ["fx_self"]=200048 }, [30046]={ @@ -15239,6 +15727,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200050, ["fx_self"]=200050 }, [30047]={ @@ -15263,6 +15752,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200051, ["fx_self"]=200051 }, [30048]={ @@ -15287,6 +15777,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200052, ["fx_self"]=200052 }, [30049]={ @@ -15311,6 +15802,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=200054, ["fx_self"]=200054 }, [30050]={ @@ -15335,6 +15827,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=200055, ["fx_self"]=200055 }, [30051]={ @@ -15359,6 +15852,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=200056, ["fx_self"]=200056 }, [30052]={ @@ -15383,6 +15877,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=200058, ["fx_self"]=200058 }, [30053]={ @@ -15407,6 +15902,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=200059, ["fx_self"]=200059 }, [30054]={ @@ -15431,6 +15927,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=200060, ["fx_self"]=200060 }, [30055]={ @@ -15455,6 +15952,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200062, ["fx_self"]=200062 }, [30056]={ @@ -15479,6 +15977,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200063, ["fx_self"]=200063 }, [30057]={ @@ -15503,6 +16002,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200064, ["fx_self"]=200064 }, [30058]={ @@ -15527,6 +16027,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=200066, ["fx_self"]=200066 }, [30059]={ @@ -15551,6 +16052,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=200067, ["fx_self"]=200067 }, [30060]={ @@ -15575,6 +16077,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=200068, ["fx_self"]=200068 }, [30061]={ @@ -15599,6 +16102,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200070, ["fx_self"]=200070 }, [30062]={ @@ -15623,6 +16127,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200071, ["fx_self"]=200071 }, [30063]={ @@ -15647,6 +16152,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200072, ["fx_self"]=200072 }, [30064]={ @@ -15671,6 +16177,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200074, ["fx_self"]=200074 }, [30065]={ @@ -15695,6 +16202,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200075, ["fx_self"]=200075 }, [30066]={ @@ -15719,6 +16227,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200074, ["fx_self"]=200074 }, [30067]={ @@ -15743,6 +16252,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200077, ["fx_self"]=200077 }, [30068]={ @@ -15767,6 +16277,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200078, ["fx_self"]=200078 }, [30069]={ @@ -15791,6 +16302,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200079, ["fx_self"]=200079 }, [30070]={ @@ -15815,6 +16327,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=200081, ["fx_self"]=200081 }, [30071]={ @@ -15839,6 +16352,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=200082, ["fx_self"]=200082 }, [30072]={ @@ -15863,6 +16377,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=200083, ["fx_self"]=200083 }, [30073]={ @@ -15887,6 +16402,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200086, ["fx_self"]=200086 }, [30074]={ @@ -15911,6 +16427,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200086, ["fx_self"]=200086 }, [30075]={ @@ -15935,6 +16452,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200087, ["fx_self"]=200087 }, [30076]={ @@ -15959,6 +16477,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200089, ["fx_self"]=200089 }, [30077]={ @@ -15983,6 +16502,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200090, ["fx_self"]=200090 }, [30078]={ @@ -16007,6 +16527,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200091, ["fx_self"]=200091 }, [30079]={ @@ -16037,6 +16558,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200093, ["fx_self"]=200093 }, [30080]={ @@ -16067,6 +16589,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200094, ["fx_self"]=200094 }, [30081]={ @@ -16097,6 +16620,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200095, ["fx_self"]=200095 }, [30082]={ @@ -16121,6 +16645,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200096, ["fx_self"]=200096 }, [30083]={ @@ -16145,6 +16670,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200097, ["fx_self"]=200097 }, [30084]={ @@ -16169,6 +16695,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200098, ["fx_self"]=200098 }, [30085]={ @@ -16193,6 +16720,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200100, ["fx_self"]=200100 }, [30086]={ @@ -16217,6 +16745,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200101, ["fx_self"]=200101 }, [30087]={ @@ -16241,6 +16770,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200102, ["fx_self"]=200102 }, [30088]={ @@ -16265,6 +16795,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200104, ["fx_self"]=200104 }, [30089]={ @@ -16289,6 +16820,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200105, ["fx_self"]=200105 }, [30090]={ @@ -16313,6 +16845,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200106, ["fx_self"]=200106 }, [30091]={ @@ -16337,6 +16870,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200109, ["fx_self"]=200109 }, [30092]={ @@ -16361,6 +16895,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200110, ["fx_self"]=200110 }, [30093]={ @@ -16385,6 +16920,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200111, ["fx_self"]=200111 }, [30094]={ @@ -16409,6 +16945,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200114, ["fx_self"]=200114 }, [30095]={ @@ -16433,6 +16970,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200115, ["fx_self"]=200115 }, [30096]={ @@ -16457,6 +16995,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200116, ["fx_self"]=200116 }, [30097]={ @@ -16487,6 +17026,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200123, ["fx_self"]=200123 }, [30098]={ @@ -16517,6 +17057,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200124, ["fx_self"]=200124 }, [30099]={ @@ -16547,6 +17088,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200125, ["fx_self"]=200125 }, [30100]={ @@ -16594,6 +17136,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200128, ["fx_self"]=200128 }, [30101]={ @@ -16641,6 +17184,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200129, ["fx_self"]=200129 }, [30102]={ @@ -16688,6 +17232,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200130, ["fx_self"]=200130 }, [30103]={ @@ -16712,6 +17257,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200133, ["fx_self"]=200133 }, [30104]={ @@ -16736,6 +17282,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200134, ["fx_self"]=200134 }, [30105]={ @@ -16760,6 +17307,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200135, ["fx_self"]=200135 }, [30106]={ @@ -16801,6 +17349,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200138, ["fx_self"]=200138 }, [30107]={ @@ -16842,6 +17391,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200139, ["fx_self"]=200139 }, [30108]={ @@ -16883,6 +17433,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200140, ["fx_self"]=200140 }, [30109]={ @@ -16907,6 +17458,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=200142, ["fx_self"]=200142 }, [30110]={ @@ -16931,6 +17483,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=200143, ["fx_self"]=200143 }, [30111]={ @@ -16955,6 +17508,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=200144, ["fx_self"]=200144 }, [30112]={ @@ -16978,6 +17532,7 @@ local skill = { 1000013 }, ["name_act"]="attack04", + ["fx_self"]=200145, ["fx_self"]=200145 }, [30113]={ @@ -17025,6 +17580,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=200131, ["fx_self"]=200131 }, [40001]={ @@ -17049,6 +17605,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=400040, ["fx_self"]=400040 }, [40002]={ @@ -17073,6 +17630,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=400041, ["fx_self"]=400041 }, [40003]={ @@ -17097,6 +17655,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=400042, ["fx_self"]=400042 }, [40004]={ @@ -17121,6 +17680,7 @@ local skill = { 1000024 }, ["name_act"]="attack04", + ["fx_self"]=400043, ["fx_self"]=400043 }, [40005]={ @@ -17145,6 +17705,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400000, ["fx_self"]=400000 }, [40006]={ @@ -17169,6 +17730,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400001, ["fx_self"]=400001 }, [40007]={ @@ -17193,6 +17755,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400002, ["fx_self"]=400002 }, [40008]={ @@ -17217,6 +17780,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400003, ["fx_self"]=400003 }, [40009]={ @@ -17241,6 +17805,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400005, ["fx_self"]=400005 }, [40010]={ @@ -17265,6 +17830,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400006, ["fx_self"]=400006 }, [40011]={ @@ -17289,6 +17855,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400007, ["fx_self"]=400007 }, [40012]={ @@ -17313,6 +17880,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400008, ["fx_self"]=400008 }, [40013]={ @@ -17337,6 +17905,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400010, ["fx_self"]=400010 }, [40014]={ @@ -17361,6 +17930,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400011, ["fx_self"]=400011 }, [40015]={ @@ -17385,6 +17955,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400012, ["fx_self"]=400012 }, [40016]={ @@ -17409,6 +17980,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400013, ["fx_self"]=400013 }, [40017]={ @@ -17433,6 +18005,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_target"]=400015, ["fx_target"]=400015 }, [40018]={ @@ -17457,6 +18030,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_target"]=400016, ["fx_target"]=400016 }, [40019]={ @@ -17481,6 +18055,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_target"]=400017, ["fx_target"]=400017 }, [40020]={ @@ -17505,6 +18080,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_target"]=400018, ["fx_target"]=400018 }, [40021]={ @@ -17529,6 +18105,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400020, ["fx_self"]=400020 }, [40022]={ @@ -17553,6 +18130,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400021, ["fx_self"]=400021 }, [40023]={ @@ -17577,6 +18155,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400022, ["fx_self"]=400022 }, [40024]={ @@ -17601,6 +18180,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400023, ["fx_self"]=400023 }, [40025]={ @@ -17625,6 +18205,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=400025, ["fx_self"]=400025 }, [40026]={ @@ -17649,6 +18230,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=400026, ["fx_self"]=400026 }, [40027]={ @@ -17673,6 +18255,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=400027, ["fx_self"]=400027 }, [40028]={ @@ -17697,6 +18280,7 @@ local skill = { 1000024 }, ["name_act"]="attack04", + ["fx_self"]=400028, ["fx_self"]=400028 }, [40029]={ @@ -17721,6 +18305,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400030, ["fx_self"]=400030 }, [40030]={ @@ -17745,6 +18330,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400031, ["fx_self"]=400031 }, [40031]={ @@ -17769,6 +18355,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400032, ["fx_self"]=400032 }, [40032]={ @@ -17793,6 +18380,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400033, ["fx_self"]=400033 }, [40033]={ @@ -17817,6 +18405,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400035, ["fx_self"]=400035 }, [40034]={ @@ -17841,6 +18430,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400036, ["fx_self"]=400036 }, [40035]={ @@ -17865,6 +18455,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400037, ["fx_self"]=400037 }, [40036]={ @@ -17889,6 +18480,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400038, ["fx_self"]=400038 }, [50001]={ @@ -17913,6 +18505,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400068, ["fx_self"]=400068 }, [50002]={ @@ -17937,6 +18530,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400069, ["fx_self"]=400069 }, [50003]={ @@ -17961,6 +18555,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400070, ["fx_self"]=400070 }, [50004]={ @@ -17985,6 +18580,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400071, ["fx_self"]=400071 }, [50005]={ @@ -18021,7 +18617,8 @@ local skill = { 1167, 3000, 300 - } + }, + ["fx_self"]=400072 }, [50006]={ ["effect_type"]=1, @@ -18060,6 +18657,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400005, ["fx_self"]=400005 }, [50008]={ @@ -18084,6 +18682,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400006, ["fx_self"]=400006 }, [50009]={ @@ -18108,6 +18707,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400007, ["fx_self"]=400007 }, [50010]={ @@ -18132,6 +18732,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400008, ["fx_self"]=400008 }, [50011]={ @@ -18188,7 +18789,8 @@ local skill = { 1900, 3000, 400 - } + }, + ["fx_self"]=400009 }, [50012]={ ["effect_type"]=1, @@ -18212,6 +18814,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400020, ["fx_self"]=400020 }, [50013]={ @@ -18236,6 +18839,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400021, ["fx_self"]=400021 }, [50014]={ @@ -18260,6 +18864,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400022, ["fx_self"]=400022 }, [50015]={ @@ -18284,6 +18889,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400023, ["fx_self"]=400023 }, [50016]={ @@ -18360,7 +18966,8 @@ local skill = { 1500, 3000, 400 - } + }, + ["fx_self"]=400024 }, [50017]={ ["effect_type"]=1, @@ -18384,6 +18991,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400078, ["fx_self"]=400078 }, [50018]={ @@ -18408,6 +19016,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400079, ["fx_self"]=400079 }, [50019]={ @@ -18432,6 +19041,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400080, ["fx_self"]=400080 }, [50020]={ @@ -18456,6 +19066,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400081, ["fx_self"]=400081 }, [50021]={ @@ -18529,7 +19140,8 @@ local skill = { 1166, 3000, 200 - } + }, + ["fx_self"]=400082 }, [50022]={ ["effect_type"]=1, @@ -18559,6 +19171,7 @@ local skill = { 1000023 }, ["name_act"]="attack01", + ["fx_self"]=400100, ["fx_self"]=400100 }, [50023]={ @@ -18589,6 +19202,7 @@ local skill = { 1000024 }, ["name_act"]="attack02", + ["fx_self"]=400101, ["fx_self"]=400101 }, [50024]={ @@ -18619,6 +19233,7 @@ local skill = { 1000021 }, ["name_act"]="attack03", + ["fx_self"]=400102, ["fx_self"]=400102 }, [50025]={ @@ -18649,6 +19264,7 @@ local skill = { 1000022 }, ["name_act"]="attack04", + ["fx_self"]=400103, ["fx_self"]=400103 }, [50026]={ @@ -18690,7 +19306,8 @@ local skill = { 1800, 3000, 400 - } + }, + ["fx_self"]=400104 }, [50027]={ ["effect_type"]=1, @@ -18714,6 +19331,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400054, ["fx_self"]=400054 }, [50028]={ @@ -18738,6 +19356,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400055, ["fx_self"]=400055 }, [50029]={ @@ -18762,6 +19381,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400056, ["fx_self"]=400056 }, [50030]={ @@ -18786,6 +19406,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400057, ["fx_self"]=400057 }, [50031]={ @@ -18821,7 +19442,8 @@ local skill = { 800, 3000, 400 - } + }, + ["fx_self"]=400058 }, [50032]={ ["effect_type"]=1, @@ -18845,6 +19467,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400010, ["fx_self"]=400010 }, [50033]={ @@ -18869,6 +19492,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400011, ["fx_self"]=400011 }, [50034]={ @@ -18893,6 +19517,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400012, ["fx_self"]=400012 }, [50035]={ @@ -18917,6 +19542,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400013, ["fx_self"]=400013 }, [50036]={ @@ -18978,7 +19604,8 @@ local skill = { 1400, 3000, 400 - } + }, + ["fx_self"]=400014 }, [50037]={ ["effect_type"]=1, @@ -19002,6 +19629,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400000, ["fx_self"]=400000 }, [50038]={ @@ -19026,6 +19654,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400001, ["fx_self"]=400001 }, [50039]={ @@ -19050,6 +19679,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400002, ["fx_self"]=400002 }, [50040]={ @@ -19074,6 +19704,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400003, ["fx_self"]=400003 }, [50041]={ @@ -19136,7 +19767,8 @@ local skill = { 800, 3000, 400 - } + }, + ["fx_self"]=400004 }, [50042]={ ["effect_type"]=1, @@ -19179,6 +19811,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400073, ["fx_self"]=400073 }, [50044]={ @@ -19203,6 +19836,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400074, ["fx_self"]=400074 }, [50045]={ @@ -19227,6 +19861,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400075, ["fx_self"]=400075 }, [50046]={ @@ -19251,6 +19886,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400076, ["fx_self"]=400076 }, [50047]={ @@ -19285,7 +19921,8 @@ local skill = { 2033, 3000, 400 - } + }, + ["fx_self"]=400077 }, [50048]={ ["skill_type"]=7, @@ -19322,6 +19959,7 @@ local skill = { 2300114 }, ["name_act"]="attack01", + ["fx_self"]=400095, ["fx_self"]=400095 }, [50050]={ @@ -19352,6 +19990,7 @@ local skill = { 4200111 }, ["name_act"]="attack02", + ["fx_self"]=400096, ["fx_self"]=400096 }, [50051]={ @@ -19382,6 +20021,7 @@ local skill = { 4200112 }, ["name_act"]="attack03", + ["fx_self"]=400097, ["fx_self"]=400097 }, [50052]={ @@ -19412,6 +20052,7 @@ local skill = { 4200113 }, ["name_act"]="attack04", + ["fx_self"]=400098, ["fx_self"]=400098 }, [50053]={ @@ -19442,7 +20083,8 @@ local skill = { 2033, 3000, 400 - } + }, + ["fx_self"]=400099 }, [50054]={ ["effect_type"]=1, @@ -19487,6 +20129,7 @@ local skill = { 1000011 }, ["name_act"]="attack01", + ["fx_self"]=400049, ["fx_self"]=400049 }, [50056]={ @@ -19511,6 +20154,7 @@ local skill = { 1000012 }, ["name_act"]="attack02", + ["fx_self"]=400050, ["fx_self"]=400050 }, [50057]={ @@ -19535,6 +20179,7 @@ local skill = { 1000013 }, ["name_act"]="attack03", + ["fx_self"]=400051, ["fx_self"]=400051 }, [50058]={ @@ -19559,6 +20204,7 @@ local skill = { 1000014 }, ["name_act"]="attack04", + ["fx_self"]=400052, ["fx_self"]=400052 }, [50059]={ @@ -19595,7 +20241,8 @@ local skill = { 966, 5000, 400 - } + }, + ["fx_self"]=400053 }, [50060]={ ["effect_type"]=2, @@ -19634,6 +20281,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_target"]=400015, ["fx_target"]=400015 }, [50062]={ @@ -19658,6 +20306,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_target"]=400016, ["fx_target"]=400016 }, [50063]={ @@ -19682,6 +20331,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_target"]=400017, ["fx_target"]=400017 }, [50064]={ @@ -19706,6 +20356,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_target"]=400018, ["fx_target"]=400018 }, [50065]={ @@ -19741,6 +20392,7 @@ local skill = { 3300120 }, ["name_act"]="skill01", + ["fx_self"]=400019, ["fx_self"]=400019 }, [50067]={ @@ -19765,6 +20417,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400035, ["fx_self"]=400035 }, [50068]={ @@ -19789,6 +20442,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400036, ["fx_self"]=400036 }, [50069]={ @@ -19813,6 +20467,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400037, ["fx_self"]=400037 }, [50070]={ @@ -19837,6 +20492,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400038, ["fx_self"]=400038 }, [50071]={ @@ -19897,7 +20553,8 @@ local skill = { 1500, 3000, 400 - } + }, + ["fx_self"]=400039 }, [50072]={ ["effect_type"]=1, @@ -19921,6 +20578,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400093, ["fx_self"]=400093 }, [50073]={ @@ -19945,6 +20603,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400093, ["fx_self"]=400093 }, [50074]={ @@ -19969,6 +20628,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400093, ["fx_self"]=400093 }, [50075]={ @@ -19993,6 +20653,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400093, ["fx_self"]=400093 }, [50076]={ @@ -20056,7 +20717,8 @@ local skill = { 1600, 3000, 200 - } + }, + ["fx_self"]=400094 }, [50077]={ ["effect_type"]=1, @@ -20080,6 +20742,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400105, ["fx_self"]=400105 }, [50078]={ @@ -20104,6 +20767,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400106, ["fx_self"]=400106 }, [50079]={ @@ -20128,6 +20792,7 @@ local skill = { 10049 }, ["name_act"]="attack03", + ["fx_self"]=400107, ["fx_self"]=400107 }, [50080]={ @@ -20152,6 +20817,7 @@ local skill = { 10048 }, ["name_act"]="attack04", + ["fx_self"]=400108, ["fx_self"]=400108 }, [50081]={ @@ -20206,7 +20872,9 @@ local skill = { 633, 3000, 400 - } + }, + ["fx_self"]=400109, + ["fx_target"]=300034 }, [50082]={ ["effect_type"]=1, @@ -20230,6 +20898,7 @@ local skill = { 4200111 }, ["name_act"]="attack01", + ["fx_target"]=400059, ["fx_target"]=400059 }, [50083]={ @@ -20254,6 +20923,7 @@ local skill = { 4200112 }, ["name_act"]="attack02", + ["fx_target"]=400060, ["fx_target"]=400060 }, [50084]={ @@ -20278,6 +20948,7 @@ local skill = { 4200113 }, ["name_act"]="attack03", + ["fx_target"]=400061, ["fx_target"]=400061 }, [50085]={ @@ -20302,6 +20973,7 @@ local skill = { 4200114 }, ["name_act"]="attack04", + ["fx_target"]=400062, ["fx_target"]=400062 }, [50086]={ @@ -20342,7 +21014,8 @@ local skill = { 1066, 3000, 400 - } + }, + ["fx_target"]=400063 }, [50087]={ ["effect_type"]=1, @@ -20366,6 +21039,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=400040, ["fx_self"]=400040 }, [50088]={ @@ -20390,6 +21064,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=400041, ["fx_self"]=400041 }, [50089]={ @@ -20414,6 +21089,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=400042, ["fx_self"]=400042 }, [50090]={ @@ -20438,6 +21114,7 @@ local skill = { 1000024 }, ["name_act"]="attack04", + ["fx_self"]=400043, ["fx_self"]=400043 }, [50091]={ @@ -20477,7 +21154,8 @@ local skill = { 200, 3000, 400 - } + }, + ["fx_self"]=400044 }, [50092]={ ["effect_type"]=1, @@ -20526,6 +21204,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400083, ["fx_self"]=400083 }, [50094]={ @@ -20550,6 +21229,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400084, ["fx_self"]=400084 }, [50095]={ @@ -20574,6 +21254,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400085, ["fx_self"]=400085 }, [50096]={ @@ -20598,6 +21279,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400086, ["fx_self"]=400086 }, [50097]={ @@ -20664,7 +21346,8 @@ local skill = { 1833, 3000, 400 - } + }, + ["fx_self"]=400087 }, [50098]={ ["effect_type"]=1, @@ -20688,6 +21371,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400045, ["fx_self"]=400045 }, [50099]={ @@ -20712,6 +21396,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400045, ["fx_self"]=400045 }, [50100]={ @@ -20736,6 +21421,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400046, ["fx_self"]=400046 }, [50101]={ @@ -20760,6 +21446,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400047, ["fx_self"]=400047 }, [50102]={ @@ -20800,7 +21487,8 @@ local skill = { 633, 3000, 400 - } + }, + ["fx_target"]=400048 }, [50103]={ ["effect_type"]=1, @@ -20830,6 +21518,7 @@ local skill = { 10005 }, ["name_act"]="attack01", + ["fx_self"]=400110, ["fx_self"]=400110 }, [50104]={ @@ -20860,6 +21549,7 @@ local skill = { 10006 }, ["name_act"]="attack02", + ["fx_self"]=400110, ["fx_self"]=400110 }, [50105]={ @@ -20890,6 +21580,7 @@ local skill = { 10023 }, ["name_act"]="attack03", + ["fx_self"]=400110, ["fx_self"]=400110 }, [50106]={ @@ -20920,6 +21611,7 @@ local skill = { 10048 }, ["name_act"]="attack04", + ["fx_self"]=400110, ["fx_self"]=400110 }, [50107]={ @@ -20980,7 +21672,8 @@ local skill = { 1600, 3000, 200 - } + }, + ["fx_self"]=400111 }, [50108]={ ["effect_type"]=1, @@ -21010,6 +21703,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=400064, ["fx_self"]=400064 }, [50109]={ @@ -21040,6 +21734,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=400064, ["fx_self"]=400064 }, [50110]={ @@ -21070,6 +21765,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=400065, ["fx_self"]=400065 }, [50111]={ @@ -21100,6 +21796,7 @@ local skill = { 1000024 }, ["name_act"]="attack04", + ["fx_self"]=400066, ["fx_self"]=400066 }, [50112]={ @@ -21130,6 +21827,7 @@ local skill = { 5200120 }, ["name_act"]="skill01", + ["fx_self"]=400067, ["fx_self"]=400067 }, [50113]={ @@ -21154,6 +21852,7 @@ local skill = { 1000021 }, ["name_act"]="attack01", + ["fx_self"]=400025, ["fx_self"]=400025 }, [50114]={ @@ -21178,6 +21877,7 @@ local skill = { 1000022 }, ["name_act"]="attack02", + ["fx_self"]=400026, ["fx_self"]=400026 }, [50115]={ @@ -21202,6 +21902,7 @@ local skill = { 1000023 }, ["name_act"]="attack03", + ["fx_self"]=400027, ["fx_self"]=400027 }, [50116]={ @@ -21226,6 +21927,7 @@ local skill = { 1000024 }, ["name_act"]="attack04", + ["fx_self"]=400028, ["fx_self"]=400028 }, [50117]={ @@ -21291,7 +21993,8 @@ local skill = { 2066, 3000, 400 - } + }, + ["fx_self"]=400029 }, [50118]={ ["effect_type"]=1, @@ -21334,6 +22037,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400030, ["fx_self"]=400030 }, [50120]={ @@ -21358,6 +22062,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400031, ["fx_self"]=400031 }, [50121]={ @@ -21382,6 +22087,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400032, ["fx_self"]=400032 }, [50122]={ @@ -21406,6 +22112,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400033, ["fx_self"]=400033 }, [50123]={ @@ -21454,7 +22161,8 @@ local skill = { 1133, 3000, 400 - } + }, + ["fx_self"]=400034 }, [50124]={ ["effect_type"]=1, @@ -21497,6 +22205,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400088, ["fx_self"]=400088 }, [50126]={ @@ -21521,6 +22230,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400089, ["fx_self"]=400089 }, [50127]={ @@ -21545,6 +22255,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400090, ["fx_self"]=400090 }, [50128]={ @@ -21569,6 +22280,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400091, ["fx_self"]=400091 }, [50129]={ @@ -21617,7 +22329,8 @@ local skill = { 1800, 3000, 400 - } + }, + ["fx_self"]=400092 }, [50130]={ ["effect_type"]=2, @@ -21662,6 +22375,7 @@ local skill = { 1000001 }, ["name_act"]="attack01", + ["fx_self"]=400112, ["fx_self"]=400112 }, [50132]={ @@ -21692,6 +22406,7 @@ local skill = { 1000002 }, ["name_act"]="attack02", + ["fx_self"]=400113, ["fx_self"]=400113 }, [50133]={ @@ -21722,6 +22437,7 @@ local skill = { 1000003 }, ["name_act"]="attack03", + ["fx_self"]=400114, ["fx_self"]=400114 }, [50134]={ @@ -21752,6 +22468,7 @@ local skill = { 1000004 }, ["name_act"]="attack04", + ["fx_self"]=400115, ["fx_self"]=400115 }, [50135]={ @@ -21815,6 +22532,7 @@ local skill = { ["sound"]=54002200, ["sound_delay"]=0, ["name_act"]="skill01", + ["fx_self"]=400116, ["fx_self"]=400116 }, [50136]={ diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index a592ca08..e9f3567d 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -258,6 +258,40 @@ local localization_global = ["NOTICE_TITLE"] = "公告", ["MAINTENANCE_NOTICE_DEFAULT"] = "服务器正在加紧链接中，目前元素较多，请稍后重试进入。", ["CANNOT_RENAME_DESC_5"] = "与当前昵称一致，无需更改", + ["ARENA_DESC_1"] = "竞技场", + ["ARENA_DESC_2"] = "匹配", + ["ARENA_DESC_3"] = "第{0}赛季", + ["ARENA_DESC_4"] = "军团竞技场", + ["ARENA_DESC_5"] = "排行榜", + ["ARENA_DESC_6"] = "竞技场战令", + ["ARENA_DESC_7"] = "战报", + ["ARENA_DESC_8"] = "暂时没有战报", + ["ARENA_DESC_9"] = "防守阵容", + ["ARENA_DESC_10"] = "进攻阵容", + ["ARENA_DESC_11"] = "结算奖励", + ["ARENA_DESC_12"] = "S{0}赛季结算时抵达相应段位可在下一赛季时来此领取奖励。", + ["ARENA_DESC_13"] = "你在S{0}赛季时的段位", + ["ARENA_DESC_14"] = "战况", + ["ARENA_DESC_15"] = "对手", + ["ARENA_DESC_16"] = "积分", + ["ARENA_DESC_17"] = "防守胜利", + ["ARENA_DESC_18"] = "防守失败", + ["ARENA_DESC_19"] = "进攻胜利", + ["ARENA_DESC_20"] = "进攻失败", + ["ARENA_RANKNAME_1"] = "青铜骑士Ⅲ", + ["ARENA_RANKNAME_2"] = "青铜骑士Ⅱ", + ["ARENA_RANKNAME_3"] = "青铜骑士Ⅰ", + ["ARENA_RANKNAME_4"] = "白银骑士Ⅳ", + ["ARENA_RANKNAME_5"] = "白银骑士Ⅲ", + ["ARENA_RANKNAME_6"] = "白银骑士Ⅱ", + ["ARENA_RANKNAME_7"] = "白银骑士Ⅰ", + ["ARENA_RANKNAME_8"] = "黄金龙骑Ⅴ", + ["ARENA_RANKNAME_9"] = "黄金龙骑Ⅳ", + ["ARENA_RANKNAME_10"] = "黄金龙骑Ⅲ", + ["ARENA_RANKNAME_11"] = "黄金龙骑Ⅱ", + ["ARENA_RANKNAME_12"] = "黄金龙骑Ⅰ", + ["SHOP_DESC_38"] = "入门礼包", + ["SHOP_DESC_39"] = "超值S级英雄,仅此一次!", } return localization_global \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index de7e9c13..34ea05ee 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -455,7 +455,7 @@ local tutorial = { [50000]={ ["next_id"]=50010, ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/left_btn", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/left/daily_challenge", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -489,7 +489,7 @@ local tutorial = { 0, 180 }, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right_btn", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", ["arrow_direction"]=1, ["arrow_offset"]={ 0, diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index b63ca318..6188c8f8 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -188,6 +188,7 @@ GConst.ATLAS_PATH = { BATTLE = "assets/arts/atlas/ui/battle.asset", DAILY_CHALLENGE = "assets/arts/atlas/ui/daily_challenge.asset", DUNGEON = "assets/arts/atlas/ui/dungeon.asset", + ARENA = "assets/arts/atlas/ui/arena.asset", ICON_ITEM = "assets/arts/atlas/icon/item.asset", UI_LOGIN = "assets/arts/atlas/ui/login.asset", ICON_SKILL = "assets/arts/atlas/icon/skill.asset", diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua new file mode 100644 index 00000000..b007888d --- /dev/null +++ b/lua/app/module/arena/arena_manager.lua @@ -0,0 +1,119 @@ +local ArenaManager = class("ArenaManager", BaseModule) + +-- 赛季改变 +function ArenaManager:onSeasonChanged() + if not self.isResetting then + return + end + + DataManager.ArenaData:onSeasonChanged() + self:reqArenaInfo() +end + +-- 匹配 +function ArenaManager:reqMatch() + self:sendMessage(ProtoMsgType.FromMsgEnum.MatchReq, {}, {}, self.rspMatch, nil) +end + +function ArenaManager:rspMatch(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onMatchInfoReceived(result.match_info) + end +end + +-- 挑战 +function ArenaManager:reqChallenge() + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPChallengeStartReq, {}, {}, self.rspChallenge, nil) +end + +function ArenaManager:rspChallenge(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + end +end + +-- 结算 +function ArenaManager:reqSettlement() + local parmas = { + win = nil, + heroes = nil, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPChallengeSettlementReq, parmas, {}, self.rspSettlement, nil) +end + +function ArenaManager:rspSettlement(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onBattleResultReceived(result.settlement) + -- 展示结算界面 + end +end + +-- 战报 +function ArenaManager:reqRecord() + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPRecordHistoryReq, {}, {}, self.rspRecord, nil) +end + +function ArenaManager:rspRecord(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onRecentBattleReceived(result.history) + end +end + +-- 排行榜 +function ArenaManager:reqRank() + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPRankReq, {}, {}, self.rspRank, nil) +end + +function ArenaManager:rspRank(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onRankDataReceived(result.rank, result.top100.info) + end +end + +-- 排行榜玩家编队信息 +function ArenaManager:reqRankHeroes(id) + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPRankHeroesReq, {rid = id}, {}, self.rspRankHeroes, nil) +end + +function ArenaManager:rspRankHeroes(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onRankFormationReceived(result.reqData.rid, result.array_heroes) + end +end + +-- 领取上赛季奖励 +function ArenaManager:reqLastSeasonReward() + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPSeasonRewardReq, {}, {}, self.rspLastSeasonReward, nil) +end + +function ArenaManager:rspLastSeasonReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onLastSeasonRewardReceived() + GFunc.showRewardBox(result.rewards) + end +end + +-- 更新赛季信息 +function ArenaManager:reqArenaInfo() + self.isResetting = true + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPInfoReq, {}, {}, self.rspArenaInfo, nil) +end + +function ArenaManager:rspArenaInfo(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + self.isResetting = false + DataManager.ArenaData:init(result.arena_info) + end +end + +-- 结束匹配cd +function ArenaManager:reqOverCD(isAd) + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPOverCDReq, {ad = isAd}, {}, self.rspOverCD, nil) +end + +function ArenaManager:rspOverCD(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onOverFreeRematchCD(result.reqData.ad) + end +end + +return ArenaManager \ No newline at end of file diff --git a/lua/app/module/arena/arena_manager.lua.meta b/lua/app/module/arena/arena_manager.lua.meta new file mode 100644 index 00000000..6e50a15a --- /dev/null +++ b/lua/app/module/arena/arena_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a11e7fd70ab0c9a45a852859ee03bb02 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 74165e26..edc52d5a 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -85,6 +85,13 @@ BattleConst.BATTLE_TYPE = { ARENA = "5", } +-- 编队 +BattleConst.FORMATION_TYPE = { + STAGE = "1",-- 主线章节 + ARENA_ATTACK = "2",-- 竞技场进攻 + ARENA_DEFEND = "3",-- 竞技场防守 +} + BattleConst.TYPEOF_LUA_COMP = { BATTLE_HERO_COMPONENT = "app/module/battle/component/battle_hero_comp", BATTLE_MONSTER_COMPONENT = "app/module/battle/component/battle_monster_comp", diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 0010b04d..dacae463 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -23,7 +23,7 @@ function ChapterManager:openBoxFinish(result) end function ChapterManager:startFight() - if not ModuleManager.FormationManager:formationIsFull() then + if not DataManager.ArenaData:formationIsFull(GConst.BattleConst.BATTLE_TYPE.STAGE) then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8)) return end diff --git a/lua/app/module/commerce/commerce_manager.lua b/lua/app/module/commerce/commerce_manager.lua index 7bb07164..85c83e06 100644 --- a/lua/app/module/commerce/commerce_manager.lua +++ b/lua/app/module/commerce/commerce_manager.lua @@ -1,5 +1,7 @@ local CommerceManager = class("CommerceManager", BaseModule) +-- 体力 + function CommerceManager:showBuyVitUI() UIManager:showUI("app/ui/commerce/buy_vit_ui") end @@ -38,4 +40,31 @@ function CommerceManager:onBuyBitFinish(data) end end +-- 竞技场入场券 + +function CommerceManager:showBuyArenaTicketUI() + UIManager:showUI("app/ui/arena/arena_buy_ticket_ui") +end + +function CommerceManager:onBuyArenaTicket(isAd) + self:sendMessage(ProtoMsgType.FromMsgEnum.BuyTicketReq, {ad = isAd}, {}, self.onBuyArenaTicketFinish, nil) +end + +function CommerceManager:onBuyArenaTicketFinish(data) + if data.status ~= 0 then + return + end + + if data.costs then + -- 钻石购买 + DataManager.PlayerData:addArenaTicketGemBuyCount() + else + -- 激励视频 + DataManager.PlayerData:addArenaTicketAdBuyCount() + end + if data.rewards then + GFunc.showRewardBox(data.rewards) + end +end + return CommerceManager \ No newline at end of file diff --git a/lua/app/module/daily_challenge/daily_challenge_manager.lua b/lua/app/module/daily_challenge/daily_challenge_manager.lua index c07e35b8..f3551261 100644 --- a/lua/app/module/daily_challenge/daily_challenge_manager.lua +++ b/lua/app/module/daily_challenge/daily_challenge_manager.lua @@ -54,7 +54,7 @@ function DailyChallengeManager:startChallenge() end -- 检查阵容 - if not ModuleManager.FormationManager:formationIsFull() then + if not DataManager.ArenaData:formationIsFull(GConst.BattleConst.BATTLE_TYPE.STAGE) then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8)) return end diff --git a/lua/app/module/formation/formation_manager.lua b/lua/app/module/formation/formation_manager.lua index 80bec5bb..a8783d8d 100644 --- a/lua/app/module/formation/formation_manager.lua +++ b/lua/app/module/formation/formation_manager.lua @@ -1,13 +1,12 @@ local FormationManager = class("FormationManager", BaseModule) +-- 主线编队 function FormationManager:upHeroToStageFormation(heroId, matchType) local formation = DataManager.FormationData:getStageFormation() if formation[matchType] == heroId then return end local args = { - -- formationType = GConst.BattleConst.BATTLE_TYPE.STAGE, - -- matchType = matchType, id = heroId } self:sendMessage(ProtoMsgType.FromMsgEnum.HeroPutOnReq, args, {}, self.upHeroToStageFormationFinish) @@ -26,25 +25,20 @@ function FormationManager:upHeroToStageFormationFinish(result) end end -function FormationManager:formationIsFull() - local actvieMap = DataManager.HeroData:getMatchActiveHeroMap() - local formation = DataManager.FormationData:getStageFormation() - local count = 0 - for matchtype = 1, GConst.BattleConst.ELEMENT_TYPE_COUNT do - if not formation[matchtype] or formation[matchtype] <= 0 then - if actvieMap[matchtype] and table.nums(actvieMap[matchtype]) > 0 then - return false - end - else - count = count + 1 - end - end +-- 竞技场编队 +function FormationManager:reqArenaFormation() + local parmas = { + -- 需要五个数据，空位用0补齐 + attack_heroIds = DataManager.FormationData:getArenaAttackFormation(),-- 进攻编队 + defend_heroIds = DataManager.FormationData:getArenaDefendFormation(),-- 防守编队 + } + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPHeroesArrayReq, parmas, {}, self.rspArenaFormation, nil) +end - if count <= 0 then - return false - end - - return true +function FormationManager:rspArenaFormation(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FormationData:initArena(result.reqData.attack_heroIds, result.reqData.defend_heroIds) + end end return FormationManager \ No newline at end of file diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index 5a7121d5..1f3ba49b 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -15,6 +15,7 @@ ItemConst.ITEM_ID_BOX_KEY_LV_3 = 15 ItemConst.ITEM_ID_BOX_LV_5 = 18 ItemConst.ITEM_ID_RANDOM_FRAGMENT = 19 ItemConst.ITEM_ID_ARENA_BOUNTY_EXP = 21 +ItemConst.ITEM_ID_ARENA_TICKET = 22 ItemConst.ITEM_TYPE = { RES = 1, diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index 1bffbd83..0ce0e7a4 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -14,11 +14,17 @@ MainCityConst.BOTTOM_ICON = { MainCityConst.BOTTOM_CLOSE_ICON = { } --- main界面模块，序号是模块从左往右的切换顺序，需要是连续的 +-- main界面模块 MainCityConst.MAIN_MODULE = { - DAILY_CHALLENGE = 1, - CHAPTER = 2, - DUNGEON = 3, + -- 左侧模块，负数，绝对值升序 + ARENA = -1, + DAILY_CHALLENGE = -2, + + -- 主模块 + CHAPTER = 0, + + -- 右侧模块，正数，绝对值升序 + DUNGEON = 1, } MainCityConst.LEFT_SIDE_BARS = { diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index ab112b62..acd5fd4b 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -37,6 +37,8 @@ local ProtoMsgType = { [904224593] = "ArenaBountyLevelUnlockRsp", [1008447203] = "DeleteReq", [1008449036] = "DeleteRsp", + [1067411524] = "BuyTicketReq", + [1067413357] = "BuyTicketRsp", [1068769299] = "ReconnectReq", [1068771132] = "ReconnectRsp", [1070841461] = "LoginReq", @@ -198,6 +200,8 @@ local ProtoMsgType = { ArenaBountyLevelUnlockRsp = 904224593, DeleteReq = 1008447203, DeleteRsp = 1008449036, + BuyTicketReq = 1067411524, + BuyTicketRsp = 1067413357, ReconnectReq = 1068769299, ReconnectRsp = 1068771132, LoginReq = 1070841461, @@ -359,6 +363,8 @@ local ProtoMsgType = { ArenaBountyLevelUnlockRsp = "ArenaBountyLevelUnlockRsp", DeleteReq = "DeleteReq", DeleteRsp = "DeleteRsp", + BuyTicketReq = "BuyTicketReq", + BuyTicketRsp = "BuyTicketRsp", ReconnectReq = "ReconnectReq", ReconnectRsp = "ReconnectRsp", LoginReq = "LoginReq", diff --git a/lua/app/ui/arena/arena_buy_ticket_ui.lua b/lua/app/ui/arena/arena_buy_ticket_ui.lua new file mode 100644 index 00000000..e49c59a4 --- /dev/null +++ b/lua/app/ui/arena/arena_buy_ticket_ui.lua @@ -0,0 +1,109 @@ +-- 竞技场：购买入场券 +local ArenaBuyTicketUI = class("ArenaBuyTicketUI", BaseUI) + +function ArenaBuyTicketUI:isFullScreen() + return false +end + +function ArenaBuyTicketUI:showCommonBG() + return false +end + +function ArenaBuyTicketUI:getPrefabPath() + return "assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab" +end + +function ArenaBuyTicketUI:onPressBackspace() + self:closeUI() +end + +function ArenaBuyTicketUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + uiMap["arena_buy_ticket_ui.bg.close_btn"]:addClickListener(function() + self:closeUI() + end) + + uiMap["arena_buy_ticket_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_ENERGY)) + local constCfg = ConfigManager:getConfig("const") + local diamondReward = constCfg["arena_notes_diamond_buy"].reward + local adReward = constCfg["arena_notes_ad_buy"].reward + uiMap["arena_buy_ticket_ui.bg.cell_1.num_tx_1"]:setText("x" .. GFunc.getRewardNum(diamondReward)) + uiMap["arena_buy_ticket_ui.bg.cell_2.num_tx_1"]:setText("x" .. GFunc.getRewardNum(adReward)) + + self.descTx1 = uiMap["arena_buy_ticket_ui.bg.cell_1.desc_tx"] + self.descTx2 = uiMap["arena_buy_ticket_ui.bg.cell_2.desc_tx"] + self.numTx1 = uiMap["arena_buy_ticket_ui.bg.cell_1.num_tx_2"] + self.numTx2 = uiMap["arena_buy_ticket_ui.bg.cell_2.num_tx_2"] + self.checkImg1 = uiMap["arena_buy_ticket_ui.bg.cell_1.check_img"] + self.checkImg2 = uiMap["arena_buy_ticket_ui.bg.cell_2.check_img"] + self.iconImg1 = uiMap["arena_buy_ticket_ui.bg.cell_1.icon_img"] + self.iconImg2 = uiMap["arena_buy_ticket_ui.bg.cell_2.icon_img"] + + self.buyBtn1 = uiMap["arena_buy_ticket_ui.bg.cell_1"] + self.buyBtn2 = uiMap["arena_buy_ticket_ui.bg.cell_2"] + self.buyBtn1:addClickListener(function() + local diamondCost = constCfg["arena_notes_diamond_cost"].reward + if not GFunc.checkCost(GFunc.getRewardId(diamondCost), GFunc.getRewardNum(diamondCost), true, BIReport.ITEM_GET_TYPE.GEM_BUY_ARENA_TICKET) then + return + end + ModuleManager.CommerceManager:onBuyArenaTicket(false) + end) + self.buyBtn2:addClickListener(function() + SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.ARENA_TICKET, function () + ModuleManager.CommerceManager:onBuyArenaTicket(true) + end) + end) + + self:bind(DataManager.PlayerData, "arenaTicketGemCount", function() + self:onRefresh() + end) + self:bind(DataManager.PlayerData, "arenaTicketADCount", function() + self:onRefresh() + end) +end + +function ArenaBuyTicketUI:onRefresh() + local gemBuyCount = DataManager.PlayerData:getArenaTicketGemBuyCount() + local adBuyCount = DataManager.PlayerData:getArenaTicketAdBuyCount() + local maxGemBuy = GFunc.getConstIntValue("arena_notes_diamond_times") + local maxAdBuy = GFunc.getConstIntValue("arena_notes_ad_times") + if gemBuyCount < maxGemBuy then + self.buyBtn1:setTouchEnable(true) + self.checkImg1:setVisible(false) + self.iconImg1:setVisible(true) + self.numTx1:setVisible(true) + else + self.buyBtn1:setTouchEnable(false) + self.checkImg1:setVisible(true) + self.iconImg1:setVisible(false) + self.numTx1:setVisible(false) + end + + GFunc.setAdsSprite(self.iconImg2, false) + if adBuyCount < maxAdBuy then + self.buyBtn2:setTouchEnable(true) + self.checkImg2:setVisible(false) + self.iconImg2:setVisible(true) + self.numTx2:setVisible(true) + else + self.buyBtn2:setTouchEnable(false) + self.checkImg2:setVisible(true) + self.iconImg2:setVisible(false) + self.numTx2:setVisible(false) + end + + self.descTx1:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, maxGemBuy - gemBuyCount)) + self.descTx2:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, maxAdBuy - adBuyCount)) + + local constCfg = ConfigManager:getConfig("const") + local diamondCost = constCfg["arena_notes_diamond_cost"].reward + self.numTx1:setText(tostring(GFunc.getRewardNum(diamondCost))) + self.numTx2:setText((maxAdBuy - adBuyCount) .. "/" .. GFunc.getConstIntValue("arena_notes_ad_times")) + if not self.adjustIconAndNum then + self.adjustIconAndNum = true + GFunc.centerImgAndTx(self.iconImg1, self.numTx1) + GFunc.centerImgAndTx(self.iconImg2, self.numTx2) + end +end + +return ArenaBuyTicketUI \ No newline at end of file diff --git a/lua/app/ui/arena/arena_buy_ticket_ui.lua.meta b/lua/app/ui/arena/arena_buy_ticket_ui.lua.meta new file mode 100644 index 00000000..5940a61b --- /dev/null +++ b/lua/app/ui/arena/arena_buy_ticket_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 17e60861d0a06c443a76e9d662eefe9a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_formation_ui.lua b/lua/app/ui/arena/arena_formation_ui.lua new file mode 100644 index 00000000..5a5e6cfb --- /dev/null +++ b/lua/app/ui/arena/arena_formation_ui.lua @@ -0,0 +1,51 @@ +-- 竞技场：调整阵容 +local ArenaFormationUI = class("ArenaFormationUI", BaseUI) + +function ArenaFormationUI:isFullScreen() + return false +end + +function ArenaFormationUI:showCommonBG() + return false +end + +function ArenaFormationUI:getPrefabPath() + return "assets/prefabs/ui/arena/arena_formation_ui.prefab" +end + +function ArenaFormationUI:onPressBackspace() + self:closeUI() +end + +function ArenaFormationUI:ctor() +end + +function ArenaFormationUI:onCover() +end + +function ArenaFormationUI:onReshow() +end + +function ArenaFormationUI:onClose() +end + +function ArenaFormationUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + uiMap["arena_formation_ui.banner.btn_ok.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_ENERGY)) + uiMap["arena_formation_ui.banner.btn_ok"]:addClickListener(function() + ModuleManager.FormationManager:reqArenaFormation() + self:closeUI() + end) + + local heroUI = uiMap["arena_formation_ui.hero_ui"] + heroUI:initPrefabHelper() + heroUI:genAllChildren() + self.heroComp = heroUI:addLuaComponent("app/ui/hero/hero_comp") +end + +function ArenaFormationUI:onRefresh() + self.heroComp:refresh(GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK) +end + +return ArenaFormationUI \ No newline at end of file diff --git a/lua/app/ui/arena/arena_formation_ui.lua.meta b/lua/app/ui/arena/arena_formation_ui.lua.meta new file mode 100644 index 00000000..7b02d08f --- /dev/null +++ b/lua/app/ui/arena/arena_formation_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 93e588c4cd4c6104c95a51a9de77f4a3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_match_ui.lua b/lua/app/ui/arena/arena_match_ui.lua new file mode 100644 index 00000000..d7c3b81b --- /dev/null +++ b/lua/app/ui/arena/arena_match_ui.lua @@ -0,0 +1,181 @@ +-- 竞技场：匹配 +local ArenaMatchUI = class("ArenaMatchUI", BaseUI) + +function ArenaMatchUI:isFullScreen() + return false +end + +function ArenaMatchUI:showCommonBG() + return false +end + +function ArenaMatchUI:getPrefabPath() + return "assets/prefabs/ui/arena/arena_match_ui.prefab" +end + +function ArenaMatchUI:onPressBackspace() + self:closeUI() +end + +function ArenaMatchUI:ctor() +end + +function ArenaMatchUI:onCover() +end + +function ArenaMatchUI:onReshow() +end + +function ArenaMatchUI:onClose() + if self.waitSid then + ModuleManager.BattleManager:unscheduleGlobal(self.waitSid) + end + if self.countdownSid then + ModuleManager.BattleManager:unscheduleGlobal(self.countdownSid) + end +end + +function ArenaMatchUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + -- 匹配等待页 + self.matchLoading = uiMap["arena_match_ui.match_loading"] + self.spineLoading = uiMap["arena_match_ui.match_loading.spine_loading"] + self.txSeason = uiMap["arena_match_ui.match_loading.tx_season"] + self.txLoading = uiMap["arena_match_ui.match_loading.tx_loading"] + self.btnCancel = uiMap["arena_match_ui.match_loading.btn_cancel"] + self.txCancel = uiMap["arena_match_ui.match_loading.btn_cancel.tx_cancel"] + + -- 匹配结果页 + self.matchResult = uiMap["arena_match_ui.match_result"] + self.btnClose = uiMap["arena_match_ui.match_result.btn_close"] + -- 对手信息 + self.matchAvatar = CellManager:addCellComp(uiMap["arena_match_ui.match_result.match_info.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) + self.matchTxName = uiMap["arena_match_ui.match_result.match_info.tx_name"] + self.matchTxLevel = uiMap["arena_match_ui.match_result.match_info.tx_level"] + self.matchImgGrading = uiMap["arena_match_ui.match_result.match_info.img_grading"] + self.matchTxGrading = uiMap["arena_match_ui.match_result.match_info.img_grading.tx_grading"] + -- 对手编队 + self.txMatchFormation = uiMap["arena_match_ui.match_result.match_formation.tx_match_formation"] + self.matchHeroFormationComp = uiMap["arena_match_ui.match_result.match_formation.hero_formation_comp"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_FORMATION_COMP) + -- 自己编队 + self.txMyFormation = uiMap["arena_match_ui.match_result.my_formation.tx_my_formation"] + self.selfHeroFormationComp = uiMap["arena_match_ui.match_result.my_formation.hero_formation_comp"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_FORMATION_COMP) + -- 功能按钮 + self.btnStart = uiMap["arena_match_ui.match_result.btn_start"] + self.imgConst = uiMap["arena_match_ui.match_result.btn_start.img_const"] + self.txStart = uiMap["arena_match_ui.match_result.btn_start.tx_start"] + self.txConst = uiMap["arena_match_ui.match_result.btn_start.tx_const"] + self.btnRematch = uiMap["arena_match_ui.match_result.btn_rematch"] + self.txRematch = uiMap["arena_match_ui.match_result.btn_rematch.tx_rematch"] + self.txFreeCountdown = uiMap["arena_match_ui.match_result.btn_rematch.tx_free_countdown"] + self.imgAd = uiMap["arena_match_ui.match_result.btn_rematch.img_ad"] + self.btnFormation = uiMap["arena_match_ui.match_result.btn_formation"] + self.txFormation = uiMap["arena_match_ui.match_result.btn_formation.tx_formation"] + + self.btnCancel:addClickListener(function() + self:closeUI() + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self.btnStart:addClickListener(function() + ModuleManager.ArenaManager:reqChallenge() + self:closeUI() + end) + self.btnRematch:addClickListener(function() + -- todo 判断重新匹配状态 + self:closeUI() + end) + self.btnFormation:addClickListener(function() + UIManager:showUI("app/ui/arena/arena_formation_ui") + self:closeUI() + end) + self:bind(DataManager.ArenaData, "isDirty", function() + self:onRefresh() + end) +end + +function ArenaMatchUI:onRefresh() + self.matchInfo = DataManager.ArenaData:getMatchInfo() + + if self.matchInfo == nil then + ModuleManager.ArenaManager:reqMatch() + self:showMatchLoading() + else + self:showMatchResult() + end +end + +-- 展示匹配等待页 +function ArenaMatchUI:showMatchLoading() + self.matchLoading:setActive(true) + self.matchResult:setActive(false) + + self.txSeason:setText() + self.txLoading:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + self.txCancel:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + + self.spineLoading:playAnimComplete("idle1", false, true, function() + self.spineLoading:playAnim("idle2", true, true) + end) + + -- 等待 + if self.waitSid == nil then + self.waitSid = self.matchLoading:scheduleGlobal(function() + self.matchInfo = DataManager.ArenaData:getMatchInfo() + if self.matchInfo ~= nil then + self:showMatchResult() + else + -- 居然还没获取到数据，继续等待，基本不会走到这 + self:showMatchLoading() + end + end, 1.5) + end +end + +-- 展示匹配结果页 +function ArenaMatchUI:showMatchResult() + self.matchLoading:setActive(true) + self.matchResult:setActive(false) + + self.txMatchFormation:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + self.txMyFormation:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + self.txConst:setText(0) + self.txRematch:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + self.txFormation:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + self.txFreeCountdown:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + + local matchGradingId = DataManager.ArenaData:getGradingIdFromScore(self.matchInfo.score) + self.matchAvatar:refresh(self.matchInfo.avatar, self.matchInfo.avatar_frame) + self.matchTxName:setText(self.matchInfo.name) + self.matchTxLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, self.matchInfo.level)) + self.matchImgGrading:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingIconName(matchGradingId)) + self.matchTxGrading:setText(DataManager.ArenaData:getGradingName(matchGradingId)) + self.matchHeroFormationComp:refreshWithOtherHero(self.matchInfo.array_heroes) + self.selfHeroFormationComp:refresh() + + self.freeRematchCD = DataManager.ArenaData:getFreeRematchCd() + if self.countdownSid then + ModuleManager.BattleManager:unscheduleGlobal(self.countdownSid) + end + self.countdownSid = self.txFreeCountdown:scheduleGlobal(function() + self:refreshCountdown() + end, 1) +end + +function ArenaMatchUI:refreshCountdown() + self.freeRematchCD = self.freeRematchCD - 1 + if self.freeRematchCD <= 0 then + -- 冷却已好 + self.txFreeCountdown:setText("") + + ModuleManager.BattleManager:unscheduleGlobal(self.countdownSid) + else + -- 冷却未好 + self.txFreeCountdown:setText(GFunc.getTimeStrWithHMS(self.freeRematchCD)) + end +end + +return ArenaMatchUI \ No newline at end of file diff --git a/lua/app/ui/arena/arena_match_ui.lua.meta b/lua/app/ui/arena/arena_match_ui.lua.meta new file mode 100644 index 00000000..feab1f8a --- /dev/null +++ b/lua/app/ui/arena/arena_match_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ce9dee8d5caa5e6498370256f94d5ed6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_rank_cell.lua b/lua/app/ui/arena/arena_rank_cell.lua new file mode 100644 index 00000000..3ee2d748 --- /dev/null +++ b/lua/app/ui/arena/arena_rank_cell.lua @@ -0,0 +1,29 @@ +local ArenaRankCell = class("ArenaRankCell", BaseCell) + +function ArenaRankCell:init() + local uiMap = self:getUIMap() + + self.txRank = uiMap["arena_rank_cell.tx_rank"] + self.playerHeadCell = CellManager:addCellComp(uiMap["arena_rank_cell.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) + self.txName = uiMap["arena_rank_cell.tx_name"] + self.imgGrading = uiMap["arena_rank_cell.img_grading"] + self.txGrading = uiMap["arena_rank_cell.img_grading.tx_grading"] + self.btnFormation = uiMap["arena_rank_cell.btn_formation"] + + self.btnFormation:addClickListener(function() + -- 展示编队信息 + end) +end + +function ArenaRankCell:refresh(rank) + self.rankInfo = DataManager.ArenaData:getRankData(rank) + + self.playerHeadCell:refresh(self.rankInfo.avatar, self.rankInfo.avatar_frame) + self.txRank:setText(self.rankInfo.rank) + self.txName:setText(rank) + local gradingId = DataManager.ArenaData:getGradingIdFromScore(self.rankInfo.score) + self.imgGrading:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingIconName(gradingId)) + self.txGrading:setText(DataManager.ArenaData:getGradingName(gradingId)) +end + +return ArenaRankCell \ No newline at end of file diff --git a/lua/app/ui/arena/arena_rank_cell.lua.meta b/lua/app/ui/arena/arena_rank_cell.lua.meta new file mode 100644 index 00000000..28c16dec --- /dev/null +++ b/lua/app/ui/arena/arena_rank_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e186769924af23c47b381a60e8ec70f0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_rank_ui.lua b/lua/app/ui/arena/arena_rank_ui.lua new file mode 100644 index 00000000..08ce6ddf --- /dev/null +++ b/lua/app/ui/arena/arena_rank_ui.lua @@ -0,0 +1,75 @@ +-- 竞技场：排行榜 +local ArenaRankUI = class("ArenaRankUI", BaseUI) + +function ArenaRankUI:isFullScreen() + return false +end + +function ArenaRankUI:showCommonBG() + return false +end + +function ArenaRankUI:getPrefabPath() + return "assets/prefabs/ui/arena/arena_rank_ui.prefab" +end + +function ArenaRankUI:onPressBackspace() + self:closeUI() +end + +function ArenaRankUI:ctor() + ModuleManager.ArenaManager:reqRank() +end + +function ArenaRankUI:onCover() +end + +function ArenaRankUI:onReshow() +end + +function ArenaRankUI:onClose() +end + +function ArenaRankUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + self.txTitle = uiMap["arena_rank_ui.bg.title.tx_title"] + self.closeBtn = uiMap["arena_rank_ui.bg.close_btn"] + self.txRank = uiMap["arena_rank_ui.bg.my_rank.tx_rank"] + self.playerHeadCell = CellManager:addCellComp(uiMap["arena_rank_ui.bg.my_rank.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) + self.txName = uiMap["arena_rank_ui.bg.my_rank.tx_name"] + self.imgGrading = uiMap["arena_rank_ui.bg.my_rank.img_grading"] + self.txGrading = uiMap["arena_rank_ui.bg.my_rank.img_grading.tx_grading"] + self.scrollRectComp = uiMap["arena_rank_ui.bg.list_rank"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_5)) + self.txRank:setText(DataManager.ArenaData:getRank()) + self.txName:setText(DataManager.PlayerData:getNickname()) + local gradingId = DataManager.ArenaData:getGradingId() + self.imgGrading:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingIconName(gradingId)) + self.txGrading:setText(DataManager.ArenaData:getGradingName(gradingId)) + self.playerHeadCell:refresh() + + self.scrollRectComp:addInitCallback(function() + return "app/ui/arena/arena_rank_cell" + end) + self.scrollRectComp:addRefreshCallback(function(index, cell) + cell:refresh(index) + end) + + self.closeBtn:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.ArenaData, "isDirty", function() + self:onRefresh() + end) +end + +function ArenaRankUI:onRefresh() + self.scrollRectComp:clearCells() + self.scrollRectComp:refillCells(DataManager.ArenaData:getRankCount()) + Logger.logHighlight("排行榜玩家总数") + Logger.logHighlight(DataManager.ArenaData:getRankCount()) +end + +return ArenaRankUI \ No newline at end of file diff --git a/lua/app/ui/arena/arena_rank_ui.lua.meta b/lua/app/ui/arena/arena_rank_ui.lua.meta new file mode 100644 index 00000000..02b15003 --- /dev/null +++ b/lua/app/ui/arena/arena_rank_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0245d41639981524eb068a539427d5cf +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_recent_battle_ui.lua b/lua/app/ui/arena/arena_recent_battle_ui.lua new file mode 100644 index 00000000..eac83c28 --- /dev/null +++ b/lua/app/ui/arena/arena_recent_battle_ui.lua @@ -0,0 +1,108 @@ +-- 竞技场：最近战报 +local ArenaRecentBattleUI = class("ArenaRecentBattleUI", BaseUI) + +function ArenaRecentBattleUI:isFullScreen() + return false +end + +function ArenaRecentBattleUI:showCommonBG() + return false +end + +function ArenaRecentBattleUI:getPrefabPath() + return "assets/prefabs/ui/arena/arena_recent_battle_ui.prefab" +end + +function ArenaRecentBattleUI:onPressBackspace() + self:closeUI() +end + +function ArenaRecentBattleUI:ctor() + ModuleManager.ArenaManager:reqRecord() +end + +function ArenaRecentBattleUI:onCover() +end + +function ArenaRecentBattleUI:onReshow() +end + +function ArenaRecentBattleUI:onClose() +end + +function ArenaRecentBattleUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + self.txTitle = uiMap["arena_recent_battle_ui.bg.title.tx_title"] + self.btnClose = uiMap["arena_recent_battle_ui.bg.btn_close"] + self.txResult = uiMap["arena_recent_battle_ui.bg.tab.tx_result"] + self.txName = uiMap["arena_recent_battle_ui.bg.tab.tx_name"] + self.txScore = uiMap["arena_recent_battle_ui.bg.tab.tx_score"] + self.txNone = uiMap["arena_recent_battle_ui.bg.tx_none"] + self.records = {} + for i = 1, 5 do + self.records[i] = uiMap["arena_recent_battle_ui.bg.records.battle_record_cell_"..i] + end + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_7)) + self.txResult:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_14)) + self.txName:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_15)) + self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_16)) + + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.ArenaData, "isDirty", function() + self:onRefresh() + end) +end + +function ArenaRecentBattleUI:onRefresh() + local showCount = 0 + for idx, obj in pairs(self.records) do + local info = DataManager.ArenaData:getRecentBattleByIdx(idx) + if info then + showCount = showCount + 1 + obj:setActive(true) + self:refreshRecord(obj, info) + else + obj:setActive(false) + end + end + + Logger.logHighlight(showCount) + if showCount == 0 then + self.txNone:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_8)) + else + self.txNone:setText("") + end +end + +function ArenaRecentBattleUI:refreshRecord(obj, info) + local uiMap = obj:genAllChildren() + + local playerHeadCell = CellManager:addCellComp(uiMap["player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) + playerHeadCell:refresh(info.match_info.avatar, info.match_info.avatar_frame) + uiMap["tx_name"]:setText(info.match_info.name) + if info.win then + obj:setSprite(GConst.ATLAS_PATH.ARENA,"arena_bg_3") + uiMap["tx_score"]:setText(""..info.incr_score.."") + uiMap["img_result"]:setSprite(GConst.ATLAS_PATH.ARENA, "arena_dec_2") + if info.attacker then + uiMap["tx_result"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_19)) + else + uiMap["tx_result"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_17)) + end + else + obj:setSprite(GConst.ATLAS_PATH.ARENA,"arena_bg_4") + uiMap["tx_score"]:setText(""..info.incr_score.."") + uiMap["img_result"]:setSprite(GConst.ATLAS_PATH.ARENA, "arena_dec_3") + if info.attacker then + uiMap["tx_result"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_20)) + else + uiMap["tx_result"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_18)) + end + end +end + +return ArenaRecentBattleUI \ No newline at end of file diff --git a/lua/app/ui/arena/arena_recent_battle_ui.lua.meta b/lua/app/ui/arena/arena_recent_battle_ui.lua.meta new file mode 100644 index 00000000..d1b1ce51 --- /dev/null +++ b/lua/app/ui/arena/arena_recent_battle_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3347c147e7632ef408c220f332dce805 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_season_reward_cell.lua b/lua/app/ui/arena/arena_season_reward_cell.lua new file mode 100644 index 00000000..105f05bb --- /dev/null +++ b/lua/app/ui/arena/arena_season_reward_cell.lua @@ -0,0 +1,27 @@ +local ArenaSeasonRewardCell = class("ArenaSeasonRewardCell", BaseCell) + +function ArenaSeasonRewardCell:init() + local uiMap = self:getUIMap() + + self.imgGrading = uiMap["arena_reward_cell.img_grading"] + self.txGrading = uiMap["arena_reward_cell.img_grading.tx_grading"] + self.scrollRectComp = uiMap["arena_reward_cell.rewards"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) +end + +function ArenaSeasonRewardCell:refresh(id) + local rewards = DataManager.ArenaData:getGradingRewardInfo(id) + self.scrollRectComp:addInitCallback(function() + return GConst.TYPEOF_LUA_CLASS.REWARD_CELL + end) + self.scrollRectComp:addRefreshCallback(function(index, cell) + cell:refreshByConfig(rewards[index]) + end) + self.scrollRectComp:clearCells() + self.scrollRectComp:refillCells(#rewards) + + local lastGradingId = DataManager.ArenaData:getLastGradingId() + self.imgGrading:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingIconName(id)) + self.txGrading:setText(DataManager.ArenaData:getGradingName(id)) +end + +return ArenaSeasonRewardCell \ No newline at end of file diff --git a/lua/app/ui/arena/arena_season_reward_cell.lua.meta b/lua/app/ui/arena/arena_season_reward_cell.lua.meta new file mode 100644 index 00000000..e25a799b --- /dev/null +++ b/lua/app/ui/arena/arena_season_reward_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f8be9ef1bd9521940846fbb4caa12687 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_season_reward_ui.lua b/lua/app/ui/arena/arena_season_reward_ui.lua new file mode 100644 index 00000000..f5611e09 --- /dev/null +++ b/lua/app/ui/arena/arena_season_reward_ui.lua @@ -0,0 +1,122 @@ +-- 竞技场：赛季奖励 +local ArenaSeasonRewardUI = class("ArenaSeasonRewardUI", BaseUI) + +function ArenaSeasonRewardUI:isFullScreen() + return false +end + +function ArenaSeasonRewardUI:showCommonBG() + return false +end + +function ArenaSeasonRewardUI:getPrefabPath() + return "assets/prefabs/ui/arena/arena_season_reward_ui.prefab" +end + +function ArenaSeasonRewardUI:onPressBackspace() + self:closeUI() +end + +function ArenaSeasonRewardUI:ctor() +end + +function ArenaSeasonRewardUI:onCover() +end + +function ArenaSeasonRewardUI:onReshow() +end + +function ArenaSeasonRewardUI:onClose() +end + +function ArenaSeasonRewardUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + self.txTitle = uiMap["arena_season_reward_ui.bg.title.tx_title"] + self.closeBtn = uiMap["arena_season_reward_ui.bg.close_btn"] + -- 赛季奖励 + self.seasonReward = uiMap["arena_season_reward_ui.bg.season_reward"] + self.txDesc = uiMap["arena_season_reward_ui.bg.season_reward.tx_desc"] + self.txTime = uiMap["arena_season_reward_ui.bg.season_reward.countdown.tx_time"] + self.seasonRewardComp = uiMap["arena_season_reward_ui.bg.season_reward.reward_list"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + -- 领取奖励 + self.getReward = uiMap["arena_season_reward_ui.bg.last_reward"] + self.txSeason = uiMap["arena_season_reward_ui.bg.last_reward.tx_season"] + self.imgGrading = uiMap["arena_season_reward_ui.bg.last_reward.img_grading"] + self.txGrading = uiMap["arena_season_reward_ui.bg.last_reward.img_grading.tx_grading"] + self.getRewardComp = uiMap["arena_season_reward_ui.bg.last_reward.rewards"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.btnGet = uiMap["arena_season_reward_ui.bg.last_reward.btn_get"] + self.txGet = uiMap["arena_season_reward_ui.bg.last_reward.btn_get.tx_get"] + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_11)) + + self.closeBtn:addClickListener(function() + self:closeUI() + end) + self.btnGet:addClickListener(function() + ModuleManager.ArenaManager:reqLastSeasonReward() + end) +end + +function ArenaSeasonRewardUI:onRefresh() + if DataManager.ArenaData:hasSeasonReward() then + self:showGetReward() + else + self:showSeasonReward() + end +end + +-- 显示赛季奖励 +function ArenaSeasonRewardUI:showSeasonReward() + self.seasonReward:setActive(true) + self.getReward:setActive(false) + + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_12, DataManager.ArenaData:getSeason())) + + if self.seasonChangeSid then + ModuleManager.BattleManager:unscheduleGlobal(self.seasonChangeSid) + end + self.seasonChangeSid = self.txTime:scheduleGlobal(function() + self:refreshCountdown() + end, 1) + + local ids = DataManager.ArenaData:getGradingIdList() + self.seasonRewardComp:addInitCallback(function() + return "app/ui/arena/arena_season_reward_cell" + end) + self.seasonRewardComp:addRefreshCallback(function(index, cell) + cell:refresh(ids[index]) + end) + self.seasonRewardComp:clearCells() + self.seasonRewardComp:refillCells(#ids) +end + +function ArenaSeasonRewardUI:refreshCountdown() + self.txTime:setText(Time:formatNumTimeStr(DataManager.ArenaData:getRemainSeasonTime())) +end + +-- 显示领取奖励 +function ArenaSeasonRewardUI:showGetReward() + self.seasonReward:setActive(false) + self.getReward:setActive(true) + + local lastId = DataManager.ArenaData:getLastGradingId() + local rewards = DataManager.ArenaData:getLastSeasonRewardInfo(lastId) + self.txSeason:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_13, DataManager.ArenaData:getSeason() - 1)) + self.imgGrading:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getLastGradingIconName(lastId)) + self.txGrading:setText(DataManager.ArenaData:getLastGradingName(lastId)) + self.txGet:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) + + self.btnGet:addRedPoint(65, 35, 0.6) + + self.getRewardComp:addInitCallback(function() + return GConst.TYPEOF_LUA_CLASS.REWARD_CELL + end) + self.getRewardComp:addRefreshCallback(function(index, cell) + cell:refresh(rewards[index]) + end) + self.seasonRewardComp:clearCells() + self.seasonRewardComp:refillCells(#rewards) +end + +return ArenaSeasonRewardUI \ No newline at end of file diff --git a/lua/app/ui/arena/arena_season_reward_ui.lua.meta b/lua/app/ui/arena/arena_season_reward_ui.lua.meta new file mode 100644 index 00000000..b2fe0028 --- /dev/null +++ b/lua/app/ui/arena/arena_season_reward_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 894baca67a318bb4aa5cc0ddaa6ed1e1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 8646a464..115d1849 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -2,19 +2,26 @@ local HeroCell = class("HeroCell", BaseCell) function HeroCell:init() local uiMap = self.baseObject:genAllChildren() + -- 通用 self.icon = uiMap["hero_cell.hero_bg.icon"] self.heroBg = uiMap["hero_cell.hero_bg"] self.heroDec = uiMap["hero_cell.hero_bg.dec"] self.check = uiMap["hero_cell.hero_bg.mask"] self.matchImg = uiMap["hero_cell.hero_bg.match_img"] - self.progressBg = uiMap["hero_cell.hero_bg.progress_bg"] - self.progress = uiMap["hero_cell.hero_bg.progress"] - self.progressTx = uiMap["hero_cell.hero_bg.progress_tx"] self.lvTx = uiMap["hero_cell.hero_bg.lv_tx"] - self.unlockTx = uiMap["hero_cell.hero_bg.unlock_tx"] - self.lvUpArrow = uiMap["hero_cell.hero_bg.effect_node.ui_spine_obj"] - self.fragmenImg = uiMap["hero_cell.hero_bg.progress_bg.fragment_img"] self.sImg = uiMap["hero_cell.hero_bg.s"] + -- 个人节点 + self.selfNode = uiMap["hero_cell.hero_bg.self_node"] + self.progressBg = uiMap["hero_cell.hero_bg.self_node.progress_bg"] + self.progress = uiMap["hero_cell.hero_bg.self_node.progress_bg.progress"] + self.progressTx = uiMap["hero_cell.hero_bg.self_node.progress_bg.progress_tx"] + self.unlockTx = uiMap["hero_cell.hero_bg.self_node.unlock_tx"] + self.fragmenImg = uiMap["hero_cell.hero_bg.self_node.progress_bg.fragment_img"] + self.lvUpArrow = uiMap["hero_cell.hero_bg.self_node.effect_node.ui_spine_obj"] + -- 他人节点 + self.otherNode = uiMap["hero_cell.hero_bg.other_node"] + self.otherTxName = uiMap["hero_cell.hero_bg.other_node.tx_name"] + self.isGray = false self.baseObject:addClickListener(function() if self.clickCallback then @@ -23,7 +30,11 @@ function HeroCell:init() end) end +-- 显示自己英雄 function HeroCell:refresh(heroEntity, isGray) + self.selfNode:setVisible(true) + self.otherNode:setVisible(false) + local heroInfo = heroEntity:getConfig() self:_refresh(heroInfo, isGray) @@ -70,6 +81,17 @@ function HeroCell:refresh(heroEntity, isGray) end end +--显示其他人英雄 +function HeroCell:refreshWithOtherHero(id, level) + self.selfNode:setVisible(false) + self.otherNode:setVisible(true) + + self:_refresh(ConfigManager:getConfig("hero")[id]) + + self.otherTxName:setText(ModuleManager.HeroManager:getHeroName(id)) + self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, level)) +end + function HeroCell:refreshWithCfgId(id, isGray) local heroInfo = ConfigManager:getConfig("hero")[id] self:_refresh(heroInfo, isGray) diff --git a/lua/app/ui/common/cell/large_hero_cell.lua b/lua/app/ui/common/cell/large_hero_cell.lua index 07931ca5..ccb7372b 100644 --- a/lua/app/ui/common/cell/large_hero_cell.lua +++ b/lua/app/ui/common/cell/large_hero_cell.lua @@ -28,11 +28,11 @@ function LargeHeroCell:init() return end self.baseObject:setAnchoredPositionX(OUT_SCREEN_X) - ModuleManager.FormationManager:upHeroToStageFormation(self.heroId, self.matchType) + self.onClickUseFunc(self.heroId, self.matchType) end) end -function LargeHeroCell:refresh(heroEntity, isGray) +function LargeHeroCell:refresh(heroEntity, isGray, useFunc) self.heroId = heroEntity:getCfgId() self.matchType = heroEntity:getMatchType() local heroInfo = heroEntity:getConfig() @@ -44,6 +44,7 @@ function LargeHeroCell:refresh(heroEntity, isGray) str = I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_9) end self.infoBtnDesc:setText(str) + self.onClickUseFunc = useFunc end function LargeHeroCell:refreshWithCfgId(id, isGray) diff --git a/lua/app/ui/common/component/hero_formation_comp.lua b/lua/app/ui/common/component/hero_formation_comp.lua index 9bca851e..76764bb0 100644 --- a/lua/app/ui/common/component/hero_formation_comp.lua +++ b/lua/app/ui/common/component/hero_formation_comp.lua @@ -11,12 +11,11 @@ function HeroFormationComp:init() uiMap["hero_formation_comp.hero_cell_4"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL), uiMap["hero_formation_comp.hero_cell_5"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL), } + self:setFormationVisible(true) end function HeroFormationComp:refresh() - - -- todo 传参控制显示对手还是自己的编队 - + -- 显示自己英雄阵容 local formation = DataManager.FormationData:getStageFormation() for i, heroCell in ipairs(self.heroCells) do if formation[i] then @@ -36,7 +35,20 @@ function HeroFormationComp:refresh() end end +function HeroFormationComp:refreshWithOtherHero(formation) + -- 显示他人英雄阵容 + for i, heroCell in ipairs(self.heroCells) do + if formation[i] then + heroCell:setVisible(true, 1) + heroCell:refreshWithOtherHero(formation[i].id, formation[i].level) + else + heroCell:setVisible(false) + end + end +end + function HeroFormationComp:setFormationVisible(visible) + self.baseObject:setActive(true) self.baseObject:setVisible(visible) end diff --git a/lua/app/ui/currency_bar/cell/currency_cell.lua b/lua/app/ui/currency_bar/cell/currency_cell.lua index 9400eab4..337093a8 100644 --- a/lua/app/ui/currency_bar/cell/currency_cell.lua +++ b/lua/app/ui/currency_bar/cell/currency_cell.lua @@ -47,6 +47,11 @@ function ResourceCell:show(itemId, hideAddImg) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.ShopConst.PAGE_TYPE.MAIN, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GEM}) end) self.addImg:setVisible(true) + elseif itemId == GConst.ItemConst.ITEM_ID_ARENA_TICKET then + self.baseObject:addClickListener(function() + ModuleManager.CommerceManager:showBuyArenaTicketUI() + end) + self.addImg:setVisible(true) else self.baseObject:removeClickListener() self.addImg:setVisible(false) diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index b8245e12..e644460e 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -10,7 +10,7 @@ function HeroComp:init() return HERO_LIST_CELL end) self.scrollRect:addRefreshCallback(function(index, cell) - cell:refresh(index, self.heroList, self.stageFormation, self.allHeroCount, self.unlockCount, function(cell, heroId) + cell:refresh(index, self.heroList, self.curFormation, self.allHeroCount, self.unlockCount, function(cell, heroId) self:onClickHero(cell, heroId) end) end) @@ -50,7 +50,7 @@ function HeroComp:init() for index, obj in ipairs(self.heroNodeList) do obj:addClickListener(function() - local heroId = self.stageFormation[index] + local heroId = self.curFormation[index] if heroId then local hero = DataManager.HeroData:getHeroById(heroId) if hero then @@ -62,21 +62,63 @@ function HeroComp:init() self.heroBgSpineObj[index]:playAnim("idle", true, false) end end - - self.uiMap["hero_ui.top_bg.title_bg_img.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.MAIN_BTN_2)) end -function HeroComp:refresh() +function HeroComp:refresh(battleType) + self.battleType = battleType + self:clearAdapt() self:adapt() - self.stageFormation = DataManager.FormationData:getStageFormation() - self:refreshStageFormation() + if self.battleType == GConst.BattleConst.FORMATION_TYPE.STAGE then + self:refreshStageFormation() + elseif self.battleType == GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK then + self:refreshArenaFightFormation() + elseif self.battleType == GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND then + self:refreshArenaDefendFormation() + end +end + +-- 展示主线章节阵容 +function HeroComp:refreshStageFormation() + self.uiMap["hero_ui.top_bg.title_bg_img.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.MAIN_BTN_2)) + self.curFormation = DataManager.FormationData:getStageFormation() + + self.onClickUseFunc = function(id, type) + ModuleManager.FormationManager:upHeroToStageFormation(id, type) + end + self:refreshScrollRect() end -function HeroComp:refreshStageFormation() +-- 展示竞技场进攻阵容 +function HeroComp:refreshArenaFightFormation() + self.uiMap["hero_ui.top_bg.title_bg_img.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.MAIN_BTN_1)) + self.curFormation = DataManager.FormationData:getArenaAttackFormation() + + self.onClickUseFunc = function(id, type) + DataManager.FormationData:upHeroToFormation(self.battleType, type, id) + self:refreshArenaFightFormation() + end + + self:refreshScrollRect() +end + +-- 展示竞技场防守阵容 +function HeroComp:refreshArenaDefendFormation() + self.uiMap["hero_ui.top_bg.title_bg_img.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.QLT_DESC_1)) + self.curFormation = DataManager.FormationData:getArenaDefendFormation() + + self.onClickUseFunc = function(id, type) + DataManager.FormationData:upHeroToFormation(self.battleType, type, id) + self:refreshArenaDefendFormation() + end + + self:refreshScrollRect() +end + +function HeroComp:refreshScrollRect() for i = 1, 5 do - local heroId = self.stageFormation[i] + local heroId = self.curFormation[i] local hero = DataManager.HeroData:getHeroById(heroId) if hero and hero:getLv() > 0 then self.heroAddImgList[i]:setVisible(false) @@ -85,7 +127,7 @@ function HeroComp:refreshStageFormation() self.heroSpineList[i]:playAnimation("idle", true) else SpineManager:loadHeroAsync(hero:getModelId(), self.heroNodeList[i], function(spineObject) - if heroId ~= self.stageFormation[i] then + if heroId ~= self.curFormation[i] then return end if self.heroSpineList[i] then @@ -104,9 +146,7 @@ function HeroComp:refreshStageFormation() end end end -end -function HeroComp:refreshScrollRect() self:sortHeroList() self.allHeroCount = #self.heroList self.unlockCount = DataManager.HeroData:getUnlockHeroCount() @@ -164,14 +204,14 @@ function HeroComp:onClickHero(cell, heroId) local entity = DataManager.HeroData:getHeroById(heroId) if entity then - if entity:isActived() and not DataManager.FormationData:heroInFormation(GConst.BattleConst.BATTLE_TYPE.STAGE, heroId) then + if entity:isActived() and not DataManager.FormationData:heroInFormation(self.battleType, heroId) then local targetPos = cell:getBaseObject():getTransform().position local sPoint = UIManager:getUICameraComponent():WorldToScreenPoint(targetPos) targetPos = CS.BF.Utils.RectTransformScreenPointToLocalPointInRectangle(self.content:getTransform(), sPoint.x, sPoint.y, UIManager:getUICameraComponent()) self.largeHeroCell:getBaseObject():setAnchoredPosition(targetPos.x, targetPos.y) self.largeHeroCell:getBaseObject():getTransform():SetAsLastSibling() - self.largeHeroCell:refresh(entity, not entity:isActived()) - self.largeHeroCell:showCheck(self.stageFormation[entity:getMatchType()] == heroId) + self.largeHeroCell:refresh(entity, not entity:isActived(), self.onClickUseFunc) + self.largeHeroCell:showCheck(self.curFormation[entity:getMatchType()] == heroId) else ModuleManager.HeroManager:showHeroDetailUI(heroId) self.largeHeroCell:getBaseObject():setAnchoredPositionX(OUT_SCREEN_X) diff --git a/lua/app/ui/main_city/component/arena_comp.lua b/lua/app/ui/main_city/component/arena_comp.lua new file mode 100644 index 00000000..a17502ba --- /dev/null +++ b/lua/app/ui/main_city/component/arena_comp.lua @@ -0,0 +1,93 @@ +local MainCompBaseCell = require "app/ui/main_city/component/main_comp_base_cell" +local ArenaComp = class("ArenaComp", MainCompBaseCell) + +function ArenaComp:getIsOpen() + return true +end + +function ArenaComp:getEntranceName() + return I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_1) +end + +function ArenaComp:getFightDesc() + return I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_2) +end + +function ArenaComp:getShowEntranceRedPoint() + return true +end + +function ArenaComp:ctor() +end + +function ArenaComp:init() + local uiMap = self:getBaseObject():genAllChildren() + + self.txSeason = uiMap["arena_comp.tx_season"] + self.txTitle = uiMap["arena_comp.tx_title"] + self.txCountdown = uiMap["arena_comp.countdown.tx_time"] + self.txGarding = uiMap["arena_comp.tx_garding"] + self.imgGarding = uiMap["arena_comp.img_garding"] + self.imgProg = uiMap["arena_comp.prog.img_prog"] + self.txProg = uiMap["arena_comp.prog.tx_prog"] + self.btnHelp = uiMap["arena_comp.tx_season.btn_help"] + self.btnRecord = uiMap["arena_comp.btn_record"] + self.txRecord = uiMap["arena_comp.btn_record.tx_record"] + self.btnFormation = uiMap["arena_comp.btn_formation"] + self.txFormation = uiMap["arena_comp.btn_formation.tx_formation"] + self.btnReward = uiMap["arena_comp.btn_reward"] + self.txReward = uiMap["arena_comp.btn_reward.tx_reward"] + self.btnRank = uiMap["arena_comp.btn_rank"] + self.txRank = uiMap["arena_comp.btn_rank.tx_rank"] + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_4)) + self.txRecord:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_7)) + self.txFormation:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_9)) + self.txReward:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) + self.txRank:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_5)) + + self.btnHelp:addClickListener(function() + ModuleManager.TipsManager:showDescTips(DataManager.DungeonData:getRule(self.moduleKey), self.btnHelp) + end) + self.btnRecord:addClickListener(function() + UIManager:showUI("app/ui/arena/arena_recent_battle_ui") + end) + self.btnFormation:addClickListener(function() + UIManager:showUI("app/ui/arena/arena_formation_ui") + end) + self.btnReward:addClickListener(function() + UIManager:showUI("app/ui/arena/arena_season_reward_ui") + end) + self.btnRank:addClickListener(function() + UIManager:showUI("app/ui/arena/arena_rank_ui") + end) + self:refreshShow() +end + +function ArenaComp:refreshShow() + local maxScore = DataManager.ArenaData:getGradingScoreTotal() + local curScore = DataManager.ArenaData:getGradingScore() + self.txSeason:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_3, DataManager.ArenaData:getSeason())) + self.txGarding:setText(DataManager.ArenaData:getGradingName(DataManager.ArenaData:getGradingId())) + self.txProg:setText(curScore.."/"..maxScore) + + self.seasonChangeCD = DataManager.ArenaData:getRemainSeasonTime() + if self.seasonChangeSid then + ModuleManager.BattleManager:unscheduleGlobal(self.seasonChangeSid) + end + self.seasonChangeSid = self.txCountdown:scheduleGlobal(function() + self:refreshCountdown() + end, 1) +end + +function ArenaComp:refreshCountdown() + self.seasonChangeCD = self.seasonChangeCD - 1 + if self.seasonChangeCD < 0 then + ModuleManager.ArenaManager:onSeasonChanged() + return + end + + self.txCountdown:setText(Time:formatNumTimeStr(self.seasonChangeCD)) +end + +return ArenaComp \ No newline at end of file diff --git a/lua/app/ui/main_city/component/arena_comp.lua.meta b/lua/app/ui/main_city/component/arena_comp.lua.meta new file mode 100644 index 00000000..bead850c --- /dev/null +++ b/lua/app/ui/main_city/component/arena_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4ed7562a967f4424f900ab045362eae1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/component/chapter_comp.lua b/lua/app/ui/main_city/component/chapter_comp.lua index 7f5d55f3..75dca4b3 100644 --- a/lua/app/ui/main_city/component/chapter_comp.lua +++ b/lua/app/ui/main_city/component/chapter_comp.lua @@ -15,15 +15,23 @@ function ChapterComp:getEntranceName() return I18N:getGlobalText(I18N.GlobalConst.MAIN_CHAPTER) end -function ChapterComp:getEntranceIcon() - return GConst.ATLAS_PATH.MAIN,"main_dec_5" +function ChapterComp:isShowTopNode() + return true end -function ChapterComp:getEntranceBg() - return GConst.ATLAS_PATH.MAIN,"main_btn_ringt" +function ChapterComp:isShowSideBar() + return true end -function ChapterComp:getHpCost() +function ChapterComp:isShowBounty() + return true +end + +function ChapterComp:isShowHeroFormation() + return true +end + +function ChapterComp:getFightHpCost() return DataManager.ChapterData:getFightCost() end diff --git a/lua/app/ui/main_city/component/daily_challenge_comp.lua b/lua/app/ui/main_city/component/daily_challenge_comp.lua index 038c0a81..b144e7d1 100644 --- a/lua/app/ui/main_city/component/daily_challenge_comp.lua +++ b/lua/app/ui/main_city/component/daily_challenge_comp.lua @@ -9,23 +9,27 @@ function DailyChallengeComp:getEntranceName() return I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE) end -function DailyChallengeComp:getEntranceIcon() - return GConst.ATLAS_PATH.MAIN,"main_dec_1" -end - -function DailyChallengeComp:getEntranceBg() - return GConst.ATLAS_PATH.MAIN,"main_btn_ligth" -end - function DailyChallengeComp:getShowEntranceRedPoint() return DataManager.DailyChallengeData:isMeetChallenge() end -function DailyChallengeComp:getHpCost() +function DailyChallengeComp:isShowTopNode() + return true +end + +function DailyChallengeComp:isShowSideBar() + return true +end + +function DailyChallengeComp:isShowHeroFormation() + return true +end + +function DailyChallengeComp:getFightHpCost() return DataManager.DailyChallengeData:getChallengeHpCost() end -function DailyChallengeComp:getTodayRemainCount() +function DailyChallengeComp:getFightTodayRemainCount() return DataManager.DailyChallengeData:getTodayRemainLimitCount() end diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua b/lua/app/ui/main_city/component/dungeon_comp.lua index 847cb46e..7baa4c17 100644 --- a/lua/app/ui/main_city/component/dungeon_comp.lua +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -9,14 +9,6 @@ function DungeonComp:getEntranceName() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_BTN) end -function DungeonComp:getEntranceIcon() - return GConst.ATLAS_PATH.MAIN,"main_dec_2" -end - -function DungeonComp:getEntranceBg() - return GConst.ATLAS_PATH.MAIN,"main_btn_ringt" -end - function DungeonComp:getShowEntranceRedPoint() return DataManager.DungeonData:isCanChallengeAnyone() end diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 7074280a..b8a37787 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -2,6 +2,7 @@ local MainComp = class("MainComp", LuaComponent) local CHAPTER_COMP = "app/ui/main_city/component/chapter_comp" local DAILY_CHALLENGE_COMP = "app/ui/main_city/component/daily_challenge_comp" local DUNGEON_COMP = "app/ui/main_city/component/dungeon_comp" +local ARENA_COMP = "app/ui/main_city/component/arena_comp" local BOTTOM_HEIGHT = 120 @@ -30,12 +31,35 @@ function MainComp:refreshModule(selectModule) self.dungeonComp = CellManager:addCellComp(dungeonComp, DUNGEON_COMP) self.dungeonComp:initWithParentUI(self) self.moduleMap[GConst.MainCityConst.MAIN_MODULE.DUNGEON] = self.dungeonComp + -- 竞技场 + local arenaComp = self.uiMap["main_comp.arena_comp"] + self.arenaComp = CellManager:addCellComp(arenaComp, ARENA_COMP) + self.arenaComp:initWithParentUI(self) + self.moduleMap[GConst.MainCityConst.MAIN_MODULE.ARENA] = self.arenaComp end + -- 左侧活动入口 + if not self.leftEntrance then + self.uiMap["main_comp.left"]:setAnchoredPositionY(self.btnPosY) + + self.leftEntrance = {} + self.leftEntrance[GConst.MainCityConst.MAIN_MODULE.CHAPTER] = self.uiMap["main_comp.left.chapter"] + self.leftEntrance[GConst.MainCityConst.MAIN_MODULE.ARENA] = self.uiMap["main_comp.left.arena"] + self.leftEntrance[GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE] = self.uiMap["main_comp.left.daily_challenge"] + end + + -- 右侧活动入口 + if not self.rightEntrance then + self.uiMap["main_comp.right"]:setAnchoredPositionY(self.btnPosY) + + self.rightEntrance = {} + self.rightEntrance[GConst.MainCityConst.MAIN_MODULE.CHAPTER] = self.uiMap["main_comp.right.chapter"] + self.rightEntrance[GConst.MainCityConst.MAIN_MODULE.DUNGEON] = self.uiMap["main_comp.right.dungeon"] + end + if self.curModuleType ~= selectModule then self.curModuleType = selectModule ModuleManager.MaincityManager:setCurModule(self.curModuleType) - self:setFormationVisible(true) if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.CHAPTER then -- 切换到主线章节 @@ -46,8 +70,8 @@ function MainComp:refreshModule(selectModule) end elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DUNGEON then -- 切换到活动副本 - self:setFormationVisible(false) end + self:refreshHeroFormationVisible() EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_COMP_MODULE, self.curModuleType) end @@ -65,112 +89,188 @@ function MainComp:refreshBtns() end function MainComp:refreshFightBtn() + if self.fightBtn == nil then + self.fightBtn = self.uiMap["main_comp.fight_btn"] + -- 体力消耗 + self.fightCost = self.uiMap["main_comp.fight_btn.cost"] + self.costTxDesc = self.uiMap["main_comp.fight_btn.cost.tx_desc"] + self.costTxCost = self.uiMap["main_comp.fight_btn.cost.tx_cost"] + -- 剩余次数 + self.countTxNum = self.uiMap["main_comp.fight_btn.tx_count"] + -- 按钮文本 + self.txFight = self.uiMap["main_comp.fight_btn.tx_desc"] + end + local moduleCell = self.moduleMap[self.curModuleType] + local isShowFight = false - local cost = moduleCell:getHpCost() + -- 体力消耗 + local cost = moduleCell:getFightHpCost() if cost then - self.uiMap["main_comp.fight_btn"]:setActive(true) - self.uiMap["main_comp.fight_btn"]:addClickListener(moduleCell.onClickFight) - self.uiMap["main_comp.fight_btn"]:setAnchoredPositionY(self.btnPosY) - self.uiMap["main_comp.fight_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) - self.uiMap["main_comp.fight_btn.desc_2"]:setText(GFunc.getRewardNum(cost)) + isShowFight = true + self.fightCost:setActive(true) + self.costTxDesc:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) + self.costTxCost:setText(GFunc.getRewardNum(cost)) else - self.uiMap["main_comp.fight_btn"]:setActive(false) - return + self.fightCost:setActive(false) end - local remainCount = moduleCell:getTodayRemainCount() + -- 剩余次数 + local remainCount = moduleCell:getFightTodayRemainCount() if remainCount >= 0 then - self.uiMap["main_comp.fight_btn.num_tx"]:setActive(true) - self.uiMap["main_comp.fight_btn.num_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, remainCount)) + isShowFight = true + self.countTxNum:setActive(true) + self.countTxNum:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, remainCount)) else - self.uiMap["main_comp.fight_btn.num_tx"]:setActive(false) + self.countTxNum:setActive(false) + end + + -- 按钮描述 + local fightDesc = moduleCell:getFightDesc() + if fightDesc then + isShowFight = true + self.txFight:setActive(true) + self.txFight:setText(fightDesc) + else + self.txFight:setActive(false) + end + + if isShowFight then + self.fightBtn:setActive(true) + self.fightBtn:addClickListener(moduleCell.onClickFight) + self.fightBtn:setAnchoredPositionY(self.btnPosY) + else + self.fightBtn:setActive(false) end end +-- 刷新左侧活动模块入口 function MainComp:refreshLeftBtn() - if self.leftBtn == nil then - self.leftBtn = self.uiMap["main_comp.left_btn"] - end - self.leftBtn:setActive(false) - self.leftBtn:setAnchoredPositionY(self.btnPosY) - local leftIdx = self:getCurLeftModuleIdx() - if leftIdx == nil then - return - end - local moduleCell = self.moduleMap[leftIdx] - if not moduleCell:getIsOpen() then - return + local showCount = 0 + local leftIdxList = self:getCurLeftModuleIdxList() + for module, entrance in pairs(self.leftEntrance) do + if leftIdxList ~= nil and table.containValue(leftIdxList, module) then + local isShow = self:refreshModuleEntrance(entrance, module, true) + if isShow then + showCount = showCount + 1 + end + else + entrance:setActive(false) + end end - self.leftBtn:setActive(true) - local bgAtlas, bgName = moduleCell:getEntranceBg() - self.uiMap["main_comp.left_btn.bg"]:setSprite(bgAtlas, bgName) - local iconAtlas, iconName = moduleCell:getEntranceIcon() - self.uiMap["main_comp.left_btn.desc"]:setText(moduleCell:getEntranceName()) - self.uiMap["main_comp.left_btn.icon"]:setSprite(iconAtlas, iconName, function() - self.uiMap["main_comp.left_btn.icon"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() - end) - self.leftBtn:addClickListener(function() - self:refreshModule(leftIdx) - end) - if moduleCell:getShowEntranceRedPoint() then - self.leftBtn:addRedPoint(65, 35, 0.6) + if showCount >= 2 then + table.foreach(self.leftEntrance, function(idx, entrance) + entrance:setLocalScale(0.8,0.8) + end) else - self.leftBtn:removeRedPoint() + table.foreach(self.leftEntrance, function(idx, entrance) + entrance:setLocalScale(1,1) + end) end end +-- 刷新右侧活动模块入口 function MainComp:refreshRightBtn() - if self.rightBtn == nil then - self.rightBtn = self.uiMap["main_comp.right_btn"] - end - self.rightBtn:setActive(false) - self.rightBtn:setAnchoredPositionY(self.btnPosY) - local rightIdx = self:getCurRightModuleIdx() - if rightIdx == nil then - return - end - local moduleCell = self.moduleMap[rightIdx] - if not moduleCell:getIsOpen() then - return + local showCount = 0 + local rightIdxList = self:getCurRightModuleIdxList() + for module, entrance in pairs(self.rightEntrance) do + if rightIdxList ~= nil and table.containValue(rightIdxList, module) then + local isShow = self:refreshModuleEntrance(entrance, module, false) + if isShow then + showCount = showCount + 1 + end + else + entrance:setActive(false) + end end - self.rightBtn:setActive(true) - local bgAtlas, bgName = moduleCell:getEntranceBg() - self.uiMap["main_comp.right_btn.bg"]:setSprite(bgAtlas, bgName) - local iconAtlas, iconName = moduleCell:getEntranceIcon() - self.uiMap["main_comp.right_btn.desc"]:setText(moduleCell:getEntranceName()) - self.uiMap["main_comp.right_btn.icon"]:setSprite(iconAtlas, iconName, function() - self.uiMap["main_comp.right_btn.icon"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() - end) - self.rightBtn:addClickListener(function() - self:refreshModule(rightIdx) - end) - if moduleCell:getShowEntranceRedPoint() then - self.rightBtn:addRedPoint(-65, 35, 0.6) + if showCount >= 2 then + table.foreach(self.rightEntrance, function(idx, entrance) + entrance:setLocalScale(0.8,0.8) + end) else - self.rightBtn:removeRedPoint() + table.foreach(self.rightEntrance, function(idx, entrance) + entrance:setLocalScale(1,1) + end) end end -function MainComp:getCurLeftModuleIdx() - if self.curModuleType == 1 then - return nil +-- 刷新活动模块入口 +function MainComp:refreshModuleEntrance(entrance, moduleType, isLeft) + entrance:setActive(false) + local module = self.moduleMap[moduleType] + if moduleType == nil or module == nil then + return false + end + if not module:getIsOpen() then + return false end - return self.curModuleType - 1 + entrance:setActive(true) + local uiMap = entrance:genAllChildren() + uiMap["desc"]:setText(module:getEntranceName()) + if module:getShowEntranceRedPoint() then + if isLeft then + entrance:addRedPoint(65, 35, 0.6) + else + entrance:addRedPoint(-65, 35, 0.6) + end + else + entrance:removeRedPoint() + end + entrance:addClickListener(function() + self:refreshModule(moduleType) + end) + return true end -function MainComp:getCurRightModuleIdx() - local totalModuleNum = table.nums(GConst.MainCityConst.MAIN_MODULE) - if self.curModuleType == totalModuleNum then +-- 获取当前左侧活动type list +function MainComp:getCurLeftModuleIdxList() + if self.curModuleType < GConst.MainCityConst.MAIN_MODULE.CHAPTER then return nil end - return self.curModuleType + 1 + local leftIdx = {} + if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.CHAPTER then + for module, idx in pairs(GConst.MainCityConst.MAIN_MODULE) do + if idx < GConst.MainCityConst.MAIN_MODULE.CHAPTER then + table.insert(leftIdx, idx) + end + end + table.sort(leftIdx, function(a, b) + return math.abs(a) < math.abs(b) + end) + else + table.insert(leftIdx, GConst.MainCityConst.MAIN_MODULE.CHAPTER) + end + + return leftIdx +end + +-- 获取当前右侧活动type list +function MainComp:getCurRightModuleIdxList() + if self.curModuleType > GConst.MainCityConst.MAIN_MODULE.CHAPTER then + return nil + end + + local rightIdx = {} + if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.CHAPTER then + for module, idx in pairs(GConst.MainCityConst.MAIN_MODULE) do + if idx > GConst.MainCityConst.MAIN_MODULE.CHAPTER then + table.insert(rightIdx, idx) + end + end + table.sort(rightIdx, function(a, b) + return math.abs(a) < math.abs(b) + end) + else + table.insert(rightIdx, GConst.MainCityConst.MAIN_MODULE.CHAPTER) + end + + return rightIdx end function MainComp:initStageFormation() @@ -182,8 +282,8 @@ function MainComp:initStageFormation() self.btnPosY = (heroBgPosY + (BOTTOM_HEIGHT / 2 - hSHeight)) / 2 end -function MainComp:setFormationVisible(visible) - self.heroCells:setFormationVisible(visible) +function MainComp:refreshHeroFormationVisible() + self.heroCells:setFormationVisible(self.moduleMap[self.curModuleType]:isShowHeroFormation()) end function MainComp:refresh() @@ -196,6 +296,10 @@ function MainComp:getCurModuleType() return self.curModuleType end +function MainComp:getCurModule() + return self.moduleMap[self.curModuleType] +end + function MainComp:refreshChapter(force) self.chapterComp:refreshChapter(force) end @@ -212,14 +316,17 @@ end function MainComp:refreshStageFormaion() self.heroCells:refresh() + self:refreshHeroFormationVisible() end function MainComp:getDailyChallengeIconPos() - if self:getCurLeftModuleIdx() == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE then - return self.leftBtn:getPosition() + local idx = table.indexof(self:getCurLeftModuleIdxList(), GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE) + if idx and self.leftEntrance[idx] then + return self.leftEntrance[idx]:getPosition() end - if self:getCurRightModuleIdx() == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE then - return self.rightBtn:getPosition() + idx = table.indexof(self:getCurRightModuleIdxList(), GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE) + if idx and self.rightEntrance[idx] then + return self.rightEntrance[idx]:getPosition() end end diff --git a/lua/app/ui/main_city/component/main_comp_base_cell.lua b/lua/app/ui/main_city/component/main_comp_base_cell.lua index 5ade76df..b319a207 100644 --- a/lua/app/ui/main_city/component/main_comp_base_cell.lua +++ b/lua/app/ui/main_city/component/main_comp_base_cell.lua @@ -11,26 +11,45 @@ function MainCompBaseCell:getEntranceName() return "" end -function MainCompBaseCell:getEntranceIcon() - return "","" -end - -function MainCompBaseCell:getEntranceBg() - return "","" -end - function MainCompBaseCell:getShowEntranceRedPoint() return false end -function MainCompBaseCell:getHpCost() - return nil-- 默认不显示挑战按钮 +-- 是否展示顶部任务、设置按钮 +function MainCompBaseCell:isShowTopNode() + return false end -function MainCompBaseCell:getTodayRemainCount() +-- 是否展示侧边栏 +function MainCompBaseCell:isShowSideBar() + return false +end + +-- 是否展示战令入口 +function MainCompBaseCell:isShowBounty() + return false +end + +-- 是否展示英雄编队 +function MainCompBaseCell:isShowHeroFormation() + return false +end + +-- 中间按钮展示体力消耗 +function MainCompBaseCell:getFightHpCost() + return nil +end + +-- 中间按钮展示剩余次数 +function MainCompBaseCell:getFightTodayRemainCount() return -1 end +-- 中间按钮展示描述 +function MainCompBaseCell:getFightDesc() + return nil +end + function MainCompBaseCell:onClickFight() end diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 79c51e0b..10771cf1 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -188,14 +188,14 @@ function MainCityUI:_bind() end, true) self:bind(DataManager.FormationData, "dirty", function(binder, value) if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.HERO then - self.subComps[self.selectedIndex]:refresh() + self.subComps[self.selectedIndex]:refresh(GConst.BattleConst.BATTLE_TYPE.STAGE) end end) self:bind(DataManager.HeroData, "isDirty", function(binder, value) if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.HERO then if self.subComps[self.selectedIndex] then - self.subComps[self.selectedIndex]:refresh() + self.subComps[self.selectedIndex]:refresh(GConst.BattleConst.BATTLE_TYPE.STAGE) end self:refreshBottomRp() elseif self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then @@ -660,7 +660,7 @@ end function MainCityUI:refreshBounty() local isOpen = DataManager.BountyData:getIsOpen() - if not isOpen or self.mainComp:getCurModuleType() == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE or GFunc.isShenhe() then + if not isOpen or not self.mainComp:getCurModule():isShowBounty() or GFunc.isShenhe() then self.bountyNode:setVisible(false) self.bountyRewardSpine:getSkeletonGraphic().enabled = false return @@ -715,9 +715,13 @@ function MainCityUI:switchComp(index) if i == index then if index == GConst.MainCityConst.BOTTOM_PAGE.SHOP then comp:clearPostFlag() + comp:refresh() + elseif index == GConst.MainCityConst.BOTTOM_PAGE.HERO then + comp:refresh(GConst.BattleConst.BATTLE_TYPE.STAGE) + else + comp:refresh() end - comp:refresh() - + self:updateTime() end end @@ -738,17 +742,10 @@ function MainCityUI:switchMainCompModule(moduleKey) return end - if moduleKey == nil then - moduleKey = self.subComps[self.selectedIndex]:getCurModuleType() - end - - if moduleKey == GConst.MainCityConst.MAIN_MODULE.DUNGEON then - -- 活动副本切换刷新 - self:setTopNodeVisible(false) - self:setSideBarVisible(false) - else - self:setTopNodeVisible(true) - self:setSideBarVisible(true) + local module = self.mainComp:getCurModule() + if module then + self:setTopNodeVisible(module:isShowTopNode()) + self:setSideBarVisible(module:isShowSideBar()) self:refreshBounty() end end diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua new file mode 100644 index 00000000..98519bcf --- /dev/null +++ b/lua/app/userdata/arena/arena_data.lua @@ -0,0 +1,384 @@ +local ArenaData = class("ArenaData", BaseData) + +-- 竞技场 + +function ArenaData:ctor() + self.data.isDirty = false +end + +function ArenaData:clear() +end + +function ArenaData:init(data) + data = data or GConst.EMPTY_TABLE + + self.season = data.season_number + self.score = data.current_score + self.lastScore = data.last_score + self.lastChallengeCount = data.last_challenge_count-- 上赛季挑战次数 + self.seasonRewardGot = data.settle_reward_season-- 最近领取过奖励的赛季 + self.todayMatchCount = data.today_match_count + self.matchInfo = data.rival_info + self.matchSuccessTime = data.match_success_at-- 匹配成功时间，超过配置时间后，匹配对象过期，需要重新匹配 + self.matchFreeCdEndTime = data.match_success_cd_end_at-- 免费匹配cd结束时间，<=0表示无cd，>0表示cd剩余时间 + self.todayAdRematchCount = data.today_ad_count-- 今日看广告跳匹配cd次数 + -- 初始化rank配置 + self.cfgRank = self:getRankCfg(self.season) + -- 初始化time配置 + self.cfgTime = self:getTimeCfg(self.season) + + self.curGradingId = self:getGradingIdFromScore(self.score) -- 当前所在段位id + DataManager.FormationData:initArena(data.attack_array_heroes, data.defend_array_heroes) + + self:setDirty() +end + +function ArenaData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +-- 通用 ---------------------------------------------------------------------- + +-- 获取赛季rank配置 +function ArenaData:getRankCfg(season) + local result = table.removeEx(ConfigManager:getConfig("arena_rank"), function(key, value) + if value.season == season then + return false, true + else + return true, true + end + end) + return result +end + +-- 获取赛季time配置 +function ArenaData:getTimeCfg(season) + local result = table.find(ConfigManager:getConfig("arena_time"), function(value) + return value.season == season + end) + return result +end + +-- 是否开启 +function ArenaData:isOpen() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ARENA, true) then + return false + end + return true +end + +-- 获取当前为第几赛季 +function ArenaData:getSeason() + return self.season +end + +-- 获取帮助文案 +function ArenaData:getHelpDesc() + return nil +end + +-- 获取当前赛季段位id列表 +function ArenaData:getGradingIdList() + return table.keys(self.cfgRank) +end + +-- 获取赛季剩余时间（秒） +function ArenaData:getRemainSeasonTime() + local endTime = Time:getCertainTimeByStr(self.cfgTime.end_time) + return endTime - Time:getServerTime() +end + +-- 获取赛季结算的剩余时间（秒） +function ArenaData:getRemainSeasonSettlementTime() + -- 赛季结束前30分钟结算 + local lockTime = Time:getCertainTimeByStr(self.cfgTime.end_time) - 30 * 60 + return lockTime - Time:getServerTime() +end + +-- 获取赛季段位结算奖励信息 +function ArenaData:getGradingRewardInfo(id) + return self.cfgRank[id].season_reward +end + +-- 获取上赛季奖励信息 +function ArenaData:getLastSeasonRewardInfo(id) + if self.season == 1 then + return nil + end + return self:getRankCfg(self.season - 1)[id].season_reward +end + +-- 获取积分所对应的段位id +function ArenaData:getGradingIdFromScore(score) + local seasonId,grading = nil + for id, data in pairs(self.cfgRank) do + if score >= data.score and (grading == nil or grading.score < data.score) then + seasonId, grading = id, data + end + end + + return seasonId +end + +-- 获取段位图标名 +function ArenaData:getGradingIconName(id) + if self.cfgRank[id] == nil then + Logger.logError("未找到段位[%d]相关数据", id) + return nil + end + return "arena_dan_" .. self.cfgRank[id].rank_icon +end + +-- 获取上赛季段位图标名 +function ArenaData:getLastGradingIconName(id) + return "arena_dan_" .. self:getRankCfg(self.season - 1)[id].rank_icon +end + +-- 获取段位名称 +function ArenaData:getGradingName(id) + return I18N:getGlobalText(self.cfgRank[id].name_txt) +end + +-- 获取上赛季段位名称 +function ArenaData:getLastGradingName(id) + return I18N:getGlobalText(self:getRankCfg(self.season - 1)[id].name_txt) +end + +-- 获取重新刷新匹配时间（秒） +function ArenaData:getRematchRefreshTime() + return GFunc.getConstIntValue("arena_refresh_time") * 60 +end + +-- 获取重新匹配每天最大广告次数 +function ArenaData:getRematchAdDailyMaxNum() + return GFunc.getConstIntValue("arena_refresh_ad_times") +end + +-- 获取重新匹配钻石消耗 +function ArenaData:getRematchConstGem() + return GFunc.getConstIntValue("arena_refresh_cost") +end + +-- 获取匹配信息最多存在时间（秒） +function ArenaData:getMatchInfoMaxTime() + return GFunc.getConstIntValue("arena_info_time") * 60 * 60 +end + +-- 获取战斗消耗 +function ArenaData:getFightCost() + return GFunc.getConstReward("arena_fight_cost") +end + +-- 排行榜 ---------------------------------------------------------------------- + +-- 排行榜玩家总数 +function ArenaData:getRankCount() + if self.rankList then + return #self.rankList + else + return 0 + end +end + +-- 获取排行榜第n名数据 +function ArenaData:getRankData(rank) + local info = table.find(self.rankList, function (value) + return value.rank == rank + end) + + if info == nil then + Logger.logError("没有找到排行榜第%d名数据", rank) + end + + return info +end + +-- 本地是否有排行榜该玩家编队数据 +function ArenaData:hasRankFormation(id) + return self.rankFormation == nil or self.rankFormation[id] == nil +end + +-- 获取排行榜玩家编队信息 +function ArenaData:getRankFormation(id) + return self.rankFormation[id] +end + +-- 匹配 ---------------------------------------------------------------------- + +-- 获取匹配玩家信息 +function ArenaData:getMatchInfo() + if Time:getServerTime() - self.matchSuccessTime > self:getMatchInfoMaxTime() then + -- 超过时间需要重新匹配 + return nil + end + if self.matchInfo == nil then + return nil + end + + return self.matchInfo +end + +-- 个人 ---------------------------------------------------------------------- + +-- 获取当前段位积分 +function ArenaData:getScore() + return self.score +end + +-- 获取当前段位id +function ArenaData:getGradingId() + return self.curGradingId +end + +-- 获取所在段位的积分 cur - min +function ArenaData:getGradingScore() + return self.score - self:getGradingMinScore(self.score) +end + +-- 获取所在段位的最低积分 +function ArenaData:getGradingMinScore() + return self.cfgRank[self.curGradingId].score +end + +-- 获取所在段位的最高积分 full +function ArenaData:getGradingMaxScore() + local isNext = false + for id, data in pairs(self.cfgRank) do + if id == self.curGradingId then + isNext = true + end + if isNext then + return data.score + end + end +end + +-- 获取所在段位的总积分 +function ArenaData:getGradingScoreTotal() + return self:getGradingMaxScore() - self:getGradingMinScore() +end + +-- 获取自己的排名 +function ArenaData:getRank() + return self.rank +end + +-- 获取最近战况 +function ArenaData:getRecentBattleByIdx(index) + if self.recentBattle == nil then + return nil + end + return self.recentBattle[index] +end + +-- 获取免费重新匹配cd， 大于0代表在cd中，小于等于0代表cd冷却已好，可以免费Rematch +function ArenaData:getFreeRematchCd() + if self.matchFreeCdEndTime <= 0 then + -- cd已经冷却 + return self.matchFreeCdEndTime + end + return self.matchFreeCdEndTime - Time:getServerTime() +end + +-- 今日是否能看视频重新匹配 +function ArenaData:canAdRematch() + return self.todayAdRematchCount < self:getRematchAdDailyMaxNum() +end + +-- 获取上赛季段位id +function ArenaData:getLastGradingId() + local lastRank = self:getRankCfg(self.season - 1) + local seasonId,grading = nil + for id, data in pairs(lastRank) do + if self.lastScore >= data.score and (grading == nil or grading.score < data.score) then + seasonId, grading = id, data + end + end + return seasonId +end + +-- 是否有可领取的上赛季奖励 +function ArenaData:hasSeasonReward() + if self.lastChallengeCount <= 0 then + return false + end + if self.seasonRewardGot == self.season - 1 then + return false + end + + return true +end + +-- 是否有入口红点 +function ArenaData:hasEntranceRedDot() + return self:getTicketNum() > 0 or self:hasSeasonReward() +end + +-- 事件处理 ---------------------------------------------------------------------- + +-- 获取到排行榜数据 +function ArenaData:onRankDataReceived(rank, list) + self.rank = rank + self.rankList = list + self:setDirty() +end + +-- 获取到排行榜编队信息 +function ArenaData:onRankFormationReceived(id, formation) + if self.rankFormation == nil then + self.rankFormation = {} + end + self.rankFormation[id] = formation +end + +-- 获取到最近战况数据 +function ArenaData:onRecentBattleReceived(recentBattle) + table.sort(recentBattle, function(a, b) + -- 由新到旧 + return a.occur_at > b.occur_at + end) + self.recentBattle = recentBattle + self:setDirty() +end + +-- 获取到匹配数据 +function ArenaData:onMatchInfoReceived(match) + self.matchInfo = match + self.matchSuccessTime = Time:getServerTime() + self.matchFreeCdEndTime = Time:getServerTime() + self:getRematchRefreshTime() + self:setDirty() +end + +-- 结算战斗数据 +function ArenaData:onBattleResultReceived(settlement) + -- 战斗记录改变 + table.remove(self.recentBattle, #self.recentBattle) + table.insert(self.recentBattle, 1, settlement) + -- 积分改变 + self.score = self.score + settlement.score + self.curGradingId = self:getGradingIdFromScore(self.score) + + self:setDirty() +end + +-- 已领取上赛季奖励 +function ArenaData:onLastSeasonRewardReceived() + self.seasonRewardGot = self.season - 1 +end + +-- 跳过匹配cd +function ArenaData:onOverFreeRematchCD(isAd) + self.matchFreeCdEndTime = -1 + if isAd then + self.todayAdRematchCount = self.todayAdRematchCount + 1 + end + self:setDirty() +end + +-- 赛季改变 +function ArenaData:onSeasonChanged() + self.matchInfo = nil + self:setDirty() +end + +return ArenaData \ No newline at end of file diff --git a/lua/app/userdata/arena/arena_data.lua.meta b/lua/app/userdata/arena/arena_data.lua.meta new file mode 100644 index 00000000..2f076ba9 --- /dev/null +++ b/lua/app/userdata/arena/arena_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 385db71b1437e764eb063afef160fe87 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/bag/item_data.lua b/lua/app/userdata/bag/item_data.lua index 1e1c2050..d6f49c51 100644 --- a/lua/app/userdata/bag/item_data.lua +++ b/lua/app/userdata/bag/item_data.lua @@ -32,6 +32,9 @@ function ItemData:init(data) if info.id == GConst.ItemConst.ITEM_ID_VIT then DataManager.PlayerData:setVit(info.count) end + if info.id == GConst.ItemConst.ITEM_ID_ARENA_TICKET then + DataManager.PlayerData:setArenaTicket(info.count) + end self:_add(info.id, info.count) end end diff --git a/lua/app/userdata/formation/formation_data.lua b/lua/app/userdata/formation/formation_data.lua index b3f2660e..076fed1d 100644 --- a/lua/app/userdata/formation/formation_data.lua +++ b/lua/app/userdata/formation/formation_data.lua @@ -5,21 +5,57 @@ function FormationData:ctor() self.formations = {} end +-- 初始化主线阵容 function FormationData:init(data) - self.data.dirty = false - self.formations = {} - -- 目前只有主线关卡的 + if self.formations == nil then + self.formations = {} + end + if data and data.heroes then local clientFormation = {} for matchType, heroId in pairs(data.heroes) do clientFormation[tonumber(matchType)] = heroId end - self.formations[GConst.BattleConst.BATTLE_TYPE.STAGE] = clientFormation + self.formations[GConst.BattleConst.FORMATION_TYPE.STAGE] = clientFormation end + self:setDirty() +end + +-- 初始化竞技场阵容 +function FormationData:initArena(attack, defend) + if self.formations == nil then + self.formations = {} + end + + -- 位置顺序特殊处理 + self.formations[GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK] = {0,0,0,0,0} + self.formations[GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND] = {0,0,0,0,0} + + for idx, id in pairs(attack) do + if id and id ~= 0 then + local type = DataManager.HeroData:getHeroById(id):getMatchType() + self.formations[GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK][type] = id + end + end + for idx, id in pairs(defend) do + if id and id ~= 0 then + local type = DataManager.HeroData:getHeroById(id):getMatchType() + self.formations[GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND][type] = id + end + end + self:setDirty() end function FormationData:getStageFormation() - return self:getFormation(GConst.BattleConst.BATTLE_TYPE.STAGE) + return self:getFormation(GConst.BattleConst.FORMATION_TYPE.STAGE) +end + +function FormationData:getArenaAttackFormation() + return self:getFormation(GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK) +end + +function FormationData:getArenaDefendFormation() + return self:getFormation(GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND) end function FormationData:getFormation(formationType) @@ -54,6 +90,27 @@ function FormationData:heroInFormation(formationType, heroId) return false end +function FormationData:formationIsFull(formationType) + local actvieMap = DataManager.HeroData:getMatchActiveHeroMap() + local formation = self:getFormation(formationType) + local count = 0 + for matchtype = 1, GConst.BattleConst.ELEMENT_TYPE_COUNT do + if not formation[matchtype] or formation[matchtype] <= 0 then + if actvieMap[matchtype] and table.nums(actvieMap[matchtype]) > 0 then + return false + end + else + count = count + 1 + end + end + + if count <= 0 then + return false + end + + return true +end + function FormationData:setDirty() self.data.dirty = not self.data.dirty end diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index e3d91c24..89c59850 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -66,7 +66,7 @@ function HeroData:getEntity(cfgId, lv) end function HeroData:getHeroById(id) - if not id then + if not id or id == 0 then return end if not self.heroes[id] then diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index ced339f1..8c1cabf1 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -37,10 +37,16 @@ function PlayerData:init(data) self.data.playInfo.unlockAvatar = data.bag.avatars self.data.playInfo.unlockFrame = data.bag.avatar_frames + -- 体力购买情况初始化 local energyLimit = data.energy_limit or GConst.EMPTY_TABLE self.data.vitGemCount = energyLimit.diamond_count or 0 self.data.vitADCount = energyLimit.ad_count or 0 + -- 竞技场入场券购买情况初始化 + local arenaTicketLimit = data.arena or GConst.EMPTY_TABLE + self.data.arenaTicketGemCount = arenaTicketLimit.today_ticket_buy_count or 0 + self.data.arenaTicketADCount = arenaTicketLimit.today_ticket_ad_count or 0 + self.lastLoginTime = basicInfo.lastLoginTime or Time:getBeginningOfServerToday() DataManager:registerCrossDayFunc("PlayerData", function() self:resetOnCrossDay() @@ -486,4 +492,37 @@ function PlayerData:getShowFrameIds() return table.addArray(unlockIds, lockIds) end +-- 竞技场战令 + +function PlayerData:getArenaTicket() + return self.arenaTicket or 0 +end + +function PlayerData:getArenaTicketGemBuyCount() + return self.data.arenaTicketGemCount +end + +function PlayerData:getArenaTicketAdBuyCount() + return self.data.arenaTicketADCount +end + +function PlayerData:setArenaTicket(ticket) + self.arenaTicket = ticket +end + +function PlayerData:getMaxArenaTicket() + if self.maxArenaTicket == nil then + self.maxArenaTicket = ConfigManager:getConfig("recovery")[GConst.ItemConst.ITEM_ID_ARENA_TICKET].limit + end + return self.maxArenaTicket +end + +function PlayerData:addArenaTicketGemBuyCount() + self.data.arenaTicketGemCount = self.data.arenaTicketGemCount + 1 +end + +function PlayerData:addArenaTicketAdBuyCount() + self.data.arenaTicketADCount = self.data.arenaTicketADCount + 1 +end + return PlayerData \ No newline at end of file