diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index a21d7f1a..25bb2dc1 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -113,7 +113,7 @@ BIReport.ITEM_GET_TYPE = { ARENA_REMATCH_CD = "ArenaRematchCd", ARENA_REWARD = "ArenaReward", ARENA_AD_BOX_REWARD = "ArenaAdBoxReward", - ARENA_SETTLEMENT = "ArenaSettlement", + ARENA_GRADING_REWARD = "ArenaGradingReward", CHANGE_NAME = "ChangeName", -- 重命名 CHANGE_AVATAR = "ChangeAvatar", -- 修改头像 CHANGE_FRAME = "ChangeFrame", -- 修改头像框 @@ -139,6 +139,7 @@ BIReport.ITEM_GET_TYPE = { ARMOR_UPGRADE = "ArmorUpgrade", OFFLINE_RECOVERY = "OfflineRecovery", ACT_SUMMER = "ActSummer", + ACT_HERO_FUND = "ActHeroFund", } BIReport.ADS_CLICK_TYPE = { @@ -207,6 +208,7 @@ BIReport.GIFT_TYPE = { WEAPON_GIFT = "WeaponGift", ARMOR_GIFT = "ArmorGift", ACT_SUMMER = "ActSummer", + ACT_HERO_FUND = "ActHeroFund" } BIReport.COIN_TYPE = { diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 832c455f..98dc9fef 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -33,6 +33,7 @@ function DataManager:init() self:initManager("ShopData", "app/userdata/shop/shop_data") 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") end function DataManager:initManager(name, path) @@ -86,6 +87,7 @@ function DataManager:checkDataBind() end function DataManager:clear() + self.loginSuccess = false self.initWithServer = false if self.cacheTimer then SchedulerManager:unscheduleGlobal(self.cacheTimer) @@ -117,6 +119,7 @@ function DataManager:clear() -- 任务数据最后清理 self.TaskData:clear() self.AIHelperData:clear() + self.HeroFundData:clear() ModuleManager.TaskManager:clear() self:clearTryOpenFunc() end @@ -140,6 +143,7 @@ function DataManager:initWithServerData(data) self.DungeonData:initDungeonGold(data.chapter_gold_challenge) self.DungeonData:initDungeonShards(data.chapter_shards_challenge) self.EquipData:init(data.heroes_equips) + self.EquipData:initGifts(data.act_weapon_armor_gift) self.SkinData:init(data.bag.skins) -- HeroData要在EquipData和SkinData之后初始化，依赖它们的属性数据 self.HeroData:init(data.bag.heroes) @@ -176,6 +180,7 @@ function DataManager:initWithServerData(data) if data.fund then self.GrowthFundData:init(data.fund.funds) end + self.HeroFundData:init(data.hero_fund) -- 任务数据最后初始化,依赖其他模块的数据 self.TaskData:init() @@ -204,6 +209,10 @@ function DataManager:getIsInCreate24Hour() return passTime < 86400 end +function DataManager:getRegisterTs() + return self.registerTs or 0 +end + function DataManager:getIsTodayFirstLogin() return self.todayFirstLogin or false end diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 5cca3762..3a8e4ab6 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -60,6 +60,7 @@ EventManager.CUSTOM_EVENT = { -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID", ACTIVITY_SUMMER_END = "ACTIVITY_SUMMER_END", + MAIN_UI_CHECK_SIDE_BAR = "MAIN_UI_CHECK_SIDE_BAR", FORMATION_CHANGE = "FORMATION_CHANGE", } diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 377b610d..a9a3b3cf 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -69,6 +69,8 @@ local MODULE_PATHS = { EquipManager = "app/module/equip/equip_manager", -- 皮肤 SkinManager = "app/module/skin/skin_manager", + -- 英雄基金 + HeroFundManager = "app/module/activity/hero_fund/hero_fund_manager", } -- 这里的key对应func_open里的id diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 76617cdb..799522e9 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -23,6 +23,9 @@ PayManager.PURCHARSE_ACT_TYPE = { WEAPON_GIFT = 11, ARMOR_GIFT = 12, ACT_SUMMER = 13, + ACT_HERO_FUND = 14, + WEAPON_UPGRADE_GIFT = 15, + ARMOR_UPGRADE_GIFT = 16, } PayManager.PURCHARSE_TYPE_CONFIG = { @@ -48,6 +51,9 @@ PayManager.BI_ITEM_GET_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.ITEM_GET_TYPE.ACT_SUMMER, + [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_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG, [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE, @@ -70,6 +76,9 @@ PayManager.BI_GIFT_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.GIFT_TYPE.ACT_SUMMER, + [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_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG, [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE, diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index c8836073..a39c4d8a 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -429,8 +429,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=53001, + ["id_for_nothing"]="UwtcA2Q=", ["num"]=20, ["num_for_nothing"]="VAg=" }, @@ -1675,9 +1675,875 @@ local act_gift = { }, ["limit"]=1, ["value"]=1100 + }, + [140403]={ + ["type"]=14, + ["recharge_id"]=10, + ["limit"]=1 + }, + [140404]={ + ["type"]=14, + ["recharge_id"]=12, + ["limit"]=1 + }, + [150102]={ + ["type"]=15, + ["parameter_pro"]={ + 0, + 20 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1001, + ["id_for_nothing"]="VwhcAg==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150202]={ + ["type"]=15, + ["parameter_pro"]={ + 20, + 40 + }, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1001, + ["id_for_nothing"]="VwhcAg==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150302]={ + ["type"]=15, + ["parameter_pro"]={ + 40, + 60 + }, + ["recharge_id"]=8, + ["reward"]={ + { + ["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"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150402]={ + ["type"]=15, + ["parameter_pro"]={ + 60, + 80 + }, + ["recharge_id"]=8, + ["reward"]={ + { + ["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"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150502]={ + ["type"]=15, + ["parameter_pro"]={ + 80, + 100 + }, + ["recharge_id"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=16000, + ["num_for_nothing"]="Vw5cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150602]={ + ["type"]=15, + ["parameter_pro"]={ + 100, + 120 + }, + ["recharge_id"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=16000, + ["num_for_nothing"]="Vw5cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150702]={ + ["type"]=15, + ["parameter_pro"]={ + 120, + 140 + }, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=24000, + ["num_for_nothing"]="VAxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150802]={ + ["type"]=15, + ["parameter_pro"]={ + 140, + 160 + }, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=24000, + ["num_for_nothing"]="VAxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150902]={ + ["type"]=15, + ["parameter_pro"]={ + 160, + 180 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["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"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1006, + ["id_for_nothing"]="VwhcBQ==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [151002]={ + ["type"]=15, + ["parameter_pro"]={ + 180, + 200 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["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"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1006, + ["id_for_nothing"]="VwhcBQ==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160102]={ + ["type"]=16, + ["parameter_pro"]={ + 0, + 20 + }, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=38, + ["id_for_nothing"]="VQA=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160202]={ + ["type"]=16, + ["parameter_pro"]={ + 20, + 40 + }, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=38, + ["id_for_nothing"]="VQA=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160302]={ + ["type"]=16, + ["parameter_pro"]={ + 40, + 60 + }, + ["recharge_id"]=12, + ["reward"]={ + { + ["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"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160402]={ + ["type"]=16, + ["parameter_pro"]={ + 60, + 80 + }, + ["recharge_id"]=12, + ["reward"]={ + { + ["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"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160502]={ + ["type"]=16, + ["parameter_pro"]={ + 80, + 100 + }, + ["recharge_id"]=14, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=32000, + ["num_for_nothing"]="VQpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160602]={ + ["type"]=16, + ["parameter_pro"]={ + 100, + 120 + }, + ["recharge_id"]=14, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=32000, + ["num_for_nothing"]="VQpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160702]={ + ["type"]=16, + ["parameter_pro"]={ + 120, + 140 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=48000, + ["num_for_nothing"]="UgBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160802]={ + ["type"]=16, + ["parameter_pro"]={ + 140, + 160 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=48000, + ["num_for_nothing"]="UgBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160902]={ + ["type"]=16, + ["parameter_pro"]={ + 160, + 180 + }, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80000, + ["num_for_nothing"]="XghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=43, + ["id_for_nothing"]="Ugs=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [161002]={ + ["type"]=16, + ["parameter_pro"]={ + 180, + 200 + }, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80000, + ["num_for_nothing"]="XghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=43, + ["id_for_nothing"]="Ugs=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 } } local config = { -data=act_gift,count=54 +data=act_gift,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/activity_herofund.lua b/lua/app/config/activity_herofund.lua new file mode 100644 index 00000000..ce2b6681 --- /dev/null +++ b/lua/app/config/activity_herofund.lua @@ -0,0 +1,627 @@ +local activity_herofund = { + [1]={ + ["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"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [2]={ + ["exp"]=30, + ["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==" + } + }, + [3]={ + ["exp"]=60, + ["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=" + } + }, + [4]={ + ["exp"]=90, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [5]={ + ["exp"]=120, + ["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==" + } + }, + [6]={ + ["exp"]=150, + ["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"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [7]={ + ["exp"]=180, + ["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=" + } + }, + [8]={ + ["exp"]=210, + ["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==" + } + }, + [9]={ + ["exp"]=240, + ["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==" + } + }, + [10]={ + ["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"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [11]={ + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=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=" + } + }, + [12]={ + ["exp"]=330, + ["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" + } + }, + [13]={ + ["exp"]=360, + ["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==" + } + }, + [14]={ + ["exp"]=390, + ["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=" + } + }, + [15]={ + ["exp"]=420, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [16]={ + ["exp"]=450, + ["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==" + } + }, + [17]={ + ["exp"]=480, + ["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=" + } + }, + [18]={ + ["exp"]=510, + ["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" + } + }, + [19]={ + ["exp"]=540, + ["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"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [20]={ + ["exp"]=570, + ["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==" + } + }, + [21]={ + ["exp"]=600, + ["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=" + } + }, + [22]={ + ["exp"]=630, + ["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==" + } + }, + [23]={ + ["exp"]=660, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } +} +local config = { +data=activity_herofund,count=23 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_herofund.lua.meta b/lua/app/config/activity_herofund.lua.meta new file mode 100644 index 00000000..8a555b65 --- /dev/null +++ b/lua/app/config/activity_herofund.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c683a9fc124b89c4a8e10278b027d723 +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 5c4b8208..862e8f51 100644 --- a/lua/app/config/arena_board.lua +++ b/lua/app/config/arena_board.lua @@ -20227,7 +20227,7 @@ local arena_board = { }, { 35, - 35 + 0 }, { 35, diff --git a/lua/app/config/arena_gift.lua b/lua/app/config/arena_gift.lua new file mode 100644 index 00000000..9ce15782 --- /dev/null +++ b/lua/app/config/arena_gift.lua @@ -0,0 +1,600 @@ +local arena_gift = { + [1]={ + ["score"]=900, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [2]={ + ["score"]=950, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=23002, + ["id_for_nothing"]="VAtcA2c=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [3]={ + ["score"]=1000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [4]={ + ["score"]=1050, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + } + }, + [5]={ + ["score"]=1100, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["unlock_hero"]={ + 54003 + } + }, + [6]={ + ["score"]=1150, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [7]={ + ["score"]=1200, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["unlock_hero"]={ + 34003 + } + }, + [8]={ + ["score"]=1250, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + } + }, + [9]={ + ["score"]=1300, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [10]={ + ["score"]=1350, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + } + }, + [11]={ + ["score"]=1400, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54003, + ["id_for_nothing"]="UwxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["unlock_hero"]={ + 24003 + } + }, + [12]={ + ["score"]=1450, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" + } + } + }, + [13]={ + ["score"]=1500, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [14]={ + ["score"]=1550, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + } + } + }, + [15]={ + ["score"]=1600, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34003, + ["id_for_nothing"]="VQxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } + }, + [16]={ + ["score"]=1650, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + } + } + }, + [17]={ + ["score"]=1700, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [18]={ + ["score"]=1750, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [19]={ + ["score"]=1800, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24003, + ["id_for_nothing"]="VAxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } + }, + [20]={ + ["score"]=1850, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + } + } + }, + [21]={ + ["score"]=1900, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [22]={ + ["score"]=1950, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=120, + ["num_for_nothing"]="Vwpc" + } + } + }, + [23]={ + ["score"]=2000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + } + }, + [24]={ + ["score"]=2050, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=24000, + ["num_for_nothing"]="VAxcA2U=" + } + } + }, + [25]={ + ["score"]=2100, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [26]={ + ["score"]=2150, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [27]={ + ["score"]=2200, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + } + }, + [28]={ + ["score"]=2250, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + } + } + }, + [29]={ + ["score"]=2300, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [30]={ + ["score"]=2350, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=180, + ["num_for_nothing"]="VwBc" + } + } + }, + [31]={ + ["score"]=2400, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + } + } + }, + [32]={ + ["score"]=2450, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [33]={ + ["score"]=2500, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [34]={ + ["score"]=2550, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + } + } + }, + [35]={ + ["score"]=2600, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [36]={ + ["score"]=2650, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + } + }, + [37]={ + ["score"]=2700, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + } + } + }, + [38]={ + ["score"]=2750, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=15, + ["id_for_nothing"]="Vw0=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [39]={ + ["score"]=2800, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + } + } + }, + [40]={ + ["score"]=2850, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=50000, + ["num_for_nothing"]="UwhcA2U=" + } + } + }, + [41]={ + ["score"]=2900, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [42]={ + ["score"]=2950, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + } + } + }, + [43]={ + ["score"]=3000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=50000, + ["num_for_nothing"]="UwhcA2U=" + } + } + }, + [44]={ + ["score"]=3050, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=15, + ["id_for_nothing"]="Vw0=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [45]={ + ["score"]=3100, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + } + } + } +} +local config = { +data=arena_gift,count=45 +} +return config \ No newline at end of file diff --git a/lua/app/config/arena_gift.lua.meta b/lua/app/config/arena_gift.lua.meta new file mode 100644 index 00000000..f68b73c7 --- /dev/null +++ b/lua/app/config/arena_gift.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 505a5ee453a5c8c4eb2542c5844eab6f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua index a600c933..d000182a 100644 --- a/lua/app/config/bounty_level.lua +++ b/lua/app/config/bounty_level.lua @@ -3238,9 +3238,1629 @@ local bounty_level = { ["num"]=1, ["num_for_nothing"]="Vw==" } + }, + [301]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [302]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [303]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [304]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [305]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [306]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [307]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [308]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [309]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [310]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_type"]=1 + }, + [311]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [312]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [313]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [314]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [315]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [316]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [317]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [318]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [319]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [320]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [321]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [322]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [323]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [324]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [325]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [326]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [327]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [328]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [329]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [330]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [331]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [332]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [333]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [334]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [335]={ + ["season"]=3, + ["exp"]=450, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [336]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [337]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [338]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [339]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [340]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [341]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [342]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [343]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [344]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [345]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [346]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [347]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [348]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [349]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [350]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [351]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [352]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4500, + ["num_for_nothing"]="Ug1cAw==" + } + }, + [353]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [354]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [355]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [356]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [357]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [358]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [359]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [360]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [361]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [362]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4500, + ["num_for_nothing"]="Ug1cAw==" + } + }, + [363]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [364]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [365]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [366]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [367]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [368]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [369]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [370]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [371]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [372]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4500, + ["num_for_nothing"]="Ug1cAw==" + } + }, + [373]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [374]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [375]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34002, + ["id_for_nothing"]="VQxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [376]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [377]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4500, + ["num_for_nothing"]="Ug1cAw==" + } + }, + [378]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [379]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [380]={ + ["season"]=3, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [381]={ + ["season"]=3, + ["exp"]=1000, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } } } local config = { -data=bounty_level,count=162 +data=bounty_level,count=243 } return config \ No newline at end of file diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua index a16f5d16..c254d8db 100644 --- a/lua/app/config/bounty_time.lua +++ b/lua/app/config/bounty_time.lua @@ -8,9 +8,14 @@ local bounty_time = { ["season"]=2, ["start_time"]="2023-8-1 00:00:00", ["end_time"]="2023-9-1 00:00:00" + }, + [3]={ + ["season"]=3, + ["start_time"]="2023-9-1 00:00:00", + ["end_time"]="2023-10-1 00:00:00" } } local config = { -data=bounty_time,count=2 +data=bounty_time,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index d909fea0..6630644e 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -16459,8 +16459,8 @@ local chapter_board = { 1 }, { - 22, - 1 + 0, + 0 }, { 0, @@ -16657,8 +16657,8 @@ local chapter_board = { 1 }, { - 22, - 1 + 0, + 0 }, { 0, @@ -17097,8 +17097,8 @@ local chapter_board = { 2 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17125,8 +17125,8 @@ local chapter_board = { 1 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17153,8 +17153,8 @@ local chapter_board = { 0 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17295,8 +17295,8 @@ local chapter_board = { 2 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17323,8 +17323,8 @@ local chapter_board = { 1 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -17351,8 +17351,8 @@ local chapter_board = { 0 }, { - 0, - 0 + 22, + 2 }, { 22, @@ -24575,8 +24575,8 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 1 }, { 0, @@ -24591,8 +24591,8 @@ local chapter_board = { 2 }, { - 1, - 0 + 0, + 1 }, { 1, @@ -24631,8 +24631,8 @@ local chapter_board = { 5 }, { - 0, - 0 + 23, + 5 }, { 27, @@ -24647,8 +24647,8 @@ local chapter_board = { 3 }, { - 0, - 0 + 23, + 5 }, { 23, diff --git a/lua/app/config/chapter_dungeon_armor.lua b/lua/app/config/chapter_dungeon_armor.lua index 9203a047..694e623b 100644 --- a/lua/app/config/chapter_dungeon_armor.lua +++ b/lua/app/config/chapter_dungeon_armor.lua @@ -828,29 +828,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -953,29 +947,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1078,29 +1066,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1203,29 +1185,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1328,101 +1304,77 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=70 + ["weight"]=38 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=150 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -1541,101 +1493,77 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=70 + ["weight"]=38 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=150 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -1754,41 +1682,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1891,41 +1807,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -2028,41 +1932,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -2165,41 +2057,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -2302,149 +2182,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=45 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=125 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -2563,149 +2395,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=45 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=125 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -2824,38 +2608,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -2955,38 +2733,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3086,38 +2858,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3217,38 +2983,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3348,128 +3108,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3585,128 +3321,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3822,41 +3534,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -3967,41 +3667,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -4112,41 +3800,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -4257,41 +3933,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -4402,149 +4066,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=48 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -4663,149 +4279,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=48 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -4924,38 +4492,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5055,38 +4617,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5186,38 +4742,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5317,38 +4867,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5448,128 +4992,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5685,128 +5205,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5922,41 +5418,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6067,41 +5551,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6212,41 +5684,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6357,41 +5817,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6502,149 +5950,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -6763,149 +6163,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -7024,38 +6376,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7155,38 +6501,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7286,38 +6626,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7417,38 +6751,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7548,128 +6876,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=58 + ["weight"]=45 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7785,128 +7089,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=58 + ["weight"]=45 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -8022,41 +7302,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8167,41 +7435,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8312,41 +7568,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8457,41 +7701,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8602,149 +7834,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -8863,149 +8047,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -9124,38 +8260,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9255,38 +8385,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9386,38 +8510,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9517,38 +8635,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9648,128 +8760,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=83 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9885,128 +8973,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=83 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, diff --git a/lua/app/config/chapter_dungeon_equip.lua b/lua/app/config/chapter_dungeon_equip.lua index dd5e946f..3d0d8511 100644 --- a/lua/app/config/chapter_dungeon_equip.lua +++ b/lua/app/config/chapter_dungeon_equip.lua @@ -58,7 +58,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -191,13 +191,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=80 + ["weight"]=90 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["rand_drop_num"]=10, @@ -205,12 +205,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1001, + ["id"]=1002, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -278,13 +278,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=60 + ["weight"]=85 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=40 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -365,13 +365,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=35 + ["weight"]=80 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=65 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -384,7 +384,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -452,19 +452,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=15 + ["weight"]=60 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=70 + ["weight"]=30 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=15 + ["weight"]=10 } }, ["rand_drop_num"]=10, @@ -472,12 +472,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1002, + ["id"]=1003, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -545,19 +545,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=5 + ["weight"]=45 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=65 + ["weight"]=40 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -565,7 +565,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1002, + ["id"]=1003, ["num"]=1, ["weight"]=100 } @@ -634,17 +634,23 @@ local chapter_dungeon_equip = { } }, ["rand_drop"]={ + { + ["type"]=1, + ["id"]=1001, + ["num"]=1, + ["weight"]=30 + }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=40 + ["weight"]=50 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=60 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -657,7 +663,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -725,13 +731,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=20 + ["weight"]=60 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=70 + ["weight"]=30 }, { ["type"]=1, @@ -745,12 +751,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1003, + ["id"]=1004, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -818,19 +824,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=65 + ["weight"]=40 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=25 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -838,7 +844,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1003, + ["id"]=1004, ["num"]=1, ["weight"]=100 } @@ -907,17 +913,23 @@ local chapter_dungeon_equip = { } }, ["rand_drop"]={ + { + ["type"]=1, + ["id"]=1002, + ["num"]=1, + ["weight"]=30 + }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=55 + ["weight"]=50 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=45 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -925,12 +937,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1003, + ["id"]=1004, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -998,19 +1010,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=30 + ["weight"]=67 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=60 + ["weight"]=25 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=10 + ["weight"]=8 } }, ["rand_drop_num"]=10, @@ -1018,12 +1030,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1005, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -1091,19 +1103,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=10 + ["weight"]=57 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=80 + ["weight"]=30 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=20 + ["weight"]=13 } }, ["rand_drop_num"]=10, @@ -1111,7 +1123,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1005, ["num"]=1, ["weight"]=100 } @@ -1180,17 +1192,23 @@ local chapter_dungeon_equip = { } }, ["rand_drop"]={ + { + ["type"]=1, + ["id"]=1003, + ["num"]=1, + ["weight"]=46 + }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=60 + ["weight"]=36 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=40 + ["weight"]=18 } }, ["rand_drop_num"]=10, @@ -1198,12 +1216,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1005, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -1271,19 +1289,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=30 + ["weight"]=66 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=55 + ["weight"]=30 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=5 + ["weight"]=4 } }, ["rand_drop_num"]=10, @@ -1291,12 +1309,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1006, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -1372,19 +1390,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=20 + ["weight"]=53 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=10 + ["weight"]=9 } }, ["rand_drop_num"]=10, @@ -1392,12 +1410,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -1465,19 +1483,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=15 + ["weight"]=43 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=65 + ["weight"]=42 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=20 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -1485,7 +1503,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } @@ -1558,19 +1576,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=10 + ["weight"]=40 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=60 + ["weight"]=40 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=30 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -1578,7 +1596,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } @@ -1651,19 +1669,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=7 + ["weight"]=37 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=53 + ["weight"]=38 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=40 + ["weight"]=25 } }, ["rand_drop_num"]=10, @@ -1671,12 +1689,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -1744,19 +1762,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=5 + ["weight"]=34 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=45 + ["weight"]=36 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=50 + ["weight"]=30 } }, ["rand_drop_num"]=10, @@ -1769,7 +1787,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 5d273786..48f7be39 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -373,9 +373,12 @@ local const = { ["num"]=50, ["num_for_nothing"]="Uwg=" } + }, + ["bounty_click"]={ + ["value"]=4 } } local config = { -data=const,count=76 +data=const,count=77 } return config \ No newline at end of file diff --git a/lua/app/config/equip.lua b/lua/app/config/equip.lua index e0095b55..d7bb5afa 100644 --- a/lua/app/config/equip.lua +++ b/lua/app/config/equip.lua @@ -7556,12 +7556,12 @@ local equip = { } }, ["weapon_icon"]={ - 31, - 32, - 33, - 34, - 35, - 36 + 25, + 26, + 27, + 28, + 29, + 30 } }, [1400103]={ @@ -8001,12 +8001,12 @@ local equip = { } }, ["weapon_icon"]={ - 19, - 20, - 21, - 22, - 23, - 24 + 13, + 14, + 15, + 16, + 17, + 18 } }, [1400104]={ @@ -8446,12 +8446,12 @@ local equip = { } }, ["weapon_icon"]={ - 7, - 8, - 9, - 10, - 11, - 12 + 1, + 2, + 3, + 4, + 5, + 6 } }, [1400105]={ @@ -8891,12 +8891,12 @@ local equip = { } }, ["weapon_icon"]={ - 43, - 44, - 45, - 46, - 47, - 48 + 37, + 38, + 39, + 40, + 41, + 42 } }, [1400201]={ diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 12d8d401..9c46cc42 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -2003,6 +2003,10 @@ local fx = { ["bind"]="root", ["bg"]=1 }, + [300150]={ + ["res"]="sfx_p0036_b05", + ["bind"]="root" + }, [400000]={ ["res"]="sfx_p0012_b01", ["bind"]="root", @@ -2754,9 +2758,14 @@ local fx = { ["bind"]="root", ["flip"]=1, ["bg"]=1 + }, + [400150]={ + ["res"]="sfx_p0036_b05", + ["bind"]="root", + ["flip"]=1 } } local config = { -data=fx,count=647 +data=fx,count=649 } return config \ No newline at end of file diff --git a/lua/app/config/grid_edge_type.lua b/lua/app/config/grid_edge_type.lua index 691b2651..e6487f1c 100644 --- a/lua/app/config/grid_edge_type.lua +++ b/lua/app/config/grid_edge_type.lua @@ -1,17 +1,17 @@ local grid_edge_type = { [1]={ ["icon"]="battle_obstacle_coral_1", - ["break_sfx"]="sfx_piece_za_b01" + ["break_sfx"]="sfx_piece_shanhu_b01" }, [2]={ ["icon"]="battle_obstacle_coral_2", ["next_type"]=1, - ["break_sfx"]="sfx_piece_za_b01" + ["break_sfx"]="sfx_piece_shanhu_b01" }, [3]={ ["icon"]="battle_obstacle_coral_3", ["next_type"]=2, - ["break_sfx"]="sfx_piece_za_b01" + ["break_sfx"]="sfx_piece_shanhu_b01" } } local config = { diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 7c971e28..04f6c483 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -247,7 +247,8 @@ local hero = { ["is_show"]=1, ["collection_point"]=5, ["skin"]={ - 14001 + 14001, + 1400101 } }, [14002]={ diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 2ca8cd81..5b3a05be 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1562,7 +1562,8 @@ local item = { 4, 5, 6, - 7 + 7, + 8 } }, [1002]={ @@ -1571,14 +1572,14 @@ local item = { ["icon"]="1002", ["get_way_type"]=1, ["get_way"]={ - 6, - 7, - 5, - 8, - 4, 9, - 3, - 10 + 8, + 10, + 6, + 11, + 5, + 4, + 3 } }, [1003]={ @@ -1587,14 +1588,15 @@ local item = { ["icon"]="1003", ["get_way_type"]=1, ["get_way"]={ - 9, - 10, - 8, - 11, 12, + 13, + 11, + 14, + 10, + 9, + 8, 7, - 6, - 13 + 6 } }, [1004]={ @@ -1603,18 +1605,18 @@ local item = { ["icon"]="1004", ["get_way_type"]=1, ["get_way"]={ - 13, - 14, - 12, 15, - 11, 16, - 10, 17, 18, 19, + 14, 20, - 10 + 13, + 12, + 11, + 10, + 9 } }, [1005]={ @@ -1623,12 +1625,12 @@ local item = { ["icon"]="1005", ["get_way_type"]=1, ["get_way"]={ - 16, 17, 18, + 16, 19, - 15, 20, + 15, 14, 13, 12 @@ -1674,21 +1676,21 @@ local item = { ["icon"]="1008", ["get_way_type"]=2, ["get_way"]={ + 25, + 31, 19, 13, - 25, 7, - 31, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1009]={ @@ -1697,22 +1699,22 @@ local item = { ["icon"]="1009", ["get_way_type"]=2, ["get_way"]={ - 31, 37, + 43, + 31, 25, 19, - 43, 13, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -1723,22 +1725,22 @@ local item = { ["icon"]="1010", ["get_way_type"]=2, ["get_way"]={ - 43, 49, + 55, + 43, 37, 31, - 55, 25, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -1772,7 +1774,7 @@ local item = { 55, 49, 59, - 60, + 54, 53, 54 } @@ -1803,21 +1805,21 @@ local item = { ["icon"]="1020", ["get_way_type"]=2, ["get_way"]={ + 26, + 32, 20, 14, - 26, 8, - 32, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1015]={ @@ -1826,22 +1828,22 @@ local item = { ["icon"]="1021", ["get_way_type"]=2, ["get_way"]={ - 32, 38, + 44, + 32, 26, 20, - 44, 14, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -1852,22 +1854,22 @@ local item = { ["icon"]="1022", ["get_way_type"]=2, ["get_way"]={ - 44, 50, + 56, + 44, 38, 32, - 56, 26, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -1901,7 +1903,7 @@ local item = { 56, 50, 59, - 60, + 54, 53, 54 } @@ -1932,21 +1934,21 @@ local item = { ["icon"]="1014", ["get_way_type"]=2, ["get_way"]={ + 27, + 33, 21, 15, - 27, 9, - 33, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1021]={ @@ -1955,22 +1957,22 @@ local item = { ["icon"]="1015", ["get_way_type"]=2, ["get_way"]={ - 33, 39, + 45, + 33, 27, 21, - 45, 15, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -1981,22 +1983,22 @@ local item = { ["icon"]="1016", ["get_way_type"]=2, ["get_way"]={ - 45, 51, + 57, + 45, 39, 33, - 57, 27, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -2030,7 +2032,7 @@ local item = { 57, 51, 59, - 60, + 54, 53, 54 } @@ -2061,21 +2063,21 @@ local item = { ["icon"]="1026", ["get_way_type"]=2, ["get_way"]={ + 28, + 34, 22, 16, - 28, 10, - 34, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1027]={ @@ -2084,22 +2086,22 @@ local item = { ["icon"]="1027", ["get_way_type"]=2, ["get_way"]={ - 34, 40, + 46, + 34, 28, 22, - 46, 16, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -2110,22 +2112,22 @@ local item = { ["icon"]="1028", ["get_way_type"]=2, ["get_way"]={ - 46, 52, + 58, + 46, 40, 34, - 58, 28, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -2159,7 +2161,7 @@ local item = { 58, 52, 59, - 60, + 54, 53, 54 } @@ -2367,9 +2369,15 @@ local item = { ["parameter"]=5400101, ["qlt"]=4, ["icon"]="5400101" + }, + [1400101]={ + ["type"]=12, + ["parameter"]=1400101, + ["qlt"]=3, + ["icon"]="1400101" } } local config = { -data=item,count=111 +data=item,count=112 } 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 14170d5c..b5621ba9 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -448,6 +448,24 @@ local LocalizationGlobalConst = ACT_DESC_12 = "ACT_DESC_12", ARENA_DESC_35 = "ARENA_DESC_35", ARENA_DESC_36 = "ARENA_DESC_36", + ONE_KEY_GET_DESC = "ONE_KEY_GET_DESC", + ACTIVITY_OVER_EDSC = "ACTIVITY_OVER_EDSC", + PART_IN_DESC = "PART_IN_DESC", + HERO_FUND_DESCC_1 = "HERO_FUND_DESCC_1", + HERO_FUND_DESCC_2 = "HERO_FUND_DESCC_2", + HERO_FUND_DESCC_3 = "HERO_FUND_DESCC_3", + HERO_FUND_DESCC_4 = "HERO_FUND_DESCC_4", + ARENA_DESC_37 = "ARENA_DESC_37", + ARENA_DESC_38 = "ARENA_DESC_38", + ARENA_DESC_39 = "ARENA_DESC_39", + 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", + SEIZED_DESC_1 = "SEIZED_DESC_1", + SEIZED_DESC_2 = "SEIZED_DESC_2", + SEIZED_DESC_3 = "SEIZED_DESC_3", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_armor.lua b/lua/app/config/monster_dungeon_armor.lua index e0257238..a03b03d4 100644 --- a/lua/app/config/monster_dungeon_armor.lua +++ b/lua/app/config/monster_dungeon_armor.lua @@ -1,7 +1,7 @@ local monster_dungeon_armor = { [107]={ ["monster_base"]=10022, - ["hp"]=76340000, + ["hp"]=80820000, ["atk"]=1760000, ["atk_times"]=3, ["hurt_skill"]={ @@ -13,7 +13,7 @@ local monster_dungeon_armor = { }, [207]={ ["monster_base"]=10043, - ["hp"]=113830000, + ["hp"]=120870000, ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ @@ -25,7 +25,7 @@ local monster_dungeon_armor = { }, [307]={ ["monster_base"]=10033, - ["hp"]=142400000, + ["hp"]=151840000, ["atk"]=2050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -37,7 +37,7 @@ local monster_dungeon_armor = { }, [407]={ ["monster_base"]=10048, - ["hp"]=150430000, + ["hp"]=159840000, ["atk"]=2450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -50,7 +50,7 @@ local monster_dungeon_armor = { [507]={ ["monster_base"]=20004, ["is_boss"]=1, - ["hp"]=290940000, + ["hp"]=327720000, ["atk"]=2640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -65,7 +65,7 @@ local monster_dungeon_armor = { }, [607]={ ["monster_base"]=10051, - ["hp"]=185400000, + ["hp"]=197100000, ["atk"]=2550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -77,7 +77,7 @@ local monster_dungeon_armor = { }, [707]={ ["monster_base"]=10046, - ["hp"]=203090000, + ["hp"]=228520000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -89,7 +89,7 @@ local monster_dungeon_armor = { }, [807]={ ["monster_base"]=10003, - ["hp"]=237710000, + ["hp"]=268050000, ["atk"]=2600000, ["atk_times"]=2, ["hurt_skill"]={ @@ -101,7 +101,7 @@ local monster_dungeon_armor = { }, [907]={ ["monster_base"]=10058, - ["hp"]=273290000, + ["hp"]=307200000, ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -114,7 +114,7 @@ local monster_dungeon_armor = { [1007]={ ["monster_base"]=20012, ["is_boss"]=2, - ["hp"]=494490000, + ["hp"]=521500000, ["atk"]=2740000, ["atk_times"]=4, ["hurt_skill"]={ @@ -129,7 +129,7 @@ local monster_dungeon_armor = { }, [1107]={ ["monster_base"]=10017, - ["hp"]=76340000, + ["hp"]=80820000, ["atk"]=1760000, ["atk_times"]=3, ["hurt_skill"]={ @@ -141,7 +141,7 @@ local monster_dungeon_armor = { }, [1207]={ ["monster_base"]=10009, - ["hp"]=113830000, + ["hp"]=120870000, ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ @@ -153,7 +153,7 @@ local monster_dungeon_armor = { }, [1307]={ ["monster_base"]=10019, - ["hp"]=142400000, + ["hp"]=151840000, ["atk"]=2050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -165,7 +165,7 @@ local monster_dungeon_armor = { }, [1407]={ ["monster_base"]=10039, - ["hp"]=150430000, + ["hp"]=159840000, ["atk"]=2450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -178,7 +178,7 @@ local monster_dungeon_armor = { [1507]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=290940000, + ["hp"]=327720000, ["atk"]=2640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -196,7 +196,7 @@ local monster_dungeon_armor = { }, [1607]={ ["monster_base"]=10048, - ["hp"]=185400000, + ["hp"]=197100000, ["atk"]=2550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -208,7 +208,7 @@ local monster_dungeon_armor = { }, [1707]={ ["monster_base"]=10017, - ["hp"]=203090000, + ["hp"]=228520000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -220,7 +220,7 @@ local monster_dungeon_armor = { }, [1807]={ ["monster_base"]=10009, - ["hp"]=237710000, + ["hp"]=268050000, ["atk"]=2600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -232,7 +232,7 @@ local monster_dungeon_armor = { }, [1907]={ ["monster_base"]=10039, - ["hp"]=273290000, + ["hp"]=307200000, ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -245,7 +245,7 @@ local monster_dungeon_armor = { [2007]={ ["monster_base"]=20011, ["is_boss"]=2, - ["hp"]=494490000, + ["hp"]=521500000, ["atk"]=2740000, ["atk_times"]=4, ["hurt_skill"]={ @@ -260,7 +260,7 @@ local monster_dungeon_armor = { }, [2107]={ ["monster_base"]=10046, - ["hp"]=76340000, + ["hp"]=80820000, ["atk"]=1760000, ["atk_times"]=3, ["hurt_skill"]={ @@ -272,7 +272,7 @@ local monster_dungeon_armor = { }, [2207]={ ["monster_base"]=10005, - ["hp"]=113830000, + ["hp"]=120870000, ["atk"]=1970000, ["atk_times"]=2, ["hurt_skill"]={ @@ -284,7 +284,7 @@ local monster_dungeon_armor = { }, [2307]={ ["monster_base"]=10044, - ["hp"]=142400000, + ["hp"]=151840000, ["atk"]=2050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -296,7 +296,7 @@ local monster_dungeon_armor = { }, [2407]={ ["monster_base"]=10052, - ["hp"]=150430000, + ["hp"]=159840000, ["atk"]=2450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -309,7 +309,7 @@ local monster_dungeon_armor = { [2507]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=290940000, + ["hp"]=327720000, ["atk"]=2640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -324,7 +324,7 @@ local monster_dungeon_armor = { }, [2607]={ ["monster_base"]=10060, - ["hp"]=185400000, + ["hp"]=197100000, ["atk"]=2550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -336,7 +336,7 @@ local monster_dungeon_armor = { }, [2707]={ ["monster_base"]=10051, - ["hp"]=203090000, + ["hp"]=228520000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -348,7 +348,7 @@ local monster_dungeon_armor = { }, [2807]={ ["monster_base"]=10036, - ["hp"]=237710000, + ["hp"]=268050000, ["atk"]=2600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -360,7 +360,7 @@ local monster_dungeon_armor = { }, [2907]={ ["monster_base"]=10029, - ["hp"]=273290000, + ["hp"]=307200000, ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -373,7 +373,7 @@ local monster_dungeon_armor = { [3007]={ ["monster_base"]=20029, ["is_boss"]=2, - ["hp"]=494490000, + ["hp"]=521500000, ["atk"]=2740000, ["atk_times"]=4, ["hurt_skill"]={ @@ -388,7 +388,7 @@ local monster_dungeon_armor = { }, [3107]={ ["monster_base"]=10029, - ["hp"]=76340000, + ["hp"]=80820000, ["atk"]=1760000, ["atk_times"]=3, ["hurt_skill"]={ @@ -400,7 +400,7 @@ local monster_dungeon_armor = { }, [3207]={ ["monster_base"]=10061, - ["hp"]=113830000, + ["hp"]=120870000, ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ @@ -412,7 +412,7 @@ local monster_dungeon_armor = { }, [3307]={ ["monster_base"]=10041, - ["hp"]=142400000, + ["hp"]=151840000, ["atk"]=2050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -424,7 +424,7 @@ local monster_dungeon_armor = { }, [3407]={ ["monster_base"]=10020, - ["hp"]=150430000, + ["hp"]=159840000, ["atk"]=2450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -437,7 +437,7 @@ local monster_dungeon_armor = { [3507]={ ["monster_base"]=20002, ["is_boss"]=1, - ["hp"]=290940000, + ["hp"]=327720000, ["atk"]=2640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -452,7 +452,7 @@ local monster_dungeon_armor = { }, [3607]={ ["monster_base"]=10035, - ["hp"]=185400000, + ["hp"]=197100000, ["atk"]=2550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -464,7 +464,7 @@ local monster_dungeon_armor = { }, [3707]={ ["monster_base"]=10018, - ["hp"]=203090000, + ["hp"]=228520000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -476,7 +476,7 @@ local monster_dungeon_armor = { }, [3807]={ ["monster_base"]=10049, - ["hp"]=237710000, + ["hp"]=268050000, ["atk"]=2600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -488,7 +488,7 @@ local monster_dungeon_armor = { }, [3907]={ ["monster_base"]=10014, - ["hp"]=273290000, + ["hp"]=307200000, ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -501,7 +501,7 @@ local monster_dungeon_armor = { [4007]={ ["monster_base"]=20023, ["is_boss"]=2, - ["hp"]=494490000, + ["hp"]=521500000, ["atk"]=2740000, ["atk_times"]=4, ["hurt_skill"]={ @@ -519,7 +519,7 @@ local monster_dungeon_armor = { }, [4107]={ ["monster_base"]=10004, - ["hp"]=76340000, + ["hp"]=80820000, ["atk"]=1760000, ["atk_times"]=2, ["hurt_skill"]={ @@ -531,7 +531,7 @@ local monster_dungeon_armor = { }, [4207]={ ["monster_base"]=10055, - ["hp"]=113830000, + ["hp"]=120870000, ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ @@ -543,7 +543,7 @@ local monster_dungeon_armor = { }, [4307]={ ["monster_base"]=10010, - ["hp"]=142400000, + ["hp"]=151840000, ["atk"]=2050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -555,7 +555,7 @@ local monster_dungeon_armor = { }, [4407]={ ["monster_base"]=10015, - ["hp"]=150430000, + ["hp"]=159840000, ["atk"]=2450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -568,7 +568,7 @@ local monster_dungeon_armor = { [4507]={ ["monster_base"]=20007, ["is_boss"]=1, - ["hp"]=290940000, + ["hp"]=327720000, ["atk"]=2640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -586,7 +586,7 @@ local monster_dungeon_armor = { }, [4607]={ ["monster_base"]=10031, - ["hp"]=185400000, + ["hp"]=197100000, ["atk"]=2550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -598,7 +598,7 @@ local monster_dungeon_armor = { }, [4707]={ ["monster_base"]=10038, - ["hp"]=203090000, + ["hp"]=228520000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -610,7 +610,7 @@ local monster_dungeon_armor = { }, [4807]={ ["monster_base"]=10025, - ["hp"]=237710000, + ["hp"]=268050000, ["atk"]=2600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -622,7 +622,7 @@ local monster_dungeon_armor = { }, [4907]={ ["monster_base"]=10007, - ["hp"]=273290000, + ["hp"]=307200000, ["atk"]=2740000, ["atk_times"]=2, ["hurt_skill"]={ @@ -635,7 +635,7 @@ local monster_dungeon_armor = { [5007]={ ["monster_base"]=20025, ["is_boss"]=2, - ["hp"]=494490000, + ["hp"]=521500000, ["atk"]=2740000, ["atk_times"]=4, ["hurt_skill"]={ @@ -653,7 +653,7 @@ local monster_dungeon_armor = { }, [5107]={ ["monster_base"]=10049, - ["hp"]=76340000, + ["hp"]=80820000, ["atk"]=1760000, ["atk_times"]=3, ["hurt_skill"]={ @@ -665,7 +665,7 @@ local monster_dungeon_armor = { }, [5207]={ ["monster_base"]=10008, - ["hp"]=113830000, + ["hp"]=120870000, ["atk"]=1970000, ["atk_times"]=2, ["hurt_skill"]={ @@ -677,7 +677,7 @@ local monster_dungeon_armor = { }, [5307]={ ["monster_base"]=10050, - ["hp"]=142400000, + ["hp"]=151840000, ["atk"]=2050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -689,7 +689,7 @@ local monster_dungeon_armor = { }, [5407]={ ["monster_base"]=10051, - ["hp"]=150430000, + ["hp"]=159840000, ["atk"]=2450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -702,7 +702,7 @@ local monster_dungeon_armor = { [5507]={ ["monster_base"]=20001, ["is_boss"]=1, - ["hp"]=290940000, + ["hp"]=327720000, ["atk"]=2640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -717,7 +717,7 @@ local monster_dungeon_armor = { }, [5607]={ ["monster_base"]=10036, - ["hp"]=185400000, + ["hp"]=197100000, ["atk"]=2550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -729,7 +729,7 @@ local monster_dungeon_armor = { }, [5707]={ ["monster_base"]=10030, - ["hp"]=203090000, + ["hp"]=228520000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -741,7 +741,7 @@ local monster_dungeon_armor = { }, [5807]={ ["monster_base"]=10055, - ["hp"]=237710000, + ["hp"]=268050000, ["atk"]=2600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -753,7 +753,7 @@ local monster_dungeon_armor = { }, [5907]={ ["monster_base"]=10062, - ["hp"]=273290000, + ["hp"]=307200000, ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -766,7 +766,7 @@ local monster_dungeon_armor = { [6007]={ ["monster_base"]=20005, ["is_boss"]=2, - ["hp"]=494490000, + ["hp"]=521500000, ["atk"]=2740000, ["atk_times"]=4, ["hurt_skill"]={ @@ -784,8 +784,8 @@ local monster_dungeon_armor = { }, [6107]={ ["monster_base"]=10054, - ["hp"]=97940000, - ["atk"]=1910000, + ["hp"]=90100000, + ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -796,8 +796,8 @@ local monster_dungeon_armor = { }, [6207]={ ["monster_base"]=10007, - ["hp"]=145130000, - ["atk"]=2150000, + ["hp"]=134930000, + ["atk"]=2210000, ["atk_times"]=2, ["hurt_skill"]={ 20019, @@ -808,8 +808,8 @@ local monster_dungeon_armor = { }, [6307]={ ["monster_base"]=10035, - ["hp"]=181680000, - ["atk"]=2220000, + ["hp"]=169110000, + ["atk"]=2290000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -820,8 +820,8 @@ local monster_dungeon_armor = { }, [6407]={ ["monster_base"]=10037, - ["hp"]=191500000, - ["atk"]=2660000, + ["hp"]=177990000, + ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -833,8 +833,8 @@ local monster_dungeon_armor = { [6507]={ ["monster_base"]=20011, ["is_boss"]=1, - ["hp"]=356570000, - ["atk"]=2870000, + ["hp"]=366790000, + ["atk"]=2950000, ["atk_times"]=4, ["hurt_skill"]={ 30031, @@ -848,8 +848,8 @@ local monster_dungeon_armor = { }, [6607]={ ["monster_base"]=10004, - ["hp"]=236460000, - ["atk"]=2770000, + ["hp"]=219850000, + ["atk"]=2860000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -860,8 +860,8 @@ local monster_dungeon_armor = { }, [6707]={ ["monster_base"]=10060, - ["hp"]=248810000, - ["atk"]=2870000, + ["hp"]=254340000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20175, @@ -872,8 +872,8 @@ local monster_dungeon_armor = { }, [6807]={ ["monster_base"]=10036, - ["hp"]=291690000, - ["atk"]=2820000, + ["hp"]=298960000, + ["atk"]=2910000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -884,8 +884,8 @@ local monster_dungeon_armor = { }, [6907]={ ["monster_base"]=10057, - ["hp"]=335220000, - ["atk"]=2980000, + ["hp"]=342680000, + ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -897,8 +897,8 @@ local monster_dungeon_armor = { [7007]={ ["monster_base"]=20017, ["is_boss"]=2, - ["hp"]=566760000, - ["atk"]=2980000, + ["hp"]=580750000, + ["atk"]=3070000, ["atk_times"]=4, ["hurt_skill"]={ 30049, @@ -912,8 +912,8 @@ local monster_dungeon_armor = { }, [7107]={ ["monster_base"]=10045, - ["hp"]=97940000, - ["atk"]=1910000, + ["hp"]=90100000, + ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -924,8 +924,8 @@ local monster_dungeon_armor = { }, [7207]={ ["monster_base"]=10015, - ["hp"]=145130000, - ["atk"]=2150000, + ["hp"]=134930000, + ["atk"]=2210000, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -936,8 +936,8 @@ local monster_dungeon_armor = { }, [7307]={ ["monster_base"]=10025, - ["hp"]=181680000, - ["atk"]=2220000, + ["hp"]=169110000, + ["atk"]=2290000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -948,8 +948,8 @@ local monster_dungeon_armor = { }, [7407]={ ["monster_base"]=10035, - ["hp"]=191500000, - ["atk"]=2660000, + ["hp"]=177990000, + ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -961,8 +961,8 @@ local monster_dungeon_armor = { [7507]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=356570000, - ["atk"]=2870000, + ["hp"]=366790000, + ["atk"]=2950000, ["atk_times"]=4, ["hurt_skill"]={ 30040, @@ -976,8 +976,8 @@ local monster_dungeon_armor = { }, [7607]={ ["monster_base"]=10040, - ["hp"]=236460000, - ["atk"]=2770000, + ["hp"]=219850000, + ["atk"]=2860000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -988,8 +988,8 @@ local monster_dungeon_armor = { }, [7707]={ ["monster_base"]=10002, - ["hp"]=248810000, - ["atk"]=2870000, + ["hp"]=254340000, + ["atk"]=2950000, ["atk_times"]=2, ["hurt_skill"]={ 20004, @@ -1000,8 +1000,8 @@ local monster_dungeon_armor = { }, [7807]={ ["monster_base"]=10047, - ["hp"]=291690000, - ["atk"]=2820000, + ["hp"]=298960000, + ["atk"]=2910000, ["atk_times"]=3, ["hurt_skill"]={ 20136, @@ -1012,8 +1012,8 @@ local monster_dungeon_armor = { }, [7907]={ ["monster_base"]=10034, - ["hp"]=335220000, - ["atk"]=2980000, + ["hp"]=342680000, + ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -1025,8 +1025,8 @@ local monster_dungeon_armor = { [8007]={ ["monster_base"]=30014, ["is_boss"]=2, - ["hp"]=566760000, - ["atk"]=2980000, + ["hp"]=580750000, + ["atk"]=3070000, ["atk_times"]=4, ["hurt_skill"]={ 40009, @@ -1041,8 +1041,8 @@ local monster_dungeon_armor = { }, [8107]={ ["monster_base"]=10005, - ["hp"]=97940000, - ["atk"]=1910000, + ["hp"]=90100000, + ["atk"]=1970000, ["atk_times"]=2, ["hurt_skill"]={ 20013, @@ -1053,8 +1053,8 @@ local monster_dungeon_armor = { }, [8207]={ ["monster_base"]=10037, - ["hp"]=145130000, - ["atk"]=2150000, + ["hp"]=134930000, + ["atk"]=2210000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -1065,8 +1065,8 @@ local monster_dungeon_armor = { }, [8307]={ ["monster_base"]=10022, - ["hp"]=181680000, - ["atk"]=2220000, + ["hp"]=169110000, + ["atk"]=2290000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -1077,8 +1077,8 @@ local monster_dungeon_armor = { }, [8407]={ ["monster_base"]=10012, - ["hp"]=191500000, - ["atk"]=2660000, + ["hp"]=177990000, + ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -1090,8 +1090,8 @@ local monster_dungeon_armor = { [8507]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=356570000, - ["atk"]=2870000, + ["hp"]=366790000, + ["atk"]=2950000, ["atk_times"]=4, ["hurt_skill"]={ 30022, @@ -1108,8 +1108,8 @@ local monster_dungeon_armor = { }, [8607]={ ["monster_base"]=10029, - ["hp"]=236460000, - ["atk"]=2770000, + ["hp"]=219850000, + ["atk"]=2860000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -1120,8 +1120,8 @@ local monster_dungeon_armor = { }, [8707]={ ["monster_base"]=10030, - ["hp"]=248810000, - ["atk"]=2870000, + ["hp"]=254340000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -1132,8 +1132,8 @@ local monster_dungeon_armor = { }, [8807]={ ["monster_base"]=10021, - ["hp"]=291690000, - ["atk"]=2820000, + ["hp"]=298960000, + ["atk"]=2910000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -1144,8 +1144,8 @@ local monster_dungeon_armor = { }, [8907]={ ["monster_base"]=10024, - ["hp"]=335220000, - ["atk"]=2980000, + ["hp"]=342680000, + ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -1157,8 +1157,8 @@ local monster_dungeon_armor = { [9007]={ ["monster_base"]=30012, ["is_boss"]=2, - ["hp"]=566760000, - ["atk"]=2980000, + ["hp"]=580750000, + ["atk"]=3070000, ["atk_times"]=4, ["hurt_skill"]={ 40005, @@ -1174,8 +1174,8 @@ local monster_dungeon_armor = { }, [9107]={ ["monster_base"]=10039, - ["hp"]=97940000, - ["atk"]=1910000, + ["hp"]=90100000, + ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ 20112, @@ -1186,8 +1186,8 @@ local monster_dungeon_armor = { }, [9207]={ ["monster_base"]=10061, - ["hp"]=145130000, - ["atk"]=2150000, + ["hp"]=134930000, + ["atk"]=2210000, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -1198,8 +1198,8 @@ local monster_dungeon_armor = { }, [9307]={ ["monster_base"]=10048, - ["hp"]=181680000, - ["atk"]=2220000, + ["hp"]=169110000, + ["atk"]=2290000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -1210,8 +1210,8 @@ local monster_dungeon_armor = { }, [9407]={ ["monster_base"]=10027, - ["hp"]=191500000, - ["atk"]=2660000, + ["hp"]=177990000, + ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -1223,8 +1223,8 @@ local monster_dungeon_armor = { [9507]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=356570000, - ["atk"]=2870000, + ["hp"]=366790000, + ["atk"]=2950000, ["atk_times"]=4, ["hurt_skill"]={ 30016, @@ -1241,8 +1241,8 @@ local monster_dungeon_armor = { }, [9607]={ ["monster_base"]=10031, - ["hp"]=236460000, - ["atk"]=2770000, + ["hp"]=219850000, + ["atk"]=2860000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -1253,8 +1253,8 @@ local monster_dungeon_armor = { }, [9707]={ ["monster_base"]=10041, - ["hp"]=248810000, - ["atk"]=2870000, + ["hp"]=254340000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -1265,8 +1265,8 @@ local monster_dungeon_armor = { }, [9807]={ ["monster_base"]=10040, - ["hp"]=291690000, - ["atk"]=2820000, + ["hp"]=298960000, + ["atk"]=2910000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -1277,8 +1277,8 @@ local monster_dungeon_armor = { }, [9907]={ ["monster_base"]=10017, - ["hp"]=335220000, - ["atk"]=2980000, + ["hp"]=342680000, + ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -1290,8 +1290,8 @@ local monster_dungeon_armor = { [10007]={ ["monster_base"]=20021, ["is_boss"]=2, - ["hp"]=566760000, - ["atk"]=2980000, + ["hp"]=580750000, + ["atk"]=3070000, ["atk_times"]=4, ["hurt_skill"]={ 30061, @@ -1309,8 +1309,8 @@ local monster_dungeon_armor = { }, [10107]={ ["monster_base"]=10039, - ["hp"]=97940000, - ["atk"]=1910000, + ["hp"]=90100000, + ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ 20112, @@ -1321,8 +1321,8 @@ local monster_dungeon_armor = { }, [10207]={ ["monster_base"]=10053, - ["hp"]=145130000, - ["atk"]=2150000, + ["hp"]=134930000, + ["atk"]=2210000, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -1333,8 +1333,8 @@ local monster_dungeon_armor = { }, [10307]={ ["monster_base"]=10002, - ["hp"]=181680000, - ["atk"]=2220000, + ["hp"]=169110000, + ["atk"]=2290000, ["atk_times"]=2, ["hurt_skill"]={ 20004, @@ -1345,8 +1345,8 @@ local monster_dungeon_armor = { }, [10407]={ ["monster_base"]=10063, - ["hp"]=191500000, - ["atk"]=2660000, + ["hp"]=177990000, + ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -1358,8 +1358,8 @@ local monster_dungeon_armor = { [10507]={ ["monster_base"]=20016, ["is_boss"]=1, - ["hp"]=356570000, - ["atk"]=2870000, + ["hp"]=366790000, + ["atk"]=2950000, ["atk_times"]=4, ["hurt_skill"]={ 30046, @@ -1377,8 +1377,8 @@ local monster_dungeon_armor = { }, [10607]={ ["monster_base"]=10061, - ["hp"]=236460000, - ["atk"]=2770000, + ["hp"]=219850000, + ["atk"]=2860000, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -1389,8 +1389,8 @@ local monster_dungeon_armor = { }, [10707]={ ["monster_base"]=10050, - ["hp"]=248810000, - ["atk"]=2870000, + ["hp"]=254340000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20145, @@ -1401,8 +1401,8 @@ local monster_dungeon_armor = { }, [10807]={ ["monster_base"]=10033, - ["hp"]=291690000, - ["atk"]=2820000, + ["hp"]=298960000, + ["atk"]=2910000, ["atk_times"]=3, ["hurt_skill"]={ 20094, @@ -1413,8 +1413,8 @@ local monster_dungeon_armor = { }, [10907]={ ["monster_base"]=10057, - ["hp"]=335220000, - ["atk"]=2980000, + ["hp"]=342680000, + ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -1426,8 +1426,8 @@ local monster_dungeon_armor = { [11007]={ ["monster_base"]=30020, ["is_boss"]=2, - ["hp"]=566760000, - ["atk"]=2980000, + ["hp"]=580750000, + ["atk"]=3070000, ["atk_times"]=4, ["hurt_skill"]={ 40033, @@ -1442,8 +1442,8 @@ local monster_dungeon_armor = { }, [11107]={ ["monster_base"]=10034, - ["hp"]=97940000, - ["atk"]=1910000, + ["hp"]=90100000, + ["atk"]=1970000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -1454,8 +1454,8 @@ local monster_dungeon_armor = { }, [11207]={ ["monster_base"]=10056, - ["hp"]=145130000, - ["atk"]=2150000, + ["hp"]=134930000, + ["atk"]=2210000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -1466,8 +1466,8 @@ local monster_dungeon_armor = { }, [11307]={ ["monster_base"]=10037, - ["hp"]=181680000, - ["atk"]=2220000, + ["hp"]=169110000, + ["atk"]=2290000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -1478,8 +1478,8 @@ local monster_dungeon_armor = { }, [11407]={ ["monster_base"]=10042, - ["hp"]=191500000, - ["atk"]=2660000, + ["hp"]=177990000, + ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -1491,8 +1491,8 @@ local monster_dungeon_armor = { [11507]={ ["monster_base"]=30010, ["is_boss"]=1, - ["hp"]=356570000, - ["atk"]=2870000, + ["hp"]=366790000, + ["atk"]=2950000, ["atk_times"]=4, ["hurt_skill"]={ 40013, @@ -1507,8 +1507,8 @@ local monster_dungeon_armor = { }, [11607]={ ["monster_base"]=10062, - ["hp"]=236460000, - ["atk"]=2770000, + ["hp"]=219850000, + ["atk"]=2860000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -1519,8 +1519,8 @@ local monster_dungeon_armor = { }, [11707]={ ["monster_base"]=10042, - ["hp"]=248810000, - ["atk"]=2870000, + ["hp"]=254340000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -1531,8 +1531,8 @@ local monster_dungeon_armor = { }, [11807]={ ["monster_base"]=10008, - ["hp"]=291690000, - ["atk"]=2820000, + ["hp"]=298960000, + ["atk"]=2910000, ["atk_times"]=2, ["hurt_skill"]={ 20022, @@ -1543,8 +1543,8 @@ local monster_dungeon_armor = { }, [11907]={ ["monster_base"]=10023, - ["hp"]=335220000, - ["atk"]=2980000, + ["hp"]=342680000, + ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -1556,8 +1556,8 @@ local monster_dungeon_armor = { [12007]={ ["monster_base"]=20003, ["is_boss"]=2, - ["hp"]=566760000, - ["atk"]=2980000, + ["hp"]=580750000, + ["atk"]=3070000, ["atk_times"]=4, ["hurt_skill"]={ 30007, @@ -1574,8 +1574,8 @@ local monster_dungeon_armor = { }, [12107]={ ["monster_base"]=10062, - ["hp"]=132190000, - ["atk"]=2500000, + ["hp"]=119130000, + ["atk"]=2650000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -1586,8 +1586,8 @@ local monster_dungeon_armor = { }, [12207]={ ["monster_base"]=10008, - ["hp"]=194920000, - ["atk"]=2770000, + ["hp"]=178560000, + ["atk"]=2940000, ["atk_times"]=2, ["hurt_skill"]={ 20022, @@ -1598,8 +1598,8 @@ local monster_dungeon_armor = { }, [12307]={ ["monster_base"]=10065, - ["hp"]=243300000, - ["atk"]=2900000, + ["hp"]=223610000, + ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -1610,8 +1610,8 @@ local monster_dungeon_armor = { }, [12407]={ ["monster_base"]=10013, - ["hp"]=255540000, - ["atk"]=3450000, + ["hp"]=235300000, + ["atk"]=3660000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -1623,8 +1623,8 @@ local monster_dungeon_armor = { [12507]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=475340000, - ["atk"]=3690000, + ["hp"]=484620000, + ["atk"]=3910000, ["atk_times"]=4, ["hurt_skill"]={ 30040, @@ -1638,8 +1638,8 @@ local monster_dungeon_armor = { }, [12607]={ ["monster_base"]=10020, - ["hp"]=316140000, - ["atk"]=3590000, + ["hp"]=290650000, + ["atk"]=3800000, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -1650,8 +1650,8 @@ local monster_dungeon_armor = { }, [12707]={ ["monster_base"]=10047, - ["hp"]=332120000, - ["atk"]=3710000, + ["hp"]=336630000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20136, @@ -1662,8 +1662,8 @@ local monster_dungeon_armor = { }, [12807]={ ["monster_base"]=10065, - ["hp"]=389430000, - ["atk"]=3660000, + ["hp"]=395270000, + ["atk"]=3880000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -1674,8 +1674,8 @@ local monster_dungeon_armor = { }, [12907]={ ["monster_base"]=10063, - ["hp"]=447180000, - ["atk"]=3870000, + ["hp"]=452990000, + ["atk"]=4100000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -1687,8 +1687,8 @@ local monster_dungeon_armor = { [13007]={ ["monster_base"]=20005, ["is_boss"]=2, - ["hp"]=754850000, - ["atk"]=3870000, + ["hp"]=767450000, + ["atk"]=4100000, ["atk_times"]=4, ["hurt_skill"]={ 30013, @@ -1705,8 +1705,8 @@ local monster_dungeon_armor = { }, [13107]={ ["monster_base"]=10033, - ["hp"]=132190000, - ["atk"]=2500000, + ["hp"]=119130000, + ["atk"]=2650000, ["atk_times"]=3, ["hurt_skill"]={ 20094, @@ -1717,8 +1717,8 @@ local monster_dungeon_armor = { }, [13207]={ ["monster_base"]=10020, - ["hp"]=194920000, - ["atk"]=2770000, + ["hp"]=178560000, + ["atk"]=2940000, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -1729,8 +1729,8 @@ local monster_dungeon_armor = { }, [13307]={ ["monster_base"]=10057, - ["hp"]=243300000, - ["atk"]=2900000, + ["hp"]=223610000, + ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -1741,8 +1741,8 @@ local monster_dungeon_armor = { }, [13407]={ ["monster_base"]=10006, - ["hp"]=255540000, - ["atk"]=3450000, + ["hp"]=235300000, + ["atk"]=3660000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -1754,8 +1754,8 @@ local monster_dungeon_armor = { [13507]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=475340000, - ["atk"]=3690000, + ["hp"]=484620000, + ["atk"]=3910000, ["atk_times"]=4, ["hurt_skill"]={ 30043, @@ -1772,8 +1772,8 @@ local monster_dungeon_armor = { }, [13607]={ ["monster_base"]=10048, - ["hp"]=316140000, - ["atk"]=3590000, + ["hp"]=290650000, + ["atk"]=3800000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -1784,8 +1784,8 @@ local monster_dungeon_armor = { }, [13707]={ ["monster_base"]=10020, - ["hp"]=332120000, - ["atk"]=3710000, + ["hp"]=336630000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -1796,8 +1796,8 @@ local monster_dungeon_armor = { }, [13807]={ ["monster_base"]=10041, - ["hp"]=389430000, - ["atk"]=3660000, + ["hp"]=395270000, + ["atk"]=3880000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -1808,8 +1808,8 @@ local monster_dungeon_armor = { }, [13907]={ ["monster_base"]=10006, - ["hp"]=447180000, - ["atk"]=3870000, + ["hp"]=452990000, + ["atk"]=4100000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -1821,8 +1821,8 @@ local monster_dungeon_armor = { [14007]={ ["monster_base"]=30012, ["is_boss"]=2, - ["hp"]=754850000, - ["atk"]=3870000, + ["hp"]=767450000, + ["atk"]=4100000, ["atk_times"]=4, ["hurt_skill"]={ 40005, @@ -1838,8 +1838,8 @@ local monster_dungeon_armor = { }, [14107]={ ["monster_base"]=10001, - ["hp"]=132190000, - ["atk"]=2500000, + ["hp"]=119130000, + ["atk"]=2650000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -1850,8 +1850,8 @@ local monster_dungeon_armor = { }, [14207]={ ["monster_base"]=10016, - ["hp"]=194920000, - ["atk"]=2770000, + ["hp"]=178560000, + ["atk"]=2940000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -1862,8 +1862,8 @@ local monster_dungeon_armor = { }, [14307]={ ["monster_base"]=10041, - ["hp"]=243300000, - ["atk"]=2900000, + ["hp"]=223610000, + ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -1874,8 +1874,8 @@ local monster_dungeon_armor = { }, [14407]={ ["monster_base"]=10053, - ["hp"]=255540000, - ["atk"]=3450000, + ["hp"]=235300000, + ["atk"]=3660000, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -1887,8 +1887,8 @@ local monster_dungeon_armor = { [14507]={ ["monster_base"]=20002, ["is_boss"]=1, - ["hp"]=475340000, - ["atk"]=3690000, + ["hp"]=484620000, + ["atk"]=3910000, ["atk_times"]=4, ["hurt_skill"]={ 30004, @@ -1902,8 +1902,8 @@ local monster_dungeon_armor = { }, [14607]={ ["monster_base"]=10054, - ["hp"]=316140000, - ["atk"]=3590000, + ["hp"]=290650000, + ["atk"]=3800000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -1914,8 +1914,8 @@ local monster_dungeon_armor = { }, [14707]={ ["monster_base"]=10018, - ["hp"]=332120000, - ["atk"]=3710000, + ["hp"]=336630000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -1926,8 +1926,8 @@ local monster_dungeon_armor = { }, [14807]={ ["monster_base"]=10050, - ["hp"]=389430000, - ["atk"]=3660000, + ["hp"]=395270000, + ["atk"]=3880000, ["atk_times"]=3, ["hurt_skill"]={ 20145, @@ -1938,8 +1938,8 @@ local monster_dungeon_armor = { }, [14907]={ ["monster_base"]=10041, - ["hp"]=447180000, - ["atk"]=3870000, + ["hp"]=452990000, + ["atk"]=4100000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -1951,8 +1951,8 @@ local monster_dungeon_armor = { [15007]={ ["monster_base"]=20017, ["is_boss"]=2, - ["hp"]=754850000, - ["atk"]=3870000, + ["hp"]=767450000, + ["atk"]=4100000, ["atk_times"]=4, ["hurt_skill"]={ 30049, @@ -1966,8 +1966,8 @@ local monster_dungeon_armor = { }, [15107]={ ["monster_base"]=10051, - ["hp"]=132190000, - ["atk"]=2500000, + ["hp"]=119130000, + ["atk"]=2650000, ["atk_times"]=3, ["hurt_skill"]={ 20148, @@ -1978,8 +1978,8 @@ local monster_dungeon_armor = { }, [15207]={ ["monster_base"]=10018, - ["hp"]=194920000, - ["atk"]=2770000, + ["hp"]=178560000, + ["atk"]=2940000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -1990,8 +1990,8 @@ local monster_dungeon_armor = { }, [15307]={ ["monster_base"]=10040, - ["hp"]=243300000, - ["atk"]=2900000, + ["hp"]=223610000, + ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -2002,8 +2002,8 @@ local monster_dungeon_armor = { }, [15407]={ ["monster_base"]=10032, - ["hp"]=255540000, - ["atk"]=3450000, + ["hp"]=235300000, + ["atk"]=3660000, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -2015,8 +2015,8 @@ local monster_dungeon_armor = { [15507]={ ["monster_base"]=20001, ["is_boss"]=1, - ["hp"]=475340000, - ["atk"]=3690000, + ["hp"]=484620000, + ["atk"]=3910000, ["atk_times"]=4, ["hurt_skill"]={ 30001, @@ -2030,8 +2030,8 @@ local monster_dungeon_armor = { }, [15607]={ ["monster_base"]=10041, - ["hp"]=316140000, - ["atk"]=3590000, + ["hp"]=290650000, + ["atk"]=3800000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -2042,8 +2042,8 @@ local monster_dungeon_armor = { }, [15707]={ ["monster_base"]=10053, - ["hp"]=332120000, - ["atk"]=3710000, + ["hp"]=336630000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -2054,8 +2054,8 @@ local monster_dungeon_armor = { }, [15807]={ ["monster_base"]=10024, - ["hp"]=389430000, - ["atk"]=3660000, + ["hp"]=395270000, + ["atk"]=3880000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -2066,8 +2066,8 @@ local monster_dungeon_armor = { }, [15907]={ ["monster_base"]=10038, - ["hp"]=447180000, - ["atk"]=3870000, + ["hp"]=452990000, + ["atk"]=4100000, ["atk_times"]=3, ["hurt_skill"]={ 20109, @@ -2079,8 +2079,8 @@ local monster_dungeon_armor = { [16007]={ ["monster_base"]=20016, ["is_boss"]=2, - ["hp"]=754850000, - ["atk"]=3870000, + ["hp"]=767450000, + ["atk"]=4100000, ["atk_times"]=4, ["hurt_skill"]={ 30046, @@ -2098,8 +2098,8 @@ local monster_dungeon_armor = { }, [16107]={ ["monster_base"]=10016, - ["hp"]=132190000, - ["atk"]=2500000, + ["hp"]=119130000, + ["atk"]=2650000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -2110,8 +2110,8 @@ local monster_dungeon_armor = { }, [16207]={ ["monster_base"]=10006, - ["hp"]=194920000, - ["atk"]=2770000, + ["hp"]=178560000, + ["atk"]=2940000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -2122,8 +2122,8 @@ local monster_dungeon_armor = { }, [16307]={ ["monster_base"]=10021, - ["hp"]=243300000, - ["atk"]=2900000, + ["hp"]=223610000, + ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -2134,8 +2134,8 @@ local monster_dungeon_armor = { }, [16407]={ ["monster_base"]=10018, - ["hp"]=255540000, - ["atk"]=3450000, + ["hp"]=235300000, + ["atk"]=3660000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -2147,8 +2147,8 @@ local monster_dungeon_armor = { [16507]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=475340000, - ["atk"]=3690000, + ["hp"]=484620000, + ["atk"]=3910000, ["atk_times"]=4, ["hurt_skill"]={ 30028, @@ -2168,8 +2168,8 @@ local monster_dungeon_armor = { }, [16607]={ ["monster_base"]=10052, - ["hp"]=316140000, - ["atk"]=3590000, + ["hp"]=290650000, + ["atk"]=3800000, ["atk_times"]=3, ["hurt_skill"]={ 20151, @@ -2180,8 +2180,8 @@ local monster_dungeon_armor = { }, [16707]={ ["monster_base"]=10039, - ["hp"]=332120000, - ["atk"]=3710000, + ["hp"]=336630000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20112, @@ -2192,8 +2192,8 @@ local monster_dungeon_armor = { }, [16807]={ ["monster_base"]=10055, - ["hp"]=389430000, - ["atk"]=3660000, + ["hp"]=395270000, + ["atk"]=3880000, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -2204,8 +2204,8 @@ local monster_dungeon_armor = { }, [16907]={ ["monster_base"]=10031, - ["hp"]=447180000, - ["atk"]=3870000, + ["hp"]=452990000, + ["atk"]=4100000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -2217,8 +2217,8 @@ local monster_dungeon_armor = { [17007]={ ["monster_base"]=30015, ["is_boss"]=2, - ["hp"]=754850000, - ["atk"]=3870000, + ["hp"]=767450000, + ["atk"]=4100000, ["atk_times"]=4, ["hurt_skill"]={ 40025, @@ -2233,8 +2233,8 @@ local monster_dungeon_armor = { }, [17107]={ ["monster_base"]=10027, - ["hp"]=132190000, - ["atk"]=2500000, + ["hp"]=119130000, + ["atk"]=2650000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -2245,8 +2245,8 @@ local monster_dungeon_armor = { }, [17207]={ ["monster_base"]=10040, - ["hp"]=194920000, - ["atk"]=2770000, + ["hp"]=178560000, + ["atk"]=2940000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -2257,8 +2257,8 @@ local monster_dungeon_armor = { }, [17307]={ ["monster_base"]=10013, - ["hp"]=243300000, - ["atk"]=2900000, + ["hp"]=223610000, + ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -2269,8 +2269,8 @@ local monster_dungeon_armor = { }, [17407]={ ["monster_base"]=10053, - ["hp"]=255540000, - ["atk"]=3450000, + ["hp"]=235300000, + ["atk"]=3660000, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -2282,8 +2282,8 @@ local monster_dungeon_armor = { [17507]={ ["monster_base"]=30020, ["is_boss"]=1, - ["hp"]=475340000, - ["atk"]=3690000, + ["hp"]=484620000, + ["atk"]=3910000, ["atk_times"]=4, ["hurt_skill"]={ 40033, @@ -2298,8 +2298,8 @@ local monster_dungeon_armor = { }, [17607]={ ["monster_base"]=10019, - ["hp"]=316140000, - ["atk"]=3590000, + ["hp"]=290650000, + ["atk"]=3800000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -2310,8 +2310,8 @@ local monster_dungeon_armor = { }, [17707]={ ["monster_base"]=10018, - ["hp"]=332120000, - ["atk"]=3710000, + ["hp"]=336630000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -2322,8 +2322,8 @@ local monster_dungeon_armor = { }, [17807]={ ["monster_base"]=10013, - ["hp"]=389430000, - ["atk"]=3660000, + ["hp"]=395270000, + ["atk"]=3880000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -2334,8 +2334,8 @@ local monster_dungeon_armor = { }, [17907]={ ["monster_base"]=10023, - ["hp"]=447180000, - ["atk"]=3870000, + ["hp"]=452990000, + ["atk"]=4100000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -2347,8 +2347,8 @@ local monster_dungeon_armor = { [18007]={ ["monster_base"]=20009, ["is_boss"]=2, - ["hp"]=754850000, - ["atk"]=3870000, + ["hp"]=767450000, + ["atk"]=4100000, ["atk_times"]=4, ["hurt_skill"]={ 30025, @@ -2366,8 +2366,8 @@ local monster_dungeon_armor = { }, [18107]={ ["monster_base"]=10043, - ["hp"]=143370000, - ["atk"]=2710000, + ["hp"]=132050000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20124, @@ -2378,8 +2378,8 @@ local monster_dungeon_armor = { }, [18207]={ ["monster_base"]=10055, - ["hp"]=210680000, - ["atk"]=3000000, + ["hp"]=197820000, + ["atk"]=3280000, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -2390,8 +2390,8 @@ local monster_dungeon_armor = { }, [18307]={ ["monster_base"]=10026, - ["hp"]=263090000, - ["atk"]=3140000, + ["hp"]=247320000, + ["atk"]=3420000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -2402,8 +2402,8 @@ local monster_dungeon_armor = { }, [18407]={ ["monster_base"]=10023, - ["hp"]=276480000, - ["atk"]=3730000, + ["hp"]=260370000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -2415,8 +2415,8 @@ local monster_dungeon_armor = { [18507]={ ["monster_base"]=30009, ["is_boss"]=1, - ["hp"]=512890000, - ["atk"]=3980000, + ["hp"]=535960000, + ["atk"]=4330000, ["atk_times"]=4, ["hurt_skill"]={ 40021, @@ -2431,8 +2431,8 @@ local monster_dungeon_armor = { }, [18607]={ ["monster_base"]=10006, - ["hp"]=341420000, - ["atk"]=3870000, + ["hp"]=321500000, + ["atk"]=4220000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -2443,8 +2443,8 @@ local monster_dungeon_armor = { }, [18707]={ ["monster_base"]=10057, - ["hp"]=359010000, - ["atk"]=4000000, + ["hp"]=372390000, + ["atk"]=4360000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -2455,8 +2455,8 @@ local monster_dungeon_armor = { }, [18807]={ ["monster_base"]=10004, - ["hp"]=420800000, - ["atk"]=3960000, + ["hp"]=437410000, + ["atk"]=4310000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -2467,8 +2467,8 @@ local monster_dungeon_armor = { }, [18907]={ ["monster_base"]=10048, - ["hp"]=483170000, - ["atk"]=4170000, + ["hp"]=500850000, + ["atk"]=4550000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -2480,8 +2480,8 @@ local monster_dungeon_armor = { [19007]={ ["monster_base"]=20010, ["is_boss"]=2, - ["hp"]=814970000, - ["atk"]=4170000, + ["hp"]=848720000, + ["atk"]=4550000, ["atk_times"]=4, ["hurt_skill"]={ 30028, @@ -2501,8 +2501,8 @@ local monster_dungeon_armor = { }, [19107]={ ["monster_base"]=10010, - ["hp"]=143370000, - ["atk"]=2710000, + ["hp"]=132050000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20028, @@ -2513,8 +2513,8 @@ local monster_dungeon_armor = { }, [19207]={ ["monster_base"]=10057, - ["hp"]=210680000, - ["atk"]=3000000, + ["hp"]=197820000, + ["atk"]=3280000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -2525,8 +2525,8 @@ local monster_dungeon_armor = { }, [19307]={ ["monster_base"]=10045, - ["hp"]=263090000, - ["atk"]=3140000, + ["hp"]=247320000, + ["atk"]=3420000, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -2537,8 +2537,8 @@ local monster_dungeon_armor = { }, [19407]={ ["monster_base"]=10032, - ["hp"]=276480000, - ["atk"]=3730000, + ["hp"]=260370000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -2550,8 +2550,8 @@ local monster_dungeon_armor = { [19507]={ ["monster_base"]=20017, ["is_boss"]=1, - ["hp"]=512890000, - ["atk"]=3980000, + ["hp"]=535960000, + ["atk"]=4330000, ["atk_times"]=4, ["hurt_skill"]={ 30049, @@ -2565,8 +2565,8 @@ local monster_dungeon_armor = { }, [19607]={ ["monster_base"]=10010, - ["hp"]=341420000, - ["atk"]=3870000, + ["hp"]=321500000, + ["atk"]=4220000, ["atk_times"]=3, ["hurt_skill"]={ 20028, @@ -2577,8 +2577,8 @@ local monster_dungeon_armor = { }, [19707]={ ["monster_base"]=10029, - ["hp"]=359010000, - ["atk"]=4000000, + ["hp"]=372390000, + ["atk"]=4360000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -2589,8 +2589,8 @@ local monster_dungeon_armor = { }, [19807]={ ["monster_base"]=10042, - ["hp"]=420800000, - ["atk"]=3960000, + ["hp"]=437410000, + ["atk"]=4310000, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -2601,8 +2601,8 @@ local monster_dungeon_armor = { }, [19907]={ ["monster_base"]=10007, - ["hp"]=483170000, - ["atk"]=4170000, + ["hp"]=500850000, + ["atk"]=4550000, ["atk_times"]=2, ["hurt_skill"]={ 20019, @@ -2614,8 +2614,8 @@ local monster_dungeon_armor = { [20007]={ ["monster_base"]=20019, ["is_boss"]=2, - ["hp"]=814970000, - ["atk"]=4170000, + ["hp"]=848720000, + ["atk"]=4550000, ["atk_times"]=4, ["hurt_skill"]={ 30055, @@ -2633,8 +2633,8 @@ local monster_dungeon_armor = { }, [20107]={ ["monster_base"]=10012, - ["hp"]=143370000, - ["atk"]=2710000, + ["hp"]=132050000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -2645,8 +2645,8 @@ local monster_dungeon_armor = { }, [20207]={ ["monster_base"]=10053, - ["hp"]=210680000, - ["atk"]=3000000, + ["hp"]=197820000, + ["atk"]=3280000, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -2657,8 +2657,8 @@ local monster_dungeon_armor = { }, [20307]={ ["monster_base"]=10022, - ["hp"]=263090000, - ["atk"]=3140000, + ["hp"]=247320000, + ["atk"]=3420000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -2669,8 +2669,8 @@ local monster_dungeon_armor = { }, [20407]={ ["monster_base"]=10058, - ["hp"]=276480000, - ["atk"]=3730000, + ["hp"]=260370000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20169, @@ -2682,8 +2682,8 @@ local monster_dungeon_armor = { [20507]={ ["monster_base"]=30014, ["is_boss"]=1, - ["hp"]=512890000, - ["atk"]=3980000, + ["hp"]=535960000, + ["atk"]=4330000, ["atk_times"]=4, ["hurt_skill"]={ 40009, @@ -2698,8 +2698,8 @@ local monster_dungeon_armor = { }, [20607]={ ["monster_base"]=10023, - ["hp"]=341420000, - ["atk"]=3870000, + ["hp"]=321500000, + ["atk"]=4220000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -2710,8 +2710,8 @@ local monster_dungeon_armor = { }, [20707]={ ["monster_base"]=10046, - ["hp"]=359010000, - ["atk"]=4000000, + ["hp"]=372390000, + ["atk"]=4360000, ["atk_times"]=3, ["hurt_skill"]={ 20133, @@ -2722,8 +2722,8 @@ local monster_dungeon_armor = { }, [20807]={ ["monster_base"]=10008, - ["hp"]=420800000, - ["atk"]=3960000, + ["hp"]=437410000, + ["atk"]=4310000, ["atk_times"]=2, ["hurt_skill"]={ 20022, @@ -2734,8 +2734,8 @@ local monster_dungeon_armor = { }, [20907]={ ["monster_base"]=10056, - ["hp"]=483170000, - ["atk"]=4170000, + ["hp"]=500850000, + ["atk"]=4550000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -2747,8 +2747,8 @@ local monster_dungeon_armor = { [21007]={ ["monster_base"]=20020, ["is_boss"]=2, - ["hp"]=814970000, - ["atk"]=4170000, + ["hp"]=848720000, + ["atk"]=4550000, ["atk_times"]=4, ["hurt_skill"]={ 30058, @@ -2766,8 +2766,8 @@ local monster_dungeon_armor = { }, [21107]={ ["monster_base"]=10055, - ["hp"]=143370000, - ["atk"]=2710000, + ["hp"]=132050000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -2778,8 +2778,8 @@ local monster_dungeon_armor = { }, [21207]={ ["monster_base"]=10025, - ["hp"]=210680000, - ["atk"]=3000000, + ["hp"]=197820000, + ["atk"]=3280000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -2790,8 +2790,8 @@ local monster_dungeon_armor = { }, [21307]={ ["monster_base"]=10049, - ["hp"]=263090000, - ["atk"]=3140000, + ["hp"]=247320000, + ["atk"]=3420000, ["atk_times"]=3, ["hurt_skill"]={ 20142, @@ -2802,8 +2802,8 @@ local monster_dungeon_armor = { }, [21407]={ ["monster_base"]=10051, - ["hp"]=276480000, - ["atk"]=3730000, + ["hp"]=260370000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20148, @@ -2815,8 +2815,8 @@ local monster_dungeon_armor = { [21507]={ ["monster_base"]=20017, ["is_boss"]=1, - ["hp"]=512890000, - ["atk"]=3980000, + ["hp"]=535960000, + ["atk"]=4330000, ["atk_times"]=4, ["hurt_skill"]={ 30049, @@ -2830,8 +2830,8 @@ local monster_dungeon_armor = { }, [21607]={ ["monster_base"]=10026, - ["hp"]=341420000, - ["atk"]=3870000, + ["hp"]=321500000, + ["atk"]=4220000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -2842,8 +2842,8 @@ local monster_dungeon_armor = { }, [21707]={ ["monster_base"]=10006, - ["hp"]=359010000, - ["atk"]=4000000, + ["hp"]=372390000, + ["atk"]=4360000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -2854,8 +2854,8 @@ local monster_dungeon_armor = { }, [21807]={ ["monster_base"]=10005, - ["hp"]=420800000, - ["atk"]=3960000, + ["hp"]=437410000, + ["atk"]=4310000, ["atk_times"]=2, ["hurt_skill"]={ 20013, @@ -2866,8 +2866,8 @@ local monster_dungeon_armor = { }, [21907]={ ["monster_base"]=10009, - ["hp"]=483170000, - ["atk"]=4170000, + ["hp"]=500850000, + ["atk"]=4550000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -2879,8 +2879,8 @@ local monster_dungeon_armor = { [22007]={ ["monster_base"]=20018, ["is_boss"]=2, - ["hp"]=814970000, - ["atk"]=4170000, + ["hp"]=848720000, + ["atk"]=4550000, ["atk_times"]=4, ["hurt_skill"]={ 30052, @@ -2898,8 +2898,8 @@ local monster_dungeon_armor = { }, [22107]={ ["monster_base"]=10003, - ["hp"]=143370000, - ["atk"]=2710000, + ["hp"]=132050000, + ["atk"]=2950000, ["atk_times"]=2, ["hurt_skill"]={ 20007, @@ -2910,8 +2910,8 @@ local monster_dungeon_armor = { }, [22207]={ ["monster_base"]=10026, - ["hp"]=210680000, - ["atk"]=3000000, + ["hp"]=197820000, + ["atk"]=3280000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -2922,8 +2922,8 @@ local monster_dungeon_armor = { }, [22307]={ ["monster_base"]=10049, - ["hp"]=263090000, - ["atk"]=3140000, + ["hp"]=247320000, + ["atk"]=3420000, ["atk_times"]=3, ["hurt_skill"]={ 20142, @@ -2934,8 +2934,8 @@ local monster_dungeon_armor = { }, [22407]={ ["monster_base"]=10024, - ["hp"]=276480000, - ["atk"]=3730000, + ["hp"]=260370000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -2947,8 +2947,8 @@ local monster_dungeon_armor = { [22507]={ ["monster_base"]=30010, ["is_boss"]=1, - ["hp"]=512890000, - ["atk"]=3980000, + ["hp"]=535960000, + ["atk"]=4330000, ["atk_times"]=4, ["hurt_skill"]={ 40013, @@ -2963,8 +2963,8 @@ local monster_dungeon_armor = { }, [22607]={ ["monster_base"]=10048, - ["hp"]=341420000, - ["atk"]=3870000, + ["hp"]=321500000, + ["atk"]=4220000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -2975,8 +2975,8 @@ local monster_dungeon_armor = { }, [22707]={ ["monster_base"]=10004, - ["hp"]=359010000, - ["atk"]=4000000, + ["hp"]=372390000, + ["atk"]=4360000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -2987,8 +2987,8 @@ local monster_dungeon_armor = { }, [22807]={ ["monster_base"]=10014, - ["hp"]=420800000, - ["atk"]=3960000, + ["hp"]=437410000, + ["atk"]=4310000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -2999,8 +2999,8 @@ local monster_dungeon_armor = { }, [22907]={ ["monster_base"]=10055, - ["hp"]=483170000, - ["atk"]=4170000, + ["hp"]=500850000, + ["atk"]=4550000, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -3012,8 +3012,8 @@ local monster_dungeon_armor = { [23007]={ ["monster_base"]=20013, ["is_boss"]=2, - ["hp"]=814970000, - ["atk"]=4170000, + ["hp"]=848720000, + ["atk"]=4550000, ["atk_times"]=4, ["hurt_skill"]={ 30037, @@ -3028,8 +3028,8 @@ local monster_dungeon_armor = { }, [23107]={ ["monster_base"]=10019, - ["hp"]=143370000, - ["atk"]=2710000, + ["hp"]=132050000, + ["atk"]=2950000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -3040,8 +3040,8 @@ local monster_dungeon_armor = { }, [23207]={ ["monster_base"]=10048, - ["hp"]=210680000, - ["atk"]=3000000, + ["hp"]=197820000, + ["atk"]=3280000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -3052,8 +3052,8 @@ local monster_dungeon_armor = { }, [23307]={ ["monster_base"]=10028, - ["hp"]=263090000, - ["atk"]=3140000, + ["hp"]=247320000, + ["atk"]=3420000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -3064,8 +3064,8 @@ local monster_dungeon_armor = { }, [23407]={ ["monster_base"]=10014, - ["hp"]=276480000, - ["atk"]=3730000, + ["hp"]=260370000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -3077,8 +3077,8 @@ local monster_dungeon_armor = { [23507]={ ["monster_base"]=20009, ["is_boss"]=1, - ["hp"]=512890000, - ["atk"]=3980000, + ["hp"]=535960000, + ["atk"]=4330000, ["atk_times"]=4, ["hurt_skill"]={ 30025, @@ -3096,8 +3096,8 @@ local monster_dungeon_armor = { }, [23607]={ ["monster_base"]=10012, - ["hp"]=341420000, - ["atk"]=3870000, + ["hp"]=321500000, + ["atk"]=4220000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -3108,8 +3108,8 @@ local monster_dungeon_armor = { }, [23707]={ ["monster_base"]=10065, - ["hp"]=359010000, - ["atk"]=4000000, + ["hp"]=372390000, + ["atk"]=4360000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -3120,8 +3120,8 @@ local monster_dungeon_armor = { }, [23807]={ ["monster_base"]=10018, - ["hp"]=420800000, - ["atk"]=3960000, + ["hp"]=437410000, + ["atk"]=4310000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -3132,8 +3132,8 @@ local monster_dungeon_armor = { }, [23907]={ ["monster_base"]=10014, - ["hp"]=483170000, - ["atk"]=4170000, + ["hp"]=500850000, + ["atk"]=4550000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -3145,8 +3145,8 @@ local monster_dungeon_armor = { [24007]={ ["monster_base"]=20024, ["is_boss"]=2, - ["hp"]=814970000, - ["atk"]=4170000, + ["hp"]=848720000, + ["atk"]=4550000, ["atk_times"]=4, ["hurt_skill"]={ 30070, @@ -3164,8 +3164,8 @@ local monster_dungeon_armor = { }, [24107]={ ["monster_base"]=10019, - ["hp"]=153090000, - ["atk"]=2870000, + ["hp"]=144620000, + ["atk"]=3230000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -3176,8 +3176,8 @@ local monster_dungeon_armor = { }, [24207]={ ["monster_base"]=10013, - ["hp"]=224450000, - ["atk"]=3190000, + ["hp"]=216360000, + ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -3188,8 +3188,8 @@ local monster_dungeon_armor = { }, [24307]={ ["monster_base"]=10001, - ["hp"]=280370000, - ["atk"]=3320000, + ["hp"]=270480000, + ["atk"]=3740000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -3200,8 +3200,8 @@ local monster_dungeon_armor = { }, [24407]={ ["monster_base"]=10031, - ["hp"]=294620000, - ["atk"]=3960000, + ["hp"]=284960000, + ["atk"]=4460000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -3213,8 +3213,8 @@ local monster_dungeon_armor = { [24507]={ ["monster_base"]=30015, ["is_boss"]=1, - ["hp"]=545940000, - ["atk"]=4220000, + ["hp"]=585830000, + ["atk"]=4750000, ["atk_times"]=4, ["hurt_skill"]={ 40025, @@ -3229,8 +3229,8 @@ local monster_dungeon_armor = { }, [24607]={ ["monster_base"]=10019, - ["hp"]=363690000, - ["atk"]=4110000, + ["hp"]=351630000, + ["atk"]=4640000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -3241,8 +3241,8 @@ local monster_dungeon_armor = { }, [24707]={ ["monster_base"]=10063, - ["hp"]=382500000, - ["atk"]=4240000, + ["hp"]=407010000, + ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -3253,8 +3253,8 @@ local monster_dungeon_armor = { }, [24807]={ ["monster_base"]=10016, - ["hp"]=447930000, - ["atk"]=4200000, + ["hp"]=478170000, + ["atk"]=4720000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -3265,8 +3265,8 @@ local monster_dungeon_armor = { }, [24907]={ ["monster_base"]=10024, - ["hp"]=514350000, - ["atk"]=4430000, + ["hp"]=547410000, + ["atk"]=4980000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -3278,8 +3278,8 @@ local monster_dungeon_armor = { [25007]={ ["monster_base"]=20032, ["is_boss"]=2, - ["hp"]=867510000, - ["atk"]=4430000, + ["hp"]=927650000, + ["atk"]=4980000, ["atk_times"]=4, ["hurt_skill"]={ 30094, @@ -3300,8 +3300,8 @@ local monster_dungeon_armor = { }, [25107]={ ["monster_base"]=10040, - ["hp"]=153090000, - ["atk"]=2870000, + ["hp"]=144620000, + ["atk"]=3230000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -3312,8 +3312,8 @@ local monster_dungeon_armor = { }, [25207]={ ["monster_base"]=10056, - ["hp"]=224450000, - ["atk"]=3190000, + ["hp"]=216360000, + ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -3324,8 +3324,8 @@ local monster_dungeon_armor = { }, [25307]={ ["monster_base"]=10038, - ["hp"]=280370000, - ["atk"]=3320000, + ["hp"]=270480000, + ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ 20109, @@ -3336,8 +3336,8 @@ local monster_dungeon_armor = { }, [25407]={ ["monster_base"]=10005, - ["hp"]=294620000, - ["atk"]=3960000, + ["hp"]=284960000, + ["atk"]=4460000, ["atk_times"]=2, ["hurt_skill"]={ 20013, @@ -3349,8 +3349,8 @@ local monster_dungeon_armor = { [25507]={ ["monster_base"]=20007, ["is_boss"]=1, - ["hp"]=545940000, - ["atk"]=4220000, + ["hp"]=585830000, + ["atk"]=4750000, ["atk_times"]=4, ["hurt_skill"]={ 30019, @@ -3367,8 +3367,8 @@ local monster_dungeon_armor = { }, [25607]={ ["monster_base"]=10035, - ["hp"]=363690000, - ["atk"]=4110000, + ["hp"]=351630000, + ["atk"]=4640000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -3379,8 +3379,8 @@ local monster_dungeon_armor = { }, [25707]={ ["monster_base"]=10026, - ["hp"]=382500000, - ["atk"]=4240000, + ["hp"]=407010000, + ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -3391,8 +3391,8 @@ local monster_dungeon_armor = { }, [25807]={ ["monster_base"]=10025, - ["hp"]=447930000, - ["atk"]=4200000, + ["hp"]=478170000, + ["atk"]=4720000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -3403,8 +3403,8 @@ local monster_dungeon_armor = { }, [25907]={ ["monster_base"]=10034, - ["hp"]=514350000, - ["atk"]=4430000, + ["hp"]=547410000, + ["atk"]=4980000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -3416,8 +3416,8 @@ local monster_dungeon_armor = { [26007]={ ["monster_base"]=20003, ["is_boss"]=2, - ["hp"]=867510000, - ["atk"]=4430000, + ["hp"]=927650000, + ["atk"]=4980000, ["atk_times"]=4, ["hurt_skill"]={ 30007, @@ -3434,8 +3434,8 @@ local monster_dungeon_armor = { }, [26107]={ ["monster_base"]=10036, - ["hp"]=153090000, - ["atk"]=2870000, + ["hp"]=144620000, + ["atk"]=3230000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -3446,8 +3446,8 @@ local monster_dungeon_armor = { }, [26207]={ ["monster_base"]=10014, - ["hp"]=224450000, - ["atk"]=3190000, + ["hp"]=216360000, + ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -3458,8 +3458,8 @@ local monster_dungeon_armor = { }, [26307]={ ["monster_base"]=10046, - ["hp"]=280370000, - ["atk"]=3320000, + ["hp"]=270480000, + ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ 20133, @@ -3470,8 +3470,8 @@ local monster_dungeon_armor = { }, [26407]={ ["monster_base"]=10041, - ["hp"]=294620000, - ["atk"]=3960000, + ["hp"]=284960000, + ["atk"]=4460000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -3483,8 +3483,8 @@ local monster_dungeon_armor = { [26507]={ ["monster_base"]=30010, ["is_boss"]=1, - ["hp"]=545940000, - ["atk"]=4220000, + ["hp"]=585830000, + ["atk"]=4750000, ["atk_times"]=4, ["hurt_skill"]={ 40013, @@ -3499,8 +3499,8 @@ local monster_dungeon_armor = { }, [26607]={ ["monster_base"]=10006, - ["hp"]=363690000, - ["atk"]=4110000, + ["hp"]=351630000, + ["atk"]=4640000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -3511,8 +3511,8 @@ local monster_dungeon_armor = { }, [26707]={ ["monster_base"]=10036, - ["hp"]=382500000, - ["atk"]=4240000, + ["hp"]=407010000, + ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -3523,8 +3523,8 @@ local monster_dungeon_armor = { }, [26807]={ ["monster_base"]=10004, - ["hp"]=447930000, - ["atk"]=4200000, + ["hp"]=478170000, + ["atk"]=4720000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -3535,8 +3535,8 @@ local monster_dungeon_armor = { }, [26907]={ ["monster_base"]=10031, - ["hp"]=514350000, - ["atk"]=4430000, + ["hp"]=547410000, + ["atk"]=4980000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -3548,8 +3548,8 @@ local monster_dungeon_armor = { [27007]={ ["monster_base"]=20016, ["is_boss"]=2, - ["hp"]=867510000, - ["atk"]=4430000, + ["hp"]=927650000, + ["atk"]=4980000, ["atk_times"]=4, ["hurt_skill"]={ 30046, @@ -3567,8 +3567,8 @@ local monster_dungeon_armor = { }, [27107]={ ["monster_base"]=10018, - ["hp"]=153090000, - ["atk"]=2870000, + ["hp"]=144620000, + ["atk"]=3230000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -3579,8 +3579,8 @@ local monster_dungeon_armor = { }, [27207]={ ["monster_base"]=10044, - ["hp"]=224450000, - ["atk"]=3190000, + ["hp"]=216360000, + ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ 20127, @@ -3591,8 +3591,8 @@ local monster_dungeon_armor = { }, [27307]={ ["monster_base"]=10033, - ["hp"]=280370000, - ["atk"]=3320000, + ["hp"]=270480000, + ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ 20094, @@ -3603,8 +3603,8 @@ local monster_dungeon_armor = { }, [27407]={ ["monster_base"]=10028, - ["hp"]=294620000, - ["atk"]=3960000, + ["hp"]=284960000, + ["atk"]=4460000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -3616,8 +3616,8 @@ local monster_dungeon_armor = { [27507]={ ["monster_base"]=20019, ["is_boss"]=1, - ["hp"]=545940000, - ["atk"]=4220000, + ["hp"]=585830000, + ["atk"]=4750000, ["atk_times"]=4, ["hurt_skill"]={ 30055, @@ -3635,8 +3635,8 @@ local monster_dungeon_armor = { }, [27607]={ ["monster_base"]=10016, - ["hp"]=363690000, - ["atk"]=4110000, + ["hp"]=351630000, + ["atk"]=4640000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -3647,8 +3647,8 @@ local monster_dungeon_armor = { }, [27707]={ ["monster_base"]=10044, - ["hp"]=382500000, - ["atk"]=4240000, + ["hp"]=407010000, + ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ 20127, @@ -3659,8 +3659,8 @@ local monster_dungeon_armor = { }, [27807]={ ["monster_base"]=10021, - ["hp"]=447930000, - ["atk"]=4200000, + ["hp"]=478170000, + ["atk"]=4720000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -3671,8 +3671,8 @@ local monster_dungeon_armor = { }, [27907]={ ["monster_base"]=10030, - ["hp"]=514350000, - ["atk"]=4430000, + ["hp"]=547410000, + ["atk"]=4980000, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -3684,8 +3684,8 @@ local monster_dungeon_armor = { [28007]={ ["monster_base"]=20020, ["is_boss"]=2, - ["hp"]=867510000, - ["atk"]=4430000, + ["hp"]=927650000, + ["atk"]=4980000, ["atk_times"]=4, ["hurt_skill"]={ 30058, @@ -3703,8 +3703,8 @@ local monster_dungeon_armor = { }, [28107]={ ["monster_base"]=10024, - ["hp"]=153090000, - ["atk"]=2870000, + ["hp"]=144620000, + ["atk"]=3230000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -3715,8 +3715,8 @@ local monster_dungeon_armor = { }, [28207]={ ["monster_base"]=10064, - ["hp"]=224450000, - ["atk"]=3190000, + ["hp"]=216360000, + ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -3727,8 +3727,8 @@ local monster_dungeon_armor = { }, [28307]={ ["monster_base"]=10047, - ["hp"]=280370000, - ["atk"]=3320000, + ["hp"]=270480000, + ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ 20136, @@ -3739,8 +3739,8 @@ local monster_dungeon_armor = { }, [28407]={ ["monster_base"]=10008, - ["hp"]=294620000, - ["atk"]=3960000, + ["hp"]=284960000, + ["atk"]=4460000, ["atk_times"]=2, ["hurt_skill"]={ 20022, @@ -3752,8 +3752,8 @@ local monster_dungeon_armor = { [28507]={ ["monster_base"]=20019, ["is_boss"]=1, - ["hp"]=545940000, - ["atk"]=4220000, + ["hp"]=585830000, + ["atk"]=4750000, ["atk_times"]=4, ["hurt_skill"]={ 30055, @@ -3771,8 +3771,8 @@ local monster_dungeon_armor = { }, [28607]={ ["monster_base"]=10056, - ["hp"]=363690000, - ["atk"]=4110000, + ["hp"]=351630000, + ["atk"]=4640000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -3783,8 +3783,8 @@ local monster_dungeon_armor = { }, [28707]={ ["monster_base"]=10045, - ["hp"]=382500000, - ["atk"]=4240000, + ["hp"]=407010000, + ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -3795,8 +3795,8 @@ local monster_dungeon_armor = { }, [28807]={ ["monster_base"]=10016, - ["hp"]=447930000, - ["atk"]=4200000, + ["hp"]=478170000, + ["atk"]=4720000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -3807,8 +3807,8 @@ local monster_dungeon_armor = { }, [28907]={ ["monster_base"]=10064, - ["hp"]=514350000, - ["atk"]=4430000, + ["hp"]=547410000, + ["atk"]=4980000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -3820,8 +3820,8 @@ local monster_dungeon_armor = { [29007]={ ["monster_base"]=20013, ["is_boss"]=2, - ["hp"]=867510000, - ["atk"]=4430000, + ["hp"]=927650000, + ["atk"]=4980000, ["atk_times"]=4, ["hurt_skill"]={ 30037, @@ -3836,8 +3836,8 @@ local monster_dungeon_armor = { }, [29107]={ ["monster_base"]=10032, - ["hp"]=153090000, - ["atk"]=2870000, + ["hp"]=144620000, + ["atk"]=3230000, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -3848,8 +3848,8 @@ local monster_dungeon_armor = { }, [29207]={ ["monster_base"]=10004, - ["hp"]=224450000, - ["atk"]=3190000, + ["hp"]=216360000, + ["atk"]=3590000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -3860,8 +3860,8 @@ local monster_dungeon_armor = { }, [29307]={ ["monster_base"]=10014, - ["hp"]=280370000, - ["atk"]=3320000, + ["hp"]=270480000, + ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -3872,8 +3872,8 @@ local monster_dungeon_armor = { }, [29407]={ ["monster_base"]=10006, - ["hp"]=294620000, - ["atk"]=3960000, + ["hp"]=284960000, + ["atk"]=4460000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -3885,8 +3885,8 @@ local monster_dungeon_armor = { [29507]={ ["monster_base"]=20031, ["is_boss"]=1, - ["hp"]=545940000, - ["atk"]=4220000, + ["hp"]=585830000, + ["atk"]=4750000, ["atk_times"]=4, ["hurt_skill"]={ 30091, @@ -3906,8 +3906,8 @@ local monster_dungeon_armor = { }, [29607]={ ["monster_base"]=10015, - ["hp"]=363690000, - ["atk"]=4110000, + ["hp"]=351630000, + ["atk"]=4640000, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -3918,8 +3918,8 @@ local monster_dungeon_armor = { }, [29707]={ ["monster_base"]=10026, - ["hp"]=382500000, - ["atk"]=4240000, + ["hp"]=407010000, + ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -3930,8 +3930,8 @@ local monster_dungeon_armor = { }, [29807]={ ["monster_base"]=10007, - ["hp"]=447930000, - ["atk"]=4200000, + ["hp"]=478170000, + ["atk"]=4720000, ["atk_times"]=2, ["hurt_skill"]={ 20019, @@ -3942,8 +3942,8 @@ local monster_dungeon_armor = { }, [29907]={ ["monster_base"]=10064, - ["hp"]=514350000, - ["atk"]=4430000, + ["hp"]=547410000, + ["atk"]=4980000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -3955,8 +3955,8 @@ local monster_dungeon_armor = { [30007]={ ["monster_base"]=20032, ["is_boss"]=2, - ["hp"]=867510000, - ["atk"]=4430000, + ["hp"]=927650000, + ["atk"]=4980000, ["atk_times"]=4, ["hurt_skill"]={ 30094, @@ -3977,8 +3977,8 @@ local monster_dungeon_armor = { }, [30107]={ ["monster_base"]=10019, - ["hp"]=164360000, - ["atk"]=3050000, + ["hp"]=157930000, + ["atk"]=3530000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -3989,8 +3989,8 @@ local monster_dungeon_armor = { }, [30207]={ ["monster_base"]=10035, - ["hp"]=240110000, - ["atk"]=3390000, + ["hp"]=236010000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -4001,8 +4001,8 @@ local monster_dungeon_armor = { }, [30307]={ ["monster_base"]=10057, - ["hp"]=299890000, - ["atk"]=3520000, + ["hp"]=294910000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -4013,8 +4013,8 @@ local monster_dungeon_armor = { }, [30407]={ ["monster_base"]=10051, - ["hp"]=315280000, - ["atk"]=4200000, + ["hp"]=310960000, + ["atk"]=4870000, ["atk_times"]=3, ["hurt_skill"]={ 20148, @@ -4026,8 +4026,8 @@ local monster_dungeon_armor = { [30507]={ ["monster_base"]=20020, ["is_boss"]=1, - ["hp"]=583450000, - ["atk"]=4490000, + ["hp"]=638700000, + ["atk"]=5200000, ["atk_times"]=4, ["hurt_skill"]={ 30058, @@ -4045,8 +4045,8 @@ local monster_dungeon_armor = { }, [30607]={ ["monster_base"]=10062, - ["hp"]=388890000, - ["atk"]=4380000, + ["hp"]=383710000, + ["atk"]=5080000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -4057,8 +4057,8 @@ local monster_dungeon_armor = { }, [30707]={ ["monster_base"]=10056, - ["hp"]=409220000, - ["atk"]=4500000, + ["hp"]=443820000, + ["atk"]=5220000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -4069,8 +4069,8 @@ local monster_dungeon_armor = { }, [30807]={ ["monster_base"]=10054, - ["hp"]=479000000, - ["atk"]=4450000, + ["hp"]=521380000, + ["atk"]=5150000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -4081,8 +4081,8 @@ local monster_dungeon_armor = { }, [30907]={ ["monster_base"]=10060, - ["hp"]=549890000, - ["atk"]=4690000, + ["hp"]=596850000, + ["atk"]=5430000, ["atk_times"]=3, ["hurt_skill"]={ 20175, @@ -4094,8 +4094,8 @@ local monster_dungeon_armor = { [31007]={ ["monster_base"]=20013, ["is_boss"]=2, - ["hp"]=927400000, - ["atk"]=4690000, + ["hp"]=1011330000, + ["atk"]=5430000, ["atk_times"]=4, ["hurt_skill"]={ 30037, @@ -4110,8 +4110,8 @@ local monster_dungeon_armor = { }, [31107]={ ["monster_base"]=10058, - ["hp"]=164360000, - ["atk"]=3050000, + ["hp"]=157930000, + ["atk"]=3530000, ["atk_times"]=3, ["hurt_skill"]={ 20169, @@ -4122,8 +4122,8 @@ local monster_dungeon_armor = { }, [31207]={ ["monster_base"]=10027, - ["hp"]=240110000, - ["atk"]=3390000, + ["hp"]=236010000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -4134,8 +4134,8 @@ local monster_dungeon_armor = { }, [31307]={ ["monster_base"]=10025, - ["hp"]=299890000, - ["atk"]=3520000, + ["hp"]=294910000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -4146,8 +4146,8 @@ local monster_dungeon_armor = { }, [31407]={ ["monster_base"]=10007, - ["hp"]=315280000, - ["atk"]=4200000, + ["hp"]=310960000, + ["atk"]=4870000, ["atk_times"]=2, ["hurt_skill"]={ 20019, @@ -4159,8 +4159,8 @@ local monster_dungeon_armor = { [31507]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=583450000, - ["atk"]=4490000, + ["hp"]=638700000, + ["atk"]=5200000, ["atk_times"]=4, ["hurt_skill"]={ 30034, @@ -4174,8 +4174,8 @@ local monster_dungeon_armor = { }, [31607]={ ["monster_base"]=10024, - ["hp"]=388890000, - ["atk"]=4380000, + ["hp"]=383710000, + ["atk"]=5080000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -4186,8 +4186,8 @@ local monster_dungeon_armor = { }, [31707]={ ["monster_base"]=10030, - ["hp"]=409220000, - ["atk"]=4500000, + ["hp"]=443820000, + ["atk"]=5220000, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -4198,8 +4198,8 @@ local monster_dungeon_armor = { }, [31807]={ ["monster_base"]=10048, - ["hp"]=479000000, - ["atk"]=4450000, + ["hp"]=521380000, + ["atk"]=5150000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -4210,8 +4210,8 @@ local monster_dungeon_armor = { }, [31907]={ ["monster_base"]=10001, - ["hp"]=549890000, - ["atk"]=4690000, + ["hp"]=596850000, + ["atk"]=5430000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -4223,8 +4223,8 @@ local monster_dungeon_armor = { [32007]={ ["monster_base"]=20034, ["is_boss"]=2, - ["hp"]=927400000, - ["atk"]=4690000, + ["hp"]=1011330000, + ["atk"]=5430000, ["atk_times"]=4, ["hurt_skill"]={ 30097, @@ -4243,8 +4243,8 @@ local monster_dungeon_armor = { }, [32107]={ ["monster_base"]=10061, - ["hp"]=164360000, - ["atk"]=3050000, + ["hp"]=157930000, + ["atk"]=3530000, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -4255,8 +4255,8 @@ local monster_dungeon_armor = { }, [32207]={ ["monster_base"]=10017, - ["hp"]=240110000, - ["atk"]=3390000, + ["hp"]=236010000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -4267,8 +4267,8 @@ local monster_dungeon_armor = { }, [32307]={ ["monster_base"]=10064, - ["hp"]=299890000, - ["atk"]=3520000, + ["hp"]=294910000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -4279,8 +4279,8 @@ local monster_dungeon_armor = { }, [32407]={ ["monster_base"]=10027, - ["hp"]=315280000, - ["atk"]=4200000, + ["hp"]=310960000, + ["atk"]=4870000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -4292,8 +4292,8 @@ local monster_dungeon_armor = { [32507]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=583450000, - ["atk"]=4490000, + ["hp"]=638700000, + ["atk"]=5200000, ["atk_times"]=4, ["hurt_skill"]={ 30022, @@ -4310,8 +4310,8 @@ local monster_dungeon_armor = { }, [32607]={ ["monster_base"]=10005, - ["hp"]=388890000, - ["atk"]=4380000, + ["hp"]=383710000, + ["atk"]=5080000, ["atk_times"]=2, ["hurt_skill"]={ 20013, @@ -4322,8 +4322,8 @@ local monster_dungeon_armor = { }, [32707]={ ["monster_base"]=10032, - ["hp"]=409220000, - ["atk"]=4500000, + ["hp"]=443820000, + ["atk"]=5220000, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -4334,8 +4334,8 @@ local monster_dungeon_armor = { }, [32807]={ ["monster_base"]=10056, - ["hp"]=479000000, - ["atk"]=4450000, + ["hp"]=521380000, + ["atk"]=5150000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -4346,8 +4346,8 @@ local monster_dungeon_armor = { }, [32907]={ ["monster_base"]=10053, - ["hp"]=549890000, - ["atk"]=4690000, + ["hp"]=596850000, + ["atk"]=5430000, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -4359,8 +4359,8 @@ local monster_dungeon_armor = { [33007]={ ["monster_base"]=20035, ["is_boss"]=2, - ["hp"]=927400000, - ["atk"]=4690000, + ["hp"]=1011330000, + ["atk"]=5430000, ["atk_times"]=4, ["hurt_skill"]={ 30100, @@ -4379,8 +4379,8 @@ local monster_dungeon_armor = { }, [33107]={ ["monster_base"]=10004, - ["hp"]=164360000, - ["atk"]=3050000, + ["hp"]=157930000, + ["atk"]=3530000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -4391,8 +4391,8 @@ local monster_dungeon_armor = { }, [33207]={ ["monster_base"]=10064, - ["hp"]=240110000, - ["atk"]=3390000, + ["hp"]=236010000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -4403,8 +4403,8 @@ local monster_dungeon_armor = { }, [33307]={ ["monster_base"]=10050, - ["hp"]=299890000, - ["atk"]=3520000, + ["hp"]=294910000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20145, @@ -4415,8 +4415,8 @@ local monster_dungeon_armor = { }, [33407]={ ["monster_base"]=10012, - ["hp"]=315280000, - ["atk"]=4200000, + ["hp"]=310960000, + ["atk"]=4870000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -4428,8 +4428,8 @@ local monster_dungeon_armor = { [33507]={ ["monster_base"]=20021, ["is_boss"]=1, - ["hp"]=583450000, - ["atk"]=4490000, + ["hp"]=638700000, + ["atk"]=5200000, ["atk_times"]=4, ["hurt_skill"]={ 30061, @@ -4447,8 +4447,8 @@ local monster_dungeon_armor = { }, [33607]={ ["monster_base"]=10024, - ["hp"]=388890000, - ["atk"]=4380000, + ["hp"]=383710000, + ["atk"]=5080000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -4459,8 +4459,8 @@ local monster_dungeon_armor = { }, [33707]={ ["monster_base"]=10052, - ["hp"]=409220000, - ["atk"]=4500000, + ["hp"]=443820000, + ["atk"]=5220000, ["atk_times"]=3, ["hurt_skill"]={ 20151, @@ -4471,8 +4471,8 @@ local monster_dungeon_armor = { }, [33807]={ ["monster_base"]=10012, - ["hp"]=479000000, - ["atk"]=4450000, + ["hp"]=521380000, + ["atk"]=5150000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -4483,8 +4483,8 @@ local monster_dungeon_armor = { }, [33907]={ ["monster_base"]=10006, - ["hp"]=549890000, - ["atk"]=4690000, + ["hp"]=596850000, + ["atk"]=5430000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -4496,8 +4496,8 @@ local monster_dungeon_armor = { [34007]={ ["monster_base"]=20036, ["is_boss"]=2, - ["hp"]=927400000, - ["atk"]=4690000, + ["hp"]=1011330000, + ["atk"]=5430000, ["atk_times"]=4, ["hurt_skill"]={ 30103, @@ -4515,8 +4515,8 @@ local monster_dungeon_armor = { }, [34107]={ ["monster_base"]=10002, - ["hp"]=164360000, - ["atk"]=3050000, + ["hp"]=157930000, + ["atk"]=3530000, ["atk_times"]=2, ["hurt_skill"]={ 20004, @@ -4527,8 +4527,8 @@ local monster_dungeon_armor = { }, [34207]={ ["monster_base"]=10060, - ["hp"]=240110000, - ["atk"]=3390000, + ["hp"]=236010000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20175, @@ -4539,8 +4539,8 @@ local monster_dungeon_armor = { }, [34307]={ ["monster_base"]=10065, - ["hp"]=299890000, - ["atk"]=3520000, + ["hp"]=294910000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -4551,8 +4551,8 @@ local monster_dungeon_armor = { }, [34407]={ ["monster_base"]=10037, - ["hp"]=315280000, - ["atk"]=4200000, + ["hp"]=310960000, + ["atk"]=4870000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -4564,8 +4564,8 @@ local monster_dungeon_armor = { [34507]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=583450000, - ["atk"]=4490000, + ["hp"]=638700000, + ["atk"]=5200000, ["atk_times"]=4, ["hurt_skill"]={ 30016, @@ -4582,8 +4582,8 @@ local monster_dungeon_armor = { }, [34607]={ ["monster_base"]=10012, - ["hp"]=388890000, - ["atk"]=4380000, + ["hp"]=383710000, + ["atk"]=5080000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -4594,8 +4594,8 @@ local monster_dungeon_armor = { }, [34707]={ ["monster_base"]=10049, - ["hp"]=409220000, - ["atk"]=4500000, + ["hp"]=443820000, + ["atk"]=5220000, ["atk_times"]=3, ["hurt_skill"]={ 20142, @@ -4606,8 +4606,8 @@ local monster_dungeon_armor = { }, [34807]={ ["monster_base"]=10020, - ["hp"]=479000000, - ["atk"]=4450000, + ["hp"]=521380000, + ["atk"]=5150000, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -4618,8 +4618,8 @@ local monster_dungeon_armor = { }, [34907]={ ["monster_base"]=10043, - ["hp"]=549890000, - ["atk"]=4690000, + ["hp"]=596850000, + ["atk"]=5430000, ["atk_times"]=3, ["hurt_skill"]={ 20124, @@ -4631,8 +4631,8 @@ local monster_dungeon_armor = { [35007]={ ["monster_base"]=20037, ["is_boss"]=2, - ["hp"]=927400000, - ["atk"]=4690000, + ["hp"]=1011330000, + ["atk"]=5430000, ["atk_times"]=4, ["hurt_skill"]={ 30106, @@ -4651,8 +4651,8 @@ local monster_dungeon_armor = { }, [35107]={ ["monster_base"]=10041, - ["hp"]=164360000, - ["atk"]=3050000, + ["hp"]=157930000, + ["atk"]=3530000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -4663,8 +4663,8 @@ local monster_dungeon_armor = { }, [35207]={ ["monster_base"]=10014, - ["hp"]=240110000, - ["atk"]=3390000, + ["hp"]=236010000, + ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -4675,8 +4675,8 @@ local monster_dungeon_armor = { }, [35307]={ ["monster_base"]=10047, - ["hp"]=299890000, - ["atk"]=3520000, + ["hp"]=294910000, + ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ 20136, @@ -4687,8 +4687,8 @@ local monster_dungeon_armor = { }, [35407]={ ["monster_base"]=10062, - ["hp"]=315280000, - ["atk"]=4200000, + ["hp"]=310960000, + ["atk"]=4870000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -4700,8 +4700,8 @@ local monster_dungeon_armor = { [35507]={ ["monster_base"]=20027, ["is_boss"]=1, - ["hp"]=583450000, - ["atk"]=4490000, + ["hp"]=638700000, + ["atk"]=5200000, ["atk_times"]=4, ["hurt_skill"]={ 30079, @@ -4715,8 +4715,8 @@ local monster_dungeon_armor = { }, [35607]={ ["monster_base"]=10005, - ["hp"]=388890000, - ["atk"]=4380000, + ["hp"]=383710000, + ["atk"]=5080000, ["atk_times"]=2, ["hurt_skill"]={ 20013, @@ -4727,8 +4727,8 @@ local monster_dungeon_armor = { }, [35707]={ ["monster_base"]=10004, - ["hp"]=409220000, - ["atk"]=4500000, + ["hp"]=443820000, + ["atk"]=5220000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -4739,8 +4739,8 @@ local monster_dungeon_armor = { }, [35807]={ ["monster_base"]=10039, - ["hp"]=479000000, - ["atk"]=4450000, + ["hp"]=521380000, + ["atk"]=5150000, ["atk_times"]=3, ["hurt_skill"]={ 20112, @@ -4751,8 +4751,8 @@ local monster_dungeon_armor = { }, [35907]={ ["monster_base"]=10032, - ["hp"]=549890000, - ["atk"]=4690000, + ["hp"]=596850000, + ["atk"]=5430000, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -4764,8 +4764,8 @@ local monster_dungeon_armor = { [36007]={ ["monster_base"]=20038, ["is_boss"]=2, - ["hp"]=927400000, - ["atk"]=4690000, + ["hp"]=1011330000, + ["atk"]=5430000, ["atk_times"]=4, ["hurt_skill"]={ 30109, @@ -4786,8 +4786,8 @@ local monster_dungeon_armor = { }, [36107]={ ["monster_base"]=10057, - ["hp"]=169650000, - ["atk"]=3230000, + ["hp"]=180630000, + ["atk"]=3970000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -4798,8 +4798,8 @@ local monster_dungeon_armor = { }, [36207]={ ["monster_base"]=10061, - ["hp"]=247740000, - ["atk"]=3600000, + ["hp"]=269660000, + ["atk"]=4420000, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -4810,8 +4810,8 @@ local monster_dungeon_armor = { }, [36307]={ ["monster_base"]=10040, - ["hp"]=309200000, - ["atk"]=3730000, + ["hp"]=336720000, + ["atk"]=4570000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -4822,8 +4822,8 @@ local monster_dungeon_armor = { }, [36407]={ ["monster_base"]=10047, - ["hp"]=324830000, - ["atk"]=4460000, + ["hp"]=355220000, + ["atk"]=5460000, ["atk_times"]=3, ["hurt_skill"]={ 20136, @@ -4835,8 +4835,8 @@ local monster_dungeon_armor = { [36507]={ ["monster_base"]=20004, ["is_boss"]=1, - ["hp"]=600970000, - ["atk"]=4760000, + ["hp"]=729050000, + ["atk"]=5830000, ["atk_times"]=4, ["hurt_skill"]={ 30010, @@ -4850,8 +4850,8 @@ local monster_dungeon_armor = { }, [36607]={ ["monster_base"]=10028, - ["hp"]=400760000, - ["atk"]=4650000, + ["hp"]=438600000, + ["atk"]=5720000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -4862,8 +4862,8 @@ local monster_dungeon_armor = { }, [36707]={ ["monster_base"]=10004, - ["hp"]=421850000, - ["atk"]=4770000, + ["hp"]=506990000, + ["atk"]=5860000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -4874,8 +4874,8 @@ local monster_dungeon_armor = { }, [36807]={ ["monster_base"]=10002, - ["hp"]=493410000, - ["atk"]=4730000, + ["hp"]=595640000, + ["atk"]=5800000, ["atk_times"]=2, ["hurt_skill"]={ 20004, @@ -4886,8 +4886,8 @@ local monster_dungeon_armor = { }, [36907]={ ["monster_base"]=10062, - ["hp"]=566670000, - ["atk"]=4980000, + ["hp"]=682150000, + ["atk"]=6110000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -4899,8 +4899,8 @@ local monster_dungeon_armor = { [37007]={ ["monster_base"]=20012, ["is_boss"]=2, - ["hp"]=955050000, - ["atk"]=4980000, + ["hp"]=1152480000, + ["atk"]=6110000, ["atk_times"]=4, ["hurt_skill"]={ 30034, @@ -4914,8 +4914,8 @@ local monster_dungeon_armor = { }, [37107]={ ["monster_base"]=10001, - ["hp"]=169650000, - ["atk"]=3230000, + ["hp"]=180630000, + ["atk"]=3970000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -4926,8 +4926,8 @@ local monster_dungeon_armor = { }, [37207]={ ["monster_base"]=10054, - ["hp"]=247740000, - ["atk"]=3600000, + ["hp"]=269660000, + ["atk"]=4420000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -4938,8 +4938,8 @@ local monster_dungeon_armor = { }, [37307]={ ["monster_base"]=10023, - ["hp"]=309200000, - ["atk"]=3730000, + ["hp"]=336720000, + ["atk"]=4570000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -4950,8 +4950,8 @@ local monster_dungeon_armor = { }, [37407]={ ["monster_base"]=10008, - ["hp"]=324830000, - ["atk"]=4460000, + ["hp"]=355220000, + ["atk"]=5460000, ["atk_times"]=2, ["hurt_skill"]={ 20022, @@ -4963,8 +4963,8 @@ local monster_dungeon_armor = { [37507]={ ["monster_base"]=20022, ["is_boss"]=1, - ["hp"]=600970000, - ["atk"]=4760000, + ["hp"]=729050000, + ["atk"]=5830000, ["atk_times"]=4, ["hurt_skill"]={ 30064, @@ -4981,8 +4981,8 @@ local monster_dungeon_armor = { }, [37607]={ ["monster_base"]=10034, - ["hp"]=400760000, - ["atk"]=4650000, + ["hp"]=438600000, + ["atk"]=5720000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -4993,8 +4993,8 @@ local monster_dungeon_armor = { }, [37707]={ ["monster_base"]=10035, - ["hp"]=421850000, - ["atk"]=4770000, + ["hp"]=506990000, + ["atk"]=5860000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -5005,8 +5005,8 @@ local monster_dungeon_armor = { }, [37807]={ ["monster_base"]=10004, - ["hp"]=493410000, - ["atk"]=4730000, + ["hp"]=595640000, + ["atk"]=5800000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -5017,8 +5017,8 @@ local monster_dungeon_armor = { }, [37907]={ ["monster_base"]=10029, - ["hp"]=566670000, - ["atk"]=4980000, + ["hp"]=682150000, + ["atk"]=6110000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -5030,8 +5030,8 @@ local monster_dungeon_armor = { [38007]={ ["monster_base"]=20003, ["is_boss"]=2, - ["hp"]=955050000, - ["atk"]=4980000, + ["hp"]=1152480000, + ["atk"]=6110000, ["atk_times"]=4, ["hurt_skill"]={ 30007, @@ -5048,8 +5048,8 @@ local monster_dungeon_armor = { }, [38107]={ ["monster_base"]=10004, - ["hp"]=169650000, - ["atk"]=3230000, + ["hp"]=180630000, + ["atk"]=3970000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -5060,8 +5060,8 @@ local monster_dungeon_armor = { }, [38207]={ ["monster_base"]=10056, - ["hp"]=247740000, - ["atk"]=3600000, + ["hp"]=269660000, + ["atk"]=4420000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -5072,8 +5072,8 @@ local monster_dungeon_armor = { }, [38307]={ ["monster_base"]=10057, - ["hp"]=309200000, - ["atk"]=3730000, + ["hp"]=336720000, + ["atk"]=4570000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -5084,8 +5084,8 @@ local monster_dungeon_armor = { }, [38407]={ ["monster_base"]=10043, - ["hp"]=324830000, - ["atk"]=4460000, + ["hp"]=355220000, + ["atk"]=5460000, ["atk_times"]=3, ["hurt_skill"]={ 20124, @@ -5097,8 +5097,8 @@ local monster_dungeon_armor = { [38507]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=600970000, - ["atk"]=4760000, + ["hp"]=729050000, + ["atk"]=5830000, ["atk_times"]=4, ["hurt_skill"]={ 30040, @@ -5112,8 +5112,8 @@ local monster_dungeon_armor = { }, [38607]={ ["monster_base"]=10009, - ["hp"]=400760000, - ["atk"]=4650000, + ["hp"]=438600000, + ["atk"]=5720000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -5124,8 +5124,8 @@ local monster_dungeon_armor = { }, [38707]={ ["monster_base"]=10030, - ["hp"]=421850000, - ["atk"]=4770000, + ["hp"]=506990000, + ["atk"]=5860000, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -5136,8 +5136,8 @@ local monster_dungeon_armor = { }, [38807]={ ["monster_base"]=10048, - ["hp"]=493410000, - ["atk"]=4730000, + ["hp"]=595640000, + ["atk"]=5800000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -5148,8 +5148,8 @@ local monster_dungeon_armor = { }, [38907]={ ["monster_base"]=10041, - ["hp"]=566670000, - ["atk"]=4980000, + ["hp"]=682150000, + ["atk"]=6110000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -5161,8 +5161,8 @@ local monster_dungeon_armor = { [39007]={ ["monster_base"]=20005, ["is_boss"]=2, - ["hp"]=955050000, - ["atk"]=4980000, + ["hp"]=1152480000, + ["atk"]=6110000, ["atk_times"]=4, ["hurt_skill"]={ 30013, @@ -5179,8 +5179,8 @@ local monster_dungeon_armor = { }, [39107]={ ["monster_base"]=10003, - ["hp"]=169650000, - ["atk"]=3230000, + ["hp"]=180630000, + ["atk"]=3970000, ["atk_times"]=2, ["hurt_skill"]={ 20007, @@ -5191,8 +5191,8 @@ local monster_dungeon_armor = { }, [39207]={ ["monster_base"]=10056, - ["hp"]=247740000, - ["atk"]=3600000, + ["hp"]=269660000, + ["atk"]=4420000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -5203,8 +5203,8 @@ local monster_dungeon_armor = { }, [39307]={ ["monster_base"]=10062, - ["hp"]=309200000, - ["atk"]=3730000, + ["hp"]=336720000, + ["atk"]=4570000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -5215,8 +5215,8 @@ local monster_dungeon_armor = { }, [39407]={ ["monster_base"]=10057, - ["hp"]=324830000, - ["atk"]=4460000, + ["hp"]=355220000, + ["atk"]=5460000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -5228,8 +5228,8 @@ local monster_dungeon_armor = { [39507]={ ["monster_base"]=30009, ["is_boss"]=1, - ["hp"]=600970000, - ["atk"]=4760000, + ["hp"]=729050000, + ["atk"]=5830000, ["atk_times"]=4, ["hurt_skill"]={ 40021, @@ -5244,8 +5244,8 @@ local monster_dungeon_armor = { }, [39607]={ ["monster_base"]=10048, - ["hp"]=400760000, - ["atk"]=4650000, + ["hp"]=438600000, + ["atk"]=5720000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -5256,8 +5256,8 @@ local monster_dungeon_armor = { }, [39707]={ ["monster_base"]=10004, - ["hp"]=421850000, - ["atk"]=4770000, + ["hp"]=506990000, + ["atk"]=5860000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -5268,8 +5268,8 @@ local monster_dungeon_armor = { }, [39807]={ ["monster_base"]=10031, - ["hp"]=493410000, - ["atk"]=4730000, + ["hp"]=595640000, + ["atk"]=5800000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -5280,8 +5280,8 @@ local monster_dungeon_armor = { }, [39907]={ ["monster_base"]=10040, - ["hp"]=566670000, - ["atk"]=4980000, + ["hp"]=682150000, + ["atk"]=6110000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -5293,8 +5293,8 @@ local monster_dungeon_armor = { [40007]={ ["monster_base"]=20025, ["is_boss"]=2, - ["hp"]=955050000, - ["atk"]=4980000, + ["hp"]=1152480000, + ["atk"]=6110000, ["atk_times"]=4, ["hurt_skill"]={ 30073, @@ -5311,8 +5311,8 @@ local monster_dungeon_armor = { }, [40107]={ ["monster_base"]=10056, - ["hp"]=169650000, - ["atk"]=3230000, + ["hp"]=180630000, + ["atk"]=3970000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -5323,8 +5323,8 @@ local monster_dungeon_armor = { }, [40207]={ ["monster_base"]=10021, - ["hp"]=247740000, - ["atk"]=3600000, + ["hp"]=269660000, + ["atk"]=4420000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -5335,8 +5335,8 @@ local monster_dungeon_armor = { }, [40307]={ ["monster_base"]=10015, - ["hp"]=309200000, - ["atk"]=3730000, + ["hp"]=336720000, + ["atk"]=4570000, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -5347,8 +5347,8 @@ local monster_dungeon_armor = { }, [40407]={ ["monster_base"]=10044, - ["hp"]=324830000, - ["atk"]=4460000, + ["hp"]=355220000, + ["atk"]=5460000, ["atk_times"]=3, ["hurt_skill"]={ 20127, @@ -5360,8 +5360,8 @@ local monster_dungeon_armor = { [40507]={ ["monster_base"]=30015, ["is_boss"]=1, - ["hp"]=600970000, - ["atk"]=4760000, + ["hp"]=729050000, + ["atk"]=5830000, ["atk_times"]=4, ["hurt_skill"]={ 40025, @@ -5376,8 +5376,8 @@ local monster_dungeon_armor = { }, [40607]={ ["monster_base"]=10055, - ["hp"]=400760000, - ["atk"]=4650000, + ["hp"]=438600000, + ["atk"]=5720000, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -5388,8 +5388,8 @@ local monster_dungeon_armor = { }, [40707]={ ["monster_base"]=10003, - ["hp"]=421850000, - ["atk"]=4770000, + ["hp"]=506990000, + ["atk"]=5860000, ["atk_times"]=2, ["hurt_skill"]={ 20007, @@ -5400,8 +5400,8 @@ local monster_dungeon_armor = { }, [40807]={ ["monster_base"]=10031, - ["hp"]=493410000, - ["atk"]=4730000, + ["hp"]=595640000, + ["atk"]=5800000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -5412,8 +5412,8 @@ local monster_dungeon_armor = { }, [40907]={ ["monster_base"]=10004, - ["hp"]=566670000, - ["atk"]=4980000, + ["hp"]=682150000, + ["atk"]=6110000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -5425,8 +5425,8 @@ local monster_dungeon_armor = { [41007]={ ["monster_base"]=20037, ["is_boss"]=2, - ["hp"]=955050000, - ["atk"]=4980000, + ["hp"]=1152480000, + ["atk"]=6110000, ["atk_times"]=4, ["hurt_skill"]={ 30106, @@ -5445,8 +5445,8 @@ local monster_dungeon_armor = { }, [41107]={ ["monster_base"]=10019, - ["hp"]=169650000, - ["atk"]=3230000, + ["hp"]=180630000, + ["atk"]=3970000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -5457,8 +5457,8 @@ local monster_dungeon_armor = { }, [41207]={ ["monster_base"]=10017, - ["hp"]=247740000, - ["atk"]=3600000, + ["hp"]=269660000, + ["atk"]=4420000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -5469,8 +5469,8 @@ local monster_dungeon_armor = { }, [41307]={ ["monster_base"]=10055, - ["hp"]=309200000, - ["atk"]=3730000, + ["hp"]=336720000, + ["atk"]=4570000, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -5481,8 +5481,8 @@ local monster_dungeon_armor = { }, [41407]={ ["monster_base"]=10013, - ["hp"]=324830000, - ["atk"]=4460000, + ["hp"]=355220000, + ["atk"]=5460000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -5494,8 +5494,8 @@ local monster_dungeon_armor = { [41507]={ ["monster_base"]=20030, ["is_boss"]=1, - ["hp"]=600970000, - ["atk"]=4760000, + ["hp"]=729050000, + ["atk"]=5830000, ["atk_times"]=4, ["hurt_skill"]={ 30088, @@ -5513,8 +5513,8 @@ local monster_dungeon_armor = { }, [41607]={ ["monster_base"]=10042, - ["hp"]=400760000, - ["atk"]=4650000, + ["hp"]=438600000, + ["atk"]=5720000, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -5525,8 +5525,8 @@ local monster_dungeon_armor = { }, [41707]={ ["monster_base"]=10025, - ["hp"]=421850000, - ["atk"]=4770000, + ["hp"]=506990000, + ["atk"]=5860000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -5537,8 +5537,8 @@ local monster_dungeon_armor = { }, [41807]={ ["monster_base"]=10002, - ["hp"]=493410000, - ["atk"]=4730000, + ["hp"]=595640000, + ["atk"]=5800000, ["atk_times"]=2, ["hurt_skill"]={ 20004, @@ -5549,8 +5549,8 @@ local monster_dungeon_armor = { }, [41907]={ ["monster_base"]=10034, - ["hp"]=566670000, - ["atk"]=4980000, + ["hp"]=682150000, + ["atk"]=6110000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -5562,8 +5562,8 @@ local monster_dungeon_armor = { [42007]={ ["monster_base"]=20032, ["is_boss"]=2, - ["hp"]=955050000, - ["atk"]=4980000, + ["hp"]=1152480000, + ["atk"]=6110000, ["atk_times"]=4, ["hurt_skill"]={ 30094, @@ -5584,8 +5584,8 @@ local monster_dungeon_armor = { }, [42107]={ ["monster_base"]=10022, - ["hp"]=180880000, - ["atk"]=3430000, + ["hp"]=123300000, + ["atk"]=1030000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -5596,8 +5596,8 @@ local monster_dungeon_armor = { }, [42207]={ ["monster_base"]=10020, - ["hp"]=263550000, - ["atk"]=3820000, + ["hp"]=157710000, + ["atk"]=1090000, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -5608,8 +5608,8 @@ local monster_dungeon_armor = { }, [42307]={ ["monster_base"]=10024, - ["hp"]=329070000, - ["atk"]=3950000, + ["hp"]=164880000, + ["atk"]=1130000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -5620,8 +5620,8 @@ local monster_dungeon_armor = { }, [42407]={ ["monster_base"]=10045, - ["hp"]=345780000, - ["atk"]=4720000, + ["hp"]=375380000, + ["atk"]=5770000, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -5633,8 +5633,8 @@ local monster_dungeon_armor = { [42507]={ ["monster_base"]=20027, ["is_boss"]=1, - ["hp"]=639240000, - ["atk"]=5050000, + ["hp"]=770320000, + ["atk"]=6170000, ["atk_times"]=4, ["hurt_skill"]={ 30079, @@ -5648,8 +5648,8 @@ local monster_dungeon_armor = { }, [42607]={ ["monster_base"]=10002, - ["hp"]=426740000, - ["atk"]=4940000, + ["hp"]=463540000, + ["atk"]=6050000, ["atk_times"]=2, ["hurt_skill"]={ 20004, @@ -5660,8 +5660,8 @@ local monster_dungeon_armor = { }, [42707]={ ["monster_base"]=10008, - ["hp"]=448850000, - ["atk"]=5060000, + ["hp"]=535690000, + ["atk"]=6190000, ["atk_times"]=2, ["hurt_skill"]={ 20022, @@ -5672,8 +5672,8 @@ local monster_dungeon_armor = { }, [42807]={ ["monster_base"]=10019, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=629350000, + ["atk"]=6140000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -5684,8 +5684,8 @@ local monster_dungeon_armor = { }, [42907]={ ["monster_base"]=10048, - ["hp"]=602910000, - ["atk"]=5280000, + ["hp"]=720850000, + ["atk"]=6460000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -5697,8 +5697,8 @@ local monster_dungeon_armor = { [43007]={ ["monster_base"]=20034, ["is_boss"]=2, - ["hp"]=1015810000, - ["atk"]=5280000, + ["hp"]=1217600000, + ["atk"]=6460000, ["atk_times"]=4, ["hurt_skill"]={ 30097, @@ -5717,8 +5717,8 @@ local monster_dungeon_armor = { }, [43107]={ ["monster_base"]=10003, - ["hp"]=180880000, - ["atk"]=3430000, + ["hp"]=123300000, + ["atk"]=1030000, ["atk_times"]=2, ["hurt_skill"]={ 20007, @@ -5729,8 +5729,8 @@ local monster_dungeon_armor = { }, [43207]={ ["monster_base"]=10016, - ["hp"]=263550000, - ["atk"]=3820000, + ["hp"]=157710000, + ["atk"]=1090000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -5741,8 +5741,8 @@ local monster_dungeon_armor = { }, [43307]={ ["monster_base"]=10057, - ["hp"]=329070000, - ["atk"]=3950000, + ["hp"]=164880000, + ["atk"]=1130000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -5753,8 +5753,8 @@ local monster_dungeon_armor = { }, [43407]={ ["monster_base"]=10023, - ["hp"]=345780000, - ["atk"]=4720000, + ["hp"]=375380000, + ["atk"]=5770000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -5766,8 +5766,8 @@ local monster_dungeon_armor = { [43507]={ ["monster_base"]=30012, ["is_boss"]=1, - ["hp"]=639240000, - ["atk"]=5050000, + ["hp"]=770320000, + ["atk"]=6170000, ["atk_times"]=4, ["hurt_skill"]={ 40005, @@ -5783,8 +5783,8 @@ local monster_dungeon_armor = { }, [43607]={ ["monster_base"]=10040, - ["hp"]=426740000, - ["atk"]=4940000, + ["hp"]=463540000, + ["atk"]=6050000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -5795,8 +5795,8 @@ local monster_dungeon_armor = { }, [43707]={ ["monster_base"]=10041, - ["hp"]=448850000, - ["atk"]=5060000, + ["hp"]=535690000, + ["atk"]=6190000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -5807,8 +5807,8 @@ local monster_dungeon_armor = { }, [43807]={ ["monster_base"]=10032, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=629350000, + ["atk"]=6140000, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -5819,8 +5819,8 @@ local monster_dungeon_armor = { }, [43907]={ ["monster_base"]=10020, - ["hp"]=602910000, - ["atk"]=5280000, + ["hp"]=720850000, + ["atk"]=6460000, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -5832,8 +5832,8 @@ local monster_dungeon_armor = { [44007]={ ["monster_base"]=20009, ["is_boss"]=2, - ["hp"]=1015810000, - ["atk"]=5280000, + ["hp"]=1217600000, + ["atk"]=6460000, ["atk_times"]=4, ["hurt_skill"]={ 30025, @@ -5851,8 +5851,8 @@ local monster_dungeon_armor = { }, [44107]={ ["monster_base"]=10027, - ["hp"]=180880000, - ["atk"]=3430000, + ["hp"]=123300000, + ["atk"]=1030000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -5863,8 +5863,8 @@ local monster_dungeon_armor = { }, [44207]={ ["monster_base"]=10014, - ["hp"]=263550000, - ["atk"]=3820000, + ["hp"]=157710000, + ["atk"]=1090000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -5875,8 +5875,8 @@ local monster_dungeon_armor = { }, [44307]={ ["monster_base"]=10042, - ["hp"]=329070000, - ["atk"]=3950000, + ["hp"]=164880000, + ["atk"]=1130000, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -5887,8 +5887,8 @@ local monster_dungeon_armor = { }, [44407]={ ["monster_base"]=10054, - ["hp"]=345780000, - ["atk"]=4720000, + ["hp"]=375380000, + ["atk"]=5770000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -5900,8 +5900,8 @@ local monster_dungeon_armor = { [44507]={ ["monster_base"]=30010, ["is_boss"]=1, - ["hp"]=639240000, - ["atk"]=5050000, + ["hp"]=770320000, + ["atk"]=6170000, ["atk_times"]=4, ["hurt_skill"]={ 40013, @@ -5916,8 +5916,8 @@ local monster_dungeon_armor = { }, [44607]={ ["monster_base"]=10024, - ["hp"]=426740000, - ["atk"]=4940000, + ["hp"]=463540000, + ["atk"]=6050000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -5928,8 +5928,8 @@ local monster_dungeon_armor = { }, [44707]={ ["monster_base"]=10022, - ["hp"]=448850000, - ["atk"]=5060000, + ["hp"]=535690000, + ["atk"]=6190000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -5940,8 +5940,8 @@ local monster_dungeon_armor = { }, [44807]={ ["monster_base"]=10034, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=629350000, + ["atk"]=6140000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -5952,8 +5952,8 @@ local monster_dungeon_armor = { }, [44907]={ ["monster_base"]=10017, - ["hp"]=602910000, - ["atk"]=5280000, + ["hp"]=720850000, + ["atk"]=6460000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -5965,8 +5965,8 @@ local monster_dungeon_armor = { [45007]={ ["monster_base"]=20036, ["is_boss"]=2, - ["hp"]=1015810000, - ["atk"]=5280000, + ["hp"]=1217600000, + ["atk"]=6460000, ["atk_times"]=4, ["hurt_skill"]={ 30103, @@ -5984,8 +5984,8 @@ local monster_dungeon_armor = { }, [45107]={ ["monster_base"]=10009, - ["hp"]=180880000, - ["atk"]=3430000, + ["hp"]=123300000, + ["atk"]=1030000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -5996,8 +5996,8 @@ local monster_dungeon_armor = { }, [45207]={ ["monster_base"]=10036, - ["hp"]=263550000, - ["atk"]=3820000, + ["hp"]=157710000, + ["atk"]=1090000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -6008,8 +6008,8 @@ local monster_dungeon_armor = { }, [45307]={ ["monster_base"]=10029, - ["hp"]=329070000, - ["atk"]=3950000, + ["hp"]=164880000, + ["atk"]=1130000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -6020,8 +6020,8 @@ local monster_dungeon_armor = { }, [45407]={ ["monster_base"]=10031, - ["hp"]=345780000, - ["atk"]=4720000, + ["hp"]=375380000, + ["atk"]=5770000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -6033,8 +6033,8 @@ local monster_dungeon_armor = { [45507]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=639240000, - ["atk"]=5050000, + ["hp"]=770320000, + ["atk"]=6170000, ["atk_times"]=4, ["hurt_skill"]={ 30040, @@ -6048,8 +6048,8 @@ local monster_dungeon_armor = { }, [45607]={ ["monster_base"]=10022, - ["hp"]=426740000, - ["atk"]=4940000, + ["hp"]=463540000, + ["atk"]=6050000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -6060,8 +6060,8 @@ local monster_dungeon_armor = { }, [45707]={ ["monster_base"]=10017, - ["hp"]=448850000, - ["atk"]=5060000, + ["hp"]=535690000, + ["atk"]=6190000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -6072,8 +6072,8 @@ local monster_dungeon_armor = { }, [45807]={ ["monster_base"]=10041, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=629350000, + ["atk"]=6140000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -6084,8 +6084,8 @@ local monster_dungeon_armor = { }, [45907]={ ["monster_base"]=10004, - ["hp"]=602910000, - ["atk"]=5280000, + ["hp"]=720850000, + ["atk"]=6460000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -6097,8 +6097,8 @@ local monster_dungeon_armor = { [46007]={ ["monster_base"]=20026, ["is_boss"]=2, - ["hp"]=1015810000, - ["atk"]=5280000, + ["hp"]=1217600000, + ["atk"]=6460000, ["atk_times"]=4, ["hurt_skill"]={ 30076, @@ -6115,8 +6115,8 @@ local monster_dungeon_armor = { }, [46107]={ ["monster_base"]=10040, - ["hp"]=180880000, - ["atk"]=3430000, + ["hp"]=123300000, + ["atk"]=1030000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -6127,8 +6127,8 @@ local monster_dungeon_armor = { }, [46207]={ ["monster_base"]=10013, - ["hp"]=263550000, - ["atk"]=3820000, + ["hp"]=157710000, + ["atk"]=1090000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -6139,8 +6139,8 @@ local monster_dungeon_armor = { }, [46307]={ ["monster_base"]=10014, - ["hp"]=329070000, - ["atk"]=3950000, + ["hp"]=164880000, + ["atk"]=1130000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -6151,8 +6151,8 @@ local monster_dungeon_armor = { }, [46407]={ ["monster_base"]=10021, - ["hp"]=345780000, - ["atk"]=4720000, + ["hp"]=375380000, + ["atk"]=5770000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -6164,8 +6164,8 @@ local monster_dungeon_armor = { [46507]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=639240000, - ["atk"]=5050000, + ["hp"]=770320000, + ["atk"]=6170000, ["atk_times"]=4, ["hurt_skill"]={ 30034, @@ -6179,8 +6179,8 @@ local monster_dungeon_armor = { }, [46607]={ ["monster_base"]=10017, - ["hp"]=426740000, - ["atk"]=4940000, + ["hp"]=463540000, + ["atk"]=6050000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -6191,8 +6191,8 @@ local monster_dungeon_armor = { }, [46707]={ ["monster_base"]=10012, - ["hp"]=448850000, - ["atk"]=5060000, + ["hp"]=535690000, + ["atk"]=6190000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -6203,8 +6203,8 @@ local monster_dungeon_armor = { }, [46807]={ ["monster_base"]=10065, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=629350000, + ["atk"]=6140000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -6215,8 +6215,8 @@ local monster_dungeon_armor = { }, [46907]={ ["monster_base"]=10044, - ["hp"]=602910000, - ["atk"]=5280000, + ["hp"]=720850000, + ["atk"]=6460000, ["atk_times"]=3, ["hurt_skill"]={ 20127, @@ -6228,8 +6228,8 @@ local monster_dungeon_armor = { [47007]={ ["monster_base"]=20021, ["is_boss"]=2, - ["hp"]=1015810000, - ["atk"]=5280000, + ["hp"]=1217600000, + ["atk"]=6460000, ["atk_times"]=4, ["hurt_skill"]={ 30061, @@ -6247,8 +6247,8 @@ local monster_dungeon_armor = { }, [47107]={ ["monster_base"]=10026, - ["hp"]=180880000, - ["atk"]=3430000, + ["hp"]=123300000, + ["atk"]=1030000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -6259,8 +6259,8 @@ local monster_dungeon_armor = { }, [47207]={ ["monster_base"]=10021, - ["hp"]=263550000, - ["atk"]=3820000, + ["hp"]=157710000, + ["atk"]=1090000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -6271,8 +6271,8 @@ local monster_dungeon_armor = { }, [47307]={ ["monster_base"]=10036, - ["hp"]=329070000, - ["atk"]=3950000, + ["hp"]=164880000, + ["atk"]=1130000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -6283,8 +6283,8 @@ local monster_dungeon_armor = { }, [47407]={ ["monster_base"]=10009, - ["hp"]=345780000, - ["atk"]=4720000, + ["hp"]=375380000, + ["atk"]=5770000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -6296,8 +6296,8 @@ local monster_dungeon_armor = { [47507]={ ["monster_base"]=20017, ["is_boss"]=1, - ["hp"]=639240000, - ["atk"]=5050000, + ["hp"]=770320000, + ["atk"]=6170000, ["atk_times"]=4, ["hurt_skill"]={ 30049, @@ -6311,8 +6311,8 @@ local monster_dungeon_armor = { }, [47607]={ ["monster_base"]=10035, - ["hp"]=426740000, - ["atk"]=4940000, + ["hp"]=463540000, + ["atk"]=6050000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -6323,8 +6323,8 @@ local monster_dungeon_armor = { }, [47707]={ ["monster_base"]=10027, - ["hp"]=448850000, - ["atk"]=5060000, + ["hp"]=535690000, + ["atk"]=6190000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -6335,8 +6335,8 @@ local monster_dungeon_armor = { }, [47807]={ ["monster_base"]=10005, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=629350000, + ["atk"]=6140000, ["atk_times"]=2, ["hurt_skill"]={ 20013, @@ -6347,8 +6347,8 @@ local monster_dungeon_armor = { }, [47907]={ ["monster_base"]=10037, - ["hp"]=602910000, - ["atk"]=5280000, + ["hp"]=720850000, + ["atk"]=6460000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -6360,8 +6360,8 @@ local monster_dungeon_armor = { [48007]={ ["monster_base"]=20034, ["is_boss"]=2, - ["hp"]=1015810000, - ["atk"]=5280000, + ["hp"]=1217600000, + ["atk"]=6460000, ["atk_times"]=4, ["hurt_skill"]={ 30097, @@ -6380,8 +6380,8 @@ local monster_dungeon_armor = { }, [48107]={ ["monster_base"]=10044, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=243240000, + ["atk"]=5360000, ["atk_times"]=3, ["hurt_skill"]={ 20127, @@ -6392,8 +6392,8 @@ local monster_dungeon_armor = { }, [48207]={ ["monster_base"]=10027, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=362910000, + ["atk"]=5970000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -6404,8 +6404,8 @@ local monster_dungeon_armor = { }, [48307]={ ["monster_base"]=10064, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=452500000, + ["atk"]=6170000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -6416,8 +6416,8 @@ local monster_dungeon_armor = { }, [48407]={ ["monster_base"]=10042, - ["hp"]=365170000, - ["atk"]=4980000, + ["hp"]=477600000, + ["atk"]=7340000, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -6429,8 +6429,8 @@ local monster_dungeon_armor = { [48507]={ ["monster_base"]=30012, ["is_boss"]=1, - ["hp"]=674740000, - ["atk"]=5330000, + ["hp"]=979070000, + ["atk"]=7860000, ["atk_times"]=4, ["hurt_skill"]={ 40005, @@ -6446,8 +6446,8 @@ local monster_dungeon_armor = { }, [48607]={ ["monster_base"]=10001, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=589900000, + ["atk"]=7740000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -6458,8 +6458,8 @@ local monster_dungeon_armor = { }, [48707]={ ["monster_base"]=10050, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=681040000, + ["atk"]=7890000, ["atk_times"]=3, ["hurt_skill"]={ 20145, @@ -6470,8 +6470,8 @@ local monster_dungeon_armor = { }, [48807]={ ["monster_base"]=10003, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=800410000, + ["atk"]=7830000, ["atk_times"]=2, ["hurt_skill"]={ 20007, @@ -6482,8 +6482,8 @@ local monster_dungeon_armor = { }, [48907]={ ["monster_base"]=10057, - ["hp"]=636480000, - ["atk"]=5590000, + ["hp"]=917010000, + ["atk"]=8240000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -6495,8 +6495,8 @@ local monster_dungeon_armor = { [49007]={ ["monster_base"]=20035, ["is_boss"]=2, - ["hp"]=1072430000, - ["atk"]=5590000, + ["hp"]=1547800000, + ["atk"]=8240000, ["atk_times"]=4, ["hurt_skill"]={ 30100, @@ -6515,8 +6515,8 @@ local monster_dungeon_armor = { }, [49107]={ ["monster_base"]=10056, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=243240000, + ["atk"]=5360000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -6527,8 +6527,8 @@ local monster_dungeon_armor = { }, [49207]={ ["monster_base"]=10054, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=362910000, + ["atk"]=5970000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -6539,8 +6539,8 @@ local monster_dungeon_armor = { }, [49307]={ ["monster_base"]=10024, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=452500000, + ["atk"]=6170000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -6551,8 +6551,8 @@ local monster_dungeon_armor = { }, [49407]={ ["monster_base"]=10013, - ["hp"]=365170000, - ["atk"]=4980000, + ["hp"]=477600000, + ["atk"]=7340000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -6564,8 +6564,8 @@ local monster_dungeon_armor = { [49507]={ ["monster_base"]=30019, ["is_boss"]=1, - ["hp"]=674740000, - ["atk"]=5330000, + ["hp"]=979070000, + ["atk"]=7860000, ["atk_times"]=4, ["hurt_skill"]={ 40029, @@ -6584,8 +6584,8 @@ local monster_dungeon_armor = { }, [49607]={ ["monster_base"]=10017, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=589900000, + ["atk"]=7740000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -6596,8 +6596,8 @@ local monster_dungeon_armor = { }, [49707]={ ["monster_base"]=10006, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=681040000, + ["atk"]=7890000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -6608,8 +6608,8 @@ local monster_dungeon_armor = { }, [49807]={ ["monster_base"]=10028, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=800410000, + ["atk"]=7830000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -6620,8 +6620,8 @@ local monster_dungeon_armor = { }, [49907]={ ["monster_base"]=10057, - ["hp"]=636480000, - ["atk"]=5590000, + ["hp"]=917010000, + ["atk"]=8240000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -6633,8 +6633,8 @@ local monster_dungeon_armor = { [50007]={ ["monster_base"]=20023, ["is_boss"]=2, - ["hp"]=1072430000, - ["atk"]=5590000, + ["hp"]=1547800000, + ["atk"]=8240000, ["atk_times"]=4, ["hurt_skill"]={ 30067, @@ -6651,8 +6651,8 @@ local monster_dungeon_armor = { }, [50107]={ ["monster_base"]=10054, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=243240000, + ["atk"]=5360000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -6663,8 +6663,8 @@ local monster_dungeon_armor = { }, [50207]={ ["monster_base"]=10025, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=362910000, + ["atk"]=5970000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -6675,8 +6675,8 @@ local monster_dungeon_armor = { }, [50307]={ ["monster_base"]=10010, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=452500000, + ["atk"]=6170000, ["atk_times"]=3, ["hurt_skill"]={ 20028, @@ -6687,8 +6687,8 @@ local monster_dungeon_armor = { }, [50407]={ ["monster_base"]=10064, - ["hp"]=365170000, - ["atk"]=4980000, + ["hp"]=477600000, + ["atk"]=7340000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -6700,8 +6700,8 @@ local monster_dungeon_armor = { [50507]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=674740000, - ["atk"]=5330000, + ["hp"]=979070000, + ["atk"]=7860000, ["atk_times"]=4, ["hurt_skill"]={ 30043, @@ -6718,8 +6718,8 @@ local monster_dungeon_armor = { }, [50607]={ ["monster_base"]=10007, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=589900000, + ["atk"]=7740000, ["atk_times"]=2, ["hurt_skill"]={ 20019, @@ -6730,8 +6730,8 @@ local monster_dungeon_armor = { }, [50707]={ ["monster_base"]=10040, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=681040000, + ["atk"]=7890000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -6742,8 +6742,8 @@ local monster_dungeon_armor = { }, [50807]={ ["monster_base"]=10018, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=800410000, + ["atk"]=7830000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -6754,8 +6754,8 @@ local monster_dungeon_armor = { }, [50907]={ ["monster_base"]=10043, - ["hp"]=636480000, - ["atk"]=5590000, + ["hp"]=917010000, + ["atk"]=8240000, ["atk_times"]=3, ["hurt_skill"]={ 20124, @@ -6767,8 +6767,8 @@ local monster_dungeon_armor = { [51007]={ ["monster_base"]=20020, ["is_boss"]=2, - ["hp"]=1072430000, - ["atk"]=5590000, + ["hp"]=1547800000, + ["atk"]=8240000, ["atk_times"]=4, ["hurt_skill"]={ 30058, @@ -6786,8 +6786,8 @@ local monster_dungeon_armor = { }, [51107]={ ["monster_base"]=10004, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=243240000, + ["atk"]=5360000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -6798,8 +6798,8 @@ local monster_dungeon_armor = { }, [51207]={ ["monster_base"]=10033, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=362910000, + ["atk"]=5970000, ["atk_times"]=3, ["hurt_skill"]={ 20094, @@ -6810,8 +6810,8 @@ local monster_dungeon_armor = { }, [51307]={ ["monster_base"]=10064, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=452500000, + ["atk"]=6170000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -6822,8 +6822,8 @@ local monster_dungeon_armor = { }, [51407]={ ["monster_base"]=10062, - ["hp"]=365170000, - ["atk"]=4980000, + ["hp"]=477600000, + ["atk"]=7340000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -6835,8 +6835,8 @@ local monster_dungeon_armor = { [51507]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=674740000, - ["atk"]=5330000, + ["hp"]=979070000, + ["atk"]=7860000, ["atk_times"]=4, ["hurt_skill"]={ 30034, @@ -6850,8 +6850,8 @@ local monster_dungeon_armor = { }, [51607]={ ["monster_base"]=10014, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=589900000, + ["atk"]=7740000, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -6862,8 +6862,8 @@ local monster_dungeon_armor = { }, [51707]={ ["monster_base"]=10064, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=681040000, + ["atk"]=7890000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -6874,8 +6874,8 @@ local monster_dungeon_armor = { }, [51807]={ ["monster_base"]=10036, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=800410000, + ["atk"]=7830000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -6886,8 +6886,8 @@ local monster_dungeon_armor = { }, [51907]={ ["monster_base"]=10013, - ["hp"]=636480000, - ["atk"]=5590000, + ["hp"]=917010000, + ["atk"]=8240000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -6899,8 +6899,8 @@ local monster_dungeon_armor = { [52007]={ ["monster_base"]=20024, ["is_boss"]=2, - ["hp"]=1072430000, - ["atk"]=5590000, + ["hp"]=1547800000, + ["atk"]=8240000, ["atk_times"]=4, ["hurt_skill"]={ 30070, @@ -6918,8 +6918,8 @@ local monster_dungeon_armor = { }, [52107]={ ["monster_base"]=10006, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=243240000, + ["atk"]=5360000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -6930,8 +6930,8 @@ local monster_dungeon_armor = { }, [52207]={ ["monster_base"]=10026, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=362910000, + ["atk"]=5970000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -6942,8 +6942,8 @@ local monster_dungeon_armor = { }, [52307]={ ["monster_base"]=10029, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=452500000, + ["atk"]=6170000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -6954,8 +6954,8 @@ local monster_dungeon_armor = { }, [52407]={ ["monster_base"]=10009, - ["hp"]=365170000, - ["atk"]=4980000, + ["hp"]=477600000, + ["atk"]=7340000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -6967,8 +6967,8 @@ local monster_dungeon_armor = { [52507]={ ["monster_base"]=20027, ["is_boss"]=1, - ["hp"]=674740000, - ["atk"]=5330000, + ["hp"]=979070000, + ["atk"]=7860000, ["atk_times"]=4, ["hurt_skill"]={ 30079, @@ -6982,8 +6982,8 @@ local monster_dungeon_armor = { }, [52607]={ ["monster_base"]=10035, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=589900000, + ["atk"]=7740000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -6994,8 +6994,8 @@ local monster_dungeon_armor = { }, [52707]={ ["monster_base"]=10043, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=681040000, + ["atk"]=7890000, ["atk_times"]=3, ["hurt_skill"]={ 20124, @@ -7006,8 +7006,8 @@ local monster_dungeon_armor = { }, [52807]={ ["monster_base"]=10030, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=800410000, + ["atk"]=7830000, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -7018,8 +7018,8 @@ local monster_dungeon_armor = { }, [52907]={ ["monster_base"]=10009, - ["hp"]=636480000, - ["atk"]=5590000, + ["hp"]=917010000, + ["atk"]=8240000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -7031,8 +7031,8 @@ local monster_dungeon_armor = { [53007]={ ["monster_base"]=20021, ["is_boss"]=2, - ["hp"]=1072430000, - ["atk"]=5590000, + ["hp"]=1547800000, + ["atk"]=8240000, ["atk_times"]=4, ["hurt_skill"]={ 30061, @@ -7050,8 +7050,8 @@ local monster_dungeon_armor = { }, [53107]={ ["monster_base"]=10057, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=243240000, + ["atk"]=5360000, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -7062,8 +7062,8 @@ local monster_dungeon_armor = { }, [53207]={ ["monster_base"]=10006, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=362910000, + ["atk"]=5970000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -7074,8 +7074,8 @@ local monster_dungeon_armor = { }, [53307]={ ["monster_base"]=10051, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=452500000, + ["atk"]=6170000, ["atk_times"]=3, ["hurt_skill"]={ 20148, @@ -7086,8 +7086,8 @@ local monster_dungeon_armor = { }, [53407]={ ["monster_base"]=10019, - ["hp"]=365170000, - ["atk"]=4980000, + ["hp"]=477600000, + ["atk"]=7340000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -7099,8 +7099,8 @@ local monster_dungeon_armor = { [53507]={ ["monster_base"]=30009, ["is_boss"]=1, - ["hp"]=674740000, - ["atk"]=5330000, + ["hp"]=979070000, + ["atk"]=7860000, ["atk_times"]=4, ["hurt_skill"]={ 40021, @@ -7115,8 +7115,8 @@ local monster_dungeon_armor = { }, [53607]={ ["monster_base"]=10024, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=589900000, + ["atk"]=7740000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -7127,8 +7127,8 @@ local monster_dungeon_armor = { }, [53707]={ ["monster_base"]=10001, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=681040000, + ["atk"]=7890000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -7139,8 +7139,8 @@ local monster_dungeon_armor = { }, [53807]={ ["monster_base"]=10015, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=800410000, + ["atk"]=7830000, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -7151,8 +7151,8 @@ local monster_dungeon_armor = { }, [53907]={ ["monster_base"]=10035, - ["hp"]=636480000, - ["atk"]=5590000, + ["hp"]=917010000, + ["atk"]=8240000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -7164,8 +7164,8 @@ local monster_dungeon_armor = { [54007]={ ["monster_base"]=20038, ["is_boss"]=2, - ["hp"]=1072430000, - ["atk"]=5590000, + ["hp"]=1547800000, + ["atk"]=8240000, ["atk_times"]=4, ["hurt_skill"]={ 30109, @@ -7186,8 +7186,8 @@ local monster_dungeon_armor = { }, [54107]={ ["monster_base"]=10045, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=270340000, + ["atk"]=5950000, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -7198,8 +7198,8 @@ local monster_dungeon_armor = { }, [54207]={ ["monster_base"]=10012, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=403210000, + ["atk"]=6660000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -7210,8 +7210,8 @@ local monster_dungeon_armor = { }, [54307]={ ["monster_base"]=10035, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=502130000, + ["atk"]=6870000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -7222,8 +7222,8 @@ local monster_dungeon_armor = { }, [54407]={ ["monster_base"]=10004, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=530250000, + ["atk"]=8190000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -7235,8 +7235,8 @@ local monster_dungeon_armor = { [54507]={ ["monster_base"]=20025, ["is_boss"]=1, - ["hp"]=722740000, - ["atk"]=5790000, + ["hp"]=1086210000, + ["atk"]=8730000, ["atk_times"]=4, ["hurt_skill"]={ 30073, @@ -7253,8 +7253,8 @@ local monster_dungeon_armor = { }, [54607]={ ["monster_base"]=10012, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=654930000, + ["atk"]=8630000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -7265,8 +7265,8 @@ local monster_dungeon_armor = { }, [54707]={ ["monster_base"]=10009, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=755890000, + ["atk"]=8780000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -7277,8 +7277,8 @@ local monster_dungeon_armor = { }, [54807]={ ["monster_base"]=10021, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=888130000, + ["atk"]=8730000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -7289,8 +7289,8 @@ local monster_dungeon_armor = { }, [54907]={ ["monster_base"]=10029, - ["hp"]=681920000, - ["atk"]=6080000, + ["hp"]=1017840000, + ["atk"]=9160000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -7302,8 +7302,8 @@ local monster_dungeon_armor = { [55007]={ ["monster_base"]=20036, ["is_boss"]=2, - ["hp"]=1148710000, - ["atk"]=6080000, + ["hp"]=1717380000, + ["atk"]=9160000, ["atk_times"]=4, ["hurt_skill"]={ 30103, @@ -7321,8 +7321,8 @@ local monster_dungeon_armor = { }, [55107]={ ["monster_base"]=10065, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=270340000, + ["atk"]=5950000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -7333,8 +7333,8 @@ local monster_dungeon_armor = { }, [55207]={ ["monster_base"]=10008, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=403210000, + ["atk"]=6660000, ["atk_times"]=2, ["hurt_skill"]={ 20022, @@ -7345,8 +7345,8 @@ local monster_dungeon_armor = { }, [55307]={ ["monster_base"]=10024, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=502130000, + ["atk"]=6870000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -7357,8 +7357,8 @@ local monster_dungeon_armor = { }, [55407]={ ["monster_base"]=10038, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=530250000, + ["atk"]=8190000, ["atk_times"]=3, ["hurt_skill"]={ 20109, @@ -7370,8 +7370,8 @@ local monster_dungeon_armor = { [55507]={ ["monster_base"]=30020, ["is_boss"]=1, - ["hp"]=722740000, - ["atk"]=5790000, + ["hp"]=1086210000, + ["atk"]=8730000, ["atk_times"]=4, ["hurt_skill"]={ 40033, @@ -7386,8 +7386,8 @@ local monster_dungeon_armor = { }, [55607]={ ["monster_base"]=10048, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=654930000, + ["atk"]=8630000, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -7398,8 +7398,8 @@ local monster_dungeon_armor = { }, [55707]={ ["monster_base"]=10023, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=755890000, + ["atk"]=8780000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -7410,8 +7410,8 @@ local monster_dungeon_armor = { }, [55807]={ ["monster_base"]=10017, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=888130000, + ["atk"]=8730000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -7422,8 +7422,8 @@ local monster_dungeon_armor = { }, [55907]={ ["monster_base"]=10041, - ["hp"]=681920000, - ["atk"]=6080000, + ["hp"]=1017840000, + ["atk"]=9160000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -7435,8 +7435,8 @@ local monster_dungeon_armor = { [56007]={ ["monster_base"]=20018, ["is_boss"]=2, - ["hp"]=1148710000, - ["atk"]=6080000, + ["hp"]=1717380000, + ["atk"]=9160000, ["atk_times"]=4, ["hurt_skill"]={ 30052, @@ -7454,8 +7454,8 @@ local monster_dungeon_armor = { }, [56107]={ ["monster_base"]=10024, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=270340000, + ["atk"]=5950000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -7466,8 +7466,8 @@ local monster_dungeon_armor = { }, [56207]={ ["monster_base"]=10006, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=403210000, + ["atk"]=6660000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -7478,8 +7478,8 @@ local monster_dungeon_armor = { }, [56307]={ ["monster_base"]=10040, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=502130000, + ["atk"]=6870000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -7490,8 +7490,8 @@ local monster_dungeon_armor = { }, [56407]={ ["monster_base"]=10061, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=530250000, + ["atk"]=8190000, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -7503,8 +7503,8 @@ local monster_dungeon_armor = { [56507]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=722740000, - ["atk"]=5790000, + ["hp"]=1086210000, + ["atk"]=8730000, ["atk_times"]=4, ["hurt_skill"]={ 30013, @@ -7521,8 +7521,8 @@ local monster_dungeon_armor = { }, [56607]={ ["monster_base"]=10009, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=654930000, + ["atk"]=8630000, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -7533,8 +7533,8 @@ local monster_dungeon_armor = { }, [56707]={ ["monster_base"]=10015, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=755890000, + ["atk"]=8780000, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -7545,8 +7545,8 @@ local monster_dungeon_armor = { }, [56807]={ ["monster_base"]=10018, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=888130000, + ["atk"]=8730000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -7557,8 +7557,8 @@ local monster_dungeon_armor = { }, [56907]={ ["monster_base"]=10040, - ["hp"]=681920000, - ["atk"]=6080000, + ["hp"]=1017840000, + ["atk"]=9160000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -7570,8 +7570,8 @@ local monster_dungeon_armor = { [57007]={ ["monster_base"]=20025, ["is_boss"]=2, - ["hp"]=1148710000, - ["atk"]=6080000, + ["hp"]=1717380000, + ["atk"]=9160000, ["atk_times"]=4, ["hurt_skill"]={ 30073, @@ -7588,8 +7588,8 @@ local monster_dungeon_armor = { }, [57107]={ ["monster_base"]=10013, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=270340000, + ["atk"]=5950000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -7600,8 +7600,8 @@ local monster_dungeon_armor = { }, [57207]={ ["monster_base"]=10060, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=403210000, + ["atk"]=6660000, ["atk_times"]=3, ["hurt_skill"]={ 20175, @@ -7612,8 +7612,8 @@ local monster_dungeon_armor = { }, [57307]={ ["monster_base"]=10019, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=502130000, + ["atk"]=6870000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -7624,8 +7624,8 @@ local monster_dungeon_armor = { }, [57407]={ ["monster_base"]=10004, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=530250000, + ["atk"]=8190000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -7637,8 +7637,8 @@ local monster_dungeon_armor = { [57507]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=722740000, - ["atk"]=5790000, + ["hp"]=1086210000, + ["atk"]=8730000, ["atk_times"]=4, ["hurt_skill"]={ 30034, @@ -7652,8 +7652,8 @@ local monster_dungeon_armor = { }, [57607]={ ["monster_base"]=10061, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=654930000, + ["atk"]=8630000, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -7664,8 +7664,8 @@ local monster_dungeon_armor = { }, [57707]={ ["monster_base"]=10046, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=755890000, + ["atk"]=8780000, ["atk_times"]=3, ["hurt_skill"]={ 20133, @@ -7676,8 +7676,8 @@ local monster_dungeon_armor = { }, [57807]={ ["monster_base"]=10039, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=888130000, + ["atk"]=8730000, ["atk_times"]=3, ["hurt_skill"]={ 20112, @@ -7688,8 +7688,8 @@ local monster_dungeon_armor = { }, [57907]={ ["monster_base"]=10027, - ["hp"]=681920000, - ["atk"]=6080000, + ["hp"]=1017840000, + ["atk"]=9160000, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -7701,8 +7701,8 @@ local monster_dungeon_armor = { [58007]={ ["monster_base"]=20019, ["is_boss"]=2, - ["hp"]=1148710000, - ["atk"]=6080000, + ["hp"]=1717380000, + ["atk"]=9160000, ["atk_times"]=4, ["hurt_skill"]={ 30055, @@ -7720,8 +7720,8 @@ local monster_dungeon_armor = { }, [58107]={ ["monster_base"]=10037, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=270340000, + ["atk"]=5950000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -7732,8 +7732,8 @@ local monster_dungeon_armor = { }, [58207]={ ["monster_base"]=10034, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=403210000, + ["atk"]=6660000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -7744,8 +7744,8 @@ local monster_dungeon_armor = { }, [58307]={ ["monster_base"]=10022, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=502130000, + ["atk"]=6870000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -7756,8 +7756,8 @@ local monster_dungeon_armor = { }, [58407]={ ["monster_base"]=10029, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=530250000, + ["atk"]=8190000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -7769,8 +7769,8 @@ local monster_dungeon_armor = { [58507]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=722740000, - ["atk"]=5790000, + ["hp"]=1086210000, + ["atk"]=8730000, ["atk_times"]=4, ["hurt_skill"]={ 30043, @@ -7787,8 +7787,8 @@ local monster_dungeon_armor = { }, [58607]={ ["monster_base"]=10017, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=654930000, + ["atk"]=8630000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -7799,8 +7799,8 @@ local monster_dungeon_armor = { }, [58707]={ ["monster_base"]=10065, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=755890000, + ["atk"]=8780000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -7811,8 +7811,8 @@ local monster_dungeon_armor = { }, [58807]={ ["monster_base"]=10016, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=888130000, + ["atk"]=8730000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -7823,8 +7823,8 @@ local monster_dungeon_armor = { }, [58907]={ ["monster_base"]=10064, - ["hp"]=681920000, - ["atk"]=6080000, + ["hp"]=1017840000, + ["atk"]=9160000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -7836,8 +7836,8 @@ local monster_dungeon_armor = { [59007]={ ["monster_base"]=20024, ["is_boss"]=2, - ["hp"]=1148710000, - ["atk"]=6080000, + ["hp"]=1717380000, + ["atk"]=9160000, ["atk_times"]=4, ["hurt_skill"]={ 30070, @@ -7855,8 +7855,8 @@ local monster_dungeon_armor = { }, [59107]={ ["monster_base"]=10022, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=270340000, + ["atk"]=5950000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -7867,8 +7867,8 @@ local monster_dungeon_armor = { }, [59207]={ ["monster_base"]=10028, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=403210000, + ["atk"]=6660000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -7879,8 +7879,8 @@ local monster_dungeon_armor = { }, [59307]={ ["monster_base"]=10006, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=502130000, + ["atk"]=6870000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -7891,8 +7891,8 @@ local monster_dungeon_armor = { }, [59407]={ ["monster_base"]=10041, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=530250000, + ["atk"]=8190000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -7904,8 +7904,8 @@ local monster_dungeon_armor = { [59507]={ ["monster_base"]=20002, ["is_boss"]=1, - ["hp"]=722740000, - ["atk"]=5790000, + ["hp"]=1086210000, + ["atk"]=8730000, ["atk_times"]=4, ["hurt_skill"]={ 30004, @@ -7919,8 +7919,8 @@ local monster_dungeon_armor = { }, [59607]={ ["monster_base"]=10040, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=654930000, + ["atk"]=8630000, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -7931,8 +7931,8 @@ local monster_dungeon_armor = { }, [59707]={ ["monster_base"]=10052, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=755890000, + ["atk"]=8780000, ["atk_times"]=3, ["hurt_skill"]={ 20151, @@ -7943,8 +7943,8 @@ local monster_dungeon_armor = { }, [59807]={ ["monster_base"]=10017, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=888130000, + ["atk"]=8730000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -7955,8 +7955,8 @@ local monster_dungeon_armor = { }, [59907]={ ["monster_base"]=10064, - ["hp"]=681920000, - ["atk"]=6080000, + ["hp"]=1017840000, + ["atk"]=9160000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -7968,8 +7968,8 @@ local monster_dungeon_armor = { [60007]={ ["monster_base"]=20031, ["is_boss"]=2, - ["hp"]=1148710000, - ["atk"]=6080000, + ["hp"]=1717380000, + ["atk"]=9160000, ["atk_times"]=4, ["hurt_skill"]={ 30091, diff --git a/lua/app/config/monster_dungeon_equip.lua b/lua/app/config/monster_dungeon_equip.lua index ec959e5b..d4a1c9f2 100644 --- a/lua/app/config/monster_dungeon_equip.lua +++ b/lua/app/config/monster_dungeon_equip.lua @@ -1,7 +1,7 @@ local monster_dungeon_equip = { [106]={ ["monster_base"]=10056, - ["hp"]=76930000, + ["hp"]=81620000, ["atk"]=1390000, ["atk_times"]=3, ["hurt_skill"]={ @@ -16,7 +16,7 @@ local monster_dungeon_equip = { }, [206]={ ["monster_base"]=10045, - ["hp"]=93400000, + ["hp"]=99240000, ["atk"]=1930000, ["atk_times"]=3, ["hurt_skill"]={ @@ -31,7 +31,7 @@ local monster_dungeon_equip = { }, [306]={ ["monster_base"]=10028, - ["hp"]=153020000, + ["hp"]=178640000, ["atk"]=2140000, ["atk_times"]=3, ["hurt_skill"]={ @@ -46,7 +46,7 @@ local monster_dungeon_equip = { }, [406]={ ["monster_base"]=10003, - ["hp"]=203320000, + ["hp"]=237440000, ["atk"]=2220000, ["atk_times"]=2, ["hurt_skill"]={ @@ -62,7 +62,7 @@ local monster_dungeon_equip = { [506]={ ["monster_base"]=20041, ["is_boss"]=2, - ["hp"]=386900000, + ["hp"]=431900000, ["atk"]=2260000, ["atk_times"]=4, ["hurt_skill"]={ @@ -82,7 +82,7 @@ local monster_dungeon_equip = { }, [606]={ ["monster_base"]=10060, - ["hp"]=85320000, + ["hp"]=90860000, ["atk"]=1540000, ["atk_times"]=3, ["hurt_skill"]={ @@ -97,7 +97,7 @@ local monster_dungeon_equip = { }, [706]={ ["monster_base"]=10055, - ["hp"]=103120000, + ["hp"]=110400000, ["atk"]=2150000, ["atk_times"]=3, ["hurt_skill"]={ @@ -112,7 +112,7 @@ local monster_dungeon_equip = { }, [806]={ ["monster_base"]=10027, - ["hp"]=168890000, + ["hp"]=198820000, ["atk"]=2380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -127,7 +127,7 @@ local monster_dungeon_equip = { }, [906]={ ["monster_base"]=10064, - ["hp"]=224600000, + ["hp"]=264180000, ["atk"]=2470000, ["atk_times"]=3, ["hurt_skill"]={ @@ -143,7 +143,7 @@ local monster_dungeon_equip = { [1006]={ ["monster_base"]=20040, ["is_boss"]=2, - ["hp"]=426150000, + ["hp"]=480480000, ["atk"]=2520000, ["atk_times"]=4, ["hurt_skill"]={ @@ -162,7 +162,7 @@ local monster_dungeon_equip = { }, [1106]={ ["monster_base"]=10015, - ["hp"]=93300000, + ["hp"]=98780000, ["atk"]=1680000, ["atk_times"]=3, ["hurt_skill"]={ @@ -177,7 +177,7 @@ local monster_dungeon_equip = { }, [1206]={ ["monster_base"]=10025, - ["hp"]=112820000, + ["hp"]=119880000, ["atk"]=2340000, ["atk_times"]=3, ["hurt_skill"]={ @@ -192,7 +192,7 @@ local monster_dungeon_equip = { }, [1306]={ ["monster_base"]=10030, - ["hp"]=191790000, + ["hp"]=215800000, ["atk"]=2590000, ["atk_times"]=3, ["hurt_skill"]={ @@ -207,7 +207,7 @@ local monster_dungeon_equip = { }, [1406]={ ["monster_base"]=10018, - ["hp"]=255070000, + ["hp"]=286720000, ["atk"]=2690000, ["atk_times"]=3, ["hurt_skill"]={ @@ -223,7 +223,7 @@ local monster_dungeon_equip = { [1506]={ ["monster_base"]=20039, ["is_boss"]=2, - ["hp"]=494490000, + ["hp"]=521500000, ["atk"]=2740000, ["atk_times"]=4, ["hurt_skill"]={ @@ -242,8 +242,8 @@ local monster_dungeon_equip = { }, [1606]={ ["monster_base"]=10004, - ["hp"]=119700000, - ["atk"]=1830000, + ["hp"]=118220000, + ["atk"]=2020000, ["atk_times"]=2, ["hurt_skill"]={ 20010, @@ -257,8 +257,8 @@ local monster_dungeon_equip = { }, [1706]={ ["monster_base"]=10049, - ["hp"]=143630000, - ["atk"]=2540000, + ["hp"]=143890000, + ["atk"]=2820000, ["atk_times"]=3, ["hurt_skill"]={ 20142, @@ -272,8 +272,8 @@ local monster_dungeon_equip = { }, [1806]={ ["monster_base"]=10037, - ["hp"]=235050000, - ["atk"]=2810000, + ["hp"]=259680000, + ["atk"]=3120000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -287,8 +287,8 @@ local monster_dungeon_equip = { }, [1906]={ ["monster_base"]=10016, - ["hp"]=312870000, - ["atk"]=2920000, + ["hp"]=351150000, + ["atk"]=3240000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -303,8 +303,8 @@ local monster_dungeon_equip = { [2006]={ ["monster_base"]=20043, ["is_boss"]=2, - ["hp"]=566760000, - ["atk"]=2980000, + ["hp"]=638400000, + ["atk"]=3310000, ["atk_times"]=4, ["hurt_skill"]={ 30120, @@ -323,8 +323,8 @@ local monster_dungeon_equip = { }, [2106]={ ["monster_base"]=10022, - ["hp"]=136880000, - ["atk"]=2010000, + ["hp"]=126040000, + ["atk"]=2180000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -338,8 +338,8 @@ local monster_dungeon_equip = { }, [2206]={ ["monster_base"]=10032, - ["hp"]=163040000, - ["atk"]=2780000, + ["hp"]=153470000, + ["atk"]=3010000, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -353,8 +353,8 @@ local monster_dungeon_equip = { }, [2306]={ ["monster_base"]=10013, - ["hp"]=267170000, - ["atk"]=3070000, + ["hp"]=276960000, + ["atk"]=3330000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -368,8 +368,8 @@ local monster_dungeon_equip = { }, [2406]={ ["monster_base"]=10001, - ["hp"]=355450000, - ["atk"]=3200000, + ["hp"]=374550000, + ["atk"]=3480000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -384,8 +384,8 @@ local monster_dungeon_equip = { [2506]={ ["monster_base"]=20042, ["is_boss"]=2, - ["hp"]=643710000, - ["atk"]=3260000, + ["hp"]=680700000, + ["atk"]=3540000, ["atk_times"]=4, ["hurt_skill"]={ 30123, @@ -403,8 +403,8 @@ local monster_dungeon_equip = { }, [2606]={ ["monster_base"]=10045, - ["hp"]=147550000, - ["atk"]=2190000, + ["hp"]=140300000, + ["atk"]=2400000, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -418,8 +418,8 @@ local monster_dungeon_equip = { }, [2706]={ ["monster_base"]=10056, - ["hp"]=175200000, - ["atk"]=3030000, + ["hp"]=169470000, + ["atk"]=3320000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -433,8 +433,8 @@ local monster_dungeon_equip = { }, [2806]={ ["monster_base"]=10003, - ["hp"]=287270000, - ["atk"]=3340000, + ["hp"]=306100000, + ["atk"]=3660000, ["atk_times"]=2, ["hurt_skill"]={ 20007, @@ -448,8 +448,8 @@ local monster_dungeon_equip = { }, [2906]={ ["monster_base"]=10028, - ["hp"]=382140000, - ["atk"]=3490000, + ["hp"]=415400000, + ["atk"]=3830000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -464,8 +464,8 @@ local monster_dungeon_equip = { [3006]={ ["monster_base"]=20041, ["is_boss"]=2, - ["hp"]=691660000, - ["atk"]=3560000, + ["hp"]=754750000, + ["atk"]=3970000, ["atk_times"]=4, ["hurt_skill"]={ 30126, @@ -484,8 +484,8 @@ local monster_dungeon_equip = { }, [3106]={ ["monster_base"]=10052, - ["hp"]=161570000, - ["atk"]=2380000, + ["hp"]=153460000, + ["atk"]=2630000, ["atk_times"]=3, ["hurt_skill"]={ 20151, @@ -499,8 +499,8 @@ local monster_dungeon_equip = { }, [3206]={ ["monster_base"]=10062, - ["hp"]=191650000, - ["atk"]=3300000, + ["hp"]=185090000, + ["atk"]=3630000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -514,8 +514,8 @@ local monster_dungeon_equip = { }, [3306]={ ["monster_base"]=10036, - ["hp"]=313710000, - ["atk"]=3620000, + ["hp"]=334280000, + ["atk"]=4000000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -529,8 +529,8 @@ local monster_dungeon_equip = { }, [3406]={ ["monster_base"]=10061, - ["hp"]=417370000, - ["atk"]=3790000, + ["hp"]=453650000, + ["atk"]=4190000, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -545,8 +545,8 @@ local monster_dungeon_equip = { [3506]={ ["monster_base"]=20040, ["is_boss"]=2, - ["hp"]=754850000, - ["atk"]=3870000, + ["hp"]=824060000, + ["atk"]=4350000, ["atk_times"]=4, ["hurt_skill"]={ 30129, @@ -564,8 +564,8 @@ local monster_dungeon_equip = { }, [3606]={ ["monster_base"]=10030, - ["hp"]=175230000, - ["atk"]=2580000, + ["hp"]=163330000, + ["atk"]=2810000, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -579,8 +579,8 @@ local monster_dungeon_equip = { }, [3706]={ ["monster_base"]=10015, - ["hp"]=207360000, - ["atk"]=3560000, + ["hp"]=196740000, + ["atk"]=3870000, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -594,8 +594,8 @@ local monster_dungeon_equip = { }, [3806]={ ["monster_base"]=10025, - ["hp"]=338580000, - ["atk"]=3900000, + ["hp"]=355260000, + ["atk"]=4250000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -609,8 +609,8 @@ local monster_dungeon_equip = { }, [3906]={ ["monster_base"]=10034, - ["hp"]=450950000, - ["atk"]=4090000, + ["hp"]=481950000, + ["atk"]=4460000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -625,8 +625,8 @@ local monster_dungeon_equip = { [4006]={ ["monster_base"]=20039, ["is_boss"]=2, - ["hp"]=814970000, - ["atk"]=4170000, + ["hp"]=875620000, + ["atk"]=4630000, ["atk_times"]=4, ["hurt_skill"]={ 30117, @@ -644,8 +644,8 @@ local monster_dungeon_equip = { }, [4106]={ ["monster_base"]=10054, - ["hp"]=182360000, - ["atk"]=2660000, + ["hp"]=177360000, + ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -659,8 +659,8 @@ local monster_dungeon_equip = { }, [4206]={ ["monster_base"]=10037, - ["hp"]=215460000, - ["atk"]=3660000, + ["hp"]=215560000, + ["atk"]=4230000, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -674,8 +674,8 @@ local monster_dungeon_equip = { }, [4306]={ ["monster_base"]=10012, - ["hp"]=351510000, - ["atk"]=4010000, + ["hp"]=386500000, + ["atk"]=4650000, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -689,8 +689,8 @@ local monster_dungeon_equip = { }, [4406]={ ["monster_base"]=10049, - ["hp"]=468340000, - ["atk"]=4210000, + ["hp"]=521660000, + ["atk"]=4870000, ["atk_times"]=3, ["hurt_skill"]={ 20142, @@ -705,8 +705,8 @@ local monster_dungeon_equip = { [4506]={ ["monster_base"]=20043, ["is_boss"]=2, - ["hp"]=846340000, - ["atk"]=4290000, + ["hp"]=947700000, + ["atk"]=5140000, ["atk_times"]=4, ["hurt_skill"]={ 30120, @@ -725,8 +725,8 @@ local monster_dungeon_equip = { }, [4606]={ ["monster_base"]=10042, - ["hp"]=187110000, - ["atk"]=2740000, + ["hp"]=187920000, + ["atk"]=3250000, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -740,8 +740,8 @@ local monster_dungeon_equip = { }, [4706]={ ["monster_base"]=10026, - ["hp"]=220970000, - ["atk"]=3780000, + ["hp"]=228230000, + ["atk"]=4480000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -755,8 +755,8 @@ local monster_dungeon_equip = { }, [4806]={ ["monster_base"]=10019, - ["hp"]=360430000, - ["atk"]=4140000, + ["hp"]=409000000, + ["atk"]=4940000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -770,8 +770,8 @@ local monster_dungeon_equip = { }, [4906]={ ["monster_base"]=10001, - ["hp"]=480060000, - ["atk"]=4340000, + ["hp"]=551930000, + ["atk"]=5160000, ["atk_times"]=2, ["hurt_skill"]={ 20001, @@ -786,8 +786,8 @@ local monster_dungeon_equip = { [5006]={ ["monster_base"]=20042, ["is_boss"]=2, - ["hp"]=867510000, - ["atk"]=4430000, + ["hp"]=1002610000, + ["atk"]=5440000, ["atk_times"]=4, ["hurt_skill"]={ 30132, @@ -805,8 +805,8 @@ local monster_dungeon_equip = { }, [5106]={ ["monster_base"]=10045, - ["hp"]=200880000, - ["atk"]=2910000, + ["hp"]=199440000, + ["atk"]=3450000, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -820,8 +820,8 @@ local monster_dungeon_equip = { }, [5206]={ ["monster_base"]=10056, - ["hp"]=236460000, - ["atk"]=4010000, + ["hp"]=242090000, + ["atk"]=4750000, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -835,8 +835,8 @@ local monster_dungeon_equip = { }, [5306]={ ["monster_base"]=10003, - ["hp"]=385650000, - ["atk"]=4400000, + ["hp"]=433750000, + ["atk"]=5240000, ["atk_times"]=2, ["hurt_skill"]={ 20007, @@ -850,8 +850,8 @@ local monster_dungeon_equip = { }, [5406]={ ["monster_base"]=10028, - ["hp"]=513230000, - ["atk"]=4600000, + ["hp"]=585310000, + ["atk"]=5480000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -866,8 +866,8 @@ local monster_dungeon_equip = { [5506]={ ["monster_base"]=20041, ["is_boss"]=2, - ["hp"]=927400000, - ["atk"]=4690000, + ["hp"]=1063140000, + ["atk"]=5780000, ["atk_times"]=4, ["hurt_skill"]={ 30126, @@ -886,8 +886,8 @@ local monster_dungeon_equip = { }, [5606]={ ["monster_base"]=10029, - ["hp"]=202710000, - ["atk"]=2990000, + ["hp"]=221510000, + ["atk"]=4040000, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -901,8 +901,8 @@ local monster_dungeon_equip = { }, [5706]={ ["monster_base"]=10055, - ["hp"]=238240000, - ["atk"]=4130000, + ["hp"]=267580000, + ["atk"]=5560000, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -916,8 +916,8 @@ local monster_dungeon_equip = { }, [5806]={ ["monster_base"]=10051, - ["hp"]=388530000, - ["atk"]=4530000, + ["hp"]=484180000, + ["atk"]=6110000, ["atk_times"]=3, ["hurt_skill"]={ 20148, @@ -931,8 +931,8 @@ local monster_dungeon_equip = { }, [5906]={ ["monster_base"]=10064, - ["hp"]=517080000, - ["atk"]=4730000, + ["hp"]=650420000, + ["atk"]=6400000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -947,8 +947,8 @@ local monster_dungeon_equip = { [6006]={ ["monster_base"]=20040, ["is_boss"]=2, - ["hp"]=933980000, - ["atk"]=4820000, + ["hp"]=1181290000, + ["atk"]=6660000, ["atk_times"]=4, ["hurt_skill"]={ 30135, @@ -966,8 +966,8 @@ local monster_dungeon_equip = { }, [6106]={ ["monster_base"]=10015, - ["hp"]=216480000, - ["atk"]=3180000, + ["hp"]=227560000, + ["atk"]=4160000, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -981,8 +981,8 @@ local monster_dungeon_equip = { }, [6206]={ ["monster_base"]=10025, - ["hp"]=254320000, - ["atk"]=4380000, + ["hp"]=274900000, + ["atk"]=5710000, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -996,8 +996,8 @@ local monster_dungeon_equip = { }, [6306]={ ["monster_base"]=10021, - ["hp"]=415070000, - ["atk"]=4810000, + ["hp"]=497380000, + ["atk"]=6280000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -1011,8 +1011,8 @@ local monster_dungeon_equip = { }, [6406]={ ["monster_base"]=10034, - ["hp"]=552120000, - ["atk"]=5030000, + ["hp"]=668140000, + ["atk"]=6580000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -1027,8 +1027,8 @@ local monster_dungeon_equip = { [6506]={ ["monster_base"]=20039, ["is_boss"]=2, - ["hp"]=996810000, - ["atk"]=5130000, + ["hp"]=1213440000, + ["atk"]=6850000, ["atk_times"]=4, ["hurt_skill"]={ 30117, @@ -1046,8 +1046,8 @@ local monster_dungeon_equip = { }, [6606]={ ["monster_base"]=10049, - ["hp"]=221080000, - ["atk"]=3280000, + ["hp"]=151200000, + ["atk"]=1050000, ["atk_times"]=3, ["hurt_skill"]={ 20142, @@ -1061,8 +1061,8 @@ local monster_dungeon_equip = { }, [6706]={ ["monster_base"]=10006, - ["hp"]=259330000, - ["atk"]=4500000, + ["hp"]=282760000, + ["atk"]=5870000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -1076,8 +1076,8 @@ local monster_dungeon_equip = { }, [6806]={ ["monster_base"]=10054, - ["hp"]=423100000, - ["atk"]=4950000, + ["hp"]=511630000, + ["atk"]=6460000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -1091,8 +1091,8 @@ local monster_dungeon_equip = { }, [6906]={ ["monster_base"]=10024, - ["hp"]=562720000, - ["atk"]=5180000, + ["hp"]=687320000, + ["atk"]=6770000, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -1107,8 +1107,8 @@ local monster_dungeon_equip = { [7006]={ ["monster_base"]=20043, ["is_boss"]=2, - ["hp"]=1015810000, - ["atk"]=5280000, + ["hp"]=1248040000, + ["atk"]=7050000, ["atk_times"]=4, ["hurt_skill"]={ 30120, @@ -1127,8 +1127,8 @@ local monster_dungeon_equip = { }, [7106]={ ["monster_base"]=10019, - ["hp"]=225650000, - ["atk"]=3370000, + ["hp"]=273750000, + ["atk"]=4990000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -1142,8 +1142,8 @@ local monster_dungeon_equip = { }, [7206]={ ["monster_base"]=10035, - ["hp"]=264660000, - ["atk"]=4630000, + ["hp"]=330170000, + ["atk"]=6840000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -1157,8 +1157,8 @@ local monster_dungeon_equip = { }, [7306]={ ["monster_base"]=10026, - ["hp"]=431730000, - ["atk"]=5090000, + ["hp"]=624370000, + ["atk"]=7530000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -1172,8 +1172,8 @@ local monster_dungeon_equip = { }, [7406]={ ["monster_base"]=10041, - ["hp"]=574040000, - ["atk"]=5330000, + ["hp"]=801000000, + ["atk"]=7910000, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -1188,8 +1188,8 @@ local monster_dungeon_equip = { [7506]={ ["monster_base"]=20042, ["is_boss"]=2, - ["hp"]=1036280000, - ["atk"]=5440000, + ["hp"]=1454090000, + ["atk"]=8290000, ["atk_times"]=4, ["hurt_skill"]={ 30138, @@ -1207,8 +1207,8 @@ local monster_dungeon_equip = { }, [7606]={ ["monster_base"]=10053, - ["hp"]=233950000, - ["atk"]=3470000, + ["hp"]=289120000, + ["atk"]=5270000, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -1222,8 +1222,8 @@ local monster_dungeon_equip = { }, [7706]={ ["monster_base"]=10043, - ["hp"]=273880000, - ["atk"]=4760000, + ["hp"]=348580000, + ["atk"]=7220000, ["atk_times"]=3, ["hurt_skill"]={ 20124, @@ -1237,8 +1237,8 @@ local monster_dungeon_equip = { }, [7806]={ ["monster_base"]=10033, - ["hp"]=446810000, - ["atk"]=5230000, + ["hp"]=659030000, + ["atk"]=7960000, ["atk_times"]=3, ["hurt_skill"]={ 20094, @@ -1252,8 +1252,8 @@ local monster_dungeon_equip = { }, [7906]={ ["monster_base"]=10028, - ["hp"]=594050000, - ["atk"]=5480000, + ["hp"]=845550000, + ["atk"]=8350000, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -1268,8 +1268,8 @@ local monster_dungeon_equip = { [8006]={ ["monster_base"]=20041, ["is_boss"]=2, - ["hp"]=1072430000, - ["atk"]=5590000, + ["hp"]=1534760000, + ["atk"]=8750000, ["atk_times"]=4, ["hurt_skill"]={ 30126, @@ -1288,8 +1288,8 @@ local monster_dungeon_equip = { }, [8106]={ ["monster_base"]=10036, - ["hp"]=132000000, - ["atk"]=870000, + ["hp"]=312170000, + ["atk"]=5690000, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -1303,8 +1303,8 @@ local monster_dungeon_equip = { }, [8206]={ ["monster_base"]=10017, - ["hp"]=284280000, - ["atk"]=4890000, + ["hp"]=376280000, + ["atk"]=7800000, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -1318,8 +1318,8 @@ local monster_dungeon_equip = { }, [8306]={ ["monster_base"]=10023, - ["hp"]=463670000, - ["atk"]=5380000, + ["hp"]=711080000, + ["atk"]=8610000, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -1333,8 +1333,8 @@ local monster_dungeon_equip = { }, [8406]={ ["monster_base"]=10051, - ["hp"]=616180000, - ["atk"]=5640000, + ["hp"]=912460000, + ["atk"]=9020000, ["atk_times"]=3, ["hurt_skill"]={ 20148, @@ -1349,8 +1349,8 @@ local monster_dungeon_equip = { [8506]={ ["monster_base"]=20040, ["is_boss"]=2, - ["hp"]=1112410000, - ["atk"]=5750000, + ["hp"]=1655840000, + ["atk"]=9450000, ["atk_times"]=4, ["hurt_skill"]={ 30141, @@ -1368,8 +1368,8 @@ local monster_dungeon_equip = { }, [8606]={ ["monster_base"]=10021, - ["hp"]=251150000, - ["atk"]=3770000, + ["hp"]=339080000, + ["atk"]=6160000, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -1383,8 +1383,8 @@ local monster_dungeon_equip = { }, [8706]={ ["monster_base"]=10034, - ["hp"]=293630000, - ["atk"]=5170000, + ["hp"]=408050000, + ["atk"]=8450000, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -1398,8 +1398,8 @@ local monster_dungeon_equip = { }, [8806]={ ["monster_base"]=10030, - ["hp"]=478890000, - ["atk"]=5680000, + ["hp"]=771120000, + ["atk"]=9340000, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -1413,8 +1413,8 @@ local monster_dungeon_equip = { }, [8906]={ ["monster_base"]=10018, - ["hp"]=636450000, - ["atk"]=5960000, + ["hp"]=986810000, + ["atk"]=9790000, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -1429,8 +1429,8 @@ local monster_dungeon_equip = { [9006]={ ["monster_base"]=20039, ["is_boss"]=2, - ["hp"]=1148710000, - ["atk"]=6080000, + ["hp"]=1790630000, + ["atk"]=10230000, ["atk_times"]=4, ["hurt_skill"]={ 30117, @@ -1448,8 +1448,8 @@ local monster_dungeon_equip = { }, [9106]={ ["monster_base"]=10016, - ["hp"]=261840000, - ["atk"]=3970000, + ["hp"]=357560000, + ["atk"]=6490000, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -1463,8 +1463,8 @@ local monster_dungeon_equip = { }, [9206]={ ["monster_base"]=10054, - ["hp"]=305680000, - ["atk"]=5440000, + ["hp"]=429930000, + ["atk"]=8920000, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -1478,8 +1478,8 @@ local monster_dungeon_equip = { }, [9306]={ ["monster_base"]=10006, - ["hp"]=498740000, - ["atk"]=5980000, + ["hp"]=812430000, + ["atk"]=9840000, ["atk_times"]=2, ["hurt_skill"]={ 20016, @@ -1493,8 +1493,8 @@ local monster_dungeon_equip = { }, [9406]={ ["monster_base"]=10020, - ["hp"]=662690000, - ["atk"]=6280000, + ["hp"]=1039660000, + ["atk"]=10320000, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -1509,8 +1509,8 @@ local monster_dungeon_equip = { [9506]={ ["monster_base"]=20043, ["is_boss"]=2, - ["hp"]=1196050000, - ["atk"]=6410000, + ["hp"]=1886200000, + ["atk"]=10790000, ["atk_times"]=4, ["hurt_skill"]={ 30120, @@ -1529,8 +1529,8 @@ local monster_dungeon_equip = { }, [9606]={ ["monster_base"]=10031, - ["hp"]=270070000, - ["atk"]=4190000, + ["hp"]=375760000, + ["atk"]=6820000, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -1544,8 +1544,8 @@ local monster_dungeon_equip = { }, [9706]={ ["monster_base"]=10035, - ["hp"]=315240000, - ["atk"]=5740000, + ["hp"]=451810000, + ["atk"]=9380000, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -1559,8 +1559,8 @@ local monster_dungeon_equip = { }, [9806]={ ["monster_base"]=10019, - ["hp"]=514070000, - ["atk"]=6320000, + ["hp"]=853590000, + ["atk"]=10350000, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -1574,8 +1574,8 @@ local monster_dungeon_equip = { }, [9906]={ ["monster_base"]=10013, - ["hp"]=682910000, - ["atk"]=6630000, + ["hp"]=1092340000, + ["atk"]=10850000, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -1590,8 +1590,8 @@ local monster_dungeon_equip = { [10006]={ ["monster_base"]=20042, ["is_boss"]=2, - ["hp"]=1232640000, - ["atk"]=6760000, + ["hp"]=1981770000, + ["atk"]=11340000, ["atk_times"]=4, ["hurt_skill"]={ 30144, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 1d965735..be8e1b56 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -4571,7 +4571,7 @@ local skill = { ["type"]="lethargy", ["num"]=0, ["ratio"]=5000, - ["round"]=2 + ["round"]=1 } }, ["obj"]=2, @@ -4694,7 +4694,71 @@ local skill = { { ["type"]="lethargy", ["num"]=0, - ["ratio"]=5000, + ["ratio"]=8000, + ["round"]=2 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 4 + }, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound"]=34002200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=300109, + ["bullet_time"]={ + 1000, + 3000, + 400 + }, + ["fx_self_mirror"]=400109 + }, + [3400224]={ + ["buff_id"]={ + "lethargy" + }, + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=1, + ["skill_type"]=4, + ["boardrange"]={ + + }, + ["battle_icon"]="23", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=13000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=13000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=24000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="lethargy", + ["num"]=0, + ["ratio"]=8000, ["round"]=2 } }, @@ -7553,7 +7617,7 @@ local skill = { }, ["name_act"]="attack01", ["fx_self"]=300112, - ["fx_self_mirror"]=400127 + ["fx_self_mirror"]=400112 }, [5400211]={ ["position"]=5, @@ -7579,7 +7643,7 @@ local skill = { }, ["name_act"]="attack02", ["fx_self"]=300113, - ["fx_self_mirror"]=400128 + ["fx_self_mirror"]=400113 }, [5400212]={ ["position"]=5, @@ -7605,7 +7669,7 @@ local skill = { }, ["name_act"]="attack03", ["fx_self"]=300114, - ["fx_self_mirror"]=400129 + ["fx_self_mirror"]=400114 }, [5400213]={ ["position"]=5, @@ -7631,7 +7695,7 @@ local skill = { }, ["name_act"]="attack04", ["fx_self"]=300115, - ["fx_self_mirror"]=400130 + ["fx_self_mirror"]=400115 }, [5400220]={ ["energy"]=10, @@ -7703,7 +7767,7 @@ local skill = { 3000, 400 }, - ["fx_self_mirror"]=400131 + ["fx_self_mirror"]=400116 }, [5400221]={ ["position"]=5, @@ -7833,7 +7897,7 @@ local skill = { }, ["name_act"]="attack01", ["fx_self"]=300127, - ["fx_self_mirror"]=400112 + ["fx_self_mirror"]=400127 }, [5400311]={ ["position"]=5, @@ -7859,7 +7923,7 @@ local skill = { }, ["name_act"]="attack02", ["fx_self"]=300128, - ["fx_self_mirror"]=400113 + ["fx_self_mirror"]=400128 }, [5400312]={ ["position"]=5, @@ -7885,7 +7949,7 @@ local skill = { }, ["name_act"]="attack03", ["fx_self"]=300129, - ["fx_self_mirror"]=400114 + ["fx_self_mirror"]=400129 }, [5400313]={ ["position"]=5, @@ -7911,7 +7975,7 @@ local skill = { }, ["name_act"]="attack04", ["fx_self"]=300130, - ["fx_self_mirror"]=400115 + ["fx_self_mirror"]=400130 }, [5400320]={ ["buff_id"]={ @@ -7958,7 +8022,7 @@ local skill = { 3000, 400 }, - ["fx_self_mirror"]=400116 + ["fx_self_mirror"]=400131 }, [5400321]={ ["position"]=5, @@ -27380,6 +27444,6 @@ local skill = { } } local config = { -data=skill,count=984 +data=skill,count=985 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index fdcb36c9..172f03d4 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -2223,11 +2223,11 @@ local skill_rogue = { ["skill_position"]=2, ["boardrange"]={ { - ["type"]=1, + ["type"]=3, ["range"]=2 }, { - ["type"]=2, + ["type"]=4, ["range"]=2 } }, @@ -2277,11 +2277,11 @@ local skill_rogue = { ["skill_position"]=2, ["boardrange"]={ { - ["type"]=3, + ["type"]=1, ["range"]=2 }, { - ["type"]=4, + ["type"]=2, ["range"]=2 } }, @@ -2967,10 +2967,9 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=16, + ["type"]=1, ["parameter"]={ - 4, - 3000 + 3400224 }, ["skill_position"]=3, ["icon"]="213" @@ -3013,6 +3012,8 @@ local skill_rogue = { ["icon"]="215" }, [3400207]={ + ["unlock"]=3400204, + ["cover_unlock"]=3400204, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 62a1eb9d..84f476a0 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -23,6 +23,32 @@ local skin = { ["skin_point"]=0, ["hero_id"]=14001 }, + [1400101]={ + ["model_id"]="p0036", + ["qlt"]=3, + ["bonus"]={ + { + ["type"]="attr_skill_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_red", + ["num"]=1000 + } + }, + ["icon"]="skin_5", + ["got"]=1, + ["skin_point"]=10, + ["hero_id"]=14001, + ["item_id"]=1400101, + ["skill_show"]={ + 14001011, + 14001012, + 14001013, + 14001014, + 14001015 + } + }, [14002]={ ["model_id"]="p0018", ["qlt"]=1, @@ -285,6 +311,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index 4b309225..759d0ee2 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -302,9 +302,83 @@ local skin_skill = { ["fx_bg"]=300148, ["fx_self_mirror"]=400144, ["fx_bg_mirror"]=400148 + }, + [14001011]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300045, + ["fx_self_mirror"]=400078 + }, + [14001012]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300046, + ["fx_self_mirror"]=400079 + }, + [14001013]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=4, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300047, + ["fx_self_mirror"]=400080 + }, + [14001014]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300048, + ["fx_self_mirror"]=400081 + }, + [14001015]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound"]=14001200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=300150, + ["bullet_time"]={ + 1166, + 3000, + 200 + }, + ["fx_self_mirror"]=400150 } } local config = { -data=skin_skill,count=20 +data=skin_skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/equip.lua b/lua/app/config/strings/cn/equip.lua index 662fe1d4..7bc88371 100644 --- a/lua/app/config/strings/cn/equip.lua +++ b/lua/app/config/strings/cn/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="巨力锤,战者之锤,流星巨锤,破军锤,断魂锤,陨星" }, [1400102]={ - ["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠" + ["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠" }, [1400103]={ - ["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠" + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" }, [1400104]={ - ["name"]="皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链,铜制手环" + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" }, [1400105]={ - ["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" + ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" }, [1400201]={ ["name"]="猫拳,尖刺猫拳,青钢猫拳,裂伤猫拳,破空猫拳,福神之力" diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 8451a022..eeb2e910 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -448,6 +448,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "可能出史诗哦~", ["ARENA_DESC_36"] = "试试手气", + ["ONE_KEY_GET_DESC"] = "一键领取", + ["ACTIVITY_OVER_EDSC"] = "活动已结束", + ["PART_IN_DESC"] = "参与", + ["HERO_FUND_DESCC_1"] = "新活动月之祝福开启", + ["HERO_FUND_DESCC_2"] = "月之祝福", + ["HERO_FUND_DESCC_3"] = "拥有月之祝福后，在战斗中累计通过波次可获得丰厚奖励。", + ["HERO_FUND_DESCC_4"] = "新活动14日达标开启", + ["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}级礼包", + ["SEIZED_DESC_1"] = "检测到你的账号存在异常，请联系客服或删除账号使用新建账号继续游戏。", + ["SEIZED_DESC_2"] = "联系客服", + ["SEIZED_DESC_3"] = "删除账号", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 311612a9..9724c5b0 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" }, [3400220]={ - ["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，2回合。" + ["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，1回合。" }, [4200120]={ ["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 690c8169..33cc7e7d 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="流星追月链接4个元素或以上时，流星追月攻击将释放2次。" }, [3400200]={ - ["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，2回合。" + ["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，1回合。" }, [3400201]={ ["desc"]="美丽梦魇沿X方向可额外消除4格。" @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="美丽梦魇沿X方向可额外消除4格。" }, [3400204]={ - ["desc"]="美丽梦魇附加的昏睡效果，概率提升到80%。" + ["desc"]="美丽梦魇附加的昏睡效果，概率提升到80%，回合数+1。" }, [3400205]={ ["desc"]="Combo:梦魔普攻昏睡敌人将附加禁锢效果，2回合。" diff --git a/lua/app/config/strings/cn/skin.lua b/lua/app/config/strings/cn/skin.lua index 6004881a..b35b2e8c 100644 --- a/lua/app/config/strings/cn/skin.lua +++ b/lua/app/config/strings/cn/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="初始" }, + [1400101]={ + ["value"]="遗迹战甲" + }, [14002]={ ["value"]="初始" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skin.lua b/lua/app/config/strings/de/skin.lua index 3fcc5359..01f28e15 100644 --- a/lua/app/config/strings/de/skin.lua +++ b/lua/app/config/strings/de/skin.lua @@ -10,6 +10,9 @@ local skin = { }, [14001]={ + }, + [1400101]={ + }, [14002]={ @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/equip.lua b/lua/app/config/strings/en/equip.lua index fe8a4769..75e1050a 100644 --- a/lua/app/config/strings/en/equip.lua +++ b/lua/app/config/strings/en/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="Mighty Mallet,Warrior's Hammer,Comet Crusher,Annihilator's Hammer,Soulshatter,Falling Star" }, [1400102]={ - ["name"]="Rugged Steel Helm,Fine Steel Visor,Obsidian Noble Crown,Gallant Coronet,Dragonhorn Circlet,Eternal Glory Crown" + ["name"]="Floral Circlet,Pearl Circlet,Flame Gilded Circlet,Serene Jade Circlet,Starry Phoenix Circlet,Supreme Crown" }, [1400103]={ - ["name"]="Thick Woven Vestment,Thin Steel Hauberk,Dark Iron Plate,Champion's Jade Armor,Wyrmhide Golden Plate,Eternal Heavy Plate" + ["name"]="Soft Leather Robe,Jade-Adorned Robe,Purple Gauze Silk,Amber-hued Robe,Phoenix Feather Robe,Sovereign Celestial Robe" }, [1400104]={ - ["name"]="Leather Belt,Ebony Gold Waistband,Knight's Baldric,Wyrm Sinew Belt,Eternal Girth,Bronze Bracelet" + ["name"]="Embroidered Belt,Elegant Waist Band,Pearl-embroidered Belt,Astral Glory Belt,Phoenix Gaze Belt,Ultimate Immortal Belt" }, [1400105]={ - ["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands" + ["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards" }, [1400201]={ ["name"]="Cat's Claw,Spiked Claw,Azure Steel Claw,Shredding Claw,Sky-Cleaving Claw,Fortune's Blessing" diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 8a9e68ad..444267f4 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "You might obtain Epic~", ["ARENA_DESC_36"] = "Try", + ["ONE_KEY_GET_DESC"] = "Claim All", + ["ACTIVITY_OVER_EDSC"] = "Event has ended", + ["PART_IN_DESC"] = "Participate", + ["HERO_FUND_DESCC_1"] = "New event [Lunar Benediction] is open", + ["HERO_FUND_DESCC_2"] = "Lunar Benediction", + ["HERO_FUND_DESCC_3"] = "With the Lunar Benediction, obtain rewards by progressing through waves in battles.", + ["HERO_FUND_DESCC_4"] = "New event [Advanced Challenge] is open", + ["ARENA_DESC_37"] = "Unlock Hero:", + ["ARENA_DESC_38"] = "Unlocked Heroes:", + ["ARENA_DESC_39"] = "Promotion rewards are one-time", + ["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", + ["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", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/skill.lua b/lua/app/config/strings/en/skill.lua index 977efacb..92668834 100644 --- a/lua/app/config/strings/en/skill.lua +++ b/lua/app/config/strings/en/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="Moon Chaser: Increase damage and deal significantly skill damage once." }, [3400220]={ - ["desc"]="Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict Drowsy that lasts 2 turns." + ["desc"]="Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict Drowsy that lasts 1 turns." }, [4200120]={ ["desc"]="Elemental Link: Clear 3 random elements and deal skill damage once." diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 3d1ab122..81b20872 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="When Moonchaser links to 4 or more elements, it will be cast 2 times." }, [3400200]={ - ["desc"]="Unlock Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict Drowsy that lasts 2 turns." + ["desc"]="Unlock Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict Drowsy that lasts 1 turns." }, [3400201]={ ["desc"]="Alluring Nightmare can clear additional 4 grids in the X direction." @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="Alluring Nightmare can clear additional 4 grids in the X direction." }, [3400204]={ - ["desc"]="The chance of Drowsy inflicted by Alluring Nightmare increases to 80%." + ["desc"]="The chance of Drowsy inflicted by Alluring Nightmare increases to 80% for +1 turn." }, [3400205]={ ["desc"]="Combo: Nightmare's normal attack to Drowsy enemy will inflict Imprison for 2 turns." diff --git a/lua/app/config/strings/en/skin.lua b/lua/app/config/strings/en/skin.lua index 8bb72144..660002da 100644 --- a/lua/app/config/strings/en/skin.lua +++ b/lua/app/config/strings/en/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="Initial" }, + [1400101]={ + ["value"]="Relic Armor" + }, [14002]={ ["value"]="Initial" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/equip.lua b/lua/app/config/strings/es/equip.lua index b25d44d5..075edf7c 100644 --- a/lua/app/config/strings/es/equip.lua +++ b/lua/app/config/strings/es/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="Martillo Potente,Martillo de Guerrero,Martillo de Meteorito,Martillo Atacante,Martillo Letal,Estrella Fugaz" }, [1400102]={ - ["name"]="Visera de Acero Bruto,Visera de Acero Fino,Corona de obsidiana,Corona de héroe,Corona de Cuerno de Dragón,Corona Eterna" + ["name"]="Corona Floral,Corona con Perlas,Corona de Fuego,Corona de Jade,Corona de Fénix,Corona Suprema" }, [1400103]={ - ["name"]="Túnica Gruesa,Armadura de Acero Delgado,Armadura Pesada,Armadura de Jade,Casco Dorado de Escamas de Dragón,Armadura Pesada Eterna" + ["name"]="Forro de Cuero Suave,Túnica con Jade,Satén Morado,Túnica de Ámbar,Túnica con Pluma de Fénix,Túnica de Estrella Suprema" }, [1400104]={ - ["name"]="Cinturón de Cuero,Faja de Oro Negro,Faja de Jinete,Faja de Tendón de Dragón,Cadena de Cintura Eterna,Pulsera de Cobre" + ["name"]="Cinturón Bordado,Corsé Elegante,Cinturón Bordado con Perlas,Cinturón Imperial de Estrella,Cinturón de Ojos de Fénix,Cuerda Suprema" }, [1400105]={ - ["name"]="Pulsera de Cobre,Muñequera de Cuero,Muñequera de Hierro,Guanteletes de Héroe,Muñequera de Barba de Dragón,Muñequera Eterna" + ["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema" }, [1400201]={ ["name"]="Golpe de gato,Puño con Pinchos,Puño de Acero Verde,Puño Lacerante,Puño en Cielo ,Poder de Fortuna" diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index ae259db2..3f1b18f4 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "Héroe épico posible", ["ARENA_DESC_36"] = "Prueba tu suerte", + ["ONE_KEY_GET_DESC"] = "Colectar todo", + ["ACTIVITY_OVER_EDSC"] = "El evento ha terminado", + ["PART_IN_DESC"] = "Participar", + ["HERO_FUND_DESCC_1"] = "Comienza el nuevo evento: Bendición de la Luna", + ["HERO_FUND_DESCC_2"] = "Bendición de la Luna", + ["HERO_FUND_DESCC_3"] = "Con Bendición de la Luna, obtendrás generosas recompensas pasando las olas en la batalla.", + ["HERO_FUND_DESCC_4"] = "Comienza el nuevo evento: Desafío Avanzado", + ["ARENA_DESC_37"] = "Héroes bloqueados:", + ["ARENA_DESC_38"] = "Héroes desbloqueados:", + ["ARENA_DESC_39"] = "Las recompensas de subida de ranking se conceden una sola vez", + ["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}", + ["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", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/es/skill.lua b/lua/app/config/strings/es/skill.lua index 2fa4699d..8a6f77ee 100644 --- a/lua/app/config/strings/es/skill.lua +++ b/lua/app/config/strings/es/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="Danza de Meteoro: aumenta el daño y causa un golpe adicional de enorme daño de habilidad." }, [3400220]={ - ["desc"]="Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar Dormido durante 2 rondas." + ["desc"]="Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar Dormido durante 1 rondas." }, [4200120]={ ["desc"]="Enlace de Elementos: elimina 3 elementos aleatorios y causa un daño de habilidad." diff --git a/lua/app/config/strings/es/skill_rogue.lua b/lua/app/config/strings/es/skill_rogue.lua index 952a9129..b9142b13 100644 --- a/lua/app/config/strings/es/skill_rogue.lua +++ b/lua/app/config/strings/es/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Cuando Espada de Fantasía enlaza 4 o más elementos, lanzará 2 ataques." }, [3400200]={ - ["desc"]="Desbloquea Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar Dormido durante 2 rondas." + ["desc"]="Desbloquea Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar Dormido durante 1 rondas." }, [3400201]={ ["desc"]="Pesadilla Hermosa elimina 4 bloques extras en direcciones de X." @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="Pesadilla Hermosa elimina 4 bloques extras en direcciones de X." }, [3400204]={ - ["desc"]="Aumenta el chance de Dormido aplicado por Pesadilla Hermosa a 80%." + ["desc"]="Aumenta el chance de Dormido aplicado por Pesadilla Hermosa a 80% durante +1 rondas." }, [3400205]={ ["desc"]="Combo: el ataque común de Íncubo a enemigos Dormidos aplicará Encarcelamiento durante 2 rondas." diff --git a/lua/app/config/strings/es/skin.lua b/lua/app/config/strings/es/skin.lua index 6801a092..61e04009 100644 --- a/lua/app/config/strings/es/skin.lua +++ b/lua/app/config/strings/es/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="Inicial" }, + [1400101]={ + ["value"]="Armadura de Ruinas" + }, [14002]={ ["value"]="Inicial" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skin.lua b/lua/app/config/strings/fr/skin.lua index 3fcc5359..01f28e15 100644 --- a/lua/app/config/strings/fr/skin.lua +++ b/lua/app/config/strings/fr/skin.lua @@ -10,6 +10,9 @@ local skin = { }, [14001]={ + }, + [1400101]={ + }, [14002]={ @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/equip.lua b/lua/app/config/strings/id/equip.lua index 0fc494be..2da483ea 100644 --- a/lua/app/config/strings/id/equip.lua +++ b/lua/app/config/strings/id/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="Mallet Perkasa,Palu Prajurit,Penghancur Komet,Palu Pemusnah,Penghancur Jiwa,Bintang Jatuh" }, [1400102]={ - ["name"]="Helm Baja Kasar,Pelindung Baja Halus,Mahkota Obsidian,Coronet Perkasa,Circlet Tanduk Naga,Mahkota Kemuliaan Abadi" + ["name"]="Circlet Bunga,Circlet Mutiara,Circlet Api Emas,Circlet Giok,Circlet Phoenix,Mahkota Agung" }, [1400103]={ - ["name"]="Jubah Tenun Tebal,Armor Cincin Baja Tipis,Plat Besi Gelap,Armor Giok Sang Juara,Plat Emas Wyrmhide,Plat Berat Abadi" + ["name"]="Jubah Kulit Lembut,Jubah Giok,Sutra Kasa Ungu,Jubah Amber,Jubah Bulu Phoenix,Jubah Bintang Daulat" }, [1400104]={ - ["name"]="Sabuk Kulit,Tali Pinggang Emas Eboni,Ksatria Baldric,Sabuk Otot Wyrm,Lingkar Kekal,Gelang Bronze" + ["name"]="Sabuk Bordir,Tali Pinggang Elegan,Sabuk Mutiara,Sabuk Astral,Sabuk Phoenix,Sabuk Abadi" }, [1400105]={ - ["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi" + ["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung" }, [1400201]={ ["name"]="Cakar Kucing,Cakar Duri,Cakar Baja Azure,Cakar Pencabik,Cakar Pembelah Langit,Berkah Keberuntungan" diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index eac7ef46..2a87a07f 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "Mungkin dapat Epik", ["ARENA_DESC_36"] = "Coba", + ["ONE_KEY_GET_DESC"] = "Klaim Cepat", + ["ACTIVITY_OVER_EDSC"] = "Event telah berakhir", + ["PART_IN_DESC"] = "Partisipasi", + ["HERO_FUND_DESCC_1"] = "Event baru Berkah Lunar dibuka", + ["HERO_FUND_DESCC_2"] = "Berkah Lunar", + ["HERO_FUND_DESCC_3"] = "Dapatkan hadiah melimpah dengan melewati ombak dalam pertempuran saat memiliki Berkah Lunar.", + ["HERO_FUND_DESCC_4"] = "Event baru Tantangan Advanced dibuka", + ["ARENA_DESC_37"] = "Buka Hero:", + ["ARENA_DESC_38"] = "Hero terbuka:", + ["ARENA_DESC_39"] = "Hadiah promosi hanya satu kali", + ["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}", + ["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", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/id/skill.lua b/lua/app/config/strings/id/skill.lua index d4b809ea..8a70fb8b 100644 --- a/lua/app/config/strings/id/skill.lua +++ b/lua/app/config/strings/id/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="Pemburu Bulan: Meningkatkan DMG dan memberikan DMG skill yang besar sekali." }, [3400220]={ - ["desc"]="Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek Kantuk selama 2 giliran." + ["desc"]="Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek Kantuk selama 1 giliran." }, [4200120]={ ["desc"]="Link Elemen: Menghilangkan 3 elemen secara acak dan memberikan DMG skill." diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 3db100cd..2f2fe45a 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Saat Pemburu Bulan menautkan 4 atau lebih banyak elemen, maka ATK Pemburu Bulan akan dilepaskan sebanyak 2 kali." }, [3400200]={ - ["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek Kantuk selama 2 giliran." + ["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek Kantuk selama 1 giliran." }, [3400201]={ ["desc"]="Nightmare Z dapat menghapus 4 grid tambahan pada arah X." @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="Nightmare Z dapat menghapus 4 grid tambahan pada arah X." }, [3400204]={ - ["desc"]="Efek Kantuk Nightmare Z meningkatkan peluang hingga 80%。" + ["desc"]="Peluang Kantuk yang ditimbulkan oleh Nightmare Z meningkat 80% selama +1 giliran." }, [3400205]={ ["desc"]="Combo: ATK Nightmare Z Kantuk musuh akan memiliki efek Larangan yang melekat selama 2 giliran." diff --git a/lua/app/config/strings/id/skin.lua b/lua/app/config/strings/id/skin.lua index e7bb2794..ed879b1a 100644 --- a/lua/app/config/strings/id/skin.lua +++ b/lua/app/config/strings/id/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="Awal" }, + [1400101]={ + ["value"]="Armor Relik" + }, [14002]={ ["value"]="Awal" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/equip.lua b/lua/app/config/strings/ja/equip.lua index 39ba7060..fedbdbe2 100644 --- a/lua/app/config/strings/ja/equip.lua +++ b/lua/app/config/strings/ja/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="マイティマレット,戦士のハンマー,彗星クラッシャー,破壊ハンマー,ソウルシャッター,流れ星" }, [1400102]={ - ["name"]="鋼の仮面,ファインスチール製仮面,黒曜石の冠,勇気の冠,竜角の冠,永遠の冠" + ["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし" }, [1400103]={ - ["name"]="厚織りの法衣,薄鋼鉄製ハウバーク,玄鉄の鎧,強者の鎧,竜鱗の鎧,永遠の鎧" + ["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ" }, [1400104]={ - ["name"]="革ベルト,黒檀ゴールドのガードル,騎士のベルト,竜腱のガードル,永遠のガードル,銅のブレスレット" + ["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ" }, [1400105]={ - ["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド" + ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" }, [1400201]={ ["name"]="猫の爪,トゲの爪,鋼の爪,裂傷の爪,空を切り裂く爪,福神の力" diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index 99affb82..75b48475 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "エピックを獲得可能~", ["ARENA_DESC_36"] = "運試し", + ["ONE_KEY_GET_DESC"] = "一括受取", + ["ACTIVITY_OVER_EDSC"] = "イベントは終了しました", + ["PART_IN_DESC"] = "参加する", + ["HERO_FUND_DESCC_1"] = "新イベント月の祝福が解放", + ["HERO_FUND_DESCC_2"] = "月の祝福", + ["HERO_FUND_DESCC_3"] = "月の祝福を入手した後、バトル中にクリア回数を累計すると豪華な報酬を獲得できます。", + ["HERO_FUND_DESCC_4"] = "新イベントランクアップ挑戦が解放", + ["ARENA_DESC_37"] = "ヒーロー解放：", + ["ARENA_DESC_38"] = "解放済のヒーロー：", + ["ARENA_DESC_39"] = "ランクアップ報酬は一回のみ受取可能です", + ["ARENA_DESC_40"] = "ランクアップ報酬", + ["ARENA_DESC_41"] = "決算報酬", + ["ARENA_DESC_42"] = "未受取の報酬", + ["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック", + ["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック", + ["SEIZED_DESC_1"] = "アカウントに異常が検出されました。サポートセンターに連絡するか、アカウントを削除し、新しいアカウントを作成してゲームを続行してください。", + ["SEIZED_DESC_2"] = "サポートセンターに連絡する", + ["SEIZED_DESC_3"] = "アカウントを削除する", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill.lua b/lua/app/config/strings/ja/skill.lua index 6856a732..e24d9af0 100644 --- a/lua/app/config/strings/ja/skill.lua +++ b/lua/app/config/strings/ja/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="ムーンチェイサー：発動するターンダメージがアップ、特⼤ダメージを与えるスキルを1回発動する。" }, [3400220]={ - ["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に2ターン昏睡効果を付与する。" + ["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に1ターン昏睡効果を付与する。" }, [4200120]={ ["desc"]="元素連接：ランダムで3つの元素を消し、スキルを1回発動する。" diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index ec9efe93..1f62a4ef 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="「ムーンチェイサー」は4つ以上の元素と繋がった時、ムーンチェイサーが2回発動する。" }, [3400200]={ - ["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に2ターン昏睡効果を付与する。" + ["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に1ターン昏睡効果を付与する。" }, [3400201]={ ["desc"]="「アリュールナイトメア」は追加でX方向4マスを消す。" @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="「アリュールナイトメア」は追加でX方向4マスを消す。" }, [3400204]={ - ["desc"]="「アリュールナイトメア」の昏睡効果の確率は80%に増加する。" + ["desc"]="「アリュールナイトメア」の昏睡効果の確率は80%に増加し、ターン数が+1。" }, [3400205]={ ["desc"]="ヒット:夢魔の通常攻撃が昏睡状態の敵に2ターン拘束効果を付与する。" diff --git a/lua/app/config/strings/ja/skin.lua b/lua/app/config/strings/ja/skin.lua index 7eacc537..a9d2ccc1 100644 --- a/lua/app/config/strings/ja/skin.lua +++ b/lua/app/config/strings/ja/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="デフォルト" }, + [1400101]={ + ["value"]="レリックアーマー" + }, [14002]={ ["value"]="デフォルト" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/equip.lua b/lua/app/config/strings/ko/equip.lua index edde4ece..09e4d585 100644 --- a/lua/app/config/strings/ko/equip.lua +++ b/lua/app/config/strings/ko/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="힘센 망치,워리어의 망치,유성 망치,장군의 망치,영혼 파괴 망치,떨어지는 별" }, [1400102]={ - ["name"]="거친 강철 마스크,정교한 강철 마스크,어둠의 노블 왕관,용맹의 왕관,용의 뿔로 만든 왕관,화려한 영원의 왕관" + ["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관" }, [1400103]={ - ["name"]="두꺼운 니트 두루마기,얇은 강철 갑옷,검은 빛을 띤 무거운 중갑,강자의 옥 갑옷,용비늘 황금 투구,영원의 중갑" + ["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브" }, [1400104]={ - ["name"]="가죽 벨트,검은 황금 허리띠,기사의 벨트,용의 힘줄 허리띠,영원의 허리띠 장식,브론즈 팔찌" + ["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트" }, [1400105]={ - ["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대" + ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" }, [1400201]={ ["name"]="고양이 펀치,손톱 세운 고양이 펀치,브론즈 고양이 펀치,거친 고양이 펀치,무시무시한 고양이 펀치,행운의 신이 내린 축복" diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index be1a1177..8c6a59c2 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "행운의 신이 당신에게 미소 짓는다면 에픽 품질을 손에 넣을 수도 있습니다~", ["ARENA_DESC_36"] = "시도해보기", + ["ONE_KEY_GET_DESC"] = "모두 받기", + ["ACTIVITY_OVER_EDSC"] = "이벤트가 종료되었습니다.", + ["PART_IN_DESC"] = "참여", + ["HERO_FUND_DESCC_1"] = "새로운 이벤트 달의 축복이 시작됩니다.", + ["HERO_FUND_DESCC_2"] = "달의 축복", + ["HERO_FUND_DESCC_3"] = "달의 축복을 받게 되면 전투에서 클리어한 웨이브를 누적하여 푸짐한 보상을 받을 수 있습니다.", + ["HERO_FUND_DESCC_4"] = "신규 이벤트 고급 도전 오픈", + ["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}레벨 업그레이드 패키지", + ["SEIZED_DESC_1"] = "계정에 이상이 발견되었습니다. 문제 해결을 위해 고객 서비스에 문의하거나 계정을 삭제하시고 새 계정을 사용하여 게임을 계속 진행하시기 바랍니다.", + ["SEIZED_DESC_2"] = "고객 서비스 문의", + ["SEIZED_DESC_3"] = "계정 삭제", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill.lua b/lua/app/config/strings/ko/skill.lua index d9f46e3b..c3043b1c 100644 --- a/lua/app/config/strings/ko/skill.lua +++ b/lua/app/config/strings/ko/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="유성과 달의 숨바꼭질: 사용 후, 이번 공격 대미지가 상승하며 엄청난 양의 스킬 피해를 한 번 입힙니다." }, [3400220]={ - ["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 2턴 동안 수면 효과를 부여합니다." + ["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 1턴 동안 수면 효과를 부여합니다." }, [4200120]={ ["desc"]="원소 연결: 무작위로 3개의 원소를 소멸하고 스킬 피해를 한 번 입힙니다." diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 9f896f7e..c8ae6f7a 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="유성과 달의 숨바꼭질이 4개 또는 그 이상의 원소를 연결하면 스킬 공격을 2번 방출합니다." }, [3400200]={ - ["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 2턴 동안 수면효과를 부여합니다." + ["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 1턴 동안 수면효과를 부여합니다." }, [3400201]={ ["desc"]="아름다운 악몽이 X 방향을 따라 추가로 4개의 그리드를 소멸합니다." @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="아름다운 악몽이 X 방향을 따라 추가로 4개의 그리드를 소멸할 수 있습니다." }, [3400204]={ - ["desc"]="아름다운 악몽이 수면 효과를 부여할 확률이 80%로 증가합니다." + ["desc"]="아름다운 악몽이 수면 효과를 부여하는 확률이 80%로 증가하고 턴 횟수 +1" }, [3400205]={ ["desc"]="Combo:인큐버스의 일반 공격이 2턴 동안 수면 상태의 적에게 속박 효과를 부여합니다." diff --git a/lua/app/config/strings/ko/skin.lua b/lua/app/config/strings/ko/skin.lua index 3bab41a7..0981caa7 100644 --- a/lua/app/config/strings/ko/skin.lua +++ b/lua/app/config/strings/ko/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="초기" }, + [1400101]={ + ["value"]="유적 갑옷" + }, [14002]={ ["value"]="초기" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/equip.lua b/lua/app/config/strings/pt/equip.lua index a5660a2d..6a76531f 100644 --- a/lua/app/config/strings/pt/equip.lua +++ b/lua/app/config/strings/pt/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="Martelo Poderoso,Martelo do Combatente,Martelo do Meteoro Gigante,Martelo do Exército Quebrado,Martelo Quebra-alma,Meteorito" }, [1400102]={ - ["name"]="Máscara de Aço Grosso,Elmo de Aço Refinado,Coroa de Obsidiana,Coroa da Valentia,Coroa do Chifre do Dragão,Coroa Majestosa da Eternidade" + ["name"]="Coroa de Flor Comum,Tiara de Pérola,Tiara de Ouro Tece-chamas,Coroa de Jade da Lua Clara,Coroa Estrelada da Fênix,Coroa Encantadora da Supremacia" }, [1400103]={ - ["name"]="Túnica Grossa,Cota de Anéis de Aço Fino,Armadura Pesada de Ferro Negro,Armadura de Jade do Valente,Couraça Dourada de Escamas de Dragão,Armadura Pesada da Eternidade" + ["name"]="Vestimenta Interna de Couro Flexível,Túnica Adornada com Jade,Cetim e Gaza Roxa,Vestimenta de Âmbar,Traje Majestoso de Pena de Fênix,Túnica Estrelada da Supremacia" }, [1400104]={ - ["name"]="Cinto de Couro,Cinto de Ouro Negro,Cinto do Cavaleiro,Cinta de Tendão de Dragão,Corrente de Cintura da Eternidade,Pulseira de Cobre" + ["name"]="Faixa Bordada Simples,Cinta Elegante,Faixa Bordada de Pérola,Cinto da Luz Estelar,Cinta do Olhar da Fênix,Cordão Celestial da Supremacia" }, [1400105]={ - ["name"]="Pulseira de Cobre,Braceletes de Couro,Braceletes de Coração de Ferro,Manoplas do Herói,Braceletes do Bigode do Dragão,Pulseiras da Eternidade" + ["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia" }, [1400201]={ ["name"]="Punho de Gato,Punho de Gato Espinhoso,Punho de Gato de Aço Azul,Punho de Gato Rasgador,Punho de Gato Rompe-céus,Força do Deus da Fortuna" diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index 3b9123ab..64419409 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "Pode aparecer um Épico!", ["ARENA_DESC_36"] = "Tentar a Sorte", + ["ONE_KEY_GET_DESC"] = "Coletar tudo", + ["ACTIVITY_OVER_EDSC"] = "O evento terminou.", + ["PART_IN_DESC"] = "Participar", + ["HERO_FUND_DESCC_1"] = "Começou o novo evento: Bênção da Lua", + ["HERO_FUND_DESCC_2"] = "Bênção da Lua", + ["HERO_FUND_DESCC_3"] = "Com a Bênção da Lua, receberá recompensas generosas acumulando o número de ondas de batalha.", + ["HERO_FUND_DESCC_4"] = "Começou o novo evento: Desafio de Avanço", + ["ARENA_DESC_37"] = "Heróis a desbloquear:", + ["ARENA_DESC_38"] = "Heróis desbloqueados:", + ["ARENA_DESC_39"] = "As recompensas de aprimoramento só podem ser coletadas uma vez.", + ["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}", + ["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", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill.lua b/lua/app/config/strings/pt/skill.lua index dca29d4a..4ce91db1 100644 --- a/lua/app/config/strings/pt/skill.lua +++ b/lua/app/config/strings/pt/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="Disparada do Meteoro: aumenta o dano causado no turno atual e causa um golpe de enorme dano de habilidade." }, [3400220]={ - ["desc"]="Pesadelo da Beleza: causa adicionalmente um golpe de habilidade massivo com 50% de chance de acionar o efeito de Sonolento que dura 2 turnos." + ["desc"]="Pesadelo da Beleza: causa adicionalmente um golpe de habilidade massivo com 50% de chance de acionar o efeito de Sonolento que dura 1 turnos." }, [4200120]={ ["desc"]="Elo Elemental: elimina 3 elementos aleatórios e causa um golpe de dano de habilidade." diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index e7a6d536..6370f96f 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Ao conectar 4 ou mais elementos com a Disparada do Meteoro, esta habilidade é lançada 2 vezes." }, [3400200]={ - ["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito sono por 2 turnos." + ["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito sono por 1 turnos." }, [3400201]={ ["desc"]="Belo Pesadelo pode eliminar 4 quadrados adicionais na direção X." @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="Belo Pesadelo pode eliminar 4 quadrados adicionais na direção X." }, [3400204]={ - ["desc"]="A probabilidade do efeito sono adicionado por Belo Pesadelo aumenta para 80%." + ["desc"]="Aumenta a chance de acionamento do efeito sonolento pelo Pesadelo da Beleza para 80%, com +1 turno de duração." }, [3400205]={ ["desc"]="Combo: Ataque normal de Succubus a inimigos adormecidos adiciona o efeito aprisionamento por 2 turnos." diff --git a/lua/app/config/strings/pt/skin.lua b/lua/app/config/strings/pt/skin.lua index 23b6b181..80003712 100644 --- a/lua/app/config/strings/pt/skin.lua +++ b/lua/app/config/strings/pt/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="Inicial" }, + [1400101]={ + ["value"]="Armadura das Ruínas" + }, [14002]={ ["value"]="Inicial" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skin.lua b/lua/app/config/strings/ru/skin.lua index 3fcc5359..01f28e15 100644 --- a/lua/app/config/strings/ru/skin.lua +++ b/lua/app/config/strings/ru/skin.lua @@ -10,6 +10,9 @@ local skin = { }, [14001]={ + }, + [1400101]={ + }, [14002]={ @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/equip.lua b/lua/app/config/strings/th/equip.lua index 7ac3065e..6e9947f3 100644 --- a/lua/app/config/strings/th/equip.lua +++ b/lua/app/config/strings/th/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="ค้อนยักษ์,ค้อนนักรบ,ค้อนดาวตก,ค้อนทำลาย,ค้อนตัดวิญญาณ,อุกกาบาต" }, [1400102]={ - ["name"]="เกราะหน้าเหล็กหยาบ,เกราะหน้าเหล็กเลิศ,มงกุฎออบซิเดียน,มงกุฎกล้าหาญ,มงกุฎเขามังกร,มงกุฎนิรันดร์" + ["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม" }, [1400103]={ - ["name"]="เสื้อยาวถักหนา,เกราะวงแหวนเหล็กบาง,เกราะหนักเหล็ก,เกราะหยกผู้แข็งแกร่ง,บุตรขุนนางเกล็ดมังกร,เกราะหนักนิรันดร์" + ["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม" }, [1400104]={ - ["name"]="เข็มขัดหนัง,คอร์เซ็ททอง,แหวนเอวอัศวิน,คอร์เซ็ทเอ็นมังกร,ห่วงโซ่เอวนิรันดร์,สร้อยข้อมือทองแดง" + ["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม" }, [1400105]={ - ["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์" + ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" }, [1400201]={ ["name"]="หมัดแมว,หมัดแมวหนามแหลม,หมัดแมวเหล็กเขียว,หมัดแมวฉีกขาด,หมัดแมวทะลวง,พลังเทพโชคลาภ" diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index 1e5a4e78..2f55a840 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "อาจได้รับอีพิทนะ~", ["ARENA_DESC_36"] = "ลองเสี่ยงโชค", + ["ONE_KEY_GET_DESC"] = "รับทั้งหมด", + ["ACTIVITY_OVER_EDSC"] = "กิจกรรมสิ้นสุดแล้ว", + ["PART_IN_DESC"] = "เข้าร่วม", + ["HERO_FUND_DESCC_1"] = "เปิดกจกรรใหม่ดวงจันทร์แล้ว", + ["HERO_FUND_DESCC_2"] = "พรแห่งดวงจันทร์", + ["HERO_FUND_DESCC_3"] = "หลังจากได้รับพรแห่งดวงจันทร์แล้ว สะสมผ่านจำนวนรอบในการต่อสู้จะได้รับรางวัลมากมาย", + ["HERO_FUND_DESCC_4"] = "เปิดกิจกรรมใหม่ท้าทายขั้นสูแล้ว", + ["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} เลเวล", + ["SEIZED_DESC_1"] = "ตรวจพบบัญชีของคุณผิดปกติ โปรดติดต่อฝ่ายบริการลูกค้าหรือลบบัญชีและใช้บัญชีใหม่เพื่อเล่นเกมต่อ", + ["SEIZED_DESC_2"] = "ติดต่อฝ่ายบริการลูกค้า", + ["SEIZED_DESC_3"] = "ลบบัญชี", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/th/skill.lua b/lua/app/config/strings/th/skill.lua index e0dbe373..3dc41522 100644 --- a/lua/app/config/strings/th/skill.lua +++ b/lua/app/config/strings/th/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="ดาวตกไล่ดวงจันทร์: ดาเมจครั้งนี้จะเพิ่มขึ้นหลังจากการใช้ และสร้างดาเมจสกิลมหาศาล 1 ครั้ง" }, [3400220]={ - ["desc"]="ฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์หลับ 2รอบ" + ["desc"]="ฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์หลับ 1รอบ" }, [4200120]={ ["desc"]="การเชื่อมโยงธาตุ: สุ่มกำจัดธาตุ3อัน และสร้างดาเมจสกิล 1 ครั้ง" diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 6cd74a74..974569fd 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="เมื่อดาวตกไล่ดวงจันทร์เชื่อมโยงธาตุ4อันหรือขึ้นไป การโจมตีของดาวตกไล่ดวงจันทร์จะปล่อย2ครั้ง" }, [3400200]={ - ["desc"]="ปลดล็อคฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์หลับ 2รอบ" + ["desc"]="ปลดล็อคฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์หลับ 1รอบ" }, [3400201]={ ["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม4ช่องตามทิศทาง X" @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม4ช่องตามทิศทาง X" }, [3400204]={ - ["desc"]="เอฟเฟกต์หลับที่เพิ่มโดยฝันร้ายที่สวยงามสาม โอกาสเพิ่มขึ้นถึง80%" + ["desc"]="โอกาสเอฟเฟกต์หลับที่เพิ่มโดยฝันร้ายที่สวยงามเพิ่มขึ้นถึง80% จำนวนรอบ+1" }, [3400205]={ ["desc"]="คอมโบ: เมื่อฝันร้ายโจมตีทั่วไปศัตรูหลับจะเพิ่มเอฟเฟกต์กักขัง 2รอบ" diff --git a/lua/app/config/strings/th/skin.lua b/lua/app/config/strings/th/skin.lua index 80747895..bbc7dc0c 100644 --- a/lua/app/config/strings/th/skin.lua +++ b/lua/app/config/strings/th/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="เริ่มต้น" }, + [1400101]={ + ["value"]="เกราะรบซาก" + }, [14002]={ ["value"]="เริ่มต้น" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/equip.lua b/lua/app/config/strings/vi/equip.lua index 0d554e7d..d191f6e2 100644 --- a/lua/app/config/strings/vi/equip.lua +++ b/lua/app/config/strings/vi/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="Búa Mạnh,Búa Chiến Sĩ,Búa Sao Băng,Búa Phá Quân,Búa Đoạn Hồn,Thiên Thạch" }, [1400102]={ - ["name"]="Mặt Nạ Thép Thô,Mũ Thép Tinh Thiết,Mũ Hắc Diệu,Vương Miện Anh Dũng,Mũ Sừng Rồng,Mũ Vĩnh Hằng" + ["name"]="Mũ Gỗ Phàm Hoa,Mũ Ngọc Trai,Mũ Vàng Vân Lửa,Mũ Ngọc Trăng Sáng,Mũ Sao Mũ Phượng,Mũ Chí Tôn" }, [1400103]={ - ["name"]="Áo Dệt Kim Dày,Giáp Thép Mỏng,Giáp Huyền Thiết,Giáp Ngọc Cường Giả,Mũ Vàng Vảy Rồng,Giáp Vĩnh Hằng" + ["name"]="Áo Choàng Da,Áo Choàng Ngọc Bích,Tơ Lụa Sa Tím,Áo Hổ Phách,Trang Phục Phụng Hoàng,Áo Choàng Chí Tôn" }, [1400104]={ - ["name"]="Đai Da,Đai Than Đá,Đai Kỵ Sĩ,Đai Gân Rồng,Đai Vĩnh Hằng,Vòng Tay Đồng" + ["name"]="Đai Đơn Giản,Đai Thanh Lịch,Đai Ngọc Trai,Đai Ánh Sao,Đai Mắt Phượng,Dây Chí Tôn" }, [1400105]={ - ["name"]="Vòng Tay Đồng,Đai Da Cổ Tay,Đai Thép Cổ Tay,Bao Tay Anh Hùng,Tay Râu Rồng,Vòng Vĩnh Hằng" + ["name"]="Vòng Tay Tử Thiết,Bao Tay Nhẹ Nhàng,Bao Tay Hoàng Kim,Bao Tay Chòm Sao,Bao Tay Xương Phượng,Giáp Tay Chí Tôn" }, [1400201]={ ["name"]="Miêu Quyền,Miêu Quyền Gai Góc,Miêu Quyền Thép Xanh,Miêu Quyền Vết Rách,Miêu Quyền Phá Không,Sức Mạnh Phúc Thần" diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index 859c03c2..7f16b8b2 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "Có thể ra Sử Thi", ["ARENA_DESC_36"] = "Thử Vận May", + ["ONE_KEY_GET_DESC"] = "Nhận Nhanh", + ["ACTIVITY_OVER_EDSC"] = "Sự kiện đã kết thúc", + ["PART_IN_DESC"] = "Tham Gia", + ["HERO_FUND_DESCC_1"] = "Mở sự kiện mới Chúc Phúc Ánh Trăng", + ["HERO_FUND_DESCC_2"] = "Chúc Phúc Ánh Trăng", + ["HERO_FUND_DESCC_3"] = "Sau khi có Chúc Phúc Ánh Trăng, tích lũy số đợt vượt qua khi chiến đấu được nhận quà hậu hĩnh.", + ["HERO_FUND_DESCC_4"] = "Mở sự kiện mới Khiêu Chiến Tăng Bậc", + ["ARENA_DESC_37"] = "Mở anh hùng:", + ["ARENA_DESC_38"] = "Anh hùng đã mở:", + ["ARENA_DESC_39"] = "Thưởng Tăng Bậc là phần thưởng một lần", + ["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}", + ["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", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill.lua b/lua/app/config/strings/vi/skill.lua index 3beae01b..662f36da 100644 --- a/lua/app/config/strings/vi/skill.lua +++ b/lua/app/config/strings/vi/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="Sao Băng Siêu Tốc: Dùng xong tăng sát thương lần này, 1 lần sát thương kỹ năng cực lớn." }, [3400220]={ - ["desc"]="Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều ST kỹ năng, cos 50% kèm Ngủ Say, 2 hiệp." + ["desc"]="Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều ST kỹ năng, cos 50% kèm Ngủ Say, 1 hiệp." }, [4200120]={ ["desc"]="Liên Kết Nguyên Tố: Ngẫu nhiên xua tan 3 Nguyên Tố, gây 1 lần sát thương kỹ năng." diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 87cc582e..2c3b60d6 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="Sao Băng Siêu Tốc liên kết 4 Nguyên Tố trở lên, Sao Băng Siêu Tốc tấn công sẽ thi triển 2 lần." }, [3400200]={ - ["desc"]="Mở khóa Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều sát thương kỹ năng, 50% kèm hiệu quả Ngủ Say, 2 hiệp." + ["desc"]="Mở khóa Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều sát thương kỹ năng, 50% kèm hiệu quả Ngủ Say, 1 hiệp." }, [3400201]={ ["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm 4 ô." @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm 4 ô." }, [3400204]={ - ["desc"]="Ác Mộng Tươi Đẹp kèm hiệu quả Ngủ Say, TL tăng đến 80%." + ["desc"]="Ác Mộng Tươi Đẹp kèm hiệu quả Ngủ Say, TL tăng đến 80%, số hiệp +1." }, [3400205]={ ["desc"]="Combo: Khi Incubus đánh thường kẻ địch Ngủ Say sẽ kèm hiệu quả Giam Cầm, 2 hiệp." diff --git a/lua/app/config/strings/vi/skin.lua b/lua/app/config/strings/vi/skin.lua index f6f6969d..c80877cb 100644 --- a/lua/app/config/strings/vi/skin.lua +++ b/lua/app/config/strings/vi/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="Ban Đầu" }, + [1400101]={ + ["value"]="Giáp Di Tích" + }, [14002]={ ["value"]="Ban Đầu" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/equip.lua b/lua/app/config/strings/zh/equip.lua index b7f08c5c..37ab7f23 100644 --- a/lua/app/config/strings/zh/equip.lua +++ b/lua/app/config/strings/zh/equip.lua @@ -48,16 +48,16 @@ local equip = { ["name"]="巨力錘,戰者之錘,流星巨錘,破軍錘,斷魂錘,隕星" }, [1400102]={ - ["name"]="粗鋼面甲,精鋼面盔,黑曜貴冠,英勇冠冕,龍角之冠,永恆華冠" + ["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠" }, [1400103]={ - ["name"]="厚織長衫,薄鋼環甲,玄鐵重甲,強者玉甲,龍鱗金冑,永恆重鎧" + ["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍" }, [1400104]={ - ["name"]="皮革腰帶,烏金束腰,騎士腰環,龍筋束腰,永恆腰鏈,銅製手環" + ["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索" }, [1400105]={ - ["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪" + ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" }, [1400201]={ ["name"]="貓拳,尖刺貓拳,青鋼貓拳,裂傷貓拳,破空貓拳,福神之力" diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index 3d3aa676..dae7df04 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -447,6 +447,24 @@ local localization_global = ["ACT_DESC_12"] = "LV", ["ARENA_DESC_35"] = "可能出史詩哦~", ["ARENA_DESC_36"] = "試試手氣", + ["ONE_KEY_GET_DESC"] = "一鍵領取", + ["ACTIVITY_OVER_EDSC"] = "活動已結束", + ["PART_IN_DESC"] = "參與", + ["HERO_FUND_DESCC_1"] = "新活動月之祝福開啟", + ["HERO_FUND_DESCC_2"] = "月之祝福", + ["HERO_FUND_DESCC_3"] = "擁有月之祝福後，在戰鬥中累積通關波次可獲得豐厚獎勵。", + ["HERO_FUND_DESCC_4"] = "新活動進階挑戰開啟", + ["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}級禮包", + ["SEIZED_DESC_1"] = "檢測到你的賬號存在異常，請聯繫客服或刪除賬號使用新建賬號繼續遊戲。", + ["SEIZED_DESC_2"] = "聯繫客服", + ["SEIZED_DESC_3"] = "刪除賬號", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill.lua b/lua/app/config/strings/zh/skill.lua index 31cdbcd2..f7c16f3b 100644 --- a/lua/app/config/strings/zh/skill.lua +++ b/lua/app/config/strings/zh/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。" }, [3400220]={ - ["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附加昏睡效果，2回合。" + ["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附加昏睡效果，1回合。" }, [4200120]={ ["desc"]="元素連接：隨機消除3個元素，並造成一次技能傷害。" diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index db6ab76d..dc6e6bb7 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -468,7 +468,7 @@ local skill_rogue = { ["desc"]="流星追月連接4個元素或以上時，流星追月攻擊將釋放2次。" }, [3400200]={ - ["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶昏睡效果，2回合。" + ["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶昏睡效果，1回合。" }, [3400201]={ ["desc"]="美麗夢魘沿X方向可額外消除4格。" @@ -480,7 +480,7 @@ local skill_rogue = { ["desc"]="美麗夢魘沿X方向可額外消除4格。" }, [3400204]={ - ["desc"]="美麗夢魘附帶的昏睡效果，機率提高到80%。" + ["desc"]="美麗夢魘附帶的昏睡效果，機率提高到80%，回合數+1。" }, [3400205]={ ["desc"]="Combo:夢魔普攻昏睡敵人將附帶禁錮效果，2回合。" @@ -579,7 +579,7 @@ local skill_rogue = { ["desc"]="冰霜劍舞附帶的冰霜效果，效果提高。" }, [4400105]={ - ["desc"]="冰霜劍舞有50%機率附帶凍傷效果，2回合。" + ["desc"]="冰霜劍舞有50%機率附帶凍結效果，2回合。" }, [4400106]={ ["desc"]="寒冰妖姬攻擊提高15%。" diff --git a/lua/app/config/strings/zh/skin.lua b/lua/app/config/strings/zh/skin.lua index 8509cb6a..3cd9a39f 100644 --- a/lua/app/config/strings/zh/skin.lua +++ b/lua/app/config/strings/zh/skin.lua @@ -11,6 +11,9 @@ local skin = { [14001]={ ["value"]="初始" }, + [1400101]={ + ["value"]="遺跡戰甲" + }, [14002]={ ["value"]="初始" }, @@ -103,6 +106,6 @@ local skin = { } } local config = { -data=skin,count=34 +data=skin,count=35 } return config \ No newline at end of file diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 412c30d2..0a148c5c 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -221,6 +221,7 @@ GConst.ATLAS_PATH = { UI_DUGEON_ARMOR = "assets/arts/atlas/ui/dungeon_armor.asset", 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", } GConst.TOUCH_EVENT = { @@ -731,6 +732,7 @@ end GConst.ERROR_STR = { SUCCESS = "SUCCESS", NAME_HAS_EXISTED = "NAME_HAS_EXISTED", + ACCOUNT_BANNED = "ACCOUNT_BANNED", } return GConst \ No newline at end of file diff --git a/lua/app/module/account/account_manager.lua b/lua/app/module/account/account_manager.lua index 6b0cd55f..bb238678 100644 --- a/lua/app/module/account/account_manager.lua +++ b/lua/app/module/account/account_manager.lua @@ -4,8 +4,8 @@ function AccountManager:showBindUI() UIManager:showUI("app/ui/game_setting/account_binding_ui") end -function AccountManager:showDeleteUI() - return UIManager:showUI("app/ui/game_setting/account_delete_ui") +function AccountManager:showDeleteUI(hideCloseBtn) + return UIManager:showUI("app/ui/game_setting/account_delete_ui", {hideCloseBtn = hideCloseBtn}) end function AccountManager:getIsBinded() @@ -28,6 +28,7 @@ function AccountManager:onDeleteAccount(result) local info = LocalData:getLastLoginInfo() BIReport:postAccountDelete(info.type) ModuleManager.LoginManager:goToLoginScene() + LocalData:saveBattleSnapshot({}) -- 清除 else GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_FAILED)) end diff --git a/lua/app/module/activity/activity_manager.lua b/lua/app/module/activity/activity_manager.lua index 68ca074a..2b046819 100644 --- a/lua/app/module/activity/activity_manager.lua +++ b/lua/app/module/activity/activity_manager.lua @@ -35,7 +35,7 @@ end function ActivityManager:initSummerTimer() self:unscheduleGlobal(self.summerSid) - if DataManager.ActivityData:isInActiveTime() then + if DataManager.ActivityData:isActive() then Logger.logHighlight("夏日活动结束倒计时："..DataManager.ActivityData:getEndRemainTime()) self.summerSid = self:performWithDelayGlobal(function() -- 夏日活动结束 @@ -54,6 +54,9 @@ end -- 请求夏日活动数据 function ActivityManager:reqSummerData() + if not DataManager.ActivityData:isOpen() then + return + end self:sendMessage(ProtoMsgType.FromMsgEnum.SummerDataReq, {}, {}, self.rspSummerData, nil) end diff --git a/lua/app/module/activity/hero_fund.meta b/lua/app/module/activity/hero_fund.meta new file mode 100644 index 00000000..8e37d3d1 --- /dev/null +++ b/lua/app/module/activity/hero_fund.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 182ed211dd57b7044ae0c6f66592ded7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/activity/hero_fund/hero_fund_manager.lua b/lua/app/module/activity/hero_fund/hero_fund_manager.lua new file mode 100644 index 00000000..b24aab9e --- /dev/null +++ b/lua/app/module/activity/hero_fund/hero_fund_manager.lua @@ -0,0 +1,51 @@ +local HeroFundManager = class("HeroFundManager", BaseModule) + +function HeroFundManager:showMainUI() + UIManager:showUI("app/ui/activity/hero_fund/hero_fund_ui") +end + +function HeroFundManager:reqHeroFundAward(level, rewardType) + if not DataManager.HeroFundData:getIsOpen() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC)) + return + end + -- 直接一键领取 + local curLevel = DataManager.HeroFundData:getWaveLevel() + local heroIdWithLv = {} + for id = 1, curLevel do + if DataManager.HeroFundData:getFreeCanGet(id) then + table.insert(heroIdWithLv, {id = id, grade = 0}) + end + + if DataManager.HeroFundData:getProCanGet(id) then + table.insert(heroIdWithLv, {id = id, grade = 1}) + end + + if DataManager.HeroFundData:getUtralCanGet(id) then + table.insert(heroIdWithLv, {id = id, grade = 2}) + end + end + + if not heroIdWithLv[1] then + return + end + + local params = { + id_with_lv = heroIdWithLv + } + + self:sendMessage(ProtoMsgType.FromMsgEnum.HeroFundAwardReq, params, {}, self.rspHeroFundAward, BIReport.ITEM_GET_TYPE.ACT_HERO_FUND) +end + +function HeroFundManager:rspHeroFundAward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.HeroFundData:gotReward(result.id_with_lv) + GFunc.showRewardBox(result.rewards) + end +end + +function HeroFundManager:purcharse(id) + PayManager:purchasePackage(id, PayManager.PURCHARSE_TYPE.ACT_GIFT) +end + +return HeroFundManager \ No newline at end of file diff --git a/lua/app/module/activity/hero_fund/hero_fund_manager.lua.meta b/lua/app/module/activity/hero_fund/hero_fund_manager.lua.meta new file mode 100644 index 00000000..474cdb5d --- /dev/null +++ b/lua/app/module/activity/hero_fund/hero_fund_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 171aacb33b4ccc4439c40b8db650c861 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/arena/arena_bounty_manager.lua b/lua/app/module/arena/arena_bounty_manager.lua index 1d461760..066c36df 100644 --- a/lua/app/module/arena/arena_bounty_manager.lua +++ b/lua/app/module/arena/arena_bounty_manager.lua @@ -21,24 +21,30 @@ function ArenaBountyManager:onClaimReward(result) if result.err_code == GConst.ERROR_STR.SUCCESS then if result.rewards then -- 读表获取该层奖励 如果是箱子走单独奖励展示接口 + local isOneKeyGet = false local isSpecialBox = false local index = result.reqData.level - local isPro = result.reqData.is_pro - local info = DataManager.ArenaBountyData:getSeasonInfoByLevel(index) - local rewardType local rewardId - if info then - local reward = isPro and info.reward_pro or info.reward - rewardType = reward and reward.type - rewardId = reward and reward.id - if rewardType == GConst.REWARD_TYPE.ITEM then - local itemCfgInfo = ConfigManager:getConfig("item")[rewardId] - if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then - isSpecialBox = true + if index == 0 then -- 一键领取 + isOneKeyGet = true + else + local isPro = result.reqData.is_pro + local info = DataManager.ArenaBountyData:getSeasonInfoByLevel(index) + local rewardType + if info then + local reward = isPro and info.reward_pro or info.reward + rewardType = reward and reward.type + rewardId = reward and reward.id + if rewardType == GConst.REWARD_TYPE.ITEM then + local itemCfgInfo = ConfigManager:getConfig("item")[rewardId] + if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then + isSpecialBox = true + end end end end - if isSpecialBox then + + if isSpecialBox and not isOneKeyGet then ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.ARENA_BOUNTY, params = rewardId, rewards = result.rewards}) local openType = BIReport.BOX_OPEN_OPEN_TYPE.ARENA_BOUNTY BIReport:postBoxOpen(rewardId, BIReport.BOX_OPEN_BOX_TYPE.ACTIVITY, openType, 0, result.rewards) @@ -48,10 +54,15 @@ function ArenaBountyManager:onClaimReward(result) end if result.reqData.is_pro ~= nil then local BountyData = DataManager.ArenaBountyData - if result.reqData.is_pro then - BountyData:onClaimProReward(result.reqData.level) + local index = result.reqData.level + if index ~= 0 then + if result.reqData.is_pro then + BountyData:onClaimProReward(result.reqData.level) + else + BountyData:onClaimReward(result.reqData.level) + end else - BountyData:onClaimReward(result.reqData.level) + BountyData:onOneKeyClaimReward() end BIReport:postArenaBountyReward(BountyData:getBountyReportType(), BountyData:getLevel(), BountyData:getExp(), BountyData:getSeason(), result.reqData.level, result.reqData.is_pro) end diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua index 7905b888..eb9b7bda 100644 --- a/lua/app/module/arena/arena_manager.lua +++ b/lua/app/module/arena/arena_manager.lua @@ -249,4 +249,18 @@ function ArenaManager:showGiftPopUI(showType) UIManager:showUI("app/ui/arena/arena_pop_gift_ui", {showType = showType}) end +-- 领取段位奖励 +function ArenaManager:reqGradingReward(id) + local getIds = {} + table.insert(getIds, id) + self:sendMessage(ProtoMsgType.FromMsgEnum.PVPStageRewardReq, {ids = getIds}, {}, self.rspGradingReward, BIReport.ITEM_GET_TYPE.ARENA_GRADING_REWARD) +end + +function ArenaManager:rspGradingReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ArenaData:onGradingRewardReceived(result.reqData.ids) + GFunc.showRewardBox(result.rewards) + end +end + return ArenaManager \ No newline at end of file diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 76a737e1..caa0de46 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -3,6 +3,7 @@ local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle" local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle" local BATTLE_SKILL_CONDITION_HANDLE = require "app/module/battle/helper/battle_skill_condition_handle" +local BattleFormula = require "app/module/battle/helper/battle_formula" local BattlePassive = require "app/module/battle/helper/battle_passive" local BattleUnitComp = class("BattleUnitComp", LuaComponent) @@ -1630,6 +1631,7 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d end if num < 0 and atker.unitEntity:getBeDmgToHeal() > 0 then num = -num * atker.unitEntity:getBeDmgToHeal() // DEFAULT_FACTOR + num = BattleFormula:getAffectedHeal(num, self) end atker.unitEntity:addDamageCount(num) local showHurtCombo = atker:getHurtComboTag() @@ -1761,7 +1763,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d end function BattleUnitComp:checkDeadStatus(atker, damageOrCureType) - if self.unitEntity:getIsDead() then + if self.unitEntity:getIsDead() and not self.unitEntity:getTagDeadStatus() then + self.unitEntity:tagDeadStatus() if self.unitEntity:getCanRebirth() then -- 复活 self.battleController:resetTimeSpeed(true) local mainUnit = self.team:getMainUnit() diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index 5476175d..e0ad0760 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -968,13 +968,13 @@ function BattleBaseController:enterRoundBegin() self.needWaitingBoardOver = nil self.waveRoundCount[self.waveIndex] = (self.waveRoundCount[self.waveIndex] or 0) + 1 self.battleUI:enterShowBoardAni(function() - self:takeGridEffect() self:enterEliminationBegin() end) table.clear(self.lastRoundBreakedGridType) end function BattleBaseController:takeGridEffect() + local haveGridEffectSucc = false local gridEntities = self.battleData:getGridEnties() local effectGrid = {} for posId, entity in pairs(gridEntities) do @@ -995,6 +995,7 @@ function BattleBaseController:takeGridEffect() availableEffectTypeMap = {} end availableEffectTypeMap[effectType] = true + haveGridEffectSucc = succ end end end @@ -1008,17 +1009,38 @@ function BattleBaseController:takeGridEffect() availableEffectTypeMap = {} end availableEffectTypeMap[effectType] = true + haveGridEffectSucc = succ end end end + + return haveGridEffectSucc end function BattleBaseController:enterEliminationBegin() self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_BEGIN - self:enterRefreshBoard(true) + self:enterRefreshBoard(true, function() + local haveGridEffectSucc = self:takeGridEffect() + if haveGridEffectSucc then -- 如果成功，则等待效果播放完成后，进入消除逻辑 + if self.haveGridEffectSuccSid then + ModuleManager.BattleManager:unscheduleGlobal(self.haveGridEffectSuccSid) + self.haveGridEffectSuccSid = nil + end + ModuleManager.BattleManager:performWithDelayGlobal(function() + self:enterElimination(true) + end, 1.1) + else + self:enterElimination(true) + end + end) end function BattleBaseController:enterElimination(needDelay) + if self.haveGridEffectSuccSid then + ModuleManager.BattleManager:unscheduleGlobal(self.haveGridEffectSuccSid) + self.haveGridEffectSuccSid = nil + end + if self.showSelectSkillSid then ModuleManager.BattleManager:unscheduleGlobal(self.showSelectSkillSid) self.showSelectSkillSid = nil @@ -1446,8 +1468,8 @@ function BattleBaseController:dealGridBreak(posId, condition, time, breakedMap, return end cell:setGridTypeIcon(entity:getBreakFlyToCharacterIcon()) + self:dealGridEdge(posId) end - self:dealGridEdge(posId) end end end @@ -1466,6 +1488,7 @@ function BattleBaseController:dealGridEdge(posId) [BattleConst.BOARD_RANGE_TYPE.RIGHT] = BattleConst.BOARD_RANGE_TYPE.LEFT } end + for _, direction in ipairs(self.upDownLeftRightList) do -- 周围的 local aroundId = ModuleManager.BattleManager:getPosByDirection(posId, direction, self.battleData:getRowCount()) @@ -1649,11 +1672,12 @@ function BattleBaseController:onFillBoardOver(isRoundBeginCheck) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER) self:popBoardCacheSkill(function() self:generateSkill(function() - self:enterElimination(true) if self.onFillBoardOverCallback then local callback = self.onFillBoardOverCallback self.onFillBoardOverCallback = nil callback() + else + self:enterElimination(true) end end) end) diff --git a/lua/app/module/battle/helper/battle_formula.lua b/lua/app/module/battle/helper/battle_formula.lua index 6d12373b..2bd5f7a9 100644 --- a/lua/app/module/battle/helper/battle_formula.lua +++ b/lua/app/module/battle/helper/battle_formula.lua @@ -14,6 +14,10 @@ function BattleFormula:getDamageOrCureResult(unitComp, buff, targetUnitComp) return 0 end +function BattleFormula:getAffectedHeal(num, target) + return BattleFormula.calculateFormula[5](num, target) +end + function BattleFormula:getExpectedDamageResult(unitComp, count, targetUnitComp, skillId, atkCompMap) -- (元素个数*攻击者攻击力+链接技能的伤害) * 受击者伤害减免 -- 普攻 @@ -101,6 +105,11 @@ BattleFormula.calculateFormula = { (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(atkMatchType) - targetUnit.unitEntity:getDecDmg(atkMatchType)) // DEFAULT_FACTOR return result, 0 end, + -- 治疗量 * （治疗效果增减效果） + [5] = function(num, target) + local result = num * (target.unitEntity:getCureAddition() - target.unitEntity:getCureDec() + DEFAULT_FACTOR) // DEFAULT_FACTOR + return result, 0 + end } return BattleFormula \ No newline at end of file diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua index 40c6171c..c8f53fd1 100644 --- a/lua/app/module/battle/skill/battle_board_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua @@ -435,7 +435,10 @@ local function _takeAddSkillEnergy(atkUnitComp, skillEntity, battleController) elementType = boardSkills[math.random(1, count)] end - local side = battleController:getCurActionSide() + local side = battleController:getCurActionSide() + if atkUnitComp then + side = atkUnitComp:getSide() + end elementTypeMap = {[elementType] = addEnergy} battleController:addSkillEnergy(elementTypeMap, side) battleController.battleUI:refreshSkill(nil, nil, side) diff --git a/lua/app/module/bounty/bounty_manager.lua b/lua/app/module/bounty/bounty_manager.lua index 3e633da8..7a1fb3df 100644 --- a/lua/app/module/bounty/bounty_manager.lua +++ b/lua/app/module/bounty/bounty_manager.lua @@ -21,24 +21,30 @@ function BountyManager:onClaimReward(result) if result.err_code == GConst.ERROR_STR.SUCCESS then if result.rewards then -- 读表获取该层奖励 如果是箱子走单独奖励展示接口 + local isOneKeyGet = false local isSpecialBox = false local index = result.reqData.level - local isPro = result.reqData.is_pro - local info = DataManager.BountyData:getSeasonInfoByLevel(index) - local rewardType local rewardId - if info then - local reward = isPro and info.reward_pro or info.reward - rewardType = reward and reward.type - rewardId = reward and reward.id - if rewardType == GConst.REWARD_TYPE.ITEM then - local itemCfgInfo = ConfigManager:getConfig("item")[rewardId] - if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then - isSpecialBox = true + if index == 0 then -- 一键领取 + isOneKeyGet = true + else + local isPro = result.reqData.is_pro + local info = DataManager.BountyData:getSeasonInfoByLevel(index) + local rewardType + if info then + local reward = isPro and info.reward_pro or info.reward + rewardType = reward and reward.type + rewardId = reward and reward.id + if rewardType == GConst.REWARD_TYPE.ITEM then + local itemCfgInfo = ConfigManager:getConfig("item")[rewardId] + if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then + isSpecialBox = true + end end end end - if isSpecialBox then + + if isSpecialBox and not isOneKeyGet then ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.BOUNTY, params = rewardId, rewards = result.rewards}) local openType = BIReport.BOX_OPEN_OPEN_TYPE.BOUNTY BIReport:postBoxOpen(rewardId, BIReport.BOX_OPEN_BOX_TYPE.ACTIVITY, openType, 0, result.rewards) @@ -48,11 +54,17 @@ function BountyManager:onClaimReward(result) end if result.reqData.is_pro ~= nil then local BountyData = DataManager.BountyData - if result.reqData.is_pro then - BountyData:onClaimProReward(result.reqData.level) + local index = result.reqData.level + if index ~= 0 then + if result.reqData.is_pro then + BountyData:onClaimProReward(result.reqData.level) + else + BountyData:onClaimReward(result.reqData.level) + end else - BountyData:onClaimReward(result.reqData.level) + BountyData:onOneKeyClaimReward() end + BIReport:postBountyReward(BountyData:getBountyReportType(), BountyData:getLevel(), BountyData:getExp(), BountyData:getSeason(), result.reqData.level, result.reqData.is_pro) end end diff --git a/lua/app/module/equip/equip_manager.lua b/lua/app/module/equip/equip_manager.lua index 80664db3..cfab2b57 100644 --- a/lua/app/module/equip/equip_manager.lua +++ b/lua/app/module/equip/equip_manager.lua @@ -1,5 +1,40 @@ local EquipManager = class("EquipManager", BaseModule) +-- 展示材料获取弹窗(英雄id，部位，材料id，材料数量) +function EquipManager:showItemGetPop(heroId, part, id, num) + self:reqEquipUpgradeGift(heroId, part) + + UIManager:showUI("app/ui/dungeon/item_get_ui", {heroId = heroId, part = part, id = id, value = num}) +end + +-- 检查装备礼包状态定时器 +function EquipManager:updateEquipGiftTimer(isClear) + self:unscheduleAll() + + if not isClear then + local time = DataManager.EquipData:getGiftNearestRemainTime() + if time and time > 0 then + Logger.logHighlight("设置装备礼包倒计时:"..time) + self.giftSid = self:performWithDelayGlobal(function() + DataManager.EquipData:onGiftStateChange() + end, time) + end + end +end + +-- 请求触发装备升级礼包 +function EquipManager:reqEquipUpgradeGift(heroId, part) + if DataManager.EquipData:getCanShowGiftId(heroId, part) ~= nil then + return + end + + self:sendMessage(ProtoMsgType.FromMsgEnum.TriggerWeaponArmorGiftReq, {hero_id = heroId, equip_position = part}, {}, self.rspEquipUpgradeGift, nil) +end + +function EquipManager:rspEquipUpgradeGift(result) + DataManager.EquipData:initGifts(result.info) +end + -- 升级装备 function EquipManager:reqUpgrade(id, part) local entity = DataManager.EquipData:getEquip(id, part) @@ -15,7 +50,7 @@ function EquipManager:reqUpgrade(id, part) for index, cost in ipairs(entity:getUpgradeMaterials()) do if cost.num > DataManager.BagData.ItemData:getItemNumById(cost.id) then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_8)) - UIManager:showUI("app/ui/dungeon/item_get_ui", {id = cost.id, value = cost.num}) + self:showItemGetPop(id, part, cost.id, cost.num) return end end diff --git a/lua/app/module/gm/dev_tool_manager.lua b/lua/app/module/gm/dev_tool_manager.lua index 4dce73a2..fc12618c 100644 --- a/lua/app/module/gm/dev_tool_manager.lua +++ b/lua/app/module/gm/dev_tool_manager.lua @@ -88,4 +88,12 @@ function DevToolManager:onDealGMFinish(parmas, code, result) ModuleManager.LoginManager:goToLoginScene() end +function DevToolManager:setSkip(skip) + self.isSkipTutorial = skip +end + +function DevToolManager:getSkip() + return self.isSkipTutorial +end + return DevToolManager \ No newline at end of file diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua index 7f3559c0..80618ba2 100644 --- a/lua/app/module/hero/hero_manager.lua +++ b/lua/app/module/hero/hero_manager.lua @@ -1,7 +1,7 @@ local HeroManager = class("HeroManager", BaseModule) -function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, skinId) - UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, skinId = skinId}) +function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, skinId, formationType) + UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, skinId = skinId, formationType = formationType}) end function HeroManager:showHeroUnlockUI(heroIdList) diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index bc2336bb..4c81ccbd 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -181,8 +181,24 @@ function LoginManager:loginFinish(data) BIReport:postLvEvent(0, 1) end else + DataManager:setLoginSuccess(false) local info = LocalData:getLastLoginInfo() BIReport:postAccountLoginFailed(info.type, data.err_code) + if data.err_code == GConst.ERROR_STR.ACCOUNT_BANNED then -- 封号 + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.SEIZED_DESC_1), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.SEIZED_DESC_2), + okFunc = function() + ModuleManager.GameSettingManager:showSupport() + end, + cancelText = I18N:getGlobalText(I18N.GlobalConst.SEIZED_DESC_3), + cancelFunc = function() + ModuleManager.AccountManager:showDeleteUI(true) + end + } + GFunc.showMessageBox(params) + end end end @@ -198,40 +214,40 @@ function LoginManager:saveAuthArgs(isReconnect, name) args.client_info = self:getClientInfo() args.reconnect = isReconnect - local sendQueue = LocalData:getSendQueue() + -- local sendQueue = LocalData:getSendQueue() args.sync = { pip = GFunc.getArray() } - if sendQueue and sendQueue[1] then - local ProtoMsgDispatch = require "app/proto/proto_msg_dispatch" - local pb = require "pb" - for _, info in ipairs(sendQueue) do - local curParams = info.params - local needAd = false - if info.msgName == ProtoMsgType.FromMsgEnum.PipedReq then - local msgName = ProtoMsgDispatch:getReqMsgNameByMsgId(curParams.msg_id) - if msgName then - local fullMsgName = ProtoMsgDispatch:getMsgFullNameByMsgName(msgName) - if fullMsgName then - if curParams.data and type(curParams.data) == "table" then - local ok, pbData = pcall(function() - return pb.encode(fullMsgName, curParams.data) - end) - if ok then - needAd = true - curParams.data = pbData - end - end - end - end - end - if needAd then - table.insert(args.sync.pip, curParams) - end - end - end + -- if sendQueue and sendQueue[1] then + -- local ProtoMsgDispatch = require "app/proto/proto_msg_dispatch" + -- local pb = require "pb" + -- for _, info in ipairs(sendQueue) do + -- local curParams = info.params + -- local needAd = false + -- if info.msgName == ProtoMsgType.FromMsgEnum.PipedReq then + -- local msgName = ProtoMsgDispatch:getReqMsgNameByMsgId(curParams.msg_id) + -- if msgName then + -- local fullMsgName = ProtoMsgDispatch:getMsgFullNameByMsgName(msgName) + -- if fullMsgName then + -- if curParams.data and type(curParams.data) == "table" then + -- local ok, pbData = pcall(function() + -- return pb.encode(fullMsgName, curParams.data) + -- end) + -- if ok then + -- needAd = true + -- curParams.data = pbData + -- end + -- end + -- end + -- end + -- end + -- if needAd then + -- table.insert(args.sync.pip, curParams) + -- end + -- end + -- end NetManager:saveAuthArgs(args) end diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index 714e3bb4..db1c2537 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -30,6 +30,7 @@ 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_hero_fund_cell", "app/ui/main_city/cell/side_bar_seven_days_cell", "app/ui/main_city/cell/side_bar_activity_cell", -- gm放最后一个 diff --git a/lua/app/module/tips/tips_manager.lua b/lua/app/module/tips/tips_manager.lua index acbc13aa..059bfd01 100644 --- a/lua/app/module/tips/tips_manager.lua +++ b/lua/app/module/tips/tips_manager.lua @@ -48,7 +48,7 @@ function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignTyp return elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then -- 英雄皮肤 - ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(rewardId), true, nil, rewardId) + ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(info.parameter), true, nil, info.parameter) return elseif info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_BOX_ITEM or info.type == GConst.ItemConst.ITEM_TYPE.FIXED_BOX_ITEM then self:showBoxItemTips(rewardId) diff --git a/lua/app/module/tutorial/tutorial_manager.lua b/lua/app/module/tutorial/tutorial_manager.lua index a0857104..bb63c616 100644 --- a/lua/app/module/tutorial/tutorial_manager.lua +++ b/lua/app/module/tutorial/tutorial_manager.lua @@ -215,6 +215,11 @@ end function TutorialManager:showFuncTutorial(id) self:sendTutorialId(id, function(success) + if EDITOR_MODE or not Platform:getIsPublishChannel() then -- 跳过引导 + if ModuleManager.DevToolManager:getSkip() then + success = false + end + end if success then if not DataManager.TutorialData:getIsFuncTutorialFinished(id) then DataManager.TutorialData:markFuncTutorialFinish(id) diff --git a/lua/app/net/net_manager.lua b/lua/app/net/net_manager.lua index 625e9956..db714fbb 100644 --- a/lua/app/net/net_manager.lua +++ b/lua/app/net/net_manager.lua @@ -593,6 +593,11 @@ end function NetManager:disconnectAndReconnect() if self.alreadyConnected[NetManager.MAIN_SOCKET_NAME] then + if not DataManager:getLoginSuccess() then -- 没登陆成功的，直接重新走auth->login + ModuleManager.LoginManager:reloginOnReconnectRefuse() + return + end + if self.reconnectMainId then return end @@ -640,7 +645,7 @@ function NetManager:disconnect(socketName) if self.isClosedMap[socketName] then return end - if socketName == NetManager.CHAT_SOCKET_NAME then + if socketName == NetManager.CHAT_SOCKET_NAME then --暂时没有维护 self.isClosedMap[socketName] = true CS.BF.BFMain.Instance.NetMgr:Close(socketName) @@ -665,6 +670,11 @@ function NetManager:disconnect(socketName) end else if self.alreadyConnected[socketName] then -- 如果是成功连接过 + if not DataManager:getLoginSuccess() then -- 没登陆成功的，直接重新走auth->login + ModuleManager.LoginManager:reloginOnReconnectRefuse() + return + end + if UIManager:getWaitNetCount() > 0 then -- 当前在等待服务器回消息 if not self.activeReconnectMainFlag then self:showReconnectMain() @@ -1073,23 +1083,24 @@ function NetManager:getNotAddCostsRsp(msgName) end function NetManager:pipedMessage(msgName, params) - if msgName == ProtoMsgType.FromMsgEnum.LoginReq or - msgName == ProtoMsgType.FromMsgEnum.SyncReq or - msgName == ProtoMsgType.FromMsgEnum.IdleRewardReq or - msgName == ProtoMsgType.FromMsgEnum.IdleExtraRewardReq or - msgName == ProtoMsgType.FromMsgEnum.MailCycleReq or - msgName == ProtoMsgType.FromMsgEnum.GMReq then - return msgName, params - end - local msgId = ProtoMsgDispatch:getMsgIdByMsgName(msgName) - self.msgId = self.msgId + 1 - local pipedStruct = { - id = self.msgId, - ts = Time:getServerTime() * 1000, - msg_id = msgId, - data = params, - } - return ProtoMsgType.FromMsgEnum.PipedReq, pipedStruct + return msgName, params -- 屏蔽PipedReq + -- if msgName == ProtoMsgType.FromMsgEnum.LoginReq or + -- msgName == ProtoMsgType.FromMsgEnum.SyncReq or + -- msgName == ProtoMsgType.FromMsgEnum.IdleRewardReq or + -- msgName == ProtoMsgType.FromMsgEnum.IdleExtraRewardReq or + -- msgName == ProtoMsgType.FromMsgEnum.MailCycleReq or + -- msgName == ProtoMsgType.FromMsgEnum.GMReq then + -- return msgName, params + -- end + -- local msgId = ProtoMsgDispatch:getMsgIdByMsgName(msgName) + -- self.msgId = self.msgId + 1 + -- local pipedStruct = { + -- id = self.msgId, + -- ts = Time:getServerTime() * 1000, + -- msg_id = msgId, + -- data = params, + -- } + -- return ProtoMsgType.FromMsgEnum.PipedReq, pipedStruct end if EDITOR_MODE then diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 62732c4b..da3adff9 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -177,6 +177,8 @@ local ProtoMsgType = { [3613497485] = "ArenaBountyRewardReq", [3613499318] = "ArenaBountyRewardRsp", [3624439233] = "NewMailNtf", + [3629950931] = "PVPStageRewardReq", + [3629952764] = "PVPStageRewardRsp", [3663247602] = "MallDailyResetNtf", [3663314292] = "MallDailyResetReq", [3663316125] = "MallDailyResetRsp", @@ -206,6 +208,10 @@ local ProtoMsgType = { [4152756314] = "PVPChallengeStartRsp", [4155165814] = "SummerTaskClaimReq", [4155167647] = "SummerTaskClaimRsp", + [4188104820] = "HeroFundAwardReq", + [4188106653] = "HeroFundAwardRsp", + [4195650791] = "TriggerWeaponArmorGiftReq", + [4195652624] = "TriggerWeaponArmorGiftRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", }, @@ -387,6 +393,8 @@ local ProtoMsgType = { ArenaBountyRewardReq = 3613497485, ArenaBountyRewardRsp = 3613499318, NewMailNtf = 3624439233, + PVPStageRewardReq = 3629950931, + PVPStageRewardRsp = 3629952764, MallDailyResetNtf = 3663247602, MallDailyResetReq = 3663314292, MallDailyResetRsp = 3663316125, @@ -416,6 +424,10 @@ local ProtoMsgType = { PVPChallengeStartRsp = 4152756314, SummerTaskClaimReq = 4155165814, SummerTaskClaimRsp = 4155167647, + HeroFundAwardReq = 4188104820, + HeroFundAwardRsp = 4188106653, + TriggerWeaponArmorGiftReq = 4195650791, + TriggerWeaponArmorGiftRsp = 4195652624, ExistReq = 4256333947, ExistRsp = 4256335780, }, @@ -597,6 +609,8 @@ local ProtoMsgType = { ArenaBountyRewardReq = "ArenaBountyRewardReq", ArenaBountyRewardRsp = "ArenaBountyRewardRsp", NewMailNtf = "NewMailNtf", + PVPStageRewardReq = "PVPStageRewardReq", + PVPStageRewardRsp = "PVPStageRewardRsp", MallDailyResetNtf = "MallDailyResetNtf", MallDailyResetReq = "MallDailyResetReq", MallDailyResetRsp = "MallDailyResetRsp", @@ -626,6 +640,10 @@ local ProtoMsgType = { PVPChallengeStartRsp = "PVPChallengeStartRsp", SummerTaskClaimReq = "SummerTaskClaimReq", SummerTaskClaimRsp = "SummerTaskClaimRsp", + HeroFundAwardReq = "HeroFundAwardReq", + HeroFundAwardRsp = "HeroFundAwardRsp", + TriggerWeaponArmorGiftReq = "TriggerWeaponArmorGiftReq", + TriggerWeaponArmorGiftRsp = "TriggerWeaponArmorGiftRsp", ExistReq = "ExistReq", ExistRsp = "ExistRsp", }, diff --git a/lua/app/ui/activity/hero_fund.meta b/lua/app/ui/activity/hero_fund.meta new file mode 100644 index 00000000..a69c4c11 --- /dev/null +++ b/lua/app/ui/activity/hero_fund.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bccad4c3ed05c9a4c92259b32009b0f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/hero_fund/cell.meta b/lua/app/ui/activity/hero_fund/cell.meta new file mode 100644 index 00000000..344f15fd --- /dev/null +++ b/lua/app/ui/activity/hero_fund/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad4fd607b9b2d0b4ea51cd7a175ac2c0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/hero_fund/cell/fund_cell.lua b/lua/app/ui/activity/hero_fund/cell/fund_cell.lua new file mode 100644 index 00000000..0be011f0 --- /dev/null +++ b/lua/app/ui/activity/hero_fund/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.HeroFundData:getLevelWave(level)) + + local isGet + + isGet = DataManager.HeroFundData:getFreeGot(level) + local reward = DataManager.HeroFundData:getReward(level, DataManager.HeroFundData.REWARD_TYPE.FREE) + if reward then + self.rewardCell1:refreshByConfig(reward, isGet, isGet) + end + self.rewardCell1:showLock(false) + if DataManager.HeroFundData:getFreeCanGet(level) then + self.rewardCell1:showFrameAnimation() + self.rewardCell1.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell1:addClickListener(function() + self:onClickReward(level, DataManager.HeroFundData.REWARD_TYPE.FREE) + end) + else + self.rewardCell1:hideFrameAnimation() + self.rewardCell1.baseObject:removeRedPoint() + self.rewardCell1:addClickListener(nil) + end + + isGet = DataManager.HeroFundData:getProGot(level) + local reward = DataManager.HeroFundData:getReward(level, DataManager.HeroFundData.REWARD_TYPE.PRO) + if reward then + self.rewardCell2:refreshByConfig(reward, isGet, isGet) + end + self.rewardCell2:showLock(not DataManager.HeroFundData:getProBought()) + if DataManager.HeroFundData:getProCanGet(level) then + self.rewardCell2:showFrameAnimation() + self.rewardCell2.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell2:addClickListener(function() + self:onClickReward(level, DataManager.HeroFundData.REWARD_TYPE.PRO) + end) + else + self.rewardCell2:hideFrameAnimation() + self.rewardCell2.baseObject:removeRedPoint() + self.rewardCell2:addClickListener(nil) + end + + isGet = DataManager.HeroFundData:getUtralGot(level) + local reward = DataManager.HeroFundData:getReward(level, DataManager.HeroFundData.REWARD_TYPE.UTRAL) + if reward then + self.rewardCell3:refreshByConfig(reward, isGet, isGet) + end + self.rewardCell3:showLock(not DataManager.HeroFundData:getUtralBought()) + if DataManager.HeroFundData:getUtralCanGet(level) then + self.rewardCell3:showFrameAnimation() + self.rewardCell3.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell3:addClickListener(function() + self:onClickReward(level, DataManager.HeroFundData.REWARD_TYPE.UTRAL) + end) + else + self.rewardCell3:hideFrameAnimation() + self.rewardCell3.baseObject:removeRedPoint() + self.rewardCell3:addClickListener(nil) + end +end + +-- 领取奖励 +function FundCell:onClickReward(level, rewardType) + ModuleManager.HeroFundManager:reqHeroFundAward(level, rewardType) +end + +return FundCell \ No newline at end of file diff --git a/lua/app/ui/activity/hero_fund/cell/fund_cell.lua.meta b/lua/app/ui/activity/hero_fund/cell/fund_cell.lua.meta new file mode 100644 index 00000000..d5367fe9 --- /dev/null +++ b/lua/app/ui/activity/hero_fund/cell/fund_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1c7ef27b36c6ea042a002ca71d0b3bc3 +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 new file mode 100644 index 00000000..cf9d9058 --- /dev/null +++ b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua @@ -0,0 +1,184 @@ +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:isFullScreen() + return false +end + +function HeroFundUI:ctor() + self.rewardList = {} + for id, info in pairs(DataManager.HeroFundData:getConfig()) do + table.insert(self.rewardList, id) + end + table.sort(self.rewardList, function(a, b) + return a < b + end) +end + +function HeroFundUI:getPrefabPath() + return "assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab" +end + +function HeroFundUI: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 HeroFundUI:_display() + local uiMap = self.root:genAllChildren() + uiMap["activity_herofund_ui.bg.bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_2)) + uiMap["activity_herofund_ui.bg.ui_spine_obj"]:playAnim("idle", true, false) + uiMap["activity_herofund_ui.bg.level.tx_level"]:setText(DataManager.HeroFundData:getWaveCount()) + self.downDesc = uiMap["activity_herofund_ui.bg.bg.desc"] + self.downDesc:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_3)) + self.toActivityTx = uiMap["activity_herofund_ui.bg.bg.to_activity_tx"] + self.toActivityTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_4)) + self.toActivityBtn = uiMap["activity_herofund_ui.bg.bg.to_activity_btn"] + self.toActivityBtnTx = uiMap["activity_herofund_ui.bg.bg.to_activity_btn.text"] + self.toActivityBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.PART_IN_DESC)) + self.toActivityBtn:addClickListener(function() + self:closeUI() + -- 去14活动 + end) + + self:refreshBtns() + self:_refreshScrollrect() +end + +function HeroFundUI:_addListeners() + local uiMap = self.root:genAllChildren() + uiMap["activity_herofund_ui.bg.close_btn"]:addClickListener(function() + self:closeUI() + end) +end + +function HeroFundUI:_bind() + self:bind(DataManager.HeroFundData, "isDirty", function() + self:_display() + end) + + self:bind(DataManager.ShopData, "isDirty", function() + self:_display() + end) +end + +function HeroFundUI:refreshBtns() + local uiMap = self.root:genAllChildren() + uiMap["activity_herofund_ui.bg.title.free.tx_free"]:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE)) + + local probtn = uiMap["activity_herofund_ui.bg.title.buy1"] + local proBtntx = uiMap["activity_herofund_ui.bg.title.buy1.tx_buyed"] + local proBuy = uiMap["activity_herofund_ui.bg.title.buy1.tx_buy"] + proBtntx:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_ACTIVE)) + proBuy:setText(DataManager.HeroFundData:getProPrice()) + + if DataManager.HeroFundData:getProBought() then + probtn:setSprite(GConst.ATLAS_PATH.ACT_HEROFUND, 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.HeroFundManager:purcharse(DataManager.HeroFundData:getProActId()) + end) + proBtntx:setVisible(false) + proBuy:setVisible(true) + end + + local utralbtn = uiMap["activity_herofund_ui.bg.title.buy2"] + local utralBtntx = uiMap["activity_herofund_ui.bg.title.buy2.tx_buyed"] + local utralBuy = uiMap["activity_herofund_ui.bg.title.buy2.tx_buy"] + utralBtntx:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_ACTIVE)) + utralBuy:setText(DataManager.HeroFundData:gettUtralPrice()) + + if DataManager.HeroFundData:getUtralBought() then + utralbtn:setSprite(GConst.ATLAS_PATH.ACT_HEROFUND, 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.HeroFundManager:purcharse(DataManager.HeroFundData:getUtralActId()) + end) + utralBtntx:setVisible(false) + utralBuy:setVisible(true) + end +end + +function HeroFundUI:_refreshScrollrect() + local uiMap = self.root:genAllChildren() + local mask = uiMap["activity_herofund_ui.bg.scrollrect.viewport.content.mask_img"] + local level = DataManager.HeroFundData:getWaveLevel() + local totalCount = #self.rewardList + local maskCount = math.max(0, totalCount - level) + mask:setAnchoredPositionY(-10 - level * 120) + mask:setSizeDeltaY(maskCount * 120 + 20) + local progSlider = uiMap["activity_herofund_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["activity_herofund_ui.bg.scrollrect.viewport.content.prog"] + prog:setSizeDeltaY(y) + self.scrollRectComp = uiMap["activity_herofund_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 HeroFundUI:refreshTime() + local uiMap = self.root:genAllChildren() + local remainTime = DataManager.HeroFundData:getRemainTime() + local str + if remainTime <= 0 then + 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 + self.toActivityTx:setVisible(false) + self.toActivityBtn:setActive(false) + self.downDesc:setVisible(true) + -- end + end + uiMap["activity_herofund_ui.bg.countdown.tx_countdown"]:setText(str) +end + +return HeroFundUI \ No newline at end of file diff --git a/lua/app/ui/activity/hero_fund/hero_fund_ui.lua.meta b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua.meta new file mode 100644 index 00000000..04df0cd8 --- /dev/null +++ b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2a7c6809db6b28846acefe557b94944c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua index c16a087d..152f2a92 100644 --- a/lua/app/ui/activity/seven_day/seven_day_ui.lua +++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua @@ -54,6 +54,19 @@ function SevenDayUI:_display() self:closeUI() end) + self.downDesc = self.uiMap["seven_day_ui.down.desc"] + self.toHeroFundTx = self.uiMap["seven_day_ui.down.to_herofund_tx"] + self.toHeroFundBtn = self.uiMap["seven_day_ui.down.to_herofund_btn"] + self.toHeroFundBtnTx = self.uiMap["seven_day_ui.down.to_herofund_btn.text"] + self.toHeroFundBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.PART_IN_DESC)) + self.toHeroFundTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_FUND_DESCC_1)) + self.toHeroFundBtn:addClickListener(function() + self:closeUI() + if DataManager.HeroFundData:getIsOpen() then + ModuleManager.HeroFundManager:showMainUI() + end + end) + self:initTop() self:initTasks() end @@ -244,6 +257,15 @@ function SevenDayUI:updateTime() local remainTime = endTime - Time:getServerTime() if remainTime >= 0 then self.timeTx:setText(GFunc.getTimeStr(remainTime)) + if DataManager.HeroFundData and DataManager.HeroFundData:getIsOpen() then + self.toHeroFundTx:setVisible(true) + self.toHeroFundBtn:setActive(true) + self.downDesc:setVisible(false) + else + self.toHeroFundTx:setVisible(false) + self.toHeroFundBtn:setActive(false) + self.downDesc:setVisible(true) + end else UIManager:closeUnderUI(self) self:closeUI() diff --git a/lua/app/ui/arena/arena_grading_reward_ui.lua b/lua/app/ui/arena/arena_grading_reward_ui.lua new file mode 100644 index 00000000..66a39251 --- /dev/null +++ b/lua/app/ui/arena/arena_grading_reward_ui.lua @@ -0,0 +1,81 @@ +local ArenaGradingRewardUI = class("ArenaGradingRewardUI", BaseUI) + +function ArenaGradingRewardUI:isFullScreen() + return true +end + +function ArenaGradingRewardUI:showCommonBG() + return false +end + +function ArenaGradingRewardUI:getPrefabPath() + return "assets/prefabs/ui/arena/arena_grading_reward_ui.prefab" +end + +function ArenaGradingRewardUI:onPressBackspace() + self:closeUI() +end + +function ArenaGradingRewardUI:ctor() +end + +function ArenaGradingRewardUI:onCover() +end + +function ArenaGradingRewardUI:onReshow() +end + +function ArenaGradingRewardUI:onClose() +end + +function ArenaGradingRewardUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + self.scrollrectComp = uiMap["arena_grading_reward_ui.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollrectContent = uiMap["arena_grading_reward_ui.scrollrect.viewport.content"] + self.bannerCanvas = uiMap["arena_grading_reward_ui.banner"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS) + self.btnClose = uiMap["arena_grading_reward_ui.banner.btn_close"] + self.txTips = uiMap["arena_grading_reward_ui.banner.tx_tips"] + + self.bannerCanvas.overrideSorting = true + self.bannerCanvas.sortingOrder = self:getUIOrder() + GConst.UI_EFFECT_ORDER.LEVEL5 + + local cfg = DataManager.ArenaData:getGradingRewardCfg() + self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_39)) + self.scrollrectComp:addInitCallback(function() + return "app/ui/arena/cell/arena_grading_reward_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:setUI(self) + cell:refresh(index) + end) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#cfg) + -- 处理进入定位 + self.scrollrectContent:setActive(false) + self:performWithDelayGlobal(function() + -- self.scrollrectComp:moveToIndex(DataManager.ArenaData:getCurTargetIndex()) + local posY = -DataManager.ArenaData:getCurTargetPosY() + local temp = -self.scrollrectComp.baseObject:fastGetSizeDeltaY() / 2 + Logger.logHighlight(posY.. "/"..temp) + if posY + temp <= 0 then + posY = posY + temp + end + Logger.logHighlight(posY) + self.scrollrectContent:setAnchoredPositionY(posY) + self.scrollrectContent:setActive(true) + end, 0.01) + + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.ArenaData, "isDirty", function() + self:onRefresh() + end) +end + +function ArenaGradingRewardUI:onRefresh() + self.scrollrectComp:updateAllCell() +end + +return ArenaGradingRewardUI \ No newline at end of file diff --git a/lua/app/ui/arena/arena_grading_reward_ui.lua.meta b/lua/app/ui/arena/arena_grading_reward_ui.lua.meta new file mode 100644 index 00000000..28337f42 --- /dev/null +++ b/lua/app/ui/arena/arena_grading_reward_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fa7e37c3349ab1646a3232a7eb25fa33 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/arena_season_reward_ui.lua b/lua/app/ui/arena/arena_season_reward_ui.lua index b42064df..8fbb7468 100644 --- a/lua/app/ui/arena/arena_season_reward_ui.lua +++ b/lua/app/ui/arena/arena_season_reward_ui.lua @@ -137,7 +137,7 @@ function ArenaSeasonRewardUI:showGetReward() self.btnGet:addRedPoint(110, 35, 0.6) - local rewards = DataManager.ArenaData:getGradingRewardInfo(lastId) + local rewards = DataManager.ArenaData:getSeasonRewards(lastId) local rewardCount = #rewards self.getRewardComp:addInitCallback(function() return GConst.TYPEOF_LUA_CLASS.REWARD_CELL diff --git a/lua/app/ui/arena/bounty_main_ui.lua b/lua/app/ui/arena/bounty_main_ui.lua index bd21990a..5082164d 100644 --- a/lua/app/ui/arena/bounty_main_ui.lua +++ b/lua/app/ui/arena/bounty_main_ui.lua @@ -45,6 +45,12 @@ function BountyMainUI:onLoadRootComplete() self:closeUI() end) + self.oneKeyBtn = uiMap["bounty_main_ui.bottom_node.one_key_btn"] + self.oneKeyBtn:addClickListener(function() + ModuleManager.ArenaBountyManager:claimReward(0, false) + end) + uiMap["bounty_main_ui.bottom_node.one_key_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ONE_KEY_GET_DESC)) + self:initTitle() self:initTime() self:initLevel() @@ -264,6 +270,7 @@ function BountyMainUI:refreshPreviewReward(idx) end function BountyMainUI:refreshRewards() + self.oneKeyBtn:setActive(DataManager.ArenaBountyData:canShowOneKeyGetBtn()) self.rewardsLeftTitleTx:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_BATTLEPASS_3)) self.rewardsRightTitleTx:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_BATTLEPASS_4)) if not self.adjustRewardsTitleUI then diff --git a/lua/app/ui/arena/cell/arena_grading_cell.lua b/lua/app/ui/arena/cell/arena_grading_cell.lua index d00dcc29..52320c20 100644 --- a/lua/app/ui/arena/cell/arena_grading_cell.lua +++ b/lua/app/ui/arena/cell/arena_grading_cell.lua @@ -9,6 +9,10 @@ function ArenaGradingCell:init() end function ArenaGradingCell:refresh(id) + if id == nil then + return + end + self.txGrading:setText(DataManager.ArenaData:getGradingName(id)) self.imgIdx:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingNumName(id)) self.imgGrading:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingIconName(id)) diff --git a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua new file mode 100644 index 00000000..9114a954 --- /dev/null +++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua @@ -0,0 +1,165 @@ +local ArenaGradingRewardCell = class("ArenaGradingRewardCell", BaseCell) + +-- 光效 +local EFFECT_LIGHT = "assets/prefabs/effects/ui/vfx_ui_arena_gift_b01.prefab" + +local COMMON_GRADING_POSY = 265 +local UNLOCK_GRADING_POSY = 375 + +function ArenaGradingRewardCell:init() + local uiMap = self:getUIMap() + + -- 段位spine + self.gradingNode = uiMap["arena_grading_reward_cell.grading"] + self.spineGradingRoot = uiMap["arena_grading_reward_cell.grading.spine_root"] + self.txGrading = uiMap["arena_grading_reward_cell.grading.tx_grading"] + -- 进度 + self.progress = uiMap["arena_grading_reward_cell.progress"] + self.imgProgCur = uiMap["arena_grading_reward_cell.progress.img_prog_cur"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.imgProgMax = uiMap["arena_grading_reward_cell.progress.img_prog_max"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txGradingValue = uiMap["arena_grading_reward_cell.progress.tx_value"] + -- 游标 + self.tagProg = uiMap["arena_grading_reward_cell.cur_prog"] + self.txTag = uiMap["arena_grading_reward_cell.cur_prog.tx_tag"] + -- 通用奖励 + self.commonReward = uiMap["arena_grading_reward_cell.common_reward"] + self.txDesc = uiMap["arena_grading_reward_cell.common_reward.tx_desc"] + self.maskReward = uiMap["arena_grading_reward_cell.common_reward.mask"] + self.rootEffect = uiMap["arena_grading_reward_cell.common_reward.root_effect"] + self.rewards = {} + for i = 1, 4 do + table.insert(self.rewards, uiMap["arena_grading_reward_cell.common_reward.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) + end + -- 英雄解锁 + self.heroUnlock = uiMap["arena_grading_reward_cell.hero_unlock"] + self.txUnlock = uiMap["arena_grading_reward_cell.hero_unlock.tx_unlock"] + self.heroList = uiMap["arena_grading_reward_cell.hero_unlock.hero_list"] + self.heros = {} + for i = 1, 6 do + table.insert(self.heros, uiMap["arena_grading_reward_cell.hero_unlock.hero_list.item_hero_" .. i]) + end + + self.commonReward:addClickListener(function() + if DataManager.ArenaData:canGetGradingReward(self.id) and not DataManager.ArenaData:isReceivedGradingReward(self.id) then + ModuleManager.ArenaManager:reqGradingReward(self.id) + end + end) +end + +function ArenaGradingRewardCell:setUI(root) + self.uiRoot = root +end + +function ArenaGradingRewardCell:refresh(id) + self.id = id + local cfg = DataManager.ArenaData:getGradingRewardCfg()[self.id] + local curPoint = DataManager.ArenaData:getScore() + local maxPoint = DataManager.ArenaData:getMaxScore() + local curProg = DataManager.ArenaData:getGradingRewardProgressByScore(self.id, curPoint) + local maxProg = DataManager.ArenaData:getGradingRewardProgressByScore(self.id, maxPoint) + + -- Logger.logHighlight(id.."当前进度:"..cfg.score.."/" .. curProg .."/"..maxProg) + + self.spineGradingRoot:removeAllChildren() + local gradingId = DataManager.ArenaData:getGradingIdFromScore(cfg.score) + SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.spineGradingRoot, function(spineObject) + spineObject:setSkin(DataManager.ArenaData:getGradingNumName(gradingId)) + spineObject:playAnim("idle", true) + end) + self.txGrading:setText(DataManager.ArenaData:getGradingName(gradingId)) + + self.baseObject:setSizeDeltaY(DataManager.ArenaData:getGradingRewardItemHeight(self.id)) + if cfg.unlock_hero and #cfg.unlock_hero > 0 then + -- 解锁英雄 + self.gradingNode:setActive(true) + self.gradingNode:setAnchoredPositionY(UNLOCK_GRADING_POSY) + self.heroUnlock:setActive(true) + + if maxPoint >= cfg.score then + self.txUnlock:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_38)) + else + self.txUnlock:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_37)) + end + + for idx, hero in ipairs(self.heros) do + if cfg.unlock_hero[idx] then + hero:setActive(true) + local heroInfo = ConfigManager:getConfig("hero")[cfg.unlock_hero[idx]] + hero:setSprite(GConst.ATLAS_PATH.ICON_ITEM, "frame_"..heroInfo.qlt) + local map = hero:genAllChildren() + map["img_hero"]:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) + + hero:addClickListener(function() + ModuleManager.HeroManager:showHeroDetailUI(cfg.unlock_hero[idx], true) + end) + else + hero:setActive(false) + end + end + else + if DataManager.ArenaData:isGradingMin(self.id) then + self.gradingNode:setActive(true) + self.gradingNode:setAnchoredPositionY(COMMON_GRADING_POSY) + else + self.gradingNode:setActive(false) + end + self.heroUnlock:setActive(false) + end + + local minScore = DataManager.ArenaData:getSeasonGradingMinScore() + self.txTag:setText(curPoint - minScore) + self.txGradingValue:setText(cfg.score - minScore) + self.imgProgCur.value = curProg + self.imgProgMax.value = maxProg + + if DataManager.ArenaData:getCurGradingRewardId() == self.id then + self.tagProg:setVisible(true) + local rootHeight = self.baseObject:fastGetSizeDeltaY() + local posY = rootHeight * curProg + + -- 高度超框处理 + if self.id == 1 or self.id == #DataManager.ArenaData:getGradingRewardCfg() then + local tagHeight = self.tagProg:fastGetSizeDeltaY() + if posY < tagHeight / 2 then + posY = tagHeight / 2 + end + end + self.tagProg:setAnchoredPositionY(posY) + self.baseObject:getTransform():SetAsLastSibling() + else + self.tagProg:setVisible(false) + end + + local canGet = DataManager.ArenaData:canGetGradingReward(self.id) + local isReceived = DataManager.ArenaData:isReceivedGradingReward(self.id) + self.maskReward:setVisible(not canGet) + if canGet then + if isReceived then + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_5)) + else + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_42)) + end + else + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_6)) + end + + self.rootEffect:removeAllChildren() + if canGet and not isReceived then + EffectManager:loadUIEffectAsync(EFFECT_LIGHT, self.uiRoot, self.rootEffect, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) + obj:setAnchoredPosition(0, 0) + obj:play() + end) + end + + for idx, reward in ipairs(self.rewards) do + if cfg.reward[idx] then + reward:setVisible(true) + reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived) + reward:showLight(canGet and not isReceived, self.uiRoot) + else + reward:setVisible(false) + end + end +end + +return ArenaGradingRewardCell \ No newline at end of file diff --git a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.meta b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.meta new file mode 100644 index 00000000..e1c133dd --- /dev/null +++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b77becd3787902a478c7fab399b3ad23 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/arena/cell/arena_season_reward_cell.lua b/lua/app/ui/arena/cell/arena_season_reward_cell.lua index 9c751cac..866ffaf8 100644 --- a/lua/app/ui/arena/cell/arena_season_reward_cell.lua +++ b/lua/app/ui/arena/cell/arena_season_reward_cell.lua @@ -11,7 +11,7 @@ function ArenaSeasonRewardCell:init() end function ArenaSeasonRewardCell:refresh(id) - local rewards = DataManager.ArenaData:getGradingRewardInfo(id) + local rewards = DataManager.ArenaData:getSeasonRewards(id) for idx, cell in pairs(self.rewards) do if rewards[idx] then diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua index 6a0e3c7a..dd4727fc 100644 --- a/lua/app/ui/battle/battle_base_ui.lua +++ b/lua/app/ui/battle/battle_base_ui.lua @@ -1215,6 +1215,9 @@ function BattleBaseUI:onInitGridCellOver() local pos = entity:getPos() cell:getBaseObject():setParent(self.gridNode, true) cell:getBaseObject():setAnchoredPosition(pos.x, pos.y) + if entity:getIsIdle() then + cell:getBaseObject():setAnchoredPositionX(DEFAULT_X) + end entity:setCell(cell) end end diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 383ac0e4..35080232 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -242,6 +242,10 @@ function BattleResultUI:refreshArenaNode() local curId = DataManager.ArenaData:getGradingId() local lastId = DataManager.ArenaData:getGradingIdFromScore(lastScore) + if curId == nil or lastId == nil then + return + end + self.arenaTxGrading:setText(DataManager.ArenaData:getGradingName(lastId)) self:refreshArenaGradingSpine(lastId) @@ -321,6 +325,10 @@ function BattleResultUI:refreshArenaBoxNode() end function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp) + if gradingId == nil then + return + end + if self.arenaSpine then self.arenaSpine:playAnimComplete("vanish", false, false, function() self.arenaSpine:destroy() diff --git a/lua/app/ui/bounty/bounty_main_ui.lua b/lua/app/ui/bounty/bounty_main_ui.lua index 5cddd491..0877144e 100644 --- a/lua/app/ui/bounty/bounty_main_ui.lua +++ b/lua/app/ui/bounty/bounty_main_ui.lua @@ -45,6 +45,12 @@ function BountyMainUI:onLoadRootComplete() self:closeUI() end) + self.oneKeyBtn = uiMap["bounty_main_ui.bottom_node.one_key_btn"] + self.oneKeyBtn:addClickListener(function() + ModuleManager.BountyManager:claimReward(0, false) + end) + uiMap["bounty_main_ui.bottom_node.one_key_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ONE_KEY_GET_DESC)) + self:initTitle() self:initTime() self:initLevel() @@ -267,6 +273,7 @@ function BountyMainUI:refreshPreviewReward(idx) end function BountyMainUI:refreshRewards() + self.oneKeyBtn:setActive(DataManager.BountyData:canShowOneKeyGetBtn()) self.rewardsLeftTitleTx:setText(I18N:getGlobalText(I18N.GlobalConst.BOUNTY_FREE_NAME)) self.rewardsRightTitleTx:setText(I18N:getGlobalText(I18N.GlobalConst.BOUNTY_PURCHASE_NAME)) if not self.adjustRewardsTitleUI then diff --git a/lua/app/ui/collection/collection_ui.lua b/lua/app/ui/collection/collection_ui.lua index 04a0c47b..35a92544 100644 --- a/lua/app/ui/collection/collection_ui.lua +++ b/lua/app/ui/collection/collection_ui.lua @@ -157,6 +157,18 @@ function CollectionUI:refreshCollectPoint() self.txTotalValue:setText(cur.."/"..total) GFunc.centerImgAndTx(self.imgGet, self.txGet, 5) + + -- 红点 + if DataManager.CollectionData:hasCanCollectPoint(GConst.CollectionConst.TYPE.HERO) then + self.btnHero:addRedPoint(25, 30, 0.6) + else + self.btnHero:removeRedPoint() + end + if DataManager.CollectionData:hasCanCollectPoint(GConst.CollectionConst.TYPE.SKIN) then + self.btnSkin:addRedPoint(25, 30, 0.6) + else + self.btnSkin:removeRedPoint() + end end function CollectionUI:showFlyAnim() diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index c2aaac5c..b5566f7f 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -1,5 +1,7 @@ local RewardCell = class("RewardCell", BaseCell) +local EFFECT_LIGHT = "assets/prefabs/effects/ui/vfx_ui_arena_gift_b02.prefab" + function RewardCell:init() local uiMap = self:getUIMap() self.icon = uiMap["reward_cell.item_bg.icon"] @@ -19,6 +21,8 @@ function RewardCell:init() -- 皮肤 self.skin = uiMap["reward_cell.skin"] self.skinQlt = uiMap["reward_cell.skin.img_qlt"] + -- 特效 + self.rootEffect = uiMap["reward_cell.root_effect"] self:hideFrameAnimation() self.baseObject:addClickListener(function() @@ -127,6 +131,8 @@ function RewardCell:_refreshItem(info, count) self.matchImg:setVisible(false) self.skin:setVisible(false) end + + self:showLight(false) end function RewardCell:setNumTx(str) @@ -202,4 +208,17 @@ function RewardCell:showLock(show) self.lock:setVisible(show == true) end +-- 展示光效 +function RewardCell:showLight(show, ui) + self.rootEffect:removeAllChildren() + if show and ui ~= nil and not self.isLoadingEffectLight then + self.isLoadingEffectLight = true + EffectManager:loadUIEffectAsync(EFFECT_LIGHT, ui, self.rootEffect, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) + self.isLoadingEffectLight = false + obj:setAnchoredPosition(0, 0) + obj:play() + end) + end +end + return RewardCell \ No newline at end of file diff --git a/lua/app/ui/common/mop_up_ui.lua b/lua/app/ui/common/mop_up_ui.lua index 4a7649de..a3fcf0f3 100644 --- a/lua/app/ui/common/mop_up_ui.lua +++ b/lua/app/ui/common/mop_up_ui.lua @@ -44,6 +44,9 @@ end function MopUpUI:_display() local uiMap = self.root:genAllChildren() + self.btnOk = uiMap["mop_up_ui.bg.ok_btn"] + self.btnClose = uiMap["mop_up_ui.bg.close_btn"] + uiMap["mop_up_ui.bg.title_text"]:setText(self.customtitleTx or I18N:getGlobalText(I18N.GlobalConst.MOP_UP_DESC_1)) uiMap["mop_up_ui.bg.tx_none"]:setText(I18N:getGlobalText(I18N.GlobalConst.GET_REWARDS_DESC)) uiMap["mop_up_ui.bg.ok_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.MOP_UP_DESC_2)) @@ -61,12 +64,11 @@ function MopUpUI:_display() end function MopUpUI:_addListeners() - local uiMap = self.root:genAllChildren() - uiMap["mop_up_ui.bg.close_btn"]:addClickListener(function() + self.btnClose:addClickListener(function() self:closeUI() end) - uiMap["mop_up_ui.bg.ok_btn"]:addClickListener(function() + self.btnOk:addClickListener(function() self:closeUI() if self.callback then self.callback() @@ -134,6 +136,8 @@ function MopUpUI:showRewardAppearAnim(idx, cell) local scaleX = selfObj:fastGetLocalScale() cell:setTouchEnable(false) + self.btnOk:setTouchEnable(false) + self.btnClose:setTouchEnable(false) local animRewardAppear = selfObj:createBindTweenSequence() animRewardAppear:Insert(0, canvasGroup:DOFade(0, 0)) animRewardAppear:Insert(0, selfObj:getTransform():DOScale(scaleX * 0.6, 0)) @@ -143,6 +147,10 @@ function MopUpUI:showRewardAppearAnim(idx, cell) animRewardAppear:OnComplete(function() animRewardAppear = nil cell:setTouchEnable(true) + self:performWithDelayGlobal(function() + self.btnOk:setTouchEnable(true) + self.btnClose:setTouchEnable(true) + end, 0.5) end) return animRewardAppear end diff --git a/lua/app/ui/dungeon/cell/dungeon_target_cell.lua b/lua/app/ui/dungeon/cell/dungeon_target_cell.lua index c05c95e6..14d129fe 100644 --- a/lua/app/ui/dungeon/cell/dungeon_target_cell.lua +++ b/lua/app/ui/dungeon/cell/dungeon_target_cell.lua @@ -14,10 +14,12 @@ function DungeonTargetCell:init() self.txPowerNum = uiMap["dungeon_target_cell.right.power.tx_num"] end -function DungeonTargetCell:refresh(target, getWay, id) +function DungeonTargetCell:refresh(targetId, targetNum, getWay, id) self.getWay = getWay or self.getWay self.dungeonId = id or self.dungeonId - self.target = target or self.target + if targetId and targetNum then + self.target = {id = targetId, value = targetNum} + end if self.getWay == GConst.DungeonConst.TYPE.WEAPON then self:showWeapon() diff --git a/lua/app/ui/dungeon/item_get_ui.lua b/lua/app/ui/dungeon/item_get_ui.lua index 81de430b..f1be7771 100644 --- a/lua/app/ui/dungeon/item_get_ui.lua +++ b/lua/app/ui/dungeon/item_get_ui.lua @@ -1,5 +1,10 @@ local ItemGetUI = class("ItemGetUI", BaseUI) +local COMMON_MAIN_POSY = 0 +local COMMON_CLOSE_POSY = 280 +local GIFT_MAIN_POSY = 220 +local GIFT_CLOSE_POSY = 140 + function ItemGetUI:isFullScreen() return false end @@ -13,29 +18,52 @@ function ItemGetUI:onPressBackspace() end function ItemGetUI:onClose() + if self.giftCountdownSid then + self.txCountdown:unscheduleGlobal(self.giftCountdownSid) + end end function ItemGetUI:ctor(parmas) - self.target = parmas + self.equipEntity = DataManager.EquipData:getEquip(parmas.heroId, parmas.part) + self.targetId = parmas.id + self.targetNum = parmas.value end function ItemGetUI:onLoadRootComplete() local uiMap = self.root:genAllChildren() - self.txTitle = uiMap["item_get_ui.content.title.tx_title"] self.btnClose = uiMap["item_get_ui.content.btn_close"] + -- 主界面 + self.panelMain = uiMap["item_get_ui.panel_main"] + self.txTitle = uiMap["item_get_ui.content.title.tx_title"] self.rewardCell = uiMap["item_get_ui.content.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) self.txDesc = uiMap["item_get_ui.content.tx_desc"] self.txGet = uiMap["item_get_ui.content.tx_get"] self.scrollRectComp = uiMap["item_get_ui.content.scroll_view"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + -- 礼包界面 + self.panelGift = uiMap["item_get_ui.panel_gift"] + self.txGiftTitle = uiMap["item_get_ui.panel_gift.tx_title"] + self.txCountdown = uiMap["item_get_ui.panel_gift.time_node.tx_countdown"] + self.btnBuy = uiMap["item_get_ui.panel_gift.buy_btn"] + self.txBuy = uiMap["item_get_ui.panel_gift.buy_btn.tx_buy"] + self.rewardNodeLayout = uiMap["item_get_ui.panel_gift.item_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT) + self.rewardCellList = {} + for i = 1, 4 do + table.insert(self.rewardCellList, CellManager:addCellComp(uiMap["item_get_ui.panel_gift.item_node.pop_reward_cell_" .. i], GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL)) + end self.scrollRectComp:addInitCallback(function() return "app/ui/dungeon/cell/dungeon_target_cell" end) self.scrollRectComp:addRefreshCallback(function(index, cell) - cell:refresh(self.target, self.wayType, self.wayList[index]) + cell:refresh(self.targetId, self.targetNum, self.wayType, self.wayList[index]) end) + self.btnBuy:addClickListener(function() + if self.giftId then + PayManager:purchasePackage(self.giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end + end) self.btnClose:addClickListener(function() self:closeUI() end) @@ -48,15 +76,18 @@ function ItemGetUI:onLoadRootComplete() self:bind(DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR), "isDirty", function() self:onRefresh() end) + self:bind(DataManager.EquipData, "isDirty", function() + self:onRefresh() + end) end function ItemGetUI:onRefresh() - self.txTitle:setText(I18N:getText("item", self.target.id, "name")) - self.txDesc:setText(I18N:getText("item", self.target.id, "desc")) + self.txTitle:setText(I18N:getText("item", self.targetId, "name")) + self.txDesc:setText(I18N:getText("item", self.targetId, "desc")) self.txGet:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_23)) - self.rewardCell:refreshItemById(self.target.id) + self.rewardCell:refreshItemById(self.targetId) - local itemCfg = ConfigManager:getConfig("item")[self.target.id] + local itemCfg = ConfigManager:getConfig("item")[self.targetId] if itemCfg == nil or itemCfg.get_way_type == nil or itemCfg.get_way == nil or #itemCfg.get_way == 0 then self:closeUI() return @@ -87,6 +118,46 @@ function ItemGetUI:onRefresh() self.scrollRectComp:clearCells() self.scrollRectComp:refillCells(#self.wayList) + + self:checkShowPanelGift() +end + +-- 展示礼包界面 +function ItemGetUI:checkShowPanelGift() + self.panelGift:setActive(false) + self.panelMain:setAnchoredPositionY(COMMON_MAIN_POSY) + self.btnClose:setAnchoredPositionY(COMMON_CLOSE_POSY) + + self.giftId = DataManager.EquipData:getCanShowGiftId(self.equipEntity:getHeroId(), self.equipEntity:getPart()) + if self.giftId == nil then + return + end + + self.panelGift:setActive(true) + self.panelMain:setAnchoredPositionY(GIFT_MAIN_POSY) + self.btnClose:setAnchoredPositionY(GIFT_CLOSE_POSY) + + local gift = DataManager.ShopData:getActGiftConfig()[self.giftId] + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + self.txGiftTitle:setText(DataManager.EquipData:getGiftTitle(self.giftId)) + for i, cell in ipairs(self.rewardCellList) do + if gift.reward[i] then + cell:setVisible(true, 0.8) + cell:refresh(gift.reward[i].id, gift.reward[i].num, true) + else + cell:setVisible(false, 0.8) + end + end + self.rewardNodeLayout:RefreshLayout() + + -- 倒计时 + if self.giftCountdownSid then + self.txCountdown:unscheduleGlobal(self.giftCountdownSid) + end + self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.EquipData:getGiftRemainTime(self.giftId))) + self.giftCountdownSid = self.txCountdown:scheduleGlobal(function() + self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.EquipData:getGiftRemainTime(self.giftId))) + end, 1) end return ItemGetUI \ No newline at end of file diff --git a/lua/app/ui/game_setting/account_delete_ui.lua b/lua/app/ui/game_setting/account_delete_ui.lua index 7ba88c5f..6a979c28 100644 --- a/lua/app/ui/game_setting/account_delete_ui.lua +++ b/lua/app/ui/game_setting/account_delete_ui.lua @@ -18,8 +18,9 @@ function AccountDeleteUI:onClose() end end -function AccountDeleteUI:ctor() +function AccountDeleteUI:ctor(params) self.besureTxStr = I18N:getGlobalText(I18N.GlobalConst.BESURE_DELETE_ACCOUNT_DESC) + self.hideCloseBtn = params and params.hideCloseBtn end function AccountDeleteUI:onLoadRootComplete() @@ -36,9 +37,11 @@ function AccountDeleteUI:onLoadRootComplete() end end) - uiMap["account_delete_ui.title_bg_img.close_btn"]:addClickListener(function() + local closeBtn = uiMap["account_delete_ui.title_bg_img.close_btn"] + closeBtn:addClickListener(function() self:closeUI() end) + closeBtn:setActive(not self.hideCloseBtn) self:_display() end diff --git a/lua/app/ui/gm/gm_tool_ui.lua b/lua/app/ui/gm/gm_tool_ui.lua index 444d47be..cc175801 100644 --- a/lua/app/ui/gm/gm_tool_ui.lua +++ b/lua/app/ui/gm/gm_tool_ui.lua @@ -25,6 +25,9 @@ function GMToolUI:onRefresh() local scrollView = self.uiMap['gm_tool_ui.ScrollView'] local textTip = self.uiMap['gm_tool_ui.text_tip'] local speedUpBtn = self.uiMap["gm_tool_ui.speed_up_btn"] + local skipTutorialTx = self.uiMap["gm_tool_ui.skip_tutoria.text"] + local skipTutorialBtn = self.uiMap["gm_tool_ui.skip_tutoria"] + local skipTutorialCheck = self.uiMap["gm_tool_ui.skip_tutoria.check"] self.uiMap['gm_tool_ui.close_btn']:addClickListener(function() self:closeUI() end) self.scrollRect = scrollView:getLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) @@ -42,7 +45,7 @@ function GMToolUI:onRefresh() self.inputField = inputField titleTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT).text = "GM面板" okBtnText:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT).text = "确定" - + skipTutorialTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT).text = "跳过引导" okBtn:addClickListener(function() local gmCommand = self.inputField:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_INPUT_FIELD).text @@ -72,6 +75,12 @@ function GMToolUI:onRefresh() comp.enabled = not comp.enabled end end) + + skipTutorialCheck:setVisible(ModuleManager.DevToolManager:getSkip() == true) + skipTutorialBtn:addClickListener(function() + ModuleManager.DevToolManager:setSkip(not ModuleManager.DevToolManager:getSkip()) + skipTutorialCheck:setVisible(ModuleManager.DevToolManager:getSkip() == true) + end) end function GMToolUI:initScrollRectCell(index, cell) diff --git a/lua/app/ui/hero/armor_info_comp.lua b/lua/app/ui/hero/armor_info_comp.lua index 7451e382..b59f67f0 100644 --- a/lua/app/ui/hero/armor_info_comp.lua +++ b/lua/app/ui/hero/armor_info_comp.lua @@ -189,7 +189,7 @@ function ArmorInfoComp:refreshSelectArmor() end) add:setActive(costNum - haveNum > 0) icon:addClickListener(function() - UIManager:showUI("app/ui/dungeon/item_get_ui", {id = costId, value = costNum - haveNum < 0 and 0 or costNum - haveNum}) + ModuleManager.EquipManager:showItemGetPop(armorEntity:getHeroId(), armorEntity:getPart(), costId, costNum - haveNum < 0 and 0 or costNum - haveNum) end) else costNode:setActive(false) diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index 142b80bb..4dba8039 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -58,7 +58,7 @@ function HeroComp:init() if heroId then local hero = DataManager.HeroData:getHeroById(heroId) if hero then - ModuleManager.HeroManager:showHeroDetailUI(heroId) + ModuleManager.HeroManager:showHeroDetailUI(heroId, nil, nil, nil, self.battleType) end end end) @@ -167,7 +167,7 @@ function HeroComp:refreshDungeonArmorFormation() end function HeroComp:refreshScrollRect() - self.heroList = DataManager.HeroData:getAllHeroesSort() -- 每次都重新算一次 + self.heroList = DataManager.HeroData:getAllHeroesSort(self.battleType) -- 每次都重新算一次 for i = 1, 5 do local heroId = self.curFormation[i] @@ -235,7 +235,7 @@ function HeroComp:onClickHero(cell, heroId) self.largeHeroCell:refresh(entity, not entity:isActived(), self.onClickUseFunc) self.largeHeroCell:showCheck(self.curFormation[entity:getMatchType()] == heroId) else - ModuleManager.HeroManager:showHeroDetailUI(heroId) + ModuleManager.HeroManager:showHeroDetailUI(heroId, nil, nil, nil, self.battleType) self.largeHeroCell:getBaseObject():setAnchoredPositionX(OUT_SCREEN_X) end else diff --git a/lua/app/ui/hero/hero_detail_ui.lua b/lua/app/ui/hero/hero_detail_ui.lua index 4da27830..e969a868 100644 --- a/lua/app/ui/hero/hero_detail_ui.lua +++ b/lua/app/ui/hero/hero_detail_ui.lua @@ -26,6 +26,7 @@ function HeroDetailUI:ctor(parmas) else self.panelType = parmas.panelType or GConst.HeroConst.PANEL_TYPE.HERO end + self.formationType = parmas.formationType self.onlyLook = parmas.onlyLook if parmas.heroEntity then self.heroEntity = parmas.heroEntity @@ -94,7 +95,7 @@ function HeroDetailUI:onLoadRootComplete() self.lockSkin:setVisible(false) end - self.heroList = DataManager.HeroData:getAllHeroesSort() + self.heroList = DataManager.HeroData:getAllHeroesSort(self.formationType) self:updateSide() self:refreshShow() diff --git a/lua/app/ui/hero/weapon_info_comp.lua b/lua/app/ui/hero/weapon_info_comp.lua index 8c66470d..587d3fba 100644 --- a/lua/app/ui/hero/weapon_info_comp.lua +++ b/lua/app/ui/hero/weapon_info_comp.lua @@ -153,7 +153,7 @@ function WeaponInfoComp:refresh() end) add:setActive(costNum - haveNum > 0) icon:addClickListener(function() - UIManager:showUI("app/ui/dungeon/item_get_ui", {id = costId, value = costNum - haveNum < 0 and 0 or costNum - haveNum}) + ModuleManager.EquipManager:showItemGetPop(self.weaponEntity:getHeroId(), self.weaponEntity:getPart(), costId, costNum - haveNum < 0 and 0 or costNum - haveNum) end) else costNode:setActive(false) diff --git a/lua/app/ui/main_city/cell/side_bar_activity_cell.lua b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua index 03e0f3cb..ea49ca96 100644 --- a/lua/app/ui/main_city/cell/side_bar_activity_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua @@ -6,7 +6,7 @@ function SideBarActivityCell:getModuleKey() end function SideBarActivityCell:getIsOpen() - return DataManager.ActivityData:isOpen() + return DataManager.ActivityData:isOpen() and DataManager.ActivityData:isActive() end function SideBarActivityCell:getSpineName() diff --git a/lua/app/ui/main_city/cell/side_bar_armor_gift_cell.lua b/lua/app/ui/main_city/cell/side_bar_armor_gift_cell.lua index 8e19d62e..a07a9613 100644 --- a/lua/app/ui/main_city/cell/side_bar_armor_gift_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_armor_gift_cell.lua @@ -1,19 +1,29 @@ local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" local SideBarArmorGiftCell = class("SideBarArmorGiftCell", SideBarBaseCellComp) -local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT +local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT function SideBarArmorGiftCell:getIsOpen() - return DataManager.ShopData:hasGift(GIFT_TYPE) + -- return DataManager.ShopData:hasGift(GIFT_TYPE) + return #DataManager.EquipData:getGiftIdsByType(GIFT_TYPE) > 0 end function SideBarArmorGiftCell:getSpineName() - return "ui_main_btn_equipgift" + return "ui_main_equipgift" +end + +function SideBarArmorGiftCell:getSpineAnimationName() + return "animation" end function SideBarArmorGiftCell:onClick() - local gift = DataManager.ShopData:getGift(GIFT_TYPE) - if gift then - ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW) + -- local gift = DataManager.ShopData:getGift(GIFT_TYPE) + -- if gift then + -- ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW) + -- end + + local ids = DataManager.EquipData:getGiftIdsByType(GIFT_TYPE) + if #ids > 0 then + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, ids, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW) end end @@ -35,19 +45,26 @@ function SideBarArmorGiftCell:updateTime() end function SideBarArmorGiftCell:_refreshTime() - local gift = DataManager.ShopData:getGift(GIFT_TYPE) - if gift then - local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id] - if cfgInfo then - local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE) - if remainTime >= 0 then - self.timeTx:setText(GFunc.getTimeStr(remainTime)) - else - self.timeTx:setText("00:00:00") - end - else - self.timeTx:setText("00:00:00") - end + -- local gift = DataManager.ShopData:getGift(GIFT_TYPE) + -- if gift then + -- local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id] + -- if cfgInfo then + -- local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE) + -- if remainTime >= 0 then + -- self.timeTx:setText(GFunc.getTimeStr(remainTime)) + -- else + -- self.timeTx:setText("00:00:00") + -- end + -- else + -- self.timeTx:setText("00:00:00") + -- end + -- else + -- self.timeTx:setText("00:00:00") + -- end + + local remainTime = DataManager.EquipData:getGiftNearestRemainTime(GIFT_TYPE) + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) else self.timeTx:setText("00:00:00") end 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 new file mode 100644 index 00000000..f7c08a1f --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua @@ -0,0 +1,50 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarHeroFundCell = class("SideBarHeroFundCell", SideBarBaseCellComp) + +function SideBarHeroFundCell:getModuleKey() + return ModuleManager.MODULE_KEY.SEVEN_DAY +end + +function SideBarHeroFundCell:getHasPurchase() + return false +end + +function SideBarHeroFundCell:getIsOpen() + return DataManager.HeroFundData:getIsOpen() +end + +function SideBarHeroFundCell:getSpineName() + return "ui_main_herofund" +end + +function SideBarHeroFundCell:onClick() + ModuleManager.HeroFundManager:showMainUI() +end + +function SideBarHeroFundCell:getIsShowRedPoint() + return DataManager.HeroFundData:getHaveReward() +end + +function SideBarHeroFundCell:onRefresh() + self.timeBg:setVisible(true) + self:_refreshTime() +end + +function SideBarHeroFundCell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarHeroFundCell:_refreshTime() + local remainTime = DataManager.HeroFundData:getRemainTime() + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeTx:setText("00:00:00") + end +end + +return SideBarHeroFundCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua.meta new file mode 100644 index 00000000..bf07cd80 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 07f3f4c6518d616448dfb3093dbe841c +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_weapon_gift_cell.lua b/lua/app/ui/main_city/cell/side_bar_weapon_gift_cell.lua index 4759a55f..a98ce591 100644 --- a/lua/app/ui/main_city/cell/side_bar_weapon_gift_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_weapon_gift_cell.lua @@ -1,19 +1,25 @@ local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" local SideBarWeaponGiftCell = class("SideBarWeaponGiftCell", SideBarBaseCellComp) -local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT +local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT function SideBarWeaponGiftCell:getIsOpen() - return DataManager.ShopData:hasGift(GIFT_TYPE) + -- return DataManager.ShopData:hasGift(GIFT_TYPE) + return #DataManager.EquipData:getGiftIdsByType(GIFT_TYPE) > 0 end function SideBarWeaponGiftCell:getSpineName() - return "ui_main_btn_weapongift" + return "ui_main_weapon" end function SideBarWeaponGiftCell:onClick() - local gift = DataManager.ShopData:getGift(GIFT_TYPE) - if gift then - ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW) + -- local gift = DataManager.ShopData:getGift(GIFT_TYPE) + -- if gift then + -- ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW) + -- end + + local ids = DataManager.EquipData:getGiftIdsByType(GIFT_TYPE) + if #ids > 0 then + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, ids, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW) end end @@ -35,19 +41,26 @@ function SideBarWeaponGiftCell:updateTime() end function SideBarWeaponGiftCell:_refreshTime() - local gift = DataManager.ShopData:getGift(GIFT_TYPE) - if gift then - local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id] - if cfgInfo then - local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE) - if remainTime >= 0 then - self.timeTx:setText(GFunc.getTimeStr(remainTime)) - else - self.timeTx:setText("00:00:00") - end - else - self.timeTx:setText("00:00:00") - end + -- local gift = DataManager.ShopData:getGift(GIFT_TYPE) + -- if gift then + -- local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id] + -- if cfgInfo then + -- local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE) + -- if remainTime >= 0 then + -- self.timeTx:setText(GFunc.getTimeStr(remainTime)) + -- else + -- self.timeTx:setText("00:00:00") + -- end + -- else + -- self.timeTx:setText("00:00:00") + -- end + -- else + -- self.timeTx:setText("00:00:00") + -- end + + local remainTime = DataManager.EquipData:getGiftNearestRemainTime(GIFT_TYPE) + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) else self.timeTx:setText("00:00:00") end diff --git a/lua/app/ui/main_city/component/arena_comp.lua b/lua/app/ui/main_city/component/arena_comp.lua index 0e8ed88a..46a90b7e 100644 --- a/lua/app/ui/main_city/component/arena_comp.lua +++ b/lua/app/ui/main_city/component/arena_comp.lua @@ -57,12 +57,15 @@ function ArenaComp:init() self.txReward = uiMap["arena_comp.btn_reward.tx_reward"] self.btnRank = uiMap["arena_comp.btn_rank"] self.txRank = uiMap["arena_comp.btn_rank.tx_rank"] + self.btnGradingReward = uiMap["arena_comp.btn_grading_reward"] + self.txGradingReward = uiMap["arena_comp.btn_grading_reward.tx_grading_reward"] self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_4)) self.txRecord:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_7)) self.txFormation:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_9)) - self.txReward:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) + self.txReward:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_41)) self.txRank:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_5)) + self.txGradingReward:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_40)) self.btnHelp:addClickListener(function() local params = { @@ -84,6 +87,9 @@ function ArenaComp:init() self.btnRank:addClickListener(function() UIManager:showUI("app/ui/arena/arena_rank_ui") end) + self.btnGradingReward:addClickListener(function() + UIManager:showUI("app/ui/arena/arena_grading_reward_ui") + end) self:initBounty() self:refreshShow() self:initRightBtns() @@ -176,6 +182,7 @@ function ArenaComp:refreshShow() self:refreshBounty() -- 刷新战令 self:updateTimer() + self:refreshGradingRewardRedPoint() end function ArenaComp:updateTimer() @@ -253,4 +260,13 @@ function ArenaComp:refreshRightBtns() self.rightNode:setVisible(y < 0) end +-- 刷新段位奖励红点 +function ArenaComp:refreshGradingRewardRedPoint() + if DataManager.ArenaData:hasGradingRewardRedDot() then + self.btnGradingReward:addRedPoint(50, 50, 0.6) + else + self.btnGradingReward:removeRedPoint() + end +end + return ArenaComp \ No newline at end of file diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index f6f4320d..4235f8d5 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -183,6 +183,10 @@ function MainCityUI:_addListeners() self:addEventListener(EventManager.CUSTOM_EVENT.CHANGE_MAIN_COMP_MODULE, function(module) self:switchMainCompModule(module) end) + + self:addEventListener(EventManager.CUSTOM_EVENT.MAIN_UI_CHECK_SIDE_BAR, function(module) + self:checkSideBarOpenStatus() + end) DataManager.MailData:checkNewMail() end @@ -1018,7 +1022,7 @@ function MainCityUI:checkMainPop() end -- 金猪满了后下次进主城要弹出来 - if DataManager.GoldPigData:getPopFlag() then + if DataManager.GoldPigData:getPopFlag() and not DataManager.TutorialData:getIsInTutorial() then DataManager.GoldPigData:markPop() local showType = BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP if self.isFirstEnter then diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua index cb579f21..4061109c 100644 --- a/lua/app/ui/shop/gift_pop_ui.lua +++ b/lua/app/ui/shop/gift_pop_ui.lua @@ -8,6 +8,8 @@ local GIFT_BG_NAME = { [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png", [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png", [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png", + [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png", + [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png", }, [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png", [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "assets/arts/textures/background/shop/shop_gift_bg_1.png", @@ -21,6 +23,8 @@ local GIFT_BG_BANNER_NAME = { [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png", [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_8_2.png", [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_7_2.png", + [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_8_2.png", + [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_7_2.png", }, [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png", [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png", @@ -45,10 +49,14 @@ function GiftPopUI:ctor(params) params = params or {} self.actType = params.type - self.actId = params.id + if type(params.id) == "table" then + self.actIds = params.id + self.actId = self.actIds[1] + else + self.actId = params.id + end self.onlySelf = params.onlySelf -- 有此标记时 关闭直接关闭界面 self.showType = params.showType - self.buyCount = DataManager.ShopData:getGiftBoughtNum(self.actType, self.actId) -- 触发时该礼包的购买数量 end function GiftPopUI:isFullScreen() @@ -93,6 +101,30 @@ function GiftPopUI:onLoadRootComplete() self.buyBtnTx = self.uiMap["gift_pop_ui.bg.buy_btn.text"] self.buyBtnIcon = self.uiMap["gift_pop_ui.bg.buy_btn.icon"] + -- 界面切换 + self.nodeSwitch = self.uiMap["gift_pop_ui.switch_node"] + self.btnRight = self.uiMap["gift_pop_ui.switch_node.btn_right"] + self.btnLeft = self.uiMap["gift_pop_ui.switch_node.btn_left"] + self.pointsRoot = self.uiMap["gift_pop_ui.switch_node.points"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT) + self.points = {} + for i = 1, 10 do + table.insert(self.points, self.uiMap["gift_pop_ui.switch_node.points.point_" .. i]) + end + + self.btnRight:addClickListener(function() + local idx = table.indexof(self.actIds, self.actId) + if idx and idx + 1 <= #self.actIds then + self.actId = self.actIds[idx + 1] + end + self:refresh() + end) + self.btnLeft:addClickListener(function() + local idx = table.indexof(self.actIds, self.actId) + if idx and idx - 1 > 0 then + self.actId = self.actIds[idx - 1] + end + self:refresh() + end) self.buyBtn:addClickListener(function() self:onClickGift() end) @@ -118,15 +150,22 @@ function GiftPopUI:refresh(needCheck) self:checkNextPopGiftOrClose() return end + else + self.buyCount = DataManager.ShopData:getGiftBoughtNum(self.actType, self.actId) -- 触发时该礼包的购买数量 end + if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then - local type = PayManager:getGiftConfigInfo(self.actType, self.actId).type - self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType][type])) + local giftType = PayManager:getGiftConfigInfo(self.actType, self.actId).type + if giftType == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT or giftType == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT then + self.titleTx:setText(DataManager.EquipData:getGiftTitle(self.actId)) + else + self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType][giftType])) + end self.banner:setVisible(false) - self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType][type], function() + self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType][giftType], function() self.banner:setVisible(true) end) - self.bg:setTexture(GIFT_BG_NAME[self.actType][type]) + self.bg:setTexture(GIFT_BG_NAME[self.actType][giftType]) else self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType])) self.banner:setVisible(false) @@ -188,6 +227,7 @@ function GiftPopUI:refresh(needCheck) BIReport:postPayUIShow(giftType, self.actId, self.showType) self:updateTime() + self:showSwitch() end function GiftPopUI:updateTime() @@ -214,6 +254,14 @@ function GiftPopUI:updateTime() self:checkNextPopGiftOrClose() end self.timeText:setText(Time:formatNumTime(remainTime)) + elseif cfgInfo and (cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT or cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT) then-- 新装备礼包 + hasTime = true + local remainTime = DataManager.EquipData:getGiftRemainTime(self.actId) + if remainTime <= 0 then + remainTime = 0 + self:checkNextPopGiftOrClose() + end + self.timeText:setText(Time:formatNumTime(remainTime)) end end elseif self.actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW then -- 成长礼包 @@ -259,4 +307,27 @@ function GiftPopUI:checkNextPopGiftOrClose() end end +-- 显示切换相关内容 +function GiftPopUI:showSwitch() + if self.actIds == nil or #self.actIds <= 1 then + self.nodeSwitch:setActive(false) + return + end + + self.nodeSwitch:setActive(true) + local curIdx = table.indexof(self.actIds, self.actId) + self.btnRight:setActive(curIdx < #self.actIds) + self.btnLeft:setActive(curIdx > 1) + + for index, item in ipairs(self.points) do + if self.actIds[index] then + item:setActive(true) + item:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP).alpha = self.actIds[index] == self.actId and 1 or 0.5 + else + item:setActive(false) + end + end + self.pointsRoot:RefreshLayout() +end + return GiftPopUI \ No newline at end of file diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua index 3d2acfe2..b93abac9 100644 --- a/lua/app/ui/task/task_main_ui.lua +++ b/lua/app/ui/task/task_main_ui.lua @@ -176,6 +176,7 @@ function TaskMainUI:initDailyTaskAdCell() end end) self.dailyTaskAdCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_ad_cell.box.info"] + self.adBoxSpineObj = self.uiMap["task_main_ui.bg.daily.task_ad_cell.box.ui_spine_obj"] end function TaskMainUI:initDailyTaskFinalCell() @@ -197,6 +198,7 @@ function TaskMainUI:initDailyTaskFinalCell() end end) self.dailyTaskFinalCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_final_cell.box.info"] + self.finalBoxSpineObj = self.uiMap["task_main_ui.bg.daily.task_final_cell.box.ui_spine_obj"] end function TaskMainUI:initDailyTasks() @@ -335,9 +337,21 @@ function TaskMainUI:refreshDailyTaskAdCell() if DataManager.DailyTaskData:getDailyTaskCanClaimTask(taskId) then self.dailyTaskAdCellBoxInfo:setVisible(false) self.dailyTaskAdCellBox:addRedPoint(40, 28, 0.7) + self.adBoxSpineObj:playAnim("ready", true, false) + self.curAdCanGet = true else self.dailyTaskAdCellBoxInfo:setVisible(true) self.dailyTaskAdCellBox:removeRedPoint() + + if self.curAdCanGet then + self.adBoxSpineObj:playAnimComplete("open", false, true, function() + self.adBoxSpineObj:playAnim("idle01", true, false) + end) + else + self.adBoxSpineObj:playAnim("idle01", true, false) + end + + self.curAdCanGet = false end self.dailyTaskAdCellProgressTx:setText(count .. "/" .. needCount) self.dailyTaskAdCellProgress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = count/needCount @@ -354,9 +368,23 @@ function TaskMainUI:refreshDailyTaskFinalCell() if DataManager.DailyTaskData:getDailyTaskCanClaimTask(taskId) then self.dailyTaskFinalCellBoxInfo:setVisible(false) self.dailyTaskFinalCellBox:addRedPoint(40, 28, 0.7) + self.finalBoxSpineObj:playAnim("ready", true, false) + self.curFinalCanGet = true else self.dailyTaskFinalCellBoxInfo:setVisible(true) self.dailyTaskFinalCellBox:removeRedPoint() + if DataManager.DailyTaskData:getDailyTaskCalaimed(taskId) then + if self.curFinalCanGet then + self.finalBoxSpineObj:playAnimComplete("open", false, true, function() + self.finalBoxSpineObj:playAnim("idle02", true, false) + end) + else + self.finalBoxSpineObj:playAnim("idle02", true, false) + end + else + self.finalBoxSpineObj:playAnim("idle01", true, false) + end + self.curFinalCanGet = false end self.dailyTaskFinalCellProgressTx:setText(count .. "/" .. needCount) self.dailyTaskFinalCellProgress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = count/needCount diff --git a/lua/app/userdata/activity/activity_data.lua b/lua/app/userdata/activity/activity_data.lua index dc1aa979..d49ad4c3 100644 --- a/lua/app/userdata/activity/activity_data.lua +++ b/lua/app/userdata/activity/activity_data.lua @@ -11,6 +11,7 @@ end function ActivityData:init() self.actData = {} + ModuleManager.ActivityManager:initSummerTimer() ModuleManager.ActivityManager:reqSummerData() end @@ -25,12 +26,19 @@ function ActivityData:isOpen() if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then return false end - if not self:isInActiveTime() then - return false + if not self:isOpenTime() then + return end return true end +-- 是否在活动配置时间内 +function ActivityData:isOpenTime() + local startTime = Time:getCertainTimeByStr(self:getActCfg().start_time) + local endTime = Time:getCertainTimeByStr(self:getActCfg().end_time) + ACT_DAYS * 24 * 60 * 60 + return Time:getServerTime() >= startTime and Time:getServerTime() <= endTime +end + -- 获取活动id function ActivityData:getActId() return ACT_ID @@ -60,7 +68,7 @@ function ActivityData:getBountyCfg() end -- 是否在活动时间内 -function ActivityData:isInActiveTime() +function ActivityData:isActive() if self.actData == nil or self.actData.activated_at == nil or self.actData.activated_at <= 0 then return false end @@ -120,7 +128,7 @@ function ActivityData:onGetActData(data) self.actData = data - if self:isOpen() then + if self:isActive() then -- 注册任务进度监听 for id, data in ipairs(ConfigManager:getConfig("activity_bounty_task")) do ModuleManager.TaskManager:registerTask("ActivityData", data.type, function(count) @@ -135,8 +143,6 @@ function ActivityData:onGetActData(data) Logger.printTable(data) end - ModuleManager.ActivityManager:initSummerTimer() - self:setDirty() end diff --git a/lua/app/userdata/activity/hero_fund.meta b/lua/app/userdata/activity/hero_fund.meta new file mode 100644 index 00000000..4399e0f4 --- /dev/null +++ b/lua/app/userdata/activity/hero_fund.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c5f86b5807abb346a0327f5b30d1623 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/activity/hero_fund/hero_fund_data.lua b/lua/app/userdata/activity/hero_fund/hero_fund_data.lua new file mode 100644 index 00000000..acda8e9d --- /dev/null +++ b/lua/app/userdata/activity/hero_fund/hero_fund_data.lua @@ -0,0 +1,384 @@ +local HeroFundData = class("HeroFundData", BaseData) + +local PRO_ACT_ID = 140403 +local UTRAL_ACT_ID = 140404 +local OPEN_AT_DAY = 3 +local OPEN_DAY = 7 + +HeroFundData.REWARD_TYPE = { + FREE = 1, + PRO = 2, + UTRAL = 3 +} + +function HeroFundData:ctor() + self:clear() +end + +function HeroFundData:clear() + self.data.isDirty = false + 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.endTime = 0 -- 活动结束时间 + + DataManager:unregisterCrossDayFunc("HeroFundData") + DataManager:unregisterTryOpenFunc("HeroFundData") +end + +function HeroFundData:init(data) + data = data or {} + self.waveCount = data.total_wave or 0 + self.endTime = 0 + if data.open_at and data.open_at > 0 then + self.endTime = GFunc.formatTimeStep(data.open_at) + (OPEN_DAY + 1) * 86400 + end + + if data.funds then + if data.funds.free_awarded then + for _, id in ipairs(data.funds.free_awarded) do + self:setFreeGot(id) + end + end + + if data.funds.pay_low_awarded then + for _, id in ipairs(data.funds.pay_low_awarded) do + self:setProGot(id) + end + end + + if data.funds.pay_high_awarded then + for _, id in ipairs(data.funds.pay_high_awarded) do + self:setUtralGot(id) + end + end + end + + local cfg = self:getConfig() + self.waveLevelListCount = 0 + for id, info in ipairs(cfg) do + self.waveLevelList[id] = info.exp + self.waveLevelListCount = self.waveLevelListCount + 1 + end + + for id = 1, self.waveLevelListCount do + local wave = self.waveLevelList[id] + if wave and wave <= self.waveCount then + self.waveLevel = id + else + break + end + end + + self.proBounght = false + self:getProBought() + + self.utralBounght = false + self:getUtralBought() + + self:initTaskListener() + + if self.endTime ~= 0 then -- 开过了 + return + end + + DataManager:registerTryOpenFunc("HeroFundData", function() + if self.endTime ~= 0 then + return + end + + if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then + local time = Time:getServerTime() + local registerBeginTs = Time:getBeginningOfOneDay(DataManager:getRegisterTs()) + if registerBeginTs + (OPEN_AT_DAY - 1) * 86400 <= time then + self.endTime = time + (OPEN_DAY + 1) * 86400 + end + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.MAIN_UI_CHECK_SIDE_BAR) + self:setDirty() + DataManager:unregisterTryOpenFunc("HeroFundData") + end + end) + + DataManager:registerCrossDayFunc("HeroFundData", function() + if self.endTime ~= 0 then -- 开过了 + return + end + + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then + return + end + + local time = Time:getServerTime() + local registerBeginTs = Time:getBeginningOfOneDay(DataManager:getRegisterTs()) + if registerBeginTs + (OPEN_AT_DAY - 1) * 86400 <= time then + self.endTime = time + (OPEN_DAY + 1) * 86400 + end + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.MAIN_UI_CHECK_SIDE_BAR) + self:setDirty() + end) +end + +function HeroFundData:getConfig() + return ConfigManager:getConfig("activity_herofund") +end + +function HeroFundData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function HeroFundData:getIsOpen() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then + return false + end + + if self.endTime <= 0 then + return false + end + + return self.endTime > Time:getServerTime() +end + +function HeroFundData:getRemainTime() + local remian = math.max(0, self.endTime - Time:getServerTime()) + return remian +end + +function HeroFundData:getWaveLevel() + return self.waveLevel or 0 +end + +function HeroFundData:getLevelWave(level) + return self.waveLevelList[level] or 0 +end + +function HeroFundData:addWaveCount(count) + 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.waveLevelListCount 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 HeroFundData:getWaveCount() + return self.waveCount or 0 +end + +function HeroFundData:getFreeGot(level) + return self.free_awarded[level] +end + +function HeroFundData:setFreeGot(level) + if not self.free_awarded[level] then + self.freeLevel = self.freeLevel + 1 + end + self.free_awarded[level] = true +end + +function HeroFundData:getProActId() + return PRO_ACT_ID +end + +function HeroFundData: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 HeroFundData:getProGot(level) + return self.pay_low_awarded[level] +end + +function HeroFundData:setProGot(level) + if not self.pay_low_awarded[level] then + self.proLevel = self.proLevel + 1 + end + self.pay_low_awarded[level] = true +end + +function HeroFundData:getProBought() + if not self.proBounght then + if DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, PRO_ACT_ID) > 0 then + self.proBounght = true + end + end + + return self.proBounght +end + +function HeroFundData:setProBought() + self.proBounght = true + self:setDirty() +end + +function HeroFundData:getUtralActId() + return UTRAL_ACT_ID +end + +function HeroFundData: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 HeroFundData:getUtralGot(level) + return self.pay_high_awarded[level] +end + +function HeroFundData:setUtralGot(level) + if not self.pay_high_awarded[level] then + self.utralLevel = self.utralLevel + 1 + end + self.pay_high_awarded[level] = true +end + +function HeroFundData:getUtralBought() + if not self.utralBounght then + if DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, UTRAL_ACT_ID) > 0 then + self.utralBounght = true + end + end + return self.utralBounght +end + +function HeroFundData:setUtralBought() + self.utralBounght = true + self:setDirty() +end + +function HeroFundData:gotReward(heroIdWithLv) + if not heroIdWithLv then + return + end + + for _, info in ipairs(heroIdWithLv) 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 HeroFundData:getFreeCanGet(level) + if self:getFreeGot(level) then + return false + end + + if self.waveLevel < level then + return false + end + + return true +end + +function HeroFundData: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 HeroFundData: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 HeroFundData: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 HeroFundData:getReward(level, rewardType) + local cfg = self:getConfig()[level] + if not cfg then + return + end + + if rewardType == HeroFundData.REWARD_TYPE.FREE then + return cfg.reward + elseif rewardType == HeroFundData.REWARD_TYPE.PRO then + return cfg.reward_pro + elseif rewardType == HeroFundData.REWARD_TYPE.UTRAL then + return cfg.reward_pro_max + end +end + +function HeroFundData:initTaskListener() + local nowTime = Time:getServerTime() + -- 活动结束就不用监听了 + if self.endTime > 0 and self.endTime < nowTime then + ModuleManager.TaskManager:unRegisterAllModuleTask("HeroFundData") + return false + end + + ModuleManager.TaskManager:registerTask("HeroFundData", GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE, function(count) + if not self:getIsOpen() then + return + end + self:addWaveCount(count) + end) +end + +return HeroFundData \ No newline at end of file diff --git a/lua/app/userdata/activity/hero_fund/hero_fund_data.lua.meta b/lua/app/userdata/activity/hero_fund/hero_fund_data.lua.meta new file mode 100644 index 00000000..e37873dc --- /dev/null +++ b/lua/app/userdata/activity/hero_fund/hero_fund_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4ff7774557580a94bbc8207796f61ece +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 ed963acc..af38a4af 100644 --- a/lua/app/userdata/arena/arena_bounty_data.lua +++ b/lua/app/userdata/arena/arena_bounty_data.lua @@ -268,6 +268,58 @@ function ArenaBountyData:getIfCanClaimReward() return false end +-- 展示一键领取按钮 +function ArenaBountyData:canShowOneKeyGetBtn() + local maxLevel = self:getMaxLevel() + local curLevel = math.min(maxLevel, self.level) + if curLevel <= 0 then + return false + end + + local count = self:getShowOneKeyLimit() + for i = 1, curLevel do + if not self.claimed[i] then + count = count - 1 + end + if self.bought and not self.proClaimed[i] then + count = count - 1 + end + if count <= 0 then + return true + end + end + + return false +end + +function ArenaBountyData:getShowOneKeyLimit() + if not self.showOneKeyLimit then + self.showOneKeyLimit = GFunc.getConstIntValue("bounty_click") + end + + return self.showOneKeyLimit +end + +function ArenaBountyData:onOneKeyClaimReward() + local maxLevel = self:getMaxLevel() + local curLevel = math.min(maxLevel, self.level) + if curLevel <= 0 then + return false + end + for i = 1, curLevel do + if not self.claimed[i] then + self.claimed[i] = true + self.claimedCount = self.claimedCount + 1 + end + if self.bought and not self.proClaimed[i] then + self.proClaimed[i] = true + self.proClaimedCount = self.proClaimedCount + 1 + end + end + + self:markDirty() +end + -- 是否可以领取重复奖励 function ArenaBountyData:getIfCanClaimRepeatReward() local maxLevel = self:getMaxLevel() @@ -284,8 +336,17 @@ function ArenaBountyData:onClaimReward(level) if self.claimed[level] then return end - self.claimed[level] = true - self.claimedCount = self.claimedCount + 1 + local maxLevel = self:getMaxLevel() + if level > maxLevel then + for i = maxLevel, level do + self.claimed[i] = true + self.claimedCount = self.claimedCount + 1 + end + else + self.claimed[level] = true + self.claimedCount = self.claimedCount + 1 + end + self:markDirty() end diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 5111b2a5..802c5f6b 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -27,15 +27,14 @@ function ArenaData:init(data) self.todayAdRematchCount = data.today_ad_count-- 今日看广告跳匹配cd次数 self.todayWinAdBoxCount = data.ad_box_win_reward_count-- 今日胜利宝箱次数 self.todayLoseAdBoxCount = data.ad_box_lose_reward_count-- 今日失败宝箱次数 + self.maxScore = data.highest_score_in_history-- 历史最高积分 + self.gotGradingRewardIds = data.stage_gift_id-- 已领取的段位奖励id self:updateTotalFightCount(data) -- 初始化rank配置 self.cfgRank = self:getRankCfg(self.season) -- 初始化time配置 self.cfgTime = self:getTimeCfg(self.season) - if data.highest_score_in_history then - self.maxGradingId = self:getGradingIdFromScore(data.highest_score_in_history) - end self.curGradingId = self:getGradingIdFromScore(self.score) -- 当前所在段位id DataManager.FormationData:initArena(data.attack_array_heroes, data.defend_array_heroes) DataManager.PlayerData:initArena(data.today_ticket_buy_count, data.today_ticket_ad_count) @@ -179,7 +178,7 @@ function ArenaData:getRemainSeasonSettlementTime() end -- 获取赛季段位结算奖励信息 -function ArenaData:getGradingRewardInfo(id) +function ArenaData:getSeasonRewards(id) local cfg = ConfigManager:getConfig("arena_rank") if cfg[id] == nil then Logger.logError("未找到段位[%d]相关数据", id) @@ -188,8 +187,23 @@ function ArenaData:getGradingRewardInfo(id) return cfg[id].season_reward end +-- 获取当前赛季最低段位积分 +function ArenaData:getSeasonGradingMinScore() + local result = 0 + for id, data in pairs(self.cfgRank) do + if result == 0 or result > data.score then + result = data.score + end + end + return result +end + -- 获取积分所对应的段位id function ArenaData:getGradingIdFromScore(score, isLastSeason) + if score == nil or score < 0 then + return nil + end + local gradingId,gradingInfo = nil local cfg = self.cfgRank if isLastSeason then @@ -265,7 +279,7 @@ end -- 获取段位名称 function ArenaData:getGradingName(id) local cfg = ConfigManager:getConfig("arena_rank") - if cfg[id] == nil then + if id == nil or cfg[id] == nil then Logger.logError("未找到段位[%d]相关数据", id) return nil end @@ -363,6 +377,11 @@ end -- 个人 ---------------------------------------------------------------------- +-- 获取历史最高段位积分 +function ArenaData:getMaxScore() + return self.maxScore or self:getScore() +end + -- 获取当前段位积分 function ArenaData:getScore() return self.score @@ -375,7 +394,7 @@ end -- 获取当前段位 function ArenaData:getFormartMaxGrading() - local id = self.maxGradingId or self.curGradingId + local id = self:getGradingIdFromScore(self.maxScore) or self.curGradingId if not id then id = 0 end @@ -436,7 +455,7 @@ end -- 是否有入口红点 function ArenaData:hasEntranceRedDot() - return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() + return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() or self:hasGradingRewardRedDot() end -- 广告宝箱 ---------------------------------------------------------------------- @@ -467,6 +486,183 @@ function ArenaData:hasAdBox(isWin, checkCount) return false end +-- 升段奖励 ---------------------------------------------------------------------- + +-- 获取段位奖励配置 +function ArenaData:getGradingRewardCfg() + if self.gradingRewardCfg == nil then + self.gradingRewardCfg = ConfigManager:getConfig("arena_gift") + end + + return self.gradingRewardCfg +end + +-- 获取段位道具奖励 +function ArenaData:getGradingRewardsItem(id) + return self:getGradingRewardCfg()[id].reward +end + +-- 获取段位英雄奖励， nil为没有 +function ArenaData:getGradingRewardsHero(id) + return self:getGradingRewardCfg()[id].unlock_hero +end + +-- 获取当前列表定位所在档位的index +function ArenaData:getCurTargetIndex() + -- 判断最低奖励可领取 + for id, data in ipairs(self:getGradingRewardCfg()) do + if self:canGetGradingReward(id) and not self:isReceivedGradingReward(id) then + return id + end + end + + return self:getCurGradingRewardId() +end + +-- 获取当前所在段位奖励的id +function ArenaData:getCurGradingRewardId() + local curScore = self:getScore() + for id, data in ipairs(self:getGradingRewardCfg()) do + local prog = self:getGradingRewardProgressByScore(id, curScore) + if prog >= 0 and prog < 1 then + return id + end + end + + return 1 +end + +-- 段位奖励是否可领取 +function ArenaData:canGetGradingReward(id) + return self:getMaxScore() >= self:getGradingRewardCfg()[id].score +end + +-- 段位奖励是否已领取 +function ArenaData:isReceivedGradingReward(id) + if self.gotGradingRewardIds == nil then + return false + end + + return table.containValue(self.gotGradingRewardIds, id) +end + +-- 获取积分对应的段位奖励档位进度 +function ArenaData:getGradingRewardProgressByScore(id, score) + local cfg = self:getGradingRewardCfg() + local point = cfg[id].score + + local rangeMin = 0 + local rangeMax = 0 + if id - 1 > 0 then + rangeMin = point - math.floor((point - cfg[id - 1].score) / 2) + else + rangeMin = self:getSeasonGradingMinScore() + end + if id + 1 <= #cfg then + rangeMax = point + math.floor((cfg[id + 1].score - point) / 2) + else + rangeMax = point + end + + -- Logger.logHighlight(id.."档位范围:"..rangeMin.."->"..rangeMax) + + if id == 1 then + -- 第一个档位特殊处理 + local prog = 0.5 + + if score > point then + local half = ((score - point) / (rangeMax - point)) * 0.5 + prog = prog + half + end + return prog + end + + if score >= rangeMax then + -- 超过进度条 + return 1 + elseif score < rangeMin then + --低于进度条 + return -1 + elseif score == rangeMin then + -- 进度最低值 + return 0 + else + -- 在进度条范围内 + return (score - rangeMin) / (rangeMax - rangeMin) + end +end + +-- 是否有段位奖励入口红点 +function ArenaData:hasGradingRewardRedDot() + -- 有奖励可领取 + for id, data in pairs(self:getGradingRewardCfg()) do + if self:canGetGradingReward(id) and not self:isReceivedGradingReward(id) then + return true + end + end + + return false +end + +-- 奖励段位是否是段位分界线 +function ArenaData:isGradingMin(id) + local score = self:getGradingRewardCfg()[id].score + + for id, data in pairs(self.cfgRank) do + if score == data.score then + return true + end + end + + return false +end + +local GRADING_REWARD_COMMON_SIZE = 220 +local GRADING_REWARD_GRADING_SIZE = 460 +local GRADING_REWARD_UNLOCK_SIZE = 570 + +-- 获取段位奖励项的高 +function ArenaData:getGradingRewardItemHeight(id) + if self:getGradingRewardCfg()[id].unlock_hero ~= nil then + -- 有解锁的英雄 + return GRADING_REWARD_UNLOCK_SIZE + elseif self:isGradingMin(id) then + -- 是段位分界线 + return GRADING_REWARD_GRADING_SIZE + else + -- 普通奖励 + return GRADING_REWARD_COMMON_SIZE + end +end + +-- 获取当前列表定位所在档位的高度 +function ArenaData:getCurTargetPosY() + -- 判断最低奖励可领取 + local totalHeight = 0 + for id, data in ipairs(self:getGradingRewardCfg()) do + if self:canGetGradingReward(id) and not self:isReceivedGradingReward(id) then + -- Logger.logHighlight(id) + return totalHeight + end + + totalHeight = totalHeight + self:getGradingRewardItemHeight(id) + end + + -- 判断当前档位 + totalHeight = 0 + local curScore = self:getScore() + for id, data in ipairs(self:getGradingRewardCfg()) do + local prog = self:getGradingRewardProgressByScore(id, curScore) + if prog >= 0 and prog < 1 then + return totalHeight + end + + totalHeight = totalHeight + self:getGradingRewardItemHeight(id) + end + + return 0 +end + -- 事件处理 ---------------------------------------------------------------------- function ArenaData:onDayChanged() @@ -518,12 +714,12 @@ function ArenaData:onBattleResultReceived(settlement, result) -- 积分改变 self.score = self.score + settlement.incr_score self.curGradingId = self:getGradingIdFromScore(self.score) - if result.highest_score_in_history then - local beforeMaxGrading = self.maxGradingId - self.maxGradingId = self:getGradingIdFromScore(result.highest_score_in_history) - if beforeMaxGrading ~= self.maxGradingId then - DataManager.HeroData:checkIfCanShowHeroUnlockDan(self:getFormartMaxGrading()) - end + + local beforeMaxGradingId = self:getGradingIdFromScore(self.maxScore) + self.maxScore = result.highest_score_in_history + local curMaxGradingId = self:getGradingIdFromScore(self.maxScore) + if beforeMaxGradingId ~= curMaxGradingId then + DataManager.HeroData:checkIfCanShowHeroUnlockDan(self:getFormartMaxGrading()) end self:setDirty() @@ -560,4 +756,10 @@ function ArenaData:onSeasonChanged() self:setDirty() end +-- 领取段位奖励 +function ArenaData:onGradingRewardReceived(ids) + self.gotGradingRewardIds = table.addArray(self.gotGradingRewardIds, ids) + self:setDirty() +end + return ArenaData \ No newline at end of file diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 2a4efd09..7b91dd94 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -35,7 +35,9 @@ function BattleTeamEntity:init(side, data) else self.attr = {} end + self.deadStatusTag = false self.isDead = false + self.isRebirth = false self.stunCount = 0 self.lethargyCount = 0 self.frozenCount = 0 @@ -466,9 +468,18 @@ function BattleTeamEntity:getIsRebirth() return self.isRebirth end +function BattleUnitEntity:tagDeadStatus() + self.deadStatusTag = true +end + +function BattleUnitEntity:getTagDeadStatus() + return self.deadStatusTag +end + function BattleTeamEntity:rebirth() self.isRebirth = false self.isDead = false + self.deadStatusTag = false end function BattleTeamEntity:getIsDead() if self:getIsRebirth() then diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index bfe743d3..ce9f681f 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -568,6 +568,14 @@ function BattleUnitEntity:rebirth() self.team:rebirth() end +function BattleUnitEntity:tagDeadStatus() + self.team:tagDeadStatus() +end + +function BattleUnitEntity:getTagDeadStatus() + return self.team:getTagDeadStatus() +end + function BattleUnitEntity:onRoundEnd() for k, v in ipairs(self.activeSkills) do if not self:getActiveSkillLimit() then diff --git a/lua/app/userdata/bounty/bounty_data.lua b/lua/app/userdata/bounty/bounty_data.lua index 5c213684..80692b7f 100644 --- a/lua/app/userdata/bounty/bounty_data.lua +++ b/lua/app/userdata/bounty/bounty_data.lua @@ -272,6 +272,58 @@ function BountyData:getIfCanClaimReward() return false end +-- 展示一键领取按钮 +function BountyData:canShowOneKeyGetBtn() + local maxLevel = self:getMaxLevel() + local curLevel = math.min(maxLevel, self.level) + if curLevel <= 0 then + return false + end + + local count = self:getShowOneKeyLimit() + for i = 1, curLevel do + if not self.claimed[i] then + count = count - 1 + end + if self.bought and not self.proClaimed[i] then + count = count - 1 + end + if count <= 0 then + return true + end + end + + return false +end + +function BountyData:getShowOneKeyLimit() + if not self.showOneKeyLimit then + self.showOneKeyLimit = GFunc.getConstIntValue("bounty_click") + end + + return self.showOneKeyLimit +end + +function BountyData:onOneKeyClaimReward() + local maxLevel = self:getMaxLevel() + local curLevel = math.min(maxLevel, self.level) + if curLevel <= 0 then + return false + end + for i = 1, curLevel do + if not self.claimed[i] then + self.claimed[i] = true + self.claimedCount = self.claimedCount + 1 + end + if self.bought and not self.proClaimed[i] then + self.proClaimed[i] = true + self.proClaimedCount = self.proClaimedCount + 1 + end + end + + self:markDirty() +end + -- 是否可以领取重复奖励 function BountyData:getIfCanClaimRepeatReward() local maxLevel = self:getMaxLevel() @@ -288,8 +340,16 @@ function BountyData:onClaimReward(level) if self.claimed[level] then return end - self.claimed[level] = true - self.claimedCount = self.claimedCount + 1 + local maxLevel = self:getMaxLevel() + if level > maxLevel then + for i = maxLevel, level do + self.claimed[i] = true + self.claimedCount = self.claimedCount + 1 + end + else + self.claimed[level] = true + self.claimedCount = self.claimedCount + 1 + end self:markDirty() end diff --git a/lua/app/userdata/collection/collection_data.lua b/lua/app/userdata/collection/collection_data.lua index 41a0e608..09c55964 100644 --- a/lua/app/userdata/collection/collection_data.lua +++ b/lua/app/userdata/collection/collection_data.lua @@ -39,15 +39,11 @@ function CollectionData:hasRedPoint() end -- 可领点数 - for idx, data in pairs(self:getCollectList(GConst.CollectionConst.TYPE.HERO)) do - if self:canCollectPoint(GConst.CollectionConst.TYPE.HERO, data.id) then - return true - end + if self:hasCanCollectPoint(GConst.CollectionConst.TYPE.HERO) then + return true end - for idx, data in pairs(self:getCollectList(GConst.CollectionConst.TYPE.SKIN)) do - if self:canCollectPoint(GConst.CollectionConst.TYPE.SKIN, data.id) then - return true - end + if self:hasCanCollectPoint(GConst.CollectionConst.TYPE.SKIN) then + return true end -- 可领奖励 @@ -60,6 +56,16 @@ function CollectionData:hasRedPoint() return false end +-- 是否有可领取的收集值 +function CollectionData:hasCanCollectPoint(type) + for idx, data in pairs(self:getCollectList(type)) do + if self:canCollectPoint(type, data.id) then + return true + end + end + return false +end + -- 获取当前收集值 function CollectionData:getCurCollectPoint() return self.curPoint diff --git a/lua/app/userdata/equip/equip_data.lua b/lua/app/userdata/equip/equip_data.lua index b1cc2566..579096fd 100644 --- a/lua/app/userdata/equip/equip_data.lua +++ b/lua/app/userdata/equip/equip_data.lua @@ -6,6 +6,7 @@ function EquipData:ctor() end function EquipData:clear() + ModuleManager.EquipManager:updateEquipGiftTimer(true) end function EquipData:init(data) @@ -140,4 +141,164 @@ function EquipData:onUpgradeEquip(heroId, part) DataManager.HeroData:getHeroById(heroId):onEquipAttrChange() end +-- 装备礼包相关 ----------------------------------------------------------------------------- + +-- 初始化礼包信息 +function EquipData:initGifts(data) + self.gifts = data.active_gifts or GConst.EMPTY_TABLE + + Logger.logHighlight("初始化装备礼包") + Logger.printTable(self.gifts) + + ModuleManager.EquipManager:updateEquipGiftTimer() + self:setDirty() +end + +-- 获取礼包最近的结束时间 +function EquipData:getGiftNearestRemainTime(actType) + local checkList = actType ~= nil and self:getGiftIdsByType(actType) or table.keys(self.gifts) + local nearest = nil + + for idx, id in pairs(checkList) do + local time = self:getGiftRemainTime(id) + if nearest == nil or nearest > time then + nearest = time + end + end + + return nearest +end + +-- 获取所有存在的该类型礼包 +function EquipData:getGiftIdsByType(actType) + local ids = {} + for id, data in pairs(self.gifts) do + local cfg = DataManager.ShopData:getActGiftConfig()[id] + if cfg and actType == cfg.type and self:getGiftRemainTime(id) > 0 then + table.insert(ids, id) + end + end + table.sort(ids, function(a, b) return a > b end) + + return ids +end + +-- 获取可以展示的礼包 +function EquipData:getCanShowGiftId(heroId, part) + local giftId = self:getEquipGiftId(heroId, part) + + if not self:hasGiftData(giftId) then + return nil + end + + if self:getGiftRemainTime(giftId) > 0 then + return giftId + end + + return nil +end + +-- 当前是否存在礼包数据 +function EquipData:hasGiftData(giftId) + return self.gifts[giftId] ~= nil +end + +-- 获取装备对应的礼包id +function EquipData:getEquipGiftId(heroId, part) + local giftType + if part == GConst.EquipConst.PART_TYPE.WEAPON then + giftType = PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT + else + giftType = PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT + end + + if giftType == nil then + return nil + end + + local level = DataManager.EquipData:getEquip(heroId, part):getLevel() + for idx, id in pairs(self:getGiftIdsByType(giftType)) do + if self:meetGiftLevelRange(id, level) then + return id + end + end + + return nil +end + +-- 是否满足礼包的等级条件 +function EquipData:meetGiftLevelRange(giftId, level) + local cfg = DataManager.ShopData:getActGiftConfig()[giftId] + if cfg == nil or cfg.parameter_pro == nil then + return + end + + return level >= cfg.parameter_pro[1] and level <= cfg.parameter_pro[2] +end + +-- 获取礼包剩余时间 +function EquipData:getGiftRemainTime(giftId) + -- 没有礼包 + if self.gifts[giftId] == nil then + return 0 + end + + -- 在冷却中 + if self:isGiftCooling(giftId) then + return 0 + end + + return (self.gifts[giftId].expire_at // 1000) - Time:getServerTime() +end + +-- 礼包是否在冷却时间中 +function EquipData:isGiftCooling(giftId) + local giftData = DataManager.ShopData:getActGiftDetailData(PayManager.PURCHARSE_TYPE.ACT_GIFT, giftId) + + if giftData then + local latestBuyTime = giftData.latest_buy_at // 1000 + local cfg = DataManager.ShopData:getActGiftConfig()[giftId] + if latestBuyTime > 0 then + -- 购买冷却 + local cdTime = (cfg.cd or 0) * 3600 + if latestBuyTime + cdTime > Time:getServerTime() then + return true + end + elseif self:hasGiftData(giftId) then + -- 到期冷却 + if self.gifts[giftId].cd_end_at // 1000 < Time:getServerTime() then + return true + end + end + end + + return false +end + +-- 获取礼包显示的标题 +function EquipData:getGiftTitle(giftId) + local gift = DataManager.ShopData:getActGiftConfig()[giftId] + if gift == nil then + return nil + 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) + 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 +end + +-- 礼包状态改变 +function EquipData:onGiftStateChange() + Logger.logHighlight("装备礼包状态改变") + self:setDirty() +end + +-- 购买礼包成功 +function EquipData:onBuyGiftSuccess(giftId) + Logger.logHighlight("购买装备礼包成功："..giftId) + self:setDirty() +end + return EquipData \ No newline at end of file diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index 74d4d439..31a9c318 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -270,7 +270,15 @@ function HeroData:getAllHeroesBIStr() end -- 获取所有英雄列表（等级>品质>id） -function HeroData:getAllHeroesSort() +function HeroData:getAllHeroesSort(formationType) + local formationMap + if formationType then + local formation = DataManager.FormationData:getFormation(formationType) + formationMap = {} + for _, heroId in pairs(formation) do + formationMap[heroId] = true + end + end local result = {} local heroCfg = ConfigManager:getConfig("hero") for id, v in pairs(heroCfg) do @@ -281,19 +289,28 @@ function HeroData:getAllHeroesSort() local heroEntity = self:getHeroById(info.cfgId) local sort = info.cfgId -- id 预留6位 sort = sort + (10 - info.elementType) * 1000000 -- 位置预留1位 - sort = sort + 10000000 * heroEntity:getQlt() -- 品质1位 - sort = sort + 100000000 * heroEntity:getLv() -- 预留3位 - if heroEntity:isUnlock() then - sort = sort + 300000000000 - if heroEntity:isActived() then - sort = sort + 400000000000 - else - sort = sort + 300000000000 - end - elseif DataManager.BagData.ItemData:getItemNumById(heroEntity:getFragmentId()) > 0 then - sort = sort + 200000000000 + sort = sort + 10000000000 * heroEntity:getQlt() -- 品质1位 + sort = sort + 10000000 * heroEntity:getLv() -- 预留3位 + + if formationMap and formationMap[info.cfgId] then --在布阵中 + sort = sort + 10000000000000 + end + + if not heroEntity:isActived() and heroEntity:canLvUp() then + sort = sort + 1000000000000 else - sort = sort + 100000000000 + if heroEntity:isUnlock() then + sort = sort + 300000000000 + if heroEntity:isActived() then + sort = sort + 400000000000 + else + sort = sort + 300000000000 + end + elseif DataManager.BagData.ItemData:getItemNumById(heroEntity:getFragmentId()) > 0 then + sort = sort + 200000000000 + else + sort = sort + 100000000000 + end end info.sort = sort diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 3fb6af2f..630a2746 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -367,7 +367,12 @@ end function HeroEntity:isUnlock() if self:isActived() then return true + else + if self:canLvUp() then + return true + end end + local unlockChapter = self:getUnlcokChapter() if unlockChapter and unlockChapter <= DataManager.ChapterData:getMaxChapterId() then return true diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index da8f5b80..a9d06896 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -56,6 +56,18 @@ function ShopData:getActGiftConfig() return ConfigManager:getConfig("act_gift") end +-- 获取配置的所有该类型的礼包 +function ShopData:getGiftsByType(giftType) + local gifts = {} + for id, data in pairs(DataManager.ShopData:getActGiftConfig()) do + if data.type == giftType then + gifts[id] = data + end + end + + return gifts +end + -- 已购买的礼包 function ShopData:getActGiftMap() return self.giftMap @@ -114,6 +126,8 @@ function ShopData:updateGiftInfo(gift) DataManager.ArenaData:onBoughtGift(giftId) elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT or cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT then self:onGiftBuySuccess(cfg[giftId].type) + elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT or cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT then + DataManager.EquipData:onBuyGiftSuccess(giftId) elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER then DataManager.ActivityData:onBuyBountyGrade(giftId) end diff --git a/lua/app/userdata/task/daily_task_data.lua b/lua/app/userdata/task/daily_task_data.lua index 5b731aaf..d00e1ba7 100644 --- a/lua/app/userdata/task/daily_task_data.lua +++ b/lua/app/userdata/task/daily_task_data.lua @@ -300,6 +300,14 @@ function DailyTaskData:getTaskListByType(taskType) return self.taskTypeMap[taskType] or GConst.EMPTY_TABLE end +function DailyTaskData:getDailyTaskCalaimed(id) + local task = self.dailyTasks[id] + if not task then + return false + end + return task.claimed +end + function DailyTaskData:getIfCanClaimTask(task) if task.claimed then return false