diff --git a/lua/app/bf/common/functions.lua b/lua/app/bf/common/functions.lua index 3f65870d..f5c586bc 100644 --- a/lua/app/bf/common/functions.lua +++ b/lua/app/bf/common/functions.lua @@ -362,6 +362,23 @@ function table.shuffle(t) return tab end +function table.shuffleBySeed(t, seed) + if type(t)~="table" then + return + end + local tab = {} + local index = 1 + while #t ~= 0 do + local n = GFunc.getRandomIndexBySeed(seed, 1, #t) + if t[n] ~= nil then + tab[index] = t[n] + table.remove(t,n) + index = index + 1 + end + end + return tab +end + function table.clear(t) if not t then return diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 25bb2dc1..3a6117fe 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -140,6 +140,16 @@ BIReport.ITEM_GET_TYPE = { OFFLINE_RECOVERY = "OfflineRecovery", ACT_SUMMER = "ActSummer", ACT_HERO_FUND = "ActHeroFund", + ACT_BOSS_RUSH_FIGHT_START = "ActBossRushFightStart", + ACT_BOSS_RUSH_FIGHT = "ActBossRushFight", + ACT_BOSS_RUSH_FUND = "ActBossRushFund", + ACT_BOSS_RUSH_SHOP = "ActBossRushShop", + ACT_BOSS_RUSH_RANK = "ActBossRushRank", + ACT_BOSS_RUSH_BUY_FUND = "ActBossRushBuyFund", + ACT_FOURTEEN_DAY_BOUNTY = "ActFourteenDayBounty", + ACT_FOURTEEN_DAY_TASK = "ActFourteenDayTask", + ACT_FOURTEEN_DAY_EXCHANGE = "ActFourteenDayExchange", + FOURTEEN_DAY_GIFT = "FourteenDayGift", } BIReport.ADS_CLICK_TYPE = { @@ -188,6 +198,7 @@ BIReport.BATTLE_TYPE = { ["5"] = "Arena", ["6"] = "DungeonWeapon", ["7"] = "DungeonArmor", + ["8"] = "ActBossRush", } BIReport.GIFT_TYPE = { @@ -208,7 +219,8 @@ BIReport.GIFT_TYPE = { WEAPON_GIFT = "WeaponGift", ARMOR_GIFT = "ArmorGift", ACT_SUMMER = "ActSummer", - ACT_HERO_FUND = "ActHeroFund" + ACT_HERO_FUND = "ActHeroFund", + FOURTEEN_DAY_GIFT = "FourteenDayGift", } BIReport.COIN_TYPE = { @@ -950,6 +962,11 @@ function BIReport:postFightBegin(battleType, wave, chapterId, maxChapter, startT fight_max_chapter = maxChapter, start_times = startTimes, } + if EDITOR_MODE then + if not args.battle_type then + Logger.logFatal("============report postFightBegin 没有battle_type 请检查===========") + end + end args.formation, args.famation_level = DataManager.FormationData:getStageFormationBIStr() self:report(EVENT_NAME_FIGHT, args) end @@ -988,6 +1005,11 @@ function BIReport:postFightEnd(battleType, battleData, chapterId, wave, duration is_first_win = isFirstWin, isFianlStep = isFianlStep, } + if EDITOR_MODE then + if not args.battle_type then + Logger.logFatal("============report postFightEnd 没有battle_type 请检查===========") + end + end args.formation, args.famation_level = DataManager.FormationData:getStageFormationBIStr() args.max_link_count = maxLinkCount @@ -1020,6 +1042,11 @@ function BIReport:postShowFightSkillSelect(battleType, battleData, skillList, ch skill = skillStr, skill_num = skillNum, } + if EDITOR_MODE then + if not args.battle_type then + Logger.logFatal("============report postShowFightSkillSelect 没有battle_type 请检查===========") + end + end self:report(EVENT_NAME_FIGHT, args) end @@ -1048,6 +1075,11 @@ function BIReport:postFightSkillSelect(battleType, battleData, skillList, chapte skill = skillStr, skill_num = skillNum, } + if EDITOR_MODE then + if not args.battle_type then + Logger.logFatal("============report postFightSkillSelect 没有battle_type 请检查===========") + end + end self:report(EVENT_NAME_FIGHT, args) end diff --git a/lua/app/common/config_manager.lua b/lua/app/common/config_manager.lua index 537bc5a1..a464784b 100644 --- a/lua/app/common/config_manager.lua +++ b/lua/app/common/config_manager.lua @@ -115,6 +115,7 @@ function ConfigManager:preLoadConfig() handleMonsterGrow("monster_dungeon_shards") handleMonsterGrow("monster_dungeon_equip") handleMonsterGrow("monster_dungeon_armor") + handleMonsterGrow("monster_activity") self.configs["monster"] = { data = monsterFullData, diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 98dc9fef..e15ad478 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -34,6 +34,8 @@ function DataManager:init() self:initManager("SummonData", "app/userdata/summon/summon_data") self:initManager("AIHelperData", "app/userdata/game_setting/ai_helper_data") self:initManager("HeroFundData", "app/userdata/activity/hero_fund/hero_fund_data") + self:initManager("ActBossRushData", "app/userdata/activity/act_boss_rush/act_boss_rush_data") + self:initManager("FourteenDayData", "app/userdata/activity/fourteen_day/fourteen_day_data") end function DataManager:initManager(name, path) @@ -120,8 +122,11 @@ function DataManager:clear() self.TaskData:clear() self.AIHelperData:clear() self.HeroFundData:clear() + self.ActBossRushData:clear() + self.FourteenDayData:clear() ModuleManager.TaskManager:clear() self:clearTryOpenFunc() + self.activityBountyLevelMap = nil end function DataManager:initWithServerData(data) @@ -133,6 +138,7 @@ function DataManager:initWithServerData(data) if EDITOR_MODE then Logger.logHighlight("initWithServerData") Logger.printTable(data) + Logger.logHighlight("注册时间 : " .. Time:formatTimeYMDHMS(GFunc.formatTimeStep(data.stat.register_ts))) end self.registerTs = data.stat and data.stat.register_ts or Time:getServerTime() self.registerTs = GFunc.formatTimeStep(self.registerTs or Time:getServerTime()) @@ -181,6 +187,7 @@ function DataManager:initWithServerData(data) self.GrowthFundData:init(data.fund.funds) end self.HeroFundData:init(data.hero_fund) + self.FourteenDayData:init(data.fourteen_bounty) -- 任务数据最后初始化,依赖其他模块的数据 self.TaskData:init() @@ -188,6 +195,7 @@ function DataManager:initWithServerData(data) self:checkDataBind() ModuleManager.ArenaManager:reqArenaInfo() + self:dealOpenActivity(data.activities) -- 写在最后，防止某些数据还未初始化，就被bi访问报错 self.initWithServer = true end @@ -409,4 +417,78 @@ function DataManager:getManager(name, path) return self[name] end +---- 缓存一下活动战令 +function DataManager:getActivityBountyLevelByActId(actId) + if not self.activityBountyLevelMap then + self.activityBountyLevelMap = {} + local cfg = ConfigManager:getConfig("activity_bounty_level") + for id, info in pairs(cfg) do + if info.act_id then + if not self.activityBountyLevelMap[info.act_id] then + self.activityBountyLevelMap[info.act_id] = {} + end + table.insert(self.activityBountyLevelMap[info.act_id], id) + end + end + end + return self.activityBountyLevelMap[actId] +end + +---- 缓存一下活动兑换商店 +function DataManager:getActivityExchangeByActId(actId) + if not self.activityExchangeMap then + self.activityExchangeMap = {} + local cfg = ConfigManager:getConfig("activity_exchange") + for id, info in pairs(cfg) do + if info.activity then + if not self.activityExchangeMap[info.activity] then + self.activityExchangeMap[info.activity] = {} + end + table.insert(self.activityExchangeMap[info.activity], id) + end + end + end + Logger.printTable(self.activityExchangeMap) + return self.activityExchangeMap[actId] +end + +function DataManager:dealOpenActivity(activityInfo) + local curTime = Time:getServerTime() + if not activityInfo then + return + end + + local dealTypeMap = {} + for _, info in ipairs(activityInfo) do + local startTime = GFunc.formatTimeStep(info.start_at) + if startTime <= curTime and curTime <= GFunc.formatTimeStep(info.end_at) then + local reqFunc = DataManager.activityOpenFunc[info.type] + if reqFunc and not dealTypeMap[info.type] then + dealTypeMap[info.type] = true + reqFunc(info) + end + elseif startTime > curTime then + local waitOpenFunc = DataManager.waitOpenActivity[info.type] + if waitOpenFunc and not dealTypeMap[info.type] then + dealTypeMap[info.type] = true + waitOpenFunc(info) + end + end + end +end + +DataManager.activityOpenFunc = { + [2] = function(params) + ModuleManager.ActBossRushManager:reqActData() + DataManager.ActBossRushData:setActivityInfo(params) + end +} + +DataManager.waitOpenActivity = { + [2] = function(params) + DataManager.ActBossRushData:init({activity_id = params.id}) -- 默认初始化 + DataManager.ActBossRushData:setActivityInfo(params) + end +} + return DataManager \ No newline at end of file diff --git a/lua/app/common/local_data.lua b/lua/app/common/local_data.lua index 47e7f3ce..43a57208 100644 --- a/lua/app/common/local_data.lua +++ b/lua/app/common/local_data.lua @@ -40,6 +40,9 @@ local LOCAL_DATA_KEY = { BATTLE_SNAPSHOT = "BATTLE_SNAPSHOT", ACTIVITY_SUMMER_TODAY_SKIN = "ACTIVITY_SUMMER_TODAY_SKIN", ACTIVITY_SUMMER_TODAY_HERO = "ACTIVITY_SUMMER_TODAY_HERO", + NOT_POP_TODAY = "NOT_POP_TODAY", + FOURTEEN_DAY_TODAY_EXCHANGE = "FOURTEEN_DAY_TODAY_EXCHANGE", + ACT_BOSS_RUSH_EXCHANGE = "ACT_BOSS_RUSH_EXCHANGE", } LocalData.KEYS = LOCAL_DATA_KEY @@ -465,4 +468,28 @@ function LocalData:recordTodayActSummerWatchedHero() self:setInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_HERO .. Time:getBeginningOfServerToday(), 1) end +function LocalData:setNotPopToday(customKey) + self:setInt(LOCAL_DATA_KEY.NOT_POP_TODAY .. customKey, Time:getBeginningOfServerToday()) +end + +function LocalData:getNotPopToday(customKey) + return self:getInt(LOCAL_DATA_KEY.NOT_POP_TODAY .. customKey, 0) +end + +function LocalData:getTodayFourteenDayExchangeWatched() + return self:getInt(LOCAL_DATA_KEY.FOURTEEN_DAY_TODAY_EXCHANGE .. Time:getBeginningOfServerToday(), 0) == 1 +end + +function LocalData:recordTodayFourteenDayExchangeWatched() + self:setInt(LOCAL_DATA_KEY.FOURTEEN_DAY_TODAY_EXCHANGE .. Time:getBeginningOfServerToday(), 1) +end + +function LocalData:getTodayBossRushExchangeWatched() + return self:getInt(LOCAL_DATA_KEY.ACT_BOSS_RUSH_EXCHANGE, 0) +end + +function LocalData:recordTodayBossRushExchangeWatched() + self:setInt(LOCAL_DATA_KEY.ACT_BOSS_RUSH_EXCHANGE, Time:getBeginningOfServerToday()) +end + return LocalData \ No newline at end of file diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index a9a3b3cf..d2dcadbb 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -71,6 +71,10 @@ local MODULE_PATHS = { SkinManager = "app/module/skin/skin_manager", -- 英雄基金 HeroFundManager = "app/module/activity/hero_fund/hero_fund_manager", + -- 世界首领活动 + ActBossRushManager = "app/module/activity/act_boss_rush/act_boss_rush_manager", + -- 新手14天乐 + FourteenDayManager = "app/module/activity/fourteen_day/fourteen_day_manager", } -- 这里的key对应func_open里的id diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 799522e9..e6c6b0b1 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -26,6 +26,7 @@ PayManager.PURCHARSE_ACT_TYPE = { ACT_HERO_FUND = 14, WEAPON_UPGRADE_GIFT = 15, ARMOR_UPGRADE_GIFT = 16, + FOURTEEN_DAY_GIFT = 17, } PayManager.PURCHARSE_TYPE_CONFIG = { @@ -54,6 +55,7 @@ PayManager.BI_ITEM_GET_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND, [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG, [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE, @@ -79,6 +81,7 @@ PayManager.BI_GIFT_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND, [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG, [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE, diff --git a/lua/app/common/server_push_manager.lua b/lua/app/common/server_push_manager.lua index d0cc21e3..f7c33fae 100644 --- a/lua/app/common/server_push_manager.lua +++ b/lua/app/common/server_push_manager.lua @@ -22,6 +22,7 @@ function ServerPushManager:initWhenLogin() self:addServerPushListener(ProtoMsgType.FromMsgEnum.MallDailyResetNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onMallDailyReset) self:addServerPushListener(ProtoMsgType.FromMsgEnum.AIHelpUnreadNtf, ModuleManager.GameSettingManager, ModuleManager.GameSettingManager.rspAiHelperNtf) self:addServerPushListener(ProtoMsgType.FromMsgEnum.RecoveryNtf, ModuleManager.ItemManager, ModuleManager.ItemManager.rspRecoveryNtf) + self:addServerPushListener(ProtoMsgType.FromMsgEnum.BossRushBoughtNtf, ModuleManager.ActBossRushManager, ModuleManager.ActBossRushManager.rspBossRushBoughtNtf) end ---- 移除全局推送监听 diff --git a/lua/app/common/white_res_manager.lua b/lua/app/common/white_res_manager.lua index 8527e9d3..df5613c3 100644 --- a/lua/app/common/white_res_manager.lua +++ b/lua/app/common/white_res_manager.lua @@ -5,6 +5,7 @@ local WhiteResManager = {} local GAME_RES_WHITE_LIST = { -- ui GConst.ATLAS_PATH.COMMON, + GConst.ATLAS_PATH.ACT_COMMON, -- icon GConst.ATLAS_PATH.ICON_SKILL, GConst.ATLAS_PATH.ICON_SKILL_BIG, diff --git a/lua/app/config/act_fourteen_bounty.lua b/lua/app/config/act_fourteen_bounty.lua new file mode 100644 index 00000000..756a1edc --- /dev/null +++ b/lua/app/config/act_fourteen_bounty.lua @@ -0,0 +1,150 @@ +local act_fourteen_bounty = { + [1]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [2]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [3]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [4]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [5]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [6]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [7]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [8]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } +} +local config = { +data=act_fourteen_bounty,count=8 +} +return config \ No newline at end of file diff --git a/lua/app/ui/bounty/cell/bounty_reward_cell.lua.meta b/lua/app/config/act_fourteen_bounty.lua.meta similarity index 86% rename from lua/app/ui/bounty/cell/bounty_reward_cell.lua.meta rename to lua/app/config/act_fourteen_bounty.lua.meta index 1398823b..e32fffba 100644 --- a/lua/app/ui/bounty/cell/bounty_reward_cell.lua.meta +++ b/lua/app/config/act_fourteen_bounty.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07151d06bce0c5e488135947541210e0 +guid: 98e6ac4cce3094f4ca2032007239b1f9 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/act_fourteen_exchange.lua b/lua/app/config/act_fourteen_exchange.lua new file mode 100644 index 00000000..8b20ed6e --- /dev/null +++ b/lua/app/config/act_fourteen_exchange.lua @@ -0,0 +1,306 @@ +local act_fourteen_exchange = { + [1]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44002, + ["id_for_nothing"]="UgxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["limit"]=10 + }, + [2]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=750, + ["num_for_nothing"]="UQ1c" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24001, + ["id_for_nothing"]="VAxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["limit"]=10 + }, + [3]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=750, + ["num_for_nothing"]="UQ1c" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["limit"]=10 + }, + [4]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=750, + ["num_for_nothing"]="UQ1c" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54003, + ["id_for_nothing"]="UwxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["limit"]=10 + }, + [5]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=800, + ["num_for_nothing"]="Xghc" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=15, + ["id_for_nothing"]="Vw0=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["limit"]=3 + }, + [6]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["limit"]=3 + }, + [7]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["limit"]=10 + }, + [8]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["limit"]=10 + }, + [9]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["limit"]=10 + }, + [10]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["limit"]=10 + }, + [11]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["limit"]=10 + }, + [12]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=120, + ["num_for_nothing"]="Vwpc" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["limit"]=10 + }, + [13]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["limit"]=10 + }, + [14]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=999 + }, + [15]={ + ["stage"]=1, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["limit"]=999 + } +} +local config = { +data=act_fourteen_exchange,count=15 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_fourteen_exchange.lua.meta b/lua/app/config/act_fourteen_exchange.lua.meta new file mode 100644 index 00000000..0d0ddd2b --- /dev/null +++ b/lua/app/config/act_fourteen_exchange.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 057f6606cfb30ab43a95c25d2f0639a9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_fourteen_quest.lua b/lua/app/config/act_fourteen_quest.lua new file mode 100644 index 00000000..99148f21 --- /dev/null +++ b/lua/app/config/act_fourteen_quest.lua @@ -0,0 +1,897 @@ +local act_fourteen_quest = { + [1]={ + ["stage"]=1, + ["quest"]=32, + ["none"]="深渊挑战4", + ["num"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=16 + }, + [2]={ + ["stage"]=1, + ["quest"]=23, + ["none"]="角色升到20级", + ["num"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=6 + }, + [3]={ + ["stage"]=1, + ["quest"]=31, + ["none"]="竞技场达到青铜II", + ["num"]=1000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=13 + }, + [4]={ + ["stage"]=1, + ["quest"]=1, + ["none"]="广告次数累计达8", + ["num"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=10 + }, + [5]={ + ["stage"]=1, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["icon"]=11 + }, + [6]={ + ["stage"]=2, + ["quest"]=38, + ["none"]="武器升级15次", + ["num"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=22 + }, + [7]={ + ["stage"]=2, + ["quest"]=33, + ["none"]="时空裂隙1-6", + ["num"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=17 + }, + [8]={ + ["stage"]=2, + ["quest"]=37, + ["none"]="开启主线宝箱36个", + ["num"]=36, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=21 + }, + [9]={ + ["stage"]=2, + ["quest"]=34, + ["none"]="矿车拦截5", + ["num"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=18 + }, + [10]={ + ["stage"]=2, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["icon"]=11 + }, + [11]={ + ["stage"]=3, + ["quest"]=35, + ["none"]="灯神之塔4", + ["num"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=19 + }, + [12]={ + ["stage"]=3, + ["quest"]=23, + ["none"]="角色升到24级", + ["num"]=24, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=6 + }, + [13]={ + ["stage"]=3, + ["quest"]=32, + ["none"]="深渊挑战5", + ["num"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=16 + }, + [14]={ + ["stage"]=3, + ["quest"]=1, + ["none"]="广告次数累计达24", + ["num"]=24, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=10 + }, + [15]={ + ["stage"]=3, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["icon"]=11 + }, + [16]={ + ["stage"]=4, + ["quest"]=36, + ["none"]="每日挑战胜利5次", + ["num"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=20 + }, + [17]={ + ["stage"]=4, + ["quest"]=34, + ["none"]="矿车拦截6", + ["num"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=18 + }, + [18]={ + ["stage"]=4, + ["quest"]=33, + ["none"]="时空裂隙2-6", + ["num"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=17 + }, + [19]={ + ["stage"]=4, + ["quest"]=6, + ["none"]="开启商城宝箱5次", + ["num"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=4 + }, + [20]={ + ["stage"]=4, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["icon"]=11 + }, + [21]={ + ["stage"]=5, + ["quest"]=1, + ["none"]="广告次数累计达40", + ["num"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=10 + }, + [22]={ + ["stage"]=5, + ["quest"]=19, + ["none"]="通关波次400次", + ["num"]=400, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=20 + }, + [23]={ + ["stage"]=5, + ["quest"]=35, + ["none"]="灯神之塔5", + ["num"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=19 + }, + [24]={ + ["stage"]=5, + ["quest"]=31, + ["none"]="竞技场达到白银IV", + ["num"]=1200, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=14 + }, + [25]={ + ["stage"]=5, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["icon"]=11 + }, + [26]={ + ["stage"]=6, + ["quest"]=12, + ["none"]="击杀BOSS80次", + ["num"]=80, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=9 + }, + [27]={ + ["stage"]=6, + ["quest"]=32, + ["none"]="深渊挑战7", + ["num"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=16 + }, + [28]={ + ["stage"]=6, + ["quest"]=37, + ["none"]="开启主线宝箱48个", + ["num"]=48, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=21 + }, + [29]={ + ["stage"]=6, + ["quest"]=34, + ["none"]="矿车拦截7", + ["num"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=18 + }, + [30]={ + ["stage"]=6, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["icon"]=11 + }, + [31]={ + ["stage"]=7, + ["quest"]=33, + ["none"]="时空裂隙3-4", + ["num"]=16, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=17 + }, + [32]={ + ["stage"]=7, + ["quest"]=36, + ["none"]="每日挑战胜利10次", + ["num"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=20 + }, + [33]={ + ["stage"]=7, + ["quest"]=6, + ["none"]="开启商城宝箱10次", + ["num"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=4 + }, + [34]={ + ["stage"]=7, + ["quest"]=1, + ["none"]="广告次数累计达56", + ["num"]=56, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=10 + }, + [35]={ + ["stage"]=7, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["icon"]=11 + }, + [36]={ + ["stage"]=8, + ["quest"]=39, + ["none"]="防具升级40次", + ["num"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=23 + }, + [37]={ + ["stage"]=8, + ["quest"]=35, + ["none"]="灯神之塔7", + ["num"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=19 + }, + [38]={ + ["stage"]=8, + ["quest"]=19, + ["none"]="通关波次700次", + ["num"]=700, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=20 + }, + [39]={ + ["stage"]=8, + ["quest"]=34, + ["none"]="矿车拦截8", + ["num"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=18 + }, + [40]={ + ["stage"]=8, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["icon"]=11 + }, + [41]={ + ["stage"]=9, + ["quest"]=31, + ["none"]="竞技场达到白银III", + ["num"]=1400, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=14 + }, + [42]={ + ["stage"]=9, + ["quest"]=1, + ["none"]="广告次数累计达72", + ["num"]=72, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=10 + }, + [43]={ + ["stage"]=9, + ["quest"]=23, + ["none"]="角色升到32级", + ["num"]=32, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=6 + }, + [44]={ + ["stage"]=9, + ["quest"]=32, + ["none"]="深渊挑战9", + ["num"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["icon"]=16 + }, + [45]={ + ["stage"]=9, + ["none"]="完成所有任务", + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["icon"]=11 + } +} +local config = { +data=act_fourteen_quest,count=45 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_fourteen_quest.lua.meta b/lua/app/config/act_fourteen_quest.lua.meta new file mode 100644 index 00000000..67ae117f --- /dev/null +++ b/lua/app/config/act_fourteen_quest.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ae4732ca8e76a1243ad3c6e8d72d01b3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index a39c4d8a..5afddf5f 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1676,6 +1676,18 @@ local act_gift = { ["limit"]=1, ["value"]=1100 }, + [130502]={ + ["type"]=13, + ["recharge_id"]=11, + ["limit"]=1, + ["value"]=1800 + }, + [130602]={ + ["type"]=13, + ["recharge_id"]=12, + ["limit"]=1, + ["value"]=1800 + }, [140403]={ ["type"]=14, ["recharge_id"]=10, @@ -1686,6 +1698,11 @@ local act_gift = { ["recharge_id"]=12, ["limit"]=1 }, + [140405]={ + ["type"]=14, + ["recharge_id"]=11, + ["limit"]=1 + }, [150102]={ ["type"]=15, ["parameter_pro"]={ @@ -2541,9 +2558,198 @@ local act_gift = { ["limit_time"]=6, ["cd"]=1, ["value"]=800 + }, + [170102]={ + ["type"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + } + }, + [170202]={ + ["type"]=17, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=120, + ["num_for_nothing"]="Vwpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["limit"]=5, + ["value"]=800 + }, + [170302]={ + ["type"]=17, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["limit"]=5, + ["value"]=800 + }, + [170402]={ + ["type"]=17, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=720, + ["num_for_nothing"]="UQpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + } + }, + ["limit"]=5, + ["value"]=900 + }, + [170502]={ + ["type"]=17, + ["recharge_id"]=16, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=50000, + ["num_for_nothing"]="UwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["limit"]=5, + ["value"]=900 + }, + [170602]={ + ["type"]=17, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=51, + ["id_for_nothing"]="Uwk=", + ["num"]=4200, + ["num_for_nothing"]="UgpcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100000, + ["num_for_nothing"]="VwhcA2VR" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["limit"]=5, + ["value"]=1000 } } local config = { -data=act_gift,count=76 +data=act_gift,count=85 } return config \ No newline at end of file diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua index 68e7d1e1..a87896f5 100644 --- a/lua/app/config/activity.lua +++ b/lua/app/config/activity.lua @@ -3,9 +3,14 @@ local activity = { ["act_type"]=1, ["start_time"]="2023-08-22 00:00:00", ["end_time"]="2023-08-29 00:00:00" + }, + [206]={ + ["act_type"]=2, + ["start_time"]="2023-09-13 00:00:00", + ["end_time"]="2023-09-21 00:00:00" } } local config = { -data=activity,count=1 +data=activity,count=2 } return config \ No newline at end of file diff --git a/lua/app/config/activity_boss_rush_chapter.lua b/lua/app/config/activity_boss_rush_chapter.lua new file mode 100644 index 00000000..bd74e6ba --- /dev/null +++ b/lua/app/config/activity_boss_rush_chapter.lua @@ -0,0 +1,1546 @@ +local activity_boss_rush_chapter = { + [1]={ + ["board"]=1, + ["monster"]={ + 604, + 1604, + 2004, + 3404, + 4104 + } + }, + [2]={ + ["board"]=2, + ["monster"]={ + 604, + 1104, + 2204, + 2804, + 4204 + } + }, + [3]={ + ["board"]=3, + ["monster"]={ + 1004, + 1204, + 2404, + 3104, + 4104 + } + }, + [4]={ + ["board"]=4, + ["monster"]={ + 204, + 1204, + 2404, + 3504, + 4004 + } + }, + [5]={ + ["board"]=5, + ["monster"]={ + 104, + 1604, + 2704, + 3404, + 3704 + } + }, + [6]={ + ["board"]=6, + ["monster"]={ + 104, + 1704, + 2604, + 3504, + 4204 + } + }, + [7]={ + ["board"]=7, + ["monster"]={ + 104, + 1404, + 2304, + 2804, + 3804 + } + }, + [8]={ + ["board"]=8, + ["monster"]={ + 104, + 1204, + 2104, + 3404, + 3704 + } + }, + [9]={ + ["board"]=9, + ["monster"]={ + 604, + 1604, + 2104, + 2804, + 4004 + } + }, + [10]={ + ["board"]=10, + ["monster"]={ + 704, + 1104, + 2104, + 3404, + 4104 + } + }, + [11]={ + ["board"]=11, + ["monster"]={ + 304, + 1104, + 2404, + 3104, + 4204 + } + }, + [12]={ + ["board"]=12, + ["monster"]={ + 304, + 1204, + 2204, + 3504, + 3804 + } + }, + [13]={ + ["board"]=13, + ["monster"]={ + 104, + 1404, + 2004, + 3304, + 3904 + } + }, + [14]={ + ["board"]=14, + ["monster"]={ + 1004, + 1404, + 2204, + 3504, + 3904 + } + }, + [15]={ + ["board"]=15, + ["monster"]={ + 204, + 1504, + 2204, + 3104, + 4104 + } + }, + [16]={ + ["board"]=16, + ["monster"]={ + 504, + 1504, + 2304, + 2904, + 4004 + } + }, + [17]={ + ["board"]=17, + ["monster"]={ + 604, + 1204, + 2504, + 3404, + 4104 + } + }, + [18]={ + ["board"]=18, + ["monster"]={ + 1004, + 1704, + 2104, + 3504, + 3904 + } + }, + [19]={ + ["board"]=19, + ["monster"]={ + 504, + 1304, + 2004, + 2804, + 3904 + } + }, + [20]={ + ["board"]=20, + ["monster"]={ + 904, + 1604, + 2104, + 2904, + 3804 + } + }, + [21]={ + ["board"]=21, + ["monster"]={ + 204, + 1704, + 2704, + 3404, + 4004 + } + }, + [22]={ + ["board"]=22, + ["monster"]={ + 804, + 1304, + 2204, + 2904, + 3704 + } + }, + [23]={ + ["board"]=23, + ["monster"]={ + 1004, + 1404, + 2404, + 3404, + 4204 + } + }, + [24]={ + ["board"]=24, + ["monster"]={ + 404, + 1404, + 2604, + 2804, + 3804 + } + }, + [25]={ + ["board"]=25, + ["monster"]={ + 304, + 1404, + 2604, + 3304, + 3804 + } + }, + [26]={ + ["board"]=26, + ["monster"]={ + 604, + 1604, + 2104, + 3504, + 4004 + } + }, + [27]={ + ["board"]=27, + ["monster"]={ + 504, + 1604, + 2204, + 3504, + 4004 + } + }, + [28]={ + ["board"]=28, + ["monster"]={ + 404, + 1404, + 1904, + 3404, + 4104 + } + }, + [29]={ + ["board"]=29, + ["monster"]={ + 504, + 1804, + 2604, + 3204, + 3704 + } + }, + [30]={ + ["board"]=30, + ["monster"]={ + 704, + 1604, + 2304, + 2804, + 3904 + } + }, + [31]={ + ["board"]=31, + ["monster"]={ + 304, + 1304, + 2204, + 3304, + 4204 + } + }, + [32]={ + ["board"]=32, + ["monster"]={ + 804, + 1704, + 2604, + 2804, + 4004 + } + }, + [33]={ + ["board"]=33, + ["monster"]={ + 204, + 1404, + 2704, + 2804, + 4104 + } + }, + [34]={ + ["board"]=34, + ["monster"]={ + 104, + 1804, + 2704, + 2804, + 3704 + } + }, + [35]={ + ["board"]=35, + ["monster"]={ + 604, + 1604, + 2004, + 3104, + 4104 + } + }, + [36]={ + ["board"]=36, + ["monster"]={ + 104, + 1604, + 2704, + 3204, + 3904 + } + }, + [37]={ + ["board"]=37, + ["monster"]={ + 904, + 1804, + 2604, + 3004, + 3604 + } + }, + [38]={ + ["board"]=38, + ["monster"]={ + 1004, + 1404, + 2304, + 3104, + 3804 + } + }, + [39]={ + ["board"]=39, + ["monster"]={ + 604, + 1504, + 2604, + 2904, + 3804 + } + }, + [40]={ + ["board"]=40, + ["monster"]={ + 804, + 1604, + 2204, + 3104, + 3604 + } + }, + [41]={ + ["board"]=41, + ["monster"]={ + 104, + 1604, + 2604, + 3504, + 3804 + } + }, + [42]={ + ["board"]=42, + ["monster"]={ + 804, + 1604, + 2604, + 3004, + 4104 + } + }, + [43]={ + ["board"]=43, + ["monster"]={ + 104, + 1304, + 2204, + 3404, + 3704 + } + }, + [44]={ + ["board"]=44, + ["monster"]={ + 104, + 1104, + 2504, + 3204, + 4004 + } + }, + [45]={ + ["board"]=45, + ["monster"]={ + 704, + 1404, + 2304, + 3004, + 3604 + } + }, + [46]={ + ["board"]=46, + ["monster"]={ + 804, + 1804, + 2604, + 3404, + 4204 + } + }, + [47]={ + ["board"]=47, + ["monster"]={ + 504, + 1504, + 2604, + 3504, + 4204 + } + }, + [48]={ + ["board"]=48, + ["monster"]={ + 1004, + 1804, + 1904, + 2904, + 3604 + } + }, + [49]={ + ["board"]=49, + ["monster"]={ + 904, + 1204, + 1904, + 2804, + 3604 + } + }, + [50]={ + ["board"]=50, + ["monster"]={ + 1004, + 1404, + 2004, + 3104, + 3804 + } + }, + [51]={ + ["board"]=51, + ["monster"]={ + 504, + 1504, + 2604, + 2804, + 3904 + } + }, + [52]={ + ["board"]=52, + ["monster"]={ + 804, + 1704, + 2104, + 3004, + 4204 + } + }, + [53]={ + ["board"]=53, + ["monster"]={ + 704, + 1204, + 2504, + 3404, + 3704 + } + }, + [54]={ + ["board"]=54, + ["monster"]={ + 404, + 1804, + 2404, + 3004, + 3604 + } + }, + [55]={ + ["board"]=55, + ["monster"]={ + 904, + 1104, + 2404, + 2904, + 3804 + } + }, + [56]={ + ["board"]=56, + ["monster"]={ + 704, + 1304, + 2204, + 3404, + 3804 + } + }, + [57]={ + ["board"]=57, + ["monster"]={ + 404, + 1704, + 2304, + 3104, + 4204 + } + }, + [58]={ + ["board"]=58, + ["monster"]={ + 804, + 1104, + 2304, + 3104, + 3804 + } + }, + [59]={ + ["board"]=59, + ["monster"]={ + 604, + 1104, + 1904, + 3504, + 3804 + } + }, + [60]={ + ["board"]=60, + ["monster"]={ + 804, + 1404, + 2604, + 3104, + 3604 + } + }, + [61]={ + ["board"]=61, + ["monster"]={ + 104, + 1104, + 2204, + 2804, + 3904 + } + }, + [62]={ + ["board"]=62, + ["monster"]={ + 704, + 1604, + 2204, + 2904, + 3704 + } + }, + [63]={ + ["board"]=63, + ["monster"]={ + 604, + 1804, + 2504, + 3004, + 3704 + } + }, + [64]={ + ["board"]=64, + ["monster"]={ + 404, + 1704, + 2604, + 3404, + 3904 + } + }, + [65]={ + ["board"]=65, + ["monster"]={ + 604, + 1204, + 1904, + 3104, + 4104 + } + }, + [66]={ + ["board"]=66, + ["monster"]={ + 604, + 1504, + 2704, + 3504, + 4004 + } + }, + [67]={ + ["board"]=67, + ["monster"]={ + 704, + 1704, + 1904, + 3204, + 3604 + } + }, + [68]={ + ["board"]=68, + ["monster"]={ + 904, + 1304, + 2304, + 3104, + 4104 + } + }, + [69]={ + ["board"]=69, + ["monster"]={ + 204, + 1804, + 1904, + 3504, + 3604 + } + }, + [70]={ + ["board"]=70, + ["monster"]={ + 904, + 1804, + 2604, + 2804, + 4004 + } + }, + [71]={ + ["board"]=71, + ["monster"]={ + 1004, + 1304, + 2404, + 3404, + 4204 + } + }, + [72]={ + ["board"]=72, + ["monster"]={ + 604, + 1304, + 2504, + 3004, + 3904 + } + }, + [73]={ + ["board"]=73, + ["monster"]={ + 404, + 1304, + 2504, + 3004, + 3904 + } + }, + [74]={ + ["board"]=74, + ["monster"]={ + 704, + 1704, + 2004, + 3404, + 4104 + } + }, + [75]={ + ["board"]=75, + ["monster"]={ + 104, + 1304, + 2304, + 2904, + 4204 + } + }, + [76]={ + ["board"]=76, + ["monster"]={ + 604, + 1104, + 2604, + 3404, + 4104 + } + }, + [77]={ + ["board"]=77, + ["monster"]={ + 704, + 1104, + 2504, + 3304, + 4204 + } + }, + [78]={ + ["board"]=78, + ["monster"]={ + 304, + 1604, + 2204, + 3304, + 3604 + } + }, + [79]={ + ["board"]=79, + ["monster"]={ + 204, + 1704, + 2204, + 3004, + 3904 + } + }, + [80]={ + ["board"]=80, + ["monster"]={ + 204, + 1604, + 2104, + 3304, + 3604 + } + }, + [81]={ + ["board"]=81, + ["monster"]={ + 204, + 1504, + 1904, + 3304, + 3904 + } + }, + [82]={ + ["board"]=82, + ["monster"]={ + 304, + 1304, + 2004, + 3504, + 3704 + } + }, + [83]={ + ["board"]=83, + ["monster"]={ + 604, + 1704, + 1904, + 3304, + 4204 + } + }, + [84]={ + ["board"]=84, + ["monster"]={ + 404, + 1804, + 2304, + 3504, + 4104 + } + }, + [85]={ + ["board"]=85, + ["monster"]={ + 504, + 1504, + 2404, + 3304, + 4104 + } + }, + [86]={ + ["board"]=86, + ["monster"]={ + 304, + 1504, + 2104, + 3004, + 3804 + } + }, + [87]={ + ["board"]=87, + ["monster"]={ + 604, + 1804, + 2504, + 3504, + 3804 + } + }, + [88]={ + ["board"]=88, + ["monster"]={ + 604, + 1504, + 2704, + 3504, + 3804 + } + }, + [89]={ + ["board"]=89, + ["monster"]={ + 1004, + 1204, + 2004, + 3204, + 3704 + } + }, + [90]={ + ["board"]=90, + ["monster"]={ + 604, + 1104, + 2004, + 3004, + 4104 + } + }, + [91]={ + ["board"]=91, + ["monster"]={ + 704, + 1304, + 2204, + 3504, + 4004 + } + }, + [92]={ + ["board"]=92, + ["monster"]={ + 304, + 1404, + 2404, + 3204, + 3804 + } + }, + [93]={ + ["board"]=93, + ["monster"]={ + 704, + 1104, + 2504, + 3504, + 4004 + } + }, + [94]={ + ["board"]=94, + ["monster"]={ + 604, + 1704, + 2604, + 3304, + 3904 + } + }, + [95]={ + ["board"]=95, + ["monster"]={ + 604, + 1104, + 2104, + 3304, + 3904 + } + }, + [96]={ + ["board"]=96, + ["monster"]={ + 604, + 1304, + 2104, + 3304, + 3904 + } + }, + [97]={ + ["board"]=97, + ["monster"]={ + 804, + 1804, + 2404, + 3004, + 4104 + } + }, + [98]={ + ["board"]=98, + ["monster"]={ + 604, + 1404, + 2504, + 3404, + 3804 + } + }, + [99]={ + ["board"]=99, + ["monster"]={ + 404, + 1704, + 2504, + 2904, + 4104 + } + }, + [100]={ + ["board"]=100, + ["monster"]={ + 904, + 1204, + 2404, + 2904, + 3604 + } + }, + [101]={ + ["board"]=101, + ["monster"]={ + 504, + 1104, + 2404, + 3404, + 3604 + } + }, + [102]={ + ["board"]=102, + ["monster"]={ + 804, + 1504, + 2304, + 3404, + 4004 + } + }, + [103]={ + ["board"]=103, + ["monster"]={ + 404, + 1204, + 2204, + 3104, + 3604 + } + }, + [104]={ + ["board"]=104, + ["monster"]={ + 204, + 1404, + 1904, + 2904, + 4104 + } + }, + [105]={ + ["board"]=105, + ["monster"]={ + 404, + 1704, + 2604, + 3104, + 4204 + } + }, + [106]={ + ["board"]=106, + ["monster"]={ + 1004, + 1704, + 2004, + 3304, + 3904 + } + }, + [107]={ + ["board"]=107, + ["monster"]={ + 204, + 1804, + 2004, + 3504, + 3804 + } + }, + [108]={ + ["board"]=108, + ["monster"]={ + 604, + 1704, + 2404, + 3104, + 4004 + } + }, + [109]={ + ["board"]=109, + ["monster"]={ + 804, + 1104, + 1904, + 2904, + 3804 + } + }, + [110]={ + ["board"]=110, + ["monster"]={ + 804, + 1404, + 2704, + 3304, + 4004 + } + }, + [111]={ + ["board"]=111, + ["monster"]={ + 1004, + 1704, + 2004, + 3504, + 3704 + } + }, + [112]={ + ["board"]=112, + ["monster"]={ + 304, + 1604, + 2304, + 3404, + 3904 + } + }, + [113]={ + ["board"]=113, + ["monster"]={ + 604, + 1504, + 2504, + 3104, + 4204 + } + }, + [114]={ + ["board"]=114, + ["monster"]={ + 704, + 1804, + 2304, + 2904, + 4104 + } + }, + [115]={ + ["board"]=115, + ["monster"]={ + 904, + 1804, + 2604, + 2804, + 3804 + } + }, + [116]={ + ["board"]=116, + ["monster"]={ + 204, + 1704, + 2704, + 2904, + 4004 + } + }, + [117]={ + ["board"]=117, + ["monster"]={ + 304, + 1104, + 2504, + 3304, + 4204 + } + }, + [118]={ + ["board"]=118, + ["monster"]={ + 904, + 1304, + 2704, + 3304, + 3604 + } + }, + [119]={ + ["board"]=119, + ["monster"]={ + 304, + 1804, + 2604, + 3104, + 3904 + } + }, + [120]={ + ["board"]=120, + ["monster"]={ + 604, + 1504, + 1904, + 3504, + 3604 + } + }, + [121]={ + ["board"]=121, + ["monster"]={ + 204, + 1404, + 2404, + 3104, + 3904 + } + }, + [122]={ + ["board"]=122, + ["monster"]={ + 504, + 1204, + 1904, + 2904, + 4204 + } + }, + [123]={ + ["board"]=123, + ["monster"]={ + 104, + 1304, + 2104, + 2804, + 4104 + } + }, + [124]={ + ["board"]=124, + ["monster"]={ + 604, + 1704, + 2104, + 3304, + 3904 + } + }, + [125]={ + ["board"]=125, + ["monster"]={ + 804, + 1504, + 2304, + 2804, + 4004 + } + }, + [126]={ + ["board"]=126, + ["monster"]={ + 704, + 1504, + 2004, + 3504, + 3804 + } + }, + [127]={ + ["board"]=127, + ["monster"]={ + 304, + 1404, + 2504, + 3504, + 4104 + } + }, + [128]={ + ["board"]=128, + ["monster"]={ + 404, + 1404, + 2104, + 3204, + 4104 + } + }, + [129]={ + ["board"]=129, + ["monster"]={ + 204, + 1504, + 1904, + 3204, + 4004 + } + }, + [130]={ + ["board"]=130, + ["monster"]={ + 704, + 1104, + 2404, + 3504, + 3904 + } + }, + [131]={ + ["board"]=131, + ["monster"]={ + 504, + 1504, + 2604, + 3304, + 3604 + } + }, + [132]={ + ["board"]=132, + ["monster"]={ + 1004, + 1804, + 2004, + 3304, + 3804 + } + }, + [133]={ + ["board"]=133, + ["monster"]={ + 504, + 1604, + 2604, + 3204, + 3704 + } + }, + [134]={ + ["board"]=134, + ["monster"]={ + 104, + 1304, + 2404, + 3104, + 3604 + } + }, + [135]={ + ["board"]=135, + ["monster"]={ + 604, + 1604, + 1904, + 3004, + 4104 + } + }, + [136]={ + ["board"]=136, + ["monster"]={ + 204, + 1804, + 2304, + 2804, + 3604 + } + }, + [137]={ + ["board"]=137, + ["monster"]={ + 704, + 1604, + 2604, + 3204, + 4204 + } + }, + [138]={ + ["board"]=138, + ["monster"]={ + 304, + 1404, + 2104, + 3104, + 3804 + } + }, + [139]={ + ["board"]=139, + ["monster"]={ + 604, + 1204, + 2604, + 3004, + 4204 + } + }, + [140]={ + ["board"]=140, + ["monster"]={ + 904, + 1804, + 2604, + 3004, + 3704 + } + }, + [141]={ + ["board"]=141, + ["monster"]={ + 704, + 1304, + 2404, + 3204, + 3704 + } + }, + [142]={ + ["board"]=142, + ["monster"]={ + 804, + 1204, + 2104, + 3404, + 3904 + } + }, + [143]={ + ["board"]=143, + ["monster"]={ + 204, + 1204, + 2704, + 2904, + 3804 + } + }, + [144]={ + ["board"]=144, + ["monster"]={ + 804, + 1204, + 2204, + 3204, + 3704 + } + }, + [145]={ + ["board"]=145, + ["monster"]={ + 604, + 1604, + 2504, + 3204, + 3904 + } + }, + [146]={ + ["board"]=146, + ["monster"]={ + 1004, + 1504, + 2204, + 2804, + 4004 + } + }, + [147]={ + ["board"]=147, + ["monster"]={ + 404, + 1404, + 2404, + 3104, + 4204 + } + }, + [148]={ + ["board"]=148, + ["monster"]={ + 104, + 1504, + 2604, + 3104, + 4204 + } + }, + [149]={ + ["board"]=149, + ["monster"]={ + 404, + 1404, + 1904, + 3404, + 3604 + } + }, + [150]={ + ["board"]=150, + ["monster"]={ + 104, + 1604, + 2204, + 3504, + 3604 + } + }, + [151]={ + ["board"]=151, + ["monster"]={ + 804, + 1704, + 2004, + 3504, + 3704 + } + }, + [152]={ + ["board"]=152, + ["monster"]={ + 804, + 1504, + 1904, + 2804, + 3804 + } + }, + [153]={ + ["board"]=153, + ["monster"]={ + 604, + 1604, + 2604, + 3104, + 3804 + } + }, + [154]={ + ["board"]=154, + ["monster"]={ + 404, + 1404, + 2004, + 3204, + 3704 + } + } +} +local config = { +data=activity_boss_rush_chapter,count=154 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_boss_rush_chapter.lua.meta b/lua/app/config/activity_boss_rush_chapter.lua.meta new file mode 100644 index 00000000..3417c199 --- /dev/null +++ b/lua/app/config/activity_boss_rush_chapter.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3b9c06b8307dd0b4cb53ae035d53aa11 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/activity_boss_rush_exchange.lua b/lua/app/config/activity_boss_rush_exchange.lua new file mode 100644 index 00000000..9481219c --- /dev/null +++ b/lua/app/config/activity_boss_rush_exchange.lua @@ -0,0 +1,158 @@ +local activity_boss_rush_exchange = { + [1]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["limit"]=1 + }, + [2]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=101, + ["num_for_nothing"]="Vwhd" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=101, + ["num_for_nothing"]="Vwhd" + }, + ["limit"]=1 + }, + [3]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=102, + ["num_for_nothing"]="Vwhe" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=102, + ["num_for_nothing"]="Vwhe" + }, + ["limit"]=1 + }, + [4]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=103, + ["num_for_nothing"]="Vwhf" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=103, + ["num_for_nothing"]="Vwhf" + }, + ["limit"]=1 + }, + [5]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=104, + ["num_for_nothing"]="VwhY" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=104, + ["num_for_nothing"]="VwhY" + }, + ["limit"]=1 + }, + [6]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=105, + ["num_for_nothing"]="VwhZ" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=105, + ["num_for_nothing"]="VwhZ" + }, + ["limit"]=1 + }, + [7]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=106, + ["num_for_nothing"]="Vwha" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=106, + ["num_for_nothing"]="Vwha" + }, + ["limit"]=1 + }, + [8]={ + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=107, + ["num_for_nothing"]="Vwhb" + }, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=107, + ["num_for_nothing"]="Vwhb" + }, + ["limit"]=1 + } +} +local config = { +data=activity_boss_rush_exchange,count=8 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_boss_rush_exchange.lua.meta b/lua/app/config/activity_boss_rush_exchange.lua.meta new file mode 100644 index 00000000..347a5b2f --- /dev/null +++ b/lua/app/config/activity_boss_rush_exchange.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8c8d75a1f2e364844b081ef20888e140 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/activity_boss_rush_rank.lua b/lua/app/config/activity_boss_rush_rank.lua new file mode 100644 index 00000000..20db661e --- /dev/null +++ b/lua/app/config/activity_boss_rush_rank.lua @@ -0,0 +1,174 @@ +local activity_boss_rush_rank = { + [1]={ + ["ranking"]={ + 1, + 1 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [2]={ + ["ranking"]={ + 2, + 2 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + } + }, + [3]={ + ["ranking"]={ + 3, + 3 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + } + }, + [4]={ + ["ranking"]={ + 4, + 10 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } + }, + [5]={ + ["ranking"]={ + 11, + 50 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [6]={ + ["ranking"]={ + 51, + 500 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [7]={ + ["ranking"]={ + 501, + 99999999 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + } + } +} +local config = { +data=activity_boss_rush_rank,count=7 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_boss_rush_rank.lua.meta b/lua/app/config/activity_boss_rush_rank.lua.meta new file mode 100644 index 00000000..fcf40175 --- /dev/null +++ b/lua/app/config/activity_boss_rush_rank.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 472bee3e9223f3c4aa8b407e72891bc3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/activity_bounty_level.lua b/lua/app/config/activity_bounty_level.lua index 79e26427..3173f19b 100644 --- a/lua/app/config/activity_bounty_level.lua +++ b/lua/app/config/activity_bounty_level.lua @@ -837,9 +837,653 @@ local activity_bounty_level = { ["num"]=3, ["num_for_nothing"]="VQ==" } + }, + [201]={ + ["act_id"]=206, + ["exp"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [202]={ + ["act_id"]=206, + ["exp"]=15, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [203]={ + ["act_id"]=206, + ["exp"]=30, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + [204]={ + ["act_id"]=206, + ["exp"]=45, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [205]={ + ["act_id"]=206, + ["exp"]=60, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [206]={ + ["act_id"]=206, + ["exp"]=75, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [207]={ + ["act_id"]=206, + ["exp"]=90, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [208]={ + ["act_id"]=206, + ["exp"]=105, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [209]={ + ["act_id"]=206, + ["exp"]=120, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [210]={ + ["act_id"]=206, + ["exp"]=135, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [211]={ + ["act_id"]=206, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [212]={ + ["act_id"]=206, + ["exp"]=165, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [213]={ + ["act_id"]=206, + ["exp"]=180, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [214]={ + ["act_id"]=206, + ["exp"]=195, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + [215]={ + ["act_id"]=206, + ["exp"]=210, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [216]={ + ["act_id"]=206, + ["exp"]=225, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [217]={ + ["act_id"]=206, + ["exp"]=240, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [218]={ + ["act_id"]=206, + ["exp"]=255, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [219]={ + ["act_id"]=206, + ["exp"]=270, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [220]={ + ["act_id"]=206, + ["exp"]=285, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [221]={ + ["act_id"]=206, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [222]={ + ["act_id"]=206, + ["exp"]=315, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [223]={ + ["act_id"]=206, + ["exp"]=330, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } } } local config = { -data=activity_bounty_level,count=30 +data=activity_bounty_level,count=53 } return config \ No newline at end of file diff --git a/lua/app/config/activity_exchange.lua b/lua/app/config/activity_exchange.lua new file mode 100644 index 00000000..eb889061 --- /dev/null +++ b/lua/app/config/activity_exchange.lua @@ -0,0 +1,186 @@ +local activity_exchange = { + [101]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + ["limit"]=10 + }, + [102]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34003, + ["id_for_nothing"]="VQxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [103]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [104]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54002, + ["id_for_nothing"]="UwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [105]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=15, + ["id_for_nothing"]="Vw0=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=240, + ["num_for_nothing"]="VAxc" + }, + ["limit"]=3 + }, + [106]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["limit"]=3 + }, + [107]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=10 + }, + [108]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=800, + ["num_for_nothing"]="Xghc" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=999 + }, + [109]={ + ["activity"]=206, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=999 + } +} +local config = { +data=activity_exchange,count=9 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_exchange.lua.meta b/lua/app/config/activity_exchange.lua.meta new file mode 100644 index 00000000..33748803 --- /dev/null +++ b/lua/app/config/activity_exchange.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 59cc689139c1fb0429cd581fc781710e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/arena_board.lua b/lua/app/config/arena_board.lua index 862e8f51..0286d318 100644 --- a/lua/app/config/arena_board.lua +++ b/lua/app/config/arena_board.lua @@ -26,11 +26,11 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { @@ -82,7 +82,31 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -110,11 +134,11 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { @@ -126,7 +150,11 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, 0 }, { @@ -137,38 +165,10 @@ local arena_board = { 0, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, { 3, 0 @@ -194,11 +194,11 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { @@ -250,11 +250,11 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { @@ -313,98 +313,10 @@ local arena_board = { 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 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, { 2, 0 @@ -422,37 +334,13 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, + 2, 0 }, { 2, 0 }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, { 3, 0 @@ -481,38 +369,6 @@ local arena_board = { 3, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 2, 0 @@ -529,6 +385,14 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -537,6 +401,26 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 @@ -557,6 +441,14 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 @@ -564,6 +456,114 @@ local arena_board = { { 3, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 } } }, @@ -597,14 +597,6 @@ local arena_board = { 3, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, { 2, 0 @@ -613,20 +605,12 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, { 0, 0 }, { - 3, - 0 - }, - { - 3, + 0, 0 }, { @@ -641,6 +625,10 @@ local arena_board = { 2, 0 }, + { + 3, + 0 + }, { 0, 0 @@ -654,13 +642,17 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { 0, 0 }, + { + 3, + 0 + }, { 2, 0 @@ -670,7 +662,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -678,7 +670,15 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -737,14 +737,6 @@ local arena_board = { 3, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, { 2, 0 @@ -753,20 +745,12 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, { 0, 0 }, { - 3, - 0 - }, - { - 3, + 0, 0 }, { @@ -781,6 +765,10 @@ local arena_board = { 2, 0 }, + { + 3, + 0 + }, { 0, 0 @@ -794,13 +782,17 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { 0, 0 }, + { + 3, + 0 + }, { 2, 0 @@ -810,7 +802,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -818,7 +810,15 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -910,7 +910,7 @@ local arena_board = { 0 }, { - 3, + 2, 0 }, { @@ -922,7 +922,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -934,7 +934,7 @@ local arena_board = { 0 }, { - 3, + 2, 0 }, { @@ -1050,7 +1050,7 @@ local arena_board = { 0 }, { - 3, + 2, 0 }, { @@ -1062,7 +1062,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -1074,7 +1074,7 @@ local arena_board = { 0 }, { - 3, + 2, 0 }, { @@ -1161,42 +1161,6 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -1205,26 +1169,6 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 0, 0 @@ -1273,14 +1217,6 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -1293,82 +1229,6 @@ local arena_board = { 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 @@ -1413,44 +1273,156 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 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 + }, + { + 0, + 0 + }, + { + 0, + 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 + }, + { + 0, + 0 } } }, [6]={ ["board"]={ { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, + 35, 0 }, { @@ -1474,67 +1446,11 @@ local arena_board = { 0 }, { - 3, + 35, 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, + 35, 0 }, { @@ -1558,7 +1474,15 @@ local arena_board = { 0 }, { - 3, + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, 0 }, { @@ -1569,6 +1493,166 @@ local arena_board = { 0, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -1586,11 +1670,11 @@ local arena_board = { 0 }, { - 3, + 35, 0 }, { - 3, + 35, 0 }, { @@ -1614,91 +1698,7 @@ local arena_board = { 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, + 35, 0 } } @@ -1706,11 +1706,7 @@ local arena_board = { [7]={ ["board"]={ { - 3, - 0 - }, - { - 2, + 35, 0 }, { @@ -1726,41 +1722,65 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, 0 }, { 3, 0 }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, { 3, 0 }, - { - 2, - 0 - }, { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, { 3, 0 }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, { 3, 0 @@ -1778,19 +1798,15 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { - 0, + 35, 0 }, { - 3, - 0 - }, - { - 3, + 35, 0 }, { @@ -1813,10 +1829,98 @@ local arena_board = { 0, 0 }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, { 3, 0 @@ -1825,28 +1929,12 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, { 3, 0 }, { - 3, + 35, 0 }, { @@ -1854,7 +1942,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -1862,11 +1950,7 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 0, + 35, 0 }, { @@ -1874,7 +1958,7 @@ local arena_board = { 0 }, { - 3, + 35, 0 }, { @@ -1898,101 +1982,97 @@ local arena_board = { 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, + 35, 0 } } }, [8]={ ["board"]={ + { + 2, + 0 + }, { 3, 0 }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, { 2, 0 @@ -2009,46 +2089,6 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -2061,50 +2101,6 @@ local arena_board = { 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 @@ -2121,18 +2117,18 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 2, 0 @@ -2149,46 +2145,6 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -2201,50 +2157,6 @@ local arena_board = { 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 @@ -2261,6 +2173,18 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, { 2, 0 @@ -2268,151 +2192,87 @@ local arena_board = { { 3, 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 } } }, [9]={ ["board"]={ - { - 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 - }, - { - 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 @@ -2449,46 +2309,10 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, { 3, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, { 0, 0 @@ -2502,11 +2326,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 2, + 3, 0 }, { @@ -2514,13 +2334,189 @@ local arena_board = { 0 }, { - 2, + 35, 0 }, { 0, 0 }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, { 0, 0 @@ -2550,7 +2546,11 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 } } @@ -2558,7 +2558,7 @@ local arena_board = { [10]={ ["board"]={ { - 3, + 35, 0 }, { @@ -2582,35 +2582,7 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, + 35, 0 }, { @@ -2622,43 +2594,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, + 3, 0 }, { @@ -2669,6 +2605,42 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, { 3, 0 @@ -2694,7 +2666,63 @@ local arena_board = { 0 }, { - 2, + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, 0 }, { @@ -2721,38 +2749,38 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, { 3, 0 }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, { 3, 0 @@ -2762,43 +2790,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, + 3, 0 }, { @@ -2809,10 +2801,18 @@ local arena_board = { 3, 0 }, + { + 0, + 0 + }, { 3, 0 }, + { + 35, + 0 + }, { 0, 0 @@ -2834,7 +2834,7 @@ local arena_board = { 0 }, { - 2, + 35, 0 } } @@ -2842,7 +2842,11 @@ local arena_board = { [11]={ ["board"]={ { - 3, + 0, + 0 + }, + { + 2, 0 }, { @@ -2866,235 +2870,31 @@ local arena_board = { 0 }, { - 3, + 35, 0 }, { - 3, + 36, 0 }, { - 0, + 35, 0 }, { - 0, + 36, 0 }, { - 0, + 35, 0 }, { - 0, + 36, 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, + 35, 0 }, { @@ -3118,7 +2918,207 @@ local arena_board = { 0 }, { - 3, + 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, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 } } @@ -3126,11 +3126,11 @@ local arena_board = { [12]={ ["board"]={ { - 3, + 36, 0 }, { - 2, + 35, 0 }, { @@ -3146,19 +3146,15 @@ local arena_board = { 0 }, { - 2, + 35, 0 }, { - 3, + 36, 0 }, { - 3, - 0 - }, - { - 2, + 35, 0 }, { @@ -3169,20 +3165,40 @@ local arena_board = { 0, 0 }, + { + 35, + 0 + }, { 0, 0 }, { - 2, + 0, 0 }, { - 3, + 35, 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 }, { @@ -3206,11 +3222,7 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 3, + 35, 0 }, { @@ -3234,11 +3246,7 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 3, + 0, 0 }, { @@ -3246,57 +3254,17 @@ local arena_board = { 0 }, { - 2, + 0, 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 @@ -3318,11 +3286,27 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, 0 }, { @@ -3346,15 +3330,59 @@ local arena_board = { 0 }, { - 3, + 35, 0 }, { - 3, + 36, 0 }, { - 2, + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 }, { @@ -3370,39 +3398,11 @@ local arena_board = { 0 }, { - 2, + 35, 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 3, + 36, 0 } } @@ -3410,7 +3410,79 @@ local arena_board = { [13]={ ["board"]={ { - 3, + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 }, { @@ -3429,44 +3501,12 @@ local arena_board = { 0, 0 }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 }, { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, + 35, 0 }, { @@ -3478,7 +3518,11 @@ local arena_board = { 0 }, { - 2, + 0, + 0 + }, + { + 0, 0 }, { @@ -3490,11 +3534,7 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 3, + 0, 0 }, { @@ -3502,7 +3542,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -3510,7 +3550,7 @@ local arena_board = { 0 }, { - 2, + 0, 0 }, { @@ -3518,15 +3558,43 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, 0 }, { @@ -3546,11 +3614,15 @@ local arena_board = { 0 }, { - 3, + 35, 0 }, { - 3, + 36, + 0 + }, + { + 35, 0 }, { @@ -3562,7 +3634,31 @@ local arena_board = { 0 }, { - 0, + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 }, { @@ -3570,103 +3666,7 @@ local arena_board = { 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, + 35, 0 }, { @@ -3682,11 +3682,11 @@ local arena_board = { 0 }, { - 2, + 35, 0 }, { - 3, + 0, 0 } } @@ -3694,7 +3694,79 @@ local arena_board = { [14]={ ["board"]={ { - 3, + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 }, { @@ -3718,91 +3790,7 @@ local arena_board = { 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 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, + 35, 0 }, { @@ -3861,38 +3849,10 @@ local arena_board = { 0, 0 }, - { - 3, - 0 - }, { 0, 0 }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -3914,39 +3874,7 @@ local arena_board = { 0 }, { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, + 35, 0 }, { @@ -3970,7 +3898,79 @@ local arena_board = { 0 }, { - 3, + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 } } @@ -3978,7 +3978,107 @@ local arena_board = { [15]={ ["board"]={ { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 }, { @@ -4005,94 +4105,10 @@ local arena_board = { 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 @@ -4118,7 +4134,91 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, 0 }, { @@ -4142,95 +4242,7 @@ local arena_board = { 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, + 35, 0 }, { @@ -4244,25 +4256,13 @@ local arena_board = { { 0, 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 } } }, [16]={ ["board"]={ { - 35, + 3, 0 }, { @@ -4270,7 +4270,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -4278,47 +4278,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 2, 0 }, { @@ -4329,10 +4289,6 @@ local arena_board = { 3, 0 }, - { - 0, - 0 - }, { 3, 0 @@ -4341,42 +4297,6 @@ local arena_board = { 0, 0 }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -4393,86 +4313,38 @@ local arena_board = { 0, 0 }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, { 3, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -4482,15 +4354,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 0, 0 }, { @@ -4498,7 +4362,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -4506,15 +4370,67 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 35, + 3, 0 }, { - 35, + 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 }, { @@ -4538,47 +4454,103 @@ local arena_board = { 0 }, { - 35, + 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 } } }, [17]={ ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 }, { - 35, + 2, 0 }, { @@ -4594,47 +4566,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 2, 0 }, { @@ -4645,60 +4577,32 @@ local arena_board = { 3, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 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, + 3, 0 }, { @@ -4730,7 +4634,11 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 }, { @@ -4749,18 +4657,6 @@ local arena_board = { 3, 0 }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -4769,12 +4665,28 @@ local arena_board = { 0, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 35, + 3, 0 }, { @@ -4782,7 +4694,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -4790,7 +4702,11 @@ local arena_board = { 0 }, { - 35, + 2, + 0 + }, + { + 0, 0 }, { @@ -4798,7 +4714,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -4822,33 +4738,97 @@ local arena_board = { 0 }, { - 35, + 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"]={ - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, { 3, 0 @@ -4858,33 +4838,17 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 35, + 0, 0 }, { 0, 0 }, - { - 35, - 0 - }, { 0, 0 }, - { - 35, - 0 - }, - { - 2, - 0 - }, { 2, 0 @@ -4893,12 +4857,24 @@ local arena_board = { 3, 0 }, + { + 3, + 0 + }, { 0, 0 }, { - 3, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -4909,126 +4885,6 @@ local arena_board = { 3, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 3, 0 @@ -5037,58 +4893,46 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, - { - 0, - 0 - }, { 3, 0 }, { - 2, + 0, 0 }, { 2, 0 }, - { - 35, - 0 - }, { 0, 0 }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 2, 0 }, - { - 2, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -5097,10 +4941,34 @@ local arena_board = { 3, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -5108,17 +4976,145 @@ local arena_board = { { 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 } } }, [19]={ ["board"]={ { - 0, - 0 - }, - { - 0, + 3, 0 }, { @@ -5150,7 +5146,23 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -5165,66 +5177,6 @@ local arena_board = { 0, 0 }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -5241,110 +5193,10 @@ 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 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, + { + 3, + 0 + }, { 3, 0 @@ -5354,7 +5206,15 @@ local arena_board = { 0 }, { - 3, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -5392,39 +5252,151 @@ local arena_board = { { 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 } } }, [20]={ ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -5433,6 +5405,54 @@ local arena_board = { 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 @@ -5442,7 +5462,43 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -5454,7 +5510,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -5466,7 +5522,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -5478,7 +5534,7 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { @@ -5490,7 +5546,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -5498,7 +5554,35 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -5509,62 +5593,6 @@ local arena_board = { 3, 0 }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -5574,7 +5602,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -5582,7 +5614,31 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -5593,34 +5649,6 @@ local arena_board = { 3, 0 }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -5629,30 +5657,6 @@ local arena_board = { 0, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -5670,11 +5674,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 2, 0 } } @@ -7101,90 +7101,10 @@ local arena_board = { }, [26]={ ["board"]={ - { - 35, - 0 - }, { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 35, 0 @@ -7214,27 +7134,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 36, 0 }, { @@ -7242,33 +7142,17 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 36, 0 }, { 35, 0 }, + { + 36, + 0 + }, { 35, 0 @@ -7298,7 +7182,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -7306,7 +7190,7 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { @@ -7314,7 +7198,7 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { @@ -7322,15 +7206,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 0, 0 }, { @@ -7338,7 +7214,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -7346,15 +7222,63 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 0, 0 }, { - 35, + 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 }, { @@ -7380,11 +7304,159 @@ local arena_board = { { 35, 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 } } }, [27]={ ["board"]={ + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, { 35, 0 @@ -7413,82 +7485,6 @@ local arena_board = { 35, 0 }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -7561,18 +7557,6 @@ local arena_board = { 0, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -7581,62 +7565,6 @@ local arena_board = { 0, 0 }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, { 35, 0 @@ -7664,17 +7592,89 @@ local arena_board = { { 35, 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 } } }, [28]={ ["board"]={ { - 2, + 0, 0 }, { - 3, + 35, 0 }, { @@ -7682,7 +7682,7 @@ local arena_board = { 0 }, { - 3, + 0, 0 }, { @@ -7690,15 +7690,231 @@ local arena_board = { 0 }, { - 3, + 35, 0 }, { - 2, + 0, 0 }, { - 2, + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, 0 }, { @@ -7717,190 +7933,10 @@ local arena_board = { 0, 0 }, - { - 35, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, { 0, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -7912,107 +7948,35 @@ local arena_board = { { 0, 0 - }, - { - 35, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 } } }, [29]={ ["board"]={ { - 0, + 35, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, + 36, 0 }, { 35, 0 }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, { 35, 0 @@ -8033,14 +7997,6 @@ local arena_board = { 35, 0 }, - { - 35, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -8053,10 +8009,42 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 35, 0 }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -8121,6 +8109,78 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 35, 0 @@ -8150,7 +8210,7 @@ local arena_board = { 0 }, { - 35, + 36, 0 }, { @@ -8166,81 +8226,17 @@ local arena_board = { 0 }, { - 0, + 36, 0 }, { 35, 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 } } }, [30]={ ["board"]={ - { - 35, - 0 - }, { 0, 0 @@ -8253,102 +8249,6 @@ local arena_board = { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, { 35, 0 @@ -8377,6 +8277,66 @@ local arena_board = { 35, 0 }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, { 35, 0 @@ -8405,38 +8365,14 @@ local arena_board = { 35, 0 }, - { - 3, - 0 - }, { 0, 0 }, - { - 35, - 0 - }, { 0, 0 }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -8445,10 +8381,6 @@ local arena_board = { 0, 0 }, - { - 35, - 0 - }, { 0, 0 @@ -8461,38 +8393,6 @@ local arena_board = { 35, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -8516,13 +8416,113 @@ local arena_board = { { 35, 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 } } }, [31]={ ["board"]={ { - 35, + 3, 0 }, { @@ -8530,7 +8530,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -8538,47 +8538,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 2, 0 }, { @@ -8589,10 +8549,6 @@ local arena_board = { 3, 0 }, - { - 0, - 0 - }, { 3, 0 @@ -8601,42 +8557,6 @@ local arena_board = { 0, 0 }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -8653,86 +8573,38 @@ local arena_board = { 0, 0 }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, { 3, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -8742,15 +8614,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 0, 0 }, { @@ -8758,7 +8622,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -8766,15 +8630,67 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 35, + 3, 0 }, { - 35, + 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 }, { @@ -8798,47 +8714,103 @@ local arena_board = { 0 }, { - 35, + 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 } } }, [32]={ ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 }, { - 35, + 2, 0 }, { @@ -8854,47 +8826,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 2, 0 }, { @@ -8905,60 +8837,32 @@ local arena_board = { 3, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 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, + 3, 0 }, { @@ -8990,7 +8894,11 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 }, { @@ -9009,18 +8917,6 @@ local arena_board = { 3, 0 }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -9029,12 +8925,28 @@ local arena_board = { 0, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 35, + 3, 0 }, { @@ -9042,7 +8954,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -9050,7 +8962,11 @@ local arena_board = { 0 }, { - 35, + 2, + 0 + }, + { + 0, 0 }, { @@ -9058,7 +8974,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -9082,33 +8998,97 @@ local arena_board = { 0 }, { - 35, + 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 } } }, [33]={ ["board"]={ - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, { 3, 0 @@ -9118,33 +9098,17 @@ local arena_board = { 0 }, { - 2, - 0 - }, - { - 35, + 0, 0 }, { 0, 0 }, - { - 35, - 0 - }, { 0, 0 }, - { - 35, - 0 - }, - { - 2, - 0 - }, { 2, 0 @@ -9153,12 +9117,24 @@ local arena_board = { 3, 0 }, + { + 3, + 0 + }, { 0, 0 }, { - 3, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -9169,126 +9145,6 @@ local arena_board = { 3, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 3, 0 @@ -9297,58 +9153,46 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, - { - 0, - 0 - }, { 3, 0 }, { - 2, + 0, 0 }, { 2, 0 }, - { - 35, - 0 - }, { 0, 0 }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 2, 0 }, - { - 2, - 0 - }, - { - 3, - 0 - }, { 0, 0 @@ -9357,10 +9201,34 @@ local arena_board = { 3, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -9368,17 +9236,145 @@ local arena_board = { { 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 } } }, [34]={ ["board"]={ { - 0, - 0 - }, - { - 0, + 3, 0 }, { @@ -9410,7 +9406,23 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 0 }, { @@ -9425,66 +9437,6 @@ local arena_board = { 0, 0 }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -9501,110 +9453,10 @@ 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 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, + { + 3, + 0 + }, { 3, 0 @@ -9614,7 +9466,15 @@ local arena_board = { 0 }, { - 3, + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -9652,39 +9512,151 @@ local arena_board = { { 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 } } }, [35]={ ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -9693,6 +9665,54 @@ local arena_board = { 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 @@ -9702,7 +9722,43 @@ local arena_board = { 0 }, { - 3, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -9714,7 +9770,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -9726,7 +9782,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -9738,7 +9794,7 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { @@ -9750,7 +9806,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -9758,7 +9814,35 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -9769,62 +9853,6 @@ local arena_board = { 3, 0 }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -9834,7 +9862,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -9842,7 +9874,31 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, 0 }, { @@ -9853,34 +9909,6 @@ local arena_board = { 3, 0 }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, { 3, 0 @@ -9889,30 +9917,6 @@ local arena_board = { 0, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, { 0, 0 @@ -9930,21 +9934,97 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 2, 0 } } }, [36]={ ["board"]={ + { + 35, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, { 35, 0 @@ -9974,23 +10054,59 @@ local arena_board = { 0 }, { - 36, + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 35, 0 }, - { - 36, - 0 - }, { 35, 0 }, { - 36, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, 0 }, { @@ -10022,7 +10138,7 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { @@ -10030,7 +10146,7 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { @@ -10038,7 +10154,7 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { @@ -10046,7 +10162,15 @@ local arena_board = { 0 }, { - 0, + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, 0 }, { @@ -10054,7 +10178,7 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { @@ -10062,63 +10186,15 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { - 0, + 35, 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, + 35, 0 }, { @@ -10144,159 +10220,11 @@ local arena_board = { { 35, 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 } } }, [37]={ ["board"]={ - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, { 35, 0 @@ -10325,6 +10253,14 @@ local arena_board = { 35, 0 }, + { + 3, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -10337,6 +10273,70 @@ local arena_board = { 0, 0 }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -10401,10 +10401,82 @@ local arena_board = { 0, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, { 35, 0 @@ -10432,89 +10504,17 @@ local arena_board = { { 35, 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 } } }, [38]={ ["board"]={ { - 0, + 2, 0 }, { - 35, + 3, 0 }, { @@ -10522,7 +10522,7 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { @@ -10530,231 +10530,15 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 0, + 2, 0 }, { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 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 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, + 2, 0 }, { @@ -10773,10 +10557,190 @@ local arena_board = { 0, 0 }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 0, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -10788,17 +10752,105 @@ local arena_board = { { 0, 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 } } }, [39]={ ["board"]={ { - 35, + 0, 0 }, { - 36, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, 0 }, { @@ -10814,7 +10866,15 @@ local arena_board = { 0 }, { - 36, + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, 0 }, { @@ -10857,78 +10917,6 @@ local arena_board = { 0, 0 }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, { 0, 0 @@ -10982,15 +10970,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 35, 0 }, { @@ -11002,7 +10982,7 @@ local arena_board = { 0 }, { - 36, + 0, 0 }, { @@ -11010,15 +10990,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 35, 0 }, { @@ -11041,20 +11013,12 @@ local arena_board = { 35, 0 }, - { - 0, - 0 - }, { 35, 0 }, { - 36, - 0 - }, - { - 35, + 3, 0 }, { @@ -11062,21 +11026,65 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 36, + 0, 0 }, { - 35, + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 } } }, [40]={ ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -11089,6 +11097,98 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, { 35, 0 @@ -11117,66 +11217,6 @@ local arena_board = { 35, 0 }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, { 35, 0 @@ -11205,10 +11245,38 @@ local arena_board = { 35, 0 }, + { + 3, + 0 + }, { 0, 0 }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -11218,7 +11286,7 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { @@ -11233,6 +11301,38 @@ local arena_board = { 35, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -11256,106 +11356,6 @@ local arena_board = { { 35, 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 } } }, @@ -12782,11 +12782,7 @@ local arena_board = { [46]={ ["board"]={ { - 0, - 0 - }, - { - 35, + 3, 0 }, { @@ -12794,7 +12790,7 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { @@ -12802,7 +12798,7 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { @@ -12810,55 +12806,11 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, + 3, 0 }, { @@ -12882,7 +12834,15 @@ local arena_board = { 0 }, { - 0, + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, 0 }, { @@ -12898,7 +12858,15 @@ local arena_board = { 0 }, { - 0, + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -12922,7 +12890,11 @@ local arena_board = { 0 }, { - 0, + 3, + 0 + }, + { + 3, 0 }, { @@ -12933,6 +12905,10 @@ local arena_board = { 0, 0 }, + { + 2, + 0 + }, { 0, 0 @@ -12941,6 +12917,42 @@ local arena_board = { 0, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, 0 @@ -12961,6 +12973,42 @@ local arena_board = { 0, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, 0 @@ -12982,7 +13030,11 @@ local arena_board = { 0 }, { - 35, + 3, + 0 + }, + { + 3, 0 }, { @@ -12990,7 +13042,7 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { @@ -12998,7 +13050,7 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { @@ -13006,59 +13058,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, + 3, 0 } } @@ -13066,11 +13066,11 @@ local arena_board = { [47]={ ["board"]={ { - 36, + 3, 0 }, { - 35, + 2, 0 }, { @@ -13086,15 +13086,19 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 36, + 3, 0 }, { - 35, + 3, + 0 + }, + { + 2, 0 }, { @@ -13105,40 +13109,20 @@ local arena_board = { 0, 0 }, - { - 35, - 0 - }, { 0, 0 }, { - 0, + 2, 0 }, { - 35, + 3, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, + 3, 0 }, { @@ -13162,7 +13146,11 @@ local arena_board = { 0 }, { - 35, + 3, + 0 + }, + { + 3, 0 }, { @@ -13186,7 +13174,11 @@ local arena_board = { 0 }, { - 0, + 3, + 0 + }, + { + 3, 0 }, { @@ -13194,17 +13186,57 @@ local arena_board = { 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 @@ -13226,27 +13258,11 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, + 3, 0 }, { @@ -13270,59 +13286,15 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 36, + 3, 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, + 2, 0 }, { @@ -13338,11 +13310,39 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 36, + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 } } @@ -13350,11 +13350,11 @@ local arena_board = { [48]={ ["board"]={ { - 0, + 3, 0 }, { - 35, + 2, 0 }, { @@ -13370,7 +13370,15 @@ local arena_board = { 0 }, { - 35, + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -13378,31 +13386,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, + 2, 0 }, { @@ -13410,23 +13394,79 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 35, + 0, 0 }, { - 36, + 3, 0 }, { - 35, + 3, 0 }, { - 35, + 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 }, { @@ -13442,11 +13482,19 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { - 35, + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, 0 }, { @@ -13461,10 +13509,46 @@ local arena_board = { 0, 0 }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, 0 }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, 0 @@ -13473,6 +13557,58 @@ local arena_board = { 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 @@ -13486,147 +13622,11 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, + 3, 0 } } @@ -13634,79 +13634,7 @@ local arena_board = { [49]={ ["board"]={ { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, + 3, 0 }, { @@ -13730,7 +13658,91 @@ local arena_board = { 0 }, { - 35, + 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 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -13790,7 +13802,7 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { @@ -13798,7 +13810,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -13806,7 +13818,7 @@ local arena_board = { 0 }, { - 0, + 2, 0 }, { @@ -13814,7 +13826,11 @@ local arena_board = { 0 }, { - 35, + 3, + 0 + }, + { + 3, 0 }, { @@ -13838,15 +13854,39 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 36, + 0, 0 }, { - 35, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -13862,7 +13902,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -13870,47 +13910,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, + 3, 0 } } @@ -13918,19 +13918,7 @@ local arena_board = { [50]={ ["board"]={ { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, + 3, 0 }, { @@ -13954,15 +13942,39 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 36, + 2, 0 }, { - 35, + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -13974,23 +13986,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, + 2, 0 }, { @@ -14002,7 +13998,11 @@ local arena_board = { 0 }, { - 0, + 2, + 0 + }, + { + 2, 0 }, { @@ -14010,15 +14010,27 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 36, + 0, 0 }, { - 35, + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -14042,7 +14054,11 @@ local arena_board = { 0 }, { - 35, + 2, + 0 + }, + { + 3, 0 }, { @@ -14065,12 +14081,96 @@ local arena_board = { 0, 0 }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 0, 0 }, { - 35, + 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 }, { @@ -14094,117 +14194,97 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 2, 0 } } }, [51]={ ["board"]={ + { + 35, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, { 35, 0 @@ -14234,23 +14314,59 @@ local arena_board = { 0 }, { - 36, + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 35, 0 }, - { - 36, - 0 - }, { 35, 0 }, { - 36, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, 0 }, { @@ -14282,7 +14398,7 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { @@ -14290,7 +14406,7 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { @@ -14298,7 +14414,7 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { @@ -14306,7 +14422,15 @@ local arena_board = { 0 }, { - 0, + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, 0 }, { @@ -14314,7 +14438,7 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { @@ -14322,63 +14446,15 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { - 0, + 35, 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, + 35, 0 }, { @@ -14404,159 +14480,11 @@ local arena_board = { { 35, 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 } } }, [52]={ ["board"]={ - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, { 35, 0 @@ -14585,6 +14513,14 @@ local arena_board = { 35, 0 }, + { + 3, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -14597,6 +14533,70 @@ local arena_board = { 0, 0 }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -14661,10 +14661,82 @@ local arena_board = { 0, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, { 35, 0 @@ -14692,89 +14764,17 @@ local arena_board = { { 35, 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 } } }, [53]={ ["board"]={ { - 0, + 2, 0 }, { - 35, + 3, 0 }, { @@ -14782,7 +14782,7 @@ local arena_board = { 0 }, { - 0, + 3, 0 }, { @@ -14790,231 +14790,15 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 0, + 2, 0 }, { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 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 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, + 2, 0 }, { @@ -15033,10 +14817,190 @@ local arena_board = { 0, 0 }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 0, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -15048,17 +15012,105 @@ local arena_board = { { 0, 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 } } }, [54]={ ["board"]={ { - 35, + 0, 0 }, { - 36, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, 0 }, { @@ -15074,7 +15126,15 @@ local arena_board = { 0 }, { - 36, + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, 0 }, { @@ -15117,78 +15177,6 @@ local arena_board = { 0, 0 }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, { 0, 0 @@ -15242,15 +15230,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 35, 0 }, { @@ -15262,7 +15242,7 @@ local arena_board = { 0 }, { - 36, + 0, 0 }, { @@ -15270,15 +15250,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 35, 0 }, { @@ -15301,20 +15273,12 @@ local arena_board = { 35, 0 }, - { - 0, - 0 - }, { 35, 0 }, { - 36, - 0 - }, - { - 35, + 3, 0 }, { @@ -15322,21 +15286,65 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 36, + 0, 0 }, { - 35, + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 } } }, [55]={ ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -15349,6 +15357,98 @@ local arena_board = { 0, 0 }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, { 35, 0 @@ -15377,66 +15477,6 @@ local arena_board = { 35, 0 }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, { 35, 0 @@ -15465,10 +15505,38 @@ local arena_board = { 35, 0 }, + { + 3, + 0 + }, { 0, 0 }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -15478,7 +15546,7 @@ local arena_board = { 0 }, { - 0, + 35, 0 }, { @@ -15493,6 +15561,38 @@ local arena_board = { 35, 0 }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, { 0, 0 @@ -15516,106 +15616,6 @@ local arena_board = { { 35, 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 } } }, diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index 2b4dd2bf..82bee2dd 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -3253,8 +3253,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=23, - ["id_for_nothing"]="VAs=", + ["id"]=1400101, + ["id_for_nothing"]="VwxcA2RRfg==", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 5fc25d3a..aaaf7bdf 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -4162,6 +4162,8 @@ local arena_rank = { [301]={ ["season"]=3, ["score"]=900, + ["reset_rank"]=401, + ["inactive_reset_rank"]=401, ["min_point"]=4, ["k1"]=40, ["k2"]=350, @@ -4320,6 +4322,8 @@ local arena_rank = { [302]={ ["season"]=3, ["score"]=1000, + ["reset_rank"]=401, + ["inactive_reset_rank"]=401, ["min_point"]=4, ["k1"]=35, ["k2"]=290, @@ -4456,11 +4460,11 @@ local arena_rank = { } }, ["rand_board"]={ - 6, - 7, - 8, - 9, - 10 + 1, + 2, + 3, + 4, + 5 }, ["effect"]={ { @@ -4486,6 +4490,2082 @@ local arena_rank = { [303]={ ["season"]=3, ["score"]=1100, + ["reset_rank"]=401, + ["inactive_reset_rank"]=401, + ["min_point"]=4, + ["k1"]=30, + ["k2"]=200, + ["k3"]=15, + ["k4"]=15, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=7000, + ["num_for_nothing"]="UQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=280, + ["num_for_nothing"]="VABc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=180, + ["num_for_nothing"]="VwBc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["lose_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["rand_board"]={ + 1, + 2, + 3, + 4, + 5 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_01", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_3", + ["rank_show"]="arena_num_bronze_1", + ["rank_icon"]="arena_dan_1" + }, + [304]={ + ["season"]=3, + ["score"]=1200, + ["reset_rank"]=404, + ["inactive_reset_rank"]=401, + ["min_point"]=4, + ["k1"]=30, + ["k2"]=300, + ["k3"]=15, + ["k4"]=15, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=53, + ["id_for_nothing"]="Uws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=320, + ["num_for_nothing"]="VQpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=210, + ["num_for_nothing"]="VAlc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["lose_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["rand_board"]={ + 6, + 7, + 8, + 9, + 10 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_02", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_4", + ["rank_show"]="arena_num_silver_4", + ["rank_icon"]="arena_dan_2" + }, + [305]={ + ["season"]=3, + ["score"]=1400, + ["reset_rank"]=404, + ["inactive_reset_rank"]=401, + ["min_point"]=4, + ["k1"]=28, + ["k2"]=250, + ["k3"]=14, + ["k4"]=14, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=53, + ["id_for_nothing"]="Uws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=360, + ["num_for_nothing"]="VQ5c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=230, + ["num_for_nothing"]="VAtc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["lose_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["rand_board"]={ + 6, + 7, + 8, + 9, + 10 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_02", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_5", + ["rank_show"]="arena_num_silver_3", + ["rank_icon"]="arena_dan_2" + }, + [306]={ + ["season"]=3, + ["score"]=1600, + ["reset_rank"]=404, + ["inactive_reset_rank"]=401, + ["min_point"]=4, + ["k1"]=25, + ["k2"]=200, + ["k3"]=12, + ["k4"]=12, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=53, + ["id_for_nothing"]="Uws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=260, + ["num_for_nothing"]="VA5c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["lose_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["rand_board"]={ + 6, + 7, + 8, + 9, + 10 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_02", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_6", + ["rank_show"]="arena_num_silver_2", + ["rank_icon"]="arena_dan_2" + }, + [307]={ + ["season"]=3, + ["score"]=1800, + ["reset_rank"]=404, + ["inactive_reset_rank"]=401, + ["min_point"]=4, + ["k1"]=23, + ["k2"]=150, + ["k3"]=11, + ["k4"]=11, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=53, + ["id_for_nothing"]="Uws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=440, + ["num_for_nothing"]="Ugxc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=290, + ["num_for_nothing"]="VAFc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["lose_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["rand_board"]={ + 6, + 7, + 8, + 9, + 10 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_02", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_7", + ["rank_show"]="arena_num_silver_1", + ["rank_icon"]="arena_dan_2" + }, + [308]={ + ["season"]=3, + ["score"]=2000, + ["reset_rank"]=408, + ["inactive_reset_rank"]=404, + ["min_point"]=4, + ["k1"]=21, + ["k2"]=250, + ["k3"]=10, + ["k4"]=10, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54, + ["id_for_nothing"]="Uww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=54000, + ["num_for_nothing"]="UwxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=120, + ["num_for_nothing"]="Vwpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=480, + ["num_for_nothing"]="UgBc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=310, + ["num_for_nothing"]="VQlc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["lose_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["rand_board"]={ + 11, + 12, + 13, + 14, + 15 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_03", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_8", + ["rank_show"]="arena_num_gold_5", + ["rank_icon"]="arena_dan_3" + }, + [309]={ + ["season"]=3, + ["score"]=2200, + ["reset_rank"]=408, + ["inactive_reset_rank"]=404, + ["min_point"]=4, + ["k1"]=20, + ["k2"]=180, + ["k3"]=10, + ["k4"]=10, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54, + ["id_for_nothing"]="Uww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=140, + ["num_for_nothing"]="Vwxc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=520, + ["num_for_nothing"]="Uwpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=340, + ["num_for_nothing"]="VQxc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["lose_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["rand_board"]={ + 11, + 12, + 13, + 14, + 15 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_03", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_9", + ["rank_show"]="arena_num_gold_4", + ["rank_icon"]="arena_dan_3" + }, + [310]={ + ["season"]=3, + ["score"]=2500, + ["reset_rank"]=408, + ["inactive_reset_rank"]=404, + ["min_point"]=4, + ["k1"]=18, + ["k2"]=150, + ["k3"]=9, + ["k4"]=9, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54, + ["id_for_nothing"]="Uww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=35000, + ["num_for_nothing"]="VQ1cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=160, + ["num_for_nothing"]="Vw5c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=7, + ["num_for_nothing"]="UQ==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=560, + ["num_for_nothing"]="Uw5c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=360, + ["num_for_nothing"]="VQ5c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["lose_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["rand_board"]={ + 11, + 12, + 13, + 14, + 15 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_03", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_10", + ["rank_show"]="arena_num_gold_3", + ["rank_icon"]="arena_dan_3" + }, + [311]={ + ["season"]=3, + ["score"]=2800, + ["reset_rank"]=408, + ["inactive_reset_rank"]=404, + ["min_point"]=4, + ["k1"]=16, + ["k2"]=130, + ["k3"]=8, + ["k4"]=8, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54, + ["id_for_nothing"]="Uww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=180, + ["num_for_nothing"]="VwBc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=600, + ["num_for_nothing"]="UAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=390, + ["num_for_nothing"]="VQFc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["lose_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["rand_board"]={ + 11, + 12, + 13, + 14, + 15 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_03", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_11", + ["rank_show"]="arena_num_gold_2", + ["rank_icon"]="arena_dan_3" + }, + [312]={ + ["season"]=3, + ["score"]=3100, + ["reset_rank"]=408, + ["inactive_reset_rank"]=404, + ["min_point"]=4, + ["k1"]=15, + ["k2"]=120, + ["k3"]=7, + ["k4"]=7, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54, + ["id_for_nothing"]="Uww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=50000, + ["num_for_nothing"]="UwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=640, + ["num_for_nothing"]="UAxc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=420, + ["num_for_nothing"]="Ugpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["lose_adbox"]={ + { + ["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"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["rand_board"]={ + 11, + 12, + 13, + 14, + 15 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_03", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_12", + ["rank_show"]="arena_num_gold_1", + ["rank_icon"]="arena_dan_3" + }, + [401]={ + ["season"]=4, + ["score"]=900, + ["min_point"]=4, + ["k1"]=40, + ["k2"]=350, + ["k3"]=20, + ["k4"]=20, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=130, + ["num_for_nothing"]="Vwtc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["lose_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["rand_board"]={ + 1, + 2, + 3, + 4, + 5 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_01", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_1", + ["rank_show"]="arena_num_bronze_3", + ["rank_icon"]="arena_dan_1" + }, + [402]={ + ["season"]=4, + ["score"]=1000, + ["min_point"]=4, + ["k1"]=35, + ["k2"]=290, + ["k3"]=17, + ["k4"]=17, + ["season_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + }, + ["win_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=240, + ["num_for_nothing"]="VAxc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["lose_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=132, + ["num_for_nothing"]="Vwte" + } + }, + ["win_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["lose_adbox"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=26, + ["id_for_nothing"]="VA4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["rand_board"]={ + 1, + 2, + 3, + 4, + 5 + }, + ["effect"]={ + { + ["type"]="hpp_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="end_dmg_dec_all_add", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["scene"]="pvp_01", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_1", + ["name_txt"]="ARENA_RANKNAME_2", + ["rank_show"]="arena_num_bronze_2", + ["rank_icon"]="arena_dan_1" + }, + [403]={ + ["season"]=4, + ["score"]=1100, ["min_point"]=4, ["k1"]=30, ["k2"]=200, @@ -4622,11 +6702,11 @@ local arena_rank = { } }, ["rand_board"]={ - 11, - 12, - 13, - 14, - 15 + 1, + 2, + 3, + 4, + 5 }, ["effect"]={ { @@ -4649,8 +6729,8 @@ local arena_rank = { ["rank_show"]="arena_num_bronze_1", ["rank_icon"]="arena_dan_1" }, - [304]={ - ["season"]=3, + [404]={ + ["season"]=4, ["score"]=1200, ["min_point"]=4, ["k1"]=30, @@ -4796,11 +6876,11 @@ local arena_rank = { } }, ["rand_board"]={ - 16, - 17, - 18, - 19, - 20 + 6, + 7, + 8, + 9, + 10 }, ["effect"]={ { @@ -4823,8 +6903,8 @@ local arena_rank = { ["rank_show"]="arena_num_silver_4", ["rank_icon"]="arena_dan_2" }, - [305]={ - ["season"]=3, + [405]={ + ["season"]=4, ["score"]=1400, ["min_point"]=4, ["k1"]=28, @@ -4970,11 +7050,11 @@ local arena_rank = { } }, ["rand_board"]={ - 21, - 22, - 23, - 24, - 25 + 6, + 7, + 8, + 9, + 10 }, ["effect"]={ { @@ -4997,8 +7077,8 @@ local arena_rank = { ["rank_show"]="arena_num_silver_3", ["rank_icon"]="arena_dan_2" }, - [306]={ - ["season"]=3, + [406]={ + ["season"]=4, ["score"]=1600, ["min_point"]=4, ["k1"]=25, @@ -5144,11 +7224,11 @@ local arena_rank = { } }, ["rand_board"]={ - 26, - 27, - 28, - 29, - 30 + 6, + 7, + 8, + 9, + 10 }, ["effect"]={ { @@ -5171,8 +7251,8 @@ local arena_rank = { ["rank_show"]="arena_num_silver_2", ["rank_icon"]="arena_dan_2" }, - [307]={ - ["season"]=3, + [407]={ + ["season"]=4, ["score"]=1800, ["min_point"]=4, ["k1"]=23, @@ -5318,11 +7398,11 @@ local arena_rank = { } }, ["rand_board"]={ - 31, - 32, - 33, - 34, - 35 + 6, + 7, + 8, + 9, + 10 }, ["effect"]={ { @@ -5345,8 +7425,8 @@ local arena_rank = { ["rank_show"]="arena_num_silver_1", ["rank_icon"]="arena_dan_2" }, - [308]={ - ["season"]=3, + [408]={ + ["season"]=4, ["score"]=2000, ["min_point"]=4, ["k1"]=21, @@ -5492,11 +7572,11 @@ local arena_rank = { } }, ["rand_board"]={ - 36, - 37, - 38, - 39, - 40 + 11, + 12, + 13, + 14, + 15 }, ["effect"]={ { @@ -5519,8 +7599,8 @@ local arena_rank = { ["rank_show"]="arena_num_gold_5", ["rank_icon"]="arena_dan_3" }, - [309]={ - ["season"]=3, + [409]={ + ["season"]=4, ["score"]=2200, ["min_point"]=4, ["k1"]=20, @@ -5666,11 +7746,11 @@ local arena_rank = { } }, ["rand_board"]={ - 41, - 42, - 43, - 44, - 45 + 11, + 12, + 13, + 14, + 15 }, ["effect"]={ { @@ -5693,8 +7773,8 @@ local arena_rank = { ["rank_show"]="arena_num_gold_4", ["rank_icon"]="arena_dan_3" }, - [310]={ - ["season"]=3, + [410]={ + ["season"]=4, ["score"]=2500, ["min_point"]=4, ["k1"]=18, @@ -5840,11 +7920,11 @@ local arena_rank = { } }, ["rand_board"]={ - 46, - 47, - 48, - 49, - 50 + 11, + 12, + 13, + 14, + 15 }, ["effect"]={ { @@ -5867,8 +7947,8 @@ local arena_rank = { ["rank_show"]="arena_num_gold_3", ["rank_icon"]="arena_dan_3" }, - [311]={ - ["season"]=3, + [411]={ + ["season"]=4, ["score"]=2800, ["min_point"]=4, ["k1"]=16, @@ -6014,11 +8094,11 @@ local arena_rank = { } }, ["rand_board"]={ - 51, - 52, - 53, - 54, - 55 + 11, + 12, + 13, + 14, + 15 }, ["effect"]={ { @@ -6041,8 +8121,8 @@ local arena_rank = { ["rank_show"]="arena_num_gold_2", ["rank_icon"]="arena_dan_3" }, - [312]={ - ["season"]=3, + [412]={ + ["season"]=4, ["score"]=3100, ["min_point"]=4, ["k1"]=15, @@ -6188,11 +8268,11 @@ local arena_rank = { } }, ["rand_board"]={ - 56, - 57, - 58, - 59, - 60 + 11, + 12, + 13, + 14, + 15 }, ["effect"]={ { @@ -6217,6 +8297,6 @@ local arena_rank = { } } local config = { -data=arena_rank,count=36 +data=arena_rank,count=48 } return config \ No newline at end of file diff --git a/lua/app/config/arena_time.lua b/lua/app/config/arena_time.lua index 4579d403..806bb1e6 100644 --- a/lua/app/config/arena_time.lua +++ b/lua/app/config/arena_time.lua @@ -2,20 +2,29 @@ local arena_time = { [1]={ ["season"]=1, ["start_time"]="2023-6-25 00:00:00", - ["end_time"]="2023-8-16 00:00:00" + ["end_time"]="2023-8-16 00:00:00", + ["ui_banner"]="ui_arena_bounty_banner" }, [2]={ ["season"]=2, ["start_time"]="2023-8-16 00:00:00", - ["end_time"]="2023-9-15 00:00:00" + ["end_time"]="2023-9-15 00:00:00", + ["ui_banner"]="ui_arena_bounty_banner" }, [3]={ ["season"]=3, ["start_time"]="2023-9-15 00:00:00", - ["end_time"]="2023-10-16 00:00:00" + ["end_time"]="2023-10-16 00:00:00", + ["ui_banner"]="ui_arena_bounty_banner_1" + }, + [4]={ + ["season"]=4, + ["start_time"]="2023-10-16 00:00:00", + ["end_time"]="2023-11-15 00:00:00", + ["ui_banner"]="ui_arena_bounty_banner_1" } } local config = { -data=arena_time,count=3 +data=arena_time,count=4 } return config \ No newline at end of file diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua index f5f7ebd8..852d1cff 100644 --- a/lua/app/config/avatar.lua +++ b/lua/app/config/avatar.lua @@ -6,7 +6,8 @@ local avatar = { }, [24]={ ["iconId"]="avatar_2", - ["item"]=44 + ["item"]=44, + ["unlock_show"]=true }, [1001]={ ["iconId"]="1", @@ -132,23 +133,27 @@ local avatar = { ["hero"]=54003 }, [1400201]={ - ["iconId"]="skin_3", + ["iconId"]="23_1", ["item"]=1400201 }, [3400101]={ - ["iconId"]="skin_1", + ["iconId"]="18_1", ["item"]=3400101 }, [5300101]={ - ["iconId"]="skin_4", + ["iconId"]="10_1", ["item"]=5300101 }, [5400101]={ - ["iconId"]="skin_2", + ["iconId"]="20_1", ["item"]=5400101 + }, + [1400101]={ + ["iconId"]="16_1", + ["item"]=1400101 } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua index b88c5ae5..2e235db8 100644 --- a/lua/app/config/avatar_frame.lua +++ b/lua/app/config/avatar_frame.lua @@ -20,9 +20,19 @@ local avatar_frame = { [27]={ ["iconId"]="avatar_frame_5", ["item"]=46 + }, + [28]={ + ["iconId"]="avatar_frame_6", + ["item"]=53, + ["unlock_show"]=true + }, + [29]={ + ["iconId"]="avatar_frame_7", + ["item"]=54, + ["unlock_show"]=true } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 70944ece..7501b15c 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -199,7 +199,8 @@ local buff = { ["name"]="atkp_color_add", ["buff_type"]=1, ["stack"]=2, - ["decr"]=1 + ["decr"]=1, + ["limit_parameter"]=10000 }, [26]={ ["id"]=26, @@ -207,7 +208,8 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=1, - ["decr"]=1 + ["decr"]=1, + ["limit_parameter"]=10000 }, [27]={ ["id"]=27, @@ -215,7 +217,8 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=2, - ["decr"]=1 + ["decr"]=1, + ["limit_parameter"]=10000 }, [28]={ ["id"]=28, @@ -223,7 +226,8 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=3, - ["decr"]=1 + ["decr"]=1, + ["limit_parameter"]=10000 }, [29]={ ["id"]=29, @@ -231,7 +235,8 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=4, - ["decr"]=1 + ["decr"]=1, + ["limit_parameter"]=10000 }, [30]={ ["id"]=30, @@ -239,7 +244,8 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=5, - ["decr"]=1 + ["decr"]=1, + ["limit_parameter"]=10000 }, [31]={ ["id"]=31, @@ -532,7 +538,8 @@ local buff = { ["name"]="skill_hurt_add", ["buff_type"]=1, ["stack"]=2, - ["decr"]=1 + ["decr"]=1, + ["limit_parameter"]=10000 }, [61]={ ["id"]=61, diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 96bedf1a..5a183fbc 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -7580,8 +7580,8 @@ local chapter = { ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=30, - ["idle_gold"]=55, + ["idle_exp"]=35, + ["idle_gold"]=87, ["idle_drop"]={ { ["type"]=1, @@ -7799,8 +7799,8 @@ local chapter = { ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=32, - ["idle_gold"]=55, + ["idle_exp"]=35, + ["idle_gold"]=88, ["idle_drop"]={ { ["type"]=1, @@ -8018,8 +8018,8 @@ local chapter = { ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=32, - ["idle_gold"]=56, + ["idle_exp"]=36, + ["idle_gold"]=88, ["idle_drop"]={ { ["type"]=1, @@ -8237,8 +8237,8 @@ local chapter = { ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=34, - ["idle_gold"]=56, + ["idle_exp"]=36, + ["idle_gold"]=89, ["idle_drop"]={ { ["type"]=1, @@ -8455,8 +8455,8 @@ local chapter = { ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=34, - ["idle_gold"]=57, + ["idle_exp"]=37, + ["idle_gold"]=89, ["idle_drop"]={ { ["type"]=1, diff --git a/lua/app/config/chapter_board_bossrush.lua b/lua/app/config/chapter_board_bossrush.lua new file mode 100644 index 00000000..89222ce4 --- /dev/null +++ b/lua/app/config/chapter_board_bossrush.lua @@ -0,0 +1,31710 @@ +local chapter_board_bossrush = { + [1]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [2]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [3]={ + ["board"]={ + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [4]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [5]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [6]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [7]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [8]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [9]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [10]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [11]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [12]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [13]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 4, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [14]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [15]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [16]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + } + } + }, + [17]={ + ["board"]={ + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 5 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 5, + 4 + }, + { + 0, + 5 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 3, + 0 + } + } + }, + [18]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + } + } + }, + [19]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 3 + } + } + }, + [20]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [21]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [22]={ + ["board"]={ + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [23]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [24]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 2, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [25]={ + ["board"]={ + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 3, + 0 + } + } + }, + [26]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 4, + 5 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 0, + 0 + }, + { + 4, + 5 + }, + { + 2, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 2, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 3 + } + } + }, + [27]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [28]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [29]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 4, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 4, + 1 + }, + { + 0, + 2 + }, + { + 4, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [30]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [31]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [32]={ + ["board"]={ + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 0, + 2 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 10, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + } + } + }, + [33]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 10, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [34]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [35]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [36]={ + ["board"]={ + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [37]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [38]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [39]={ + ["board"]={ + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 13, + 3 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 13, + 4 + }, + { + 13, + 3 + }, + { + 13, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [40]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 13, + 1 + }, + { + 13, + 3 + }, + { + 13, + 5 + }, + { + 13, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 13, + 1 + }, + { + 13, + 3 + }, + { + 13, + 5 + }, + { + 13, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [41]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 13, + 4 + }, + { + 2, + 0 + }, + { + 13, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 13, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 13, + 4 + }, + { + 2, + 0 + }, + { + 13, + 1 + }, + { + 2, + 0 + }, + { + 13, + 1 + }, + { + 2, + 0 + }, + { + 13, + 1 + }, + { + 2, + 0 + }, + { + 13, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [42]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 13, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 13, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 13, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 13, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [43]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 13, + 4 + }, + { + 13, + 4 + }, + { + 13, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [44]={ + ["board"]={ + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 13, + 3 + }, + { + 13, + 2 + }, + { + 13, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 13, + 4 + }, + { + 13, + 4 + }, + { + 13, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 13, + 4 + }, + { + 13, + 2 + }, + { + 13, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [45]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 13, + 3 + }, + { + 13, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 13, + 5 + }, + { + 13, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 13, + 5 + }, + { + 13, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [46]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 13, + 2 + }, + { + 13, + 5 + }, + { + 13, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [47]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 2, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [48]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 4 + }, + { + 2, + 0 + }, + { + 21, + 4 + }, + { + 2, + 0 + }, + { + 21, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 21, + 4 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [49]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 21, + 4 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [50]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 9, + 0 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [51]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 9, + 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 + }, + { + 21, + 3 + }, + { + 0, + 0 + }, + { + 21, + 3 + }, + { + 0, + 0 + }, + { + 21, + 3 + }, + { + 0, + 0 + }, + { + 21, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + } + } + }, + [52]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 5 + }, + { + 21, + 5 + }, + { + 11, + 0 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 21, + 3 + }, + { + 21, + 3 + }, + { + 21, + 1 + }, + { + 21, + 3 + }, + { + 21, + 3 + }, + { + 10, + 0 + } + } + }, + [53]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 8, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 8, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 10 + }, + { + 8, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [54]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 8, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [55]={ + ["board"]={ + { + 18, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 9, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 10, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 11, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 8, + 0 + } + } + }, + [56]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 0, + 3 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 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 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [57]={ + ["board"]={ + { + 19, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 19, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + } + } + }, + [58]={ + ["board"]={ + { + 19, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 4, + 5 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 4, + 3 + }, + { + 19, + 0 + }, + { + 10, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 11, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 8, + 0 + } + } + }, + [59]={ + ["board"]={ + { + 9, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 10, + 0 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 11, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 10, + 0 + }, + { + 11, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + } + } + }, + [60]={ + ["board"]={ + { + 9, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 11, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 8, + 0 + } + } + }, + [61]={ + ["board"]={ + { + 9, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + } + } + }, + [62]={ + ["board"]={ + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 4, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 4, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 4, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 8, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 10, + 0 + } + } + }, + [63]={ + ["board"]={ + { + 12, + 1 + }, + { + 18, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 0, + 4 + }, + { + 9, + 0 + }, + { + 0, + 4 + }, + { + 18, + 0 + }, + { + 12, + 1 + }, + { + 12, + 1 + }, + { + 19, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 12, + 1 + }, + { + 12, + 1 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 10, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 12, + 1 + }, + { + 12, + 1 + }, + { + 20, + 0 + }, + { + 18, + 0 + }, + { + 10, + 0 + }, + { + 18, + 0 + }, + { + 20, + 0 + }, + { + 19, + 0 + } + } + }, + [64]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 0, + 4 + }, + { + 9, + 0 + }, + { + 0, + 4 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 8, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 10, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 11, + 0 + }, + { + 12, + 3 + }, + { + 12, + 3 + }, + { + 8, + 0 + }, + { + 19, + 0 + }, + { + 12, + 1 + }, + { + 12, + 1 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + } + } + }, + [65]={ + ["board"]={ + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 12, + 5 + }, + { + 12, + 4 + }, + { + 12, + 4 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 12, + 4 + }, + { + 12, + 4 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + } + } + }, + [66]={ + ["board"]={ + { + 19, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 12, + 1 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 12, + 3 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 12, + 2 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + } + } + }, + [67]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 11, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 9, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 10, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + } + } + }, + [68]={ + ["board"]={ + { + 18, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 19, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 12, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + } + } + }, + [69]={ + ["board"]={ + { + 19, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 20, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 4, + 5 + }, + { + 20, + 0 + }, + { + 0, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 20, + 0 + }, + { + 12, + 5 + }, + { + 20, + 0 + }, + { + 12, + 5 + }, + { + 20, + 0 + }, + { + 12, + 5 + }, + { + 20, + 0 + }, + { + 12, + 5 + }, + { + 19, + 0 + }, + { + 12, + 5 + }, + { + 12, + 5 + }, + { + 12, + 5 + }, + { + 19, + 0 + }, + { + 12, + 5 + } + } + }, + [70]={ + ["board"]={ + { + 18, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 4, + 3 + }, + { + 12, + 1 + }, + { + 0, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 4, + 5 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 12, + 1 + }, + { + 0, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 0, + 0 + }, + { + 12, + 1 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 12, + 1 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + }, + { + 18, + 0 + } + } + }, + [71]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 11, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 11, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [72]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 10, + 0 + }, + { + 0, + 4 + }, + { + 11, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 4, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 2 + }, + { + 12, + 2 + }, + { + 3, + 0 + }, + { + 10, + 0 + }, + { + 0, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 12, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 3, + 0 + }, + { + 7, + 0 + }, + { + 10, + 0 + }, + { + 0, + 0 + }, + { + 11, + 0 + }, + { + 7, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 3, + 0 + } + } + }, + [73]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 9, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [74]={ + ["board"]={ + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 10, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [75]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [76]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 10, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 10, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [77]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 11, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 3, + 0 + } + } + }, + [78]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [79]={ + ["board"]={ + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 9, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 9, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 11, + 0 + }, + { + 24, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 11, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + } + } + }, + [80]={ + ["board"]={ + { + 24, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 24, + 0 + }, + { + 9, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 0, + 3 + }, + { + 24, + 0 + }, + { + 27, + 1 + }, + { + 27, + 1 + }, + { + 27, + 1 + }, + { + 24, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 24, + 0 + }, + { + 27, + 4 + }, + { + 27, + 5 + }, + { + 27, + 5 + }, + { + 24, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 24, + 0 + }, + { + 27, + 4 + }, + { + 27, + 4 + }, + { + 27, + 5 + }, + { + 24, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 0, + 3 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + } + } + }, + [81]={ + ["board"]={ + { + 9, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 0, + 3 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 3 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 25, + 0 + }, + { + 0, + 1 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 3 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 25, + 0 + }, + { + 0, + 1 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 0, + 5 + }, + { + 25, + 0 + }, + { + 0, + 1 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 0, + 1 + }, + { + 25, + 0 + }, + { + 11, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 8, + 0 + } + } + }, + [82]={ + ["board"]={ + { + 0, + 5 + }, + { + 24, + 0 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 0, + 5 + }, + { + 27, + 1 + }, + { + 0, + 3 + }, + { + 27, + 3 + }, + { + 0, + 3 + }, + { + 27, + 3 + }, + { + 0, + 3 + }, + { + 27, + 4 + }, + { + 9, + 0 + }, + { + 27, + 1 + }, + { + 0, + 1 + }, + { + 27, + 3 + }, + { + 0, + 4 + }, + { + 27, + 4 + }, + { + 9, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 9, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 0, + 0 + }, + { + 24, + 0 + }, + { + 0, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 24, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 24, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + } + } + }, + [83]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 9, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 11, + 0 + }, + { + 24, + 0 + }, + { + 8, + 0 + }, + { + 24, + 0 + }, + { + 8, + 0 + } + } + }, + [84]={ + ["board"]={ + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 24, + 0 + }, + { + 0, + 1 + }, + { + 24, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 24, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 24, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 27, + 2 + }, + { + 27, + 1 + }, + { + 27, + 3 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 27, + 2 + }, + { + 27, + 1 + }, + { + 27, + 3 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 26, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + } + } + }, + [85]={ + ["board"]={ + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 25, + 0 + }, + { + 9, + 0 + }, + { + 24, + 0 + }, + { + 27, + 3 + }, + { + 27, + 1 + }, + { + 27, + 3 + }, + { + 24, + 0 + }, + { + 9, + 0 + }, + { + 24, + 0 + }, + { + 0, + 0 + }, + { + 27, + 2 + }, + { + 27, + 5 + }, + { + 27, + 2 + }, + { + 0, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 27, + 5 + }, + { + 27, + 2 + }, + { + 27, + 5 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 11, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 8, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 10, + 0 + } + } + }, + [86]={ + ["board"]={ + { + 9, + 0 + }, + { + 27, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 27, + 1 + }, + { + 9, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 27, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 24, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 10, + 0 + }, + { + 11, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 + } + } + }, + [87]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 28, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 0, + 2 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 5, + 3 + }, + { + 5, + 1 + } + } + }, + [88]={ + ["board"]={ + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 5, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 29, + 0 + }, + { + 30, + 0 + }, + { + 5, + 4 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 30, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 30, + 0 + }, + { + 29, + 0 + }, + { + 5, + 4 + }, + { + 29, + 0 + }, + { + 30, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 30, + 0 + }, + { + 29, + 0 + }, + { + 5, + 1 + }, + { + 29, + 0 + }, + { + 30, + 0 + }, + { + 29, + 0 + } + } + }, + [89]={ + ["board"]={ + { + 28, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 28, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 28, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + } + } + }, + [90]={ + ["board"]={ + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 28, + 0 + }, + { + 0, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 30, + 0 + }, + { + 30, + 0 + }, + { + 30, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 30, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + } + } + }, + [91]={ + ["board"]={ + { + 29, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 28, + 0 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 29, + 0 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 29, + 0 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 29, + 0 + } + } + }, + [92]={ + ["board"]={ + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 5, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 0, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + } + } + }, + [93]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 29, + 0 + }, + { + 5, + 2 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 5, + 2 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 5, + 2 + }, + { + 29, + 0 + }, + { + 28, + 0 + }, + { + 29, + 0 + }, + { + 5, + 2 + }, + { + 29, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 28, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 29, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + } + } + }, + [94]={ + ["board"]={ + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 10, + 0 + }, + { + 0, + 5 + }, + { + 11, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 28, + 0 + }, + { + 28, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 29, + 0 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 29, + 0 + }, + { + 5, + 4 + }, + { + 29, + 0 + }, + { + 5, + 4 + }, + { + 29, + 0 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 29, + 0 + }, + { + 5, + 4 + }, + { + 29, + 0 + }, + { + 5, + 4 + }, + { + 29, + 0 + }, + { + 5, + 1 + } + } + }, + [95]={ + ["board"]={ + { + 31, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 31, + 0 + }, + { + 9, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 4 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 35, + 5 + }, + { + 31, + 0 + }, + { + 35, + 5 + }, + { + 32, + 0 + }, + { + 35, + 5 + }, + { + 31, + 0 + }, + { + 35, + 5 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 35, + 5 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 35, + 5 + }, + { + 31, + 0 + } + } + }, + [96]={ + ["board"]={ + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 8, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 10, + 0 + }, + { + 0, + 3 + }, + { + 11, + 0 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 33, + 0 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 0, + 1 + }, + { + 33, + 0 + }, + { + 32, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 31, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + } + } + }, + [97]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 0, + 5 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 9, + 0 + }, + { + 32, + 0 + }, + { + 10, + 0 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 33, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 35, + 2 + }, + { + 0, + 0 + }, + { + 10, + 0 + }, + { + 33, + 0 + }, + { + 11, + 0 + }, + { + 0, + 0 + }, + { + 35, + 2 + }, + { + 35, + 2 + }, + { + 35, + 2 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 35, + 2 + }, + { + 35, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 33, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [98]={ + ["board"]={ + { + 32, + 0 + }, + { + 4, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 4, + 2 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 4, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 35, + 2 + }, + { + 35, + 1 + }, + { + 35, + 5 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 4, + 1 + }, + { + 35, + 1 + }, + { + 4, + 3 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 35, + 1 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 32, + 0 + } + } + }, + [99]={ + ["board"]={ + { + 9, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 31, + 0 + }, + { + 35, + 2 + }, + { + 35, + 1 + }, + { + 35, + 3 + }, + { + 35, + 3 + }, + { + 35, + 3 + }, + { + 35, + 1 + }, + { + 35, + 1 + }, + { + 35, + 4 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 32, + 0 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 35, + 2 + }, + { + 35, + 3 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 32, + 0 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 35, + 1 + }, + { + 35, + 3 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 35, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [100]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 4, + 4 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 4, + 5 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 4, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 8, + 0 + }, + { + 0, + 4 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [101]={ + ["board"]={ + { + 32, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 9, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 35, + 3 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 35, + 2 + }, + { + 32, + 0 + }, + { + 35, + 3 + }, + { + 35, + 3 + }, + { + 35, + 3 + }, + { + 32, + 0 + }, + { + 35, + 2 + }, + { + 35, + 2 + }, + { + 35, + 2 + }, + { + 32, + 0 + }, + { + 35, + 3 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 35, + 2 + }, + { + 32, + 0 + } + } + }, + [102]={ + ["board"]={ + { + 32, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 33, + 0 + }, + { + 32, + 0 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 4, + 1 + }, + { + 32, + 0 + }, + { + 4, + 3 + }, + { + 32, + 0 + }, + { + 4, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [103]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 31, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [104]={ + ["board"]={ + { + 32, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 33, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 33, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 33, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 33, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + } + } + }, + [105]={ + ["board"]={ + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 4, + 5 + }, + { + 4, + 1 + }, + { + 4, + 5 + }, + { + 4, + 1 + }, + { + 4, + 5 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [106]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 32, + 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 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + } + } + }, + [107]={ + ["board"]={ + { + 32, + 0 + }, + { + 0, + 1 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 0, + 1 + }, + { + 31, + 0 + }, + { + 0, + 5 + }, + { + 31, + 0 + }, + { + 0, + 4 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 1 + }, + { + 4, + 2 + }, + { + 0, + 3 + }, + { + 4, + 2 + }, + { + 0, + 4 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 0, + 5 + }, + { + 31, + 0 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 31, + 0 + }, + { + 8, + 0 + }, + { + 10, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 11, + 0 + }, + { + 8, + 0 + } + } + }, + [108]={ + ["board"]={ + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 33, + 0 + }, + { + 0, + 3 + }, + { + 33, + 0 + }, + { + 0, + 3 + }, + { + 33, + 0 + }, + { + 0, + 3 + }, + { + 33, + 0 + }, + { + 0, + 3 + }, + { + 33, + 0 + }, + { + 0, + 3 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 33, + 0 + }, + { + 0, + 3 + }, + { + 33, + 0 + } + } + }, + [109]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 9, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [110]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [111]={ + ["board"]={ + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 31, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 32, + 0 + } + } + }, + [112]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [113]={ + ["board"]={ + { + 0, + 3 + }, + { + 9, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 10, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 11, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 9, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 2 + }, + { + 9, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 10, + 0 + }, + { + 0, + 2 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 11, + 0 + }, + { + 32, + 32 + }, + { + 32, + 32 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + } + } + }, + [114]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 0, + 3 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + } + } + }, + [115]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [116]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [117]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [118]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + } + } + }, + [119]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [120]={ + ["board"]={ + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + } + } + }, + [121]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [122]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 36, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [123]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [124]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [125]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 3, + 0 + } + } + }, + [126]={ + ["board"]={ + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + } + } + }, + [127]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + } + } + }, + [128]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 1 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 37, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 0, + 2 + } + } + }, + [129]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + } + } + }, + [130]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 5, + 4 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 5, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 3, + 0 + } + } + }, + [131]={ + ["board"]={ + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 3, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [132]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 5, + 5 + }, + { + 37, + 0 + }, + { + 5, + 2 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [133]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 37, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 37, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 3, + 0 + } + } + }, + [134]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [135]={ + ["board"]={ + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 5, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [136]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 5, + 1 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 5, + 1 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 3, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [137]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + } + } + }, + [138]={ + ["board"]={ + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 37, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 37, + 0 + }, + { + 0, + 2 + } + } + }, + [139]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [140]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + } + } + }, + [141]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 4 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [142]={ + ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 37, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + } + } + }, + [143]={ + ["board"]={ + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=22, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=33, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=17, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=22, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=35, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=1, + ["direction"]=4 + } + } + }, + [144]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 5, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=22, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=42, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=62, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=72, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=16, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=76, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=14, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=14, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=2, + ["direction"]=2 + } + } + }, + [145]={ + ["board"]={ + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 5, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=13, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=42, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=42, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=51, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=51, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=62, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=62, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=73, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=15, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=57, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=75, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=3, + ["direction"]=4 + } + } + }, + [146]={ + ["board"]={ + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 2 + }, + { + 5, + 1 + } + }, + ["grid_edge"]={ + { + ["pos"]=51, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=51, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=62, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=73, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=73, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=66, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=57, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=1, + ["direction"]=3 + } + } + }, + [147]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=51, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=2, + ["direction"]=1 + } + } + }, + [148]={ + ["board"]={ + { + 7, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 7, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=51, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=1 + } + } + }, + [149]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 5, + 1 + } + }, + ["grid_edge"]={ + { + ["pos"]=13, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=15, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=71, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=77, + ["type"]=2, + ["direction"]=3 + } + } + }, + [150]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=22, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=16, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=26, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=72, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=73, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=3, + ["direction"]=4 + } + } + }, + [151]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=21, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=27, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=17, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=51, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=57, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=47, + ["type"]=2, + ["direction"]=1 + } + } + }, + [152]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=23, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=3 + } + } + }, + [153]={ + ["board"]={ + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=61, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=62, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=62, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=64, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=65, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=72, + ["type"]=2, + ["direction"]=4 + } + } + }, + [154]={ + ["board"]={ + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=12, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=22, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=42, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=42, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=16, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=16, + ["type"]=3, + ["direction"]=2 + } + } + } +} +local config = { +data=chapter_board_bossrush,count=154 +} +return config \ No newline at end of file diff --git a/lua/app/config/chapter_board_bossrush.lua.meta b/lua/app/config/chapter_board_bossrush.lua.meta new file mode 100644 index 00000000..c4390393 --- /dev/null +++ b/lua/app/config/chapter_board_bossrush.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f136cacb0fc4a2e47b93053e37dcf71b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/chapter_board_dungeon_armor.lua b/lua/app/config/chapter_board_dungeon_armor.lua index 1393b743..87b51ec7 100644 --- a/lua/app/config/chapter_board_dungeon_armor.lua +++ b/lua/app/config/chapter_board_dungeon_armor.lua @@ -13699,7 +13699,7 @@ local chapter_board_dungeon_armor = { }, { 21, - 0 + 5 }, { 0, diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 48f7be39..229ea2ca 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -376,9 +376,53 @@ local const = { }, ["bounty_click"]={ ["value"]=4 + }, + ["activity_boss_rush_time"]={ + ["value"]=1 + }, + ["activity_boss_rush_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["activity_boss_rush_costadd"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["activity_boss_rush_hp_add_1"]={ + ["value"]=1750 + }, + ["activity_boss_rush_atk_add_1"]={ + ["value"]=1370 + }, + ["activity_boss_rush_hp_add_2"]={ + ["value"]=2700 + }, + ["activity_boss_rush_atk_add_2"]={ + ["value"]=2200 + }, + ["activity_boss_rush_hp_add_3"]={ + ["value"]=4100 + }, + ["activity_boss_rush_atk_add_3"]={ + ["value"]=3500 + }, + ["activity_recurring_day"]={ + ["value"]=15 } } local config = { -data=const,count=77 +data=const,count=87 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 5b3a05be..49db49f9 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1550,6 +1550,26 @@ local item = { } } }, + [51]={ + ["type"]=2, + ["qlt"]=4, + ["icon"]="51" + }, + [52]={ + ["type"]=2, + ["qlt"]=4, + ["icon"]="52" + }, + [53]={ + ["type"]=10, + ["qlt"]=4, + ["icon"]="53" + }, + [54]={ + ["type"]=10, + ["qlt"]=5, + ["icon"]="54" + }, [1001]={ ["type"]=2, ["qlt"]=1, @@ -2378,6 +2398,6 @@ local item = { } } local config = { -data=item,count=112 +data=item,count=116 } 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 b5621ba9..9a0f0b88 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -461,11 +461,58 @@ local LocalizationGlobalConst = ARENA_DESC_40 = "ARENA_DESC_40", ARENA_DESC_41 = "ARENA_DESC_41", ARENA_DESC_42 = "ARENA_DESC_42", - EQUIP_DESC_26 = "EQUIP_DESC_26", EQUIP_DESC_27 = "EQUIP_DESC_27", + EQUIP_DESC_28 = "EQUIP_DESC_28", SEIZED_DESC_1 = "SEIZED_DESC_1", SEIZED_DESC_2 = "SEIZED_DESC_2", SEIZED_DESC_3 = "SEIZED_DESC_3", + ACT_FOURTEEN_TITLE_1 = "ACT_FOURTEEN_TITLE_1", + ACT_FOURTEEN_TITLE_2 = "ACT_FOURTEEN_TITLE_2", + ACT_FOURTEEN_TITLE_3 = "ACT_FOURTEEN_TITLE_3", + ACT_FOURTEEN_TITLE_4 = "ACT_FOURTEEN_TITLE_4", + ACT_FOURTEEN_DESC_1 = "ACT_FOURTEEN_DESC_1", + ACT_FOURTEEN_DESC_2 = "ACT_FOURTEEN_DESC_2", + ACT_FOURTEEN_DESC_3 = "ACT_FOURTEEN_DESC_3", + ACT_FOURTEEN_DESC_5 = "ACT_FOURTEEN_DESC_5", + ACT_FOURTEEN_DESC_6 = "ACT_FOURTEEN_DESC_6", + ACT_FOURTEEN_DESC_7 = "ACT_FOURTEEN_DESC_7", + ACT_FOURTEEN_DESC_8 = "ACT_FOURTEEN_DESC_8", + ACT_FOURTEEN_DESC_9 = "ACT_FOURTEEN_DESC_9", + ACT_BOSS_RUSH_DESC_1 = "ACT_BOSS_RUSH_DESC_1", + ACT_BOSS_RUSH_DESC_2 = "ACT_BOSS_RUSH_DESC_2", + ACT_BOSS_RUSH_DESC_3 = "ACT_BOSS_RUSH_DESC_3", + ACT_BOSS_RUSH_DESC_4 = "ACT_BOSS_RUSH_DESC_4", + ACT_BOSS_RUSH_DESC_5 = "ACT_BOSS_RUSH_DESC_5", + ACT_BOSS_RUSH_DESC_6 = "ACT_BOSS_RUSH_DESC_6", + ACT_BOSS_RUSH_DESC_7 = "ACT_BOSS_RUSH_DESC_7", + ACT_BOSS_RUSH_DESC_8 = "ACT_BOSS_RUSH_DESC_8", + ACT_BOSS_RUSH_DESC_9 = "ACT_BOSS_RUSH_DESC_9", + ACT_BOSS_RUSH_DESC_10 = "ACT_BOSS_RUSH_DESC_10", + ACT_BOSS_RUSH_DESC_11 = "ACT_BOSS_RUSH_DESC_11", + ACT_BOSS_RUSH_DESC_12 = "ACT_BOSS_RUSH_DESC_12", + ACT_BOSS_RUSH_DESC_13 = "ACT_BOSS_RUSH_DESC_13", + ACT_BOSS_RUSH_DESC_14 = "ACT_BOSS_RUSH_DESC_14", + ACT_BOSS_RUSH_DESC_15 = "ACT_BOSS_RUSH_DESC_15", + ACT_BOSS_RUSH_DESC_16 = "ACT_BOSS_RUSH_DESC_16", + ACT_BOSS_RUSH_DESC_17 = "ACT_BOSS_RUSH_DESC_17", + ACT_BOSS_RUSH_DESC_18 = "ACT_BOSS_RUSH_DESC_18", + ACT_BOSS_RUSH_DESC_19 = "ACT_BOSS_RUSH_DESC_19", + ACT_BOSS_RUSH_DESC_20 = "ACT_BOSS_RUSH_DESC_20", + ACT_BOSS_RUSH_DESC_21 = "ACT_BOSS_RUSH_DESC_21", + ACT_BOSS_RUSH_DESC_22 = "ACT_BOSS_RUSH_DESC_22", + ACT_BOSS_RUSH_DESC_23 = "ACT_BOSS_RUSH_DESC_23", + ACT_BOSS_RUSH_DESC_24 = "ACT_BOSS_RUSH_DESC_24", + ACT_BOSS_RUSH_DESC_25 = "ACT_BOSS_RUSH_DESC_25", + ACT_BOSS_RUSH_DESC_26 = "ACT_BOSS_RUSH_DESC_26", + ACT_BOSS_RUSH_DESC_27 = "ACT_BOSS_RUSH_DESC_27", + ACT_BOSS_RUSH_DESC_28 = "ACT_BOSS_RUSH_DESC_28", + ACT_BOSS_RUSH_DESC_29 = "ACT_BOSS_RUSH_DESC_29", + ACT_BOSS_RUSH_DESC_30 = "ACT_BOSS_RUSH_DESC_30", + ACT_BOSS_RUSH_DESC_31 = "ACT_BOSS_RUSH_DESC_31", + ACT_BOSS_RUSH_DESC_32 = "ACT_BOSS_RUSH_DESC_32", + ACT_BOSS_RUSH_DESC_33 = "ACT_BOSS_RUSH_DESC_33", + NOT_POP_TODAY = "NOT_POP_TODAY", + ACT_BOSS_RUSH_DESC_34 = "ACT_BOSS_RUSH_DESC_34", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_activity.lua b/lua/app/config/monster_activity.lua new file mode 100644 index 00000000..b94fef9f --- /dev/null +++ b/lua/app/config/monster_activity.lua @@ -0,0 +1,777 @@ +local monster_activity = { + [104]={ + ["monster_base"]=20001, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30001, + 30002, + 30003 + }, + ["skill"]={ + 10020 + }, + ["monster_exp"]=15000 + }, + [204]={ + ["monster_base"]=20002, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30004, + 30005, + 30006 + }, + ["skill"]={ + 10019 + }, + ["monster_exp"]=15000 + }, + [304]={ + ["monster_base"]=20004, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30010, + 30011, + 30012 + }, + ["skill"]={ + 10015 + }, + ["monster_exp"]=15000 + }, + [404]={ + ["monster_base"]=20006, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30016, + 30017, + 30018 + }, + ["skill"]={ + 10033 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=15000 + }, + [504]={ + ["monster_base"]=20007, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30019, + 30020, + 30021 + }, + ["skill"]={ + 10060 + }, + ["passive_skill"]={ + 10061 + }, + ["monster_exp"]=15000 + }, + [604]={ + ["monster_base"]=20008, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30022, + 30023, + 30024 + }, + ["skill"]={ + 10032 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=15000 + }, + [704]={ + ["monster_base"]=20012, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30034, + 30035, + 30036 + }, + ["skill"]={ + 10017 + }, + ["monster_exp"]=15000 + }, + [804]={ + ["monster_base"]=20014, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30040, + 30041, + 30042 + }, + ["skill"]={ + 10016 + }, + ["monster_exp"]=15000 + }, + [904]={ + ["monster_base"]=20015, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30043, + 30044, + 30045 + }, + ["skill"]={ + 10070 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=15000 + }, + [1004]={ + ["monster_base"]=20023, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30067, + 30068, + 30069 + }, + ["skill"]={ + 10063 + }, + ["passive_skill"]={ + 10013 + }, + ["monster_exp"]=15000 + }, + [1104]={ + ["monster_base"]=20009, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30025, + 30026, + 30027 + }, + ["skill"]={ + 10039 + }, + ["passive_skill"]={ + 10010, + 10011 + }, + ["monster_exp"]=15000 + }, + [1204]={ + ["monster_base"]=20011, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30031, + 30032, + 30033 + }, + ["skill"]={ + 10018 + }, + ["monster_exp"]=15000 + }, + [1304]={ + ["monster_base"]=20017, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30049, + 30050, + 30051 + }, + ["skill"]={ + 10027 + }, + ["monster_exp"]=15000 + }, + [1404]={ + ["monster_base"]=20019, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30055, + 30056, + 30057 + }, + ["skill"]={ + 10045 + }, + ["passive_skill"]={ + 10013 + }, + ["monster_exp"]=15000 + }, + [1504]={ + ["monster_base"]=20022, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30064, + 30065, + 30066 + }, + ["skill"]={ + 10023 + }, + ["passive_skill"]={ + 10013 + }, + ["monster_exp"]=15000 + }, + [1604]={ + ["monster_base"]=20026, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30076, + 30077, + 30078 + }, + ["skill"]={ + 10064 + }, + ["passive_skill"]={ + 10013 + }, + ["monster_exp"]=15000 + }, + [1704]={ + ["monster_base"]=20028, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30162, + 30163, + 30164 + }, + ["skill"]={ + 10142 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=15000 + }, + [1804]={ + ["monster_base"]=20029, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30085, + 30086, + 30087 + }, + ["skill"]={ + 10065 + }, + ["monster_exp"]=15000 + }, + [1904]={ + ["monster_base"]=20010, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30028, + 30029, + 30030 + }, + ["skill"]={ + 10041, + 10066 + }, + ["passive_skill"]={ + 10008, + 10009, + 10013 + }, + ["monster_exp"]=15000 + }, + [2004]={ + ["monster_base"]=20016, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30046, + 30047, + 30048 + }, + ["skill"]={ + 10036 + }, + ["passive_skill"]={ + 10010, + 10011 + }, + ["monster_exp"]=15000 + }, + [2104]={ + ["monster_base"]=20018, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30052, + 30053, + 30054 + }, + ["skill"]={ + 10051 + }, + ["passive_skill"]={ + 10011, + 10012 + }, + ["monster_exp"]=15000 + }, + [2204]={ + ["monster_base"]=20021, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30061, + 30062, + 30063 + }, + ["skill"]={ + 10034 + }, + ["passive_skill"]={ + 10011, + 10008 + }, + ["monster_exp"]=15000 + }, + [2304]={ + ["monster_base"]=20025, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30073, + 30074, + 30075 + }, + ["skill"]={ + 10062 + }, + ["passive_skill"]={ + 10013 + }, + ["monster_exp"]=15000 + }, + [2404]={ + ["monster_base"]=20027, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30079, + 30080, + 30081 + }, + ["skill"]={ + 10082 + }, + ["monster_exp"]=15000 + }, + [2504]={ + ["monster_base"]=20035, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30100, + 30101, + 30102, + 30113 + }, + ["skill"]={ + 10076 + }, + ["passive_skill"]={ + 10011, + 10009 + }, + ["monster_exp"]=15000 + }, + [2604]={ + ["monster_base"]=20036, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30103, + 30104, + 30105 + }, + ["skill"]={ + 10077, + 10078 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=15000 + }, + [2704]={ + ["monster_base"]=20044, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30147, + 30148, + 30149 + }, + ["skill"]={ + 10130, + 10131 + }, + ["passive_skill"]={ + 10132, + 10013, + 10011 + }, + ["monster_exp"]=15000 + }, + [2804]={ + ["monster_base"]=20003, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30007, + 30008, + 30009 + }, + ["skill"]={ + 10029 + }, + ["passive_skill"]={ + 10013 + }, + ["monster_exp"]=15000 + }, + [2904]={ + ["monster_base"]=20005, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30013, + 30014, + 30015 + }, + ["skill"]={ + 10024 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=15000 + }, + [3004]={ + ["monster_base"]=20020, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30058, + 30059, + 30060 + }, + ["skill"]={ + 10047 + }, + ["passive_skill"]={ + 10013 + }, + ["monster_exp"]=15000 + }, + [3104]={ + ["monster_base"]=20030, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30088, + 30089, + 30090 + }, + ["skill"]={ + 10056, + 10057 + }, + ["passive_skill"]={ + 10014 + }, + ["monster_exp"]=15000 + }, + [3204]={ + ["monster_base"]=20034, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30097, + 30098, + 30099 + }, + ["skill"]={ + 10074, + 10075 + }, + ["passive_skill"]={ + 10013, + 10012 + }, + ["monster_exp"]=15000 + }, + [3304]={ + ["monster_base"]=20037, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30106, + 30107, + 30108 + }, + ["skill"]={ + 10079 + }, + ["passive_skill"]={ + 10013, + 10009, + 10084 + }, + ["monster_exp"]=15000 + }, + [3404]={ + ["monster_base"]=20045, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30150, + 30151, + 30152 + }, + ["skill"]={ + 10133, + 10134 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=15000 + }, + [3504]={ + ["monster_base"]=20046, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30153, + 30154, + 30155 + }, + ["skill"]={ + 10135, + 10136 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=15000 + }, + [3604]={ + ["monster_base"]=20013, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30037, + 30038, + 30039 + }, + ["skill"]={ + 10049, + 10050 + }, + ["monster_exp"]=15000 + }, + [3704]={ + ["monster_base"]=20024, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30070, + 30071, + 30072 + }, + ["skill"]={ + 10043, + 10044 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=15000 + }, + [3804]={ + ["monster_base"]=20031, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30091, + 30092, + 30093 + }, + ["skill"]={ + 10058, + 10059 + }, + ["passive_skill"]={ + 10008, + 10011, + 10013 + }, + ["monster_exp"]=15000 + }, + [3904]={ + ["monster_base"]=20032, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30094, + 30095, + 30096 + }, + ["skill"]={ + 10052, + 10053, + 10054 + }, + ["passive_skill"]={ + 10008, + 10010, + 10013 + }, + ["monster_exp"]=15000 + }, + [4004]={ + ["monster_base"]=20038, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30109, + 30110, + 30111, + 30112 + }, + ["skill"]={ + 10080, + 10081 + }, + ["passive_skill"]={ + 10083, + 10009, + 10011 + }, + ["monster_exp"]=15000 + }, + [4104]={ + ["monster_base"]=20047, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30156, + 30157, + 30158 + }, + ["skill"]={ + 10137, + 10138 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=15000 + }, + [4204]={ + ["monster_base"]=20048, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30159, + 30160, + 30161 + }, + ["skill"]={ + 10139, + 10140 + }, + ["passive_skill"]={ + 10141, + 10014, + 10009 + }, + ["monster_exp"]=15000 + } +} +local config = { +data=monster_activity,count=42 +} +return config \ No newline at end of file diff --git a/lua/app/config/monster_activity.lua.meta b/lua/app/config/monster_activity.lua.meta new file mode 100644 index 00000000..5f1cfcba --- /dev/null +++ b/lua/app/config/monster_activity.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 228b857e2abcb754185db1ca23e6184e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index be8e1b56..43b24383 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1714,6 +1714,14 @@ local skill = { ["round"]=1 } }, + ["pvp_effect"]={ + { + ["type"]="rebirth", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, ["obj"]=1 }, [1400325]={ @@ -1723,8 +1731,16 @@ local skill = { ["effect"]={ { ["type"]="rebirth", - ["num"]=10000, - ["ratio"]=15000, + ["num"]=15000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["pvp_effect"]={ + { + ["type"]="rebirth", + ["num"]=7500, + ["ratio"]=10000, ["round"]=2 } }, @@ -12583,7 +12599,7 @@ local skill = { ["name_act"]="skill01", ["fx_self"]=200171, ["bullet_time"]={ - 583, + 1100, 3000, 400 } @@ -12618,7 +12634,7 @@ local skill = { ["sound_delay"]=0.0, ["name_act"]="skill02", ["bullet_time"]={ - 1300, + 583, 3000, 400 } @@ -12935,6 +12951,42 @@ local skill = { ["cd"]=0, ["cd_start"]=0 }, + [10142]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 21, + 2 + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=25000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=2, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 10018 + }, + ["name_act"]="skill01", + ["fx_self"]=200099, + ["bullet_time"]={ + 466, + 3000, + 400 + } + }, [20001]={ ["effect_type"]=1, ["trigger"]=1, @@ -22518,6 +22570,78 @@ local skill = { ["name_act"]="attack03", ["fx_self"]=200184 }, + [30162]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=200096 + }, + [30163]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=200097 + }, + [30164]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=200098 + }, [40001]={ ["effect_type"]=1, ["trigger"]=1, @@ -27444,6 +27568,6 @@ local skill = { } } local config = { -data=skill,count=985 +data=skill,count=989 } return config \ No newline at end of file diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 84f476a0..2c454b43 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -36,7 +36,7 @@ local skin = { ["num"]=1000 } }, - ["icon"]="skin_5", + ["icon"]="16_1", ["got"]=1, ["skin_point"]=10, ["hero_id"]=14001, @@ -68,7 +68,7 @@ local skin = { ["num"]=1000 } }, - ["icon"]="skin_3", + ["icon"]="23_1", ["got"]=1, ["skin_point"]=10, ["hero_id"]=14002, @@ -160,7 +160,7 @@ local skin = { ["num"]=2000 } }, - ["icon"]="skin_1", + ["icon"]="18_1", ["got"]=1, ["skin_point"]=15, ["hero_id"]=34001, @@ -246,7 +246,7 @@ local skin = { ["num"]=1000000 } }, - ["icon"]="skin_4", + ["icon"]="10_1", ["got"]=1, ["skin_point"]=5, ["hero_id"]=53001, @@ -284,7 +284,7 @@ local skin = { ["num"]=2000 } }, - ["icon"]="skin_2", + ["icon"]="20_1", ["got"]=1, ["skin_point"]=15, ["hero_id"]=54001, diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua index 7e5b67a3..d10a6a1e 100644 --- a/lua/app/config/strings/cn/avatar.lua +++ b/lua/app/config/strings/cn/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="激活刀姬翩然起舞皮肤获得。" + }, + [1400101]={ + ["desc"]="遗迹战甲" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar_frame.lua b/lua/app/config/strings/cn/avatar_frame.lua index 9f6c5019..3d34ff77 100644 --- a/lua/app/config/strings/cn/avatar_frame.lua +++ b/lua/app/config/strings/cn/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="S2竞技场黄金头像框，英雄的光辉。" + }, + [28]={ + ["desc"]="S3竞技场白银头像，勇气的代表。" + }, + [29]={ + ["desc"]="S3竞技场黄金头像，实力的证明。" } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index 433a76e5..f535d32e 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -225,18 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="重生", ["desc"]="重生：持续期间被击败则会触发重生并恢复生命，回合结束时未触发重生也会恢复生命。", ["tips_desc"]="重生：持续期间被击败则会触发重生并恢复生命，回合结束时未触发重生也会恢复生命。", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="海洋护盾", ["desc"]="海洋护盾：承受一定伤害，免疫所有负面效果。", + ["tips_desc"]="海洋护盾：承受一定伤害，免疫所有负面效果。", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="自愈", ["desc"]="自愈：回合结束时恢复生命。", + ["tips_desc"]="自愈：回合结束时恢复生命。", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index eeb2e910..860b4eb6 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -454,18 +454,65 @@ local localization_global = ["HERO_FUND_DESCC_1"] = "新活动月之祝福开启", ["HERO_FUND_DESCC_2"] = "月之祝福", ["HERO_FUND_DESCC_3"] = "拥有月之祝福后，在战斗中累计通过波次可获得丰厚奖励。", - ["HERO_FUND_DESCC_4"] = "新活动14日达标开启", + ["HERO_FUND_DESCC_4"] = "新活动进阶挑战开启", ["ARENA_DESC_37"] = "解锁英雄：", ["ARENA_DESC_38"] = "已解锁英雄：", ["ARENA_DESC_39"] = "升段奖励为一次性奖励", ["ARENA_DESC_40"] = "升段奖励", ["ARENA_DESC_41"] = "结算奖励", ["ARENA_DESC_42"] = "未领取奖励", - ["EQUIP_DESC_26"] = "武器直升{0}级礼包", ["EQUIP_DESC_27"] = "防具直升{0}级礼包", + ["EQUIP_DESC_28"] = "武器直升{0}级礼包", ["SEIZED_DESC_1"] = "检测到你的账号存在异常，请联系客服或删除账号使用新建账号继续游戏。", ["SEIZED_DESC_2"] = "联系客服", ["SEIZED_DESC_3"] = "删除账号", + ["ACT_FOURTEEN_TITLE_1"] = "登录好礼", + ["ACT_FOURTEEN_TITLE_2"] = "进阶挑战", + ["ACT_FOURTEEN_TITLE_3"] = "限时兑换", + ["ACT_FOURTEEN_TITLE_4"] = "限时礼包", + ["ACT_FOURTEEN_DESC_1"] = "登陆游戏，既享大礼！", + ["ACT_FOURTEEN_DESC_2"] = "挑战自己，更有好礼相送！", + ["ACT_FOURTEEN_DESC_3"] = "时不待人，机不再来！", + ["ACT_FOURTEEN_DESC_5"] = "登录即可领取奖励，解锁高级战令领取额外奖励！", + ["ACT_FOURTEEN_DESC_6"] = "阶段", + ["ACT_FOURTEEN_DESC_7"] = "尚未解锁，请明日再来~", + ["ACT_FOURTEEN_DESC_8"] = "完成当前阶段所有任务可获得：", + ["ACT_FOURTEEN_DESC_9"] = "活动期间，完成进阶挑战可获得【挑战点】", + ["ACT_BOSS_RUSH_DESC_1"] = "是否消耗{0}钻石战斗？", + ["ACT_BOSS_RUSH_DESC_2"] = "首领公开赛", + ["ACT_BOSS_RUSH_DESC_3"] = "今日高手", + ["ACT_BOSS_RUSH_DESC_4"] = "我今日最高：", + ["ACT_BOSS_RUSH_DESC_5"] = "我今日挑战：{0}次", + ["ACT_BOSS_RUSH_DESC_6"] = "今日次数：{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "消耗：", + ["ACT_BOSS_RUSH_DESC_8"] = "虚位以待", + ["ACT_BOSS_RUSH_DESC_9"] = "参赛阵容", + ["ACT_BOSS_RUSH_DESC_10"] = "排行榜", + ["ACT_BOSS_RUSH_DESC_11"] = "首领巡礼", + ["ACT_BOSS_RUSH_DESC_12"] = "活动商店", + ["ACT_BOSS_RUSH_DESC_13"] = "参与公开赛，挑战各类首领！\n赢稀有S级英雄！！", + ["ACT_BOSS_RUSH_DESC_14"] = "立即前往", + ["ACT_BOSS_RUSH_DESC_15"] = "首领巡礼", + ["ACT_BOSS_RUSH_DESC_16"] = "累计公开赛挑战波次，可领取首领巡礼奖励。", + ["ACT_BOSS_RUSH_DESC_17"] = "首领巡礼中获得【首领金币】兑换奖励，活动结束时【首领金币】奖杯回收，请尽快兑换。", + ["ACT_BOSS_RUSH_DESC_18"] = "兑换", + ["ACT_BOSS_RUSH_DESC_19"] = "剩余次数：{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "昨日", + ["ACT_BOSS_RUSH_DESC_21"] = "今日", + ["ACT_BOSS_RUSH_DESC_22"] = "奖励", + ["ACT_BOSS_RUSH_DESC_23"] = "排名:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "排名", + ["ACT_BOSS_RUSH_DESC_25"] = "玩家", + ["ACT_BOSS_RUSH_DESC_26"] = "记录", + ["ACT_BOSS_RUSH_DESC_27"] = "1.排行榜将以当日最大波数进行排名，波数相同的玩家将对比最小回合数。\n2.排行榜每日0点（UTC-0）刷新重置，重置后可根据前一天的排名领取奖励，奖励过期未领将不会补发。", + ["ACT_BOSS_RUSH_DESC_28"] = "新纪录", + ["ACT_BOSS_RUSH_DESC_29"] = "巡回积分", + ["ACT_BOSS_RUSH_DESC_30"] = "挑战完成", + ["ACT_BOSS_RUSH_DESC_31"] = "1.首领出场顺序和地图每日都将进行变化。\n2.战斗开始后，您的英雄技能默认已激活，但强化技能还需要升级获得，战斗内最多提升40级。\n3.叠加属性的强化技能，最多可生效10次。\n4.每日公开赛的排名都将结算一次，结算可获得大量【首领金币】，可用于活动商店兑换奖励。\n5.首领巡礼将根据您参与公开赛战斗的累计波次给与奖励。\n5.每日可免费挑战1次，后续挑战需要消耗钻石，请准备好再开始挑战。", + ["ACT_BOSS_RUSH_DESC_32"] = "限时礼包，倾情回馈！", + ["ACT_BOSS_RUSH_DESC_33"] = "阶段{0}解锁", + ["NOT_POP_TODAY"] = "今日不再提醒", + ["ACT_BOSS_RUSH_DESC_34"] = "退出将按照当前波次结算，是否退出？", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index b5aed2c8..48858bfd 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="随机史诗英雄", ["desc"]="批量获取时只会随机以下英雄中的一名" }, + [51]={ + ["name"]="挑战点", + ["desc"]="挑战点，进阶挑战限时兑换奖励。" + }, + [52]={ + ["name"]="首领金币", + ["desc"]="首领金币，可在首领公开赛的活动商店中兑换奖励。" + }, + [53]={ + ["name"]="S3赛季白银头像框", + ["desc"]="S3竞技场白银头像框，勇气的代表。" + }, + [54]={ + ["name"]="S3赛季黄金头像框", + ["desc"]="S3竞技场黄金头像框，实力的证明。" + }, [1001]={ ["name"]="暗淡陨铁", ["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。" @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task_type.lua b/lua/app/config/strings/cn/task_type.lua new file mode 100644 index 00000000..a5173734 --- /dev/null +++ b/lua/app/config/strings/cn/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="累计观看广告" + }, + [2]={ + ["desc"]="获得金币" + }, + [3]={ + ["desc"]="获得钻石" + }, + [4]={ + ["desc"]="消耗金币" + }, + [5]={ + ["desc"]="消耗钻石" + }, + [6]={ + ["desc"]="开启商城任意宝箱" + }, + [7]={ + ["desc"]="开启商城史诗宝箱" + }, + [8]={ + ["desc"]="关卡内打开技能神灯" + }, + [9]={ + ["desc"]="在战斗中获胜" + }, + [10]={ + ["desc"]="升级你的英雄" + }, + [11]={ + ["desc"]="获得英雄碎片" + }, + [12]={ + ["desc"]="击杀首领" + }, + [13]={ + ["desc"]="击杀小怪" + }, + [14]={ + ["desc"]="累计消除元素" + }, + [15]={ + ["desc"]="6连消次数" + }, + [16]={ + ["desc"]="8连消次数" + }, + [17]={ + ["desc"]="战斗中超过10连击次数" + }, + [18]={ + ["desc"]="战斗中释放技能次数" + }, + [19]={ + ["desc"]="通过战斗波次" + }, + [20]={ + ["desc"]="每日任务完成X个" + }, + [21]={ + ["desc"]="直接看1次广告的任务" + }, + [22]={ + ["desc"]="累计签到{0}天" + }, + [23]={ + ["desc"]="等级达到{0}" + }, + [24]={ + ["desc"]="通过主线章节{0}" + }, + [25]={ + ["desc"]="英雄最高等级达到{0}" + }, + [26]={ + ["desc"]="消耗体力{0}点" + }, + [27]={ + ["desc"]="拥有{0}个英雄" + }, + [28]={ + ["desc"]="开启{0}次普通宝箱" + }, + [29]={ + ["desc"]="开启{0}次珍贵宝箱" + }, + [30]={ + ["desc"]="竞技场挑战次数" + }, + [31]={ + ["desc"]="竞技场段位达到{0}" + }, + [32]={ + ["desc"]="深渊挑战通关{0}" + }, + [33]={ + ["desc"]="通关时空裂隙{0}-{1}" + }, + [34]={ + ["desc"]="通关矿车拦截{0}" + }, + [35]={ + ["desc"]="通关灯神之塔{0}" + }, + [36]={ + ["desc"]="每日挑战胜利{0}次" + }, + [37]={ + ["desc"]="开启主线宝箱{0}个" + }, + [38]={ + ["desc"]="武器升级{0}次" + }, + [39]={ + ["desc"]="防具升级{0}次" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task_type.lua.meta b/lua/app/config/strings/cn/task_type.lua.meta new file mode 100644 index 00000000..1da19ecc --- /dev/null +++ b/lua/app/config/strings/cn/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b10781256ecf831459ed491d7dab37ea +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/avatar.lua b/lua/app/config/strings/de/avatar.lua index 9e50f952..e55df79f 100644 --- a/lua/app/config/strings/de/avatar.lua +++ b/lua/app/config/strings/de/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ + }, + [1400101]={ + } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar_frame.lua b/lua/app/config/strings/de/avatar_frame.lua index 924596db..43ceb019 100644 --- a/lua/app/config/strings/de/avatar_frame.lua +++ b/lua/app/config/strings/de/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ + }, + [28]={ + + }, + [29]={ + } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/global.lua b/lua/app/config/strings/de/global.lua index 6d428074..a31a1d1b 100644 --- a/lua/app/config/strings/de/global.lua +++ b/lua/app/config/strings/de/global.lua @@ -32,6 +32,7 @@ local localization_global = ["TWITTER_DESC"] = "Twitter", ["NAVER_SETTING_DESC"] = "Naver", ["ACT_DESC_12"] = "LV", + ["ACT_BOSS_RUSH_DESC_6"] = "Chances de hoy:{0}", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index 1e181bdd..cdc4654a 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -139,6 +139,18 @@ local item = { }, [47]={ + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + }, [1001]={ @@ -334,6 +346,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/task_type.lua b/lua/app/config/strings/de/task_type.lua new file mode 100644 index 00000000..c087d8bf --- /dev/null +++ b/lua/app/config/strings/de/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/task_type.lua.meta b/lua/app/config/strings/de/task_type.lua.meta new file mode 100644 index 00000000..8f27288c --- /dev/null +++ b/lua/app/config/strings/de/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1d88d0e4f96b2a8488ecd37a95288351 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua index 6dc4d2d6..e390ea18 100644 --- a/lua/app/config/strings/en/avatar.lua +++ b/lua/app/config/strings/en/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="Obtained after activating Graceful Dance." + }, + [1400101]={ + ["desc"]="Relic Armor" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar_frame.lua b/lua/app/config/strings/en/avatar_frame.lua index cd268d22..d7311d5f 100644 --- a/lua/app/config/strings/en/avatar_frame.lua +++ b/lua/app/config/strings/en/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="S2 Gold Arena Avatar Frame, shining with heroic radiance." + }, + [28]={ + ["desc"]="S3 Silver Arena Avatar Frame. It is reversed for hero." + }, + [29]={ + ["desc"]="S3 Gold Arena Avatar Frame. Proof of your prowess." } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index a5adf638..ffe8b912 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/lua/app/config/strings/en/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="Rebirth", + ["desc"]="Rebirth: During the Rebirth, when you are defeated or the turn ends, it will trigger to restore HP.", + ["tips_desc"]="Rebirth: During the Rebirth, when you are defeated or the turn ends, it will trigger to restore HP.", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="Ocean Shield", + ["desc"]="Ocean Shield: Can take a certain amount of damage and stay immune to all debuffs.", + ["tips_desc"]="Ocean Shield: Can take a certain amount of damage and stay immune to all debuffs.", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="Self-healing", + ["desc"]="Self-healing: Restore HP at the end of the turn.", + ["tips_desc"]="Self-healing: Restore HP at the end of the turn.", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 444267f4..03bfe394 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "Promotion Rewards", ["ARENA_DESC_41"] = "Settlement Rewards", ["ARENA_DESC_42"] = "Unclaimed Rewards", - ["EQUIP_DESC_26"] = "Weapon Upgrade Lv.{0} Pack", ["EQUIP_DESC_27"] = "Armor Upgrade Lv.{0} Pack", + ["EQUIP_DESC_28"] = "Weapon Upgrade Lv.{0} Pack", ["SEIZED_DESC_1"] = "Detected abnormality on your account. Please contact customer service or delete the account and continue playing with a new account.", ["SEIZED_DESC_2"] = "Customer Service", ["SEIZED_DESC_3"] = "Delete Account", + ["ACT_FOURTEEN_TITLE_1"] = "Login Rewards", + ["ACT_FOURTEEN_TITLE_2"] = "Advanced Challenge", + ["ACT_FOURTEEN_TITLE_3"] = "Limited-Time Exchange", + ["ACT_FOURTEEN_TITLE_4"] = "Limited-Time Pack", + ["ACT_FOURTEEN_DESC_1"] = "Log in to the game and receive great rewards!", + ["ACT_FOURTEEN_DESC_2"] = "Challenge yourself and receive even better rewards!", + ["ACT_FOURTEEN_DESC_3"] = "Time waits for no one, and chances don't come again!", + ["ACT_FOURTEEN_DESC_5"] = "Log in to claim rewards and get extra rewards by unlocking Premium Battle Pass!", + ["ACT_FOURTEEN_DESC_6"] = "Stage", + ["ACT_FOURTEEN_DESC_7"] = "Locked. Please come back tomorrow~", + ["ACT_FOURTEEN_DESC_8"] = "Completing all quests in the current stage grants:", + ["ACT_FOURTEEN_DESC_9"] = "During the event, completing the advanced challenges grants [Challenge Points].", + ["ACT_BOSS_RUSH_DESC_1"] = "Confirm to spend {0} Diamonds to battle?", + ["ACT_BOSS_RUSH_DESC_2"] = "Boss Championship", + ["ACT_BOSS_RUSH_DESC_3"] = "Master Today", + ["ACT_BOSS_RUSH_DESC_4"] = "My highest today:", + ["ACT_BOSS_RUSH_DESC_5"] = "My challenges today: {0} times", + ["ACT_BOSS_RUSH_DESC_6"] = "今日次数：{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "Cost:", + ["ACT_BOSS_RUSH_DESC_8"] = "Vacant", + ["ACT_BOSS_RUSH_DESC_9"] = "Line-up", + ["ACT_BOSS_RUSH_DESC_10"] = "Leaderboard", + ["ACT_BOSS_RUSH_DESC_11"] = "Boss Parade", + ["ACT_BOSS_RUSH_DESC_12"] = "Event Shop", + ["ACT_BOSS_RUSH_DESC_13"] = "Participate in the championship to challenge bosses!Win rare S heroes!!", + ["ACT_BOSS_RUSH_DESC_14"] = "Go", + ["ACT_BOSS_RUSH_DESC_15"] = "Boss Parade", + ["ACT_BOSS_RUSH_DESC_16"] = "Challenge enough boss championship waves to claim Boss Parade rewards.", + ["ACT_BOSS_RUSH_DESC_17"] = "Obtain [Boss Coins] in the Boss Parade to exchange for rewards. [Boss Coins] will be reclaimed when the event ends. Please exchange them on time.", + ["ACT_BOSS_RUSH_DESC_18"] = "Exchange", + ["ACT_BOSS_RUSH_DESC_19"] = "Remaining Attempts:{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "Yesterday", + ["ACT_BOSS_RUSH_DESC_21"] = "Today", + ["ACT_BOSS_RUSH_DESC_22"] = "Rewards", + ["ACT_BOSS_RUSH_DESC_23"] = "Ranking:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "Ranking", + ["ACT_BOSS_RUSH_DESC_25"] = "Player", + ["ACT_BOSS_RUSH_DESC_26"] = "Record", + ["ACT_BOSS_RUSH_DESC_27"] = "1. Ranking will be based on the highest wave reached within the given day, and if multiple players have the same wave, the comparison will be based on the lowest number of turns taken. \n2. Ranking resets at 0:00 UTC daily, and then you can claim rewards based on your ranking from the previous day. Unclaimed rewards will not be reissued.", + ["ACT_BOSS_RUSH_DESC_28"] = "New Record", + ["ACT_BOSS_RUSH_DESC_29"] = "Parade Points", + ["ACT_BOSS_RUSH_DESC_30"] = "Challenge Completed", + ["ACT_BOSS_RUSH_DESC_31"] = "1. The order of bosses' appearance and the map will change daily. \n2. When the battle starts, your hero's skills are initially activated, but enhanced skills need to be upgraded, up to Lv. 40 in the battle. \n3. Enhancement skills that stack attributes can be effective up to 10 times.\n4. Championship ranking will be calculated once daily, and then you'll receive tons of [Boss Coins] that can exchange rewards in the event shop. \n5. Boss Parade will grant rewards based on the cumulative waves of battles you participate in during the championship. \n6. You can challenge once for free every day, and later challenges will consume Diamonds. Please brace yourself before engaging.", + ["ACT_BOSS_RUSH_DESC_32"] = "Highly rewarding limited time packages!", + ["ACT_BOSS_RUSH_DESC_33"] = "Stage {0} Unlocked", + ["NOT_POP_TODAY"] = "Don't remind me today", + ["ACT_BOSS_RUSH_DESC_34"] = "When you quit, the battle will be settled according to the current wave, do you quit?", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 763847ed..9c267f29 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="Random Epic Hero", ["desc"]="Shards obtained in batch will only randomly grant one of the following heroes." }, + [51]={ + ["name"]="Challenge Points", + ["desc"]="Challenge Points can exchange time-limited rewards of Advanced Challenges." + }, + [52]={ + ["name"]="Boss Coins", + ["desc"]="Boss Coin can exchange rewards in the event shop of Boss Championship." + }, + [53]={ + ["name"]="S3 Silver Avatar Frame", + ["desc"]="S3 Silver Arena Avatar Frame. It is reversed for hero." + }, + [54]={ + ["name"]="S3 Gold Avatar Frame", + ["desc"]="S3 Gold Arena Avatar Frame. Proof of your prowess." + }, [1001]={ ["name"]="Dim Meteorite", ["desc"]="A dim meteorite that holds a mysterious energy." @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 81b20872..832f6c09 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -474,7 +474,7 @@ local skill_rogue = { ["desc"]="Alluring Nightmare can clear additional 4 grids in the X direction." }, [3400202]={ - ["desc"]="Combo: Alluring Nightmare deals 50% more damage to Vulnerable enemies." + ["desc"]="Combo: Alluring Nightmare deals 50% more damage to Weak enemies." }, [3400203]={ ["desc"]="Alluring Nightmare can clear additional 4 grids in the X direction." diff --git a/lua/app/config/strings/en/task_type.lua b/lua/app/config/strings/en/task_type.lua new file mode 100644 index 00000000..8a8c1dab --- /dev/null +++ b/lua/app/config/strings/en/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="Ads watched" + }, + [2]={ + ["desc"]="Obtain Gold Coins" + }, + [3]={ + ["desc"]="Obtain Diamonds" + }, + [4]={ + ["desc"]="Spend Gold Coins" + }, + [5]={ + ["desc"]="Spend Diamonds" + }, + [6]={ + ["desc"]="Open Any Chest in the Shop" + }, + [7]={ + ["desc"]="Open Epic Chest in the Shop" + }, + [8]={ + ["desc"]="Open skill lamp in the stage" + }, + [9]={ + ["desc"]="Win the battle" + }, + [10]={ + ["desc"]="Upgrade Hero" + }, + [11]={ + ["desc"]="Obtain Hero Shard" + }, + [12]={ + ["desc"]="Kill boss" + }, + [13]={ + ["desc"]="Kill minions" + }, + [14]={ + ["desc"]="Elements cleared" + }, + [15]={ + ["desc"]="6-Links" + }, + [16]={ + ["desc"]="8-Links" + }, + [17]={ + ["desc"]="10 Hits or more in battle" + }, + [18]={ + ["desc"]="Skills used in battle" + }, + [19]={ + ["desc"]="Clear battle waves" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="Log in for {0} day" + }, + [23]={ + ["desc"]="Reach level {0}" + }, + [24]={ + ["desc"]="Clear Chapter {0} of Main Story" + }, + [25]={ + ["desc"]="Hero's highest level reaches {0}" + }, + [26]={ + ["desc"]="Use {0} stamina" + }, + [27]={ + ["desc"]="Own {0} heroes" + }, + [28]={ + ["desc"]="Open {0} Common Chest" + }, + [29]={ + ["desc"]="Open {0} Precious Chest" + }, + [30]={ + ["desc"]="Arena Challenge Attempts" + }, + [31]={ + ["desc"]="Reach {0} in the Arena" + }, + [32]={ + ["desc"]="Clear Abyss Challenge {0}" + }, + [33]={ + ["desc"]="Clear Time Rift {0}-{1}" + }, + [34]={ + ["desc"]="Clear Minecart Interception {0}" + }, + [35]={ + ["desc"]="Clear Tower of Lumens {0}" + }, + [36]={ + ["desc"]="Win in Daily Challenges {0} times" + }, + [37]={ + ["desc"]="Open {0} Main Story Chests" + }, + [38]={ + ["desc"]="Upgrade weapon {0} times" + }, + [39]={ + ["desc"]="Upgrade armor {0} times" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/task_type.lua.meta b/lua/app/config/strings/en/task_type.lua.meta new file mode 100644 index 00000000..e9226956 --- /dev/null +++ b/lua/app/config/strings/en/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ad57b1002d1ee974d97f01d213b96642 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/es/avatar.lua b/lua/app/config/strings/es/avatar.lua index 88562730..0c6bc694 100644 --- a/lua/app/config/strings/es/avatar.lua +++ b/lua/app/config/strings/es/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="Se obtiene tras activar Danza Elegante." + }, + [1400101]={ + ["desc"]="Armadura de Ruinas" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/avatar_frame.lua b/lua/app/config/strings/es/avatar_frame.lua index 82126b48..ad5e70cf 100644 --- a/lua/app/config/strings/es/avatar_frame.lua +++ b/lua/app/config/strings/es/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe." + }, + [28]={ + ["desc"]="Marco de avatar de plata Temporada S3, símbolo de valentía." + }, + [29]={ + ["desc"]="Marco de avatar de oro Temporada S3, prueba de fuerza." } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/buff.lua b/lua/app/config/strings/es/buff.lua index c7008d72..9dc0d33c 100644 --- a/lua/app/config/strings/es/buff.lua +++ b/lua/app/config/strings/es/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="Resucitación", + ["desc"]="Resucitación: se activa y restaura HP cuando el héroe es derrotado durante el efecto, o cuando llega el final de la ronda.", + ["tips_desc"]="Resucitación: se activa y restaura HP cuando el héroe es derrotado durante el efecto, o cuando llega el final de la ronda.", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="Escudo Marino", + ["desc"]="Escudo Marino: Soporta una cierta cantidad de daño y es inmune a todos los debuffs.", + ["tips_desc"]="Escudo Marino: Soporta una cierta cantidad de daño y es inmune a todos los debuffs.", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="Autocura", + ["desc"]="Autocura: Restaura HP al final de la ronda.", + ["tips_desc"]="Autocura: Restaura HP al final de la ronda.", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index 3f1b18f4..557ed094 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "Recompensas de Subida de Ranking", ["ARENA_DESC_41"] = "Recompensas de Clasificación", ["ARENA_DESC_42"] = "Recompensas no colectadas", - ["EQUIP_DESC_26"] = "Paquete de Mejora de Arma al Nv. {0}", ["EQUIP_DESC_27"] = "Paquete de Mejora de Armadura al Nv. {0}", + ["EQUIP_DESC_28"] = "Paquete de Mejora de Arma al Nv. {0}", ["SEIZED_DESC_1"] = "Se ha detectado una anomalía en tu cuenta. Por favor contacta con Atención al Cliente, o elimina la cuenta actual y crear una nueva para continuar el juego.", ["SEIZED_DESC_2"] = "Atención al Cliente", ["SEIZED_DESC_3"] = "Eliminar Cuenta", + ["ACT_FOURTEEN_TITLE_1"] = "Regalo de Acceso", + ["ACT_FOURTEEN_TITLE_2"] = "Desafío Avanzado", + ["ACT_FOURTEEN_TITLE_3"] = "Canje por Tiempo Limitado", + ["ACT_FOURTEEN_TITLE_4"] = "Paquete por Tiempo Limitado", + ["ACT_FOURTEEN_DESC_1"] = "¡Entra en el juego y disfruta de regalos!", + ["ACT_FOURTEEN_DESC_2"] = "¡Desafíate y recibe regalos!", + ["ACT_FOURTEEN_DESC_3"] = "¡Es ahora o nunca!", + ["ACT_FOURTEEN_DESC_5"] = "¡Entra el juego para recibir recompensas, y gana recompensas adicionales al desbloquear el Pase de Batalla Premium!", + ["ACT_FOURTEEN_DESC_6"] = "Etapa", + ["ACT_FOURTEEN_DESC_7"] = "Está bloqueado. Por favor vuelve mañana.", + ["ACT_FOURTEEN_DESC_8"] = "Tras completar todas las misiones en la etapa actual, podrá obtener:", + ["ACT_FOURTEEN_DESC_9"] = "Durante el evento, se puede obtener [Puntos de desafío] completando Desafío Avanzado.", + ["ACT_BOSS_RUSH_DESC_1"] = "¿Quieres entrar en combate con {0} diamantes?", + ["ACT_BOSS_RUSH_DESC_2"] = "Abierto de Jefes", + ["ACT_BOSS_RUSH_DESC_3"] = "El maestro de hoy", + ["ACT_BOSS_RUSH_DESC_4"] = "Mi récord de hoy:", + ["ACT_BOSS_RUSH_DESC_5"] = "Mis desafíos de hoy: {0}", + ["ACT_BOSS_RUSH_DESC_6"] = "จำนวนวันนี้:{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "Consumo:", + ["ACT_BOSS_RUSH_DESC_8"] = "Vacante", + ["ACT_BOSS_RUSH_DESC_9"] = "Alineación", + ["ACT_BOSS_RUSH_DESC_10"] = "Clasificación", + ["ACT_BOSS_RUSH_DESC_11"] = "Desfile de Jefes", + ["ACT_BOSS_RUSH_DESC_12"] = "Tienda del Evento", + ["ACT_BOSS_RUSH_DESC_13"] = "¡Participa en torneos abiertos y desafía a los jefes!¡Gana héroes raros de clase S!", + ["ACT_BOSS_RUSH_DESC_14"] = "Ir ahora", + ["ACT_BOSS_RUSH_DESC_15"] = "Desfile de Jefes", + ["ACT_BOSS_RUSH_DESC_16"] = "Acumula las ondas de desafíos del Abierto para recibir recompensas de Desfile de Jefes.", + ["ACT_BOSS_RUSH_DESC_17"] = "Obtén [Monedas de Jefe] en Desfile de Jefes para canjearlas por recompensas. Cuando termina el evento, las [Monedas de Jefe] serán recicladas. No olvides de canjearlas a tiempo.", + ["ACT_BOSS_RUSH_DESC_18"] = "Canjear", + ["ACT_BOSS_RUSH_DESC_19"] = "Chances Restantes:{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "Ayer", + ["ACT_BOSS_RUSH_DESC_21"] = "Hoy", + ["ACT_BOSS_RUSH_DESC_22"] = "Recompensa", + ["ACT_BOSS_RUSH_DESC_23"] = "Clasificación:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "Clasificación", + ["ACT_BOSS_RUSH_DESC_25"] = "Jugador", + ["ACT_BOSS_RUSH_DESC_26"] = "Récord", + ["ACT_BOSS_RUSH_DESC_27"] = "1.La clasificación se basará en el número máximo de ondas del día. Para los jugadores con el mismo número de ondas, se compararán el número menor de rondas. \2.La clasificación se restablecerá a las 0:00 (UTC-0) todos los días y, tras el restablecimiento, podrás colectar las recompensas según la clasificación del día anterior. Las recompensas no colectadas no serán reemitidas.", + ["ACT_BOSS_RUSH_DESC_28"] = "Nuevo Récord", + ["ACT_BOSS_RUSH_DESC_29"] = "Puntos de Desfile", + ["ACT_BOSS_RUSH_DESC_30"] = "Desafío completado", + ["ACT_BOSS_RUSH_DESC_31"] = "1. El orden de aparición de los jefes y del mapa cambian diariamente. \n2. Cuando comienza la batalla, las habilidades de tu héroe se activan por defecto, pero las habilidades reforzadas requieren mejoras, hasta 40 niveles dentro de la batalla. \n3. Las habilidades de refuerzo de atributos superpuestos pueden entrar en vigor hasta 10 veces. \n4. La clasificación del Abierto se calcula diariamente, y se otorgará una gran cantidad de [Monedas de Jefe], que se puede utilizar en la tienda del evento para canjear por recompensas. \n5. Las recompensas del Desfile de Jefes se basa en el número acumulado de ondas participadas en las batallas del Abierto. \n6. Puedes desafiar gratuitamente una vez al día, y los desafíos posteriores requieren diamantes. Prepárate antes de empezar un desafío adicional.", + ["ACT_BOSS_RUSH_DESC_32"] = "¡Paquete especial de tiempo limitado!", + ["ACT_BOSS_RUSH_DESC_33"] = "Desbloqueo de la etapa {0}", + ["NOT_POP_TODAY"] = "No más notas por hoy", + ["ACT_BOSS_RUSH_DESC_34"] = "¿Después de la salida, la batalla se liquidará de acuerdo con la ola actual, ¿ se retirará?", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index a45d2cf3..8e705946 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="Héroe Épico aleatorio", ["desc"]="Al obtener por lote, solo aparecerá uno de los siguientes héroes" }, + [51]={ + ["name"]="Puntos de Desafío", + ["desc"]="Los Puntos de Desafío se pueden canjear por recompensas en Desafío Avanzado por tiempo limitado." + }, + [52]={ + ["name"]="Monedas de Jefe", + ["desc"]="Las Monedas de Jefe se pueden canjear por recompensas en la tienda del evento Abierto de Jefes." + }, + [53]={ + ["name"]="Marco de avatar de plata Temporada S3", + ["desc"]="Marco de avatar de plata Temporada S3, símbolo de valentía." + }, + [54]={ + ["name"]="Marco de avatar de oro Temporada S3", + ["desc"]="Marco de avatar de oro Temporada S3, prueba de fuerza." + }, [1001]={ ["name"]="Meteorito Opaco", ["desc"]="Un trozo de meteorito opaco que contiene energía misteriosa." @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/task_type.lua b/lua/app/config/strings/es/task_type.lua new file mode 100644 index 00000000..457a8b13 --- /dev/null +++ b/lua/app/config/strings/es/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="Anuncios vistos" + }, + [2]={ + ["desc"]="Obtener monedas" + }, + [3]={ + ["desc"]="Obtener diamantes" + }, + [4]={ + ["desc"]="Gastar monedas" + }, + [5]={ + ["desc"]="Gastar diamantes" + }, + [6]={ + ["desc"]="Abre cualquier cofre de la Tienda" + }, + [7]={ + ["desc"]="Abre un cofre épico de la Tienda" + }, + [8]={ + ["desc"]="Enciende la lámpara de habilidad en la fase." + }, + [9]={ + ["desc"]="Gana un combate" + }, + [10]={ + ["desc"]="Mejora tus héroes" + }, + [11]={ + ["desc"]="Obtiene fragmentos de héroes" + }, + [12]={ + ["desc"]="Mata al jefe" + }, + [13]={ + ["desc"]="Mata los monstruos" + }, + [14]={ + ["desc"]="Elementos eliminados" + }, + [15]={ + ["desc"]="Eliminaciones de 6 objetos" + }, + [16]={ + ["desc"]="Eliminaciones de 8 objetos" + }, + [17]={ + ["desc"]="Número de 10 o más hits en un combate" + }, + [18]={ + ["desc"]="Número de habilidades lanzadas en un combate" + }, + [19]={ + ["desc"]="Ondas de combates completadas" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="Acumular {0} dia de check-in" + }, + [23]={ + ["desc"]="Atingir nível {0}" + }, + [24]={ + ["desc"]="Passar pelo Capítulo {0} da campanha principal" + }, + [25]={ + ["desc"]="Nível máximo do herói atingir {0}" + }, + [26]={ + ["desc"]="Gastar {0} pontos de energia" + }, + [27]={ + ["desc"]="Possuir {0} heróis" + }, + [28]={ + ["desc"]="Abrir {0} baú comum" + }, + [29]={ + ["desc"]="Abrir {0} baú valioso" + }, + [30]={ + ["desc"]="Desafíos de Arena" + }, + [31]={ + ["desc"]="Alcanza {0} en la Arena" + }, + [32]={ + ["desc"]="Completa el Desafío Abisal {0}" + }, + [33]={ + ["desc"]="Completa fases 3 a 6 de Grieta de Tiempo" + }, + [34]={ + ["desc"]="Completa Interceptación de Vagoneta" + }, + [35]={ + ["desc"]="Completa Torre de Genio de Lámpara" + }, + [36]={ + ["desc"]="{0} victorias en desafíos diarios" + }, + [37]={ + ["desc"]="Abre {0} cofres de línea principal" + }, + [38]={ + ["desc"]="Mejora armas {0} veces" + }, + [39]={ + ["desc"]="Mejora armadura {0} veces" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/es/task_type.lua.meta b/lua/app/config/strings/es/task_type.lua.meta new file mode 100644 index 00000000..050239c8 --- /dev/null +++ b/lua/app/config/strings/es/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 34df813ee2b77d349b67572822b40e7e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/avatar.lua b/lua/app/config/strings/fr/avatar.lua index 9e50f952..e55df79f 100644 --- a/lua/app/config/strings/fr/avatar.lua +++ b/lua/app/config/strings/fr/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ + }, + [1400101]={ + } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar_frame.lua b/lua/app/config/strings/fr/avatar_frame.lua index 924596db..43ceb019 100644 --- a/lua/app/config/strings/fr/avatar_frame.lua +++ b/lua/app/config/strings/fr/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ + }, + [28]={ + + }, + [29]={ + } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index 1e181bdd..cdc4654a 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -139,6 +139,18 @@ local item = { }, [47]={ + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + }, [1001]={ @@ -334,6 +346,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/task_type.lua b/lua/app/config/strings/fr/task_type.lua new file mode 100644 index 00000000..c087d8bf --- /dev/null +++ b/lua/app/config/strings/fr/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/task_type.lua.meta b/lua/app/config/strings/fr/task_type.lua.meta new file mode 100644 index 00000000..921a770a --- /dev/null +++ b/lua/app/config/strings/fr/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9bee2ea317c2e364d8ebe91c5c217a76 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua index cde4380c..6f29e561 100644 --- a/lua/app/config/strings/id/avatar.lua +++ b/lua/app/config/strings/id/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="Dapat setelah lolos Tarian Anggun" + }, + [1400101]={ + ["desc"]="Armor Relik" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar_frame.lua b/lua/app/config/strings/id/avatar_frame.lua index bf1de6b5..43d6503a 100644 --- a/lua/app/config/strings/id/avatar_frame.lua +++ b/lua/app/config/strings/id/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="Bingkai Avatar Emas Arena S2.Pahlawan mulia." + }, + [28]={ + ["desc"]="Bingkai Avatar Silver S3. Simbol keberanian." + }, + [29]={ + ["desc"]="Bingkai Avatar Emas S3. Bukti kekuatan!" } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua index 2ccf97f2..4c8cd9fb 100644 --- a/lua/app/config/strings/id/buff.lua +++ b/lua/app/config/strings/id/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="Lahir Kembali", + ["desc"]="Lahir Kembali: Kelahiran kembali dipicu dan memulihkan HP jika dikalahkan selama durasi, dan juga memulihkan HP jika tidak dipicu di akhir giliran.", + ["tips_desc"]="Lahir Kembali: Kelahiran kembali dipicu dan memulihkan HP jika dikalahkan selama durasi, dan juga memulihkan HP jika tidak dipicu di akhir giliran.", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="Perisai Samudra", + ["desc"]="Perisai Samudra: Menahan sejumlah DMG dan kebal terhadap semua efek negatif.", + ["tips_desc"]="Perisai Samudra: Menahan sejumlah DMG dan kebal terhadap semua efek negatif.", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="Pemulihan Diri", + ["desc"]="Pemulihan Diri: Mengembalikan HP di akhir giliran.", + ["tips_desc"]="Pemulihan Diri: Mengembalikan HP di akhir giliran.", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index 2a87a07f..e9827831 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "Hadiah Promosi", ["ARENA_DESC_41"] = "Hadiah Penyelesaian", ["ARENA_DESC_42"] = "Hadiah yang belum diklaim", - ["EQUIP_DESC_26"] = "Pack Peningkatan Senjata Lv.{0}", ["EQUIP_DESC_27"] = "Pack upgrade Armor Lv.{0}", + ["EQUIP_DESC_28"] = "Pack Peningkatan Senjata Lv.{0}", ["SEIZED_DESC_1"] = "Telah terdeteksi kondisi tidak normal pada akunmuu. Silakan hubungi layanan pelanggan atau hapus akun, dan gunakan akun baru untuk melanjutkan permainan.", ["SEIZED_DESC_2"] = "Hubungi Layanan Pelanggan", ["SEIZED_DESC_3"] = "Hapus Akun", + ["ACT_FOURTEEN_TITLE_1"] = "Hadiah Login", + ["ACT_FOURTEEN_TITLE_2"] = "Tantangan Advanced", + ["ACT_FOURTEEN_TITLE_3"] = "Penukaran Berbatas Waktu", + ["ACT_FOURTEEN_TITLE_4"] = "Pack Berbatas Waktu", + ["ACT_FOURTEEN_DESC_1"] = "Login game dan nikmati hadiah menarik!", + ["ACT_FOURTEEN_DESC_2"] = "Tantang diri sendiri dan dapatkan lebih banyak hadiah!", + ["ACT_FOURTEEN_DESC_3"] = "Waktu tidak menunggu siapa pun, dan kesempatan tidak akan datang dua kali!", + ["ACT_FOURTEEN_DESC_5"] = "Login untuk klaim hadiah dan dapatkan hadiah tambahan dengan membuka Pass Premium!", + ["ACT_FOURTEEN_DESC_6"] = "Stage", + ["ACT_FOURTEEN_DESC_7"] = "Terkunci. Silakan kembali lagi besok!", + ["ACT_FOURTEEN_DESC_8"] = "Selesaikan semua quest di stage saat ini bisa mendapatkan:", + ["ACT_FOURTEEN_DESC_9"] = "Selama periode acara, [Poin Tantangan] dapat diperoleh dengan menyelesaikan Tantangan Advanced.", + ["ACT_BOSS_RUSH_DESC_1"] = "Gunakan {0} berlian untuk battle?", + ["ACT_BOSS_RUSH_DESC_2"] = "Kejuaraan Boss", + ["ACT_BOSS_RUSH_DESC_3"] = "Master hari ini", + ["ACT_BOSS_RUSH_DESC_4"] = "Tertinggi hari ini:", + ["ACT_BOSS_RUSH_DESC_5"] = "Tantangan hari ini: {0} kali", + ["ACT_BOSS_RUSH_DESC_6"] = "今日次數：{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "Biaya:", + ["ACT_BOSS_RUSH_DESC_8"] = "Kosong", + ["ACT_BOSS_RUSH_DESC_9"] = "Line-up", + ["ACT_BOSS_RUSH_DESC_10"] = "Papan Peringkat", + ["ACT_BOSS_RUSH_DESC_11"] = "Parade Boss", + ["ACT_BOSS_RUSH_DESC_12"] = "Mall Event", + ["ACT_BOSS_RUSH_DESC_13"] = "Berpartisipasilah dalam kejuaraan untuk menantang Boss!Menangkan Hero S langka!!", + ["ACT_BOSS_RUSH_DESC_14"] = "Pergi", + ["ACT_BOSS_RUSH_DESC_15"] = "Parade Boss", + ["ACT_BOSS_RUSH_DESC_16"] = "Tantang sejumlah kejuaraan Boss untuk mendapatkan hadiah Parade Boss.", + ["ACT_BOSS_RUSH_DESC_17"] = "Dapatkan [Koin Boss] di Parade Boss untuk ditukar dengan hadiah. [Koin Boss] dapat diklaim kembali setelah event berakhir. Harap tukarkan tepat waktu.", + ["ACT_BOSS_RUSH_DESC_18"] = "Tukar", + ["ACT_BOSS_RUSH_DESC_19"] = "Sisa:{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "Kemarin", + ["ACT_BOSS_RUSH_DESC_21"] = "Hari ini", + ["ACT_BOSS_RUSH_DESC_22"] = "Hadiah", + ["ACT_BOSS_RUSH_DESC_23"] = "Rank:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "Rank", + ["ACT_BOSS_RUSH_DESC_25"] = "Pemain", + ["ACT_BOSS_RUSH_DESC_26"] = "Log", + ["ACT_BOSS_RUSH_DESC_27"] = "1. Peringkat akan didasarkan pada gelombang tertinggi yang dicapai pada hari tertentu, dan jika beberapa pemain memiliki gelombang yang sama, perbandingan akan didasarkan pada jumlah putaran terendah yang dilakukan. \n2. Peringkat direset setiap hari pada pukul 00:00 UTC, lalu dapat klaim hadiah berdasarkan peringkatmu dari hari sebelumnya. Hadiah yang tidak diklaim tidak akan diterbitkan kembali.", + ["ACT_BOSS_RUSH_DESC_28"] = "Log Baru", + ["ACT_BOSS_RUSH_DESC_29"] = "Poin Parade", + ["ACT_BOSS_RUSH_DESC_30"] = "Tatangan selesai", + ["ACT_BOSS_RUSH_DESC_31"] = "1. Urutan kemunculan Boss dan peta akan berubah setiap hari. \n2. Saat battle dimulai, skill Hero diaktifkan, tapi skill yang ditingkatkan perlu diupgrade hingga Lv. 40 dalam battle. \n3. Kemampuan yang meningkat dengan atribut yang terkumpul dapat mengambil efek sampai 10 kali. \n4. Peringkat kejuaraan akan dihitung 1x per hari, dan kamu akan mendapat [Koin Boss] yang dapat ditukarkan dengan hadiah di toko event. \n5. Parade Boss akan memberikan hadiah berdasarkan gelombang kumulatif battle yang diikuti selama kejuaraan. \n6. Dapat menantang sekali secara gratis setiap hari, dan tantangan selanjutnya akan mengonsumsi Berlian.", + ["ACT_BOSS_RUSH_DESC_32"] = "Paket waktu terbatas yang sangat bermanfaat!", + ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} membuka kunci", + ["NOT_POP_TODAY"] = "Jangan ingatkan lagi hari ini", + ["ACT_BOSS_RUSH_DESC_34"] = "Setelah keluar, pertempuran akan diselesaikan menurut gelombang saat ini. Apakah Anda ingin keluar?", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index c09cc6e1..a0d26781 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="Hero Epik acak", ["desc"]="Hanya satu dari Hero berikut yang akan muncul secara acak saat dapat dalam jumlah banyak." }, + [51]={ + ["name"]="Poin Tantangan", + ["desc"]="Poin Tantangan dapat ditukarkan hadiah Tantangan Advanced berbatas waktu." + }, + [52]={ + ["name"]="Koin Boss", + ["desc"]="Koin Boss dapat ditukarkan hadiah di toko event Kejuaraan Boss." + }, + [53]={ + ["name"]="Bingkai Avatar Silver Musim S3", + ["desc"]="Bingkai Avatar Silver S3. Simbol keberanian." + }, + [54]={ + ["name"]="Bingkai Avatar Emas Musim S3", + ["desc"]="Bingkai Avatar Emas S3. Bukti kekuatan!" + }, [1001]={ ["name"]="Chondrite", ["desc"]="Meteorit redup yang menyimpan energi misterius." @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/task_type.lua b/lua/app/config/strings/id/task_type.lua new file mode 100644 index 00000000..e6bbdfb7 --- /dev/null +++ b/lua/app/config/strings/id/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="Iklan ditonton" + }, + [2]={ + ["desc"]="Dapat Koin" + }, + [3]={ + ["desc"]="Dapat Berlian" + }, + [4]={ + ["desc"]="Konsumsi Koin" + }, + [5]={ + ["desc"]="Konsumsi Berlian" + }, + [6]={ + ["desc"]="Buka peti harta di Mall" + }, + [7]={ + ["desc"]="Buka peti epik di Mall" + }, + [8]={ + ["desc"]="Nyalakan lampu skill di level" + }, + [9]={ + ["desc"]="Memenangkan Battle" + }, + [10]={ + ["desc"]="Upgrade Hero" + }, + [11]={ + ["desc"]="Dapatkan Shard Hero" + }, + [12]={ + ["desc"]="Bunuh Boss" + }, + [13]={ + ["desc"]="Bunuh Minion" + }, + [14]={ + ["desc"]="Hapus elemen" + }, + [15]={ + ["desc"]="6x Hapus" + }, + [16]={ + ["desc"]="8x Hapus" + }, + [17]={ + ["desc"]="10 Kombo atau lebih dalam battle" + }, + [18]={ + ["desc"]="Skill yang dilepaskan dalam battle" + }, + [19]={ + ["desc"]="Hapus gelombang battle" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="Total Sign-in {0} hari" + }, + [23]={ + ["desc"]="Capai Lv.{0}" + }, + [24]={ + ["desc"]="Lolos Quest Utama Bab {0}" + }, + [25]={ + ["desc"]="Level max Hero mencapai {0}" + }, + [26]={ + ["desc"]="Konsumsi {0} poin Energi" + }, + [27]={ + ["desc"]="Punya {0} Hero" + }, + [28]={ + ["desc"]="Membuka Peti Umum {0} kali" + }, + [29]={ + ["desc"]="Membuka Peti Premium {0} kali" + }, + [30]={ + ["desc"]="Jumlah tantangan arena" + }, + [31]={ + ["desc"]="Raih {0} di Arena" + }, + [32]={ + ["desc"]="Lolos Tantangan Abyssal {0}" + }, + [33]={ + ["desc"]="Lolos Celah Waktu {0}-{1}" + }, + [34]={ + ["desc"]="Lolos Mencegat Kereta Tambang {0}" + }, + [35]={ + ["desc"]="Lolos Menara Lumen {0}" + }, + [36]={ + ["desc"]="Menang Tantangan Harian {0} kali" + }, + [37]={ + ["desc"]="Buka {0} Peti Quest Utama" + }, + [38]={ + ["desc"]="Upgrade senjata {0} kali" + }, + [39]={ + ["desc"]="Upgrade Armor {0} kali" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/task_type.lua.meta b/lua/app/config/strings/id/task_type.lua.meta new file mode 100644 index 00000000..9355e21e --- /dev/null +++ b/lua/app/config/strings/id/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 10f39500da2f33f49b932f55ded99502 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua index c14c66d4..ef9960af 100644 --- a/lua/app/config/strings/ja/avatar.lua +++ b/lua/app/config/strings/ja/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="グレイスフルダンスをアクティブ化後獲得できる。" + }, + [1400101]={ + ["desc"]="レリックアーマー" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar_frame.lua b/lua/app/config/strings/ja/avatar_frame.lua index 57c5abb8..f81b1f09 100644 --- a/lua/app/config/strings/ja/avatar_frame.lua +++ b/lua/app/config/strings/ja/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="S2闘技場ゴールドフレーム。ヒーローの輝き。" + }, + [28]={ + ["desc"]="S3闘技場シルバーフレーム。勇気の証。" + }, + [29]={ + ["desc"]="S3闘技場ゴールドフレーム。実力の証。" } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua index 8dd6a504..af276468 100644 --- a/lua/app/config/strings/ja/buff.lua +++ b/lua/app/config/strings/ja/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="再生", + ["desc"]="再生：持続期間中に撃破されると、再生を発動してHPを回復する。ターン終了時に再生を発動してもHPが回復される。", + ["tips_desc"]="再生：持続期間中に撃破されると、再生を発動してHPを回復する。ターン終了時に再生を発動してもHPが回復される。", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="オーシャンシールド", + ["desc"]="オーシャンシールド：一定量のダメージには耐えられ、全てのデバフ効果を無効化する。", + ["tips_desc"]="オーシャンシールド：一定量のダメージには耐えられ、全てのデバフ効果を無効化する。", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="自己回復", + ["desc"]="自己回復：ターン終了時にHPを回復する。", + ["tips_desc"]="自己回復：ターン終了時にHPを回復する。", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index 75b48475..4c47313c 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "ランクアップ報酬", ["ARENA_DESC_41"] = "決算報酬", ["ARENA_DESC_42"] = "未受取の報酬", - ["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック", ["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック", + ["EQUIP_DESC_28"] = "武器Lv{0}レベルアップパック", ["SEIZED_DESC_1"] = "アカウントに異常が検出されました。サポートセンターに連絡するか、アカウントを削除し、新しいアカウントを作成してゲームを続行してください。", ["SEIZED_DESC_2"] = "サポートセンターに連絡する", ["SEIZED_DESC_3"] = "アカウントを削除する", + ["ACT_FOURTEEN_TITLE_1"] = "ログインボーナス", + ["ACT_FOURTEEN_TITLE_2"] = "ランクアップ挑戦", + ["ACT_FOURTEEN_TITLE_3"] = "期間限定交換", + ["ACT_FOURTEEN_TITLE_4"] = "期間限定パック", + ["ACT_FOURTEEN_DESC_1"] = "ログインすると、豪華なボーナスを獲得可能！", + ["ACT_FOURTEEN_DESC_2"] = "自分自身に挑戦して、豪華な報酬をゲットしよう！", + ["ACT_FOURTEEN_DESC_3"] = "期間限定、お見逃しなく！", + ["ACT_FOURTEEN_DESC_5"] = "ログインすると報酬を獲得できます。プレミアム戦令を解放すると、追加報酬も獲得できます！", + ["ACT_FOURTEEN_DESC_6"] = "ステージ", + ["ACT_FOURTEEN_DESC_7"] = "未解放、明日また来てください~", + ["ACT_FOURTEEN_DESC_8"] = "現在のステージのすべてのミッションを完了すると、以下を獲得可能：", + ["ACT_FOURTEEN_DESC_9"] = "イベント期間中、ランクアップ挑戦を完了すると、【挑戦ポイント】を獲得できる。", + ["ACT_BOSS_RUSH_DESC_1"] = "{0}ダイヤを消費して、バトルを開始しますか？", + ["ACT_BOSS_RUSH_DESC_2"] = "ボス選手権大会", + ["ACT_BOSS_RUSH_DESC_3"] = "今日のマスター", + ["ACT_BOSS_RUSH_DESC_4"] = "自分の本日最高：", + ["ACT_BOSS_RUSH_DESC_5"] = "今日の挑戦回数：{0}回", + ["ACT_BOSS_RUSH_DESC_6"] = "Attempts Today:{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "消費：", + ["ACT_BOSS_RUSH_DESC_8"] = "データありません", + ["ACT_BOSS_RUSH_DESC_9"] = "ラインナップ", + ["ACT_BOSS_RUSH_DESC_10"] = "ランキング", + ["ACT_BOSS_RUSH_DESC_11"] = "ボスパレード", + ["ACT_BOSS_RUSH_DESC_12"] = "イベントショップ", + ["ACT_BOSS_RUSH_DESC_13"] = "選手権大会に参加して、様々なボスに挑戦しよう！レアS級ヒーローをゲットしよう！！", + ["ACT_BOSS_RUSH_DESC_14"] = "移動", + ["ACT_BOSS_RUSH_DESC_15"] = "ボスパレード", + ["ACT_BOSS_RUSH_DESC_16"] = "選手権大会の挑戦回数を貯めると、ボスパレード報酬を獲得できます。", + ["ACT_BOSS_RUSH_DESC_17"] = "ボスパレードで【ボスコイン】を獲得し、報酬と交換できます。イベント終了後、【ボスコイン】は回収されますので、お早めに交換してください。", + ["ACT_BOSS_RUSH_DESC_18"] = "交換", + ["ACT_BOSS_RUSH_DESC_19"] = "残りの回数：{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "昨日", + ["ACT_BOSS_RUSH_DESC_21"] = "今日", + ["ACT_BOSS_RUSH_DESC_22"] = "報酬", + ["ACT_BOSS_RUSH_DESC_23"] = "ランキング:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "ランキング", + ["ACT_BOSS_RUSH_DESC_25"] = "プレーヤー", + ["ACT_BOSS_RUSH_DESC_26"] = "記録", + ["ACT_BOSS_RUSH_DESC_27"] = "1.ランキングは当日最大回数によって作成され、回数が同じのプレーヤーは最小ラウンド数を比較します。\n2.ランキングは毎日の0時（UTC-0）にリセットされます。リセット後、前日のランキングに応じて報酬を獲得できます。報酬の有効期限が過ぎても受け取らなかった場合、報酬は再発行されません。", + ["ACT_BOSS_RUSH_DESC_28"] = "新記録", + ["ACT_BOSS_RUSH_DESC_29"] = "パレードポイント", + ["ACT_BOSS_RUSH_DESC_30"] = "挑戦完了", + ["ACT_BOSS_RUSH_DESC_31"] = "1.ボスの登場順とマップは毎日変わります。\n2.バトル開始後、ヒーローのスキルはデフォルトで解放されますが、強化スキルを獲得するにはレベルアップが必要です。バトル中最大40級までレベルアップできます。\n3.属性を重ねた強化スキルは、最大10回有効になります。\n4.選手権大会のランキングは1日1回決算され、決算完了後に大量の【ボスコイン】を獲得でき、イベントショップで報酬と交換できます。\n5.ボスパレードでは、選手権大会で参加したバトルの回数に応じて報酬を獲得できます。\n6.1日1回無料で挑戦でき、それ以降の挑戦にはダイヤを消費する必要があります。きちんと準備して挑戦を開始しましょう。", + ["ACT_BOSS_RUSH_DESC_32"] = "報酬の高い期間限定パック！", + ["ACT_BOSS_RUSH_DESC_33"] = "フェーズ{0}ロック解除", + ["NOT_POP_TODAY"] = "今日は見ない", + ["ACT_BOSS_RUSH_DESC_34"] = "撤退後は、現在の波次決済に従って戦いますが、撤退しますか？", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 2081d0ac..6ed6297e 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="ランダムエピックヒーロー", ["desc"]="一括獲得の時、以下のいずれかのヒーロー1名をランダムで獲得できる。" }, + [51]={ + ["name"]="挑戦ポイント", + ["desc"]="挑戦ポイント、ランクアップ挑戦で期間限定報酬と交換できる。" + }, + [52]={ + ["name"]="ボスコイン", + ["desc"]="ボスコイン、ボス選手権大会のイベントショップで報酬と交換できる。" + }, + [53]={ + ["name"]="S3シーズンシルバーフレーム", + ["desc"]="S3闘技場シルバーフレーム。勇気の証。" + }, + [54]={ + ["name"]="S3シーズンゴールドフレーム", + ["desc"]="S3闘技場ゴールドフレーム。実力の証。" + }, [1001]={ ["name"]="薄暗い隕石", ["desc"]="謎のエネルギーを秘めた隕石。" @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/task_type.lua b/lua/app/config/strings/ja/task_type.lua new file mode 100644 index 00000000..0c353a3f --- /dev/null +++ b/lua/app/config/strings/ja/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="合計CM視聴回数" + }, + [2]={ + ["desc"]="コインを入手する" + }, + [3]={ + ["desc"]="ダイヤを入手する" + }, + [4]={ + ["desc"]="コインを消費する" + }, + [5]={ + ["desc"]="ダイヤを消費する" + }, + [6]={ + ["desc"]="ショップでいずれの宝箱を開ける" + }, + [7]={ + ["desc"]="ショップでエピック宝箱を開ける" + }, + [8]={ + ["desc"]="クエスト内でスキルランプを点灯する" + }, + [9]={ + ["desc"]="バトルに勝利する" + }, + [10]={ + ["desc"]="ヒーローをレベルアップする" + }, + [11]={ + ["desc"]="ヒーローピースを入手する" + }, + [12]={ + ["desc"]="ボスを撃破する" + }, + [13]={ + ["desc"]="手下を撃破する" + }, + [14]={ + ["desc"]="合計消した元素" + }, + [15]={ + ["desc"]="6連消しの回数" + }, + [16]={ + ["desc"]="8連消しの回数" + }, + [17]={ + ["desc"]="10連消し回数" + }, + [18]={ + ["desc"]="バトル中スキルを発動する回数" + }, + [19]={ + ["desc"]="波をクリアする回数" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="{0}日ログインする" + }, + [23]={ + ["desc"]="レベル{0}に到達する" + }, + [24]={ + ["desc"]="メインクエスト{0}をクリアする" + }, + [25]={ + ["desc"]="ヒーローがレベル{0}に到達する" + }, + [26]={ + ["desc"]="スタミナを{0}消費する" + }, + [27]={ + ["desc"]="ヒーローを{0}体入手する" + }, + [28]={ + ["desc"]="普通の宝箱を{0}箱開ける" + }, + [29]={ + ["desc"]="貴重の宝箱を{0}箱開ける" + }, + [30]={ + ["desc"]="闘技場挑戦回数" + }, + [31]={ + ["desc"]="闘技場で{0}に達する" + }, + [32]={ + ["desc"]="アビス挑戦で{0}をクリアする" + }, + [33]={ + ["desc"]="時空の裂け目{0}-{1}をクリアする" + }, + [34]={ + ["desc"]="トロッコを阻む{0}をクリアする" + }, + [35]={ + ["desc"]="ランプの魔神の塔{0}をクリアする" + }, + [36]={ + ["desc"]="デイリー挑戦で{0}回勝利する" + }, + [37]={ + ["desc"]="メインストーリー宝箱を{0}個開ける" + }, + [38]={ + ["desc"]="武器を{0}回レベルアップする" + }, + [39]={ + ["desc"]="防具を{0}回レベルアップする" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/task_type.lua.meta b/lua/app/config/strings/ja/task_type.lua.meta new file mode 100644 index 00000000..dbde0cfb --- /dev/null +++ b/lua/app/config/strings/ja/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 79ef9e9ef8a9dc549ba2e2205713633c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua index a5eaca0f..43b37c0b 100644 --- a/lua/app/config/strings/ko/avatar.lua +++ b/lua/app/config/strings/ko/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="날아오르는 춤(를) 활성화한 후, 획득할 수 있습니다." + }, + [1400101]={ + ["desc"]="유적 갑옷" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar_frame.lua b/lua/app/config/strings/ko/avatar_frame.lua index 88909731..97343e9a 100644 --- a/lua/app/config/strings/ko/avatar_frame.lua +++ b/lua/app/config/strings/ko/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="S2 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다." + }, + [28]={ + ["desc"]="S3 아레나 실버 아이콘 프레임, 용기를 대표합니다." + }, + [29]={ + ["desc"]="S3 아레나 골드 아이콘 프레임, 검증받은 실력입니다." } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua index 18f0344a..5101a916 100644 --- a/lua/app/config/strings/ko/buff.lua +++ b/lua/app/config/strings/ko/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="부활", + ["desc"]="부활: 지속 시간 동안 패배하면 부활하여 HP를 회복하며 턴 종료 시 부활이 발동되지 않아도 HP를 회복합니다.", + ["tips_desc"]="부활: 지속 시간 동안 패배하면 부활하여 HP를 회복하며 턴 종료 시 부활이 발동되지 않아도 HP를 회복합니다.", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="해양 방패", + ["desc"]="해양 방패: 일정량의 피해를 감내하고 모든 부정적인 효과에 면역이 됩니다.", + ["tips_desc"]="해양 방패: 일정량의 피해를 감내하고 모든 부정적인 효과에 면역이 됩니다.", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="자가 치유", + ["desc"]="자가 치유: 턴이 끝날 때 HP를 회복합니다.", + ["tips_desc"]="자가 치유: 턴이 끝날 때 HP를 회복합니다.", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index 8c6a59c2..659d1489 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "승급 보상", ["ARENA_DESC_41"] = "정산 보상", ["ARENA_DESC_42"] = "미수령 보상", - ["EQUIP_DESC_26"] = "무기 {0}레벨 업그레이드 패키지", ["EQUIP_DESC_27"] = "방어구 {0}레벨 업그레이드 패키지", + ["EQUIP_DESC_28"] = "무기 {0}레벨 업그레이드 패키지", ["SEIZED_DESC_1"] = "계정에 이상이 발견되었습니다. 문제 해결을 위해 고객 서비스에 문의하거나 계정을 삭제하시고 새 계정을 사용하여 게임을 계속 진행하시기 바랍니다.", ["SEIZED_DESC_2"] = "고객 서비스 문의", ["SEIZED_DESC_3"] = "계정 삭제", + ["ACT_FOURTEEN_TITLE_1"] = "로그인 선물", + ["ACT_FOURTEEN_TITLE_2"] = "고급 도전", + ["ACT_FOURTEEN_TITLE_3"] = "기간 한정 교환", + ["ACT_FOURTEEN_TITLE_4"] = "한정 시간 패키지", + ["ACT_FOURTEEN_DESC_1"] = "게임에 로그인하고 푸짐한 보상을 획득하세요!", + ["ACT_FOURTEEN_DESC_2"] = "멈추지 않는 도전으로 더 많은 선물을 받으세요!", + ["ACT_FOURTEEN_DESC_3"] = "시간은 사람을 기다리지 않고 기회는 다시 오지 않습니다!", + ["ACT_FOURTEEN_DESC_5"] = "로그인하면 즉시 보상을 받을 수 있습니다. 고급 배틀 패스를 해제하여 추가 보상을 받으세요!", + ["ACT_FOURTEEN_DESC_6"] = "스테이지", + ["ACT_FOURTEEN_DESC_7"] = "아직 잠겨 있습니다. 내일 다시 시도하세요~", + ["ACT_FOURTEEN_DESC_8"] = "현재 스테이지의 모든 퀘스트를 완료하면 획득 가능:", + ["ACT_FOURTEEN_DESC_9"] = "이벤트 기간 고급 도전을 완료하면 [도전 포인트]를 획득할 수 있습니다.", + ["ACT_BOSS_RUSH_DESC_1"] = "{0} 다이아를 소모하여 전투에 참여하시겠나요?", + ["ACT_BOSS_RUSH_DESC_2"] = "보스 오픈 토너먼트", + ["ACT_BOSS_RUSH_DESC_3"] = "오늘의 마스터", + ["ACT_BOSS_RUSH_DESC_4"] = "오늘 나의 최고 기록:", + ["ACT_BOSS_RUSH_DESC_5"] = "오늘 도전한 횟수: {0}회", + ["ACT_BOSS_RUSH_DESC_6"] = "今日の回数：{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "소비:", + ["ACT_BOSS_RUSH_DESC_8"] = "비어있음", + ["ACT_BOSS_RUSH_DESC_9"] = "라인업", + ["ACT_BOSS_RUSH_DESC_10"] = "랭킹", + ["ACT_BOSS_RUSH_DESC_11"] = "보스 퍼레이드", + ["ACT_BOSS_RUSH_DESC_12"] = "이벤트 상점", + ["ACT_BOSS_RUSH_DESC_13"] = "오픈 토너먼트에 참가하여 다양한 보스에게 도전해보세요!희귀한 S레벨 영웅을 획득하세요!!", + ["ACT_BOSS_RUSH_DESC_14"] = "바로가기", + ["ACT_BOSS_RUSH_DESC_15"] = "보스 퍼레이드", + ["ACT_BOSS_RUSH_DESC_16"] = "오픈 토너먼트의 챌린지 웨이브를 누적하여 보스 퍼레이드 보상을 받으세요.", + ["ACT_BOSS_RUSH_DESC_17"] = "보스 퍼레이드에서 [보스 코인]을 획득하여 보상으로 교환하세요. 이벤트 종료 후 [보스 코인] 은 회수되므로 빨리 교환하시길 바랍니다.", + ["ACT_BOSS_RUSH_DESC_18"] = "교환", + ["ACT_BOSS_RUSH_DESC_19"] = "남은 횟수:{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "어제", + ["ACT_BOSS_RUSH_DESC_21"] = "오늘", + ["ACT_BOSS_RUSH_DESC_22"] = "보상", + ["ACT_BOSS_RUSH_DESC_23"] = "순위:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "순위", + ["ACT_BOSS_RUSH_DESC_25"] = "플레이어", + ["ACT_BOSS_RUSH_DESC_26"] = "기록", + ["ACT_BOSS_RUSH_DESC_27"] = "1. 랭킹은 당일 최대 웨이브 수에 따라 순위가 결정되며, 같은 웨이브 수를 가진 플레이어들은 최소 라운드 수를 비교합니다. \n2. 랭킹은 매일 0시(UTC-0)에 초기화되며, 그 후 전날의 랭킹 결과에 기반하여 보상을 받을 수 있습니다. 기간이 만료된 후 받지 보상은 다시 지급되지 않습니다.", + ["ACT_BOSS_RUSH_DESC_28"] = "신기록", + ["ACT_BOSS_RUSH_DESC_29"] = "퍼레이드 포인트", + ["ACT_BOSS_RUSH_DESC_30"] = "도전 완료", + ["ACT_BOSS_RUSH_DESC_31"] = "1. 보스 등장 순서와 맵은 매일 달라집니다. \n2. 전투가 시작되면 영웅 스킬은 기본적으로 활성화되지만 강화 스킬은 업그레이드를 통해 획득해야 합니다. 전투에서 최대 40레벨까지 업그레이드할 수 있습니다. \n3. 속성을 중첩하는 강화 스킬, 최대 10회 유효. \n4. 오픈 토너먼트 랭킹은 매일 한번 정산됩니다. 정산 시 대량의 [보스 코인]이 지급되며 이벤트 상점에서 보상으로 교환할 수 있습니다. \n5. 보스 퍼레이드에서는 오픈 토너먼트 전투에 참여한 누적 웨이브 수에 따라 보상이 지급됩니다.\n6. 하루에 한 번 무료로 도전할 수 있으며, 이후 도전에는 다이아가 소모됩니다. 준비가 되면 도전을 시작하세요.", + ["ACT_BOSS_RUSH_DESC_32"] = "고수익 기간 한정 선물 팩!", + ["ACT_BOSS_RUSH_DESC_33"] = "{0}단계 잠금 해제", + ["NOT_POP_TODAY"] = "오늘 더 이상 알림 받지 않음", + ["ACT_BOSS_RUSH_DESC_34"] = "퇴장 후, 현재 라운드 결산에 따라 전투, 퇴장하시겠습니까?", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index 1d38b727..d2f2351e 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="랜덤의 에픽 영웅", ["desc"]="일괄 획득 시 다음 영웅 중 한 명만 무작위로 선택됩니다." }, + [51]={ + ["name"]="도전 포인트", + ["desc"]="도전 포인트, 고급 도전에 참여하여 기간 한정 보상으로 교환할 수 있습니다." + }, + [52]={ + ["name"]="보스 코인", + ["desc"]="보스 오픈 토너먼트 이벤트 상점에서 보상으로 교환할 수 있는 보스 코인" + }, + [53]={ + ["name"]="S3 시즌 실버 아이콘 프레임", + ["desc"]="S3 아레나 실버 아이콘 프레임, 용기를 대표합니다." + }, + [54]={ + ["name"]="S3 시즌 골드 아이콘 프레임", + ["desc"]="S3 아레나 골드 아이콘 프레임, 검증받은 실력입니다." + }, [1001]={ ["name"]="알렌데 운석", ["desc"]="암흑의 운석 한 조각, 신비한 에너지를 품고 있습니다." @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/task_type.lua b/lua/app/config/strings/ko/task_type.lua new file mode 100644 index 00000000..ad71bb8a --- /dev/null +++ b/lua/app/config/strings/ko/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="누적 광고 시청" + }, + [2]={ + ["desc"]="골드 획득하기" + }, + [3]={ + ["desc"]="다이아 얻기" + }, + [4]={ + ["desc"]="골드 소비하기" + }, + [5]={ + ["desc"]="다이아 소모하기" + }, + [6]={ + ["desc"]="상점에서 임의의 보물상자 오픈하기" + }, + [7]={ + ["desc"]="상점에서 에픽 보물상자 오픈하기" + }, + [8]={ + ["desc"]="스테이지에서 스킬 램프 오픈하기" + }, + [9]={ + ["desc"]="전투에서 승리하기" + }, + [10]={ + ["desc"]="영웅을 업그레이드하기" + }, + [11]={ + ["desc"]="영웅 파편 획득하기" + }, + [12]={ + ["desc"]="보스 처치하기" + }, + [13]={ + ["desc"]="미니언 처치하기" + }, + [14]={ + ["desc"]="누적 소멸한 원소" + }, + [15]={ + ["desc"]="6콤보 소멸 횟수" + }, + [16]={ + ["desc"]="8콤보 소멸 횟수" + }, + [17]={ + ["desc"]="전투에서 10연타 이상 공격한 횟수" + }, + [18]={ + ["desc"]="전투에서 스킬을 시전한 횟수" + }, + [19]={ + ["desc"]="클리어한 전투 웨이브 수" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="누적 출석 {0}일" + }, + [23]={ + ["desc"]="레벨 {0}에 도달하기" + }, + [24]={ + ["desc"]="메인라인 챕터{0} 클리어하기" + }, + [25]={ + ["desc"]="영웅 최고 레벨이 {0}에 도달하기" + }, + [26]={ + ["desc"]="체력 {0} 포인트 소모하기" + }, + [27]={ + ["desc"]="{0}명의 영웅 보유하기" + }, + [28]={ + ["desc"]="일반 보물 상자 {0}번 오픈하기" + }, + [29]={ + ["desc"]="귀중한 보물 상자 {0}번 오픈하기" + }, + [30]={ + ["desc"]="아레나 도전 횟수" + }, + [31]={ + ["desc"]="아레나에서 {0} 달성" + }, + [32]={ + ["desc"]="어비스 챌린지 {0} 클리어" + }, + [33]={ + ["desc"]="시공간의 균열 {0}-{1} 클리어" + }, + [34]={ + ["desc"]="트램카 막기 {0} 클리어" + }, + [35]={ + ["desc"]="램프신의 탑 {0} 클리어" + }, + [36]={ + ["desc"]="데일리 챌린지에서 {0}회 승리" + }, + [37]={ + ["desc"]="메인라인 보물 상자 {0}개 오픈" + }, + [38]={ + ["desc"]="무기 업그레이드 {0}회" + }, + [39]={ + ["desc"]="방어구 업그레이드 {0}회" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/task_type.lua.meta b/lua/app/config/strings/ko/task_type.lua.meta new file mode 100644 index 00000000..b795b3a7 --- /dev/null +++ b/lua/app/config/strings/ko/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 013b5d3e9ea538844bf8a3a4dfebfe8c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua index caef2762..5288ae0f 100644 --- a/lua/app/config/strings/pt/avatar.lua +++ b/lua/app/config/strings/pt/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="Ativar Dança Fluida para obter." + }, + [1400101]={ + ["desc"]="Armadura das Ruínas" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar_frame.lua b/lua/app/config/strings/pt/avatar_frame.lua index 14a6246e..b8057287 100644 --- a/lua/app/config/strings/pt/avatar_frame.lua +++ b/lua/app/config/strings/pt/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="Moldura de avatar de ouro da Arena S2, o brilho de um herói." + }, + [28]={ + ["desc"]="Moldura de avatar de prata da Arena S3, um símbolo de coragem." + }, + [29]={ + ["desc"]="Moldura de avatar de ouro da Arena S3, uma testemunha do poder." } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua index 8bde60c1..d96608ab 100644 --- a/lua/app/config/strings/pt/buff.lua +++ b/lua/app/config/strings/pt/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="Renascimento", + ["desc"]="Renascimento: ser derrotado enquanto o efeito durar desencadeará o renascimento e restaurará a vida. A vida também é restaurada se o renascimento não for acionado no final do turno.", + ["tips_desc"]="Renascimento: ser derrotado enquanto o efeito durar desencadeará o renascimento e restaurará a vida. A vida também é restaurada se o renascimento não for acionado no final do turno.", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="Escudo Marinho", + ["desc"]="Escudo Marinho: pode aguentar uma certa quantidade de dano e garantir imunidade a todas as penalidades.", + ["tips_desc"]="Escudo Marinho: pode aguentar uma certa quantidade de dano e garantir imunidade a todas as penalidades.", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="Autocura", + ["desc"]="Autocura: Restaura a vida no final do turno.", + ["tips_desc"]="Autocura: Restaura a vida no final do turno.", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index 64419409..9d4853ce 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "Recompensas pela subida de ranque", ["ARENA_DESC_41"] = "Recompensas de classificação", ["ARENA_DESC_42"] = "Recompensas não coletadas", - ["EQUIP_DESC_26"] = "Pacote de Melhoria de Arma a Nv.{0}", ["EQUIP_DESC_27"] = "Pacote de Melhoria de Armadura a Nv.{0}", + ["EQUIP_DESC_28"] = "Pacote de Melhoria de Arma a Nv.{0}", ["SEIZED_DESC_1"] = "Foi detectada alguma anormalidade com sua conta. Entre em contato com o atendimento ao cliente ou exclua a conta atual e crie uma nova conta para continuar jogando.", ["SEIZED_DESC_2"] = "Atendimento ao Cliente", ["SEIZED_DESC_3"] = "Excluir Conta", + ["ACT_FOURTEEN_TITLE_1"] = "Presente de Login", + ["ACT_FOURTEEN_TITLE_2"] = "Desafio de Avanço", + ["ACT_FOURTEEN_TITLE_3"] = "Resgate por Tempo Limitado", + ["ACT_FOURTEEN_TITLE_4"] = "Pacote por Tempo Limitado", + ["ACT_FOURTEEN_DESC_1"] = "Entre no jogo para receber presentes!", + ["ACT_FOURTEEN_DESC_2"] = "Desafie-se e receberá mais presentes!", + ["ACT_FOURTEEN_DESC_3"] = "É uma oportunidade única que não retorna!", + ["ACT_FOURTEEN_DESC_5"] = "Entre no jogo para receber recompensas e ganhará extras após desbloquear o Passe Premium!", + ["ACT_FOURTEEN_DESC_6"] = "Estágio", + ["ACT_FOURTEEN_DESC_7"] = "Bloqueado. Volte amanhã!", + ["ACT_FOURTEEN_DESC_8"] = "Após completar todas as missões no estágio atual, receberá:", + ["ACT_FOURTEEN_DESC_9"] = "Durante o período do evento, os [Pontos de Desafio] podem ser obtidos ao concluir o Desafio de Avanço.", + ["ACT_BOSS_RUSH_DESC_1"] = "Deseja entrar em combate com {0} diamantes?", + ["ACT_BOSS_RUSH_DESC_2"] = "Torneio Aberto de Chefões", + ["ACT_BOSS_RUSH_DESC_3"] = "Mestre de Hoje", + ["ACT_BOSS_RUSH_DESC_4"] = "Meu recorde de hoje:", + ["ACT_BOSS_RUSH_DESC_5"] = "Meus desafios de hoje: {0}", + ["ACT_BOSS_RUSH_DESC_6"] = "Jumlah hari ini:{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "Consumo:", + ["ACT_BOSS_RUSH_DESC_8"] = "Vacante", + ["ACT_BOSS_RUSH_DESC_9"] = "Formação", + ["ACT_BOSS_RUSH_DESC_10"] = "Tabela de Classificação", + ["ACT_BOSS_RUSH_DESC_11"] = "Desfile de Chefões", + ["ACT_BOSS_RUSH_DESC_12"] = "Loja do Evento", + ["ACT_BOSS_RUSH_DESC_13"] = "Participe do Torneio Aberto e desafie chefões diversos!Ganhe heróis S raros!!", + ["ACT_BOSS_RUSH_DESC_14"] = "Ir agora", + ["ACT_BOSS_RUSH_DESC_15"] = "Desfile de Chefões", + ["ACT_BOSS_RUSH_DESC_16"] = "Acumule as ondas de desafios do Torneio Aberto para receber recompensas do Desfile de Chefões.", + ["ACT_BOSS_RUSH_DESC_17"] = "Obtenha as moedas [Ouro de Chefão] no Desfile de Chefões e troque-as por recompensas. Como as moedas [Ouro de Chefão] serão recolhidas no final do evento, não se esqueça de as resgatar quanto antes.", + ["ACT_BOSS_RUSH_DESC_18"] = "Resgatar", + ["ACT_BOSS_RUSH_DESC_19"] = "Chances restantes:{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "Ontem", + ["ACT_BOSS_RUSH_DESC_21"] = "Hoje", + ["ACT_BOSS_RUSH_DESC_22"] = "Recompensas", + ["ACT_BOSS_RUSH_DESC_23"] = "Classificação:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "Classificação", + ["ACT_BOSS_RUSH_DESC_25"] = "Jogador", + ["ACT_BOSS_RUSH_DESC_26"] = "Recorde", + ["ACT_BOSS_RUSH_DESC_27"] = "1. A tabela de classificação será baseada no maior número de ondas concluídas do dia, e jogadores com o mesmo número de ondas serão comparados com base no menor número de rodadas.\n2. A classificação será atualizada e redefinida diariamente à 0h (UTC-0). Após a redefinição, você poderá coletar recompensas com base na sua classificação do dia anterior. As recompensas não coletadas após a expiração não serão reemitidas.", + ["ACT_BOSS_RUSH_DESC_28"] = "Novo Recorde", + ["ACT_BOSS_RUSH_DESC_29"] = "Pontuação do Desfile", + ["ACT_BOSS_RUSH_DESC_30"] = "Desafio Concluído", + ["ACT_BOSS_RUSH_DESC_31"] = "1. A ordem de aparição dos chefões e o mapa mudarão todos os dias.\n2. Após o início da batalha, as habilidades do seu herói serão ativadas por padrão, mas aquelas de reforço precisam ser ativadas por aprimoramento. Seu herói pode chegar até Nv.40 na batalha.\n3. Capacidades reforçadas com atributos pilhados podem ter efeito até 10 vezes.\n4. O ranking do Torneio Aberto será calculado uma vez por dia, e você pode obter um grande número de moedas [Ouro de Chefão], que podem ser trocadas por recompensas na loja do evento.\n5. O Desfile de Chefões concederá recompensas com base no número total de ondas de batalha em que você participou no Torneio Aberto.\n6. Você pode desafiar gratuitamente 1 vez por dia, e os subsequentes exigirão diamantes. Lembre-se de preparar diamantes antes de iniciar desafios adicionais.", + ["ACT_BOSS_RUSH_DESC_32"] = "Pacote especial de tempo limitado!", + ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} desbloqueando", + ["NOT_POP_TODAY"] = "Não me notifique por hoje.", + ["ACT_BOSS_RUSH_DESC_34"] = "Depois de sair, a batalha será resolvida de acordo com a onda actual. Você quer sair?", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index f4c32662..357c654d 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="Frag. Alea. de Herói Épico", ["desc"]="Ao obter em lote, virá apenas um dos seguintes heróis, aleatoriamente" }, + [51]={ + ["name"]="Pontos de Desafio", + ["desc"]="Os Pontos de Desafio podem ser resgatados por recompensas no Desafio de Avanço no prazo limitado." + }, + [52]={ + ["name"]="Ouro de Chefão", + ["desc"]="As moedas Ouro de Chefão podem ser trocadas por recompensas na loja do evento Torneio Aberto de Chefões." + }, + [53]={ + ["name"]="Moldura de Avatar de Prata da S3", + ["desc"]="Moldura de avatar de prata da Arena S3, um símbolo de coragem." + }, + [54]={ + ["name"]="Moldura de Avatar de Ouro da S3", + ["desc"]="Moldura de avatar de ouro da Arena S3, uma testemunha do poder." + }, [1001]={ ["name"]="Ferro Meteórico Opaco", ["desc"]="Uma peça de ferro meteórico opaco, contendo energia misteriosa." @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/task_type.lua b/lua/app/config/strings/pt/task_type.lua new file mode 100644 index 00000000..d8c530b9 --- /dev/null +++ b/lua/app/config/strings/pt/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="Anúncios visualizados" + }, + [2]={ + ["desc"]="Obtenha moedas de ouro" + }, + [3]={ + ["desc"]="Obtenha diamantes" + }, + [4]={ + ["desc"]="Gaste moedas de ouro" + }, + [5]={ + ["desc"]="Gaste diamantes" + }, + [6]={ + ["desc"]="Abra qualquer baú na Loja" + }, + [7]={ + ["desc"]="Abra um Baú Lendário na Loja" + }, + [8]={ + ["desc"]="Ative a habilidade Lâmpada Mágica numa fase" + }, + [9]={ + ["desc"]="Vença nas batalhas" + }, + [10]={ + ["desc"]="Aprimore seus heróis" + }, + [11]={ + ["desc"]="Obtenha fragmentos de heróis" + }, + [12]={ + ["desc"]="Derrote o chefão" + }, + [13]={ + ["desc"]="Derrote os lacaios" + }, + [14]={ + ["desc"]="Elementos eliminados" + }, + [15]={ + ["desc"]="Eliminações de 6 em sequência" + }, + [16]={ + ["desc"]="Eliminações de 8 em sequência" + }, + [17]={ + ["desc"]="Número de 10 ou mais hits seguidos em combate" + }, + [18]={ + ["desc"]="Habilidades lançadas em combate" + }, + [19]={ + ["desc"]="Ondas de combates concluídas" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="Entrar en el juego {0} día." + }, + [23]={ + ["desc"]="Alcanzar Nivel {0}." + }, + [24]={ + ["desc"]="Completar Capítulo {0} de la historia principal." + }, + [25]={ + ["desc"]="El héroe alzanza Nivel {0}." + }, + [26]={ + ["desc"]="Consumir {0} puntos de Energía." + }, + [27]={ + ["desc"]="Tener {0} héroes." + }, + [28]={ + ["desc"]="Abrir {0} Cofre Común." + }, + [29]={ + ["desc"]="Abrir {0} Cofre Precioso." + }, + [30]={ + ["desc"]="Desafios da Arena" + }, + [31]={ + ["desc"]="Atinja {0} na Arena." + }, + [32]={ + ["desc"]="Conclua o Desafio do Abismo {0}." + }, + [33]={ + ["desc"]="Conclua fases 3 a 6 da Fenda Espaço-temporal." + }, + [34]={ + ["desc"]="Conclua a Interceptação do Vagonete {0}." + }, + [35]={ + ["desc"]="Conclua a Torre do Gênio da Lâmpada {0}." + }, + [36]={ + ["desc"]="Vença {0} Desafios Diários." + }, + [37]={ + ["desc"]="Abra Baú x {0} da História." + }, + [38]={ + ["desc"]="Aprimore armas {0} vezes." + }, + [39]={ + ["desc"]="Aprimore Armaduras {0} vezes." + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/task_type.lua.meta b/lua/app/config/strings/pt/task_type.lua.meta new file mode 100644 index 00000000..ec4502b3 --- /dev/null +++ b/lua/app/config/strings/pt/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c6bf303608369c641b8e03478231618a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/avatar.lua b/lua/app/config/strings/ru/avatar.lua index 9e50f952..e55df79f 100644 --- a/lua/app/config/strings/ru/avatar.lua +++ b/lua/app/config/strings/ru/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ + }, + [1400101]={ + } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar_frame.lua b/lua/app/config/strings/ru/avatar_frame.lua index 924596db..43ceb019 100644 --- a/lua/app/config/strings/ru/avatar_frame.lua +++ b/lua/app/config/strings/ru/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ + }, + [28]={ + + }, + [29]={ + } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index 1e181bdd..cdc4654a 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -139,6 +139,18 @@ local item = { }, [47]={ + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + }, [1001]={ @@ -334,6 +346,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua index 0bae4ea9..02341f1a 100644 --- a/lua/app/config/strings/th/avatar.lua +++ b/lua/app/config/strings/th/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="หลังจากการเปิดใช้งานเยื้องกรายเต้นรำจะได้รับ" + }, + [1400101]={ + ["desc"]="เกราะรบซาก" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar_frame.lua b/lua/app/config/strings/th/avatar_frame.lua index 42a168d4..e396c15c 100644 --- a/lua/app/config/strings/th/avatar_frame.lua +++ b/lua/app/config/strings/th/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="กรอบรูปทองของอารีน่า S2 ความรุ่งโรจน์ของฮีโร่" + }, + [28]={ + ["desc"]="กรอบรูปเงินของอารีน่า S3 ตัวแทนแห่งความกล้าหาญ" + }, + [29]={ + ["desc"]="กรอบรูปทองของอารีน่า S3 พิสูจน์ความแข็งแกร่ง" } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua index 83d0656a..65402e1a 100644 --- a/lua/app/config/strings/th/buff.lua +++ b/lua/app/config/strings/th/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="เกิดใหม่", + ["desc"]="เกิดใหม่: ถูกเอาชนะระหว่างเวลาต่อเนื่องจะปลดปล่อยเกิดใหม่และฟื้นฟู HP เมื่อสิ้นสุดรอบ ยังไม่ปลดปล่อยเกิดใหม่ก็สามารถฟื้นฟู HP", + ["tips_desc"]="เกิดใหม่: ถูกเอาชนะระหว่างเวลาต่อเนื่องจะปลดปล่อยเกิดใหม่และฟื้นฟู HP เมื่อสิ้นสุดรอบ ยังไม่ปลดปล่อยเกิดใหม่ก็สามารถฟื้นฟู HP", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="โล่ทะเล", + ["desc"]="โล่ทะเล: สามารถรับดาเมจที่กำหนดได้ ภูมิคุ้มกันเอฟเฟกต์เชิงลบทั้งหมด", + ["tips_desc"]="โล่ทะเล: สามารถรับดาเมจที่กำหนดได้ ภูมิคุ้มกันเอฟเฟกต์เชิงลบทั้งหมด", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="ฮีลออล", + ["desc"]="ฮีลออล: ฟื้นฟู HP เมื่อสิ้นสุดรอบ", + ["tips_desc"]="ฮีลออล: ฟื้นฟู HP เมื่อสิ้นสุดรอบ", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index 2f55a840..34eed110 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "รางวัลอัประดับ", ["ARENA_DESC_41"] = "รางวัลคำนวณ", ["ARENA_DESC_42"] = "รางวัลที่ยังไม่ได้รับ", - ["EQUIP_DESC_26"] = "แพ็คอัปอาวุธ {0} เลเวล", ["EQUIP_DESC_27"] = "แพ็คอัปเกราะ {0} เลเวล", + ["EQUIP_DESC_28"] = "แพ็คอัปอาวุธ {0} เลเวล", ["SEIZED_DESC_1"] = "ตรวจพบบัญชีของคุณผิดปกติ โปรดติดต่อฝ่ายบริการลูกค้าหรือลบบัญชีและใช้บัญชีใหม่เพื่อเล่นเกมต่อ", ["SEIZED_DESC_2"] = "ติดต่อฝ่ายบริการลูกค้า", ["SEIZED_DESC_3"] = "ลบบัญชี", + ["ACT_FOURTEEN_TITLE_1"] = "รางวัลล็อกอิน", + ["ACT_FOURTEEN_TITLE_2"] = "การท้าทายขั้นสูง", + ["ACT_FOURTEEN_TITLE_3"] = "แลกจำกัดเวลา", + ["ACT_FOURTEEN_TITLE_4"] = "แพ็คจำกัดเวลา", + ["ACT_FOURTEEN_DESC_1"] = "ล็อกอินเกมเพื่อรับรางวัล!", + ["ACT_FOURTEEN_DESC_2"] = "ท้าทายตัวเองยังมีรางวัลอีกมากมาย!", + ["ACT_FOURTEEN_DESC_3"] = "เวลาไม่เคยคอยใคร โอกาสไม่เคยกลับมาอีกครั้ง!", + ["ACT_FOURTEEN_DESC_5"] = "ล็อกอินรับรางวัล และปลดล็อคป้ายรบขั้นสูงเพื่อรับรางวัลเพิ่มเติม!", + ["ACT_FOURTEEN_DESC_6"] = "ช่วง", + ["ACT_FOURTEEN_DESC_7"] = "ยังไม่ปลดล็อค โปรดกลับมาพรุ่งนี้~", + ["ACT_FOURTEEN_DESC_8"] = "บรรลุภารกิจทั้งหมดในช่วงปัจจุบันจะได้รับ:", + ["ACT_FOURTEEN_DESC_9"] = "ในระหว่างกิจกรรมเสร็จสิ้น การท้าทายขั้นสูง จะได้รับ [แต้มท้าทาย]", + ["ACT_BOSS_RUSH_DESC_1"] = "ใช้ {0} เพชรเพื่อต่อสู้หรือไม่?", + ["ACT_BOSS_RUSH_DESC_2"] = "การแข่งขันชิงแชมป์บอส", + ["ACT_BOSS_RUSH_DESC_3"] = "ปรมาจารย์วันนี้", + ["ACT_BOSS_RUSH_DESC_4"] = "วันนี้ฉันเป็นผู้สูงสุด:", + ["ACT_BOSS_RUSH_DESC_5"] = "วันนี้ฉันท้าทาย: {0} ครั้ง", + ["ACT_BOSS_RUSH_DESC_6"] = "Chances de hoje:{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "ใช้:", + ["ACT_BOSS_RUSH_DESC_8"] = "รอคอย", + ["ACT_BOSS_RUSH_DESC_9"] = "ขบวนรบที่เข้าร่วมการแข่งขัน", + ["ACT_BOSS_RUSH_DESC_10"] = "ชาร์ตอันดับ", + ["ACT_BOSS_RUSH_DESC_11"] = "รางวัลบอส", + ["ACT_BOSS_RUSH_DESC_12"] = "ร้านกิจกรรม", + ["ACT_BOSS_RUSH_DESC_13"] = "เข้าร่วมการแข่งขันชิงแชมป์และท้าทายบอสต่างๆ!ได้รับฮีโร่หายากระดับ S! !", + ["ACT_BOSS_RUSH_DESC_14"] = "ไปทันที", + ["ACT_BOSS_RUSH_DESC_15"] = "รางวัลบอส", + ["ACT_BOSS_RUSH_DESC_16"] = "สะสมจำนวนรอบท้าทายของการแข่งขันชิงแชมป์เพื่อรับรางวัลบอส", + ["ACT_BOSS_RUSH_DESC_17"] = "รับ [เหรียญทองบอสจาก] รางวัลบอสเพื่อแลกรางวัล เมื่อกิจกรรมสิ้นสุดจะรีไซเคิลถ้วยรางวัล โปรดแลกให้ทันเวลา", + ["ACT_BOSS_RUSH_DESC_18"] = "แลก", + ["ACT_BOSS_RUSH_DESC_19"] = "จำนวนที่เหลือ:{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "เมื่อวาน", + ["ACT_BOSS_RUSH_DESC_21"] = "วันนี้", + ["ACT_BOSS_RUSH_DESC_22"] = "รางวัล", + ["ACT_BOSS_RUSH_DESC_23"] = "อันดับ:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "อันดับ", + ["ACT_BOSS_RUSH_DESC_25"] = "ผู้เล่น", + ["ACT_BOSS_RUSH_DESC_26"] = "บันทึก", + ["ACT_BOSS_RUSH_DESC_27"] = "1. ชาร์ตอันดับตะจัดอันดับตามจำนวนรอบสูงสุดของวันนั้น และผู้เล่นที่มีจำนวนรอบเท่ากันจะถูกเปรียบเทียบจำนวนรอบขั้นต่ำ\n2. ชาร์ตอันดับจะรีเฟรชและรีเซ็ตเวลา 00:00 (UTC-0) ทุกวัน หลังจากรีเซ็ตแล้ว จะสามารถรับรางวัลได้ตามอันดับของวันก่อนหน้า และจะไม่ชดเชยรางวัลที่ยังไม่ได้รับ", + ["ACT_BOSS_RUSH_DESC_28"] = "สถิติใหม่", + ["ACT_BOSS_RUSH_DESC_29"] = "แต้มตระเวน", + ["ACT_BOSS_RUSH_DESC_30"] = "ท้าทายสำเร็จ", + ["ACT_BOSS_RUSH_DESC_31"] = "1. ลำดับการปรากฏตัวของบอสและแผนที่จะเปลี่ยนไปทุกวัน\n2. หลังจากการต่อสู้เริ่มต้นขึ้น สกิลฮีโร่ของคุณจะถูกเปิดใช้งานตามค่าเริ่มต้น แต่สกิลที่ตีบวกแล้วจำเป็นต้องได้รับจากการอัปเกรด และสามารถอัปได้ถึง Lv.40 ในการต่อสู้\n3. สกิลเสริมพลังของคุณสมบัติที่ซ้อนทับ มีผลสูงสุด 10 ครั้ง\n4. อันดับของการแข่งขันชิงแชมป์รายวันจะคำนวณเพียงครั้งเดียว และสามารถได้รับ [เหรียญทองบอส] จำนวนมากได้หลังจากการคำนวณ ซึ่งสามารถใช้เพื่อแลกเปลี่ยนรางวัลในร้านกิจกรรมได้\n5. รางวัลบอสจะมอบรางวัลให้คุณตามจำนวนรอบที่คุณเข้าร่วมในการต่อสู้ที่คุณได้เข้าร่วมในการแข่งขันชิงแชมป์\n6. สามารถท้าทายได้ฟรีวันละครั้ง การท้าทายครั้งต่อไปจะใช้เพชร โปรดเริ่มการท้าทายเมื่อคุณพร้อม", + ["ACT_BOSS_RUSH_DESC_32"] = "แพ็คเกจพิเศษแบบจำกัดเวลา!", + ["ACT_BOSS_RUSH_DESC_33"] = "ขั้นตอนที่ {0} ปลดล็อค", + ["NOT_POP_TODAY"] = "วันนี้ไม่เตือนอีก", + ["ACT_BOSS_RUSH_DESC_34"] = "เมื่อออกแล้วจะชำระค่าต่อสู้ตามคลื่นปัจจุบัน จะออกหรือไม่", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index aa92241a..170c6a44 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="ฮีโร่อีพิทแบบสุ่ม", ["desc"]="เมื่อรับแบบแบทช์จะสุ่มรับฮีโร่ต่อไปนี้เพียงหนึ่งตัวเท่านั้น" }, + [51]={ + ["name"]="แต้มท้าทาย", + ["desc"]="แต้มท้าทาย สามารถแลกรางวัลได้ภายในระยะเวลาที่จำกัดเมื่อทำการท้าทายขั้นสูง" + }, + [52]={ + ["name"]="เหรียญทองบอส", + ["desc"]="เหรียญทองบอส สามารถแลกเปลี่ยนเป็นรางวัลได้ในร้านกิจกรรมของการแข่งขันชิงแชมป์บอส" + }, + [53]={ + ["name"]="กรอบรูปเงินซีซั่น S3", + ["desc"]="กรอบรูปเงินของอารีน่า S3 ตัวแทนแห่งความกล้าหาญ" + }, + [54]={ + ["name"]="กรอบรูปทองซีซั่น S3", + ["desc"]="กรอบรูปทองของอารีน่า S3 พิสูจน์ความแข็งแกร่ง" + }, [1001]={ ["name"]="อุกกาบาตทื่อ", ["desc"]="อุกกาบาตสลัวๆ ที่มีพลังงานลึกลับ" @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/task_type.lua b/lua/app/config/strings/th/task_type.lua new file mode 100644 index 00000000..ba8bcb7e --- /dev/null +++ b/lua/app/config/strings/th/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="สะสมดูโฆษณา" + }, + [2]={ + ["desc"]="ได้รับเหรียญทอง" + }, + [3]={ + ["desc"]="ได้รับเพชร" + }, + [4]={ + ["desc"]="ใช้เหรียญทอง" + }, + [5]={ + ["desc"]="ใช้เพชร" + }, + [6]={ + ["desc"]="เปิดหีบใดก็ได้ในห้าง" + }, + [7]={ + ["desc"]="เปิดหีบอีพิทในห้าง" + }, + [8]={ + ["desc"]="เปิดตะเกียงเทพในด่าน" + }, + [9]={ + ["desc"]="ชนะการต่อสู้" + }, + [10]={ + ["desc"]="อัปเลเวลฮีโร่ของคุณ" + }, + [11]={ + ["desc"]="ได้รับเศษฮีโร่" + }, + [12]={ + ["desc"]="สังหารบอส" + }, + [13]={ + ["desc"]="สังหารมอน" + }, + [14]={ + ["desc"]="สะสมกำจัดธาตุ" + }, + [15]={ + ["desc"]="จำนวนกำจัด 6 คอมโบ" + }, + [16]={ + ["desc"]="จำนวนกำจัด 8 คอมโบ" + }, + [17]={ + ["desc"]="จำนวนเกิน 10 คอมโบในการต่อสู้" + }, + [18]={ + ["desc"]="จำนวนปล่อยสกิลในการต่อสู้" + }, + [19]={ + ["desc"]="จำนวนผ่านรอบการต่อสู้" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="สะสมลงชื่อ {0} วัน" + }, + [23]={ + ["desc"]="เลเวลถึง Lv.{0}" + }, + [24]={ + ["desc"]="ผ่านบทที่ {0} ของเควสหลัก" + }, + [25]={ + ["desc"]="เลเวลสูงสุดของฮีโร่ถึง Lv.{0}" + }, + [26]={ + ["desc"]="ใช้พลังกาย {0} แต้ม" + }, + [27]={ + ["desc"]="มีฮีโร่ {0} ตัว" + }, + [28]={ + ["desc"]="เปิดหีบสมบัติทั่วไป {0} ครั้ง" + }, + [29]={ + ["desc"]="เปิดหีบสมบัติล้ำค่า {0} ครั้ง" + }, + [30]={ + ["desc"]="จำนวนท้าทายอารีน่า" + }, + [31]={ + ["desc"]="อารีน่าถึง{0}" + }, + [32]={ + ["desc"]="ผ่านด่าน{0}ของท้าทายเหว" + }, + [33]={ + ["desc"]="ผ่านด่านรอยแยกกาลอวกาศ {0}-{1}" + }, + [34]={ + ["desc"]="ผ่านด่านสกัดกั้นรถเข็นเหมือง{0}" + }, + [35]={ + ["desc"]="ผ่านด่านหอคอยเทพตะเกียง{0}" + }, + [36]={ + ["desc"]="ชนะการท้าทายรายวัน {0} ครั้ง" + }, + [37]={ + ["desc"]="เปิดหีบสมบัติสายหลัก {0} อัน" + }, + [38]={ + ["desc"]="อัปเกรดอาวุธ {0} ครั้ง" + }, + [39]={ + ["desc"]="อัปเกรดเกราะ {0} ครั้ง" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/task_type.lua.meta b/lua/app/config/strings/th/task_type.lua.meta new file mode 100644 index 00000000..d1c6e657 --- /dev/null +++ b/lua/app/config/strings/th/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ab8cfc0153d5b7b408ba9ae79a2b08b6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua index ee88216c..dfe57233 100644 --- a/lua/app/config/strings/vi/avatar.lua +++ b/lua/app/config/strings/vi/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="Kích hoạt Nhảy Múa Nhanh Nhẹn nhận được." + }, + [1400101]={ + ["desc"]="Giáp Di Tích" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar_frame.lua b/lua/app/config/strings/vi/avatar_frame.lua index 9a7507dc..86fe00c2 100644 --- a/lua/app/config/strings/vi/avatar_frame.lua +++ b/lua/app/config/strings/vi/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="Khung Avatar Vàng Đấu Trường S2, anh hùng tỏa sáng." + }, + [28]={ + ["desc"]="Khung Avatar Bạc Đấu Trường S3, biểu tượng gan dạ." + }, + [29]={ + ["desc"]="Khung Avatar Vàng Đấu Trường S3, biểu tượng thực lực." } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua index e227e9c0..f185a5f9 100644 --- a/lua/app/config/strings/vi/buff.lua +++ b/lua/app/config/strings/vi/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="Trùng Sinh", + ["desc"]="Trùng Sinh: Khi bị hạ gục trong thời gian duy trì sẽ kích hoạt Trùng Sinh và hồi HP, khi kết thúc hiệp chưa kích hoạt Trùng Sinh cũng sẽ hồi HP.", + ["tips_desc"]="Trùng Sinh: Khi bị hạ gục trong thời gian duy trì sẽ kích hoạt Trùng Sinh và hồi HP, khi kết thúc hiệp chưa kích hoạt Trùng Sinh cũng sẽ hồi HP.", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="Khiên Hải Dương", + ["desc"]="Khiên Hải Dương: Chịu một lượng ST nhất định, miễn dịch mọi debuff.", + ["tips_desc"]="Khiên Hải Dương: Chịu một lượng ST nhất định, miễn dịch mọi debuff.", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="Chữa Trị", + ["desc"]="Chữa Trị: Khi kết thúc hiệp sẽ hồi HP.", + ["tips_desc"]="Chữa Trị: Khi kết thúc hiệp sẽ hồi HP.", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index 7f16b8b2..cae1a18c 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "Thưởng Tăng Bậc", ["ARENA_DESC_41"] = "Thưởng Tổng Kết", ["ARENA_DESC_42"] = "Chưa nhận quà", - ["EQUIP_DESC_26"] = "Quà Tăng Ngay Vũ Khí Lv{0}", ["EQUIP_DESC_27"] = "Quà Tăng Ngay Phòng Cụ Lv{0}", + ["EQUIP_DESC_28"] = "Quà Tăng Ngay Vũ Khí Lv{0}", ["SEIZED_DESC_1"] = "Đã phát hiện tài khoản có bất thường, vui lòng liên hệ CSKH hoặc xóa TK và sử dụng TK mới để tiếp tục trò chơi.", ["SEIZED_DESC_2"] = "Liên hệ CSKH", ["SEIZED_DESC_3"] = "Xóa TK", + ["ACT_FOURTEEN_TITLE_1"] = "Quà Đăng Nhập", + ["ACT_FOURTEEN_TITLE_2"] = "Khiêu Chiến Tăng Bậc", + ["ACT_FOURTEEN_TITLE_3"] = "Đổi Hạn Giờ", + ["ACT_FOURTEEN_TITLE_4"] = "Quà Hạn Giờ", + ["ACT_FOURTEEN_DESC_1"] = "Đăng nhập game, nhân quà to!", + ["ACT_FOURTEEN_DESC_2"] = "Thử thách bản thân, nhận thêm nhiều quà!", + ["ACT_FOURTEEN_DESC_3"] = "Cơ hội hiếm có!", + ["ACT_FOURTEEN_DESC_5"] = "Đăng nhập nhận thưởng, mở khóa Chiến Lệnh Cao nhận thêm phần thưởng!", + ["ACT_FOURTEEN_DESC_6"] = "Giai đoạn", + ["ACT_FOURTEEN_DESC_7"] = "Chưa mở khóa, ngày mai quay lại~", + ["ACT_FOURTEEN_DESC_8"] = "Hoàn thành tất cả nhiệm vụ giai đoạn hiện tại được nhận:", + ["ACT_FOURTEEN_DESC_9"] = "Trong sự kiện, Hoàn thành Khiêu Chiến Tăng Bậc có thể nhận được [Điểm Khiêu Chiến].", + ["ACT_BOSS_RUSH_DESC_1"] = "Có tiêu hao {0} Kim Cương chiến đấu?", + ["ACT_BOSS_RUSH_DESC_2"] = "Giải Mở Rộng BOSS", + ["ACT_BOSS_RUSH_DESC_3"] = "Cao thủ hôm nay", + ["ACT_BOSS_RUSH_DESC_4"] = "Tối đa hôm nay:", + ["ACT_BOSS_RUSH_DESC_5"] = "Khiêu chiến hôm nay: {0} lần", + ["ACT_BOSS_RUSH_DESC_6"] = "오늘 횟수:{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "Tốn:", + ["ACT_BOSS_RUSH_DESC_8"] = "Trống", + ["ACT_BOSS_RUSH_DESC_9"] = "Đội hình tham chiến", + ["ACT_BOSS_RUSH_DESC_10"] = "BXH", + ["ACT_BOSS_RUSH_DESC_11"] = "Tham Quan BOSS", + ["ACT_BOSS_RUSH_DESC_12"] = "SHOP Sự Kiện", + ["ACT_BOSS_RUSH_DESC_13"] = "Tham gia Giải Mở Rộng, khiêu chiến các loại BOSS!Nhận Anh Hùng Hiếm cấp S!!", + ["ACT_BOSS_RUSH_DESC_14"] = "Đến Ngay", + ["ACT_BOSS_RUSH_DESC_15"] = "Tham Quan BOSS", + ["ACT_BOSS_RUSH_DESC_16"] = "Tích lũy số đợt khiêu chiến Giải Mở Rộng, được nhận quà Tham Quan BOSS.", + ["ACT_BOSS_RUSH_DESC_17"] = "Trong Tham Quan BOSS nhận [Vàng BOSS] đổi thưởng, khi kết thúc sự kiện sẽ thu hồi cúp [Vàng BOSS], hãy mau đổi.", + ["ACT_BOSS_RUSH_DESC_18"] = "Đổi", + ["ACT_BOSS_RUSH_DESC_19"] = "Lượt còn:{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "Hôm qua", + ["ACT_BOSS_RUSH_DESC_21"] = "Hôm nay", + ["ACT_BOSS_RUSH_DESC_22"] = "Thưởng", + ["ACT_BOSS_RUSH_DESC_23"] = "XH:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "XH", + ["ACT_BOSS_RUSH_DESC_25"] = "Người chơi", + ["ACT_BOSS_RUSH_DESC_26"] = "Nhật ký", + ["ACT_BOSS_RUSH_DESC_27"] = "1.BXH sẽ xếp hạng theo số đợt tối đa trong ngày, người chơi có số đợt giống nhau sẽ so sánh số hiệu tối thiểu.\n2.BXH reset làm mới vào 0h mỗi ngày (UTC-0), sau khi reset có thể nhận thưởng theo xếp hạng ngày hôm trước, thưởng hết hạn chưa nhận sẽ không gửi bù.", + ["ACT_BOSS_RUSH_DESC_28"] = "Nhật ký mới", + ["ACT_BOSS_RUSH_DESC_29"] = "Điểm Tham Quan", + ["ACT_BOSS_RUSH_DESC_30"] = "Hoàn thành khiêu chiến", + ["ACT_BOSS_RUSH_DESC_31"] = "1.Thứ tự và bản đồ BOSS xuất hiện sẽ thay đổi mỗi ngày.\n2.Sau khi bắt đầu chiến đấu, kỹ năng anh hùng mặc định đã kích hoạt, nhưng kỹ năng cường hóa thì cần phải tăng cấp mới nhận được, tối đa tăng 40 cấp trong chiến đấu.\n3.Kỹ năng cường hóa thuộc tính chồng lên nhau, nhiều nhất có thể có hiệu lực 10 lần.\n4.Xếp hạng Giải Mở Rộng mỗi ngày đều tổng kết 1 lần, tổng kết được nhận vô số [Vàng BOSS], được dùng để đổi thưởng ở SHOP Sự Kiện.\n5.Tham Quan BOSS sẽ phát thưởng theo số lượt tích lũy tham gia chiến đấu Giải Mở Rộng.\n6.Mỗi ngày được 1 lần khiêu chiến miễn phí, khiêu chiến tiếp theo cần tốn Kim Cương, hãy chuẩn bị sẵn sàng rồi bắt đầu khiêu chiến.", + ["ACT_BOSS_RUSH_DESC_32"] = "Quà tặng giới hạn hồi báo cao!", + ["ACT_BOSS_RUSH_DESC_33"] = "Giai đoạn {0} Mở khóa", + ["NOT_POP_TODAY"] = "Hôm nay không nhắc lại", + ["ACT_BOSS_RUSH_DESC_34"] = "Sau khi rút lui, sẽ dựa theo sóng hiện tại thanh toán chiến đấu, có rút lui hay không?", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index 2bf22e8b..825b6258 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="Anh Hùng Sử Thi N.Nhiên", ["desc"]="Khi nhận số lượng nhiều chỉ ngẫu nhiên ra 1 trong các Anh Hùng dưới đây." }, + [51]={ + ["name"]="Điểm Khiêu Chiến", + ["desc"]="Điểm Khiêu Chiến, Khiêu Chiến Tăng Bậc hạn giờ đổi thưởng." + }, + [52]={ + ["name"]="Vàng BOSS", + ["desc"]="Vàng BOSS, có thể đổi thưởng trong SHOP Sự Kiện của Giải Mở Rộng BOSS." + }, + [53]={ + ["name"]="Khung Avatar Bạc S3", + ["desc"]="Khung Avatar Bạc Đấu Trường S3, biểu tượng gan dạ." + }, + [54]={ + ["name"]="Khung Avatar Vàng S3", + ["desc"]="Khung Avatar Vàng Đấu Trường S3, biểu tượng thực lực." + }, [1001]={ ["name"]="Thiên Thạch Ảm Đạm", ["desc"]="Một thiên thạch ảm đảm, chứa năng lượng thần bí." @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/task_type.lua b/lua/app/config/strings/vi/task_type.lua new file mode 100644 index 00000000..7cd75811 --- /dev/null +++ b/lua/app/config/strings/vi/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="Tích xem quảng cáo" + }, + [2]={ + ["desc"]="Nhận Vàng" + }, + [3]={ + ["desc"]="Nhận Kim Cương" + }, + [4]={ + ["desc"]="Tiêu hao Vàng" + }, + [5]={ + ["desc"]="Tiêu hao Kim Cương" + }, + [6]={ + ["desc"]="Mở rương bất kỳ trong SHOP" + }, + [7]={ + ["desc"]="Mở Rương Sử Thi trong SHOP" + }, + [8]={ + ["desc"]="Trong ải mở Kỹ Năng Thần Đèn" + }, + [9]={ + ["desc"]="Giành chiến thắng trong trận" + }, + [10]={ + ["desc"]="Tăng cấp Anh Hùng của bạn" + }, + [11]={ + ["desc"]="Nhận Mảnh Anh Hùng" + }, + [12]={ + ["desc"]="Diệt BOSS" + }, + [13]={ + ["desc"]="Diệt Quái" + }, + [14]={ + ["desc"]="Tích lũy xua tan Nguyên Tố" + }, + [15]={ + ["desc"]="Lượt xua tan x6" + }, + [16]={ + ["desc"]="Lượt xua tan x8" + }, + [17]={ + ["desc"]="Lượt hits hơn 10 lần trong trận" + }, + [18]={ + ["desc"]="Lượt thi triển kỹ năng trong trận" + }, + [19]={ + ["desc"]="Thông qua đợt chiến đấu" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="Tích lũy điểm danh {0} ngày" + }, + [23]={ + ["desc"]="Đạt Lv{0}" + }, + [24]={ + ["desc"]="Vượt Chính Tuyến Chương {0}" + }, + [25]={ + ["desc"]="Anh Hùng tối đa đạt Lv{0}" + }, + [26]={ + ["desc"]="Tiêu hao {0} Thể Lực" + }, + [27]={ + ["desc"]="Có {0} Anh Hùng" + }, + [28]={ + ["desc"]="Mở {0} lần Rương Thường" + }, + [29]={ + ["desc"]="Mở {0} lần Rương Quý" + }, + [30]={ + ["desc"]="Lượt k.chiến Đấu Trường" + }, + [31]={ + ["desc"]="Đấu Trường đạt {0}" + }, + [32]={ + ["desc"]="Khiêu Chiến Vực Sâu vượt ải {0}" + }, + [33]={ + ["desc"]="Vượt ải Khe Nứt Không Gian {0}-{1}" + }, + [34]={ + ["desc"]="Vượt ải Chặn Xe Mỏ {0}" + }, + [35]={ + ["desc"]="Vượt ải Tháp Thần Đèn {0}" + }, + [36]={ + ["desc"]="Khiêu chiến mỗi ngày thắng {0} lần" + }, + [37]={ + ["desc"]="Mở {0} Rương Chính Tuyến" + }, + [38]={ + ["desc"]="Tăng cấp Vũ Khí {0} lần" + }, + [39]={ + ["desc"]="Tăng cấp Phòng Cụ {0} lần" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/task_type.lua.meta b/lua/app/config/strings/vi/task_type.lua.meta new file mode 100644 index 00000000..02d676f7 --- /dev/null +++ b/lua/app/config/strings/vi/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c972c8069bbc001458f6875786b50907 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua index 625a3ad2..a20467e9 100644 --- a/lua/app/config/strings/zh/avatar.lua +++ b/lua/app/config/strings/zh/avatar.lua @@ -106,9 +106,12 @@ local avatar = { }, [5400101]={ ["desc"]="啟動刀姬翩然起舞皮膚後獲得。" + }, + [1400101]={ + ["desc"]="遺跡戰甲" } } local config = { -data=avatar,count=36 +data=avatar,count=37 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar_frame.lua b/lua/app/config/strings/zh/avatar_frame.lua index 550322f7..c5abd9aa 100644 --- a/lua/app/config/strings/zh/avatar_frame.lua +++ b/lua/app/config/strings/zh/avatar_frame.lua @@ -13,9 +13,15 @@ local avatar_frame = { }, [27]={ ["desc"]="S2競技場黃金頭像框，英雄的光輝。" + }, + [28]={ + ["desc"]="S3競技場白銀頭像框，勇氣的代表。" + }, + [29]={ + ["desc"]="S3競技場黃金頭像框，實力的證明。" } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=7 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index 1ea833d4..e76faf21 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -225,14 +225,23 @@ local buff = { }, [84]={ ["id"]=84, + ["show_name"]="重生", + ["desc"]="重生：持續期間被擊敗則會觸發重生並回復生命，回合結束時未觸發重生也會回復生命。", + ["tips_desc"]="重生：持續期間被擊敗則會觸發重生並回復生命，回合結束時未觸發重生也會回復生命。", ["name"]="rebirth" }, [85]={ ["id"]=85, + ["show_name"]="海洋護盾", + ["desc"]="海洋護盾：承受一定傷害，免疫所有負面效果。", + ["tips_desc"]="海洋護盾：承受一定傷害，免疫所有負面效果。", ["name"]="ocean_shield" }, [86]={ ["id"]=86, + ["show_name"]="自癒", + ["desc"]="自癒：回合結束時回復生命。", + ["tips_desc"]="自癒：回合結束時回復生命。", ["name"]="self_heal" } } diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index dae7df04..ef476b88 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -460,11 +460,58 @@ local localization_global = ["ARENA_DESC_40"] = "升段獎勵", ["ARENA_DESC_41"] = "結算獎勵", ["ARENA_DESC_42"] = "未領取獎勵", - ["EQUIP_DESC_26"] = "武器直升{0}級禮包", ["EQUIP_DESC_27"] = "防具直升{0}級禮包", + ["EQUIP_DESC_28"] = "武器直升{0}級禮包", ["SEIZED_DESC_1"] = "檢測到你的賬號存在異常，請聯繫客服或刪除賬號使用新建賬號繼續遊戲。", ["SEIZED_DESC_2"] = "聯繫客服", ["SEIZED_DESC_3"] = "刪除賬號", + ["ACT_FOURTEEN_TITLE_1"] = "登入好禮", + ["ACT_FOURTEEN_TITLE_2"] = "進階挑戰", + ["ACT_FOURTEEN_TITLE_3"] = "限時兌換", + ["ACT_FOURTEEN_TITLE_4"] = "限時禮包", + ["ACT_FOURTEEN_DESC_1"] = "登入遊戲，既享大禮！", + ["ACT_FOURTEEN_DESC_2"] = "挑戰自己，更有好禮相送！", + ["ACT_FOURTEEN_DESC_3"] = "時不待人，機不再來！", + ["ACT_FOURTEEN_DESC_5"] = "登入即可領取獎勵，解鎖高級戰令領取額外獎勵！", + ["ACT_FOURTEEN_DESC_6"] = "階段", + ["ACT_FOURTEEN_DESC_7"] = "尚未解鎖，請明日再來~", + ["ACT_FOURTEEN_DESC_8"] = "完成目前階段所有任務可獲得：", + ["ACT_FOURTEEN_DESC_9"] = "活動期間，完成進階挑戰可獲得【挑戰點】", + ["ACT_BOSS_RUSH_DESC_1"] = "是否消耗{0}鑽石戰鬥？", + ["ACT_BOSS_RUSH_DESC_2"] = "首領公開賽", + ["ACT_BOSS_RUSH_DESC_3"] = "今日高手", + ["ACT_BOSS_RUSH_DESC_4"] = "我今日最高：", + ["ACT_BOSS_RUSH_DESC_5"] = "我今日挑戰：{0}次", + ["ACT_BOSS_RUSH_DESC_6"] = "Lượt hôm nay:{0}", + ["ACT_BOSS_RUSH_DESC_7"] = "使用：", + ["ACT_BOSS_RUSH_DESC_8"] = "虛位以待", + ["ACT_BOSS_RUSH_DESC_9"] = "參賽陣容", + ["ACT_BOSS_RUSH_DESC_10"] = "排行榜", + ["ACT_BOSS_RUSH_DESC_11"] = "首領巡禮", + ["ACT_BOSS_RUSH_DESC_12"] = "活動商店", + ["ACT_BOSS_RUSH_DESC_13"] = "參與公開賽，挑戰各類首領！贏得稀有S級英雄！！", + ["ACT_BOSS_RUSH_DESC_14"] = "立即前往", + ["ACT_BOSS_RUSH_DESC_15"] = "首領巡禮", + ["ACT_BOSS_RUSH_DESC_16"] = "累積公開賽挑戰波次，可領取首領巡禮獎勵。", + ["ACT_BOSS_RUSH_DESC_17"] = "首領巡禮中獲得【首領金幣】兌換獎勵，活動結束時【首領金幣】將會回收，請盡快兌換。", + ["ACT_BOSS_RUSH_DESC_18"] = "兌換", + ["ACT_BOSS_RUSH_DESC_19"] = "剩餘次數：{0}", + ["ACT_BOSS_RUSH_DESC_20"] = "昨日", + ["ACT_BOSS_RUSH_DESC_21"] = "今日", + ["ACT_BOSS_RUSH_DESC_22"] = "獎勵", + ["ACT_BOSS_RUSH_DESC_23"] = "排名:{0}", + ["ACT_BOSS_RUSH_DESC_24"] = "排名", + ["ACT_BOSS_RUSH_DESC_25"] = "玩家", + ["ACT_BOSS_RUSH_DESC_26"] = "記錄", + ["ACT_BOSS_RUSH_DESC_27"] = "1.排行榜將以當日最大波數進行排名，波數相同的玩家將對比最小回合數。 \n2.排行榜每日0點（UTC-0）刷新重置，重置後可根據前一天的排名領取獎勵，獎勵過期未領將不會補發。", + ["ACT_BOSS_RUSH_DESC_28"] = "新紀錄", + ["ACT_BOSS_RUSH_DESC_29"] = "巡迴積分", + ["ACT_BOSS_RUSH_DESC_30"] = "挑戰完成", + ["ACT_BOSS_RUSH_DESC_31"] = "1.首領出場順序和地圖每日都將進行變化。 \n2.戰鬥開始後，您的英雄技能默認已激活，但強化技能還需要升級獲得，戰鬥內最多提升40級。 \n3.疊加屬性的強化技能，最多可生效10次。 \n4.每日公開賽的排名都將結算一次，結算可獲得大量【首領金幣】，可用於活動商店兌換獎勵。 \n5.首領巡禮將根據您參與公開賽戰鬥的累計波次給與獎勵。 \n6.每日可免費挑戰1次，後續挑戰需要消耗鑽石，請準備好再開始挑戰。", + ["ACT_BOSS_RUSH_DESC_32"] = "限時禮包，傾情回饋！", + ["ACT_BOSS_RUSH_DESC_33"] = "階段{0}解鎖", + ["NOT_POP_TODAY"] = "今日不再提醒", + ["ACT_BOSS_RUSH_DESC_34"] = "退出後，將按照當前波次結算戰鬥，是否退出？", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index c19176d7..12f9b07a 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -187,6 +187,22 @@ local item = { ["name"]="隨機史詩英雄", ["desc"]="批量獲取時只會隨機以下英雄中的一名" }, + [51]={ + ["name"]="挑戰點", + ["desc"]="挑戰點，進階挑戰限時兌換獎勵。" + }, + [52]={ + ["name"]="首領金幣", + ["desc"]="首領金幣，可在首領公開賽的活動商店中兌換獎勵。" + }, + [53]={ + ["name"]="S3賽季白銀頭像框", + ["desc"]="S3競技場白銀頭像框，勇氣的代表。" + }, + [54]={ + ["name"]="S3賽季黃金頭像框", + ["desc"]="S3競技場黃金頭像框，實力的證明。" + }, [1001]={ ["name"]="暗淡隕鐵", ["desc"]="一塊暗淡的隕鐵，蘊含著神秘的能量。" @@ -445,6 +461,6 @@ local item = { } } local config = { -data=item,count=111 +data=item,count=115 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/task_type.lua b/lua/app/config/strings/zh/task_type.lua new file mode 100644 index 00000000..76b45c31 --- /dev/null +++ b/lua/app/config/strings/zh/task_type.lua @@ -0,0 +1,123 @@ +local task_type = { + [1]={ + ["desc"]="累積觀看廣告" + }, + [2]={ + ["desc"]="獲得金幣" + }, + [3]={ + ["desc"]="獲得鑽石" + }, + [4]={ + ["desc"]="花費金幣" + }, + [5]={ + ["desc"]="花費鑽石" + }, + [6]={ + ["desc"]="開啟商城任意寶箱" + }, + [7]={ + ["desc"]="開啟商城史詩寶箱" + }, + [8]={ + ["desc"]="關卡內打開技能神燈" + }, + [9]={ + ["desc"]="在戰鬥中獲勝" + }, + [10]={ + ["desc"]="升級你的英雄" + }, + [11]={ + ["desc"]="獲得英雄碎片" + }, + [12]={ + ["desc"]="擊殺首領" + }, + [13]={ + ["desc"]="擊殺小怪" + }, + [14]={ + ["desc"]="累積消除元素" + }, + [15]={ + ["desc"]="6連消次數" + }, + [16]={ + ["desc"]="8連消次數" + }, + [17]={ + ["desc"]="戰鬥中超過10連擊次數" + }, + [18]={ + ["desc"]="戰鬥中釋放技能次數" + }, + [19]={ + ["desc"]="完成戰鬥波次" + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + ["desc"]="累積簽到{0}天" + }, + [23]={ + ["desc"]="等級達到{0}" + }, + [24]={ + ["desc"]="通關主線章節{0}" + }, + [25]={ + ["desc"]="英雄最高等級達到{0}" + }, + [26]={ + ["desc"]="使用體力{0}點" + }, + [27]={ + ["desc"]="擁有{0}個英雄" + }, + [28]={ + ["desc"]="開啟{0}次普通寶箱" + }, + [29]={ + ["desc"]="開啟{0}次珍貴寶箱" + }, + [30]={ + ["desc"]="競技場挑戰次數" + }, + [31]={ + ["desc"]="競技場段位達到{0}" + }, + [32]={ + ["desc"]="深淵挑戰通關{0}" + }, + [33]={ + ["desc"]="通關時空裂隙{0}-{1}" + }, + [34]={ + ["desc"]="通關礦車攔截{0}" + }, + [35]={ + ["desc"]="通關燈神之塔{0}" + }, + [36]={ + ["desc"]="每日挑戰勝利{0}次" + }, + [37]={ + ["desc"]="開啟主線寶箱{0}個" + }, + [38]={ + ["desc"]="武器升級{0}次" + }, + [39]={ + ["desc"]="防具升級{0}次" + } +} +local config = { +data=task_type,count=39 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/task_type.lua.meta b/lua/app/config/strings/zh/task_type.lua.meta new file mode 100644 index 00000000..cc24b612 --- /dev/null +++ b/lua/app/config/strings/zh/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 273768c61173bae42bce276fa0a6cb51 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 0a148c5c..e6725361 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -20,6 +20,7 @@ local CONST_PATHS = { GameSettingConst = "app/module/game_setting/game_setting_const", CollectionConst = "app/module/collection/collection_const", ActivityConst = "app/module/activity/activity_const", + FourteenDayConst = "app/module/activity/fourteen_day/fourteen_day_const", } if EDITOR_MODE then @@ -181,6 +182,7 @@ GConst.TYPEOF_LUA_CLASS = { PLAYER_INFO_CELL = "app/ui/common/cell/player_info_cell", PLAYER_HEAD_CELL = "app/ui/common/cell/player_head_cell", REWARD_CELL = "app/ui/common/cell/reward_cell", + BOUNTY_REWARD_CELL = "app/ui/common/cell/bounty_reward_cell", LARGE_HERO_CELL = "app/ui/common/cell/large_hero_cell", POP_HERO_CELL = "app/ui/shop/cell/pop_hero_cell", POP_REWARD_CELL = "app/ui/shop/cell/pop_reward_cell", @@ -190,10 +192,14 @@ GConst.TYPEOF_LUA_CLASS = { -- comp HERO_FORMATION_COMP = "app/ui/common/component/hero_formation_comp", + + -- tools + POP_CHECK_BAR = "app/ui/activity/pop_check_bar", } GConst.ATLAS_PATH = { COMMON = "assets/arts/atlas/ui/common.asset", + ACT_COMMON = "assets/arts/atlas/ui/act_common.asset", MAIN = "assets/arts/atlas/ui/main.asset", BATTLE = "assets/arts/atlas/ui/battle.asset", DAILY_CHALLENGE = "assets/arts/atlas/ui/daily_challenge.asset", @@ -222,6 +228,8 @@ GConst.ATLAS_PATH = { ACT_SUMMER = "assets/arts/atlas/ui/act_summer.asset", TASK = "assets/arts/atlas/ui/task.asset", ACT_HEROFUND = "assets/arts/atlas/ui/act_herofund.asset", + ACT_BOSS_RUSH = "assets/arts/atlas/ui/act_bossrush.asset", + ACT_COMMON = "assets/arts/atlas/ui/act_common.asset", } GConst.TOUCH_EVENT = { diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 42dbf538..2474d294 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -783,6 +783,12 @@ function GFunc.getRandomIndex(weightArr) return idx end +---- 线性随机数算法 +function GFunc.getRandomIndexBySeed(seed, min, max) + seed = (seed * 9301 + 49297)%233280 + return min + seed*(max - min + 1)//233280 +end + function GFunc.getRewardsStr(rewards) if rewards == nil then return @@ -1420,6 +1426,20 @@ function GFunc.centerTxAndTx(txObj1, txObj2, spacing) txObj2:setAnchoredPositionX(w - txW2 / 2) end +function GFunc.centerTxAndImgAndTx(txObj1, spacing1, imgObj, spacing2, txObj2) + local txW = txObj1:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredWidth + txObj1:setSizeDeltaX(txW) + + local txW2 = txObj2:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredWidth + txObj2:setSizeDeltaX(txW2) + + local imgW = imgObj:getSizeDelta().x + local w = (txW + spacing1 + imgW + spacing2 + txW2) / 2 + txObj1:setAnchoredPositionX(txW / 2 - w) + imgObj:setAnchoredPositionX(txW - w + spacing1 + imgW / 2) + txObj2:setAnchoredPositionX(txW - w + spacing1 + imgW + spacing2 + txW2 / 2) +end + function GFunc.expandImgToFitTx(imgObj, txObj, spacing) spacing = spacing or 0 local txW = txObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredWidth diff --git a/lua/app/module/activity/act_boss_rush.meta b/lua/app/module/activity/act_boss_rush.meta new file mode 100644 index 00000000..87c1dbb4 --- /dev/null +++ b/lua/app/module/activity/act_boss_rush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4bc67b0cb6448474b89b7a92613c0fba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua new file mode 100644 index 00000000..1349e3c6 --- /dev/null +++ b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua @@ -0,0 +1,319 @@ +local ActBossRushManager = class("ActBossRushManager", BaseModule) + +function ActBossRushManager:showMainUI() + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + self:reqTopRank() + UIManager:showUI("app/ui/activity/act_boss_rush/act_boss_rush_ui") +end + +function ActBossRushManager:showFundUI() + UIManager:showUI("app/ui/activity/act_boss_rush/act_boss_rush_fund_ui") +end + +function ActBossRushManager:showRankUI() + self:reqRankList() + UIManager:showUI("app/ui/activity/act_boss_rush/act_boss_rush_rank_ui") +end + +function ActBossRushManager:showShopUI() + UIManager:showUI("app/ui/activity/act_boss_rush/act_boss_rush_shop_ui") +end + +function ActBossRushManager:showPopUI() + UIManager:showUI("app/ui/activity/act_boss_rush/act_boss_rush_pop_ui") + return true +end + +function ActBossRushManager:reqFight() + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + + if not DataManager.ActBossRushData:getFightFree() then + local cost = DataManager.ActBossRushData:getFightCost() + if not GFunc.checkCost(GConst.ItemConst.ITEM_ID_GEM, cost, true) then -- 消耗不足 + return + else + local params ={ + content = I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_1, cost), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + costId = GConst.ItemConst.ITEM_ID_GEM, + costNum = cost, + okFunc = function() + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushStartReq, {}, {}, self.rspFight, BIReport.ITEM_GET_TYPE.ACT_BOSS_RUSH_FIGHT_START) + end, + } + GFunc.showMessageBox(params) + return + end + end + + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushStartReq, {}, {}, self.rspFight, BIReport.ITEM_GET_TYPE.ACT_BOSS_RUSH_FIGHT_START) +end + +function ActBossRushManager:rspFight(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActBossRushData:updateStageSeed(result.seed) + + local params = { + atkFormation = {} + } + local formation = DataManager.FormationData:getBossRushFormation() + for elementType, heroId in pairs(formation) do + local heroEntity = DataManager.HeroData:getHeroById(heroId) + if heroEntity then + params.atkFormation[elementType] = heroEntity + end + end + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, params, function() + UIManager:closeAllUI() + ModuleManager.MaincityManager:showMainCityUI() + ModuleManager.ActBossRushManager:showMainUI() + end) + end +end + +function ActBossRushManager:reqEndBattle(chapterId, combatReport, taskProgress) + local params = { + chapterId = chapterId, + combatReport = combatReport, + task_stat = taskProgress + } + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushSettlementReq, params, {}, self.rspEndBattle, BIReport.ITEM_GET_TYPE.ACT_BOSS_RUSH_FIGHT) +end + +function ActBossRushManager:rspEndBattle(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local wave = result.max_wave or 0 + local round = result.min_round or 0 + DataManager.ActBossRushData:addWaveCount(wave) + DataManager.ActBossRushData:updateWaveAndRound(wave, round) + ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat) + + if result.reqData then + ModuleManager.TaskManager:addFightTaskProgress(result.reqData.task_stat) + end + end +end + +function ActBossRushManager:purcharse(id) + PayManager:purchasePackage(id, PayManager.PURCHARSE_TYPE.ACT_GIFT) +end + +function ActBossRushManager:reqFundAward(level, rewardType) + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + -- -- 直接一键领取 + -- local curLevel = DataManager.ActBossRushData:getWaveLevel() + -- local idWithLv = {} + -- for id = 1, curLevel do + -- if DataManager.ActBossRushData:getFreeCanGet(id) then + -- table.insert(idWithLv, {id = id, grade = 0}) + -- end + + -- if DataManager.ActBossRushData:getProCanGet(id) then + -- table.insert(idWithLv, {id = id, grade = 1}) + -- end + + -- if DataManager.ActBossRushData:getUtralCanGet(id) then + -- table.insert(idWithLv, {id = id, grade = 2}) + -- end + -- end + + -- if not idWithLv[1] then + -- return + -- end + + local params = { + id = level, + grade = rewardType + } + + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushBountyClaimReq, params, {}, self.rspFundAward, BIReport.ITEM_GET_TYPE.ACT_BOSS_RUSH_FUND) +end + +function ActBossRushManager:rspFundAward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + if result.reqData then + if result.reqData.id ~= 0 then + DataManager.ActBossRushData:gotSingleFundReward(result.reqData.id, result.reqData.grade) + end + end + GFunc.showRewardBox(result.rewards) + end +end + +function ActBossRushManager:reqBuyFundLevel() + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + + local cost = DataManager.ActBossRushData:getBuyBountyLevelCost() + if not GFunc.checkCost(cost.id, cost.num, true) then + return + end + + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushBountyUnlockReq, {}, {}, self.rspBuyFundLevel, BIReport.ITEM_GET_TYPE.ACT_BOSS_RUSH_BUY_FUND) +end + +function ActBossRushManager:rspBuyFundLevel(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local addCount = result.accum_wave - DataManager.ActBossRushData:getWaveCount() + if addCount > 0 then + DataManager.ActBossRushData:addWaveCount(addCount) + end + end +end + +function ActBossRushManager:reqExchange(id, count) + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + + if DataManager.ActBossRushData:getExchangeRemainCount(id) < count then + return + end + + local params = { + id = id, + count = count + } + + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushExchangeReq, params, {}, self.rspExchange, BIReport.ITEM_GET_TYPE.ACT_BOSS_RUSH_SHOP) +end + +function ActBossRushManager:rspExchange(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + if result.reqData then + DataManager.ActBossRushData:setShopInfo(result.reqData.id, result.reqData.count) + end + GFunc.showRewardBox(result.rewards) + end +end + +function ActBossRushManager:reqRankReward() + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushRankRewardReq, {}, {}, self.rspRankReward, BIReport.ITEM_GET_TYPE.ACT_BOSS_RUSH_RANK) +end + +function ActBossRushManager:rspRankReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActBossRushData:setGotRankReward() + GFunc.showRewardBox(result.rewards) + end +end + +function ActBossRushManager:reqActData() + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushInfoReq, {}, {}, self.rspActData) +end + +function ActBossRushManager:rspActData(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActBossRushData:init(result.boss_rush) + end +end + +function ActBossRushManager:reqRankList() + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + + if not DataManager.ActBossRushData:getNeedUpdateRank() then + return + end + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushRankReq, {}, {}, self.rspRankList) +end + +function ActBossRushManager:rspRankList(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActBossRushData:updateRankInfo(result) + end +end + +function ActBossRushManager:reqTopRank() + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + + if not DataManager.ActBossRushData:getIsOpen() then + return false + end + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushTopReq, {}, {}, self.rspTopRank) +end + +function ActBossRushManager:rspTopRank(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActBossRushData:updateTopRankInfo(result.top3) + end +end + +function ActBossRushManager:reqFormation(formation) + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + + local heroes = {} + for matchType, heroId in pairs(formation) do + if heroId and heroId > 0 then + table.insert(heroes, heroId) + end + end + local params = { + heroes = heroes + } + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushFormationReq, params, {}, self.rspFormation) +end + +function ActBossRushManager:rspFormation(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.FORMATION_CHANGE, {type = GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH}) + end +end + +function ActBossRushManager:rspBossRushBoughtNtf(result) + if result.bought then + DataManager.ActBossRushData:setProBought() + end + + if result.bought_max then + DataManager.ActBossRushData:setUtralBought() + end +end + +---- 特殊callback, 引用的话，需要注意callback中如果有baseobj需要判定null或销毁状态 +function ActBossRushManager:reqOtherPlayerInfo(playerId, callback) + self.reqOtherPlayerInfoCallback = callback + local params = { + id = playerId + } + self:sendMessage(ProtoMsgType.FromMsgEnum.BossRushPlayerInfoReq, params, {}, self.rspOtherPlayerInfo) +end + +function ActBossRushManager:rspOtherPlayerInfo(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local callback = self.reqOtherPlayerInfoCallback + self.reqOtherPlayerInfoCallback = nil + local formation = GFunc.formatPlayerFormationInfo(result) + if callback then + callback(formation) + end + end + self.reqOtherPlayerInfoCallback = nil +end + +return ActBossRushManager \ No newline at end of file diff --git a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua.meta b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua.meta new file mode 100644 index 00000000..ae3a5f36 --- /dev/null +++ b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 72435753c4dcd0e419a2685ad64955d6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/activity/fourteen_day.meta b/lua/app/module/activity/fourteen_day.meta new file mode 100644 index 00000000..a95d6f9c --- /dev/null +++ b/lua/app/module/activity/fourteen_day.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8cccd7f512852a408f6f2ced012eb95 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/activity/fourteen_day/fourteen_day_const.lua b/lua/app/module/activity/fourteen_day/fourteen_day_const.lua new file mode 100644 index 00000000..d65149d8 --- /dev/null +++ b/lua/app/module/activity/fourteen_day/fourteen_day_const.lua @@ -0,0 +1,12 @@ +local FourteenDayConst = {} + +-- 战令档位 +FourteenDayConst.BOUNTY_GRADE_TYPE = { + FREE = 0, + PAY = 1, +} + +-- 战令礼包id +FourteenDayConst.BOUNTY_GIFT_ID = 140405 + +return FourteenDayConst \ No newline at end of file diff --git a/lua/app/module/activity/fourteen_day/fourteen_day_const.lua.meta b/lua/app/module/activity/fourteen_day/fourteen_day_const.lua.meta new file mode 100644 index 00000000..865ce302 --- /dev/null +++ b/lua/app/module/activity/fourteen_day/fourteen_day_const.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0598bbbceeebf3444bc6ac70ab44861a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/activity/fourteen_day/fourteen_day_manager.lua b/lua/app/module/activity/fourteen_day/fourteen_day_manager.lua new file mode 100644 index 00000000..d09529fa --- /dev/null +++ b/lua/app/module/activity/fourteen_day/fourteen_day_manager.lua @@ -0,0 +1,75 @@ +local FourteenDayManager = class("FourteenDayManager", BaseModule) + +function FourteenDayManager:showFourteenDayUI() + if DataManager.FourteenDayData:getNeedSyncData() then + self:reqSyncData() + end + + local time = DataManager.FourteenDayData:getEndRemainTime() + if time > 0 then + UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_entrance_ui") + else + UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_task_ui") + end +end + +-- 购买活动战令 +function FourteenDayManager:buyBounty() + PayManager:purchasePackage(GConst.FourteenDayConst.BOUNTY_GIFT_ID, PayManager.PURCHARSE_TYPE.ACT_GIFT) +end + +-- 请求任务奖励 +function FourteenDayManager:reqTaskReward(id) + self:sendMessage(ProtoMsgType.FromMsgEnum.FourteenBountyTaskAwardReq, {id = id}, {}, self.rspTaskReward, BIReport.ITEM_GET_TYPE.ACT_FOURTEEN_DAY_TASK) +end + +function FourteenDayManager:rspTaskReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FourteenDayData:onReceivedTaskReward(result.reqData.id) + GFunc.showRewardBox(result.rewards) + end +end + +-- 请求战令奖励 +function FourteenDayManager:reqBountyReward(id, grade) + local list = {} + table.insert(list, {id = id, grade = grade}) + self:sendMessage(ProtoMsgType.FromMsgEnum.FourteenBountyAwardReq, {id_with_lv = list}, {}, self.rspBountyReward, BIReport.ITEM_GET_TYPE.ACT_FOURTEEN_DAY_BOUNTY) +end + +function FourteenDayManager:rspBountyReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FourteenDayData:onReceivedBountyReward(result.id_with_lv) + + GFunc.showRewardBox(result.rewards) + end +end + +-- 请求兑换奖励 +function FourteenDayManager:reqExchangeReward(id, count) + self:sendMessage(ProtoMsgType.FromMsgEnum.FourteenBountyExchangeAwardReq, {id = id, count = count or 0}, {}, self.rspExchangeReward, BIReport.ITEM_GET_TYPE.ACT_FOURTEEN_DAY_EXCHANGE) +end + +function FourteenDayManager:rspExchangeReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + if result.reqData.count then + DataManager.FourteenDayData:onReceivedExchangeReward(result.reqData.id, result.reqData.count) + end + + GFunc.showRewardBox(result.rewards) + end +end + +function FourteenDayManager:reqSyncData() + self:sendMessage(ProtoMsgType.FromMsgEnum.FourteenDayInfoReq, {}, {}, self.rspSyncData) +end + +function FourteenDayManager:rspSyncData(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FourteenDayData:setSyncData() + DataManager.FourteenDayData:initData(result.info) + DataManager.FourteenDayData:setDirty() + end +end + +return FourteenDayManager \ No newline at end of file diff --git a/lua/app/module/activity/fourteen_day/fourteen_day_manager.lua.meta b/lua/app/module/activity/fourteen_day/fourteen_day_manager.lua.meta new file mode 100644 index 00000000..b28b60eb --- /dev/null +++ b/lua/app/module/activity/fourteen_day/fourteen_day_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3f6a2e3ef3d3e3045b4c3cc0fda335bc +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 77505f64..40b9c900 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -88,6 +88,7 @@ BattleConst.BATTLE_TYPE = { ARENA = "5", DUNGEON_WEAPON = "6", DUNGEON_ARMOR = "7", + ACT_BOSS_RUSH = "8", } BattleConst.IS_PVP_BATTLE = { @@ -101,6 +102,7 @@ BattleConst.FORMATION_TYPE = { ARENA_DEFEND = "3",-- 竞技场防守 DUNGEON_WEAPON = "4", -- 武器副本 DUNGEON_ARMOR = "5", -- 支线副本 + BOSS_RUSH = "6", -- boss rush } BattleConst.TYPEOF_LUA_COMP = { diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 58b07f00..319571fe 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -14,6 +14,7 @@ local BATTLE_CONTROLLER = { [BattleConst.BATTLE_TYPE.ARENA] = "app/module/battle/controller/battle_controller_arena", [BattleConst.BATTLE_TYPE.DUNGEON_WEAPON] = "app/module/battle/controller/battle_controller_dungeon_weapon", [BattleConst.BATTLE_TYPE.DUNGEON_ARMOR] = "app/module/battle/controller/battle_controller_dungeon_armor", + [BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH] = "app/module/battle/controller/battle_controller_boss_rush", } function BattleManager:showPauseUI(battleType, battleController) @@ -62,6 +63,14 @@ function BattleManager:showArenaBattleResultUI(settlement, rewards, checkCount) }) end +function BattleManager:showBossRushBattleResultUI(battleType, combatReport, taskProgress) + UIManager:showUI("app/ui/battle/battle_bossrush_result_ui", { + battleType = battleType, + combatReport = combatReport, + taskProgress = taskProgress, + }) +end + function BattleManager:showBoxOpenUI(rewards, callback) UIManager:showUI("app/ui/battle/battle_box_open_ui", {rewards = rewards, callback = callback}) end diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index caa0de46..b0e3ff3f 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1352,6 +1352,10 @@ function BattleUnitComp:addBuff(buffEffect, conditionResult) return self.team:addBuff(buffEffect) end +function BattleUnitComp:judgeBuffEffectEffectNumOverflow(buffEntity) + return self.team:judgeBuffEffectEffectNumOverflow(buffEntity) +end + function BattleUnitComp:getBuffCountByName(buffName) return self.team:getBuffCountByName(buffName) end @@ -1553,6 +1557,9 @@ function BattleUnitComp:takeEffect(buff, target, conditionResult) buffEffect.target = target buffEffect.sender = self buffEffect = target:addBuff(buffEffect, conditionResult) + if not buffEffect then -- 添加buff失败 + return + end end if buffEffect and buffEffect.result then return @@ -1584,6 +1591,9 @@ function BattleUnitComp:reTakeEffectByBuffEffect(buffEffect) if round > 0 then buffEffect.result = nil buffEffect = target:addBuff(buffEffect) + if not buffEffect then -- 添加buff失败 + return + end end if buffEffect and buffEffect.result then return diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index e7b7ad0c..9a38032f 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -108,7 +108,7 @@ function BattleBaseController:refreshWave() if not self.battleUI then return end - self.battleUI:refreshWave(self.waveIndex) + self.battleUI:refreshWave(self:getWaveIndex()) end -- 战斗结束 @@ -153,9 +153,19 @@ function BattleBaseController:getMinEliminationCount() return self.minEliminationCount end -function BattleBaseController:generateNextMonster() +function BattleBaseController:getNextMonsterId(waveIndex) + waveIndex = waveIndex or self:getWaveIndex() + 1 local config = self:getChapterConfig()[self.chapterId] - local monsterId = config.monster[self.waveIndex + 1] + local monsterId = config.monster[waveIndex] + return monsterId +end + +function BattleBaseController:showBossEnterAni(bornTime, bossName, monsterComp, callback) + self.battleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback) +end + +function BattleBaseController:generateNextMonster() + local monsterId = self:getNextMonsterId() if monsterId == nil then return self:enterNextWave() end @@ -185,7 +195,7 @@ function BattleBaseController:generateNextMonster() isBoss = self.defTeam:getIsBoss() if isBoss then local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + self:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() monsterComp:playEnterBattlefield(true, onFinish) end) else @@ -204,7 +214,7 @@ function BattleBaseController:generateNextMonster() isBoss = self.defTeam:getIsBoss() if isBoss then local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + self:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() monsterComp:playEnterBattlefield(false, onFinish) end) else @@ -696,12 +706,12 @@ function BattleBaseController:initAtkUnits(callback) end function BattleBaseController:initDefUnits(callback) - local config = self:getChapterConfig()[self.chapterId] - local initIndex = self.waveIndex - if self.waveIndex <= 0 then + local initIndex = self:getWaveIndex() + if initIndex <= 0 then initIndex = 1 end - local unitEntity = self.battleData:addMonster(config.monster[initIndex], nil, self) + local monsterId = self:getNextMonsterId(initIndex) + local unitEntity = self.battleData:addMonster(monsterId, nil, self) local modelId = unitEntity:getModelId() BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) local monsterComp = spineObject:addLuaComponent(BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) @@ -864,6 +874,22 @@ function BattleBaseController:setTimeScale(timeScale) BattleHelper:setTimeScale(timeScale) end +function BattleBaseController:addWaveIndex(wave) + local origin = self:getWaveIndex() + self.waveIndex = GFunc.encryptNumber(origin + wave) +end + +function BattleBaseController:setWaveIndex(wave) + self.waveIndex = GFunc.encryptNumber(wave) +end + +function BattleBaseController:getWaveIndex() + if self.waveIndex <= 0 then + return 0 + end + return GFunc.decryptNumber(self.waveIndex) +end + function BattleBaseController:_findNextDefUnit() if self.isBossWave then -- 如果上一波是boss波次，则重新生成棋盘 self:putBoardCacheSkill(function() @@ -879,16 +905,17 @@ end ---- start 回合步骤 function BattleBaseController:enterNextWave() - if self.waveIndex ~= 0 and self.curWaveMonsterDead then + local waveIndex = self:getWaveIndex() + if waveIndex ~= 0 and self.curWaveMonsterDead then if self.isBossWave then self:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.KILL_BOSS, 1) else self:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER, 1) end - self:setTaskProgress(BattleConst.BATTLE_TASK_FIELD.PASS_WAVE, self.waveIndex) + self:setTaskProgress(BattleConst.BATTLE_TASK_FIELD.PASS_WAVE, waveIndex) end - if self.waveIndex >= self.maxWaveIndex then + if waveIndex >= self.maxWaveIndex then self.victory = self.curWaveMonsterDead self:postWaveOver(not self.curWaveMonsterDead) self:battleEnd() @@ -903,14 +930,15 @@ function BattleBaseController:enterNextWave() return end - if self.waveIndex ~= 0 then -- 第一波 + if waveIndex ~= 0 then -- 第一波 self:postWaveOver(false) end self.curWaveMonsterDead = false - self.waveIndex = self.waveIndex + 1 - self:refreshWave(self.waveIndex) - if self.waveIndex == 1 then -- 第一波 + self:addWaveIndex(1) + waveIndex = self:getWaveIndex() + self:refreshWave(waveIndex) + if waveIndex == 1 then -- 第一波 self.needWaitingBoardOver = true self:generateBoard(true) else @@ -942,7 +970,7 @@ function BattleBaseController:enterNextWaveBySnapshot(snapShot) end self.curWaveMonsterDead = false - self:refreshWave(self.waveIndex) + self:refreshWave(self:getWaveIndex()) self.needWaitingBoardOver = true self:generateBoard(true, snapShot) @@ -967,7 +995,8 @@ function BattleBaseController:enterRoundBegin() self:resetSideActionCount() self:setCurActionSide(SIDE_ATK) self.needWaitingBoardOver = nil - self.waveRoundCount[self.waveIndex] = (self.waveRoundCount[self.waveIndex] or 0) + 1 + local waveIndex = self:getWaveIndex() + self.waveRoundCount[waveIndex] = (self.waveRoundCount[waveIndex] or 0) + 1 self.battleUI:enterShowBoardAni(function() self:enterEliminationBegin() end) @@ -1147,7 +1176,7 @@ function BattleBaseController:checkTeamIsDead(callback) self:onDefDead(function() self.defTeam:removeAllBuff() if self.battleData:getDefTeam():getIsDead() then - if self.waveIndex >= self.maxWaveIndex then + if self:getWaveIndex() >= self.maxWaveIndex then if callback() then callback() end @@ -1581,7 +1610,7 @@ function BattleBaseController:tryShowSelectSkillComp(needDelay, onlyCommonSkill) self.battleUI:showSelectSkillComp(skillList, onlyCommonSkill) end - BIReport:postShowFightSkillSelect(self.battleType, self.battleData, skillList, self.chapterId, self.totalDurationTime, self.waveIndex) + BIReport:postShowFightSkillSelect(self.battleType, self.battleData, skillList, self.chapterId, self.totalDurationTime, self:getWaveIndex()) end @@ -2325,7 +2354,7 @@ function BattleBaseController:onSelectSkill(skillId, value, pos, side) side = side or self:getCurActionSide() self:dealSelectSkill(skillId, value, side) - BIReport:postFightSkillSelect(self.battleType, self.battleData, {skillId}, self.chapterId, self.totalDurationTime, self.waveIndex) + BIReport:postFightSkillSelect(self.battleType, self.battleData, {skillId}, self.chapterId, self.totalDurationTime, self:getWaveIndex()) local elementType = ModuleManager.HeroManager:getSkillRoguePosition(skillId) if elementType then @@ -3050,8 +3079,9 @@ function BattleBaseController:battleEnd() end -- 处理战斗任务 + local curWaveIndex = self:getWaveIndex() if self.victory then - self:setTaskProgress(GConst.BattleConst.BATTLE_TASK_FIELD.KILLS_BOSS_TURN, self.waveRoundCount[self.waveIndex]) + self:setTaskProgress(GConst.BattleConst.BATTLE_TASK_FIELD.KILLS_BOSS_TURN, self.waveRoundCount[curWaveIndex]) end local teamEntity = self.battleData:getAtkTeam() @@ -3060,7 +3090,13 @@ function BattleBaseController:battleEnd() local totalRound = 0 for wave, round in pairs(self.waveRoundCount) do - totalRound = totalRound + round + if wave == curWaveIndex then + if self.victory then + totalRound = totalRound + round + end + else + totalRound = totalRound + round + end end self:setTaskProgress(GConst.BattleConst.BATTLE_TASK_FIELD.TOTAL_TURN, totalRound) -- end处理战斗任务 diff --git a/lua/app/module/battle/controller/battle_controller_arena.lua b/lua/app/module/battle/controller/battle_controller_arena.lua index f04055c9..019c5be0 100644 --- a/lua/app/module/battle/controller/battle_controller_arena.lua +++ b/lua/app/module/battle/controller/battle_controller_arena.lua @@ -52,9 +52,9 @@ end function BattleControllerArena:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.ARENA, - wave = self.waveIndex, + wave = self:getWaveIndex(), victory = self.victory, - round = self.waveRoundCount[self.waveIndex] or 0 + round = self.waveRoundCount[self:getWaveIndex()] or 0 } local atkReport = {} local teamEntity = self.battleData:getAtkTeam() @@ -119,14 +119,14 @@ function BattleControllerArena:postWaveOver(atkDead, isQuit) local totalTime = self.totalDurationTime local startTimes = DataManager.ArenaData:getTotalFightCount() local isFirstWin = false - local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex - BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.ARENA, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.ARENA, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerArena:postFightStart() local startTimes = DataManager.ArenaData:getTotalFightCount() - BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.ARENA, self.waveIndex, self.chapterId, self.chapterId, startTimes) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.ARENA, self:getWaveIndex(), self.chapterId, self.chapterId, startTimes) end function BattleControllerArena:getAtkMinRow() diff --git a/lua/app/module/battle/controller/battle_controller_boss_rush.lua b/lua/app/module/battle/controller/battle_controller_boss_rush.lua new file mode 100644 index 00000000..22fb47ad --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_boss_rush.lua @@ -0,0 +1,215 @@ +local BattleController = require "app/module/battle/controller/battle_controller" +local BattleControllerBossRush = class("BattleControllerBossRush", BattleController) +local SIDE_ATK = GConst.BattleConst.SIDE_ATK +local MAX_LV = 41 + +function BattleControllerBossRush:getBoardConfig() + return ConfigManager:getConfig("chapter_board_bossrush") +end + +function BattleControllerBossRush:getChapterConfig() + return ConfigManager:getConfig("activity_boss_rush_chapter") +end + +---- 障碍格子图片 +function BattleControllerBossRush:getBlockIcon() + return "battle_hinder_4" +end + +function BattleControllerBossRush:getChessBoardBgName() + return "chessboard_1" +end + +function BattleControllerBossRush:getScene() + return "boss_rush" +end + +function BattleControllerBossRush:getChapterId() + return 1 +end + +function BattleControllerBossRush:getMaxWave() + self:getInitBoard() + return #self.monsterList +end + +function BattleControllerBossRush:getInitBoard() + if not self.boradList then + self.boradList = {} + self.fixedRandomGrid = {} + self.mysteryBoxIndexMap = {} + self.monsterList = {} + + local boardCfg = self:getBoardConfig() + for _, id in ipairs(DataManager.ActBossRushData:getStageList()) do + local info = self:getChapterConfig()[id] + if info then + for index, montserId in ipairs(info.monster) do + table.insert(self.monsterList, montserId) + end + local cfg = boardCfg[info.board] + if cfg then + table.insert(self.boradList, {board = GFunc.getTable(cfg.board), gridEdge = GFunc.getTable(cfg.grid_edge)}) + end + end + end + end + + return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap +end + +function BattleControllerBossRush:onLoadComplete(...) + -- 处理技能 + local unlockAllSkill = function(side) + local skillPool = self.battleData:getSkillPool(side) + if skillPool then + for elementType, list in pairs(skillPool) do -- 先遍历一下未解锁的技能 + if not self.battleData:isUnlockedSkillElementType(elementType, side) then + local skillEntity = self.battleData:getSkillEntityByElement(elementType, side) + if skillEntity then + local skillId = skillEntity:getUnlockId() + if skillId then + self:dealSelectSkill(skillId, nil, side) + end + end + end + end + self.battleUI:refreshSkill(nil, nil, side) + end + end + unlockAllSkill(SIDE_ATK) + + BattleController.onLoadComplete(self, ...) +end + +function BattleControllerBossRush:initOther() + self.monsterAtkAddition1 = GFunc.getConstIntValue("activity_boss_rush_atk_add_1") + self.monsterHpAddition1 = GFunc.getConstIntValue("activity_boss_rush_hp_add_1") + self.monsterAtkAddition2 = GFunc.getConstIntValue("activity_boss_rush_atk_add_2") + self.monsterHpAddition2 = GFunc.getConstIntValue("activity_boss_rush_hp_add_2") + self.monsterAtkAddition3 = GFunc.getConstIntValue("activity_boss_rush_atk_add_3") + self.monsterHpAddition3 = GFunc.getConstIntValue("activity_boss_rush_hp_add_3") + self.battleData:setMaxBattleLv(MAX_LV) +end + +-- 怪物攻击力加成 +function BattleControllerBossRush:getMonsterAtkAddition() + local waveIndex = self:getWaveIndex() + local index = waveIndex + local addtion = 0 + if not self.lastAtkWaveIndex ~= waveIndex then + self.lastAtkWaveIndex = waveIndex + index = waveIndex + 1 + else + index = self.lastAtkWaveIndex + end + if index <= 20 then + addtion = self.monsterAtkAddition1 + elseif index <= 50 then + addtion = self.monsterAtkAddition2 + else + addtion = self.monsterAtkAddition3 + end + return addtion * index +end + +-- 怪物血量加成 +function BattleControllerBossRush:getMonsterHpAddition() + local waveIndex = self:getWaveIndex() + local index = waveIndex + local addtion = 0 + if not self.lastHpWaveIndex ~= waveIndex then + self.lastHpWaveIndex = waveIndex + index = waveIndex + 1 + else + index = self.lastHpWaveIndex + end + if index <= 20 then + addtion = self.monsterHpAddition1 + elseif index <= 50 then + addtion = self.monsterHpAddition2 + else + addtion = self.monsterHpAddition3 + end + return addtion * index +end + +function BattleControllerBossRush:getNextMonsterId(waveIndex) + self:getInitBoard() + waveIndex = waveIndex or self:getWaveIndex() + 1 + return self.monsterList[waveIndex] +end + +function BattleControllerBossRush:showBossEnterAni(bornTime, bossName, monsterComp, callback) + if callback then + callback() + end +end + +function BattleControllerBossRush:addBattleExp(...) + if self.battleData:getBattleLv() >= MAX_LV then -- 只能升级60次 + return + end + + BattleController.addBattleExp(self, ...) +end + +function BattleControllerBossRush:controllBattleEnd() + self.combatReport = { + battleType = GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, + wave = self:getWaveIndex(), + victory = self.victory, + } + local atkReport = {} + local teamEntity = self.battleData:getAtkTeam() + local members = teamEntity:getAllMembers() + local heroInfo = {} + for k, v in pairs(members) do + local report = { + heroId = v:getId(), + dmg = v:getDamageCount(), + } + table.insert(atkReport, report) + heroInfo[v:getId()] = { + skill_cast = v:getActiveSkillReleaseCount(), + Damage = v:getDamageCount(), + } + end + self.combatReport.atkReport = atkReport + if not self.victory then + self.combatReport.wave = self.combatReport.wave - 1 + end + ModuleManager.ActBossRushManager:reqEndBattle(self.chapterId, self.combatReport, self.taskProgress) +end + +function BattleControllerBossRush:postWaveOver(atkDead, isQuit) + local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE + local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN + if atkDead then + if self.isBossWave then + deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL + else + deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL + end + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL + end + + if isQuit then + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT + end + + local duration = self.waveDurationTime + local totalTime = self.totalDurationTime + local startTimes = DataManager.ActBossRushData:getTotalFightCount() + local isFirstWin = false + + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex + + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) +end + +function BattleControllerBossRush:postFightStart() + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, self:getWaveIndex(), self.chapterId, nil, 1) +end + +return BattleControllerBossRush \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_boss_rush.lua.meta b/lua/app/module/battle/controller/battle_controller_boss_rush.lua.meta new file mode 100644 index 00000000..1bba7dde --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_boss_rush.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ead83638337227e4dba003425edda9df +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua index dbc39fed..d4272853 100644 --- a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua +++ b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua @@ -85,7 +85,7 @@ end function BattleControllerDailyChallenge:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, - wave = self.waveIndex, + wave = self:getWaveIndex(), victory = self.victory, } local atkReport = {} @@ -132,13 +132,13 @@ function BattleControllerDailyChallenge:postWaveOver(atkDead, isQuit) local startTimes = DataManager.DailyChallengeData:getTotalFightCount() local isFirstWin = false -- TODO 策划说不需要 因为系数在变 - local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex - BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerDailyChallenge:postFightStart() - BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, self.waveIndex, self.chapterId, nil, 1) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, self:getWaveIndex(), self.chapterId, nil, 1) end return BattleControllerDailyChallenge \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_armor.lua b/lua/app/module/battle/controller/battle_controller_dungeon_armor.lua index 42d13298..fe122fad 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_armor.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_armor.lua @@ -17,7 +17,7 @@ end function BattleControllerDungeonArmor:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, - wave = self.waveIndex, + wave = self:getWaveIndex(), victory = self.victory, } local atkReport = {} @@ -62,16 +62,16 @@ function BattleControllerDungeonArmor:postWaveOver(atkDead, isQuit) isFirstWin = true end - local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex - BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerDungeonArmor:postFightStart() local armorData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR) local startTimes = armorData:getChapterFightCount(self.chapterId) local unlockMaxChapter = armorData:getPassedMaxId() + 1 - BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, self.waveIndex, self.chapterId, unlockMaxChapter, startTimes) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, self:getWaveIndex(), self.chapterId, unlockMaxChapter, startTimes) end return BattleControllerDungeonArmor \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index 2d3a1107..1c9a1e48 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -19,7 +19,7 @@ end function BattleControllerDungeonGold:enterRoundBegin(...) local nextWaveRound = 0 if self.dungeonGoldMaxRoundCount then - nextWaveRound = (self.waveRoundCount[self.waveIndex] or 0) + 1 + nextWaveRound = (self.waveRoundCount[self:getWaveIndex()] or 0) + 1 if self.dungeonGoldMaxRoundCount < nextWaveRound then -- 超过最大回合, 直接结算 self.victory = false self:postWaveOver(false) @@ -46,7 +46,7 @@ function BattleControllerDungeonGold:controllBattleEnd() local remainRound = self.dungeonGoldMaxRoundCount - (self.waveRoundCount[1] or 0) self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, - wave = self.waveIndex, + wave = self:getWaveIndex(), victory = self.victory, remainRound = remainRound, } @@ -94,14 +94,14 @@ function BattleControllerDungeonGold:postWaveOver(atkDead, isQuit) isFirstWin = true end - local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex - BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerDungeonGold:postFightStart() local unlockMaxChapter = DataManager.DungeonData:getUnlockMaxId(ModuleManager.MODULE_KEY.DUNGEON_GOLD) - BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_GOLD, self.chapterId)) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, self:getWaveIndex(), self.chapterId, unlockMaxChapter, DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_GOLD, self.chapterId)) end return BattleControllerDungeonGold \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua index 56dc2fb7..80bedbe5 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua @@ -16,7 +16,7 @@ end function BattleControllerDungeonShards:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, - wave = self.waveIndex, + wave = self:getWaveIndex(), victory = self.victory, } local atkReport = {} @@ -62,14 +62,14 @@ function BattleControllerDungeonShards:postWaveOver(atkDead, isQuit) isFirstWin = true end - local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex - BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerDungeonShards:postFightStart() local unlockMaxChapter = DataManager.DungeonData:getUnlockMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) - BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_SHARDS, self.chapterId)) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, self:getWaveIndex(), self.chapterId, unlockMaxChapter, DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_SHARDS, self.chapterId)) end return BattleControllerDungeonShards \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua b/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua index c807d108..9612880a 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua @@ -17,7 +17,7 @@ end function BattleControllerDungeonWeapon:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, - wave = self.waveIndex, + wave = self:getWaveIndex(), victory = self.victory, } local atkReport = {} @@ -62,16 +62,16 @@ function BattleControllerDungeonWeapon:postWaveOver(atkDead, isQuit) isFirstWin = true end - local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex - BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerDungeonWeapon:postFightStart() local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) local startTimes = weaponData:getChapterFightCount(self.chapterId) local unlockMaxChapter = weaponData:getPassedMaxId() + 1 - BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, self.waveIndex, self.chapterId, unlockMaxChapter, startTimes) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, self:getWaveIndex(), self.chapterId, unlockMaxChapter, startTimes) end return BattleControllerDungeonWeapon \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_pvp.lua b/lua/app/module/battle/controller/battle_controller_pvp.lua index fc869273..edc3da4b 100644 --- a/lua/app/module/battle/controller/battle_controller_pvp.lua +++ b/lua/app/module/battle/controller/battle_controller_pvp.lua @@ -290,7 +290,8 @@ function BattleControllerPVP:checkDefBoard() end function BattleControllerPVP:enterRoundBegin(...) - local nextWaveRound = (self.waveRoundCount[self.waveIndex] or 0) + 1 + local waveIndex = self:getWaveIndex() + local nextWaveRound = (self.waveRoundCount[waveIndex] or 0) + 1 if self:getMaxRoundCount() < nextWaveRound then -- 超过最大回合, 直接结算 self.victory = false self:postWaveOver(false) @@ -298,13 +299,13 @@ function BattleControllerPVP:enterRoundBegin(...) return end local isFirstWaveFirstRound = false - if self.waveIndex == 1 and nextWaveRound == 1 then + if waveIndex == 1 and nextWaveRound == 1 then isFirstWaveFirstRound = true end self:resetSideActionCount() self:setCurActionSide(SIDE_ATK) self.needWaitingBoardOver = nil - self.waveRoundCount[self.waveIndex] = (self.waveRoundCount[self.waveIndex] or 0) + 1 + self.waveRoundCount[waveIndex] = (self.waveRoundCount[waveIndex] or 0) + 1 self.battleUI:enterShowBoardAni(function() self:enterEliminationBegin() end, isFirstWaveFirstRound) @@ -316,7 +317,7 @@ function BattleControllerPVP:refreshWave() if not self.battleUI then return end - self.battleUI:refreshWave(self.waveRoundCount[self.waveIndex] or 0) + self.battleUI:refreshWave(self.waveRoundCount[self:getWaveIndex()] or 0) end return BattleControllerPVP \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index cad43468..017998bc 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -57,7 +57,7 @@ end function BattleControllerStage:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.STAGE, - wave = self.waveIndex, + wave = self:getWaveIndex(), victory = self.victory, } local atkReport = {} @@ -101,14 +101,14 @@ function BattleControllerStage:postWaveOver(atkDead, isQuit) isFirstWin = true end - local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex - BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.STAGE, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.STAGE, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerStage:postFightStart() local unlockMaxChapter = DataManager.ChapterData:getNewChapterId() - BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.STAGE, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.ChapterData:getChapterFightCount(self.chapterId)) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.STAGE, self:getWaveIndex(), self.chapterId, unlockMaxChapter, DataManager.ChapterData:getChapterFightCount(self.chapterId)) end return BattleControllerStage \ No newline at end of file diff --git a/lua/app/module/battle/helper/battle_snapshot_helper.lua b/lua/app/module/battle/helper/battle_snapshot_helper.lua index 5a42d049..dc2dab3d 100644 --- a/lua/app/module/battle/helper/battle_snapshot_helper.lua +++ b/lua/app/module/battle/helper/battle_snapshot_helper.lua @@ -52,7 +52,7 @@ function BattleSnapshotHelper:snapshotBattleInfo(battleBaseController) end battleBaseController.snapShotInfo.curBoardIndex = battleBaseController.curBoardIndex battleBaseController.snapShotInfo.chapterId = battleBaseController.chapterId -- 当前战斗关卡 - battleBaseController.snapShotInfo.waveIndex = battleBaseController.waveIndex -- 当前波次 + battleBaseController.snapShotInfo.waveIndex = battleBaseController:getWaveIndex() -- 当前波次 battleBaseController.snapShotInfo.gotMysteryBoxIndexs = table.clearOrCreate(battleBaseController.snapShotInfo.gotMysteryBoxIndexs) -- 神秘宝箱索引 for k, v in pairs(battleBaseController.gotMysteryBoxIndexs) do battleBaseController.snapShotInfo.gotMysteryBoxIndexs[tostring(k)] = v @@ -168,7 +168,7 @@ function BattleSnapshotHelper:dealSnapshotBattleBaseInfo(battleBaseController, s end battleBaseController.chapterId = snapInfo.chapterId - battleBaseController.waveIndex = snapInfo.waveIndex + battleBaseController:setWaveIndex(snapInfo.waveIndex) battleBaseController.maxWaveIndex = battleBaseController:getMaxWave() if snapInfo.gotMysteryBoxIndexs then diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 70fbf3cc..9c53a9fa 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -11,6 +11,7 @@ function BattleTeam:init(side, battleController) self.unitMap = {} self.buffList = {} self.sameBuffCount = {} + self.sameBuffEffectNum = {} -- 相同的buff参数，用于判定buff数值上限 self.shieldBuffList = {} self.loopFxMap = {} self.comboCount = 0 @@ -265,9 +266,14 @@ function BattleTeam:handleShield(reduceShield, unit) if needReedRefreshBuff then self.battleController:refreshBuff(self.side, self.buffList) end + self:calSameBuffEffectNum() end function BattleTeam:addBuff(buffEffect) + if not self:judgeBuffEffectEffectNumOverflow(buffEffect.buff) then + return + end + local stack = buffEffect.buff:getStack() local needRecycle if not stack or stack == BattleConst.BUFF_STACK_TYPE.CANT_ADD then @@ -337,6 +343,7 @@ function BattleTeam:addBuff(buffEffect) self.battleController:refreshBuff(self.side, self.buffList) end + self:calSameBuffEffectNum() return needRecycle end @@ -364,6 +371,7 @@ function BattleTeam:removeAllBuff() end self.battleController:clearBuff(self.side) + self:calSameBuffEffectNum() end function BattleTeam:putCacheBuff(buffEffect) @@ -402,6 +410,8 @@ function BattleTeam:putCacheBuffByDecr(buffDecr) if needRefresh then self.battleController:refreshBuff(self.side, self.buffList) end + + self:calSameBuffEffectNum() end function BattleTeam:popCacheBuffByDecr(buffDecr) @@ -426,6 +436,48 @@ function BattleTeam:popCacheBuffByDecr(buffDecr) if needRefresh then self.battleController:refreshBuff(self.side, self.buffList) end + + self:calSameBuffEffectNum() +end + +function BattleTeam:calSameBuffEffectNum() + if not self.buffList then + return + end + self.sameBuffEffectNum = table.clearOrCreate(self.sameBuffEffectNum) + for _, buffEffect in ipairs(self.buffList) do + local buffEntity = buffEffect.buff + if buffEntity then + local buffName = buffEntity:getName() + local buffNum = buffEntity:getEffectNum() + if buffName and buffNum then + self.sameBuffEffectNum[buffName] = (self.sameBuffEffectNum[buffName] or 0) + buffNum + end + end + end +end + +function BattleTeam:judgeBuffEffectEffectNumOverflow(buffEntity) + if not buffEntity then + return true + end + local limitNum = buffEntity:getLimitParameter() + if not limitNum then + return true + end + + local buffName = buffEntity:getName() + local buffNum = buffEntity:getEffectNum() + local curNum = self.sameBuffEffectNum[buffName] or 0 + local remainNum = limitNum - curNum + if remainNum <= 0 then -- 已经超出上限了，直接返回失败 + return false + end + + if buffNum > remainNum then + buffEntity:setEffectNum(remainNum) + end + return true end function BattleTeam:doBuffWork() @@ -473,6 +525,8 @@ function BattleTeam:doBuffWork() end end self.battleController:refreshBuff(self.side, self.buffList) + + self:calSameBuffEffectNum() end -- 比如复活类，需要最后触发buff @@ -514,6 +568,7 @@ function BattleTeam:doFinalBuffWork() if refreshUI then self.battleController:refreshBuff(self.side, self.buffList) end + self:calSameBuffEffectNum() end function BattleTeam:removeBuffByName(buffName) @@ -531,6 +586,7 @@ function BattleTeam:removeBuffByName(buffName) end end self.battleController:refreshBuff(self.side, self.buffList) + self:calSameBuffEffectNum() end function BattleTeam:updateBuffState(buff, num) diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index add2c3c2..afcad13c 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -19,6 +19,8 @@ function ChapterManager:openBoxFinish(result) DataManager.ChapterData:openBox(reqData.chapter_id, reqData.wave) BIReport:postChapterOpenBox(reqData.chapter_id, DataManager.ChapterData:getChapterBoxNum(reqData.chapter_id, reqData.wave), result.rewards) + + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX) end end diff --git a/lua/app/module/common/common_manager.lua b/lua/app/module/common/common_manager.lua index 7db46857..3179fd66 100644 --- a/lua/app/module/common/common_manager.lua +++ b/lua/app/module/common/common_manager.lua @@ -22,4 +22,16 @@ function CommonManager:showFormationUI(formationType) UIManager:showUI("app/ui/common/common_formation_ui", params) end +function CommonManager:showExchangeUI(defaultNum, remainNum, reward, cost, callback) + local params = { + defaultNum = defaultNum, + remainNum = remainNum, + reward = reward, + cost = cost, + callback = callback + } + + UIManager:showUI("app/ui/common/common_exchange_ui", params) +end + return CommonManager \ 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 c196ea15..05efa73c 100644 --- a/lua/app/module/daily_challenge/daily_challenge_manager.lua +++ b/lua/app/module/daily_challenge/daily_challenge_manager.lua @@ -126,6 +126,10 @@ function DailyChallengeManager:endChallengeFinish(result) end end BIReport:postDailyChallengeTaskState(completedCount, taskInfo) + + if result.reqData.win then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_DAILY_CHALLENGE_SUCCESS) + end end end diff --git a/lua/app/module/equip/equip_manager.lua b/lua/app/module/equip/equip_manager.lua index cfab2b57..c03c69f9 100644 --- a/lua/app/module/equip/equip_manager.lua +++ b/lua/app/module/equip/equip_manager.lua @@ -81,6 +81,12 @@ end function EquipManager:rspUpgrade(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.EquipData:onUpgradeEquip(result.reqData.hero_id, result.reqData.position) + + if result.reqData.position == GConst.EquipConst.PART_TYPE.WEAPON then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON) + else + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR) + end end end diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index bdb09876..560531a4 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -16,6 +16,7 @@ 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_ID_FOURTEEN_DAY_EXCHANGE = 51 ItemConst.ITEM_TYPE = { RES = 1, diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index db1c2537..befe56f5 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -30,6 +30,8 @@ MainCityConst.MAIN_MODULE = { MainCityConst.LEFT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_idle_cell", "app/ui/main_city/cell/side_bar_growth_fund_cell", + "app/ui/main_city/cell/side_bar_boss_rush_cell", + "app/ui/main_city/cell/side_bar_fourteen_day_cell", "app/ui/main_city/cell/side_bar_hero_fund_cell", "app/ui/main_city/cell/side_bar_seven_days_cell", "app/ui/main_city/cell/side_bar_activity_cell", diff --git a/lua/app/module/task/task_const.lua b/lua/app/module/task/task_const.lua index c3a7c27a..c2a102d5 100644 --- a/lua/app/module/task/task_const.lua +++ b/lua/app/module/task/task_const.lua @@ -31,6 +31,15 @@ TaskConst.TASK_TYPE = { X_OPEN_SHOP_BOX_LEVEL_1 = 28, -- 商城里的1级抽卡宝箱 X_OPEN_SHOP_BOX_LEVEL_2 = 29, -- 商城里的2级抽卡宝箱 X_ARENA_CHALLENGE = 30, -- 竞技场挑战 + X_ARENA_GRADING = 31, -- 竞技场段位 + X_DUNGEON_SHARDS = 32, -- 副本通x关：碎片 + X_DUNGEON_ARMOR = 33, -- 副本通x关：防具 + X_DUNGEON_GOLD = 34, -- 副本通x关：金币 + X_DUNGEON_WEAPON = 35, -- 副本通x关：武器 + X_DAILY_CHALLENGE_SUCCESS = 36, -- 每日挑战通关次数 + X_OPEN_CHAPTER_BOX = 37, -- 开启主线宝箱x个 + X_UPGRADE_WEAPON = 38, -- 武器升级x次 + X_UPGRADE_ARMOR = 39, -- 防具升级x次 } return TaskConst \ No newline at end of file diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 38f6b677..0f6ad958 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -274,6 +274,42 @@ function TaskManager:xArenaChallenge() self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE, 1) end +function TaskManager:xArenaGradingScore(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING, count) +end + +function TaskManager:xDungeonShards(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_SHARDS, count) +end + +function TaskManager:xDungeonGold(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_GOLD, count) +end + +function TaskManager:xDungeonWeapon(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_WEAPON, count) +end + +function TaskManager:xDungeonArmor(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR, count) +end + +function TaskManager:xDailyChallengeSuccess() + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DAILY_CHALLENGE_SUCCESS, 1) +end + +function TaskManager:xOpenChapterBox() + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX, 1) +end + +function TaskManager:xUpgradeWeapon() + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON, 1) +end + +function TaskManager:xUpgradeArmor() + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR, 1) +end + ---- 没有特殊说明，方法均返回任务增量 TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd, @@ -304,6 +340,15 @@ TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_2] = TaskManager.xOpenShopBoxLevel2, [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3] = TaskManager.xOpenShopBoxLevel3, [GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE] = TaskManager.xArenaChallenge, + [GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING] = TaskManager.xArenaGradingScore, + [GConst.TaskConst.TASK_TYPE.X_DUNGEON_SHARDS] = TaskManager.xDungeonShards, + [GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR] = TaskManager.xDungeonArmor, + [GConst.TaskConst.TASK_TYPE.X_DUNGEON_GOLD] = TaskManager.xDungeonGold, + [GConst.TaskConst.TASK_TYPE.X_DUNGEON_WEAPON] = TaskManager.xDungeonWeapon, + [GConst.TaskConst.TASK_TYPE.X_DAILY_CHALLENGE_SUCCESS] = TaskManager.xDailyChallengeSuccess, + [GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX] = TaskManager.xOpenChapterBox, + [GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON] = TaskManager.xUpgradeWeapon, + [GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR] = TaskManager.xUpgradeArmor, } function TaskManager:taskGoto(taskType) diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index da3adff9..d785e5ca 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -26,6 +26,8 @@ local ProtoMsgType = { [448797406] = "ChapterArmorChallengeHeroesRsp", [516281556] = "GuideFundMarkReq", [516283389] = "GuideFundMarkRsp", + [524551468] = "FourteenBountyAwardReq", + [524553301] = "FourteenBountyAwardRsp", [531558517] = "PigPlayUpdateNtf", [554454681] = "EnergyByDiamondReq", [554456514] = "EnergyByDiamondRsp", @@ -33,6 +35,8 @@ local ProtoMsgType = { [606210585] = "DailyChallengeTaskAwardRsp", [613793796] = "WatchADReq", [613795629] = "WatchADRsp", + [697000709] = "FourteenBountyTaskAwardReq", + [697002542] = "FourteenBountyTaskAwardRsp", [737107384] = "BuyMallIdleReq", [737109217] = "BuyMallIdleRsp", [822916593] = "MatchReq", @@ -53,6 +57,10 @@ local ProtoMsgType = { [1068771132] = "ReconnectRsp", [1070841461] = "LoginReq", [1070843294] = "LoginRsp", + [1312685858] = "BossRushTopReq", + [1312687691] = "BossRushTopRsp", + [1326064687] = "FourteenBountyExchangeAwardReq", + [1326066520] = "FourteenBountyExchangeAwardRsp", [1371198132] = "ChapterShardsChallengeSettlementReq", [1371199965] = "ChapterShardsChallengeSettlementRsp", [1433352538] = "ChapterDailyChallengeResetReq", @@ -61,6 +69,8 @@ local ProtoMsgType = { [1435949623] = "AppStorePaidRsp", [1471116409] = "BindReq", [1471118242] = "BindRsp", + [1478006910] = "BossRushBountyClaimReq", + [1478008743] = "BossRushBountyClaimRsp", [1502684232] = "ChapterWeaponChallengeHeroesReq", [1502686065] = "ChapterWeaponChallengeHeroesRsp", [1571167683] = "ChapterArmorChallengeFarmReq", @@ -84,6 +94,8 @@ local ProtoMsgType = { [1751460231] = "PVPHeroesArrayReq", [1751462064] = "PVPHeroesArrayRsp", [1901321540] = "PipedReq", + [2017336372] = "BossRushSettlementReq", + [2017338205] = "BossRushSettlementRsp", [2060508030] = "ChangeAvatarFrameReq", [2060509863] = "ChangeAvatarFrameRsp", [2095612947] = "ChangeNameReq", @@ -92,10 +104,15 @@ local ProtoMsgType = { [2105156478] = "CDKeyUseRsp", [2118851896] = "HeroUpgradeReq", [2118853729] = "HeroUpgradeRsp", + [2164009445] = "BossRushStartReq", + [2164011278] = "BossRushStartRsp", + [2198847028] = "BossRushBoughtNtf", [2285872137] = "ChapterBoxRewardReq", [2285873970] = "ChapterBoxRewardRsp", [2314118791] = "ChapterWeaponLatestPlayerInfoReq", [2314120624] = "ChapterWeaponLatestPlayerInfoRsp", + [2420360424] = "FourteenDayInfoReq", + [2420362257] = "FourteenDayInfoRsp", [2429586383] = "MailCycleReq", [2429588216] = "MailCycleRsp", [2467213182] = "ChapterWeaponChallengeFarmReq", @@ -116,6 +133,8 @@ local ProtoMsgType = { [2581182822] = "MailListRsp", [2620369240] = "SevenDayRewardReq", [2620371073] = "SevenDayRewardRsp", + [2665299111] = "BossRushInfoReq", + [2665300944] = "BossRushInfoRsp", [2706989220] = "TriggerGrowUpGift2Ntf", [2708281176] = "PVPChallengeSettlementReq", [2708283009] = "PVPChallengeSettlementRsp", @@ -145,6 +164,8 @@ local ProtoMsgType = { [3082272573] = "ChapterArmorFundRewardRsp", [3087688987] = "IdleRewardReq", [3087690820] = "IdleRewardRsp", + [3123310542] = "BossRushRankRewardReq", + [3123312375] = "BossRushRankRewardRsp", [3137310682] = "ActPayNtf", [3137377372] = "ActPayReq", [3137379205] = "ActPayRsp", @@ -152,8 +173,12 @@ local ProtoMsgType = { [3191521707] = "ChapterArmorStarRewardReq", [3191523540] = "ChapterArmorStarRewardRsp", [3197501935] = "ArenaBountyBoughtNtf", + [3209780877] = "BossRushRankReq", + [3209782710] = "BossRushRankRsp", [3224230499] = "SevenDayTaskRewardReq", [3224232332] = "SevenDayTaskRewardRsp", + [3274332802] = "BossRushBountyUnlockReq", + [3274334635] = "BossRushBountyUnlockRsp", [3309820798] = "HeroPutOnReq", [3309822631] = "HeroPutOnRsp", [3341173994] = "BountyBoughtNtf", @@ -168,6 +193,8 @@ local ProtoMsgType = { [3421843875] = "TaskDailyRewardReq", [3421845708] = "TaskDailyRewardRsp", [3440328467] = "PigLevelUpNtf", + [3512214338] = "BossRushPlayerInfoReq", + [3512216171] = "BossRushPlayerInfoRsp", [3555824176] = "TaskDailyInfoReq", [3555826009] = "TaskDailyInfoRsp", [3597633120] = "BattleSkillRefreshReq", @@ -182,6 +209,8 @@ local ProtoMsgType = { [3663247602] = "MallDailyResetNtf", [3663314292] = "MallDailyResetReq", [3663316125] = "MallDailyResetRsp", + [3694862366] = "BossRushFormationReq", + [3694864199] = "BossRushFormationRsp", [3739566473] = "SummerDataReq", [3739568306] = "SummerDataRsp", [3741702491] = "MallDailyOverDayReq", @@ -198,6 +227,8 @@ local ProtoMsgType = { [3904150593] = "GMRsp", [3933875617] = "ChapterStartReq", [3933877450] = "ChapterStartRsp", + [4099982754] = "BossRushExchangeReq", + [4099984587] = "BossRushExchangeRsp", [4106156009] = "BountyLevelUnlockReq", [4106157842] = "BountyLevelUnlockRsp", [4133057746] = "ChapterGoldChallengeFarmReq", @@ -242,6 +273,8 @@ local ProtoMsgType = { ChapterArmorChallengeHeroesRsp = 448797406, GuideFundMarkReq = 516281556, GuideFundMarkRsp = 516283389, + FourteenBountyAwardReq = 524551468, + FourteenBountyAwardRsp = 524553301, PigPlayUpdateNtf = 531558517, EnergyByDiamondReq = 554454681, EnergyByDiamondRsp = 554456514, @@ -249,6 +282,8 @@ local ProtoMsgType = { DailyChallengeTaskAwardRsp = 606210585, WatchADReq = 613793796, WatchADRsp = 613795629, + FourteenBountyTaskAwardReq = 697000709, + FourteenBountyTaskAwardRsp = 697002542, BuyMallIdleReq = 737107384, BuyMallIdleRsp = 737109217, MatchReq = 822916593, @@ -269,6 +304,10 @@ local ProtoMsgType = { ReconnectRsp = 1068771132, LoginReq = 1070841461, LoginRsp = 1070843294, + BossRushTopReq = 1312685858, + BossRushTopRsp = 1312687691, + FourteenBountyExchangeAwardReq = 1326064687, + FourteenBountyExchangeAwardRsp = 1326066520, ChapterShardsChallengeSettlementReq = 1371198132, ChapterShardsChallengeSettlementRsp = 1371199965, ChapterDailyChallengeResetReq = 1433352538, @@ -277,6 +316,8 @@ local ProtoMsgType = { AppStorePaidRsp = 1435949623, BindReq = 1471116409, BindRsp = 1471118242, + BossRushBountyClaimReq = 1478006910, + BossRushBountyClaimRsp = 1478008743, ChapterWeaponChallengeHeroesReq = 1502684232, ChapterWeaponChallengeHeroesRsp = 1502686065, ChapterArmorChallengeFarmReq = 1571167683, @@ -300,6 +341,8 @@ local ProtoMsgType = { PVPHeroesArrayReq = 1751460231, PVPHeroesArrayRsp = 1751462064, PipedReq = 1901321540, + BossRushSettlementReq = 2017336372, + BossRushSettlementRsp = 2017338205, ChangeAvatarFrameReq = 2060508030, ChangeAvatarFrameRsp = 2060509863, ChangeNameReq = 2095612947, @@ -308,10 +351,15 @@ local ProtoMsgType = { CDKeyUseRsp = 2105156478, HeroUpgradeReq = 2118851896, HeroUpgradeRsp = 2118853729, + BossRushStartReq = 2164009445, + BossRushStartRsp = 2164011278, + BossRushBoughtNtf = 2198847028, ChapterBoxRewardReq = 2285872137, ChapterBoxRewardRsp = 2285873970, ChapterWeaponLatestPlayerInfoReq = 2314118791, ChapterWeaponLatestPlayerInfoRsp = 2314120624, + FourteenDayInfoReq = 2420360424, + FourteenDayInfoRsp = 2420362257, MailCycleReq = 2429586383, MailCycleRsp = 2429588216, ChapterWeaponChallengeFarmReq = 2467213182, @@ -332,6 +380,8 @@ local ProtoMsgType = { MailListRsp = 2581182822, SevenDayRewardReq = 2620369240, SevenDayRewardRsp = 2620371073, + BossRushInfoReq = 2665299111, + BossRushInfoRsp = 2665300944, TriggerGrowUpGift2Ntf = 2706989220, PVPChallengeSettlementReq = 2708281176, PVPChallengeSettlementRsp = 2708283009, @@ -361,6 +411,8 @@ local ProtoMsgType = { ChapterArmorFundRewardRsp = 3082272573, IdleRewardReq = 3087688987, IdleRewardRsp = 3087690820, + BossRushRankRewardReq = 3123310542, + BossRushRankRewardRsp = 3123312375, ActPayNtf = 3137310682, ActPayReq = 3137377372, ActPayRsp = 3137379205, @@ -368,8 +420,12 @@ local ProtoMsgType = { ChapterArmorStarRewardReq = 3191521707, ChapterArmorStarRewardRsp = 3191523540, ArenaBountyBoughtNtf = 3197501935, + BossRushRankReq = 3209780877, + BossRushRankRsp = 3209782710, SevenDayTaskRewardReq = 3224230499, SevenDayTaskRewardRsp = 3224232332, + BossRushBountyUnlockReq = 3274332802, + BossRushBountyUnlockRsp = 3274334635, HeroPutOnReq = 3309820798, HeroPutOnRsp = 3309822631, BountyBoughtNtf = 3341173994, @@ -384,6 +440,8 @@ local ProtoMsgType = { TaskDailyRewardReq = 3421843875, TaskDailyRewardRsp = 3421845708, PigLevelUpNtf = 3440328467, + BossRushPlayerInfoReq = 3512214338, + BossRushPlayerInfoRsp = 3512216171, TaskDailyInfoReq = 3555824176, TaskDailyInfoRsp = 3555826009, BattleSkillRefreshReq = 3597633120, @@ -398,6 +456,8 @@ local ProtoMsgType = { MallDailyResetNtf = 3663247602, MallDailyResetReq = 3663314292, MallDailyResetRsp = 3663316125, + BossRushFormationReq = 3694862366, + BossRushFormationRsp = 3694864199, SummerDataReq = 3739566473, SummerDataRsp = 3739568306, MallDailyOverDayReq = 3741702491, @@ -414,6 +474,8 @@ local ProtoMsgType = { GMRsp = 3904150593, ChapterStartReq = 3933875617, ChapterStartRsp = 3933877450, + BossRushExchangeReq = 4099982754, + BossRushExchangeRsp = 4099984587, BountyLevelUnlockReq = 4106156009, BountyLevelUnlockRsp = 4106157842, ChapterGoldChallengeFarmReq = 4133057746, @@ -458,6 +520,8 @@ local ProtoMsgType = { ChapterArmorChallengeHeroesRsp = "ChapterArmorChallengeHeroesRsp", GuideFundMarkReq = "GuideFundMarkReq", GuideFundMarkRsp = "GuideFundMarkRsp", + FourteenBountyAwardReq = "FourteenBountyAwardReq", + FourteenBountyAwardRsp = "FourteenBountyAwardRsp", PigPlayUpdateNtf = "PigPlayUpdateNtf", EnergyByDiamondReq = "EnergyByDiamondReq", EnergyByDiamondRsp = "EnergyByDiamondRsp", @@ -465,6 +529,8 @@ local ProtoMsgType = { DailyChallengeTaskAwardRsp = "DailyChallengeTaskAwardRsp", WatchADReq = "WatchADReq", WatchADRsp = "WatchADRsp", + FourteenBountyTaskAwardReq = "FourteenBountyTaskAwardReq", + FourteenBountyTaskAwardRsp = "FourteenBountyTaskAwardRsp", BuyMallIdleReq = "BuyMallIdleReq", BuyMallIdleRsp = "BuyMallIdleRsp", MatchReq = "MatchReq", @@ -485,6 +551,10 @@ local ProtoMsgType = { ReconnectRsp = "ReconnectRsp", LoginReq = "LoginReq", LoginRsp = "LoginRsp", + BossRushTopReq = "BossRushTopReq", + BossRushTopRsp = "BossRushTopRsp", + FourteenBountyExchangeAwardReq = "FourteenBountyExchangeAwardReq", + FourteenBountyExchangeAwardRsp = "FourteenBountyExchangeAwardRsp", ChapterShardsChallengeSettlementReq = "ChapterShardsChallengeSettlementReq", ChapterShardsChallengeSettlementRsp = "ChapterShardsChallengeSettlementRsp", ChapterDailyChallengeResetReq = "ChapterDailyChallengeResetReq", @@ -493,6 +563,8 @@ local ProtoMsgType = { AppStorePaidRsp = "AppStorePaidRsp", BindReq = "BindReq", BindRsp = "BindRsp", + BossRushBountyClaimReq = "BossRushBountyClaimReq", + BossRushBountyClaimRsp = "BossRushBountyClaimRsp", ChapterWeaponChallengeHeroesReq = "ChapterWeaponChallengeHeroesReq", ChapterWeaponChallengeHeroesRsp = "ChapterWeaponChallengeHeroesRsp", ChapterArmorChallengeFarmReq = "ChapterArmorChallengeFarmReq", @@ -516,6 +588,8 @@ local ProtoMsgType = { PVPHeroesArrayReq = "PVPHeroesArrayReq", PVPHeroesArrayRsp = "PVPHeroesArrayRsp", PipedReq = "PipedReq", + BossRushSettlementReq = "BossRushSettlementReq", + BossRushSettlementRsp = "BossRushSettlementRsp", ChangeAvatarFrameReq = "ChangeAvatarFrameReq", ChangeAvatarFrameRsp = "ChangeAvatarFrameRsp", ChangeNameReq = "ChangeNameReq", @@ -524,10 +598,15 @@ local ProtoMsgType = { CDKeyUseRsp = "CDKeyUseRsp", HeroUpgradeReq = "HeroUpgradeReq", HeroUpgradeRsp = "HeroUpgradeRsp", + BossRushStartReq = "BossRushStartReq", + BossRushStartRsp = "BossRushStartRsp", + BossRushBoughtNtf = "BossRushBoughtNtf", ChapterBoxRewardReq = "ChapterBoxRewardReq", ChapterBoxRewardRsp = "ChapterBoxRewardRsp", ChapterWeaponLatestPlayerInfoReq = "ChapterWeaponLatestPlayerInfoReq", ChapterWeaponLatestPlayerInfoRsp = "ChapterWeaponLatestPlayerInfoRsp", + FourteenDayInfoReq = "FourteenDayInfoReq", + FourteenDayInfoRsp = "FourteenDayInfoRsp", MailCycleReq = "MailCycleReq", MailCycleRsp = "MailCycleRsp", ChapterWeaponChallengeFarmReq = "ChapterWeaponChallengeFarmReq", @@ -548,6 +627,8 @@ local ProtoMsgType = { MailListRsp = "MailListRsp", SevenDayRewardReq = "SevenDayRewardReq", SevenDayRewardRsp = "SevenDayRewardRsp", + BossRushInfoReq = "BossRushInfoReq", + BossRushInfoRsp = "BossRushInfoRsp", TriggerGrowUpGift2Ntf = "TriggerGrowUpGift2Ntf", PVPChallengeSettlementReq = "PVPChallengeSettlementReq", PVPChallengeSettlementRsp = "PVPChallengeSettlementRsp", @@ -577,6 +658,8 @@ local ProtoMsgType = { ChapterArmorFundRewardRsp = "ChapterArmorFundRewardRsp", IdleRewardReq = "IdleRewardReq", IdleRewardRsp = "IdleRewardRsp", + BossRushRankRewardReq = "BossRushRankRewardReq", + BossRushRankRewardRsp = "BossRushRankRewardRsp", ActPayNtf = "ActPayNtf", ActPayReq = "ActPayReq", ActPayRsp = "ActPayRsp", @@ -584,8 +667,12 @@ local ProtoMsgType = { ChapterArmorStarRewardReq = "ChapterArmorStarRewardReq", ChapterArmorStarRewardRsp = "ChapterArmorStarRewardRsp", ArenaBountyBoughtNtf = "ArenaBountyBoughtNtf", + BossRushRankReq = "BossRushRankReq", + BossRushRankRsp = "BossRushRankRsp", SevenDayTaskRewardReq = "SevenDayTaskRewardReq", SevenDayTaskRewardRsp = "SevenDayTaskRewardRsp", + BossRushBountyUnlockReq = "BossRushBountyUnlockReq", + BossRushBountyUnlockRsp = "BossRushBountyUnlockRsp", HeroPutOnReq = "HeroPutOnReq", HeroPutOnRsp = "HeroPutOnRsp", BountyBoughtNtf = "BountyBoughtNtf", @@ -600,6 +687,8 @@ local ProtoMsgType = { TaskDailyRewardReq = "TaskDailyRewardReq", TaskDailyRewardRsp = "TaskDailyRewardRsp", PigLevelUpNtf = "PigLevelUpNtf", + BossRushPlayerInfoReq = "BossRushPlayerInfoReq", + BossRushPlayerInfoRsp = "BossRushPlayerInfoRsp", TaskDailyInfoReq = "TaskDailyInfoReq", TaskDailyInfoRsp = "TaskDailyInfoRsp", BattleSkillRefreshReq = "BattleSkillRefreshReq", @@ -614,6 +703,8 @@ local ProtoMsgType = { MallDailyResetNtf = "MallDailyResetNtf", MallDailyResetReq = "MallDailyResetReq", MallDailyResetRsp = "MallDailyResetRsp", + BossRushFormationReq = "BossRushFormationReq", + BossRushFormationRsp = "BossRushFormationRsp", SummerDataReq = "SummerDataReq", SummerDataRsp = "SummerDataRsp", MallDailyOverDayReq = "MallDailyOverDayReq", @@ -630,6 +721,8 @@ local ProtoMsgType = { GMRsp = "GMRsp", ChapterStartReq = "ChapterStartReq", ChapterStartRsp = "ChapterStartRsp", + BossRushExchangeReq = "BossRushExchangeReq", + BossRushExchangeRsp = "BossRushExchangeRsp", BountyLevelUnlockReq = "BountyLevelUnlockReq", BountyLevelUnlockRsp = "BountyLevelUnlockRsp", ChapterGoldChallengeFarmReq = "ChapterGoldChallengeFarmReq", diff --git a/lua/app/ui/activity/act_boss_rush.meta b/lua/app/ui/activity/act_boss_rush.meta new file mode 100644 index 00000000..a993b0bd --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb002506d3ebe7f4b81bfb1f32ccb50b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua new file mode 100644 index 00000000..36c818a9 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua @@ -0,0 +1,172 @@ +local ActBossRushFundUI = class("ActBossRushFundUI", BaseUI) + +local FUND_CELL = "app/ui/activity/act_boss_rush/cell/fund_cell" +local BTN_ICON = {"common_btn_green_3", "act_bossrush_board_1"} + +function ActBossRushFundUI:onPressBackspace() + self:closeUI() +end + +function ActBossRushFundUI:isFullScreen() + return false +end + +function ActBossRushFundUI:ctor() + self.rewardList = {} + for _, id in pairs(DataManager.ActBossRushData:getBountyList()) do + table.insert(self.rewardList, id) + end + table.sort(self.rewardList, function(a, b) + return a < b + end) +end + +function ActBossRushFundUI:getPrefabPath() + return "assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_fund_ui.prefab" +end + +function ActBossRushFundUI:onLoadRootComplete() + self:_display() + self:_addListeners() + self:_bind() + + self:refreshTime() + if self.actCountdownSid then + self:unscheduleGlobal(self.actCountdownSid) + end + self.actCountdownSid = self:scheduleGlobal(function() + self:refreshTime() + end, 1) +end + +function ActBossRushFundUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_fund_ui.bg.bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_15)) + uiMap["act_boss_rush_fund_ui.bg.level.tx_level"]:setText(DataManager.ActBossRushData:getWaveCount()) + uiMap["act_boss_rush_fund_ui.bg.scrollrect.viewport.content.mask_img.line.btn_buy_level.tx_num"]:setText(GFunc.getRewardNum(DataManager.ActBossRushData:getBuyBountyLevelCost())) + self.downDesc = uiMap["act_boss_rush_fund_ui.bg.bg.desc"] + self.downDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_16)) + + self:refreshBtns() + self:_refreshScrollrect() +end + +function ActBossRushFundUI:_addListeners() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_fund_ui.bg.close_btn"]:addClickListener(function() + self:closeUI() + end) + + uiMap["act_boss_rush_fund_ui.bg.scrollrect.viewport.content.mask_img.line.btn_buy_level"]:addClickListener(function() + ModuleManager.ActBossRushManager:reqBuyFundLevel() + end) +end + +function ActBossRushFundUI:_bind() + self:bind(DataManager.ActBossRushData, "isDirty", function() + self:_display() + end) +end + +function ActBossRushFundUI:refreshBtns() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_fund_ui.bg.free.tx_free"]:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE)) + + local probtn = uiMap["act_boss_rush_fund_ui.bg.buy1"] + local proBtntx = uiMap["act_boss_rush_fund_ui.bg.buy1.tx_buyed"] + local proBuy = uiMap["act_boss_rush_fund_ui.bg.buy1.tx_buy"] + proBtntx:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_ACTIVE)) + proBuy:setText(DataManager.ActBossRushData:getProPrice()) + + if DataManager.ActBossRushData:getProBought() then + probtn:setSprite(GConst.ATLAS_PATH.ACT_BOSS_RUSH, BTN_ICON[2]) + probtn:setTouchEnable(false) + proBtntx:setVisible(true) + proBuy:setVisible(false) + else + probtn:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[1]) + probtn:setTouchEnable(true) + probtn:addClickListener(function() + ModuleManager.ActBossRushManager:purcharse(DataManager.ActBossRushData:getProActId()) + end) + proBtntx:setVisible(false) + proBuy:setVisible(true) + end + + local utralbtn = uiMap["act_boss_rush_fund_ui.bg.buy2"] + local utralBtntx = uiMap["act_boss_rush_fund_ui.bg.buy2.tx_buyed"] + local utralBuy = uiMap["act_boss_rush_fund_ui.bg.buy2.tx_buy"] + utralBtntx:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_ACTIVE)) + utralBuy:setText(DataManager.ActBossRushData:gettUtralPrice()) + + if DataManager.ActBossRushData:getUtralBought() then + utralbtn:setSprite(GConst.ATLAS_PATH.ACT_BOSS_RUSH, BTN_ICON[2]) + utralbtn:setTouchEnable(false) + utralBtntx:setVisible(true) + utralBuy:setVisible(false) + else + utralbtn:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[1]) + utralbtn:setTouchEnable(true) + utralbtn:addClickListener(function() + ModuleManager.ActBossRushManager:purcharse(DataManager.ActBossRushData:getUtralActId()) + end) + utralBtntx:setVisible(false) + utralBuy:setVisible(true) + end +end + +function ActBossRushFundUI:_refreshScrollrect() + local uiMap = self.root:genAllChildren() + local mask = uiMap["act_boss_rush_fund_ui.bg.scrollrect.viewport.content.mask_img"] + local level = DataManager.ActBossRushData:getWaveLevel() - DataManager.ActBossRushData:getStartWaveLevel() + local totalCount = #self.rewardList + local maskCount = math.max(0, totalCount - level) + mask:setAnchoredPositionY(-10 - level * 120) + mask:setSizeDeltaY(maskCount * 120 + 20) + local progSlider = uiMap["act_boss_rush_fund_ui.bg.scrollrect.viewport.content.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + local y = (totalCount - 1) * 120 + if (level - 1) >= 0 then + progSlider.value = (level - 1) / (totalCount - 1) + else + progSlider.value = 0 + end + mask:setVisible(level < totalCount) + + if self.scrollRectComp then + self.scrollRectComp:updateAllCell() + return + end + + local prog = uiMap["act_boss_rush_fund_ui.bg.scrollrect.viewport.content.prog"] + prog:setSizeDeltaY(y) + self.scrollRectComp = uiMap["act_boss_rush_fund_ui.bg.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollRectComp:addInitCallback(function() + return FUND_CELL + end) + self.scrollRectComp:addRefreshCallback(function(index, cell) + cell:refresh(self.rewardList[index]) + mask:getTransform():SetAsLastSibling() + end) + self.scrollRectComp:clearCells() + self.scrollRectComp:setTotalCount(0) + if level < 1 then + level = 1 + end + self.scrollRectComp:refillCells(totalCount, nil, level) +end + +function ActBossRushFundUI:refreshTime() + local uiMap = self.root:genAllChildren() + local remainTime = DataManager.ActBossRushData:getRemainTime() + local str + if remainTime <= 0 then + str = I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC) + else + str = Time:formatNumTimeStr(remainTime) + end + uiMap["act_boss_rush_fund_ui.bg.countdown.tx_countdown"]:setText(str) + + uiMap["act_boss_rush_fund_ui.bg.scrollrect.viewport.content.mask_img.line.btn_buy_level"]:setActive(remainTime < 86400) +end + +return ActBossRushFundUI \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua.meta b/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua.meta new file mode 100644 index 00000000..afec8598 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 45ba6058207d9da498e2e6f026751fa9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua new file mode 100644 index 00000000..f82c5ec9 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua @@ -0,0 +1,75 @@ +local ActBossRushPopUI = class("ActBossRushPopUI", BaseUI) + +function ActBossRushPopUI:onPressBackspace() + self:closeUI() +end + +function ActBossRushPopUI:isFullScreen() + return false +end + +function ActBossRushPopUI:getPrefabPath() + return "assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab" +end + +function ActBossRushPopUI:onClose() + if self.popCheckBar then + self.popCheckBar:saveCheckStatus() + end +end + +function ActBossRushPopUI:onLoadRootComplete() + self:_display() + self:_addListeners() + + self:refreshTime() + if self.actCountdownSid then + self:unscheduleGlobal(self.actCountdownSid) + end + self.actCountdownSid = self:scheduleGlobal(function() + self:refreshTime() + end, 1) + + DataManager.ActBossRushData:markPoped() +end + +function ActBossRushPopUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_pop_ui.ui_spine_obj"]:playAnim("idle", true, false) + uiMap["act_boss_rush_pop_ui.ui_spine_obj.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_2)) + uiMap["act_boss_rush_pop_ui.ui_spine_obj.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_13)) + uiMap["act_boss_rush_pop_ui.btn_goto.tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_14)) + + self.popCheckBar = uiMap["act_boss_rush_pop_ui.pop_check_bar"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_CHECK_BAR) + self.popCheckBar:refresh(false, "ActBossRushData") +end + +function ActBossRushPopUI:_addListeners() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_pop_ui.close_btn"]:addClickListener(function() + self:closeUI() + end) + + uiMap["act_boss_rush_pop_ui.btn_goto"]:addClickListener(function() + if not DataManager.ActBossRushData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + ModuleManager.ActBossRushManager:showMainUI() + self:closeUI() + end) +end + +function ActBossRushPopUI:refreshTime() + local uiMap = self.root:genAllChildren() + local remainTime = DataManager.ActBossRushData:getRemainTime() + local str + if remainTime <= 0 then + str = I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC) + else + str = Time:formatNumTimeStr(remainTime) + end + uiMap["act_boss_rush_pop_ui.ui_spine_obj.countdown.tx_countdown"]:setText(str) +end + +return ActBossRushPopUI \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua.meta b/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua.meta new file mode 100644 index 00000000..8bbb9fcf --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c80ebce3c84c2684c88d7ad6c254c656 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua new file mode 100644 index 00000000..9ad40d6b --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua @@ -0,0 +1,328 @@ +local ActBossRushRankUI = class("ActBossRushRankUI", BaseUI) + +local RANK_REWARD_CELL = "app/ui/activity/act_boss_rush/cell/rank_reward_cell" +local RANK_CELL = "app/ui/activity/act_boss_rush/cell/rank_cell" +local TOP_RANK_CELL = "app/ui/activity/act_boss_rush/cell/top_rank_cell" + +local PAGE_ICON = {"common_menu_1", "common_menu_2"} + +local PAGE_TYPE = { + LAST_DAY = 1, + TODAY = 2, + REWARD = 3, +} + +local PAGE_TX = { + [PAGE_TYPE.LAST_DAY] = I18N.GlobalConst.ACT_BOSS_RUSH_DESC_20, + [PAGE_TYPE.TODAY] = I18N.GlobalConst.ACT_BOSS_RUSH_DESC_21, + [PAGE_TYPE.REWARD] = I18N.GlobalConst.ACT_BOSS_RUSH_DESC_22, +} + +function ActBossRushRankUI:onPressBackspace() + self:closeUI() +end + +function ActBossRushRankUI:isFullScreen() + return false +end + +function ActBossRushRankUI:getPrefabPath() + return "assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_rank_ui.prefab" +end + +function ActBossRushRankUI:ctor() + self.rankRewardList = {} + self.rankRewardListCount = 0 + local cfg = DataManager.ActBossRushData:getRankConfig() + for id, info in ipairs(cfg) do + table.insert(self.rankRewardList, {id = id, ranking1 = info.ranking[1], ranking2 = info.ranking[2], rewards = info.reward}) + self.rankRewardListCount = self.rankRewardListCount + 1 + end +end + +function ActBossRushRankUI:onLoadRootComplete() + self:_display() + self:_addListeners() + self:_bind() +end + +function ActBossRushRankUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_rank_ui.bg.rank_node.rank_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_24)) + uiMap["act_boss_rush_rank_ui.bg.rank_node.player_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_25)) + uiMap["act_boss_rush_rank_ui.bg.rank_node.record_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_26)) + + if not DataManager.ActBossRushData:getIsFinalDay() then + self:switchPage(PAGE_TYPE.TODAY) + else + self:switchPage(PAGE_TYPE.LAST_DAY) + end +end + +function ActBossRushRankUI:_addListeners() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_rank_ui.close_btn"]:addClickListener(function() + self:closeUI() + end) + + uiMap["act_boss_rush_rank_ui.bg.rank_bg.btn_help"]:addClickListener(function() + local params = { + type = GConst.TipsConst.HELP_TIPS_TYPE.NORMAL, + title = I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_11), + desc = I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_27), + } + ModuleManager.TipsManager:showHelpTips(params) + end) +end + +function ActBossRushRankUI:_bind() + self:bind(DataManager.ActBossRushData, "isDirty", function() + if self.curPage ~= PAGE_TYPE.REWARD then + self:refreshRankNode() + else + self:refreshRewardNode() + end + self:refreshMyRankInfo() + self:refreshPages() + end) +end + +function ActBossRushRankUI:refreshRankNode() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_rank_ui.bg.rank_node"]:setActive(true) + uiMap["act_boss_rush_rank_ui.bg.reward_node"]:setActive(false) + local text = I18N.GlobalConst.ACT_BOSS_RUSH_DESC_20 + if self.curPage == PAGE_TYPE.LAST_DAY then + self.rankList = DataManager.ActBossRushData:getLastRankInfo() + else + self.rankList = DataManager.ActBossRushData:getCurRankInfo() + text = I18N.GlobalConst.ACT_BOSS_RUSH_DESC_21 + end + uiMap["act_boss_rush_rank_ui.bg.title"]:setText(I18N:getGlobalText(text)) + if not self.topRankCells then + self.topRankCells = {} + for i = 1, 3 do + self.topRankCells[i] = CellManager:addCellComp(uiMap["act_boss_rush_rank_ui.bg.rank_node.top_rank_cell_" .. i], TOP_RANK_CELL) + end + end + for index, cell in ipairs(self.topRankCells) do + cell:refresh(self.rankList[index]) + end + local count = #self.rankList - 3 + if count < 0 then + count = 0 + end + if self.rankScrollRectComp then + self.rankScrollRectComp:refillCells(count) + return + end + + self.rankScrollRectComp = uiMap["act_boss_rush_rank_ui.bg.rank_node.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.rankScrollRectComp:addInitCallback(function() + return RANK_CELL + end) + self.rankScrollRectComp:addRefreshCallback(function(index, cell) + local info = self.rankList[index + 3] + cell:refresh(index + 3, info) + end) + self.rankScrollRectComp:clearCells() + self.rankScrollRectComp:setTotalCount(0) + self.rankScrollRectComp:refillCells(count) +end + +function ActBossRushRankUI:refreshRewardNode() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_rank_ui.bg.rank_node"]:setActive(false) + uiMap["act_boss_rush_rank_ui.bg.reward_node"]:setActive(true) + uiMap["act_boss_rush_rank_ui.bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_22)) + if self.rewardScrollRectComp then + self.rewardScrollRectComp:updateAllCell() + return + end + + self.rewardScrollRectComp = uiMap["act_boss_rush_rank_ui.bg.reward_node.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.rewardScrollRectComp:addInitCallback(function() + return RANK_REWARD_CELL + end) + self.rewardScrollRectComp:addRefreshCallback(function(index, cell) + local info = self.rankRewardList[index] + cell:refresh(info.ranking1, info.ranking2, info.rewards, self.rankRewardListCount) + end) + self.rewardScrollRectComp:clearCells() + self.rewardScrollRectComp:setTotalCount(0) + self.rewardScrollRectComp:refillCells(#self.rankRewardList) +end + +function ActBossRushRankUI:refreshPages() + if not self.pageObjs then + local uiMap = self.root:genAllChildren() + self.pageObjs = {} + for i = 1, 3 do + self.pageObjs[i] = { + page = uiMap["act_boss_rush_rank_ui.bg.page_" .. i], + tx1 = uiMap["act_boss_rush_rank_ui.bg.page_" .. i .. ".tx"], + tx2 = uiMap["act_boss_rush_rank_ui.bg.page_" .. i .. ".tx_hl"], + } + self.pageObjs[i].page:addClickListener(function() + self:switchPage(i) + end) + end + end + for index, objs in ipairs(self.pageObjs) do + if index == self.curPage then + objs.page:setSprite(GConst.ATLAS_PATH.COMMON, PAGE_ICON[1]) + objs.page:setAnchoredPositionY(-516.5) + objs.tx1:setText(GConst.EMPTY_STRING) + objs.tx2:setText(I18N:getGlobalText(PAGE_TX[index])) + else + objs.page:setSprite(GConst.ATLAS_PATH.COMMON, PAGE_ICON[2]) + objs.page:setAnchoredPositionY(-505.5) + objs.tx1:setText(I18N:getGlobalText(PAGE_TX[index])) + objs.tx2:setText(GConst.EMPTY_STRING) + end + end + + if DataManager.ActBossRushData:getIsFinalDay() then + self.pageObjs[2].page:setActive(false) + self.pageObjs[1].page:setActive(true) + self.pageObjs[3].page:setActive(true) + self.pageObjs[1].page:setAnchoredPositionX(-90) + self.pageObjs[3].page:setAnchoredPositionX(90) + elseif DataManager.ActBossRushData:getIsFirstDay() then + self.pageObjs[1].page:setActive(false) + self.pageObjs[2].page:setActive(true) + self.pageObjs[3].page:setActive(true) + self.pageObjs[2].page:setAnchoredPositionX(-90) + self.pageObjs[3].page:setAnchoredPositionX(90) + else + local x = -186 + for index, objs in ipairs(self.pageObjs) do + objs.page:setAnchoredPositionX(x) + x = x + 186 + objs.page:setActive(true) + end + end + + if DataManager.ActBossRushData:canGetRankReward() then + self.pageObjs[3].page:addRedPoint(77, -6.5, 1) + else + self.pageObjs[3].page:removeRedPoint() + end +end + +function ActBossRushRankUI:switchPage(page) + if self.curPage == page then + return + end + self.curPage = page + + if self.curPage ~= PAGE_TYPE.REWARD then + self:refreshRankNode() + else + self:refreshRewardNode() + end + + self:refreshPages() + self:refreshMyRankInfo() +end + +function ActBossRushRankUI:refreshMyRankInfo() + local info = DataManager.ActBossRushData:getLastSelfInfo() + local canGot = DataManager.ActBossRushData:canGetRankReward() + + if self.curPage == PAGE_TYPE.TODAY then + info = DataManager.ActBossRushData:getCurRankSelfInfo() + end + if self.curPage == PAGE_TYPE.REWARD and not canGot then + info = DataManager.ActBossRushData:getCurRankSelfInfo() + end + local rank = info and info.rank or 0 + local wave = info and info.wave or 0 + local round = info and info.round or 0 + local uiMap = self.root:genAllChildren() + if not self.playerHeadCell then + self.playerHeadCell = CellManager:addCellComp(uiMap["act_boss_rush_rank_ui.bg.rank_bg.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) + self.selfRewardCells = {} + for i = 1, 2 do + self.selfRewardCells[i] = CellManager:addCellComp(uiMap["act_boss_rush_rank_ui.bg.rank_bg.reward_cell_" .. i], GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + end + end + + self.playerHeadCell:refresh() + uiMap["act_boss_rush_rank_ui.bg.rank_bg.name"]:setText(DataManager.PlayerData:getNickname()) + local descObj = uiMap["act_boss_rush_rank_ui.bg.rank_bg.tx_last_day"] + local rankObj = uiMap["act_boss_rush_rank_ui.bg.rank_bg.tx_rank"] + if not rank or rank <= 0 then + rankObj:setText("--") + else + rankObj:setText(rank) + end + + local waveObj = uiMap["act_boss_rush_rank_ui.bg.rank_bg.tx_wave"] + if not wave then + waveObj:setText("--") + else + waveObj:setText(wave) + end + + local roundObj = uiMap["act_boss_rush_rank_ui.bg.rank_bg.tx_round"] + if not round then + roundObj:setText("--") + else + roundObj:setText(round) + end + + local imgWave = uiMap["act_boss_rush_rank_ui.bg.rank_bg.wave_icon"] + local imgRound = uiMap["act_boss_rush_rank_ui.bg.rank_bg.round_icon"] + if self.curPage ~= PAGE_TYPE.REWARD then + imgWave:setVisible(true) + imgRound:setVisible(true) + waveObj:setVisible(true) + roundObj:setVisible(true) + for index, cell in ipairs(self.selfRewardCells) do + cell:getBaseObject():setActive(false) + end + if self.curPage == PAGE_TYPE.LAST_DAY then + descObj:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_20)) + else + descObj:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_21)) + end + else + imgWave:setVisible(false) + imgRound:setVisible(false) + waveObj:setVisible(false) + roundObj:setVisible(false) + + local got = DataManager.ActBossRushData:isGotRankReward() + local rewards + if canGot then + rewards = DataManager.ActBossRushData:getRankRewards(rank) + descObj:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_20)) + else + info = DataManager.ActBossRushData:getCurRankSelfInfo() + rewards = DataManager.ActBossRushData:getRankRewards(info.rank or 0) + got = false + descObj:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_21)) + end + + for index, cell in ipairs(self.selfRewardCells) do + if rewards and rewards[index] then + cell:refreshByConfig(rewards[index], got, got) + cell:getBaseObject():setActive(true) + if canGot then + cell:showFrameAnimation() + cell:addClickListener(function() + ModuleManager.ActBossRushManager:reqRankReward() + end) + else + cell:hideFrameAnimation() + cell:addClickListener(nil) + end + else + cell:getBaseObject():setActive(false) + end + end + end +end + +return ActBossRushRankUI \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua.meta b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua.meta new file mode 100644 index 00000000..a5800d2d --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f63e47497cfb42442a9ae4c634a24cb1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua new file mode 100644 index 00000000..90ebff49 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua @@ -0,0 +1,116 @@ +local ActBossRushShopUI = class("ActBossRushShopUI", BaseUI) + +local SHOP_CELL = "app/ui/activity/act_boss_rush/cell/shop_cell" + +function ActBossRushShopUI:onPressBackspace() + self:closeUI() +end + +function ActBossRushShopUI:getPrefabPath() + return "assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_shop_ui.prefab" +end + +function ActBossRushShopUI:isFullScreen() + return false +end + +function ActBossRushShopUI:ctor() + self:dealList() +end + +function ActBossRushShopUI:dealList() + self.shopList = {} + self.costId = 1 + for _, id in ipairs(DataManager.ActBossRushData:getExchangeList()) do + local canExchange = DataManager.ActBossRushData:getExchangeRemainCount(id) > 0 + table.insert(self.shopList, {id = id, canExchange = canExchange}) + if self.costId == 1 then + local cost = DataManager.ActBossRushData:getShopCost(id) + self.costId = GFunc.getRewardId(cost) + end + end + + table.sort(self.shopList, function(a, b) + if a.canExchange == b.canExchange then + return a.id < b.id + else + return a.canExchange + end + end) +end + +function ActBossRushShopUI:onLoadRootComplete() + self:_display() + self:_addListeners() + self:_bind() + + self:refreshTime() + if self.actCountdownSid then + self:unscheduleGlobal(self.actCountdownSid) + end + self.actCountdownSid = self:scheduleGlobal(function() + self:refreshTime() + end, 1) + + DataManager.ActBossRushData:setTodayExchangeCheck() +end + +function ActBossRushShopUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_shop_ui.bg.desc_bg.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_17)) + uiMap["act_boss_rush_shop_ui.bg.score.tx_score"]:setText(DataManager.BagData.ItemData:getItemNumById(self.costId)) + uiMap["act_boss_rush_shop_ui.bg.score.img"]:setSprite(ModuleManager.ItemManager:getItemIcon(self.costId)) + + self:_refreshScrollrect() +end + +function ActBossRushShopUI:_addListeners() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_shop_ui.bg.score"]:addClickListener(function() + ModuleManager.ActBossRushManager:showFundUI() + self:closeUI() + end) + + uiMap["act_boss_rush_shop_ui.bg.close_btn"]:addClickListener(function() + self:closeUI() + end) +end + +function ActBossRushShopUI:_bind() + self:bind(DataManager.ActBossRushData, "isDirty", function() + self:dealList() + self:_display() + end) +end + +function ActBossRushShopUI:refreshTime() + local uiMap = self.root:genAllChildren() + local remainTime = DataManager.ActBossRushData:getRemainTime() + local str + if remainTime <= 0 then + str = I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC) + else + str = Time:formatNumTimeStr(remainTime) + end + uiMap["act_boss_rush_shop_ui.bg.countdown.tx_countdown"]:setText(str) +end + +function ActBossRushShopUI:_refreshScrollrect() + if self.scrollRectComp then + self.scrollRectComp:updateAllCell() + return + end + + local uiMap = self.root:genAllChildren() + self.scrollRectComp = uiMap["act_boss_rush_shop_ui.bg.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollRectComp:addInitCallback(function() + return SHOP_CELL + end) + self.scrollRectComp:addRefreshCallback(function(index, cell) + cell:refresh(self.shopList[index].id) + end) + self.scrollRectComp:clearCells() + self.scrollRectComp:refillCells(#self.shopList) +end + +return ActBossRushShopUI \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua.meta b/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua.meta new file mode 100644 index 00000000..7d809914 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 02887a866f7ba9e40a30aeac46081d0e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua new file mode 100644 index 00000000..9b9890e1 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua @@ -0,0 +1,205 @@ +local ActBossRushUI = class("ActBossRushUI", BaseUI) + +local RANK_CELL = "app/ui/activity/act_boss_rush/cell/rank_cell" + +function ActBossRushUI:getPrefabPath() + return "assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_ui.prefab" +end + +function ActBossRushUI:onPressBackspace() + self:closeUI() +end + +function ActBossRushUI:getCurrencyParams() + if self.currencyParams == nil then + self.currencyParams = { + itemIds = { + GConst.ItemConst.ITEM_ID_GEM, + }, + showType = GConst.CURRENCY_TYPE.HORIZONTAL + } + end + return self.currencyParams +end + +function ActBossRushUI:ctor() + +end + +function ActBossRushUI:onLoadRootComplete() + self:_display() + self:_addListeners() + self:_bind() + + self:refreshTime() + if self.actCountdownSid then + self:unscheduleGlobal(self.actCountdownSid) + end + self.actCountdownSid = self:scheduleGlobal(function() + self:refreshTime() + end, 1) +end + +function ActBossRushUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_2)) + uiMap["act_boss_rush_ui.bg.tx_today_rank"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_3)) + uiMap["act_boss_rush_ui.down.formation_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_4)) + uiMap["act_boss_rush_ui.bg.btn_rank.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_10)) + uiMap["act_boss_rush_ui.bg.btn_bounty.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_11)) + uiMap["act_boss_rush_ui.bg.btn_shop.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_12)) + uiMap["act_boss_rush_ui.bg.fight_btn.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE)) + + local todayMaxWaveDesc = uiMap["act_boss_rush_ui.bg.tx_today_max_wave_desc"] + local todayMaxWave = uiMap["act_boss_rush_ui.bg.tx_today_max_wave"] + local todayMaxWaveImg = uiMap["act_boss_rush_ui.bg.img_today_max_wave"] + todayMaxWaveDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_4)) + todayMaxWave:setText(DataManager.ActBossRushData:getTodayMaxWave()) + GFunc.centerTxAndImgAndTx(todayMaxWaveDesc, 5, todayMaxWaveImg, 5, todayMaxWave) + + uiMap["act_boss_rush_ui.bg.tx_today_fight_count"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_5, DataManager.ActBossRushData:getTodayFightCount())) + + local cost = uiMap["act_boss_rush_ui.bg.fight_btn.cost"] + local costIcon = uiMap["act_boss_rush_ui.bg.cost.icon"] + local costDesc = uiMap["act_boss_rush_ui.bg.cost.tx_cost_desc"] + local costNum = uiMap["act_boss_rush_ui.bg.cost.tx_cost"] + + local todayFreeFightCount = uiMap["act_boss_rush_ui.bg.tx_count"] + local count = DataManager.ActBossRushData:getFreeFightCount() + if count > 0 then + todayFreeFightCount:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_6, count)) + cost:setVisible(false) + else + todayFreeFightCount:setText(GConst.EMPTY_STRING) + cost:setVisible(true) + costDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_7)) + costNum:setText(DataManager.ActBossRushData:getFightCost()) + GFunc.centerTxAndImgAndTx(costDesc, 5, costIcon, 5, costNum) + end + + local rankBtn = uiMap["act_boss_rush_ui.bg.btn_rank"] + if DataManager.ActBossRushData:canGetRankReward() then + rankBtn:addRedPoint(20, 40, 0.8) + else + rankBtn:removeRedPoint() + end + + local bountyBtn = uiMap["act_boss_rush_ui.bg.btn_bounty"] + if DataManager.ActBossRushData:getHaveReward() then + bountyBtn:addRedPoint(20, 40, 0.8) + else + bountyBtn:removeRedPoint() + end + + local shopBtn = uiMap["act_boss_rush_ui.bg.btn_shop"] + if not DataManager.ActBossRushData:getTodayExchangeCheck() then + shopBtn:addRedPoint(20, 40, 0.8) + else + shopBtn:removeRedPoint() + end + + self:refreshRankList() + self:refreshFormation() +end + +function ActBossRushUI:_addListeners() + local uiMap = self.root:genAllChildren() + uiMap["act_boss_rush_ui.bg.fight_btn"]:addClickListener(function() + ModuleManager.ActBossRushManager:reqFight() + end) + + uiMap["act_boss_rush_ui.down.formation_btn"]:addClickListener(function() + if not DataManager.ActBossRushData:getIsOpen() then + return + end + ModuleManager.CommonManager:showFormationUI(GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH) + end) + + uiMap["act_boss_rush_ui.down.close_btn"]:addClickListener(function() + self:closeUI() + end) + + uiMap["act_boss_rush_ui.bg.btn_rank"]:addClickListener(function() + ModuleManager.ActBossRushManager:showRankUI() + end) + + uiMap["act_boss_rush_ui.bg.btn_bounty"]:addClickListener(function() + ModuleManager.ActBossRushManager:showFundUI() + end) + + uiMap["act_boss_rush_ui.bg.btn_shop"]:addClickListener(function() + ModuleManager.ActBossRushManager:showShopUI() + end) + + uiMap["act_boss_rush_ui.bg.time_bg.btn_help"]:addClickListener(function() + local params = { + type = GConst.TipsConst.HELP_TIPS_TYPE.NORMAL, + title = I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_11), + desc = I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_31), + } + ModuleManager.TipsManager:showHelpTips(params) + end) + + self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function() + self:closeUI() + end) +end + +function ActBossRushUI:_bind() + self:bind(DataManager.ActBossRushData, "isDirty", function() + self:_display() + end) + + self:bind(DataManager.FormationData, "dirty", function() + self:refreshFormation() + end) + + self:bind(DataManager.HeroData, "isDirty", function() + self:refreshFormation() + end) +end + +function ActBossRushUI:refreshRankList() + if not self.rankCells then + self.rankCells = {} + local uiMap = self.root:genAllChildren() + for i = 1, 3 do + self.rankCells[i] = CellManager:addCellComp(uiMap["act_boss_rush_ui.bg.act_rank_cell_" .. i], RANK_CELL) + end + end + + local list = DataManager.ActBossRushData:getTopRankInfo() + for index, cell in ipairs(self.rankCells) do + cell:refresh(index, list[index]) + end +end + +function ActBossRushUI:refreshTime() + local uiMap = self.root:genAllChildren() + local remainTime = DataManager.ActBossRushData:getRemainTime() + local str + if remainTime <= 0 then + str = I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC) + else + str = Time:formatNumTimeStr(remainTime) + end + uiMap["act_boss_rush_ui.bg.time_bg.time"]:setText(str) + + local canFight = remainTime > 86400 + if self.canFight ~= canFight then + self.canFight = canFight + uiMap["act_boss_rush_ui.bg.fight_btn"]:setActive(canFight) + uiMap["act_boss_rush_ui.bg.fight_btn.cost"]:setActive(canFight) + uiMap["act_boss_rush_ui.bg.tx_count"]:setActive(canFight) + end +end + +function ActBossRushUI:refreshFormation() + if not self.formationComp then + local uiMap = self.root:genAllChildren() + self.formationComp = uiMap["act_boss_rush_ui.bg.hero_formation_comp"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_FORMATION_COMP) + end + self.formationComp:refreshByFormation(DataManager.FormationData:getBossRushFormation()) +end + +return ActBossRushUI \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua.meta b/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua.meta new file mode 100644 index 00000000..dda9d8af --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6309932b9c9dcee4a958a6d21ce8a252 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/cell.meta b/lua/app/ui/activity/act_boss_rush/cell.meta new file mode 100644 index 00000000..2566ca89 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3ad55d83f2f7554b9c8c21a442f894f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/act_boss_rush/cell/fund_cell.lua b/lua/app/ui/activity/act_boss_rush/cell/fund_cell.lua new file mode 100644 index 00000000..1d315e06 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/fund_cell.lua @@ -0,0 +1,76 @@ +local FundCell = class("FundCell", BaseCell) + +function FundCell:init() + local uiMap = self:getUIMap() + self.txLevel = uiMap["fund_cell.level.tx_level"] + self.rewardCell1 = uiMap["fund_cell.reward_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.rewardCell2 = uiMap["fund_cell.reward_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.rewardCell3 = uiMap["fund_cell.reward_cell_3"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) +end + +function FundCell:refresh(level) + self.txLevel:setText(DataManager.ActBossRushData:getLevelWave(level)) + + local isGet + + isGet = DataManager.ActBossRushData:getFreeGot(level) + local reward = DataManager.ActBossRushData:getReward(level, DataManager.ActBossRushData.REWARD_TYPE.FREE) + if reward then + self.rewardCell1:refreshByConfig(reward, isGet, isGet) + end + self.rewardCell1:showLock(false) + if DataManager.ActBossRushData:getFreeCanGet(level) then + self.rewardCell1:showFrameAnimation() + self.rewardCell1.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell1:addClickListener(function() + self:onClickReward(level, DataManager.ActBossRushData.REWARD_TYPE.FREE) + end) + else + self.rewardCell1:hideFrameAnimation() + self.rewardCell1.baseObject:removeRedPoint() + self.rewardCell1:addClickListener(nil) + end + + isGet = DataManager.ActBossRushData:getProGot(level) + local reward = DataManager.ActBossRushData:getReward(level, DataManager.ActBossRushData.REWARD_TYPE.PRO) + if reward then + self.rewardCell2:refreshByConfig(reward, isGet, isGet) + end + self.rewardCell2:showLock(not DataManager.ActBossRushData:getProBought()) + if DataManager.ActBossRushData:getProCanGet(level) then + self.rewardCell2:showFrameAnimation() + self.rewardCell2.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell2:addClickListener(function() + self:onClickReward(level, DataManager.ActBossRushData.REWARD_TYPE.PRO) + end) + else + self.rewardCell2:hideFrameAnimation() + self.rewardCell2.baseObject:removeRedPoint() + self.rewardCell2:addClickListener(nil) + end + + isGet = DataManager.ActBossRushData:getUtralGot(level) + local reward = DataManager.ActBossRushData:getReward(level, DataManager.ActBossRushData.REWARD_TYPE.UTRAL) + if reward then + self.rewardCell3:refreshByConfig(reward, isGet, isGet) + end + self.rewardCell3:showLock(not DataManager.ActBossRushData:getUtralBought()) + if DataManager.ActBossRushData:getUtralCanGet(level) then + self.rewardCell3:showFrameAnimation() + self.rewardCell3.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell3:addClickListener(function() + self:onClickReward(level, DataManager.ActBossRushData.REWARD_TYPE.UTRAL) + end) + else + self.rewardCell3:hideFrameAnimation() + self.rewardCell3.baseObject:removeRedPoint() + self.rewardCell3:addClickListener(nil) + end +end + +-- 领取奖励 +function FundCell:onClickReward(level, rewardType) + ModuleManager.ActBossRushManager:reqFundAward(level, rewardType) +end + +return FundCell \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/cell/fund_cell.lua.meta b/lua/app/ui/activity/act_boss_rush/cell/fund_cell.lua.meta new file mode 100644 index 00000000..59b2d0cc --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/fund_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b36db9010b508c0478375b99251e7b35 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/cell/rank_cell.lua b/lua/app/ui/activity/act_boss_rush/cell/rank_cell.lua new file mode 100644 index 00000000..7e45a355 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/rank_cell.lua @@ -0,0 +1,65 @@ +local RankCell = class("RankCell", BaseCell) + +local RANK_ICON = { + "act_ranking_1", + "act_ranking_2", + "act_ranking_3" +} + +local RANK_BG = { + "act_ranking_bg_1", + "act_ranking_bg_2", + "act_ranking_bg_3", + "act_ranking_bg_4" +} + +function RankCell:refresh(index, info) + local uiMap = self:getUIMap() + if not self.playerHeadCell then + self.playerHeadCell = CellManager:addCellComp(uiMap["act_rank_cell.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) + end + uiMap["act_rank_cell.tx_rank"]:setText(index) + local imgRank = uiMap["act_rank_cell.img_rank"] + if RANK_ICON[index] then + imgRank:setVisible(true) + imgRank:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_ICON[index]) + uiMap["act_rank_cell.tx_rank"]:setText(GConst.EMPTY_STRING) + else + imgRank:setVisible(false) + end + + local imgBg = uiMap["act_rank_cell.bg"] + if RANK_BG[index] then + imgBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_BG[index]) + else + imgBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_BG[4]) + end + + local txName = uiMap["act_rank_cell.tx_name"] + local txWave = uiMap["act_rank_cell.tx_wave"] + local txRound = uiMap["act_rank_cell.tx_round"] + + if info then + txName:setText(info.name) + txWave:setText(info.wave) + txRound:setText(info.round) + self.playerHeadCell:getBaseObject():addClickListener(function() + ModuleManager.ActBossRushManager:reqOtherPlayerInfo(info.id, function(formation) + if not self.playerHeadCell or not self.playerHeadCell:getBaseObject() or self.playerHeadCell:getBaseObject():isDestroyed() then + return + end + ModuleManager.TipsManager:showHeroFormation(self.playerHeadCell:getBaseObject(), formation) + end) + end) + self.playerHeadCell:refresh(info.avatar, info.avatar_frame, false) + else + txName:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_8)) + txWave:setText("--") + txRound:setText("--") + self.playerHeadCell:getBaseObject():addClickListener(nil) + self.playerHeadCell:refresh(3001, 1000, false) -- 默认 + end + +end + +return RankCell \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/cell/rank_cell.lua.meta b/lua/app/ui/activity/act_boss_rush/cell/rank_cell.lua.meta new file mode 100644 index 00000000..2162c314 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/rank_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 032e61c832631f04b9b9eceb08853b1d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua b/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua new file mode 100644 index 00000000..27d5a6a8 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua @@ -0,0 +1,32 @@ +local RankRewardcell = class("RankRewardcell", BaseCell) + +function RankRewardcell:refresh(ranking1, ranking2, rewards, totalIndex) + local uiMap = self:getUIMap() + + local rankStr = ranking1 .. "-" + if ranking2 then + rankStr = rankStr .. ranking2 + else + rankStr = rankStr .. "-" + end + if self:getIndex() == totalIndex then + rankStr = ranking1 .. "+" + end + uiMap["rank_reward_cell.bg.tx_rank"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_23, rankStr)) + if not self.rewardCells then + self.rewardCells = {} + for i = 1, 2 do + self.rewardCells[i] = uiMap["rank_reward_cell.bg.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + end + end + for index, cell in ipairs(self.rewardCells) do + if rewards and rewards[index] then + cell:refreshByConfig(rewards[index]) + cell:getBaseObject():setActive(true) + else + cell:getBaseObject():setActive(false) + end + end +end + +return RankRewardcell \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua.meta b/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua.meta new file mode 100644 index 00000000..2183e3b3 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a830faf323aec28408b0a931906bd52d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/cell/shop_cell.lua b/lua/app/ui/activity/act_boss_rush/cell/shop_cell.lua new file mode 100644 index 00000000..7c99aec6 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/shop_cell.lua @@ -0,0 +1,66 @@ +local ShopCell = class("ShopCell", BaseCell) + +local BTN_ICON = {"common_btn_green_2", "common_btn_grey_2"} + +function ShopCell:init() + local uiMap = self:getUIMap() + self.scoreIcon = uiMap["shop_cell.bg.score"] + self.txScore = uiMap["shop_cell.score.tx_score"] + self.rewardCell = uiMap["shop_cell.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.txBtn = uiMap["shop_cell.ok_btn.text"] + self.txLimit = uiMap["shop_cell.tx_limit"] + self.btn = uiMap["shop_cell.ok_btn"] +end + +function ShopCell:refresh(id) + self.txBtn:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_18)) + + local cost = DataManager.ActBossRushData:getShopCost(id) + local costId = GFunc.getRewardId(cost) + local costNum = GFunc.getRewardNum(cost) + self.scoreIcon:setSprite(ModuleManager.ItemManager:getItemIcon(costId)) + local color = "#FFFFFF" + local itemEnough = GFunc.checkCost(costId, costNum, false) + if not itemEnough then + -- color = "#FF4F38" + end + local str = string.format("%s", color, costNum) + self.txScore:setText(str) + + local remainCount = DataManager.ActBossRushData:getExchangeRemainCount(id) + local reward = DataManager.ActBossRushData:getShopReward(id) + if reward then + self.rewardCell:refreshByConfig(reward) + end + + local canExchange = remainCount > 0 + local color = "#FFFFFF" + if not canExchange then + -- color = "#FF4F38" + end + local str = string.format("%s", color, I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_19, remainCount)) + self.txLimit:setText(str) + + self.btn:addClickListener(function() + self:onClickReward(id) + end) + + if not itemEnough then + canExchange = false + end + local icon = canExchange and BTN_ICON[1] or BTN_ICON[2] + self.btn:setSprite(GConst.ATLAS_PATH.COMMON, icon) + self.btn:setTouchEnable(canExchange) +end + +-- 领取奖励 +function ShopCell:onClickReward(id) + local cost = DataManager.ActBossRushData:getShopCost(id) + local remainCount = DataManager.ActBossRushData:getExchangeRemainCount(id) + local reward = DataManager.ActBossRushData:getShopReward(id) + ModuleManager.CommonManager:showExchangeUI(1, remainCount, reward, cost, function(count) + ModuleManager.ActBossRushManager:reqExchange(id, count) + end) +end + +return ShopCell \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/cell/shop_cell.lua.meta b/lua/app/ui/activity/act_boss_rush/cell/shop_cell.lua.meta new file mode 100644 index 00000000..6186b208 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/shop_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ea3b29f79e884c845bf330b3dd5a8112 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/act_boss_rush/cell/top_rank_cell.lua b/lua/app/ui/activity/act_boss_rush/cell/top_rank_cell.lua new file mode 100644 index 00000000..3847bf56 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/top_rank_cell.lua @@ -0,0 +1,43 @@ +local TopRankCell = class("TopRankCell", BaseCell) + +function TopRankCell:refresh(info) + local uiMap = self:getUIMap() + if not self.playerHeadCell then + self.playerHeadCell = CellManager:addCellComp(uiMap["top_rank_cell.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) + end + + local txName = uiMap["top_rank_cell.name"] + local txWave = uiMap["top_rank_cell.wave"] + local txRound = uiMap["top_rank_cell.round"] + local imgWave = uiMap["top_rank_cell.img_wave"] + local imgRound = uiMap["top_rank_cell.img_round"] + + if info then + txName:setText(info.name) + txWave:setText(info.wave) + txRound:setText(info.round) + imgWave:setVisible(true) + imgRound:setVisible(true) + self.playerHeadCell:getBaseObject():addClickListener(function() + ModuleManager.ActBossRushManager:reqOtherPlayerInfo(info.id, function(formation) + if not self.playerHeadCell or not self.playerHeadCell:getBaseObject() or self.playerHeadCell:getBaseObject():isDestroyed() then + return + end + ModuleManager.TipsManager:showHeroFormation(self.playerHeadCell:getBaseObject(), formation) + end) + end) + self.playerHeadCell:refresh(info.avatar, info.avatar_frame, false) + GFunc.centerImgAndTx(imgWave, txWave, 5) + GFunc.centerImgAndTx(imgRound, txRound, 5) + else + txName:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_8)) + txWave:setText(GConst.EMPTY_STRING) + txRound:setText(GConst.EMPTY_STRING) + imgWave:setVisible(false) + imgRound:setVisible(false) + self.playerHeadCell:getBaseObject():addClickListener(nil) + self.playerHeadCell:refresh(3001, 1000, false) -- 默认 + end +end + +return TopRankCell \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/cell/top_rank_cell.lua.meta b/lua/app/ui/activity/act_boss_rush/cell/top_rank_cell.lua.meta new file mode 100644 index 00000000..7f4d59f9 --- /dev/null +++ b/lua/app/ui/activity/act_boss_rush/cell/top_rank_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4c6f718109e791b44987ca2a865c654d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day.meta b/lua/app/ui/activity/fourteen_day.meta new file mode 100644 index 00000000..13ae4c1a --- /dev/null +++ b/lua/app/ui/activity/fourteen_day.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e405abdcb4030e64dba3631b38b997ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/fourteen_day/cell.meta b/lua/app/ui/activity/fourteen_day/cell.meta new file mode 100644 index 00000000..60d3bf36 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c817462bfb12094bab1174e31e48e1d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua new file mode 100644 index 00000000..03c67103 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua @@ -0,0 +1,52 @@ +local FourteenDayBountyCell = class("FourteenDayBountyCell", BaseCell) + +function FourteenDayBountyCell:init() + local uiMap = self:getUIMap() + self.imgLevel = uiMap["fourteen_day_bounty_cell.level"] + self.txLevel = uiMap["fourteen_day_bounty_cell.level.tx_level"] + self.line = uiMap["fourteen_day_bounty_cell.line"] + self.bountyRewardCell1 = uiMap["fourteen_day_bounty_cell.bounty_reward_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL) + self.bountyRewardCell2 = uiMap["fourteen_day_bounty_cell.bounty_reward_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL) +end + +function FourteenDayBountyCell:refresh(id) + self.txLevel:setText(id) + self.line:setActive(id < #DataManager.FourteenDayData:getBountyCfg()) + + self.bountyRewardCell1:refresh( + DataManager.FourteenDayData:getBountyGradeReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE), false, + not DataManager.FourteenDayData:isBountyGradeUnlock(GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE), + DataManager.FourteenDayData:isReceivedBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE)) + self.bountyRewardCell2:refresh( + DataManager.FourteenDayData:getBountyGradeReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY), true, + not DataManager.FourteenDayData:isBountyGradeUnlock(GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY), + DataManager.FourteenDayData:isReceivedBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY)) + + if DataManager.FourteenDayData:getActiveDays() >= id then + self.imgLevel:setImageGray(false) + if DataManager.FourteenDayData:canGetBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE) then + self.bountyRewardCell1:showLight() + self.bountyRewardCell1:addClickListener(function() + ModuleManager.FourteenDayManager:reqBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE) + end) + else + self.bountyRewardCell1:hideLight() + self.bountyRewardCell1:addClickListener(nil) + end + if DataManager.FourteenDayData:canGetBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY) then + self.bountyRewardCell2:showLight() + self.bountyRewardCell2:addClickListener(function() + ModuleManager.FourteenDayManager:reqBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY) + end) + else + self.bountyRewardCell2:hideLight() + self.bountyRewardCell2:addClickListener(nil) + end + else + self.imgLevel:setImageGray(true) + self.bountyRewardCell1:hideLight() + self.bountyRewardCell2:hideLight() + end +end + +return FourteenDayBountyCell \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua.meta b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua.meta new file mode 100644 index 00000000..531d75f4 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b719a1636ad4d83438f07408ff008528 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua new file mode 100644 index 00000000..0b6ef174 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua @@ -0,0 +1,57 @@ +local FourteenDayExchangeCell = class("FourteenDayExchangeCell", BaseCell) + +function FourteenDayExchangeCell:init() + local uiMap = self:getUIMap() + self.rewardCell = uiMap["fourteen_day_exchange_cell.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.txLimit = uiMap["fourteen_day_exchange_cell.tx_limit"] + self.cost = uiMap["fourteen_day_exchange_cell.cost"] + self.imgCost = uiMap["fourteen_day_exchange_cell.cost.img_cost"] + self.txCost = uiMap["fourteen_day_exchange_cell.cost.tx_num"] + self.lock = uiMap["fourteen_day_exchange_cell.lock"] + self.txLock = uiMap["fourteen_day_exchange_cell.lock.tx_lock"] + + self:addClickListener(function() + if DataManager.FourteenDayData:canExchange(self.id) then + local cost = DataManager.FourteenDayData:getExchangeCost(self.id) + local remainCount = DataManager.FourteenDayData:getExchangeRemainTime(self.id) + local reward = DataManager.FourteenDayData:getExchangeReward(self.id) + ModuleManager.CommonManager:showExchangeUI(1, remainCount, reward, cost, function(count) + ModuleManager.FourteenDayManager:reqExchangeReward(self.id, count) + end) + end + end) +end + +function FourteenDayExchangeCell:refresh(id) + self.id = id + + if DataManager.FourteenDayData:isExchangeUnlock(self.id) then + -- 已解锁 + self.cost:setActive(true) + self.txLimit:setActive(true) + self.lock:setActive(false) + local time = DataManager.FourteenDayData:getExchangeRemainTime(self.id) + if time > 0 then + self.txLimit:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, time)) + else + self.txLimit:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, ""..time.."")) + end + local costNum = DataManager.FourteenDayData:getExchangeCostNum(self.id) + if DataManager.FourteenDayData:getExchangeItemNum() >= costNum then + self.txCost:setText(costNum) + else + self.txCost:setText(""..costNum.."") + end + GFunc.centerImgAndTx(self.imgCost, self.txCost) + else + -- 未解锁 + self.cost:setActive(false) + self.txLimit:setActive(false) + self.lock:setActive(true) + self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_33, DataManager.FourteenDayData:getExchangeUnlockCondition(self.id))) + end + + self.rewardCell:refreshByConfig(DataManager.FourteenDayData:getExchangeReward(self.id)) +end + +return FourteenDayExchangeCell \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua.meta b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua.meta new file mode 100644 index 00000000..a8e780f6 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e9fe8f4f82483f947b15fccafcee78c3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_gift_cell.lua b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_gift_cell.lua new file mode 100644 index 00000000..d81ebe95 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_gift_cell.lua @@ -0,0 +1,56 @@ +local FourteenDayExchangeCell = class("FourteenDayExchangeCell", BaseCell) + +function FourteenDayExchangeCell:init() + local uiMap = self:getUIMap() + + self.txLimit = uiMap["fourteen_day_gift_cell.tx_limit"] + self.txBuy = uiMap["fourteen_day_gift_cell.tx_buy"] + self.imgOff = uiMap["fourteen_day_gift_cell.off_img"] + self.txOff = uiMap["fourteen_day_gift_cell.off_img.tx_off"] + self.rewards = {} + for i = 1, 3 do + table.insert(self.rewards, uiMap["fourteen_day_gift_cell.reward_cell_"..i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) + end + + self:addClickListener(function() + if DataManager.FourteenDayData:getGiftRemainTime(self.id) > 0 then + PayManager:purchasePackage(self.id, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end + end) +end + +function FourteenDayExchangeCell:refresh(id) + self.id = id + local cfg = DataManager.ShopData:getActGiftConfig()[self.id] + local time = DataManager.FourteenDayData:getGiftRemainTime(self.id) + + self.txLimit:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, time)) + + for idx, reward in ipairs(self.rewards) do + if cfg.reward[idx] then + reward:setVisible(true) + reward:refreshByConfig(cfg.reward[idx]) + else + reward:setVisible(false) + end + end + + local buyStr + if cfg.recharge_id then + self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_6") + self.imgOff:setActive(true) + self.txOff:setText(cfg.value .. "%") + buyStr = GFunc.getFormatPrice(cfg.recharge_id) + else + self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_5") + self.imgOff:setActive(false) + buyStr = I18N:getGlobalText(I18N.GlobalConst.STR_FREE) + end + + if time <= 0 then + buyStr = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20) + end + self.txBuy:setText(buyStr) +end + +return FourteenDayExchangeCell \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_gift_cell.lua.meta b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_gift_cell.lua.meta new file mode 100644 index 00000000..8f606933 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_gift_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6c0949220f56e2a4888eb9d2106a949e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_task_cell.lua b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_task_cell.lua new file mode 100644 index 00000000..171c9bf6 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_task_cell.lua @@ -0,0 +1,63 @@ +local FourteenDayTaskCell = class("FourteenDayTaskCell", BaseCell) +local TASK_BG = { + "act_common_bg_2", + "act_common_bg_3", +} +local TASK_ICON_BG = { + "act_common_board_3", + "act_common_board_4", +} + +function FourteenDayTaskCell:init() + local uiMap = self:getUIMap() + self.imgTaskBg = uiMap["fourteen_day_task_cell.img_task_bg"] + self.imgTask = uiMap["fourteen_day_task_cell.img_task_bg.img_task"] + self.txDesc = uiMap["fourteen_day_task_cell.tx_desc"] + self.imgProg = uiMap["fourteen_day_task_cell.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txProg = uiMap["fourteen_day_task_cell.prog.tx_prog"] + self.txNum = uiMap["fourteen_day_task_cell.tx_num"] + self.finish = uiMap["fourteen_day_task_cell.finish"] + self.txFinish = uiMap["fourteen_day_task_cell.finish.bg.tx_finish"] + + self:addClickListener(function() + if DataManager.FourteenDayData:canGetTaskReward(self.taskId) then + ModuleManager.FourteenDayManager:reqTaskReward(self.taskId) + end + end) +end + +function FourteenDayTaskCell:refresh(id) + self.taskId = id + local total = DataManager.FourteenDayData:getTaskTarget(self.taskId) + local cur = DataManager.FourteenDayData:getTaskProgress(self.taskId) + if DataManager.FourteenDayData:getTaskType(self.taskId) == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then + local minScore = DataManager.ArenaData:getSeasonGradingMinScore() + total = total - minScore + cur = cur - minScore + if cur < 0 then + cur = 0 + end + end + self.imgTask:setSprite(GConst.ATLAS_PATH.ICON_TASK, tostring(DataManager.FourteenDayData:getTaskIcon(self.taskId))) + self.txDesc:setText(DataManager.FourteenDayData:getTaskDesc(self.taskId)) + self.imgProg.value = cur / total + self.txProg:setText(cur .. "/" .. total) + self.txNum:setText(GFunc.getRewardNum(DataManager.FourteenDayData:getTaskRewards(self.taskId)[1])) + self.txFinish:setText(I18N:getGlobalText(I18N.GlobalConst.STR_COMPLETED)) + + self.finish:setActive(false) + self.baseObject:removeRedPoint() + if DataManager.FourteenDayData:canGetTaskReward(self.taskId) then + -- 可领取 + self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, TASK_BG[2]) + self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, TASK_ICON_BG[2]) + self.baseObject:addRedPoint(260, 70, 0.8) + else + -- 未完成 or 已领取 + self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, TASK_BG[1]) + self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, TASK_ICON_BG[1]) + self.finish:setActive(DataManager.FourteenDayData:isReceivedTaskReward(self.taskId)) + end +end + +return FourteenDayTaskCell \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/cell/fourteen_day_task_cell.lua.meta b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_task_cell.lua.meta new file mode 100644 index 00000000..568dfd12 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/cell/fourteen_day_task_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 41f7aa194192dd641bc09fbb49698a9b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua new file mode 100644 index 00000000..7d77a063 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua @@ -0,0 +1,132 @@ +local FourteenDayBountyUI = class("FourteenDayBountyUI", BaseUI) + +function FourteenDayBountyUI:isFullScreen() + return false +end + +function FourteenDayBountyUI:getPrefabPath() + return "assets/prefabs/ui/activity/fourteen_day/fourteen_day_bounty_ui.prefab" +end + +function FourteenDayBountyUI:onPressBackspace() + self:closeUI() +end + +function FourteenDayBountyUI:onClose() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end +end + +function FourteenDayBountyUI:ctor() +end + +function FourteenDayBountyUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.txTitle = uiMap["fourteen_day_bounty_ui.content.title.tx_title"] + self.btnClose = uiMap["fourteen_day_bounty_ui.content.btn_close"] + self.scrollrectComp = uiMap["fourteen_day_bounty_ui.content.list_bounty"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.prog = uiMap["fourteen_day_bounty_ui.content.list_bounty.viewport.content.prog"] + self.imgProg = uiMap["fourteen_day_bounty_ui.content.list_bounty.viewport.content.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.imgMask = uiMap["fourteen_day_bounty_ui.content.list_bounty.viewport.content.mask_img"] + self.imgLine = uiMap["fourteen_day_bounty_ui.content.list_bounty.viewport.content.line"] + -- 购买 + self.btnBuy = uiMap["fourteen_day_bounty_ui.content.btn_buy"] + self.txBuy = uiMap["fourteen_day_bounty_ui.content.btn_buy.tx_buy"] + self.txTips = uiMap["fourteen_day_bounty_ui.content.tx_tips"] + self.txCountdown = uiMap["fourteen_day_bounty_ui.content.countdown.tx_countdown"] + self.bought = uiMap["fourteen_day_bounty_ui.content.bought"] + self.txBought = uiMap["fourteen_day_bounty_ui.content.bought.tx_bought"] + + self.bountyList = DataManager.FourteenDayData:getBountyCfg() + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_1)) + self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_5)) + self.txBought:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_ACTIVE)) + self.scrollrectComp:addInitCallback(function() + self.imgMask:getTransform():SetAsLastSibling() + self.imgLine:getTransform():SetAsLastSibling() + return "app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refresh(index) + end) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#self.bountyList) + + self.btnBuy:addClickListener(function() + ModuleManager.FourteenDayManager:buyBounty() + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.FourteenDayData, "isDirty", function() + self:onRefresh() + end) + self:bind(DataManager.ShopData, "isDirty", function() + self:refreshBuy() + self:refreshBountyList() + end) +end + +function FourteenDayBountyUI:onRefresh() + self:refreshBuy() + self:refreshBountyList() + self:refreshCountdown() +end + +-- 刷新倒计时 +function FourteenDayBountyUI:refreshCountdown() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end + self.countdownSid = self:scheduleGlobal(function() + local time = DataManager.FourteenDayData:getEndRemainTime() + if time < 0 then + self:closeUI() + return + end + self.txCountdown:setText(Time:formatNumTimeStr(time)) + end, 1) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) +end + +-- 刷新购买 +function FourteenDayBountyUI:refreshBuy() + if not DataManager.FourteenDayData:isBountyGradeUnlock(GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY) then + self.bought:setActive(false) + self.btnBuy:setActive(true) + local gift = DataManager.ShopData:getActGiftConfig()[GConst.FourteenDayConst.BOUNTY_GIFT_ID] + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + else + self.bought:setActive(true) + self.btnBuy:setActive(false) + end +end + +-- 刷新战令列表 +function FourteenDayBountyUI:refreshBountyList() + self.scrollrectComp:updateAllCell() + local maxLevel = #self.bountyList + local curLevel = DataManager.FourteenDayData:getActiveDays() + local topRecoveryOffset = self.scrollrectComp:getTopRecoveryOffset() + local downRecoveryOffset = self.scrollrectComp:getDownRecoveryOffset() + local cellHeight = self.scrollrectComp:getCellHeight() + if curLevel >= maxLevel then + self.imgLine:setVisible(false) + else + self.imgLine:setVisible(true) + self.imgLine:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) + end + self.prog:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 10) + self.prog:setSizeDeltaY(cellHeight * (maxLevel - 1)) + local percent = (curLevel - 1) / (maxLevel - 1) + if percent < 0 then + percent = 0 + end + self.imgProg.value = percent + self.imgMask:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) + self.imgMask:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT) +end + +return FourteenDayBountyUI \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua.meta b/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua.meta new file mode 100644 index 00000000..18b4da8f --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4855e5b248c94bb4cabd7c39b659352a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua new file mode 100644 index 00000000..4e7004f3 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua @@ -0,0 +1,160 @@ +local FourteenDayEntranceUI = class("FourteenDayEntranceUI", BaseUI) + +function FourteenDayEntranceUI:isFullScreen() + return false +end + +function FourteenDayEntranceUI:getPrefabPath() + return "assets/prefabs/ui/activity/fourteen_day/fourteen_day_entrance_ui.prefab" +end + +function FourteenDayEntranceUI:onPressBackspace() + self:closeUI() +end + +function FourteenDayEntranceUI:onClose() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end + if self.animsAppear then + for idx, anim in pairs(self.animsAppear) do + if anim then + anim:Kill() + end + end + end +end + +function FourteenDayEntranceUI:ctor() +end + +function FourteenDayEntranceUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.btnClose = uiMap["fourteen_day_entrance_ui.btn_close"] + self.flyPos = uiMap["fourteen_day_entrance_ui.fly_posx"] + -- 战令 + self.itemBounty = uiMap["fourteen_day_entrance_ui.item_bounty"] + self.txBountyTitle = uiMap["fourteen_day_entrance_ui.item_bounty.tx_title"] + self.txBountyDesc = uiMap["fourteen_day_entrance_ui.item_bounty.tx_desc"] + self.txBountyCountdown = uiMap["fourteen_day_entrance_ui.item_bounty.countdown.tx_countdown"] + -- 任务 + self.itemTask = uiMap["fourteen_day_entrance_ui.item_task"] + self.txTaskTitle = uiMap["fourteen_day_entrance_ui.item_task.tx_title"] + self.txTaskDesc = uiMap["fourteen_day_entrance_ui.item_task.tx_desc"] + self.txTaskCountdown = uiMap["fourteen_day_entrance_ui.item_task.countdown.tx_countdown"] + -- 兑换 + self.itemExchange = uiMap["fourteen_day_entrance_ui.item_exchange"] + self.txExchangeTitle = uiMap["fourteen_day_entrance_ui.item_exchange.tx_title"] + self.txExchangeDesc = uiMap["fourteen_day_entrance_ui.item_exchange.tx_desc"] + self.txExchangeCountdown = uiMap["fourteen_day_entrance_ui.item_exchange.countdown.tx_countdown"] + -- 礼包 + self.itemGift = uiMap["fourteen_day_entrance_ui.item_gift"] + self.txGiftTitle = uiMap["fourteen_day_entrance_ui.item_gift.tx_title"] + self.txGiftDesc = uiMap["fourteen_day_entrance_ui.item_gift.tx_desc"] + self.txGiftCountdown = uiMap["fourteen_day_entrance_ui.item_gift.countdown.tx_countdown"] + + self.txBountyTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_1)) + self.txBountyDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_1)) + self.txTaskTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_2)) + self.txTaskDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_2)) + self.txExchangeTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_3)) + self.txExchangeDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_3)) + self.txGiftTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_4)) + self.txGiftDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_32)) + if self.animsAppear then + for idx, anim in pairs(self.animsAppear) do + if anim then + anim:Kill() + end + end + end + self.animsAppear = {} + table.insert(self.animsAppear, self:showAppearAnim(1, self.itemBounty)) + table.insert(self.animsAppear, self:showAppearAnim(2, self.itemTask)) + table.insert(self.animsAppear, self:showAppearAnim(3, self.itemExchange)) + table.insert(self.animsAppear, self:showAppearAnim(4, self.itemGift)) + + self.itemBounty:addClickListener(function() + UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_bounty_ui") + end) + self.itemTask:addClickListener(function() + UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_task_ui") + end) + self.itemExchange:addClickListener(function() + UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_exchange_ui") + end) + self.itemGift:addClickListener(function() + UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_gift_ui") + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.FourteenDayData, "isDirty", function() + self:onRefresh() + end) +end + +function FourteenDayEntranceUI:onRefresh() + -- 倒计时 + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end + self.countdownSid = self:scheduleGlobal(function() + local time = DataManager.FourteenDayData:getEndRemainTime() + if time < 0 then + self:closeUI() + return + end + self.txBountyCountdown:setText(Time:formatNumTimeStr(time)) + self.txTaskCountdown:setText(Time:formatNumTimeStr(time)) + self.txExchangeCountdown:setText(Time:formatNumTimeStr(time)) + self.txGiftCountdown:setText(Time:formatNumTimeStr(time)) + end, 1) + local time = DataManager.FourteenDayData:getEndRemainTime() + self.txBountyCountdown:setText(Time:formatNumTimeStr(time)) + self.txTaskCountdown:setText(Time:formatNumTimeStr(time)) + self.txExchangeCountdown:setText(Time:formatNumTimeStr(time)) + self.txGiftCountdown:setText(Time:formatNumTimeStr(time)) + + self:refreshRedPoint() +end + +-- 刷新红点 +function FourteenDayEntranceUI:refreshRedPoint() + if DataManager.FourteenDayData:hasBountyRedPoint() then + self.itemBounty:addRedPoint(300, 75, 0.6) + else + self.itemBounty:removeRedPoint() + end + if DataManager.FourteenDayData:hasTaskRedPoint() then + self.itemTask:addRedPoint(300, 75, 0.6) + else + self.itemTask:removeRedPoint() + end + if DataManager.FourteenDayData:hasExchangeRedPoint() then + self.itemExchange:addRedPoint(300, 75, 0.6) + else + self.itemExchange:removeRedPoint() + end + if DataManager.FourteenDayData:hasGiftRedPoint() then + self.itemGift:addRedPoint(300, 75, 0.6) + else + self.itemGift:removeRedPoint() + end +end + +-- 展示出现动画 +function FourteenDayEntranceUI:showAppearAnim(idx, item) + item:setTouchEnable(false) + item:setPosition(self.flyPos:getPosition().x, item:getPosition().y, item:getPosition().z) + + local delay = (idx - 1) * 0.1 + local animAppear = item:createBindTweenSequence() + animAppear:Insert(delay, item:getTransform():DOMove(CS.UnityEngine.Vector3(0, item:getPosition().y, item:getPosition().z), 0.5)) + animAppear:OnComplete(function() + item:setTouchEnable(true) + end) + return animAppear +end + +return FourteenDayEntranceUI \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua.meta b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua.meta new file mode 100644 index 00000000..732999d1 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fbd9d20a63c9fe94583d988bb8d253e2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua new file mode 100644 index 00000000..88b4f2bf --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua @@ -0,0 +1,84 @@ +local FourteenDayExchangeUI = class("FourteenDayExchangeUI", BaseUI) + +function FourteenDayExchangeUI:isFullScreen() + return false +end + +function FourteenDayExchangeUI:getPrefabPath() + return "assets/prefabs/ui/activity/fourteen_day/fourteen_day_exchange_ui.prefab" +end + +function FourteenDayExchangeUI:onPressBackspace() + self:closeUI() +end + +function FourteenDayExchangeUI:onClose() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end +end + +function FourteenDayExchangeUI:ctor() +end + +function FourteenDayExchangeUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.txTitle = uiMap["fourteen_day_exchange_ui.content.img_title.tx_title"] + self.btnClose = uiMap["fourteen_day_exchange_ui.content.btn_close"] + self.txCountdown = uiMap["fourteen_day_exchange_ui.content.countdown.tx_countdown"] + self.txDesc = uiMap["fourteen_day_exchange_ui.content.tx_desc"] + self.scrollrectComp = uiMap["fourteen_day_exchange_ui.content.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.txNum = uiMap["fourteen_day_exchange_ui.content.item.tx_num"] + self.btnAdd = uiMap["fourteen_day_exchange_ui.content.item"] + + self.exchangeList = DataManager.FourteenDayData:getExchangeShowIdsSort() + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_3)) + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_9)) + + self.scrollrectComp:addInitCallback(function() + return "app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refresh(self.exchangeList[index].id) + end) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#self.exchangeList) + + self.btnAdd:addClickListener(function() + UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_task_ui") + self:closeUI() + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.FourteenDayData, "isDirty", function() + self:onRefresh() + end) +end + +function FourteenDayExchangeUI:onRefresh() + DataManager.FourteenDayData:setTodayExchangeCheck() + self.exchangeList = DataManager.FourteenDayData:getExchangeShowIdsSort() + + self.txNum:setText(DataManager.FourteenDayData:getExchangeItemNum()) + self.scrollrectComp:updateAllCell() + self:refreshCountdown() +end + +-- 刷新倒计时 +function FourteenDayExchangeUI:refreshCountdown() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end + self.countdownSid = self:scheduleGlobal(function() + local time = DataManager.FourteenDayData:getEndRemainTime() + if time < 0 then + self:closeUI() + return + end + self.txCountdown:setText(Time:formatNumTimeStr(time)) + end, 1) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) +end + +return FourteenDayExchangeUI \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua.meta b/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua.meta new file mode 100644 index 00000000..636449e8 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 68f6d93df63aa1248864fba73ced6424 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua new file mode 100644 index 00000000..5dd13884 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua @@ -0,0 +1,75 @@ +local FourteenDayGiftUI = class("FourteenDayGiftUI", BaseUI) + +function FourteenDayGiftUI:isFullScreen() + return false +end + +function FourteenDayGiftUI:getPrefabPath() + return "assets/prefabs/ui/activity/fourteen_day/fourteen_day_gift_ui.prefab" +end + +function FourteenDayGiftUI:onPressBackspace() + self:closeUI() +end + +function FourteenDayGiftUI:onClose() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end +end + +function FourteenDayGiftUI:ctor() +end + +function FourteenDayGiftUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.txTitle = uiMap["fourteen_day_gift_ui.content.img_title.tx_title"] + self.btnClose = uiMap["fourteen_day_gift_ui.content.btn_close"] + self.txCountdown = uiMap["fourteen_day_gift_ui.content.countdown.tx_countdown"] + self.scrollrectComp = uiMap["fourteen_day_gift_ui.content.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_4)) + + self.scrollrectComp:addInitCallback(function() + return "app/ui/activity/fourteen_day/cell/fourteen_day_gift_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refresh(self.giftList[index].id) + end) + + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.FourteenDayData, "isDirty", function() + self:onRefresh() + end) + self:bind(DataManager.ShopData, "isDirty", function() + self:onRefresh() + end) +end + +function FourteenDayGiftUI:onRefresh() + self.giftList = DataManager.FourteenDayData:getGiftIdsSort() + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#self.giftList) + + self:refreshCountdown() +end + +-- 刷新倒计时 +function FourteenDayGiftUI:refreshCountdown() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end + self.countdownSid = self:scheduleGlobal(function() + local time = DataManager.FourteenDayData:getEndRemainTime() + if time < 0 then + self:closeUI() + return + end + self.txCountdown:setText(Time:formatNumTimeStr(time)) + end, 1) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) +end + +return FourteenDayGiftUI \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua.meta b/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua.meta new file mode 100644 index 00000000..43609044 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a171fec6561af8045b52689025759620 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua new file mode 100644 index 00000000..51677809 --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua @@ -0,0 +1,122 @@ +local FourteenDayTaskUI = class("FourteenDayTaskUI", BaseUI) + +function FourteenDayTaskUI:isFullScreen() + return false +end + +function FourteenDayTaskUI:getPrefabPath() + return "assets/prefabs/ui/activity/fourteen_day/fourteen_day_task_ui.prefab" +end + +function FourteenDayTaskUI:onPressBackspace() + self:closeUI() +end + +function FourteenDayTaskUI:onClose() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end +end + +function FourteenDayTaskUI:ctor() + self.curStage = DataManager.FourteenDayData:getTaskShowStage() +end + +function FourteenDayTaskUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.txTitle = uiMap["fourteen_day_task_ui.content.img_title.tx_title"] + self.txCountdown = uiMap["fourteen_day_task_ui.content.countdown.tx_countdown"] + self.txDesc = uiMap["fourteen_day_task_ui.content.stage.tx_desc"] + self.rewardsNode = uiMap["fourteen_day_task_ui.content.stage.rewards"] + self.rewards = {} + for i = 1, 4 do + table.insert(self.rewards, uiMap["fourteen_day_task_ui.content.stage.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) + end + self.btnRight = uiMap["fourteen_day_task_ui.content.stage.select.btn_right"] + self.btnLeft = uiMap["fourteen_day_task_ui.content.stage.select.btn_left"] + self.txStage = uiMap["fourteen_day_task_ui.content.stage.select.tx_stage"] + self.txSelect = uiMap["fourteen_day_task_ui.content.stage.select.tx_select"] + self.scrollrectComp = uiMap["fourteen_day_task_ui.content.list_task"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.btnClose = uiMap["fourteen_day_task_ui.content.btn_close"] + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_TITLE_2)) + self.txStage:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_6)) + + self.scrollrectComp:addInitCallback(function() + return "app/ui/activity/fourteen_day/cell/fourteen_day_task_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refresh(self.taskList[index]) + end) + + self.btnRight:addClickListener(function() + if self.curStage + 1 > DataManager.FourteenDayData:getActiveDays() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_7)) + return + end + self.curStage = self.curStage + 1 + self:onRefresh() + end) + self.btnLeft:addClickListener(function() + self.curStage = self.curStage - 1 + self:onRefresh() + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.FourteenDayData, "isDirty", function() + self:onRefresh() + end) +end + +function FourteenDayTaskUI:onRefresh() + self.taskStage = DataManager.FourteenDayData:getStageTaskId(self.curStage) + self.taskList = DataManager.FourteenDayData:getStageSubTaskIdsSort(self.curStage) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#self.taskList) + + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_FOURTEEN_DESC_8)) + self.txSelect:setText(self.curStage .. "/" .. DataManager.FourteenDayData:getTaskMaxStage()) + self.btnRight:setActive(self.curStage < DataManager.FourteenDayData:getTaskMaxStage()) + self.btnLeft:setActive(self.curStage > 1) + + self:refreshStageRewards() + self:refreshCountdown() +end + +-- 刷新阶段奖励显示 +function FourteenDayTaskUI:refreshStageRewards() + local stageRewards = DataManager.FourteenDayData:getTaskRewards(self.taskStage) + local canGet = DataManager.FourteenDayData:canGetTaskReward(self.taskStage) + local isReceived = DataManager.FourteenDayData:isReceivedTaskReward(self.taskStage) + for idx, reward in ipairs(self.rewards) do + reward:hideFrameAnimation() + if stageRewards[idx] then + reward:setVisible(true) + reward:refreshByConfig(stageRewards[idx], isReceived, isReceived) + if canGet then + reward:addClickListener(function() + ModuleManager.FourteenDayManager:reqTaskReward(self.taskStage) + end) + reward:showFrameAnimation() + else + reward:addClickListener(nil) + end + else + reward:setVisible(false) + end + end +end + +-- 刷新倒计时 +function FourteenDayTaskUI:refreshCountdown() + if self.countdownSid then + self:unscheduleGlobal(self.countdownSid) + end + self.countdownSid = self:scheduleGlobal(function() + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) + end, 1) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) +end + +return FourteenDayTaskUI \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua.meta b/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua.meta new file mode 100644 index 00000000..15067fcb --- /dev/null +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 70750f44a076f274eabff37f134cc6b0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/hero_fund/hero_fund_ui.lua b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua index cf9d9058..d3e8801f 100644 --- a/lua/app/ui/activity/hero_fund/hero_fund_ui.lua +++ b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua @@ -3,6 +3,10 @@ local HeroFundUI = class("HeroFundUI", BaseUI) local FUND_CELL = "app/ui/activity/hero_fund/cell/fund_cell" local BTN_ICON = {"common_btn_green_3", "act_herofund_board_2"} +function HeroFundUI:onPressBackspace() + self:closeUI() +end + function HeroFundUI:isFullScreen() return false end @@ -49,7 +53,7 @@ function HeroFundUI:_display() self.toActivityBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.PART_IN_DESC)) self.toActivityBtn:addClickListener(function() self:closeUI() - -- 去14活动 + ModuleManager.FourteenDayManager:showFourteenDayUI() end) self:refreshBtns() @@ -168,15 +172,15 @@ function HeroFundUI:refreshTime() str = I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC) else str = Time:formatNumTimeStr(remainTime) - -- if remainTime <= 86400 then --最后一天 -- 14天活动未开，不处理 - -- self.toActivityTx:setVisible(true) - -- self.toActivityBtn:setActive(true) - -- self.downDesc:setVisible(false) - -- else + if DataManager.FourteenDayData:getOpenStatus() then -- 14天活动开了就显示 + self.toActivityTx:setVisible(true) + self.toActivityBtn:setActive(true) + self.downDesc:setVisible(false) + else self.toActivityTx:setVisible(false) self.toActivityBtn:setActive(false) self.downDesc:setVisible(true) - -- end + end end uiMap["activity_herofund_ui.bg.countdown.tx_countdown"]:setText(str) end diff --git a/lua/app/ui/activity/pop_check_bar.lua b/lua/app/ui/activity/pop_check_bar.lua new file mode 100644 index 00000000..b39d7049 --- /dev/null +++ b/lua/app/ui/activity/pop_check_bar.lua @@ -0,0 +1,30 @@ +local PopCheckBar = class("PopCheckBar", LuaComponent) + +function PopCheckBar:init() + self.baseObject:initPrefabHelper() + self.baseObject:genAllChildren() +end + +function PopCheckBar:refresh(isCheck, customKey) + self.isCheck = isCheck + self.customKey = customKey + local uiMap = self:getUIMap() + local txObj = uiMap["pop_check_bar.desc"] + txObj:setText(I18N:getGlobalText(I18N.GlobalConst.NOT_POP_TODAY)) + GFunc.expandImgToFitTx(self.baseObject, txObj, 20) + + local checkIcon = uiMap["pop_check_bar.check"] + checkIcon:setVisible(self.isCheck) + self.baseObject:addClickListener(function() + self.isCheck = not self.isCheck + checkIcon:setVisible(self.isCheck) + end) +end + +function PopCheckBar:saveCheckStatus() + if self.isCheck then + LocalData:setNotPopToday(self.customKey) + end +end + +return PopCheckBar \ No newline at end of file diff --git a/lua/app/ui/activity/pop_check_bar.lua.meta b/lua/app/ui/activity/pop_check_bar.lua.meta new file mode 100644 index 00000000..29ebf6f4 --- /dev/null +++ b/lua/app/ui/activity/pop_check_bar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b0597a40cbdf3b64a9aa9c1e0c589e2e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/bounty_main_ui.lua b/lua/app/ui/arena/bounty_main_ui.lua index 5082164d..494b8da3 100644 --- a/lua/app/ui/arena/bounty_main_ui.lua +++ b/lua/app/ui/arena/bounty_main_ui.lua @@ -73,12 +73,14 @@ function BountyMainUI:onLoadRootComplete() end function BountyMainUI:initTitle() - self.titleSpine = self.uiMap["bounty_main_ui.top_node.ui_spine_obj"] - local trackEntry = self.titleSpine:playAnim("born", false) - local time = self.titleSpine:getAnimation(trackEntry).Duration - self:performWithDelayGlobal(function() - self.titleSpine:playAnim("idle", true) - end, time) + self.titleSpine = self.uiMap["bounty_main_ui.top_node.spine_title"] + self.titleSpine:setVisible(false) + self.titleSpine:loadAssetAsync(DataManager.ArenaBountyData:getBannerName(), function() + self.titleSpine:setVisible(true) + self.titleSpine:playAnimComplete("born", false, true, function() + self.titleSpine:playAnim("idle", true, true, true) + end, true) + end, false) end function BountyMainUI:initTime() diff --git a/lua/app/ui/arena/cell/bounty_cell.lua b/lua/app/ui/arena/cell/bounty_cell.lua index b0078e43..b78b544a 100644 --- a/lua/app/ui/arena/cell/bounty_cell.lua +++ b/lua/app/ui/arena/cell/bounty_cell.lua @@ -1,14 +1,12 @@ local BountyCell = class("BountyCell", BaseCell) -local BOUNTY_REWARD_CELL = "app/ui/arena/cell/bounty_reward_cell" - function BountyCell:init() local uiMap = self:getUIMap() self.uiMap = uiMap uiMap["cell.bg.bounty_reward_cell_1"]:setAnchoredPositionX(-GConst.UI_SCREEN_WIDTH/4) - self.bountyRewardCell1 = uiMap["cell.bg.bounty_reward_cell_1"]:addLuaComponent(BOUNTY_REWARD_CELL) + self.bountyRewardCell1 = uiMap["cell.bg.bounty_reward_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL) uiMap["cell.bg.bounty_reward_cell_2"]:setAnchoredPositionX(GConst.UI_SCREEN_WIDTH/4) - self.bountyRewardCell2 = uiMap["cell.bg.bounty_reward_cell_2"]:addLuaComponent(BOUNTY_REWARD_CELL) + self.bountyRewardCell2 = uiMap["cell.bg.bounty_reward_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL) self.lvBg = uiMap["cell.bg.lv_bg"] self.lvTx = uiMap["cell.bg.lv_bg.lv_tx"] diff --git a/lua/app/ui/battle/battle_arena_pause_ui.lua b/lua/app/ui/battle/battle_arena_pause_ui.lua index 469ededf..7156820c 100644 --- a/lua/app/ui/battle/battle_arena_pause_ui.lua +++ b/lua/app/ui/battle/battle_arena_pause_ui.lua @@ -52,7 +52,7 @@ function BattleArenaPauseUI:_addListeners() okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), okFunc = function() - self.battleController:controllBattleEnd() + self.battleController:battleEnd() end, } GFunc.showMessageBox(params) diff --git a/lua/app/ui/battle/battle_bossrush_result_ui.lua b/lua/app/ui/battle/battle_bossrush_result_ui.lua new file mode 100644 index 00000000..01b2a58b --- /dev/null +++ b/lua/app/ui/battle/battle_bossrush_result_ui.lua @@ -0,0 +1,211 @@ +local ProgressBar = require "app/tools/progress_bar" +local BattleBossRushResultUI = class("BattleBossRushResultUI", BaseUI) + +local UNIT_RESULT_RERPORT_CELL = "app/ui/battle/cell/unit_result_report_cell" +local MAX_SCROLL_SHOW_COUNT = 10 +local SCROLL_LINE_HEIGHT = 130 + +function BattleBossRushResultUI:getPrefabPath() + return "assets/prefabs/ui/battle/battle_boss_rush_result_ui.prefab" +end + +function BattleBossRushResultUI:ctor(params) + if EDITOR_MODE then + Logger.printTable(params) + end + -- 通用 + self.battleType = params.battleType + self.combatReport = params.combatReport + self.taskProgress = params.taskProgress + self.totalDmg = 0 + self.atkReport = self.combatReport.atkReport + if self.atkReport then + for _, info in ipairs(self.atkReport) do + self.totalDmg = self.totalDmg + info.dmg + end + end +end + +function BattleBossRushResultUI:onClose() + if self.sliderSequence then + self.sliderSequence:Kill() + self.sliderSequence = nil + end + if self.animNode then + self.animNode:Kill() + self.animNode = nil + end +end + +function BattleBossRushResultUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + self.continue = uiMap["battle_boss_rush_result_ui.continue"] + -- 胜利节点 + self.victoryNode = uiMap["battle_boss_rush_result_ui.victory_node"] + self.victoryMask = uiMap["battle_boss_rush_result_ui.victory_node.mask_v"] + self.victoryTxTitle = uiMap["battle_boss_rush_result_ui.victory_node.title_bg.desc"] + self.victorySpine = uiMap["battle_boss_rush_result_ui.victory_node.ui_spine_obj"] + self.victoryUnitNode = uiMap["battle_boss_rush_result_ui.victory_node.unit_node"] + self.unitNode = uiMap["battle_boss_rush_result_ui.unit_node"] + self.unitTxDesc3 = uiMap["battle_boss_rush_result_ui.unit_node.desc_3"] + if not self.unitResultReportCells then + self.unitResultReportCells = {} + for index = 1, 5 do + self.unitResultReportCells[index] = CellManager:addCellComp(uiMap["battle_boss_rush_result_ui.unit_node.unit_result_report_cell_" .. index], UNIT_RESULT_RERPORT_CELL) + end + end + + local iconWave = uiMap["battle_boss_rush_result_ui.unit_node.icon_wave"] + local iconRound = uiMap["battle_boss_rush_result_ui.unit_node.icon_round"] + local txWave = uiMap["battle_boss_rush_result_ui.unit_node.desc_wave"] + local txRound = uiMap["battle_boss_rush_result_ui.unit_node.desc_round"] + txWave:setText(self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.PASS_WAVE] or 0) + txRound:setText(self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.TOTAL_TURN] or 0) + GFunc.centerImgAndTx(iconWave, txWave, 10, -136) + GFunc.centerImgAndTx(iconRound, txRound, 10, 136) + + local waveNew = uiMap["battle_boss_rush_result_ui.unit_node.desc_new_1"] + local roundNew = uiMap["battle_boss_rush_result_ui.unit_node.desc_new_2"] + waveNew:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_28)) + roundNew:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_28)) + local tag1, tag2 = DataManager.ActBossRushData:getWaveRoundNewTag() + waveNew:setVisible(tag1 == true) + roundNew:setVisible(tag2 == true) + + self.victoryMask:addClickListener(function() + self:onClickMask() + end) +end + +function BattleBossRushResultUI:onClickMask() + ModuleManager.BattleManager:endBattleAndExit() +end + +function BattleBossRushResultUI:onRefresh() + AudioManager:playEffect(AudioManager.EFFECT_ID.BATTLE_VICTORY) + self:refreshVictoryNode() + self:refreshUnitInfo() + self:refreshRewards() +end + +function BattleBossRushResultUI:refreshVictoryNode() + self.victoryNode:setVisible(true) + + self.victoryTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_30)) + self.victorySpine:playAnimComplete("born", false, true, function() + self.victorySpine:playAnim("idle", true, true) + end) + + self:showNodeAnim(self.victoryUnitNode, self.unitNode) +end + +-- 播放节点动画 +function BattleBossRushResultUI:showNodeAnim(parent, node) + if not parent then + node:setVisible(false) + return + else + node:setVisible(true) + end + node:setParent(parent, false) + node:setAnchoredPosition(0, 0) + local canvasNode = parent:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) + + self.animNode = self.root:createBindTweenSequence() + self.animNode:Insert(0, canvasNode:DOFade(0, 0)) + self.animNode:Insert(0.1, canvasNode:DOFade(1, 0)) + self.animNode:Insert(0, parent:getTransform():DOScale(0, 0)) + self.animNode:Insert(0.1, parent:getTransform():DOScale(0.35, 0)) + self.animNode:Insert(0.13, parent:getTransform():DOScale(1.1, 0.16)) + self.animNode:Insert(0.26, parent:getTransform():DOScale(1, 0.14)) + self.animNode:OnComplete(function() + self.animNode = nil + end) +end + +function BattleBossRushResultUI:refreshRewards() + local uiMap = self.root:genAllChildren() + uiMap["battle_boss_rush_result_ui.reward_node.reward_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_29)) + local wave = self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.PASS_WAVE] or 0 + uiMap["battle_boss_rush_result_ui.reward_node.score.tx_score"]:setText("+" .. wave) + local txLastWave = uiMap["battle_boss_rush_result_ui.reward_node.tx_last"] + local txNextWave = uiMap["battle_boss_rush_result_ui.reward_node.tx_next"] + local slider = uiMap["battle_boss_rush_result_ui.reward_node.slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + local sliderText = uiMap["battle_boss_rush_result_ui.reward_node.text"] + local curWaveLevel = DataManager.ActBossRushData:getWaveLevel() + local curWaveCount = DataManager.ActBossRushData:getWaveCount() + local lastLevel, lastCount = DataManager.ActBossRushData:getLastWaveLevelInfo() + + local count = DataManager.ActBossRushData:getLevelWave(lastLevel) + local lastNeedCount = math.max(DataManager.ActBossRushData:getLevelWave(lastLevel + 1), 0) + local lastHaveCount = math.max(lastCount - count, 0) + local oldSliderValue = lastHaveCount / lastNeedCount + + local count = DataManager.ActBossRushData:getLevelWave(curWaveLevel) + local curNeedCount = math.max(DataManager.ActBossRushData:getLevelWave(curWaveLevel + 1) - count, 0) + local curHaveCount = math.max(curWaveCount - count, 0) + local newSliderValue = curHaveCount / curNeedCount + + if DataManager.ActBossRushData:isMaxWaveLevel() then + curWaveLevel = curWaveLevel - 1 + newSliderValue = 1 + end + + local params = {} + params.ui = self + params.oldLv = lastLevel + params.newLv = curWaveLevel + params.beginPer = oldSliderValue + params.endPer = newSliderValue + params.time = 0.01 + params.perStep = 0.01 + params.callback = function (curLv, curPer) + slider.value = curPer + local nextCount = DataManager.ActBossRushData:getLevelWave(curLv + 1) + local minCount = DataManager.ActBossRushData:getLevelWave(curLv) + local ss = minCount + if nextCount then + ss = math.floor(curPer * (nextCount - minCount) + 0.0000001) + end + sliderText:setText(ss) + txLastWave:setText(minCount) + txNextWave:setText(nextCount) + end + params.endCallback = function() + local nextCount = DataManager.ActBossRushData:getLevelWave(curWaveLevel + 1) + local minCount = DataManager.ActBossRushData:getLevelWave(curWaveLevel) + + local sliderStr = curHaveCount + if sliderStr > nextCount - minCount then + sliderStr = nextCount - minCount + end + sliderText:setText(sliderStr) + + + txLastWave:setText(minCount) + txNextWave:setText(nextCount) + end + local progressBar = ProgressBar:create() + progressBar:runBar(params) +end + +function BattleBossRushResultUI:refreshUnitInfo() + if not self.atkReport then + self.unitNode:setVisible(false) + return + end + + self.unitNode:setVisible(true) + for index, cell in ipairs(self.unitResultReportCells) do + local info = self.atkReport[index] + cell:getBaseObject():setVisible(info ~= nil) + if info then + cell:refresh(info, self.totalDmg) + end + end + + self.unitTxDesc3:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_7, GFunc.num2Str(self.totalDmg))) +end + +return BattleBossRushResultUI \ No newline at end of file diff --git a/lua/app/ui/battle/battle_bossrush_result_ui.lua.meta b/lua/app/ui/battle/battle_bossrush_result_ui.lua.meta new file mode 100644 index 00000000..98aa7854 --- /dev/null +++ b/lua/app/ui/battle/battle_bossrush_result_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 74b9e3a6ea5818945a08ae688442dec1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/battle/battle_pause_ui.lua b/lua/app/ui/battle/battle_pause_ui.lua index 8bb9c7ca..9fb48fdf 100644 --- a/lua/app/ui/battle/battle_pause_ui.lua +++ b/lua/app/ui/battle/battle_pause_ui.lua @@ -28,8 +28,8 @@ end function BattlePauseUI:ctor(params) self.battleType = params.battleType - local battleController = ModuleManager.BattleManager.battleController - local map = battleController.battleData:getSelectSkillMap() + self.battleController = ModuleManager.BattleManager.battleController + local map = self.battleController.battleData:getSelectSkillMap() self.skillList = {} for skillId, info in pairs(map) do local cfg = SKILL_ROGUE_CFG[skillId] @@ -54,16 +54,29 @@ end function BattlePauseUI:_addListeners() local uiMap = self.root:genAllChildren() uiMap["battle_pause_ui.home_btn"]:addClickListener(function() - local params = { - content = I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_1), - boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, - okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), - cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), - okFunc = function() - ModuleManager.BattleManager:endBattleAndExit(true) - end, - } - GFunc.showMessageBox(params) + if self.battleType == GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH then + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_34), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), + okFunc = function() + self.battleController:battleEnd() + end, + } + GFunc.showMessageBox(params) + else + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_1), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), + okFunc = function() + ModuleManager.BattleManager:endBattleAndExit(true) + end, + } + GFunc.showMessageBox(params) + end end) uiMap["battle_pause_ui.continue_btn"]:addClickListener(function() diff --git a/lua/app/ui/battle/cell/unit_result_report_cell.lua b/lua/app/ui/battle/cell/unit_result_report_cell.lua index 0e7600c8..7798f92d 100644 --- a/lua/app/ui/battle/cell/unit_result_report_cell.lua +++ b/lua/app/ui/battle/cell/unit_result_report_cell.lua @@ -1,6 +1,9 @@ local UnitResultReportCell = class("UnitResultReportCell", BaseCell) function UnitResultReportCell:refresh(info, maxValue) + if maxValue <= 0 then + maxValue = 1 + end local uiMap = self:getUIMap() local icon = ModuleManager.HeroManager:getHeroIcon(info.heroId) if icon then diff --git a/lua/app/ui/bounty/cell/bounty_cell.lua b/lua/app/ui/bounty/cell/bounty_cell.lua index 7a3e4188..a3cc053f 100644 --- a/lua/app/ui/bounty/cell/bounty_cell.lua +++ b/lua/app/ui/bounty/cell/bounty_cell.lua @@ -1,14 +1,12 @@ local BountyCell = class("BountyCell", BaseCell) -local BOUNTY_REWARD_CELL = "app/ui/bounty/cell/bounty_reward_cell" - function BountyCell:init() local uiMap = self:getUIMap() self.uiMap = uiMap uiMap["cell.bg.bounty_reward_cell_1"]:setAnchoredPositionX(-GConst.UI_SCREEN_WIDTH/4) - self.bountyRewardCell1 = uiMap["cell.bg.bounty_reward_cell_1"]:addLuaComponent(BOUNTY_REWARD_CELL) + self.bountyRewardCell1 = uiMap["cell.bg.bounty_reward_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL) uiMap["cell.bg.bounty_reward_cell_2"]:setAnchoredPositionX(GConst.UI_SCREEN_WIDTH/4) - self.bountyRewardCell2 = uiMap["cell.bg.bounty_reward_cell_2"]:addLuaComponent(BOUNTY_REWARD_CELL) + self.bountyRewardCell2 = uiMap["cell.bg.bounty_reward_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL) self.lvBg = uiMap["cell.bg.lv_bg"] self.lvTx = uiMap["cell.bg.lv_bg.lv_tx"] diff --git a/lua/app/ui/bounty/cell/bounty_reward_cell.lua b/lua/app/ui/bounty/cell/bounty_reward_cell.lua deleted file mode 100644 index 2906ba47..00000000 --- a/lua/app/ui/bounty/cell/bounty_reward_cell.lua +++ /dev/null @@ -1,101 +0,0 @@ -local BountyRewardCell = class("BountyRewardCell", BaseCell) - -function BountyRewardCell:init() - local uiMap = self:getUIMap() - self.bg = uiMap["bounty_reward_cell.bg"] - self.icon = uiMap["bounty_reward_cell.icon"] - self.numTx = uiMap["bounty_reward_cell.num"] - self.check = uiMap["bounty_reward_cell.check"] - self.fragment = uiMap["bounty_reward_cell.fragment"] - self.light = uiMap["bounty_reward_cell.light"] - self.lock = uiMap["bounty_reward_cell.lock"] - self.matchImg = uiMap["bounty_reward_cell.match_img"] - self.sImg = uiMap["bounty_reward_cell.s"] - - self:hideLight() - self.baseObject:addClickListener(function() - if self.clickCallback then - self.clickCallback() - elseif self.rewardId ~= nil then - ModuleManager.TipsManager:showRewardTips(self.rewardId, self.rewardType, self.baseObject) - end - end) -end - -function BountyRewardCell:refresh(reward, isPro, isLock, showCheck) - self:showCheck(showCheck) - if isPro then - self.bg:setSprite(GConst.ATLAS_PATH.BOUNTY, "bounty_board_2") - else - self.bg:setSprite(GConst.ATLAS_PATH.BOUNTY, "bounty_board_1") - end - if isLock then - self.lock:setVisible(true) - else - self.lock:setVisible(false) - end - if reward.type == GConst.REWARD_TYPE.ITEM then - self:_refreshItem(reward) - self.rewardId = reward.id - self.rewardType = reward.type - else - self.rewardId = nil - end -end - -function BountyRewardCell:_refreshItem(item) - local info = ConfigManager:getConfig("item")[item.id] - if info == nil then - return - end - self.numTx:setText(item.count or item.num) - if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then - local heroInfo = ConfigManager:getConfig("hero")[info.parameter] - if heroInfo then - self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) - self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) - self.matchImg:setVisible(true) - self.sImg:setVisible(heroInfo.qlt >= 4) - else - self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") - self.matchImg:setVisible(false) - self.sImg:setVisible(false) - end - self.fragment:setVisible(true) - else - self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) - self.fragment:setVisible(false) - self.matchImg:setVisible(false) - self.sImg:setVisible(false) - end -end - -function BountyRewardCell:showCheck(show) - self.check:setVisible(show == true) -end - -function BountyRewardCell:setVisible(visible) - self.baseObject:setActive(visible) -end - -function BountyRewardCell:setAnchoredPositionX(x) - self.baseObject:setAnchoredPositionX(x) -end - -function BountyRewardCell:setTouchEnable(enable) - self.baseObject:setTouchEnable(enable) -end - -function BountyRewardCell:addClickListener(callback) - self.clickCallback = callback -end - -function BountyRewardCell:showLight() - self.light:setVisible(true) -end - -function BountyRewardCell:hideLight() - self.light:setVisible(false) -end - -return BountyRewardCell \ No newline at end of file diff --git a/lua/app/ui/arena/cell/bounty_reward_cell.lua b/lua/app/ui/common/cell/bounty_reward_cell.lua similarity index 73% rename from lua/app/ui/arena/cell/bounty_reward_cell.lua rename to lua/app/ui/common/cell/bounty_reward_cell.lua index 2906ba47..92d06255 100644 --- a/lua/app/ui/arena/cell/bounty_reward_cell.lua +++ b/lua/app/ui/common/cell/bounty_reward_cell.lua @@ -11,6 +11,8 @@ function BountyRewardCell:init() self.lock = uiMap["bounty_reward_cell.lock"] self.matchImg = uiMap["bounty_reward_cell.match_img"] self.sImg = uiMap["bounty_reward_cell.s"] + self.skin = uiMap["bounty_reward_cell.skin"] + self.skinQlt = uiMap["bounty_reward_cell.skin.img_qlt"] self:hideLight() self.baseObject:addClickListener(function() @@ -25,9 +27,9 @@ end function BountyRewardCell:refresh(reward, isPro, isLock, showCheck) self:showCheck(showCheck) if isPro then - self.bg:setSprite(GConst.ATLAS_PATH.BOUNTY, "bounty_board_2") + self.bg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_2") else - self.bg:setSprite(GConst.ATLAS_PATH.BOUNTY, "bounty_board_1") + self.bg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_1") end if isLock then self.lock:setVisible(true) @@ -50,6 +52,7 @@ function BountyRewardCell:_refreshItem(item) end self.numTx:setText(item.count or item.num) if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then + self.skin:setVisible(false) local heroInfo = ConfigManager:getConfig("hero")[info.parameter] if heroInfo then self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) @@ -62,11 +65,28 @@ function BountyRewardCell:_refreshItem(item) self.sImg:setVisible(false) end self.fragment:setVisible(true) + elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then + -- 皮肤道具 + self.skin:setVisible(true) + self.matchImg:setVisible(false) + self.fragment:setVisible(false) + local skinInfo = ConfigManager:getConfig("skin")[info.parameter] + if skinInfo then + self.skin:setVisible(true) + self.sImg:setVisible(skinInfo.qlt >= 4) + self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, skinInfo.icon) + self.skin:setSprite(GConst.ATLAS_PATH.ICON_HERO, "frame_dec_" .. skinInfo.qlt) + self.skinQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_" .. skinInfo.qlt) + else + self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") + self.sImg:setVisible(false) + end else self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) self.matchImg:setVisible(false) self.sImg:setVisible(false) + self.skin:setVisible(false) end end diff --git a/lua/app/ui/arena/cell/bounty_reward_cell.lua.meta b/lua/app/ui/common/cell/bounty_reward_cell.lua.meta similarity index 86% rename from lua/app/ui/arena/cell/bounty_reward_cell.lua.meta rename to lua/app/ui/common/cell/bounty_reward_cell.lua.meta index b6490bbc..837ec9d1 100644 --- a/lua/app/ui/arena/cell/bounty_reward_cell.lua.meta +++ b/lua/app/ui/common/cell/bounty_reward_cell.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4208111e8330d6046aa5e366b6be1f9a +guid: 95ea42e6f8c253144bfbcc09b3d76e89 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 5abcdc27..c3e2e0d3 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -31,6 +31,9 @@ function HeroCell:init() self:bind(DataManager.BagData.ItemData, "dirty", function() self:refreshRedPoint() end) + self:bind(DataManager.SkinData, "isDirty", function() + self:refreshHeroIcon() + end) end function HeroCell:refresh(heroEntity, isGray) @@ -92,6 +95,15 @@ function HeroCell:refresh(heroEntity, isGray) self:refreshRedPoint() end +-- 刷新英雄icon +function HeroCell:refreshHeroIcon(iconName) + if self.heroEntity ~= nil then + self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO_2, DataManager.SkinData:getIcon(self.heroEntity:getSkinId())) + elseif iconName then + self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO_2, tostring(iconName)) + end +end + -- 刷新红点 function HeroCell:refreshRedPoint() if self.heroEntity == nil then @@ -123,7 +135,10 @@ function HeroCell:getHeroId() return self.heroEntity:getCfgId() end -function HeroCell:refreshBriefInfo(id, level) +function HeroCell:refreshBriefInfo(heroEntity) + self.heroEntity = heroEntity + local id = self.heroEntity:getCfgId() + local level = self.heroEntity:getLv() self.selfNode:setVisible(false) self.otherNode:setVisible(true) @@ -165,10 +180,10 @@ function HeroCell:_refresh(heroInfo, isGray) self.heroBg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.FRAME_QLT[heroInfo.qlt]) end self.heroDec:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HERO_DEC_QLT[heroInfo.qlt]) - self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO_2, tostring(heroInfo.icon)) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) self.check:setVisible(false) self.sImg:setVisible(heroInfo.qlt >= 4) + self:refreshHeroIcon(heroInfo.icon) self:setGray(isGray) end diff --git a/lua/app/ui/common/cell/large_hero_cell.lua b/lua/app/ui/common/cell/large_hero_cell.lua index ccb7372b..002cd056 100644 --- a/lua/app/ui/common/cell/large_hero_cell.lua +++ b/lua/app/ui/common/cell/large_hero_cell.lua @@ -37,6 +37,7 @@ function LargeHeroCell:refresh(heroEntity, isGray, useFunc) self.matchType = heroEntity:getMatchType() local heroInfo = heroEntity:getConfig() self:_refresh(heroInfo, isGray) + self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO_2, DataManager.SkinData:getIcon(heroEntity:getSkinId())) local str if heroEntity:canLvUp() then str = I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_4) @@ -61,7 +62,6 @@ function LargeHeroCell:_refresh(heroInfo, isGray) else self.heroBg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.FRAME_QLT[heroInfo.qlt]) end - self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO_2, tostring(heroInfo.icon)) self.heroDec:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HERO_DEC_QLT[heroInfo.qlt]) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) self.check:setVisible(false) diff --git a/lua/app/ui/common/common_exchange_ui.lua b/lua/app/ui/common/common_exchange_ui.lua new file mode 100644 index 00000000..2db735ce --- /dev/null +++ b/lua/app/ui/common/common_exchange_ui.lua @@ -0,0 +1,127 @@ +local CommonExchangeUI = class("CommonExchangeUI", BaseUI) + +function CommonExchangeUI:onPressBackspace() + self:closeUI() +end + +function CommonExchangeUI:isFullScreen() + return false +end + +function CommonExchangeUI:ctor(params) + self.defaultNum = params.defaultNum + self.remainNum = params.remainNum + self.reward = params.reward + self.cost = params.cost + self.callback = params.callback + local costId = GFunc.getRewardId(self.cost) + local costNum = GFunc.getRewardNum(self.cost) + local num = DataManager.BagData.ItemData:getItemNumById(costId) + local maxBuyCount = num // costNum + self.remainNum = math.min(self.remainNum, maxBuyCount) + if self.remainNum <= 0 then + self.remainNum = 1 + end +end + +function CommonExchangeUI:getPrefabPath() + return "assets/prefabs/ui/common/exchange_ui.prefab" +end + +function CommonExchangeUI:onLoadRootComplete() + self:_display() + self:_addListeners() +end + +function CommonExchangeUI:onClose() + if self.inputComp then + self.inputComp.onValueChanged:RemoveAllListeners() + end +end + +function CommonExchangeUI:_display() + local uiMap = self.root:genAllChildren() + if not self.rewardCell then + self.rewardCell = CellManager:addCellComp(uiMap["exchange_ui.bg.reward_cell"], GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + end + self.rewardCell:refreshByConfig(self.reward) + uiMap["exchange_ui.bg.tx_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_18)) + uiMap["exchange_ui.bg.tx_remain"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_19, self.remainNum)) + uiMap["exchange_ui.bg.ok_btn.tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_18)) + + self.inputComp = uiMap["exchange_ui.bg.input"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD) + self.inputComp.text = tostring(self.defaultNum) + self.inputComp.onValueChanged:AddListener(function(str) + local count = self.defaultNum + if str and tonumber(str) then + count = math.floor(tonumber(str) + 0.0001) + end + + if count < 1 then + count = 1 + end + + if count > self.remainNum then + count = self.remainNum + end + self.defaultNum = count + + self:refreshCountInfo() + end) + + self:refreshCountInfo() +end + +function CommonExchangeUI:_addListeners() + local uiMap = self.root:genAllChildren() + uiMap["exchange_ui.bg.ok_btn"]:addClickListener(function() + if self.callback then + self.callback(self.defaultNum) + end + self:closeUI() + end) + + uiMap["exchange_ui.bg.close_btn"]:addClickListener(function() + self:closeUI() + end) + + uiMap["exchange_ui.bg.btn_reduce"]:addClickListener(function() + self.defaultNum = self.defaultNum - 1 + self:refreshCountInfo() + end) + + uiMap["exchange_ui.bg.btn_min"]:addClickListener(function() + self.defaultNum = 1 + self:refreshCountInfo() + end) + + uiMap["exchange_ui.bg.btn_add"]:addClickListener(function() + self.defaultNum = self.defaultNum + 1 + self:refreshCountInfo() + end) + + uiMap["exchange_ui.bg.btn_max"]:addClickListener(function() + self.defaultNum = self.remainNum + self:refreshCountInfo() + end) +end + +function CommonExchangeUI:refreshCountInfo() + if self.defaultNum < 1 then + self.defaultNum = 1 + end + local costId = GFunc.getRewardId(self.cost) + if self.defaultNum > self.remainNum then + self.defaultNum = self.remainNum + end + local uiMap = self.root:genAllChildren() + local costIcon = uiMap["exchange_ui.bg.ok_btn.icon"] + costIcon:setSprite(ModuleManager.ItemManager:getItemIcon(costId)) + local singlePrice = GFunc.getRewardNum(self.cost) + local costNum = uiMap["exchange_ui.bg.ok_btn.text"] + costNum:setText(singlePrice * self.defaultNum) + GFunc.centerImgAndTx(costIcon, costNum, 5) + self.inputComp.text = tostring(self.defaultNum) +end + +return CommonExchangeUI \ No newline at end of file diff --git a/lua/app/ui/common/common_exchange_ui.lua.meta b/lua/app/ui/common/common_exchange_ui.lua.meta new file mode 100644 index 00000000..1aaa5004 --- /dev/null +++ b/lua/app/ui/common/common_exchange_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f58dac828e59f6418bf4e8918d0bfdb +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/common/common_formation_ui.lua b/lua/app/ui/common/common_formation_ui.lua index 52e229c5..82e854c6 100644 --- a/lua/app/ui/common/common_formation_ui.lua +++ b/lua/app/ui/common/common_formation_ui.lua @@ -39,6 +39,8 @@ function CommonFormationUI:onLoadRootComplete() ModuleManager.DungeonWeaponManager:reqFormation(formation) elseif self.formationType == GConst.BattleConst.FORMATION_TYPE.DUNGEON_ARMOR then ModuleManager.DungeonArmorManager:reqFormation(formation) + elseif self.formationType == GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH then + ModuleManager.ActBossRushManager:reqFormation(formation) else self:closeUI() end diff --git a/lua/app/ui/common/component/hero_formation_comp.lua b/lua/app/ui/common/component/hero_formation_comp.lua index db92912b..6b0a242c 100644 --- a/lua/app/ui/common/component/hero_formation_comp.lua +++ b/lua/app/ui/common/component/hero_formation_comp.lua @@ -59,7 +59,7 @@ function HeroFormationComp:refreshByEntitys(formation) local heroEntity = formation[i] if heroEntity then heroCell:setVisible(true, 1) - heroCell:refreshBriefInfo(heroEntity:getCfgId(), heroEntity:getLv()) + heroCell:refreshBriefInfo(heroEntity) heroCell:addClickListener(function() ModuleManager.HeroManager:showHeroDetailUI(heroEntity:getCfgId(), true, heroEntity) end) diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index 4dba8039..ed3b4f52 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -94,6 +94,8 @@ function HeroComp:refresh(battleType) self:refreshDungeonWeaponFormation() elseif self.battleType == GConst.BattleConst.FORMATION_TYPE.DUNGEON_ARMOR then self:refreshDungeonArmorFormation() + elseif self.battleType == GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH then + self:refreshBossRushFormation() end end @@ -166,6 +168,19 @@ function HeroComp:refreshDungeonArmorFormation() self:refreshScrollRect() end +function HeroComp:refreshBossRushFormation() + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_9)) + self.rimgTopBG:setTexture("assets/arts/textures/background/hero/hero_bg_1.png") + self.curFormation = DataManager.FormationData:getBossRushFormation() + + self.onClickUseFunc = function(id, type) + DataManager.FormationData:upHeroToFormation(self.battleType, type, id) + self:refreshBossRushFormation() + end + + self:refreshScrollRect() +end + function HeroComp:refreshScrollRect() self.heroList = DataManager.HeroData:getAllHeroesSort(self.battleType) -- 每次都重新算一次 diff --git a/lua/app/ui/main_city/cell/side_bar_base_cell.lua b/lua/app/ui/main_city/cell/side_bar_base_cell.lua index 3d278180..cbcc1868 100644 --- a/lua/app/ui/main_city/cell/side_bar_base_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_base_cell.lua @@ -152,6 +152,10 @@ function SideBarBaseCellComp:setAnchoredPositionY(y) self.baseObject:setAnchoredPositionY(y) end +function SideBarBaseCellComp:setAnchoredPositionX(x) + self.baseObject:setAnchoredPositionX(x) +end + function SideBarBaseCellComp:setVisible(visible) self.visible = visible self.baseObject:setVisible(visible) diff --git a/lua/app/ui/main_city/cell/side_bar_boss_rush_cell.lua b/lua/app/ui/main_city/cell/side_bar_boss_rush_cell.lua new file mode 100644 index 00000000..f9e871ee --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_boss_rush_cell.lua @@ -0,0 +1,50 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarBossRushCell = class("SideBarBossRushCell", SideBarBaseCellComp) + +function SideBarBossRushCell:getModuleKey() + return nil +end + +function SideBarBossRushCell:getHasPurchase() + return true +end + +function SideBarBossRushCell:getIsOpen() + return DataManager.ActBossRushData:getIsOpen() +end + +function SideBarBossRushCell:getSpineName() + return "ui_act_bossrush_mainbtn" +end + +function SideBarBossRushCell:onClick() + ModuleManager.ActBossRushManager:showMainUI() +end + +function SideBarBossRushCell:getIsShowRedPoint() + return DataManager.ActBossRushData:getRp() +end + +function SideBarBossRushCell:onRefresh() + self.timeBg:setVisible(true) + self:_refreshTime() +end + +function SideBarBossRushCell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarBossRushCell:_refreshTime() + local remainTime = DataManager.ActBossRushData:getRemainTime() + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeTx:setText("00:00:00") + end +end + +return SideBarBossRushCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_boss_rush_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_boss_rush_cell.lua.meta new file mode 100644 index 00000000..de16c931 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_boss_rush_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7f46400ca989c054594fb980979f5e8b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/cell/side_bar_fourteen_day_cell.lua b/lua/app/ui/main_city/cell/side_bar_fourteen_day_cell.lua new file mode 100644 index 00000000..7c03a0f0 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_fourteen_day_cell.lua @@ -0,0 +1,43 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarFourteenDayCell = class("SideBarFourteenDayCell", SideBarBaseCellComp) + +function SideBarFourteenDayCell:getIsOpen() + return DataManager.FourteenDayData:isOpen() and DataManager.FourteenDayData:isActiveTime() +end + +function SideBarFourteenDayCell:getSpineName() + return "ui_act_fourteen_mainbtn" +end + +function SideBarFourteenDayCell:onClick() + ModuleManager.FourteenDayManager:showFourteenDayUI() +end + +function SideBarFourteenDayCell:getIsShowRedPoint() + return DataManager.FourteenDayData:hasRedPoint() +end + +function SideBarFourteenDayCell:onRefresh() + self:_refreshTime() +end + +function SideBarFourteenDayCell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarFourteenDayCell:_refreshTime() + local remainTime = DataManager.FourteenDayData:getEndRemainTime() + if remainTime >= 0 then + self.timeBg:setVisible(true) + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeBg:setVisible(false) + self.timeTx:setText("00:00:00") + end +end + +return SideBarFourteenDayCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_fourteen_day_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_fourteen_day_cell.lua.meta new file mode 100644 index 00000000..54ee3446 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_fourteen_day_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 51bd15e742f644046a5d918498f2a4c2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua b/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua index f7c08a1f..d43ef0d8 100644 --- a/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua @@ -6,7 +6,7 @@ function SideBarHeroFundCell:getModuleKey() end function SideBarHeroFundCell:getHasPurchase() - return false + return true end function SideBarHeroFundCell:getIsOpen() diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 4235f8d5..45961d48 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -390,7 +390,14 @@ end function MainCityUI:initLeftRightBtns() self.leftNode = self.uiMap["main_ui.left_node"] self.leftSideBar = self.uiMap["main_ui.left_node.side_bar"] + self.leftSideBar:setAnchorMin(0, 1) + self.leftSideBar:setAnchorMax(0, 1) + self.leftSideBar:getTransform().pivot = BF.Vector2(0, 1) + local addY = SafeAreaManager:getNotchScreenHeight() + self.leftSideBar:setAnchoredPosition(17, -280 - addY) self.leftArrowBtn = self.uiMap["main_ui.left_node.arrow_node"] + self.leftArrowBtn:setAnchorMin(0, 1) + self.leftArrowBtn:setAnchorMax(0, 1) self.leftArrowBtn:addClickListener(function() self:openOrCloseLeftSideBar() end) @@ -398,7 +405,13 @@ function MainCityUI:initLeftRightBtns() self.rightNode = self.uiMap["main_ui.right_node"] self.rightSideBar = self.uiMap["main_ui.right_node.side_bar"] + self.rightSideBar:setAnchorMin(1, 1) + self.rightSideBar:setAnchorMax(1, 1) + self.rightSideBar:getTransform().pivot = BF.Vector2(1, 1) + self.rightSideBar:setAnchoredPosition(-17, -280 - addY) self.rightArrowBtn = self.uiMap["main_ui.right_node.arrow_node"] + self.rightArrowBtn:setAnchorMin(1, 1) + self.rightArrowBtn:setAnchorMax(1, 1) self.rightArrowBtn:addClickListener(function() self:openOrCloseRightSideBar() end) @@ -407,6 +420,7 @@ function MainCityUI:initLeftRightBtns() self.sideBarCellObject = self.uiMap["main_ui.cache_node.side_bar_cell"] local w, h = self.sideBarCellObject:fastGetSizeDelta() self.sideBarHeight = h + self.sideBarMaxCount = 4 if self.leftBarList == nil then self.leftBarList = {} end @@ -478,6 +492,8 @@ function MainCityUI:refreshLeftBtns() if cell == nil then cell = self:addSideBarCellComp(v) cell:getBaseObject():setParent(self.leftSideBar, false) + cell:getBaseObject():setAnchorMin(0, 1) + cell:getBaseObject():setAnchorMax(0, 1) end cell:initWithParentUI(self, v, true) table.insert(self.leftBarList, cell) @@ -490,16 +506,25 @@ function MainCityUI:refreshLeftBtns() end self.leftNode:setAnchoredPositionX(0) local y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 + local x = 60 + local maxCount = self.sideBarMaxCount + local minY = y + local bgSizeX = 112 + local otherColumn = false if isClose then -- 只显示3个 local minCount = GConst.MainCityConst.SIDE_BAR_MIN_COUNT for i = 1, minCount do local sideBarBtn = self.leftBarList[i] if i <= sideBarShowCount then + sideBarBtn:setAnchoredPositionX(x) sideBarBtn:setAnchoredPositionY(y) sideBarBtn:refresh() sideBarBtn:setActive(true) sideBarBtn:setVisible(true) y = y - self.sideBarHeight - SIDE_BAR_INTERVAL + if minY > y then + minY = y + end end end for i = minCount + 1, sideBarShowCount do @@ -509,25 +534,50 @@ function MainCityUI:refreshLeftBtns() end else for k, v in ipairs(self.leftBarList) do + if maxCount == 0 then -- 换行 + y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 + x = x + 110 + bgSizeX = 228 + otherColumn = true + end + + maxCount = maxCount - 1 + v:setAnchoredPositionX(x) v:setAnchoredPositionY(y) v:refresh() v:setActive(true) v:setVisible(true) y = y - self.sideBarHeight - SIDE_BAR_INTERVAL + if minY > y then + minY = y + end end end if sideBarShowCount <= GConst.MainCityConst.SIDE_BAR_MIN_COUNT then -- 小于3个不显示箭头 y = y + self.sideBarHeight / 2 - self.leftSideBar:setSizeDeltaY(-y) + if minY > y then + minY = y + end + self.leftSideBar:setSizeDeltaX(bgSizeX) + self.leftSideBar:setSizeDeltaY(-minY) self.leftArrowBtn:stopClickAnimation() self.leftArrowBtn:setVisible(false) else local arrowHeight = self.leftArrowBtn:getRectHeight() y = y + self.sideBarHeight/2 - SIDE_BAR_ARROW_INTERVAL - arrowHeight - self.leftSideBar:setSizeDeltaY(-y) + if minY > y then + minY = y + end + self.leftSideBar:setSizeDeltaX(bgSizeX) + self.leftSideBar:setSizeDeltaY(-minY) self.leftArrowImg:setLocalScale(1, isClose and -1 or 1, 1) self.leftArrowBtn:setVisible(true) - self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) + self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + minY + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) + if otherColumn then + self.leftArrowBtn:setAnchoredPositionX(133) + else + self.leftArrowBtn:setAnchoredPositionX(73) + end end end @@ -558,6 +608,8 @@ function MainCityUI:refreshRightBtns() if cell == nil then cell = self:addSideBarCellComp(v) cell:getBaseObject():setParent(self.rightSideBar, false) + cell:getBaseObject():setAnchorMin(1, 1) + cell:getBaseObject():setAnchorMax(1, 1) end cell:initWithParentUI(self, v, false) table.insert(self.rightBarList, cell) @@ -570,16 +622,25 @@ function MainCityUI:refreshRightBtns() end self.rightNode:setAnchoredPositionX(0) local y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 + local x = -60 + local maxCount = self.sideBarMaxCount + local minY = y + local bgSizeX = 112 + local otherColumn = false if isClose then -- 只显示一个 local minCount = GConst.MainCityConst.SIDE_BAR_MIN_COUNT for i = 1, minCount do local sideBarBtn = self.rightBarList[i] if i <= sideBarShowCount then + sideBarBtn:setAnchoredPositionX(x) sideBarBtn:setAnchoredPositionY(y) sideBarBtn:refresh() sideBarBtn:setActive(true) sideBarBtn:setVisible(true) y = y - self.sideBarHeight - SIDE_BAR_INTERVAL + if minY > y then + minY = y + end end end for i = minCount + 1, sideBarShowCount do @@ -589,25 +650,50 @@ function MainCityUI:refreshRightBtns() end else for k, v in ipairs(self.rightBarList) do + if maxCount == 0 then -- 换行 + y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 + x = x - 110 + bgSizeX = 228 + otherColumn = true + end + maxCount = maxCount - 1 + v:setAnchoredPositionX(x) v:setAnchoredPositionY(y) v:refresh() v:setActive(true) v:setVisible(true) y = y - self.sideBarHeight - SIDE_BAR_INTERVAL + if minY > y then + minY = y + end end end if sideBarShowCount <= GConst.MainCityConst.SIDE_BAR_MIN_COUNT then y = y + self.sideBarHeight / 2 - self.rightSideBar:setSizeDeltaY(-y) + y = y + self.sideBarHeight / 2 + if minY > y then + minY = y + end + self.rightSideBar:setSizeDeltaX(bgSizeX) + self.rightSideBar:setSizeDeltaY(-minY) self.rightArrowBtn:stopClickAnimation() self.rightArrowBtn:setVisible(false) else local arrowHeight = self.rightArrowBtn:getRectHeight() y = y + self.sideBarHeight / 2 - SIDE_BAR_ARROW_INTERVAL - arrowHeight - self.rightSideBar:setSizeDeltaY(-y) + if minY > y then + minY = y + end + self.rightSideBar:setSizeDeltaX(bgSizeX) + self.rightSideBar:setSizeDeltaY(-minY) self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1) self.rightArrowBtn:setVisible(true) self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) + if otherColumn then + self.rightArrowBtn:setAnchoredPositionX(-133) + else + self.rightArrowBtn:setAnchoredPositionX(-73) + end end end @@ -1029,6 +1115,15 @@ function MainCityUI:checkMainPop() showType = BIReport.PAY_UI_SHOW_TYPE.LOGIN_POP end ModuleManager.ActivityManager:showGoldPigUI(showType) + return + end + + if DataManager.ActBossRushData:getIsOpen() and not DataManager.TutorialData:getIsInTutorial() then -- 弹窗 + if not DataManager.ActBossRushData:getMarkPoped() then + if ModuleManager.ActBossRushManager:showPopUI() then + return + end + end end end diff --git a/lua/app/ui/ui_manager.lua b/lua/app/ui/ui_manager.lua index ea026392..7946cbf5 100644 --- a/lua/app/ui/ui_manager.lua +++ b/lua/app/ui/ui_manager.lua @@ -468,9 +468,7 @@ function UIManager:closeAllUIExceptMainUI(includeCurrencyBar) local uiNum = #self.uiList for i = uiNum, 1, -1 do if self.uiList[i]:getUIIndex() ~= UIManager.UI_PATH.MAINCITY_UI then - self.uiList[i]:_onClose() - self.uiList[i]:_onExitAnimationComplete() - table.remove(self.uiList, i) + self.uiList[i]:closeUI() end self:_updateUISwallowOrder() end diff --git a/lua/app/userdata/activity/act_boss_rush.meta b/lua/app/userdata/activity/act_boss_rush.meta new file mode 100644 index 00000000..2ebd44ea --- /dev/null +++ b/lua/app/userdata/activity/act_boss_rush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f03a26eebd5c8c4da63b03db9b6be58 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua new file mode 100644 index 00000000..df38e24c --- /dev/null +++ b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua @@ -0,0 +1,754 @@ +local ActBossRushData = class("ActBossRushData", BaseData) + +local ACT_ID = 206 +local PRO_ACT_ID = 130502 +local UTRAL_ACT_ID = 130602 + +ActBossRushData.REWARD_TYPE = { + FREE = 0, + PRO = 1, + UTRAL = 2 +} + +function ActBossRushData:clear() + self.data.isDirty = false + self.startTime = 0 + self.endTime = 0 + -- 战斗相关 + self.stageRandomSeed = 0 + self.stageList = {} + self.todayMaxWave = 0 + self.todayFightCount = 0 + self.fightCount = 0 + self.todayMaxWaveRound = 0 + -- 兑换 + self.shop = {} + -- 战令 + self.waveCount = 0 -- 波次 + self.waveLevel = 0 -- 波次等级 可领的最高等级 + self.freeLevel = 0 -- 免费领取过的等级 + self.proLevel = 0 -- 付费1领取过的等级 + self.utralLevel = 0 -- 付费2领取过的等级 + self.free_awarded = {} -- 领取过的免费id + self.pay_low_awarded = {} -- 领取过的付费1id + self.pay_high_awarded = {} -- 领取过的付费2id + self.proBounght = false -- 付费1已购买 + self.utralBounght = false -- 付费2已购买 + self.waveLevelList = {} -- 缓存波次等级 + self.waveLevelListCount = 0 -- 缓存最大等级 + -- 排行榜 + self.topRankList = {} + self.lastRankList = {} + self.rankList = {} + self.selfRank = {} + self.lastSelfRank = {} + self.needUpdateRank = 0 + self.todayRankRerwardGot = false + + DataManager:unregisterCrossDayFunc("ActBossRushData") +end + +function ActBossRushData:ctor() + self:clear() +end + +function ActBossRushData:setActivityInfo(activity) + self.startTime = GFunc.formatTimeStep(activity.start_at) + self.endTime = GFunc.formatTimeStep(activity.end_at) +end + +function ActBossRushData:init(data) + if not data then + return + end + + self.activity_id = data.activity_id + -- 战斗 + if data.heroes then + local update = false + for _, heroId in ipairs(data.heroes) do + if heroId > 0 then + update = true + break + end + end + if update then + DataManager.FormationData:initFormationByType(GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH, data.heroes) + end + end + self.todayFightCount = data.fight_count or 0 + self.fightCount = data.total_fight_count or 0 + self.todayMaxWave = data.max_wave or 0 + self.todayMaxWaveRound = data.min_round or 0 + + -- 兑换 + self.shop = data.exchanged or {} + + -- 排行榜 + if data.rank_rewarded ~= nil then + self.todayRankRerwardGot = data.rank_rewarded + end + + -- 战令 + self.waveCount = data.accum_wave or 0 + self.waveLevelListCount = 0 + local list = self:getBountyList() + local startId + self.waveLevelStartId = nil + for index, id in ipairs(list) do + local info = self:getBountyCfg()[id] + if info then + self.waveLevelList[id] = info.exp + self.waveLevelListCount = self.waveLevelListCount + 1 + if not startId or startId > id then + startId = id + self.waveLevelStartId = startId + end + end + end + if self.waveLevelStartId then + local startId = math.max(0, self.waveLevelStartId - 1) + self.freeLevel = startId + self.proLevel = startId + self.utralLevel = startId + end + + if startId then + for id = startId, startId + self.waveLevelListCount do + local wave = self.waveLevelList[id] + if wave and wave <= self.waveCount then + self.waveLevel = id + else + break + end + end + end + + if data.collected then + for level, bossrushgrade in pairs(data.collected) do + if bossrushgrade.normal then + self:setFreeGot(level) + end + if bossrushgrade.superior then + self:setProGot(level) + end + if bossrushgrade.superior_max then + self:setUtralGot(level) + end + end + end + + if data.bought ~= nil then + self.proBounght = data.bought + self.utralBounght = data.bought_max + end + + DataManager:registerCrossDayFunc("ActBossRushData", function() + self.todayMaxWave = 0 + self.todayMaxWaveRound = 0 + self.todayFightCount = 0 + + self.needUpdateRank = 0 + self.todayRankRerwardGot = false + self:setDirty() + + if self:getIsFirstDay() then + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.MAIN_UI_CHECK_SIDE_BAR) + end + end) +end + +function ActBossRushData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function ActBossRushData:getConditionDay() + if not self.conditionDay then + self.conditionDay = GFunc.getConstIntValue('activity_recurring_day') + self.conditionDay = (self.conditionDay - 1) * 86400 + end + + return self.conditionDay +end + +function ActBossRushData:getIsOpen() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then + return false + end + if DataManager:getRegisterTs() <= self:getConditionDay() then -- 前14天的号，看不到 + return false + end + local time = Time:getServerTime() + return self.endTime > time and time > self.startTime +end + +function ActBossRushData:getRp() + if not self:getIsOpen() then + return false + end + + if self:getHaveReward() then + return true + end + + if self:canGetRankReward() then + return true + end + + if not self:getTodayExchangeCheck() then + return true + end + + return false +end + +function ActBossRushData:getRemainTime() + local time = self.endTime - Time:getServerTime() + if time < 0 then + time = 0 + end + return time +end + +function ActBossRushData:getIsFinalDay() + local time = self:getRemainTime() + if time > 0 and time < 86400 then + return true + end + return false +end + +function ActBossRushData:getIsFirstDay() + local time = Time:getServerTime() - self.startTime + if time <= 86400 then + return true + end + return false +end + +---- 战斗 +function ActBossRushData:updateStageSeed(seed) + self.todayFightCount = self.todayFightCount + 1 + self.fightCount = self.fightCount + 1 + if self.stageRandomSeed == seed then + return + end + self.stageRandomSeed = seed + self.stageList = {} + for id, info in ipairs(ConfigManager:getConfig("activity_boss_rush_chapter")) do + table.insert(self.stageList, id) + end + self.stageList = table.shuffleBySeed(self.stageList, self.stageRandomSeed) +end + +function ActBossRushData:getStageList() + return self.stageList +end + +function ActBossRushData:getTodayMaxWave() + return self.todayMaxWave or 0 +end + +function ActBossRushData:getTodayFightCount() + return self.todayFightCount +end + +function ActBossRushData:getTotalFightCount() + return self.fightCount +end + +function ActBossRushData:getFreeFightLimit() + if not self.freeFightLimit then + self.freeFightLimit = GFunc.getConstIntValue("activity_boss_rush_time") or 1 + end + return self.freeFightLimit +end + +function ActBossRushData:getFreeFightCount() + local count = self:getFreeFightLimit() - self:getTodayFightCount() + if count < 0 then + count = 0 + end + return count +end + +function ActBossRushData:getFightFree() + return self.todayFightCount <= 0 +end + +function ActBossRushData:getFightCost() + if not self.fightCostOrigin then + self.fightCostOrigin = GFunc.getRewardNum(GFunc.getConstReward("activity_boss_rush_cost")) + self.fightCostAdd = GFunc.getRewardNum(GFunc.getConstReward("activity_boss_rush_costadd")) + end + local count = self.todayFightCount - self:getFreeFightLimit() + if count <= 0 then + return self.fightCostOrigin + end + + return self.fightCostOrigin + self.fightCostAdd * count +end + + +---- 排行榜 +function ActBossRushData:getTodayRankList() + if self:getRemainTime() < 86400 then -- 最后一天 + return self.lastRankList + end + return self.rankList +end + +function ActBossRushData:getRankConfig() + return ConfigManager:getConfig("activity_boss_rush_rank") +end + +function ActBossRushData:getRankRewards(rank) + if not rank or rank <= 0 then -- 没参加就没有 + return + end + if not self.cacheRankRewardsMap then -- 缓存名次对应的配置表ID + self.cacheRankRewardsMap = {} + end + if not self.cacheRankRewardsMap[rank] then + local cfg = self:getRankConfig() + for id, info in ipairs(cfg) do + if info.ranking[1] and info.ranking[2] then + if info.ranking[1] <= rank and rank <= info.ranking[2] then + self.cacheRankRewardsMap[rank] = id + end + elseif info.ranking[1] then + if info.ranking[1] <= rank then + self.cacheRankRewardsMap[rank] = id + end + end + end + end + local cfg = self:getRankConfig()[self.cacheRankRewardsMap[rank]] + if cfg then + return cfg.reward + end +end + +function ActBossRushData:getNeedUpdateRank() + if not self:getIsOpen() then + return false + end + return (Time:getServerTime() - self.needUpdateRank) > 30 +end + +function ActBossRushData:setNeedUpdateRank() + self.needUpdateRank = Time:getServerTime() +end + +function ActBossRushData:updateRankInfo(info) + self.lastRankList = info.yesterday_top50 + self.lastSelfRank = info.yesterday_self + self.rankList = info.today_top50 + self.selfRank = info.today_self + + self.needUpdateRank = Time:getServerTime() + self:setDirty() +end + +function ActBossRushData:updateTopRankInfo(info) + self.topRankList = info or {} + + self:setDirty() +end + +function ActBossRushData:getTopRankInfo() + return self.topRankList +end + +function ActBossRushData:getLastRankInfo() + return self.lastRankList +end + +function ActBossRushData:getCurRankInfo() + return self.rankList +end + +function ActBossRushData:getLastSelfInfo() + return self.lastSelfRank +end + +function ActBossRushData:getCurRankSelfInfo() + return self.selfRank +end + +function ActBossRushData:canGetRankReward() + if not self.todayRankRerwardGot then + if (not self.lastSelfRank or not self.lastSelfRank.rank) and not self:getIsFirstDay() then + return true + end + end + + if not self.lastSelfRank or not self.lastSelfRank.rank or self.lastSelfRank.rank <= 0 then + return false + end + + return not self.todayRankRerwardGot +end + +function ActBossRushData:setGotRankReward() + self.todayRankRerwardGot = true + self:setDirty() +end + +function ActBossRushData:isGotRankReward() + return self.todayRankRerwardGot +end + +---- 战令 +function ActBossRushData:getBountyCfg() + return ConfigManager:getConfig("activity_bounty_level") +end + +function ActBossRushData:getBountyList() + if not self.bountyList then + self.bountyList = GFunc.getTable(DataManager:getActivityBountyLevelByActId(self.activity_id or ACT_ID) or {}) + table.sort(self.bountyList, function(a, b) + return a < b + end) + end + return self.bountyList +end + +function ActBossRushData:getWaveCount() + return self.waveCount or 0 +end + +function ActBossRushData:getWaveLevel() + return self.waveLevel or 0 +end + +function ActBossRushData:getStartWaveLevel() + return (self.waveLevelStartId - 1) +end + +function ActBossRushData:getMaxLevel() + return (self.waveLevelStartId - 1) + self.waveLevelListCount +end + +function ActBossRushData:isMaxWaveLevel() + return self.waveLevel >= self:getMaxLevel() +end + +function ActBossRushData:getLevelWave(level) + if level > self:getMaxLevel() then + level = self:getMaxLevel() + end + return self.waveLevelList[level] or 0 +end + +function ActBossRushData:updateWaveAndRound(wave, round) + self.waveNewtag = false + self.roundNewtag = false + if wave > self.todayMaxWave then + self.todayMaxWave = wave + self.todayMaxWaveRound = round + self.waveNewtag = true + self.roundNewtag = true + elseif wave == self.todayMaxWave and round < self.todayMaxWaveRound then + self.todayMaxWaveRound = round + self.roundNewtag = true + end +end + +function ActBossRushData:getWaveRoundNewTag() + return self.waveNewtag, self.roundNewtag +end + +function ActBossRushData:getLastWaveLevelInfo() + return self.lastWaveLevel or self.waveLevel, self.lastWaveCount or self.waveCount +end + +function ActBossRushData:addWaveCount(count) + self.lastWaveLevel = self.waveLevel + self.lastWaveCount = self.waveCount + + self.waveCount = self.waveCount + count + local nextLevel = self.waveLevel + 1 + if self.waveLevelList[nextLevel] and self.waveCount >= self.waveLevelList[nextLevel] then -- 升级了 + for id = nextLevel, self:getMaxLevel() do + local wave = self.waveLevelList[id] + if wave and wave <= self.waveCount then + self.waveLevel = id + else + break + end + end + end + + self:setDirty() +end + +function ActBossRushData:getFreeGot(level) + return self.free_awarded[level] +end + +function ActBossRushData:setFreeGot(level) + if not self.free_awarded[level] then + self.freeLevel = self.freeLevel + 1 + end + self.free_awarded[level] = true +end + +function ActBossRushData:getProActId() + return PRO_ACT_ID +end + +function ActBossRushData:getProPrice() + local cfg = ConfigManager:getConfig("act_gift")[PRO_ACT_ID] + if not cfg then + return GConst.EMPTY_STRING + end + return GFunc.getFormatPrice(cfg.recharge_id) +end + +function ActBossRushData:getProGot(level) + return self.pay_low_awarded[level] +end + +function ActBossRushData:setProGot(level) + if not self.pay_low_awarded[level] then + self.proLevel = self.proLevel + 1 + end + self.pay_low_awarded[level] = true +end + +function ActBossRushData:getProBought() + return self.proBounght +end + +function ActBossRushData:setProBought() + self.proBounght = true + self:setDirty() +end + +function ActBossRushData:getUtralActId() + return UTRAL_ACT_ID +end + +function ActBossRushData:gettUtralPrice() + local cfg = ConfigManager:getConfig("act_gift")[UTRAL_ACT_ID] + if not cfg then + return GConst.EMPTY_STRING + end + return GFunc.getFormatPrice(cfg.recharge_id) +end + +function ActBossRushData:getUtralGot(level) + return self.pay_high_awarded[level] +end + +function ActBossRushData:setUtralGot(level) + if not self.pay_high_awarded[level] then + self.utralLevel = self.utralLevel + 1 + end + self.pay_high_awarded[level] = true +end + +function ActBossRushData:getUtralBought() + return self.utralBounght +end + +function ActBossRushData:setUtralBought() + self.utralBounght = true + self:setDirty() +end + +function ActBossRushData:gotFundReward(idWithLv) + if not idWithLv then + return + end + + for _, info in ipairs(idWithLv) do + if info.grade == 0 then + self:setFreeGot(info.id) + elseif info.grade == 1 then + self:setProGot(info.id) + elseif info.grade == 2 then + self:setUtralGot(info.id) + end + end + + self:setDirty() +end + +function ActBossRushData:gotSingleFundReward(level, grade) + if grade == 0 then + self:setFreeGot(level) + elseif grade == 1 then + self:setProGot(level) + elseif grade == 2 then + self:setUtralGot(level) + end + + self:setDirty() +end + +function ActBossRushData:getFreeCanGet(level) + if self:getFreeGot(level) then + return false + end + + if self.waveLevel < level then + return false + end + + return true +end + +function ActBossRushData:getProCanGet(level) + if self:getProGot(level) then + return false + end + + if not self.proBounght then + return false + end + + if self.waveLevel < level then + return false + end + + return true +end + +function ActBossRushData:getUtralCanGet(level) + if self:getUtralGot(level) then + return false + end + + if not self.utralBounght then + return false + end + + if self.waveLevel < level then + return false + end + + return true +end + +function ActBossRushData:getHaveReward() + if self.freeLevel < self.waveLevel then + return true + end + + if self.proBounght then + if self.proLevel < self.waveLevel then + return true + end + end + + if self.utralBounght then + if self.utralLevel < self.waveLevel then + return true + end + end + + return false +end + +function ActBossRushData:getReward(level, rewardType) + local cfg = self:getBountyCfg()[level] + if not cfg then + return + end + + if rewardType == ActBossRushData.REWARD_TYPE.FREE then + return cfg.reward + elseif rewardType == ActBossRushData.REWARD_TYPE.PRO then + return cfg.reward_pro + elseif rewardType == ActBossRushData.REWARD_TYPE.UTRAL then + return cfg.reward_pro_max + end +end + +function ActBossRushData:getBuyBountyLevelCost() + return GFunc.getConstReward("activity_bounty_cost") +end + +---- 兑换商店 + +function ActBossRushData:getExchangeList() + if not self.exchangeList then + self.exchangeList = GFunc.getTable(DataManager:getActivityExchangeByActId(self.activity_id or ACT_ID) or {}) + end + + return self.exchangeList +end + +function ActBossRushData:getExchangeConfig() + return ConfigManager:getConfig("activity_exchange") +end + +function ActBossRushData:getExchangeRemainCount(id) + local count = self.shop[id] or 0 + local cfg = self:getExchangeConfig()[id] + if not cfg then + return 0 + end + count = cfg.limit - count + if count <= 0 then + count = 0 + end + return count +end + +function ActBossRushData:getShopReward(id) + local cfg = self:getExchangeConfig()[id] + if not cfg then + return + end + return cfg.reward +end + +function ActBossRushData:getShopCost(id) + local cfg = self:getExchangeConfig()[id] + if not cfg then + return + end + return cfg.cost +end + +function ActBossRushData:setShopInfo(id, count) + if not id or not count then + return + end + self.shop[id] = (self.shop[id] or 0) + count + self:setDirty() +end + +function ActBossRushData:markPoped() + self.popTag = true +end + +function ActBossRushData:getMarkPoped() + if self.popTag == nil then + local time = LocalData:getNotPopToday("ActBossRushData") + self.popTag = time == Time:getBeginningOfServerToday() + end + return self.popTag +end + +function ActBossRushData:getTodayExchangeCheck() + if self.todayExchangeChecked == nil then + self.todayExchangeChecked = LocalData:getTodayBossRushExchangeWatched() == Time:getServerTime() + end + return self.todayExchangeChecked +end + +function ActBossRushData:setTodayExchangeCheck() + if self.todayExchangeChecked then + return + else + LocalData:recordTodayBossRushExchangeWatched() + end + self.todayExchangeChecked = true + self:setDirty() +end + +return ActBossRushData \ No newline at end of file diff --git a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.meta b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.meta new file mode 100644 index 00000000..fe7e587f --- /dev/null +++ b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a9dee8d82b60a8b4c88bed4c0c52260b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/activity/fourteen_day.meta b/lua/app/userdata/activity/fourteen_day.meta new file mode 100644 index 00000000..4a046450 --- /dev/null +++ b/lua/app/userdata/activity/fourteen_day.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7b314b845f319d4fa788528c141dc54 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua new file mode 100644 index 00000000..b90e118c --- /dev/null +++ b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua @@ -0,0 +1,650 @@ +local FourteenDayData = class("FourteenDayData", BaseData) + +-- 新玩家开启 +local OPEN_DAYS = 7 +-- 活动持续时间 +local ACTIVE_DAYS = 14 + +function FourteenDayData:ctor() + self:clear() +end + +function FourteenDayData:clear() + DataManager:unregisterCrossDayFunc("FourteenDayData") + DataManager:unregisterTryOpenFunc("FourteenDayData") +end + +function FourteenDayData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function FourteenDayData:init(data) + data = data or GConst.EMPTY_TABLE + + if EDITOR_MODE then + Logger.logHighlight("新手14天乐数据初始化") + Logger.printTable(data) + end + self:initData(data) + + -- 活动开启 + DataManager:registerTryOpenFunc("FourteenDayData", function() + if self:isOpen() then + DataManager:unregisterTryOpenFunc("FourteenDayData") + self:setDirty() + end + end) + -- 跨天 + DataManager:registerCrossDayFunc("FourteenDayData", function() + if not self:isOpen() then + return + end + if not self:isActiveTime() then + return + end + if not self.openStatus then + self.needSyncTaskInfo = true + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.MAIN_UI_CHECK_SIDE_BAR) + end + self.openStatus = true + + -- Logger.logHighlight("14天乐跨天") + + self.activeDays = self.activeDays + 1 + self:setDirty() + end) + + local endTime = self:getEndTime() + local nowTime = Time:getServerTime() + if endTime > nowTime then + -- 注册任务进度监听 + for id, data in ipairs(self:getTaskCfg()) do + if data.quest then + ModuleManager.TaskManager:registerTask("FourteenDayData", data.quest, function(count) + self:addTaskProgress(data.quest, count) + end) + end + end + end + + self.openStatus = false + if self:isOpen() and self:isActiveTime() then + self.openStatus = true + end +end + +function FourteenDayData:initData(data) + self.openTs = GFunc.formatTimeStep(data.open_at or 0) + self.activeDays = data.active_days or 0-- 活动开启后的登陆天数、阶段数 + self.bountyStatus = data.funds + self.tasksStatus = data.tasks + self.exchangeStatus = data.exchange_info +end + +function FourteenDayData:getOpenStatus() + return self.openStatus +end + +function FourteenDayData:getNeedSyncData() + return self.needSyncTaskInfo +end + +function FourteenDayData:setSyncData() + self.needSyncTaskInfo = true +end + +function FourteenDayData:isOpen() + -- 开启条件同七天乐 + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then + return false + end + + return true +end + +-- 是否在活动时间内 +function FourteenDayData:isActiveTime() + local openTime = self:getOpenTime() + local endTime = self:getEndTime() + local nowTime = Time:getServerTime() + + return nowTime >= openTime and nowTime < endTime +end + +-- 获取开启时间 +function FourteenDayData:getOpenTime() + local result + if self.openTs and self.openTs > 0 then + result = self.openTs + else + local registerBeginTs = Time:getBeginningOfOneDay(DataManager:getRegisterTs()) + result = math.floor(registerBeginTs + (OPEN_DAYS - 1) * 24 * 60 * 60) + end + + -- Logger.logHighlight("开始时间："..result) + return result +end + +-- 获取结束时间 +function FourteenDayData:getEndTime() + if self.endTs == nil or self.endTs <= 0 then + self.endTs = math.floor(self:getOpenTime() + ACTIVE_DAYS * 24 * 60 * 60) + end + + return self.endTs +end + +-- 获取活动结束剩余时间（秒） +function FourteenDayData:getEndRemainTime() + return self:getEndTime() - Time:getServerTime() +end + +-- 获取活动开启时的活跃天数 +function FourteenDayData:getActiveDays() + return self.activeDays +end + +-- 是否有红点 +function FourteenDayData:hasRedPoint() + if not self:isActiveTime() then + return false + end + + return self:hasBountyRedPoint() or self:hasTaskRedPoint() or self:hasExchangeRedPoint() or self:hasGiftRedPoint() +end + +-- 战令---------------------------------------------------------------------------------------------------------------- + +-- 是否有战令红点 +function FourteenDayData:hasBountyRedPoint() + for id, data in ipairs(self:getBountyCfg()) do + if self:canGetBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE) then + return true + end + if self:canGetBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY) then + return true + end + end + + return false +end + +-- 获取战令配置 +function FourteenDayData:getBountyCfg() + return ConfigManager:getConfig("act_fourteen_bounty") +end + +-- 档位是否已解锁 +function FourteenDayData:isBountyGradeUnlock(grade) + if grade == GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY then + return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.FourteenDayConst.BOUNTY_GIFT_ID) > 0 + else + return true + end +end + +-- 获取战令档位奖励 +function FourteenDayData:getBountyGradeReward(id, grade) + local cfg = self:getBountyCfg()[id] + local result + if cfg ~= nil then + if grade == GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE then + result = cfg.reward + elseif grade == GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY then + result = cfg.reward_pro + end + end + + return result +end + +-- 战令奖励可领取 +function FourteenDayData:canGetBountyReward(id, grade) + return self:isReachBountyReward(id, grade) and not self:isReceivedBountyReward(id, grade) +end + +-- 战令奖励是否满足领取条件 +function FourteenDayData:isReachBountyReward(id, grade) + if self:getActiveDays() >= id then + return self:isBountyGradeUnlock(grade) + else + return false + end +end + +-- 战令奖励是否已领取 +function FourteenDayData:isReceivedBountyReward(id, grade) + if self.bountyStatus == nil or self.bountyStatus.free_awarded == nil or self.bountyStatus.pay_awarded == nil then + return false + end + + if grade == GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE then + return table.containValue(self.bountyStatus.free_awarded, id) + elseif grade == GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY then + return table.containValue(self.bountyStatus.pay_awarded, id) + end + + return false +end + +-- 战令奖励领取成功 +function FourteenDayData:onReceivedBountyReward(successMap) + for index, data in ipairs(successMap) do + if data.grade == GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE then + table.insert(self.bountyStatus.free_awarded, data.id) + elseif data.grade == GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY then + table.insert(self.bountyStatus.pay_awarded, data.id) + end + end + + self:setDirty() +end + +-- 任务---------------------------------------------------------------------------------------------------------------- + +-- 是否有任务红点 +function FourteenDayData:hasTaskRedPoint() + local openDay = self:getActiveDays() + for id, data in ipairs(self:getTaskCfg()) do + if data.stage <= openDay then + if self:canGetTaskReward(id) then + return true + end + end + end + + return false +end + +-- 获取当前应该显示的阶段 +function FourteenDayData:getTaskShowStage() + for id, data in ipairs(self:getTaskCfg()) do + if self:getActiveDays() >= data.stage and self:canGetTaskReward(id) then + return data.stage + end + end + + local curStage = self:getActiveDays() + local maxStage = self:getTaskMaxStage() + if curStage > maxStage then + curStage = maxStage + end + + return curStage +end + + +-- 获取任务配置 +function FourteenDayData:getTaskCfg() + return ConfigManager:getConfig("act_fourteen_quest") +end + +-- 获取任务id map结构 +function FourteenDayData:getTaskMap() + if self.taskMap == nil then + self.taskMap = {} + for id, data in ipairs(ConfigManager:getConfig("act_fourteen_quest")) do + if self.taskMap[data.stage] == nil then + self.taskMap[data.stage] = {} + end + + if data.quest ~= nil then + if self.taskMap[data.stage].task == nil then + self.taskMap[data.stage].task = {} + end + table.insert(self.taskMap[data.stage].task, id) + else + self.taskMap[data.stage].stage = id + end + end + end + + return self.taskMap +end + +-- 获取任务最大阶段值 +function FourteenDayData:getTaskMaxStage() + return #self:getTaskMap() +end + +-- 获取阶段任务id +function FourteenDayData:getStageTaskId(stage) + local taskMap = self:getTaskMap() + + return taskMap[stage] and taskMap[stage].stage or nil +end + +-- 获取阶段子任务id列表 +function FourteenDayData:getStageSubTaskIdsSort(stage) + local taskMap = self:getTaskMap() + if taskMap[stage] == nil or taskMap[stage].task == nil then + return nil + end + + local canGet = {} + local unfinish = {} + local result = {} + for index, id in ipairs(taskMap[stage].task) do + if self:isTaskFinish(id) then + -- 已完成 + if self:isReceivedTaskReward(id) then + -- 已领取 + table.insert(result, id) + else + -- 未领取 + table.insert(canGet, id) + end + else + --未完成 + table.insert(unfinish, id) + end + end + + unfinish = table.addArray(canGet, unfinish) + result = table.addArray(unfinish, result) + + return result +end + +-- 获取任务目标 +function FourteenDayData:getTaskTarget(id) + return self:getTaskCfg()[id].num +end + +-- 获取任务类型 +function FourteenDayData:getTaskType(id) + return self:getTaskCfg()[id].quest +end + +-- 获取任务阶段 +function FourteenDayData:getTaskStage(id) + return self:getTaskCfg()[id].stage +end + +-- 获取任务奖励 +function FourteenDayData:getTaskRewards(id) + return self:getTaskCfg()[id].reward +end + +-- 获取任务icon +function FourteenDayData:getTaskIcon(id) + return self:getTaskCfg()[id].icon +end + +-- 获取任务描述 +function FourteenDayData:getTaskDesc(id) + local taskType = self:getTaskType(id) + if taskType == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then + local grading = DataManager.ArenaData:getGradingName(DataManager.ArenaData:getGradingIdFromScore(self:getTaskTarget(id))) + return I18N:getText("task_type", taskType, "desc", grading) + elseif taskType == GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR then + local cfg = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR):getConfig(id) + return I18N:getText("task_type", taskType, "desc", cfg.chapter, cfg.stage) + else + return I18N:getText("task_type", taskType, "desc", self:getTaskTarget(id)) + end +end + +-- 任务奖励是否可领取 +function FourteenDayData:canGetTaskReward(id) + return self:isTaskFinish(id) and not self:isReceivedTaskReward(id) +end + +-- 任务是否完成 +function FourteenDayData:isTaskFinish(id) + if self:getTaskType(id) ~= nil then + return self:getTaskProgress(id) >= self:getTaskTarget(id) + else + local ids = self:getStageSubTaskIdsSort(self:getTaskStage(id)) + + local isFinish = true + for idx, taskId in ipairs(ids) do + if not self:isTaskFinish(taskId) then + isFinish = false + break + end + end + + return isFinish + end +end + +-- 任务奖励是否已领取 +function FourteenDayData:isReceivedTaskReward(id) + return self.tasksStatus[id] and self.tasksStatus[id].claimed or false +end + +-- 获取任务进度 +function FourteenDayData:getTaskProgress(id) + if self:getTaskType(id) == GConst.TaskConst.TASK_TYPE.X_PLAYER_LV_REACH then + -- 玩家等级实时处理 + return DataManager.PlayerData:getLv() + end + return self.tasksStatus[id] and self.tasksStatus[id].progress or 0 +end + +-- 添加任务进度 +function FourteenDayData:addTaskProgress(taskType, count) + -- Logger.logHighlight("任务进度改变："..tostring(taskType)..","..tostring(count)) + if not self:isOpen() then + return + end + if not self:isActiveTime() then + return + end + + for id, data in ipairs(self:getTaskCfg()) do + if data.quest == taskType then + if self.tasksStatus[id] == nil then + self.tasksStatus[id] = {} + self.tasksStatus[id].progress = 0 + end + self.tasksStatus[id].progress = self.tasksStatus[id].progress + count + end + end + + self:setDirty() +end + +-- 任务奖励领取成功 +function FourteenDayData:onReceivedTaskReward(id) + if self.tasksStatus[id] == nil then + self.tasksStatus[id] = {} + end + + self.tasksStatus[id].claimed = true + self:setDirty() +end + +-- 兑换商店-------------------------------------------------------------------------------------------------------------- + +-- 是否有兑换红点 +function FourteenDayData:hasExchangeRedPoint() + local isFullUnlock = true + for index, data in ipairs(self:getExchangeShowIdsSort()) do + if not self:isExchangeUnlock(data.id) then + isFullUnlock = false + break + end + end + if not isFullUnlock then + return not self:getTodayExchangeCheck() + else + for index, data in ipairs(self:getExchangeShowIdsSort()) do + if self:canExchange(data.id) then + return true + end + end + end +end + +function FourteenDayData:getTodayExchangeCheck() + if self.todayExchangeChecked == nil then + self.todayExchangeChecked = LocalData:getTodayFourteenDayExchangeWatched() + end + return self.todayExchangeChecked +end + +function FourteenDayData:setTodayExchangeCheck() + if self.todayExchangeChecked then + return + else + LocalData:recordTodayFourteenDayExchangeWatched() + end + self.todayExchangeChecked = true + self:setDirty() +end + +-- 获取拥有的兑换道具个数 +function FourteenDayData:getExchangeItemNum() + return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_FOURTEEN_DAY_EXCHANGE) +end + +-- 获取兑换配置 +function FourteenDayData:getExchangeCfg() + return ConfigManager:getConfig("act_fourteen_exchange") +end + +-- 获取显示的id列表 +function FourteenDayData:getExchangeShowIdsSort() + local result = {} + local ids = table.keys(self:getExchangeCfg()) + for index, id in ipairs(ids) do + local sort = id + 10000000000 + + if self:isExchangeUnlock(id) then + sort = sort - 10000000 + end + + if self:getExchangeRemainTime(id) > 0 then + sort = sort - 10000 + end + table.insert(result, {id = id, sort = sort}) + end + + table.sort(result, function (a, b) + return a.sort < b.sort + end) + + return result +end + +-- 获取兑换所需最小道具数 +function FourteenDayData:getExchangeMinNum() + local minExchange + for index, data in ipairs(self:getExchangeShowIdsSort()) do + local temp = self:getExchangeCostNum(data.id) + if minExchange == nil or minExchange > temp then + minExchange = temp + end + end + + return minExchange +end + +-- 物品是否可以兑换 +function FourteenDayData:canExchange(id) + return self:isExchangeUnlock(id) and self:getExchangeRemainTime(id) > 0 and self:getExchangeItemNum() >= self:getExchangeCostNum(id) +end + +-- 兑换物品是否解锁 +function FourteenDayData:isExchangeUnlock(id) + return self:getActiveDays() >= self:getExchangeUnlockCondition(id) +end + +-- 兑换物品的解锁条件 +function FourteenDayData:getExchangeUnlockCondition(id) + return self:getExchangeCfg()[id].stage +end + +-- 兑换物品剩余兑换次数 +function FourteenDayData:getExchangeRemainTime(id) + return self:getExchangeCfg()[id].limit - (self.exchangeStatus[id] or 0) +end + +-- 获取兑换的消耗道具个数 +function FourteenDayData:getExchangeCostNum(id) + return GFunc.getRewardNum(self:getExchangeCfg()[id].cost) +end + +function FourteenDayData:getExchangeCost(id) + return self:getExchangeCfg()[id].cost +end + +-- 获取兑换的奖励道具 +function FourteenDayData:getExchangeReward(id) + return self:getExchangeCfg()[id].reward +end + +-- 兑换奖励领取成功 +function FourteenDayData:onReceivedExchangeReward(id, count) + count = count or 1 + if self.exchangeStatus[id] == nil then + self.exchangeStatus[id] = 0 + end + + self.exchangeStatus[id] = self.exchangeStatus[id] + count + self:setDirty() +end + +-- 礼包---------------------------------------------------------------------------------------------------------------- + +-- 是否有礼包红点 +function FourteenDayData:hasGiftRedPoint() + local gifts = DataManager.ShopData:getGiftsByType(PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT) + for id, data in pairs(gifts) do + if data.recharge_id == nil and self:getGiftRemainTime(id) > 0 then + return true + end + end + + return false +end + +-- 是否是免费礼包 +function FourteenDayData:isFreeGift(id) + return DataManager.ShopData:getActGiftConfig()[id].recharge_id == nil +end + +-- 获取礼包id列表 +function FourteenDayData:getGiftIdsSort() + local gifts = DataManager.ShopData:getGiftsByType(PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT) + + local result = {} + local ids = table.keys(gifts) + for index, id in ipairs(ids) do + local sort = id + 10000000000 + + if self:isFreeGift(id) then + sort = sort - 10000000 + end + + if self:getGiftRemainTime(id) > 0 then + sort = sort - 10000 + end + table.insert(result, {id = id, sort = sort}) + end + + table.sort(result, function (a, b) + return a.sort < b.sort + end) + + return result +end + +-- 礼包剩余购买次数 +function FourteenDayData:getGiftRemainTime(giftId) + if self:isFreeGift(giftId) then + local giftData = DataManager.ShopData:getActGiftDetailData(PayManager.PURCHARSE_TYPE.ACT_GIFT, giftId) + if giftData and giftData.latest_buy_at then + if Time:getBeginningOfOneDay(Time:getServerTime()) == Time:getBeginningOfOneDay(giftData.latest_buy_at // 1000) then + return 0 + end + end + return 1 + else + return DataManager.ShopData:getGiftRemainBuyNum(giftId) + end +end + +return FourteenDayData \ No newline at end of file diff --git a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.meta b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.meta new file mode 100644 index 00000000..cdbca31c --- /dev/null +++ b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bfb514a5b5b3c8c43a855a2fd5139977 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/arena/arena_bounty_data.lua b/lua/app/userdata/arena/arena_bounty_data.lua index af38a4af..71a1bb79 100644 --- a/lua/app/userdata/arena/arena_bounty_data.lua +++ b/lua/app/userdata/arena/arena_bounty_data.lua @@ -172,7 +172,7 @@ function ArenaBountyData:getIsOpen() end function ArenaBountyData:getBannerName() - return "bounty_arena_btn_main" + return ConfigManager:getConfig("arena_time")[self.season].ui_banner end function ArenaBountyData:getRewardBannerName() diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 802c5f6b..4acb7ca1 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -715,12 +715,14 @@ function ArenaData:onBattleResultReceived(settlement, result) self.score = self.score + settlement.incr_score self.curGradingId = self:getGradingIdFromScore(self.score) - local beforeMaxGradingId = self:getGradingIdFromScore(self.maxScore) + local beforeMaxGrading = self.maxScore self.maxScore = result.highest_score_in_history - local curMaxGradingId = self:getGradingIdFromScore(self.maxScore) - if beforeMaxGradingId ~= curMaxGradingId then + if self:getGradingIdFromScore(beforeMaxGrading) ~= self:getGradingIdFromScore(self.maxScore) then DataManager.HeroData:checkIfCanShowHeroUnlockDan(self:getFormartMaxGrading()) end + if beforeMaxGrading < self.maxScore then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING, self.maxScore - beforeMaxGrading) + end self:setDirty() end diff --git a/lua/app/userdata/battle/battle_base_data.lua b/lua/app/userdata/battle/battle_base_data.lua index f4b398db..ae1d0816 100644 --- a/lua/app/userdata/battle/battle_base_data.lua +++ b/lua/app/userdata/battle/battle_base_data.lua @@ -48,6 +48,7 @@ function BattleBaseData:init(params, snapInfo) self:initRogueSkills(SIDE_DEF, params.defFormation) self.atkFormation = params.atkFormation or {} self.defFormation = params.defFormation or {} + self:setMaxBattleLv(nil) if snapInfo then if snapInfo.cacheSkillList then @@ -670,9 +671,19 @@ function BattleBaseData:getLvNeedExp(lv) return cfg[lv].exp end +function BattleBaseData:setMaxBattleLv(maxLv) + self.maxBattleLv = maxLv +end + function BattleBaseData:addExp(exp) self.curBattleExp = self.curBattleExp + exp while self.curBattleExp >= self.needBattleExp do + if self.maxBattleLv then -- 超过最大等级后跳出 + if self.maxBattleLv <= self.battleLv then + break + end + end + self.curBattleExp = self.curBattleExp - self.needBattleExp self.addLvCount = self.addLvCount + 1 self.battleLv = self.battleLv + 1 @@ -690,6 +701,12 @@ function BattleBaseData:useAddlvCount() return true end +function BattleBaseData:addBattleLvCount(count) + self.addLvCount = self.addLvCount + count + self.battleLv = self.battleLv + count + self.data.lvDirty = not self.data.lvDirty +end + function BattleBaseData:addCommonSelectSkillCount(count) self.commonSelectSkillCount = self.commonSelectSkillCount + (count or 1) end diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua index d10ccc53..d7dc0e62 100644 --- a/lua/app/userdata/battle/skill/battle_buff_entity.lua +++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua @@ -141,6 +141,10 @@ function BattleBuffEntity:needShowName() return self.buffInfo.show_name end +function BattleBuffEntity:getLimitParameter() + return self.buffInfo.limit_parameter +end + function BattleBuffEntity:isCantRemove() return self.cantRemove end diff --git a/lua/app/userdata/dungeon/dungeon_armor_entity.lua b/lua/app/userdata/dungeon/dungeon_armor_entity.lua index 73e9dd95..49afb2a5 100644 --- a/lua/app/userdata/dungeon/dungeon_armor_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_armor_entity.lua @@ -30,6 +30,9 @@ function DungeonArmorEntity:init(data) end function DungeonArmorEntity:refreshInfoOnSettlement(chapterId, result) + if result.max_id > self.maxPassedId then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR, result.max_id - self.maxPassedId) + end self.totalChallengeCount[chapterId] = (self.totalChallengeCount[chapterId] or 0) + 1 self.maxPassedId = result.max_id self.armorInfo[chapterId] = result.armor_info @@ -323,8 +326,9 @@ function DungeonArmorEntity:formatTaskByController(battleBaseController, chapter local pass = self:getPassedMaxId() >= chapterId and 1 or 0 local hpp = math.floor(battleBaseController.battleData:getAtkTeam():getHpPercent() * 100 + 0.0001) local bossRoundCount = 0 - if battleBaseController.waveIndex >= battleBaseController.maxWaveIndex then -- 最后一波 - bossRoundCount = battleBaseController.waveRoundCount[battleBaseController.waveIndex] or 0 + local waveIndex = battleBaseController:getWaveIndex() + if waveIndex >= battleBaseController.maxWaveIndex then -- 最后一波 + bossRoundCount = battleBaseController.waveRoundCount[waveIndex] or 0 end local totalRound = 0 for wave, round in pairs(battleBaseController.waveRoundCount) do diff --git a/lua/app/userdata/dungeon/dungeon_gold_entity.lua b/lua/app/userdata/dungeon/dungeon_gold_entity.lua index 45ccfd2e..861db60a 100644 --- a/lua/app/userdata/dungeon/dungeon_gold_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_gold_entity.lua @@ -4,6 +4,9 @@ local DungeonGoldEntity = class("DungeonGoldEntity", DungeonBaseEntity) -- 金币副本数据 function DungeonGoldEntity:init(data) + if self.maxPassedId then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_DUNGEON_GOLD, data.max_chapter_gold_id - self.maxPassedId) + end self.totalChallengeCount = data.total_challenge_count self.todayChallengeCount = data.today_challenge_count self.maxPassedId = data.max_chapter_gold_id diff --git a/lua/app/userdata/dungeon/dungeon_shards_entity.lua b/lua/app/userdata/dungeon/dungeon_shards_entity.lua index 73cafe00..0e7eae8f 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_entity.lua @@ -4,6 +4,9 @@ local DungeonShardsEntity = class("DungeonShardsEntity", DungeonBaseEntity) -- 碎片副本数据 function DungeonShardsEntity:init(data) + if self.maxPassedId then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_DUNGEON_SHARDS, data.max_chapter_shards_id - self.maxPassedId) + end self.totalChallengeCount = data.total_challenge_count self.todayChallengeCount = data.today_challenge_count self.maxPassedId = data.max_chapter_shards_id diff --git a/lua/app/userdata/dungeon/dungeon_weapon_entity.lua b/lua/app/userdata/dungeon/dungeon_weapon_entity.lua index c407e845..4db7637e 100644 --- a/lua/app/userdata/dungeon/dungeon_weapon_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_weapon_entity.lua @@ -25,6 +25,9 @@ function DungeonWeaponEntity:init(data) end function DungeonWeaponEntity:refreshInfoOnSettlement(chapterId, result) + if result.max_id > self.maxPassedId then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_DUNGEON_WEAPON, result.max_id - self.maxPassedId) + end self.totalChallengeCount[chapterId] = (self.totalChallengeCount[chapterId] or 0) + 1 self.maxPassedId = result.max_id self:updateGift(result.gift_info) diff --git a/lua/app/userdata/equip/equip_data.lua b/lua/app/userdata/equip/equip_data.lua index 579096fd..8a3a0c01 100644 --- a/lua/app/userdata/equip/equip_data.lua +++ b/lua/app/userdata/equip/equip_data.lua @@ -283,7 +283,7 @@ function EquipData:getGiftTitle(giftId) end if gift.type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT then - return I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_26, gift.parameter_pro[1] + 20) + return I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_28, gift.parameter_pro[1] + 20) elseif gift.type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT then return I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_27, gift.parameter_pro[1] + 20) end diff --git a/lua/app/userdata/formation/formation_data.lua b/lua/app/userdata/formation/formation_data.lua index 1e216399..6628b3d7 100644 --- a/lua/app/userdata/formation/formation_data.lua +++ b/lua/app/userdata/formation/formation_data.lua @@ -74,6 +74,20 @@ function FormationData:initDungeonArmor(heroes) end end +function FormationData:initFormationByType(formationType, heroes) + if self.formations == nil then + self.formations = {} + end + + self.formations[formationType] = {} + for idx, id in pairs(heroes) do + if id and id ~= 0 then + local matchType = DataManager.HeroData:getHeroById(id):getMatchType() + self.formations[formationType][matchType] = id + end + end +end + function FormationData:getStageFormation() return self:getFormation(GConst.BattleConst.FORMATION_TYPE.STAGE) end @@ -104,6 +118,15 @@ function FormationData:getDungeonArmorFormation() return formation end +function FormationData:getBossRushFormation() + local formation = self:getFormation(GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH) + if table.nums(formation) <= 0 then + self:setFormation(GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH, self:getFormation(GConst.BattleConst.FORMATION_TYPE.STAGE)) -- 如果没有，则用默认关卡 + formation = self:getFormation(GConst.BattleConst.FORMATION_TYPE.BOSS_RUSH) + end + return formation +end + function FormationData:getFormation(formationType) local formation = self.formations[formationType] if formation == nil then diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 630a2746..6db52cbe 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -238,7 +238,9 @@ function HeroEntity:setLv(lv) return end self.data.lv = lv - self:onBaseAttrChange() + self:updateAllAttr() + self:setDirty() + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_HERO_LV_UP, lv) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.HERO_UPGRADE_SUCCESS, self:getCfgId()) end diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index a9d06896..5640b1a2 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -56,10 +56,10 @@ function ShopData:getActGiftConfig() return ConfigManager:getConfig("act_gift") end --- 获取配置的所有该类型的礼包 +-- 获取通用礼包配置的所有该类型的礼包 function ShopData:getGiftsByType(giftType) local gifts = {} - for id, data in pairs(DataManager.ShopData:getActGiftConfig()) do + for id, data in pairs(self:getActGiftConfig()) do if data.type == giftType then gifts[id] = data end diff --git a/lua/app/userdata/skin/skin_data.lua b/lua/app/userdata/skin/skin_data.lua index 18674baa..bd08a7ae 100644 --- a/lua/app/userdata/skin/skin_data.lua +++ b/lua/app/userdata/skin/skin_data.lua @@ -133,6 +133,17 @@ function SkinData:getModelId(skinId) return cfg and cfg.model_id end +-- 获取icon名称 +function SkinData:getIcon(skinId) + local cfg = self:getSkinCfg(skinId) + if cfg and cfg.icon then + return cfg.icon + else + local heroInfo = ConfigManager:getConfig("hero")[self:getHeroIdBySkinId(skinId)] + return heroInfo.icon + end +end + -- 获取皮肤来源 function SkinData:getSource(skinId) return I18N:getGlobalText("SKIN_GOT_" .. self:getSkinCfg(skinId).got)