更新配置

# Conflicts:
#	lua/app/config/const.lua

lua/app/bf/common/functions.lua

@@ -362,6 +362,23 @@ function table.shuffle(t)
     return tab
 end
 
+function table.shuffleBySeed(t, seed)
+    if type(t)~="table" then
+        return
+    end
+    local tab = {}
+    local index = 1
+    while #t ~= 0 do
+        local n = GFunc.getRandomIndexBySeed(seed, 1, #t)
+        if t[n] ~= nil then
+            tab[index] = t[n]
+            table.remove(t,n)
+            index = index + 1
+        end
+    end
+    return tab
+end
+
 function table.clear(t)
     if not t then
         return

lua/app/common/audio_manager.lua

@@ -8,6 +8,9 @@ local AUDIO_CLIP = typeof(CS.UnityEngine.AudioClip)
 AudioManager.BGM_ID = {
     MAINCITY = "assets/arts/sounds/music/main_city.wav",
     BATTLE = "assets/arts/sounds/music/battle.wav",
+    ACT_PVP_CHOOSEBGM = "assets/arts/sounds/music/act_pvp_choosebgm.wav",
+    ACT_PVP_FIGHT = "assets/arts/sounds/music/act_pvp_fight.wav",
+    ACT_PVP_MAINBGM = "assets/arts/sounds/music/act_pvp_mainbgm.wav",
 }
 
 AudioManager.CLICK_ID = {
@@ -41,6 +44,7 @@ AudioManager.EFFECT_ID = {
     EQUIP_ARMOR_UP = "assets/arts/sounds/sfx/ui/armor_up.wav",
     DUNGEON_SMASH = "assets/arts/sounds/sfx/ui/smash.wav",
     STAR_GET = "assets/arts/sounds/sfx/ui/star_get.wav",
+    ACT_PVP_FINISH = "assets/arts/sounds/sfx/ui/act_pvp_finish.wav",
 }
 
 AudioManager.BO_EFFECT_ID = {

lua/app/common/bi_report.lua

@@ -140,6 +140,46 @@ BIReport.ITEM_GET_TYPE = {
 	OFFLINE_RECOVERY = "OfflineRecovery",
 	ACT_SUMMER = "ActSummer",
 	ACT_HERO_FUND = "ActHeroFund",
+	ACT_BOSS_RUSH_FIGHT_START = "ActBossRushFightStart",
+	ACT_BOSS_RUSH_FIGHT = "ActBossRushFight",
+	ACT_BOSS_RUSH_FUND = "ActBossRushFund",
+	ACT_BOSS_RUSH_SHOP = "ActBossRushShop",
+	ACT_BOSS_RUSH_RANK = "ActBossRushRank",
+	ACT_BOSS_RUSH_BUY_FUND = "ActBossRushBuyFund",
+	ACT_FOURTEEN_DAY_BOUNTY = "ActFourteenDayBounty",
+	ACT_FOURTEEN_DAY_TASK = "ActFourteenDayTask",
+	ACT_FOURTEEN_DAY_EXCHANGE = "ActFourteenDayExchange",
+	FOURTEEN_DAY_GIFT = "FourteenDayGift",
+	FULL_MOON_HERO_GIFT = "FullMoonHeroGift",
+	FULL_MOON_NEW_HERO_GIFT = "FullMoonNewHeroGift",
+	FULL_MOON_SKIN_GIFT = "FullMoonSkinGift",
+	DUNGEON_RUNE_START = "DungeonRuneStart",
+	DUNGEON_RUNE_SETTLEMENT = "DungeonRuneSettlement",
+	DUNGEON_RUNE_SWEEP = "DungeonRuneSweep",
+	DUNGEON_RUNE_BUY_WING = "DungeonRunebuyWing",
+	ACT_PVP_ENTER = "ActPvpEnter",
+	ACT_PVP_REFRESH_HERO = "ActPvpRefreshHero",
+	ACT_PVP_FIGHT_END = "ActPvpFightEnd",
+	ACT_PVP_OVER_CD = "ActPvpOverCd",
+	ACT_PVP_DAILY_REWARD = "ActPvpDailyReward",
+	ACT_PVP_BOUNTY = "ActPvpBounty",
+	ACT_PVP_BOUNTY_GIFT = "ActPvpBountyGift",
+	ACT_PVP_RANK_REWARD = "ActPvpRankReward",
+	ACT_PVP_BUY_BOUNTY_LEVEL = "ActPvpBuyBountyLevel",
+	RUNES_QUENCHING = "RuneQuenching",
+	RUNES_AUTO_QUENCHING = "RuneAutoQuenching",
+	RUNES_GIFT = "RuneGift",
+	TOURN_WAVE_BOUNTY_REWARD = "TournWaveBountyReward",
+	TOURN_WAVE_BOUNTY_LEVEL = "TournWaveBountyLevel",
+	TOURN_WAVE_RANK_REWARD = "TournWaveRankReward",
+	TOURN_WAVE_GIFT = "TournWaveGift",
+	TOURN_ARENA_BOUNTY_REWARD = "TournArenaBountyReward",
+	TOURN_ARENA_BOUNTY_LEVEL = "TournArenaBountyLevel",
+	TOURN_ARENA_RANK_REWARD = "TournArenaRankReward",
+	TOURN_ARENA_GIFT = "TournArenaGift",
+	FULL_MOON_TASK = "FullMoonTask",
+	FULL_MOON_TASK_PROG_REWARD = "FullMoonTaskProgReward",
+	FULL_MOON_SKIN_CHALLENGE_REWARD = "FullMoonSkinChallengeReward",
 }
 
 BIReport.ADS_CLICK_TYPE = {
@@ -152,6 +192,9 @@ BIReport.ADS_CLICK_TYPE = {
 	ARENA_REMATCH = "ArenaRematch",
 	ARENA_AD_BOX = "ArenaAdBox",
 	ARMOR_FUND_AD = "ArmorFundAd",
+	DUNGEON_RUNE_REBIRTH = "DungeonRuneRebirth",
+	ACT_PVP_AD_REFRESH_HERO = "ActPvpAdRefreshHero",
+	ACT_PVP_AD_REMATCH = "ActPvpAdRematch",
 
 	MALL_DAILY = "MallDaily",
 	MALL_DAILY_RESET = "MallDailyReset",
@@ -165,6 +208,8 @@ BIReport.FIGHT_OPT_TYPE = {
 	END = "End",
 	SELECT_SKILL_OPEN = "SelectSkillOpen",
 	SELECT_SKILL = "SelectSkill",
+	HERO_INFO = "HeroInfo",
+	HERO_REPORT = "HeroReport",
 }
 
 BIReport.FIGHT_DEATH_TYPE = {
@@ -188,6 +233,10 @@ BIReport.BATTLE_TYPE = {
 	["5"] = "Arena",
 	["6"] = "DungeonWeapon",
 	["7"] = "DungeonArmor",
+	["8"] = "ActBossRush",
+	["9"] = "DungeonRune",
+	["10"] = "FullMoonSkin",
+	["11"] = "ActPvp",
 }
 
 BIReport.GIFT_TYPE = {
@@ -208,7 +257,15 @@ BIReport.GIFT_TYPE = {
 	WEAPON_GIFT = "WeaponGift",
 	ARMOR_GIFT = "ArmorGift",
 	ACT_SUMMER = "ActSummer",
-	ACT_HERO_FUND = "ActHeroFund"
+	ACT_HERO_FUND = "ActHeroFund",
+	FOURTEEN_DAY_GIFT = "FourteenDayGift",
+	ACT_PVP_BOUNTY_GIFT = "ActPvpBountyGift",
+	FULL_MOON_HERO_GIFT = "FullMoonHeroGift",
+	FULL_MOON_NEW_HERO_GIFT = "FullMoonNewHeroGift",
+	FULL_MOON_SKIN_GIFT = "FullMoonSkinGift",
+	RUNES_GIFT = "RunesGift",
+	TOURN_WAVE_GIFT = "TournWaveGift",
+	TOURN_ARENA_GIFT = "TournArenaGift",
 }
 
 BIReport.COIN_TYPE = {
@@ -251,6 +308,7 @@ BIReport.DIALY_CHALLENGE_OPT_TYPE = {
 BIReport.MISCELLANEOUS_OPT_TYPE = {
 	EVALUATE_OPEN = "EvaluateOpen",
 	EVALUATE_CLOSE = "EvaluateClose",
+	BATTLE_SNAP_SHOP_OPEN = "BattleSnapShopOpen",
 }
 
 BIReport.ARENA_OPT_TYPE = {
@@ -283,6 +341,10 @@ BIReport.ACTIVITY_SUMMER = {
 	BUY_LEVEL_UP = "BuyLevelUp",
 }
 
+BIReport.RUNES_FORMATION = {
+	CHAPTER = "chapter",
+}
+
 -- b6
 local EVENT_NAME_EXIT = "client_exit"
 local EVENT_NAME_FIGHT = "client_fight"
@@ -314,6 +376,7 @@ local EVENT_NAME_ARENA_OPT = "client_arena_opt"-- 竞技场
 local EVENT_NAME_MISCELLANEOUS_OPT = "event_name_miscellaneous_opt" -- 一些杂项
 local EVENT_BOX_OPEN = "client_box_open"
 local EVENT_ACT_OPT = "client_act_opt"
+local EVENT_NAME_RUNES = "client_runes"
 
 function BIReport:setIsNewPlayer(isNewPlayer)
 	self.isNewPlayer = isNewPlayer
@@ -950,6 +1013,11 @@ function BIReport:postFightBegin(battleType, wave, chapterId, maxChapter, startT
 		fight_max_chapter = maxChapter,
 		start_times = startTimes,
 	}
+	if EDITOR_MODE then
+		if not args.battle_type then
+			Logger.logFatal("============report postFightBegin 没有battle_type 请检查===========")
+		end
+	end
 	args.formation, args.famation_level = DataManager.FormationData:getStageFormationBIStr()
 	self:report(EVENT_NAME_FIGHT, args)
 end
@@ -988,6 +1056,11 @@ function BIReport:postFightEnd(battleType, battleData, chapterId, wave, duration
 		is_first_win = isFirstWin,
 		isFianlStep = isFianlStep,
 	}
+	if EDITOR_MODE then
+		if not args.battle_type then
+			Logger.logFatal("============report postFightEnd 没有battle_type 请检查===========")
+		end
+	end
 
 	args.formation, args.famation_level = DataManager.FormationData:getStageFormationBIStr()
 	args.max_link_count = maxLinkCount
@@ -1020,6 +1093,11 @@ function BIReport:postShowFightSkillSelect(battleType, battleData, skillList, ch
 		skill = skillStr,
 		skill_num = skillNum,
 	}
+	if EDITOR_MODE then
+		if not args.battle_type then
+			Logger.logFatal("============report postShowFightSkillSelect 没有battle_type 请检查===========")
+		end
+	end
 	self:report(EVENT_NAME_FIGHT, args)
 end
 
@@ -1048,6 +1126,57 @@ function BIReport:postFightSkillSelect(battleType, battleData, skillList, chapte
 		skill = skillStr,
 		skill_num = skillNum,
 	}
+	if EDITOR_MODE then
+		if not args.battle_type then
+			Logger.logFatal("============report postFightSkillSelect 没有battle_type 请检查===========")
+		end
+	end
+	self:report(EVENT_NAME_FIGHT, args)
+end
+
+function BIReport:postFightHeroInfo(battleType, arkFormation)
+	if not arkFormation then
+		return
+	end
+	local heroInfo = {}
+	for matchType, heroEntity in pairs(arkFormation) do
+		if heroEntity then
+			local unit = {
+				id = heroEntity:getCfgId(),
+				level = heroEntity:getLv(),
+				atk = heroEntity:getAtk(),
+				hp = heroEntity:getHp(),
+			}
+			table.insert(heroInfo, unit)
+		end
+	end
+	local args = {
+		battle_type = BIReport.BATTLE_TYPE[battleType],
+		event_type = BIReport.FIGHT_OPT_TYPE.HERO_INFO,
+		hero_info = json.encode(heroInfo)
+	}
+	if EDITOR_MODE then
+		if not args.battle_type then
+			Logger.logFatal("============report postFightSkillSelect 没有battle_type 请检查===========")
+		end
+	end
+	self:report(EVENT_NAME_FIGHT, args)
+end
+
+function BIReport:postFightHeroReport(battleType, atkReport)
+	if not atkReport then
+		return
+	end
+	local args = {
+		battle_type = BIReport.BATTLE_TYPE[battleType],
+		event_type = BIReport.FIGHT_OPT_TYPE.HERO_REPORT,
+		atk_report =  json.encode(atkReport)
+	}
+	if EDITOR_MODE then
+		if not args.battle_type then
+			Logger.logFatal("============report postFightSkillSelect 没有battle_type 请检查===========")
+		end
+	end
 	self:report(EVENT_NAME_FIGHT, args)
 end
 
@@ -1501,12 +1630,7 @@ end
 function BIReport:postAppLovinAdRevenue(msg)
 	local args = json.decode(msg) or {}
 	if args.revenue then
-		args.revenue = tonumber(args.revenue)
+		self:postAdjustAdRevenueAppLovinMAX(args.revenue, args.network_name or GConst.EMPTY_STRING, args.ad_unit_identifier or GConst.EMPTY_STRING, args.placement or GConst.EMPTY_STRING)
-	end
-	if args.revenue then
-		if args.network_name and args.ad_unit_identifier and args.placement then
-			self:postAdjustAdRevenueAppLovinMAX(args.revenue, args.network_name, args.ad_unit_identifier, args.placement)
-		end
 		local args2 = {
 			ad_platform = "applovin",
 			ad_source = args.network_name,
@@ -1524,12 +1648,6 @@ end
 
 function BIReport:postIronSourceAdRevenue(msg)
 	local args = json.decode(msg) or {}
-	if args.revenue then
-		args.revenue = tonumber(args.revenue)
-	end
-	if args.lifetime_revenue then
-		args.lifetime_revenue = tonumber(args.lifetime_revenue)
-	end
 	if args.revenue then
 		local args2 = {
 			ad_platform = "ironSource",
@@ -1633,6 +1751,13 @@ function BIReport:postRateOpen()
 	self:report(EVENT_NAME_MISCELLANEOUS_OPT, args)
 end
 
+function BIReport:postBatttleSnapshotOpen()
+	local args = {
+		event_type  = BIReport.MISCELLANEOUS_OPT_TYPE.BATTLE_SNAP_SHOP_OPEN,
+	}
+	self:report(EVENT_NAME_MISCELLANEOUS_OPT, args)
+end
+
 function BIReport:postPbAuthfailed(pbName, lastLoginInfo, authFailToLogin)
 	local args = {
 		event_type = BIReport.NETWORK_OPT_TYPE.AUTH_FAILED,
@@ -1644,12 +1769,13 @@ function BIReport:postPbAuthfailed(pbName, lastLoginInfo, authFailToLogin)
 	self:report(EVENT_NAME_NETWORK_OPT, args)
 end
 
-function BIReport:postBoxOpen(id, boxType, openType, box_level, rewards)
+function BIReport:postBoxOpen(id, boxType, openType, box_level, rewards, box_count)
 	local args = {
 		box_type = boxType,
 		open_type = openType,
 		box_item_id = id,
 		box_level = box_level,
+		box_count = box_count,
 		rewards_str = GFunc.getItemRewardsStr(rewards)
 	}
 	self:report(EVENT_BOX_OPEN, args)
@@ -1666,4 +1792,12 @@ function BIReport:postActOpt(event_type, actId, level, exp, buyLevelCost)
 	self:report(EVENT_ACT_OPT, args)
 end
 
+function BIReport:postRunes(event_type, runes)
+	local args = {
+		event_type = event_type,
+		runes = runes
+	}
+	self:report(EVENT_NAME_RUNES, args)
+end
+
 return BIReport

lua/app/common/config_manager.lua

@@ -115,6 +115,8 @@ function ConfigManager:preLoadConfig()
 	handleMonsterGrow("monster_dungeon_shards")
 	handleMonsterGrow("monster_dungeon_equip")
 	handleMonsterGrow("monster_dungeon_armor")
+	handleMonsterGrow("monster_activity")
+	handleMonsterGrow("monster_dungeon_rune")
 
 	self.configs["monster"] = {
 		data = monsterFullData,

lua/app/common/data_manager.lua

@@ -16,6 +16,7 @@ function DataManager:init()
 	self:initManager("BagData", "app/userdata/bag/bag_data")
 	self:initManager("EquipData", "app/userdata/equip/equip_data")
 	self:initManager("SkinData", "app/userdata/skin/skin_data")
+	self:initManager("RunesData", "app/userdata/runes/runes_data")
 	self:initManager("BattleData", "app/userdata/battle/battle_data")
 	self:initManager("BattlePVPData", "app/userdata/battle/battle_pvp_data")
 	self:initManager("FormationData", "app/userdata/formation/formation_data")
@@ -32,8 +33,14 @@ function DataManager:init()
 	self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data")
 	self:initManager("ShopData", "app/userdata/shop/shop_data")
 	self:initManager("SummonData", "app/userdata/summon/summon_data")
+	self:initManager("FullMoonData", "app/userdata/activity/full_moon/full_moon_data")
+	self:initManager("TournWaveData", "app/userdata/activity/tourn_wave/tourn_wave_data")
+	self:initManager("TournArenaData", "app/userdata/activity/tourn_arena/tourn_arena_data")
 	self:initManager("AIHelperData", "app/userdata/game_setting/ai_helper_data")
 	self:initManager("HeroFundData", "app/userdata/activity/hero_fund/hero_fund_data")
+	self:initManager("ActBossRushData", "app/userdata/activity/act_boss_rush/act_boss_rush_data")
+	self:initManager("FourteenDayData", "app/userdata/activity/fourteen_day/fourteen_day_data")
+	self:initManager("ActPvpData", "app/userdata/activity/act_pvp/act_pvp_data")
 end
 
 function DataManager:initManager(name, path)
@@ -104,6 +111,7 @@ function DataManager:clear()
 	self.BagData:clear()
 	self.EquipData:clear()
 	self.SkinData:clear()
+	self.RunesData:clear()
 	self.FormationData:clear()
 	self.ActivityData:clear()
 	self.MailData:clear()
@@ -116,12 +124,19 @@ function DataManager:clear()
 	self.SevenDayData:clear()
 	self.ShopData:clear()
 	self.SummonData:clear()
+	self.FullMoonData:clear()
+	self.TournWaveData:clear()
+	self.TournArenaData:clear()
 	-- 任务数据最后清理
 	self.TaskData:clear()
 	self.AIHelperData:clear()
 	self.HeroFundData:clear()
+	self.ActBossRushData:clear()
+	self.FourteenDayData:clear()
+	self.ActPvpData:clear()
 	ModuleManager.TaskManager:clear()
 	self:clearTryOpenFunc()
+	self.activityBountyLevelMap = nil
 end
 
 function DataManager:initWithServerData(data)
@@ -133,6 +148,7 @@ function DataManager:initWithServerData(data)
 	if EDITOR_MODE then
 		Logger.logHighlight("initWithServerData")
 		Logger.printTable(data)
+		Logger.logHighlight("注册时间 : " .. Time:formatTimeYMDHMS(GFunc.formatTimeStep(data.stat.register_ts)))
 	end
 	self.registerTs = data.stat and data.stat.register_ts or Time:getServerTime()
 	self.registerTs = GFunc.formatTimeStep(self.registerTs or Time:getServerTime())
@@ -142,13 +158,15 @@ function DataManager:initWithServerData(data)
 	self.DailyChallengeData:init(data.chapter_daily_challenge)
 	self.DungeonData:initDungeonGold(data.chapter_gold_challenge)
 	self.DungeonData:initDungeonShards(data.chapter_shards_challenge)
+	-- FormationData要在RunesData之前初始化，依赖阵容数据进行上报
+	self.FormationData:init(data.fight_info)
 	self.EquipData:init(data.heroes_equips)
 	self.EquipData:initGifts(data.act_weapon_armor_gift)
 	self.SkinData:init(data.bag.skins)
-	-- HeroData要在EquipData和SkinData之后初始化，依赖它们的属性数据
+	self.RunesData:init(data.rune)
+	-- HeroData要在EquipData、SkinData、RunesData之后初始化，依赖它们的属性数据
 	self.HeroData:init(data.bag.heroes)
 	self.BagData:init(data.bag)
-	self.FormationData:init(data.fight_info)
 	self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge)
 	self.DungeonData:initDungeonArmor(data.chapter_armor_challenge)
 	self.CollectionData:init(data.collection)
@@ -181,6 +199,8 @@ function DataManager:initWithServerData(data)
 		self.GrowthFundData:init(data.fund.funds)
 	end
 	self.HeroFundData:init(data.hero_fund)
+	self.FourteenDayData:init(data.fourteen_bounty)
+	self.DungeonData:initDungeonRune(data.chapter_rune_challenge)
 
 	-- 任务数据最后初始化,依赖其他模块的数据
 	self.TaskData:init()
@@ -188,6 +208,7 @@ function DataManager:initWithServerData(data)
 	self:checkDataBind()
 	ModuleManager.ArenaManager:reqArenaInfo()
 
+	self:dealOpenActivity(data.activities)
 	-- 写在最后，防止某些数据还未初始化，就被bi访问报错
 	self.initWithServer = true
 end
@@ -409,4 +430,149 @@ function DataManager:getManager(name, path)
 	return self[name]
 end
 
+---- 缓存一下活动战令
+function DataManager:getActivityBountyLevelByActId(actId)
+	if not self.activityBountyLevelMap then
+		self.activityBountyLevelMap = {}
+		local cfg = ConfigManager:getConfig("activity_bounty_level")
+		for id, info in pairs(cfg) do
+			if info.act_id then
+				if not self.activityBountyLevelMap[info.act_id] then
+					self.activityBountyLevelMap[info.act_id] = {}
+				end
+				table.insert(self.activityBountyLevelMap[info.act_id], id)
+			end
+		end
+	end
+	return self.activityBountyLevelMap[actId]
+end
+
+---- 缓存一下活动兑换商店
+function DataManager:getActivityExchangeByActId(actId)
+	if not self.activityExchangeMap then
+		self.activityExchangeMap = {}
+		local cfg = ConfigManager:getConfig("activity_exchange")
+		for id, info in pairs(cfg) do
+			if info.activity then
+				if not self.activityExchangeMap[info.activity] then
+					self.activityExchangeMap[info.activity] = {}
+				end
+				table.insert(self.activityExchangeMap[info.activity], id)
+			end
+		end
+	end
+	return self.activityExchangeMap[actId]
+end
+
+---- 缓存一下活动排行榜
+function DataManager:getActivityRankByActId(actId)
+	if not self.activityRankMap then
+		self.activityRankMap = {}
+		local cfg = ConfigManager:getConfig("activity_rank")
+		for id, info in pairs(cfg) do
+			if info.act_id then
+				if not self.activityRankMap[info.act_id] then
+					self.activityRankMap[info.act_id] = {}
+				end
+				table.insert(self.activityRankMap[info.act_id], id)
+			end
+		end
+	end
+	return self.activityRankMap[actId]
+end
+
+function DataManager:dealOpenActivity(activityInfo)
+	local curTime = Time:getServerTime()
+	if not activityInfo then
+		return
+	end
+
+	local newActivityList = {}
+	local map = {}
+	for _, info in ipairs(activityInfo) do
+		if info.type then
+			if not map[info.type] then
+				map[info.type] = info
+			else
+				if map[info.type].start_at > info.start_at then
+					map[info.type] = info
+				end
+			end
+		end
+	end
+	for actType, info in pairs(map) do
+		table.insert(newActivityList, info)
+	end
+
+	local dealTypeMap = {}
+	for _, info in ipairs(newActivityList) do
+		local startTime = GFunc.formatTimeStep(info.start_at)
+		if startTime <= curTime and curTime <= GFunc.formatTimeStep(info.end_at) then
+			local reqFunc = DataManager.activityOpenFunc[info.type]
+			if reqFunc and not dealTypeMap[info.type] then
+				dealTypeMap[info.type] = true
+				reqFunc(info)
+			end
+		elseif startTime > curTime then
+			local waitOpenFunc = DataManager.waitOpenActivity[info.type]
+			if waitOpenFunc and not dealTypeMap[info.type] then
+				dealTypeMap[info.type] = true
+				waitOpenFunc(info)
+			end
+		end
+	end
+end
+
+DataManager.activityOpenFunc = {
+	[2] = function(params)
+		DataManager.ActBossRushData:setActivityInfo(params)
+		ModuleManager.ActBossRushManager:reqActData()
+	end,
+	[3] = function(params)
+		DataManager.ActPvpData:setActivityId(params.id)
+		DataManager.ActPvpData:setActivityInfo(params)
+		DataManager.ActPvpData:init({}) -- 默认初始化
+		ModuleManager.ActPvpManager:reqActData()
+	end,
+	[4] = function(params)
+		DataManager.FullMoonData:setActStatus(params)
+		ModuleManager.FullMoonManager:reqActData()
+		ModuleManager.FullMoonManager:initTimer()
+	end,
+	[5] = function(params)
+		DataManager.TournWaveData:setActStatus(params)
+		ModuleManager.TournWaveManager:reqActData()
+		ModuleManager.TournWaveManager:initTimer()
+	end,
+	[6] = function(params)
+		DataManager.TournArenaData:setActStatus(params)
+		ModuleManager.TournArenaManager:reqActData()
+		ModuleManager.TournArenaManager:initTimer()
+	end,
+}
+
+DataManager.waitOpenActivity = {
+	[2] = function(params)
+		DataManager.ActBossRushData:init({activity_id = params.id}) -- 默认初始化
+		DataManager.ActBossRushData:setActivityInfo(params)
+	end,
+	[3] = function(params)
+		DataManager.ActPvpData:setActivityId(params.id)
+		DataManager.ActPvpData:setActivityInfo(params)
+		DataManager.ActPvpData:init({}) -- 默认初始化
+	end,
+	[4] = function(params)
+		DataManager.FullMoonData:setActStatus(params)
+		ModuleManager.FullMoonManager:initTimer()
+	end,
+	[5] = function(params)
+		DataManager.TournWaveData:setActStatus(params)
+		ModuleManager.TournWaveManager:initTimer()
+	end,
+	[6] = function(params)
+		DataManager.TournArenaData:setActStatus(params)
+		ModuleManager.TournArenaManager:initTimer()
+	end,
+}
+
 return DataManager

lua/app/common/event_manager.lua

@@ -47,12 +47,15 @@ EventManager.CUSTOM_EVENT = {
 	ARENA_RECORD_SUCCESS = "ARENA_RECORD_SUCCESS",-- 战报获取成功
 	ARENA_RANK_SUCCESS = "ARENA_RANK_SUCCESS",-- 排行榜获取成功
 	ARENA_AD_BOX_SUCCESS = "ARENA_AD_BOX_SUCCESS",-- ad宝箱获取成功
+	ARENA_BATTLE_SETTLEMENT = "ARENA_BATTLE_SETTLEMENT",-- 竞技场战斗结算
 	-- 图鉴
 	COLLECTION_CLICK_GET_POINT = "COLLECTION_CLICK_GET_POINT",
 	-- 装备
 	EQUIP_UPGRADE_SUCCESS = "EQUIP_UPGRADE_SUCCESS",
 	EQUIP_UPSECTION_SUCCESS = "EQUIP_UPSECTION_SUCCESS",
 	HERO_UPGRADE_SUCCESS = "HERO_UPGRADE_SUCCESS",
+	-- 符文
+	RUNE_QUENCHING_SUCCESS = "RUNE_QUENCHING_SUCCESS",
 	GO_DUNGEON_UI = "GO_DUNGEON_UI",
 	-- 皮肤
 	SKIN_SELECT = "SKIN_SELECT",
@@ -60,8 +63,14 @@ 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",
+	ACTIVITY_FULL_MOON_END = "ACTIVITY_FULL_MOON_END",
+	ACTIVITY_TOURN_WAVE_END = "ACTIVITY_TOURN_WAVE_END",
+	ACTIVITY_TOURN_ARENA_END = "ACTIVITY_TOURN_ARENA_END",
 	MAIN_UI_CHECK_SIDE_BAR = "MAIN_UI_CHECK_SIDE_BAR",
 	FORMATION_CHANGE = "FORMATION_CHANGE",
+	BATTLE_REBIRTH = "BATTLE_REBIRTH",
+
+	ACT_PVP_EVENT = "ACT_PVP_EVENT",
 }
 
 -- 此方法不能直接在外部调用，请使用例如BaseUI，BaseModule等封装好的接口

lua/app/common/local_data.lua

@@ -40,6 +40,10 @@ local LOCAL_DATA_KEY = {
 	BATTLE_SNAPSHOT = "BATTLE_SNAPSHOT",
 	ACTIVITY_SUMMER_TODAY_SKIN = "ACTIVITY_SUMMER_TODAY_SKIN",
 	ACTIVITY_SUMMER_TODAY_HERO = "ACTIVITY_SUMMER_TODAY_HERO",
+	NOT_POP_TODAY = "NOT_POP_TODAY",
+	FOURTEEN_DAY_TODAY_EXCHANGE = "FOURTEEN_DAY_TODAY_EXCHANGE",
+	ACT_BOSS_RUSH_EXCHANGE = "ACT_BOSS_RUSH_EXCHANGE",
+	ACT_PVP_SHOW_HELP = "ACT_PVP_SHOW_HELP",
 }
 
 LocalData.KEYS = LOCAL_DATA_KEY
@@ -465,4 +469,38 @@ function LocalData:recordTodayActSummerWatchedHero()
 	self:setInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_HERO .. Time:getBeginningOfServerToday(), 1)
 end
 
+function LocalData:setNotPopToday(customKey)
+	self:setInt(LOCAL_DATA_KEY.NOT_POP_TODAY .. customKey, Time:getBeginningOfServerToday())
+end
+
+function LocalData:getNotPopToday(customKey)
+ 	return self:getInt(LOCAL_DATA_KEY.NOT_POP_TODAY .. customKey, 0)
+end
+
+function LocalData:getTodayFourteenDayExchangeWatched()
+	return self:getInt(LOCAL_DATA_KEY.FOURTEEN_DAY_TODAY_EXCHANGE .. Time:getBeginningOfServerToday(), 0) == 1
+end
+
+function LocalData:recordTodayFourteenDayExchangeWatched()
+	self:setInt(LOCAL_DATA_KEY.FOURTEEN_DAY_TODAY_EXCHANGE .. Time:getBeginningOfServerToday(), 1)
+end
+
+function LocalData:getTodayBossRushExchangeWatched()
+	return self:getInt(LOCAL_DATA_KEY.ACT_BOSS_RUSH_EXCHANGE, 0)
+end
+
+function LocalData:recordTodayBossRushExchangeWatched()
+	self:setInt(LOCAL_DATA_KEY.ACT_BOSS_RUSH_EXCHANGE, Time:getBeginningOfServerToday())
+end
+
+function LocalData:getActPvpShowHelpTag(actId)
+	actId = actId or 0
+	return self:getInt(LOCAL_DATA_KEY.ACT_PVP_SHOW_HELP .. actId, 0)
+end
+
+function LocalData:recordActPvpShowHelpTag(actId)
+	actId = actId or 0
+	self:setInt(LOCAL_DATA_KEY.ACT_PVP_SHOW_HELP .. actId, 1)
+end
+
 return LocalData

lua/app/common/module_manager.lua

@@ -69,8 +69,24 @@ local MODULE_PATHS = {
 	EquipManager = "app/module/equip/equip_manager",
 	-- 皮肤
 	SkinManager = "app/module/skin/skin_manager",
+	-- 皮肤
+	RunesManager = "app/module/runes/runes_manager",
 	-- 英雄基金
 	HeroFundManager = "app/module/activity/hero_fund/hero_fund_manager",
+	-- 世界首领活动
+	ActBossRushManager = "app/module/activity/act_boss_rush/act_boss_rush_manager",
+	-- 新手14天乐
+	FourteenDayManager = "app/module/activity/fourteen_day/fourteen_day_manager",
+	-- 圆月活动
+	FullMoonManager = "app/module/activity/full_moon/full_moon_manager",
+	-- 波次锦标赛活动
+	TournWaveManager = "app/module/activity/tourn_wave/tourn_wave_manager",
+	-- 竞技场锦标赛活动
+	TournArenaManager = "app/module/activity/tourn_arena/tourn_arena_manager",
+	-- 符文副本
+	DungeonRuneManager = "app/module/dungeon_rune/dungeon_rune_manager",
+	-- 梦魇酒馆
+	ActPvpManager = "app/module/activity/act_pvp/act_pvp_manager",
 }
 
 -- 这里的key对应func_open里的id
@@ -102,6 +118,7 @@ ModuleManager.MODULE_KEY = {
 	EQUIP_WEAPON = "equip_weapon_open", -- 武器
 	EQUIP_ARMOR = "equip_armor_open", -- 防具
 	SKIN = "skin_open", -- 皮肤
+	RUNES_OPEN = "runes_open", -- 符文
 }
 
 local _moduleMgrs = {}
@@ -126,6 +143,7 @@ function ModuleManager:init()
 	ModuleManager.DailyChallengeManager:init()
 	ModuleManager.PlayerManager:init()
 	ModuleManager.SkinManager:init()
+	ModuleManager.TournArenaManager:init()
 end
 
 -- 功能是否开启

lua/app/common/pay_manager.lua

@@ -26,6 +26,14 @@ PayManager.PURCHARSE_ACT_TYPE = {
     ACT_HERO_FUND = 14,
     WEAPON_UPGRADE_GIFT = 15,
     ARMOR_UPGRADE_GIFT = 16,
+    FOURTEEN_DAY_GIFT = 17,
+    ACT_PVP_BOUNTY = 22,
+    FULL_MOON_HERO_GIFT = 18,
+    FULL_MOON_NEW_HERO_GIFT = 19,
+    FULL_MOON_SKIN_GIFT = 20,
+    RUNES_GIFT = 21,
+    TOURN_WAVE_GIFT = 23,
+    TOURN_ARENA_GIFT = 24,
 }
 
 PayManager.PURCHARSE_TYPE_CONFIG = {
@@ -54,6 +62,14 @@ PayManager.BI_ITEM_GET_TYPE = {
         [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.ITEM_GET_TYPE.ACT_PVP_BOUNTY_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_HERO_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_NEW_HERO_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_SKIN_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.ITEM_GET_TYPE.RUNES_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.TOURN_WAVE_GIFT] = BIReport.ITEM_GET_TYPE.TOURN_WAVE_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.TOURN_ARENA_GIFT] = BIReport.ITEM_GET_TYPE.TOURN_ARENA_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE,
@@ -76,9 +92,17 @@ 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.ACT_HERO_FUND] = BIReport.GIFT_TYPE.ACT_HERO_FUND,
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.GIFT_TYPE.ACT_PVP_BOUNTY_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_HERO_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_NEW_HERO_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_SKIN_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.GIFT_TYPE.RUNES_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.TOURN_WAVE_GIFT] = BIReport.GIFT_TYPE.TOURN_WAVE_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.TOURN_ARENA_GIFT] = BIReport.GIFT_TYPE.TOURN_ARENA_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE,

lua/app/common/server_push_manager.lua

@@ -22,6 +22,8 @@ function ServerPushManager:initWhenLogin()
     self:addServerPushListener(ProtoMsgType.FromMsgEnum.MallDailyResetNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onMallDailyReset)
     self:addServerPushListener(ProtoMsgType.FromMsgEnum.AIHelpUnreadNtf, ModuleManager.GameSettingManager, ModuleManager.GameSettingManager.rspAiHelperNtf)
     self:addServerPushListener(ProtoMsgType.FromMsgEnum.RecoveryNtf, ModuleManager.ItemManager, ModuleManager.ItemManager.rspRecoveryNtf)
+    self:addServerPushListener(ProtoMsgType.FromMsgEnum.BossRushBoughtNtf, ModuleManager.ActBossRushManager, ModuleManager.ActBossRushManager.rspBossRushBoughtNtf)
+    self:addServerPushListener(ProtoMsgType.FromMsgEnum.RuneUpdateNtf, ModuleManager.RunesManager, ModuleManager.RunesManager.rspUpdate)
 end
 
 ---- 移除全局推送监听

lua/app/common/white_res_manager.lua

@@ -5,6 +5,7 @@ local WhiteResManager = {}
 local GAME_RES_WHITE_LIST = {
     -- ui
     GConst.ATLAS_PATH.COMMON,
+    GConst.ATLAS_PATH.ACT_COMMON,
     -- icon
     GConst.ATLAS_PATH.ICON_SKILL,
     GConst.ATLAS_PATH.ICON_SKILL_BIG,

lua/app/config/act_fourteen_bounty.lua

@@ -0,0 +1,150 @@
+local act_fourteen_bounty = {
+	[1]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=8000,
+ 			["num_for_nothing"]="XghcAw=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[2]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=60,
+ 			["num_for_nothing"]="UAg="
+		}
+	},
+	[3]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[4]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=10,
+ 			["id_for_nothing"]="Vwg=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=11,
+ 			["id_for_nothing"]="Vwk=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[5]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[6]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=60,
+ 			["num_for_nothing"]="UAg="
+		}
+	},
+	[7]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[8]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	}
+}
+local config = {
+data=act_fourteen_bounty,count=8
+}
+return config

lua/app/config/act_fourteen_bounty.lua.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7209380a6f275fe4fa7fd87e464fde53
+guid: 98e6ac4cce3094f4ca2032007239b1f9
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

lua/app/config/act_fourteen_exchange.lua

@@ -0,0 +1,306 @@
+local act_fourteen_exchange = {
+	[1]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=1000,
+ 			["num_for_nothing"]="VwhcAw=="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=44002,
+ 			["id_for_nothing"]="UgxcA2c=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["limit"]=10
+	},
+	[2]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=750,
+ 			["num_for_nothing"]="UQ1c"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=24001,
+ 			["id_for_nothing"]="VAxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["limit"]=10
+	},
+	[3]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=750,
+ 			["num_for_nothing"]="UQ1c"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=34001,
+ 			["id_for_nothing"]="VQxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["limit"]=10
+	},
+	[4]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=750,
+ 			["num_for_nothing"]="UQ1c"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=54003,
+ 			["id_for_nothing"]="UwxcA2Y=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["limit"]=10
+	},
+	[5]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=800,
+ 			["num_for_nothing"]="Xghc"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=15,
+ 			["id_for_nothing"]="Vw0=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["limit"]=3
+	},
+	[6]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=300,
+ 			["num_for_nothing"]="VQhc"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14,
+ 			["id_for_nothing"]="Vww=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["limit"]=3
+	},
+	[7]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=40,
+ 			["num_for_nothing"]="Ugg="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1002,
+ 			["id_for_nothing"]="VwhcAQ==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		},
+		["limit"]=10
+	},
+	[8]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=50,
+ 			["num_for_nothing"]="Uwg="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1003,
+ 			["id_for_nothing"]="VwhcAA==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		},
+		["limit"]=10
+	},
+	[9]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=60,
+ 			["num_for_nothing"]="UAg="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1004,
+ 			["id_for_nothing"]="VwhcBw==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		},
+		["limit"]=10
+	},
+	[10]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=80,
+ 			["num_for_nothing"]="Xgg="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=39,
+ 			["id_for_nothing"]="VQE=",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		},
+		["limit"]=10
+	},
+	[11]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=40,
+ 			["id_for_nothing"]="Ugg=",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		},
+		["limit"]=10
+	},
+	[12]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=120,
+ 			["num_for_nothing"]="Vwpc"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=41,
+ 			["id_for_nothing"]="Ugk=",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		},
+		["limit"]=10
+	},
+	[13]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=15,
+ 			["num_for_nothing"]="Vw0="
+		},
+		["limit"]=10
+	},
+	[14]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		},
+		["limit"]=999
+	},
+	[15]={
+		["stage"]=1,
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=51,
+ 			["id_for_nothing"]="Uwk=",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=13,
+ 			["id_for_nothing"]="Vws=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["limit"]=999
+	}
+}
+local config = {
+data=act_fourteen_exchange,count=15
+}
+return config

lua/app/config/act_fourteen_exchange.lua.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 07151d06bce0c5e488135947541210e0
+guid: 057f6606cfb30ab43a95c25d2f0639a9
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

lua/app/config/act_fourteen_quest.lua

@@ -0,0 +1,897 @@
+local act_fourteen_quest = {
+	[1]={
+		["stage"]=1,
+		["quest"]=32,
+		["none"]="深渊挑战4",
+		["num"]=4,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=16
+	},
+	[2]={
+		["stage"]=1,
+		["quest"]=23,
+		["none"]="角色升到20级",
+		["num"]=20,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=6
+	},
+	[3]={
+		["stage"]=1,
+		["quest"]=31,
+		["none"]="竞技场达到青铜II",
+		["num"]=1000,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=13
+	},
+	[4]={
+		["stage"]=1,
+		["quest"]=1,
+		["none"]="广告次数累计达8",
+		["num"]=8,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=10
+	},
+	[5]={
+		["stage"]=1,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["icon"]=11
+	},
+	[6]={
+		["stage"]=2,
+		["quest"]=38,
+		["none"]="武器升级15次",
+		["num"]=15,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=22
+	},
+	[7]={
+		["stage"]=2,
+		["quest"]=33,
+		["none"]="时空裂隙1-6",
+		["num"]=6,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=17
+	},
+	[8]={
+		["stage"]=2,
+		["quest"]=37,
+		["none"]="开启主线宝箱36个",
+		["num"]=36,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=21
+	},
+	[9]={
+		["stage"]=2,
+		["quest"]=34,
+		["none"]="矿车拦截5",
+		["num"]=5,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=18
+	},
+	[10]={
+		["stage"]=2,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["icon"]=11
+	},
+	[11]={
+		["stage"]=3,
+		["quest"]=35,
+		["none"]="灯神之塔4",
+		["num"]=4,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=19
+	},
+	[12]={
+		["stage"]=3,
+		["quest"]=23,
+		["none"]="角色升到24级",
+		["num"]=24,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=6
+	},
+	[13]={
+		["stage"]=3,
+		["quest"]=32,
+		["none"]="深渊挑战5",
+		["num"]=5,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=16
+	},
+	[14]={
+		["stage"]=3,
+		["quest"]=1,
+		["none"]="广告次数累计达24",
+		["num"]=24,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=10
+	},
+	[15]={
+		["stage"]=3,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["icon"]=11
+	},
+	[16]={
+		["stage"]=4,
+		["quest"]=36,
+		["none"]="每日挑战胜利5次",
+		["num"]=5,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=20
+	},
+	[17]={
+		["stage"]=4,
+		["quest"]=34,
+		["none"]="矿车拦截6",
+		["num"]=6,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=18
+	},
+	[18]={
+		["stage"]=4,
+		["quest"]=33,
+		["none"]="时空裂隙2-6",
+		["num"]=12,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=17
+	},
+	[19]={
+		["stage"]=4,
+		["quest"]=6,
+		["none"]="开启商城宝箱5次",
+		["num"]=5,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=4
+	},
+	[20]={
+		["stage"]=4,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["icon"]=11
+	},
+	[21]={
+		["stage"]=5,
+		["quest"]=1,
+		["none"]="广告次数累计达40",
+		["num"]=40,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=10
+	},
+	[22]={
+		["stage"]=5,
+		["quest"]=19,
+		["none"]="通关波次400次",
+		["num"]=400,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=20
+	},
+	[23]={
+		["stage"]=5,
+		["quest"]=35,
+		["none"]="灯神之塔5",
+		["num"]=5,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=19
+	},
+	[24]={
+		["stage"]=5,
+		["quest"]=31,
+		["none"]="竞技场达到白银IV",
+		["num"]=1200,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=14
+	},
+	[25]={
+		["stage"]=5,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["icon"]=11
+	},
+	[26]={
+		["stage"]=6,
+		["quest"]=12,
+		["none"]="击杀BOSS80次",
+		["num"]=80,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=9
+	},
+	[27]={
+		["stage"]=6,
+		["quest"]=32,
+		["none"]="深渊挑战7",
+		["num"]=7,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=16
+	},
+	[28]={
+		["stage"]=6,
+		["quest"]=37,
+		["none"]="开启主线宝箱48个",
+		["num"]=48,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=21
+	},
+	[29]={
+		["stage"]=6,
+		["quest"]=34,
+		["none"]="矿车拦截7",
+		["num"]=7,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=18
+	},
+	[30]={
+		["stage"]=6,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["icon"]=11
+	},
+	[31]={
+		["stage"]=7,
+		["quest"]=33,
+		["none"]="时空裂隙3-4",
+		["num"]=16,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=17
+	},
+	[32]={
+		["stage"]=7,
+		["quest"]=36,
+		["none"]="每日挑战胜利10次",
+		["num"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=20
+	},
+	[33]={
+		["stage"]=7,
+		["quest"]=6,
+		["none"]="开启商城宝箱10次",
+		["num"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=4
+	},
+	[34]={
+		["stage"]=7,
+		["quest"]=1,
+		["none"]="广告次数累计达56",
+		["num"]=56,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=10
+	},
+	[35]={
+		["stage"]=7,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["icon"]=11
+	},
+	[36]={
+		["stage"]=8,
+		["quest"]=39,
+		["none"]="防具升级40次",
+		["num"]=40,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=23
+	},
+	[37]={
+		["stage"]=8,
+		["quest"]=35,
+		["none"]="灯神之塔7",
+		["num"]=7,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=19
+	},
+	[38]={
+		["stage"]=8,
+		["quest"]=19,
+		["none"]="通关波次700次",
+		["num"]=700,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=20
+	},
+	[39]={
+		["stage"]=8,
+		["quest"]=34,
+		["none"]="矿车拦截8",
+		["num"]=8,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=18
+	},
+	[40]={
+		["stage"]=8,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["icon"]=11
+	},
+	[41]={
+		["stage"]=9,
+		["quest"]=31,
+		["none"]="竞技场达到白银III",
+		["num"]=1400,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=14
+	},
+	[42]={
+		["stage"]=9,
+		["quest"]=1,
+		["none"]="广告次数累计达72",
+		["num"]=72,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=10
+	},
+	[43]={
+		["stage"]=9,
+		["quest"]=23,
+		["none"]="角色升到32级",
+		["num"]=32,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=6
+	},
+	[44]={
+		["stage"]=9,
+		["quest"]=32,
+		["none"]="深渊挑战9",
+		["num"]=9,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		},
+		["icon"]=16
+	},
+	[45]={
+		["stage"]=9,
+		["none"]="完成所有任务",
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["icon"]=11
+	}
+}
+local config = {
+data=act_fourteen_quest,count=45
+}
+return config

lua/app/config/act_fourteen_quest.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: ae4732ca8e76a1243ad3c6e8d72d01b3
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity.lua

@@ -3,9 +3,369 @@ local activity = {
 		["act_type"]=1,
 		["start_time"]="2023-08-22 00:00:00",
 		["end_time"]="2023-08-29 00:00:00"
+	},
+	[206]={
+		["act_type"]=2,
+		["start_time"]="2023-09-13 00:00:00",
+		["end_time"]="2023-09-21 00:00:00"
+	},
+	[306]={
+		["act_type"]=3,
+		["start_time"]="2023-09-25 00:00:00",
+		["end_time"]="2023-10-3 00:00:00"
+	},
+	[406]={
+		["act_type"]=4,
+		["start_time"]="2023-09-28 00:00:00",
+		["end_time"]="2023-10-08 00:00:00"
+	},
+	[506]={
+		["act_type"]=2,
+		["start_time"]="2023-10-2 00:00:00",
+		["end_time"]="2023-10-10 00:00:00"
+	},
+	[606]={
+		["act_type"]=3,
+		["start_time"]="2023-10-9 00:00:00",
+		["end_time"]="2023-10-17 00:00:00"
+	},
+	[706]={
+		["act_type"]=5,
+		["start_time"]="2023-10-16 00:00:00",
+		["end_time"]="2023-10-25 00:00:00"
+	},
+	[806]={
+		["act_type"]=2,
+		["start_time"]="2023-10-24 00:00:00",
+		["end_time"]="2023-11-01 00:00:00"
+	},
+	[906]={
+		["act_type"]=6,
+		["start_time"]="2023-10-31 00:00:00",
+		["end_time"]="2023-11-09 00:00:00"
+	},
+	[1006]={
+		["act_type"]=3,
+		["start_time"]="2023-11-8 00:00:00",
+		["end_time"]="2023-11-16 00:00:00"
+	},
+	[1106]={
+		["act_type"]=5,
+		["start_time"]="2023-11-15 00:00:00",
+		["end_time"]="2023-11-24 00:00:00"
+	},
+	[1206]={
+		["act_type"]=2,
+		["start_time"]="2023-11-23 00:00:00",
+		["end_time"]="2023-12-01 00:00:00"
+	},
+	[1306]={
+		["act_type"]=6,
+		["start_time"]="2023-11-30 00:00:00",
+		["end_time"]="2023-12-09 00:00:00"
+	},
+	[1406]={
+		["act_type"]=3,
+		["start_time"]="2023-12-8 00:00:00",
+		["end_time"]="2023-12-16 00:00:00"
+	},
+	[1506]={
+		["act_type"]=5,
+		["start_time"]="2023-12-15 00:00:00",
+		["end_time"]="2023-12-24 00:00:00"
+	},
+	[1606]={
+		["act_type"]=2,
+		["start_time"]="2023-12-23 00:00:00",
+		["end_time"]="2023-12-31 00:00:00"
+	},
+	[1706]={
+		["act_type"]=6,
+		["start_time"]="2023-12-30 00:00:00",
+		["end_time"]="2024-01-08 00:00:00"
+	},
+	[1806]={
+		["act_type"]=3,
+		["start_time"]="2024-01-07 00:00:00",
+		["end_time"]="2024-01-15 00:00:00"
+	},
+	[1906]={
+		["act_type"]=5,
+		["start_time"]="2024-01-14 00:00:00",
+		["end_time"]="2024-01-23 00:00:00"
+	},
+	[2006]={
+		["act_type"]=2,
+		["start_time"]="2024-01-22 00:00:00",
+		["end_time"]="2024-01-30 00:00:00"
+	},
+	[2106]={
+		["act_type"]=6,
+		["start_time"]="2024-01-29 00:00:00",
+		["end_time"]="2024-02-07 00:00:00"
+	},
+	[2206]={
+		["act_type"]=3,
+		["start_time"]="2024-02-06 00:00:00",
+		["end_time"]="2024-02-14 00:00:00"
+	},
+	[2306]={
+		["act_type"]=5,
+		["start_time"]="2024-02-13 00:00:00",
+		["end_time"]="2024-02-22 00:00:00"
+	},
+	[2406]={
+		["act_type"]=2,
+		["start_time"]="2024-02-21 00:00:00",
+		["end_time"]="2024-02-29 00:00:00"
+	},
+	[2506]={
+		["act_type"]=6,
+		["start_time"]="2024-02-28 00:00:00",
+		["end_time"]="2024-03-08 00:00:00"
+	},
+	[2606]={
+		["act_type"]=3,
+		["start_time"]="2024-03-07 00:00:00",
+		["end_time"]="2024-03-15 00:00:00"
+	},
+	[2706]={
+		["act_type"]=5,
+		["start_time"]="2024-03-14 00:00:00",
+		["end_time"]="2024-03-23 00:00:00"
+	},
+	[2806]={
+		["act_type"]=2,
+		["start_time"]="2024-03-22 00:00:00",
+		["end_time"]="2024-03-30 00:00:00"
+	},
+	[2906]={
+		["act_type"]=6,
+		["start_time"]="2024-03-29 00:00:00",
+		["end_time"]="2024-04-07 00:00:00"
+	},
+	[3006]={
+		["act_type"]=3,
+		["start_time"]="2024-04-06 00:00:00",
+		["end_time"]="2024-04-14 00:00:00"
+	},
+	[3106]={
+		["act_type"]=5,
+		["start_time"]="2024-04-13 00:00:00",
+		["end_time"]="2024-04-22 00:00:00"
+	},
+	[3206]={
+		["act_type"]=2,
+		["start_time"]="2024-04-21 00:00:00",
+		["end_time"]="2024-04-29 00:00:00"
+	},
+	[3306]={
+		["act_type"]=6,
+		["start_time"]="2024-04-28 00:00:00",
+		["end_time"]="2024-05-07 00:00:00"
+	},
+	[3406]={
+		["act_type"]=3,
+		["start_time"]="2024-05-06 00:00:00",
+		["end_time"]="2024-05-14 00:00:00"
+	},
+	[3506]={
+		["act_type"]=5,
+		["start_time"]="2024-05-13 00:00:00",
+		["end_time"]="2024-05-22 00:00:00"
+	},
+	[3606]={
+		["act_type"]=2,
+		["start_time"]="2024-05-21 00:00:00",
+		["end_time"]="2024-05-29 00:00:00"
+	},
+	[3706]={
+		["act_type"]=6,
+		["start_time"]="2024-05-28 00:00:00",
+		["end_time"]="2024-06-06 00:00:00"
+	},
+	[3806]={
+		["act_type"]=3,
+		["start_time"]="2024-06-05 00:00:00",
+		["end_time"]="2024-06-13 00:00:00"
+	},
+	[3906]={
+		["act_type"]=5,
+		["start_time"]="2024-06-12 00:00:00",
+		["end_time"]="2024-06-21 00:00:00"
+	},
+	[4006]={
+		["act_type"]=2,
+		["start_time"]="2024-06-20 00:00:00",
+		["end_time"]="2024-06-28 00:00:00"
+	},
+	[4106]={
+		["act_type"]=6,
+		["start_time"]="2024-06-27 00:00:00",
+		["end_time"]="2024-07-06 00:00:00"
+	},
+	[4206]={
+		["act_type"]=3,
+		["start_time"]="2024-07-05 00:00:00",
+		["end_time"]="2024-07-13 00:00:00"
+	},
+	[4306]={
+		["act_type"]=5,
+		["start_time"]="2024-07-12 00:00:00",
+		["end_time"]="2024-07-21 00:00:00"
+	},
+	[4406]={
+		["act_type"]=2,
+		["start_time"]="2024-07-20 00:00:00",
+		["end_time"]="2024-07-28 00:00:00"
+	},
+	[4506]={
+		["act_type"]=6,
+		["start_time"]="2024-07-27 00:00:00",
+		["end_time"]="2024-08-05 00:00:00"
+	},
+	[4606]={
+		["act_type"]=3,
+		["start_time"]="2024-08-04 00:00:00",
+		["end_time"]="2024-08-12 00:00:00"
+	},
+	[4706]={
+		["act_type"]=5,
+		["start_time"]="2024-08-11 00:00:00",
+		["end_time"]="2024-08-20 00:00:00"
+	},
+	[4806]={
+		["act_type"]=2,
+		["start_time"]="2024-08-19 00:00:00",
+		["end_time"]="2024-08-27 00:00:00"
+	},
+	[4906]={
+		["act_type"]=6,
+		["start_time"]="2024-08-26 00:00:00",
+		["end_time"]="2024-09-04 00:00:00"
+	},
+	[5006]={
+		["act_type"]=3,
+		["start_time"]="2024-09-03 00:00:00",
+		["end_time"]="2024-09-11 00:00:00"
+	},
+	[5106]={
+		["act_type"]=5,
+		["start_time"]="2024-09-10 00:00:00",
+		["end_time"]="2024-09-19 00:00:00"
+	},
+	[5206]={
+		["act_type"]=2,
+		["start_time"]="2024-09-18 00:00:00",
+		["end_time"]="2024-09-26 00:00:00"
+	},
+	[5306]={
+		["act_type"]=6,
+		["start_time"]="2024-09-25 00:00:00",
+		["end_time"]="2024-10-04 00:00:00"
+	},
+	[5406]={
+		["act_type"]=3,
+		["start_time"]="2024-10-03 00:00:00",
+		["end_time"]="2024-10-11 00:00:00"
+	},
+	[5506]={
+		["act_type"]=5,
+		["start_time"]="2024-10-10 00:00:00",
+		["end_time"]="2024-10-19 00:00:00"
+	},
+	[5606]={
+		["act_type"]=2,
+		["start_time"]="2024-10-18 00:00:00",
+		["end_time"]="2024-10-26 00:00:00"
+	},
+	[5706]={
+		["act_type"]=6,
+		["start_time"]="2024-10-25 00:00:00",
+		["end_time"]="2024-11-03 00:00:00"
+	},
+	[5806]={
+		["act_type"]=3,
+		["start_time"]="2024-11-02 00:00:00",
+		["end_time"]="2024-11-10 00:00:00"
+	},
+	[5906]={
+		["act_type"]=5,
+		["start_time"]="2024-11-09 00:00:00",
+		["end_time"]="2024-11-18 00:00:00"
+	},
+	[6006]={
+		["act_type"]=2,
+		["start_time"]="2024-11-17 00:00:00",
+		["end_time"]="2024-11-25 00:00:00"
+	},
+	[6106]={
+		["act_type"]=6,
+		["start_time"]="2024-11-24 00:00:00",
+		["end_time"]="2024-12-03 00:00:00"
+	},
+	[6206]={
+		["act_type"]=3,
+		["start_time"]="2024-12-02 00:00:00",
+		["end_time"]="2024-12-10 00:00:00"
+	},
+	[6306]={
+		["act_type"]=5,
+		["start_time"]="2024-12-09 00:00:00",
+		["end_time"]="2024-12-18 00:00:00"
+	},
+	[6406]={
+		["act_type"]=2,
+		["start_time"]="2024-12-17 00:00:00",
+		["end_time"]="2024-12-25 00:00:00"
+	},
+	[6506]={
+		["act_type"]=6,
+		["start_time"]="2024-12-24 00:00:00",
+		["end_time"]="2025-01-02 00:00:00"
+	},
+	[6606]={
+		["act_type"]=3,
+		["start_time"]="2025-01-01 00:00:00",
+		["end_time"]="2025-01-09 00:00:00"
+	},
+	[6706]={
+		["act_type"]=5,
+		["start_time"]="2025-01-08 00:00:00",
+		["end_time"]="2025-01-17 00:00:00"
+	},
+	[6806]={
+		["act_type"]=2,
+		["start_time"]="2025-01-16 00:00:00",
+		["end_time"]="2025-01-24 00:00:00"
+	},
+	[6906]={
+		["act_type"]=6,
+		["start_time"]="2025-01-23 00:00:00",
+		["end_time"]="2025-02-01 00:00:00"
+	},
+	[7006]={
+		["act_type"]=3,
+		["start_time"]="2025-01-31 00:00:00",
+		["end_time"]="2025-02-08 00:00:00"
+	},
+	[7106]={
+		["act_type"]=5,
+		["start_time"]="2025-02-07 00:00:00",
+		["end_time"]="2025-02-16 00:00:00"
+	},
+	[7206]={
+		["act_type"]=2,
+		["start_time"]="2025-02-15 00:00:00",
+		["end_time"]="2025-02-23 00:00:00"
+	},
+	[7306]={
+		["act_type"]=6,
+		["start_time"]="2025-02-22 00:00:00",
+		["end_time"]="2025-03-03 00:00:00"
 	}
 }
 local config = {
-data=activity,count=1
+data=activity,count=73
 }
 return config

lua/app/config/activity_boss_rush_chapter.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3b9c06b8307dd0b4cb53ae035d53aa11
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_boss_rush_exchange.lua

@@ -0,0 +1,158 @@
+local activity_boss_rush_exchange = {
+	[1]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["limit"]=1
+	},
+	[2]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=101,
+ 			["num_for_nothing"]="Vwhd"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=101,
+ 			["num_for_nothing"]="Vwhd"
+		},
+		["limit"]=1
+	},
+	[3]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=102,
+ 			["num_for_nothing"]="Vwhe"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=102,
+ 			["num_for_nothing"]="Vwhe"
+		},
+		["limit"]=1
+	},
+	[4]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=103,
+ 			["num_for_nothing"]="Vwhf"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=103,
+ 			["num_for_nothing"]="Vwhf"
+		},
+		["limit"]=1
+	},
+	[5]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=104,
+ 			["num_for_nothing"]="VwhY"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=104,
+ 			["num_for_nothing"]="VwhY"
+		},
+		["limit"]=1
+	},
+	[6]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=105,
+ 			["num_for_nothing"]="VwhZ"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=105,
+ 			["num_for_nothing"]="VwhZ"
+		},
+		["limit"]=1
+	},
+	[7]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=106,
+ 			["num_for_nothing"]="Vwha"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=106,
+ 			["num_for_nothing"]="Vwha"
+		},
+		["limit"]=1
+	},
+	[8]={
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=107,
+ 			["num_for_nothing"]="Vwhb"
+		},
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=107,
+ 			["num_for_nothing"]="Vwhb"
+		},
+		["limit"]=1
+	}
+}
+local config = {
+data=activity_boss_rush_exchange,count=8
+}
+return config

lua/app/config/activity_boss_rush_exchange.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 8c8d75a1f2e364844b081ef20888e140
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_boss_rush_rank.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 472bee3e9223f3c4aa8b407e72891bc3
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_exchange.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 59cc689139c1fb0429cd581fc781710e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_full_moon_quest.lua

@@ -0,0 +1,149 @@
+local activity_full_moon_quest = {
+	[1]={
+		["type"]=40,
+		["number"]=1,
+		["open_stage"]=0,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[2]={
+		["type"]=1,
+		["number"]=10,
+		["open_stage"]=0,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[3]={
+		["type"]=5,
+		["number"]=100,
+		["open_stage"]=0,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[4]={
+		["type"]=41,
+		["number"]=50,
+		["open_stage"]=12,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[5]={
+		["type"]=38,
+		["number"]=10,
+		["open_stage"]=8,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[6]={
+		["type"]=39,
+		["number"]=10,
+		["open_stage"]=10,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[7]={
+		["type"]=30,
+		["number"]=3,
+		["open_stage"]=5,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[8]={
+		["type"]=19,
+		["number"]=30,
+		["open_stage"]=0,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[9]={
+		["type"]=12,
+		["number"]=6,
+		["open_stage"]=0,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[10]={
+		["type"]=11,
+		["number"]=30,
+		["open_stage"]=0,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[11]={
+		["type"]=42,
+		["number"]=10,
+		["open_stage"]=12,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=56,
+ 			["id_for_nothing"]="Uw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	}
+}
+local config = {
+data=activity_full_moon_quest,count=11
+}
+return config

lua/app/config/activity_full_moon_quest.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5c90db40ed5e599489d9e1e3ba84a45b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_full_moon_reward.lua

@@ -0,0 +1,127 @@
+local activity_full_moon_reward = {
+	[101]={
+		["quest"]=3,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	},
+	[102]={
+		["quest"]=6,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	[103]={
+		["quest"]=9,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=10,
+ 			["id_for_nothing"]="Vwg=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[104]={
+		["quest"]=12,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=5000,
+ 			["num_for_nothing"]="UwhcAw=="
+		}
+	},
+	[105]={
+		["quest"]=15,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	},
+	[106]={
+		["quest"]=18,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=57,
+ 			["id_for_nothing"]="Uw8=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[107]={
+		["quest"]=21,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	},
+	[108]={
+		["quest"]=24,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=50,
+ 			["num_for_nothing"]="Uwg="
+		}
+	},
+	[109]={
+		["quest"]=27,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=10000,
+ 			["num_for_nothing"]="VwhcA2U="
+		}
+	},
+	[110]={
+		["quest"]=30,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=6,
+ 			["id_for_nothing"]="UA==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[111]={
+		["quest"]=33,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2300201,
+ 			["id_for_nothing"]="VAtcA2dRfg==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	}
+}
+local config = {
+data=activity_full_moon_reward,count=11
+}
+return config

lua/app/config/activity_full_moon_reward.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 227e65a00ca4e834f9375489a586b270
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_pvp.lua

@@ -0,0 +1,958 @@
+local activity_pvp = {
+	[101]={
+		["hero_id"]=12001,
+		["first"]=400,
+		["hero_weights"]={
+			{
+				201,
+				200
+			},
+			{
+				202,
+				100
+			},
+			{
+				203,
+				100
+			},
+			{
+				204,
+				100
+			},
+			{
+				205,
+				100
+			},
+			{
+				206,
+				100
+			},
+			{
+				207,
+				100
+			}
+		}
+	},
+	[102]={
+		["hero_id"]=13001,
+		["first"]=200,
+		["hero_weights"]={
+			{
+				201,
+				200
+			},
+			{
+				202,
+				200
+			},
+			{
+				203,
+				200
+			},
+			{
+				204,
+				50
+			},
+			{
+				205,
+				50
+			},
+			{
+				206,
+				50
+			},
+			{
+				207,
+				50
+			}
+		}
+	},
+	[103]={
+		["hero_id"]=13002,
+		["first"]=200,
+		["hero_weights"]={
+			{
+				201,
+				200
+			},
+			{
+				202,
+				200
+			},
+			{
+				203,
+				200
+			},
+			{
+				204,
+				50
+			},
+			{
+				205,
+				50
+			},
+			{
+				206,
+				50
+			},
+			{
+				207,
+				50
+			}
+		}
+	},
+	[104]={
+		["hero_id"]=14001,
+		["first"]=100,
+		["hero_weights"]={
+			{
+				201,
+				400
+			},
+			{
+				202,
+				100
+			},
+			{
+				203,
+				100
+			},
+			{
+				204,
+				50
+			},
+			{
+				205,
+				50
+			},
+			{
+				206,
+				50
+			},
+			{
+				207,
+				50
+			}
+		}
+	},
+	[105]={
+		["hero_id"]=14002,
+		["first"]=100,
+		["hero_weights"]={
+			{
+				201,
+				400
+			},
+			{
+				202,
+				100
+			},
+			{
+				203,
+				100
+			},
+			{
+				204,
+				50
+			},
+			{
+				205,
+				50
+			},
+			{
+				206,
+				50
+			},
+			{
+				207,
+				50
+			}
+		}
+	},
+	[106]={
+		["hero_id"]=14003,
+		["first"]=100,
+		["hero_weights"]={
+			{
+				201,
+				400
+			},
+			{
+				202,
+				100
+			},
+			{
+				203,
+				100
+			},
+			{
+				204,
+				50
+			},
+			{
+				205,
+				50
+			},
+			{
+				206,
+				50
+			},
+			{
+				207,
+				50
+			}
+		}
+	},
+	[107]={
+		["hero_id"]=14004,
+		["first"]=100,
+		["hero_weights"]={
+			{
+				201,
+				400
+			},
+			{
+				202,
+				100
+			},
+			{
+				203,
+				100
+			},
+			{
+				204,
+				50
+			},
+			{
+				205,
+				50
+			},
+			{
+				206,
+				50
+			},
+			{
+				207,
+				50
+			}
+		}
+	},
+	[201]={
+		["hero_id"]=22001,
+		["hero_weights"]={
+			{
+				301,
+				200
+			},
+			{
+				302,
+				100
+			},
+			{
+				303,
+				100
+			},
+			{
+				304,
+				100
+			},
+			{
+				305,
+				100
+			},
+			{
+				306,
+				100
+			},
+			{
+				307,
+				100
+			}
+		}
+	},
+	[202]={
+		["hero_id"]=23001,
+		["hero_weights"]={
+			{
+				301,
+				200
+			},
+			{
+				302,
+				200
+			},
+			{
+				303,
+				200
+			},
+			{
+				304,
+				50
+			},
+			{
+				305,
+				50
+			},
+			{
+				306,
+				50
+			},
+			{
+				307,
+				50
+			}
+		}
+	},
+	[203]={
+		["hero_id"]=23002,
+		["hero_weights"]={
+			{
+				301,
+				200
+			},
+			{
+				302,
+				200
+			},
+			{
+				303,
+				200
+			},
+			{
+				304,
+				50
+			},
+			{
+				305,
+				50
+			},
+			{
+				306,
+				50
+			},
+			{
+				307,
+				50
+			}
+		}
+	},
+	[204]={
+		["hero_id"]=24001,
+		["hero_weights"]={
+			{
+				301,
+				400
+			},
+			{
+				302,
+				100
+			},
+			{
+				303,
+				100
+			},
+			{
+				304,
+				50
+			},
+			{
+				305,
+				50
+			},
+			{
+				306,
+				50
+			},
+			{
+				307,
+				50
+			}
+		}
+	},
+	[205]={
+		["hero_id"]=24002,
+		["hero_weights"]={
+			{
+				301,
+				400
+			},
+			{
+				302,
+				100
+			},
+			{
+				303,
+				100
+			},
+			{
+				304,
+				50
+			},
+			{
+				305,
+				50
+			},
+			{
+				306,
+				50
+			},
+			{
+				307,
+				50
+			}
+		}
+	},
+	[206]={
+		["hero_id"]=24003,
+		["hero_weights"]={
+			{
+				301,
+				400
+			},
+			{
+				302,
+				100
+			},
+			{
+				303,
+				100
+			},
+			{
+				304,
+				50
+			},
+			{
+				305,
+				50
+			},
+			{
+				306,
+				50
+			},
+			{
+				307,
+				50
+			}
+		}
+	},
+	[207]={
+		["hero_id"]=24004,
+		["hero_weights"]={
+			{
+				301,
+				400
+			},
+			{
+				302,
+				100
+			},
+			{
+				303,
+				100
+			},
+			{
+				304,
+				50
+			},
+			{
+				305,
+				50
+			},
+			{
+				306,
+				50
+			},
+			{
+				307,
+				50
+			}
+		}
+	},
+	[301]={
+		["hero_id"]=32001,
+		["hero_weights"]={
+			{
+				401,
+				200
+			},
+			{
+				402,
+				100
+			},
+			{
+				403,
+				100
+			},
+			{
+				404,
+				100
+			},
+			{
+				405,
+				100
+			},
+			{
+				406,
+				100
+			},
+			{
+				407,
+				100
+			}
+		}
+	},
+	[302]={
+		["hero_id"]=33001,
+		["hero_weights"]={
+			{
+				401,
+				200
+			},
+			{
+				402,
+				200
+			},
+			{
+				403,
+				200
+			},
+			{
+				404,
+				50
+			},
+			{
+				405,
+				50
+			},
+			{
+				406,
+				50
+			},
+			{
+				407,
+				50
+			}
+		}
+	},
+	[303]={
+		["hero_id"]=33002,
+		["hero_weights"]={
+			{
+				401,
+				200
+			},
+			{
+				402,
+				200
+			},
+			{
+				403,
+				200
+			},
+			{
+				404,
+				50
+			},
+			{
+				405,
+				50
+			},
+			{
+				406,
+				50
+			},
+			{
+				407,
+				50
+			}
+		}
+	},
+	[304]={
+		["hero_id"]=34001,
+		["hero_weights"]={
+			{
+				401,
+				400
+			},
+			{
+				402,
+				100
+			},
+			{
+				403,
+				100
+			},
+			{
+				404,
+				50
+			},
+			{
+				405,
+				50
+			},
+			{
+				406,
+				50
+			},
+			{
+				407,
+				50
+			}
+		}
+	},
+	[305]={
+		["hero_id"]=34002,
+		["hero_weights"]={
+			{
+				401,
+				400
+			},
+			{
+				402,
+				100
+			},
+			{
+				403,
+				100
+			},
+			{
+				404,
+				50
+			},
+			{
+				405,
+				50
+			},
+			{
+				406,
+				50
+			},
+			{
+				407,
+				50
+			}
+		}
+	},
+	[306]={
+		["hero_id"]=34003,
+		["hero_weights"]={
+			{
+				401,
+				400
+			},
+			{
+				402,
+				100
+			},
+			{
+				403,
+				100
+			},
+			{
+				404,
+				50
+			},
+			{
+				405,
+				50
+			},
+			{
+				406,
+				50
+			},
+			{
+				407,
+				50
+			}
+		}
+	},
+	[307]={
+		["hero_id"]=34004,
+		["hero_weights"]={
+			{
+				401,
+				400
+			},
+			{
+				402,
+				100
+			},
+			{
+				403,
+				100
+			},
+			{
+				404,
+				50
+			},
+			{
+				405,
+				50
+			},
+			{
+				406,
+				50
+			},
+			{
+				407,
+				50
+			}
+		}
+	},
+	[401]={
+		["hero_id"]=42001,
+		["hero_weights"]={
+			{
+				501,
+				200
+			},
+			{
+				502,
+				100
+			},
+			{
+				503,
+				100
+			},
+			{
+				504,
+				100
+			},
+			{
+				505,
+				100
+			},
+			{
+				506,
+				100
+			},
+			{
+				507,
+				100
+			}
+		}
+	},
+	[402]={
+		["hero_id"]=43001,
+		["hero_weights"]={
+			{
+				501,
+				200
+			},
+			{
+				502,
+				200
+			},
+			{
+				503,
+				200
+			},
+			{
+				504,
+				50
+			},
+			{
+				505,
+				50
+			},
+			{
+				506,
+				50
+			},
+			{
+				507,
+				50
+			}
+		}
+	},
+	[403]={
+		["hero_id"]=43002,
+		["hero_weights"]={
+			{
+				501,
+				200
+			},
+			{
+				502,
+				200
+			},
+			{
+				503,
+				200
+			},
+			{
+				504,
+				50
+			},
+			{
+				505,
+				50
+			},
+			{
+				506,
+				50
+			},
+			{
+				507,
+				50
+			}
+		}
+	},
+	[404]={
+		["hero_id"]=44001,
+		["hero_weights"]={
+			{
+				501,
+				400
+			},
+			{
+				502,
+				100
+			},
+			{
+				503,
+				100
+			},
+			{
+				504,
+				50
+			},
+			{
+				505,
+				50
+			},
+			{
+				506,
+				50
+			},
+			{
+				507,
+				50
+			}
+		}
+	},
+	[405]={
+		["hero_id"]=44002,
+		["hero_weights"]={
+			{
+				501,
+				400
+			},
+			{
+				502,
+				100
+			},
+			{
+				503,
+				100
+			},
+			{
+				504,
+				50
+			},
+			{
+				505,
+				50
+			},
+			{
+				506,
+				50
+			},
+			{
+				507,
+				50
+			}
+		}
+	},
+	[406]={
+		["hero_id"]=44003,
+		["hero_weights"]={
+			{
+				501,
+				400
+			},
+			{
+				502,
+				100
+			},
+			{
+				503,
+				100
+			},
+			{
+				504,
+				50
+			},
+			{
+				505,
+				50
+			},
+			{
+				506,
+				50
+			},
+			{
+				507,
+				50
+			}
+		}
+	},
+	[407]={
+		["hero_id"]=44004,
+		["hero_weights"]={
+			{
+				501,
+				400
+			},
+			{
+				502,
+				100
+			},
+			{
+				503,
+				100
+			},
+			{
+				504,
+				50
+			},
+			{
+				505,
+				50
+			},
+			{
+				506,
+				50
+			},
+			{
+				507,
+				50
+			}
+		}
+	},
+	[501]={
+		["hero_id"]=52001
+	},
+	[502]={
+		["hero_id"]=53001
+	},
+	[503]={
+		["hero_id"]=53002
+	},
+	[504]={
+		["hero_id"]=54001
+	},
+	[505]={
+		["hero_id"]=54002
+	},
+	[506]={
+		["hero_id"]=54003
+	},
+	[507]={
+		["hero_id"]=54004
+	}
+}
+local config = {
+data=activity_pvp,count=35
+}
+return config

lua/app/config/activity_pvp.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 50e07ebaa9427ca4fbea89c4d5688dfe
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_pvp_board.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 0ea07987f5138fd4783f9cb9509cf506
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_pvp_robot.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: fd03cb791b45ac0439c466dc70d9e54e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_pvp_wingift.lua

@@ -0,0 +1,90 @@
+local activity_pvp_wingift = {
+	[1]={
+		["win"]=1,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=3000,
+ 				["num_for_nothing"]="VQhcAw=="
+			}
+		}
+	},
+	[2]={
+		["win"]=4,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=4000,
+ 				["num_for_nothing"]="UghcAw=="
+			}
+		}
+	},
+	[3]={
+		["win"]=7,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=5000,
+ 				["num_for_nothing"]="UwhcAw=="
+			}
+		}
+	},
+	[4]={
+		["win"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
+			}
+		}
+	}
+}
+local config = {
+data=activity_pvp_wingift,count=4
+}
+return config

lua/app/config/activity_pvp_wingift.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 7912de26d4904f2449669a964a5a42c2
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_rank.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 640f37c0816009d4caa2c985b412047c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/activity_tourn_arena_point.lua

@@ -0,0 +1,54 @@
+local activity_tourn_arena_point = {
+	[1]={
+		["point_win"]=4,
+		["point_lose"]=3
+	},
+	[2]={
+		["point_win"]=6,
+		["point_lose"]=4
+	},
+	[3]={
+		["point_win"]=8,
+		["point_lose"]=5
+	},
+	[4]={
+		["point_win"]=10,
+		["point_lose"]=6
+	},
+	[5]={
+		["point_win"]=12,
+		["point_lose"]=7
+	},
+	[6]={
+		["point_win"]=14,
+		["point_lose"]=8
+	},
+	[7]={
+		["point_win"]=16,
+		["point_lose"]=10
+	},
+	[8]={
+		["point_win"]=18,
+		["point_lose"]=12
+	},
+	[9]={
+		["point_win"]=20,
+		["point_lose"]=14
+	},
+	[10]={
+		["point_win"]=22,
+		["point_lose"]=16
+	},
+	[11]={
+		["point_win"]=24,
+		["point_lose"]=18
+	},
+	[12]={
+		["point_win"]=26,
+		["point_lose"]=20
+	}
+}
+local config = {
+data=activity_tourn_arena_point,count=12
+}
+return config

lua/app/config/activity_tourn_arena_point.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3e83ace12d9f46c4b8aef7f8f3521dcc
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/arena_time.lua

@@ -2,20 +2,125 @@ local arena_time = {
 	[1]={
 		["season"]=1,
 		["start_time"]="2023-6-25 00:00:00",
-		["end_time"]="2023-8-16 00:00:00"
+		["end_time"]="2023-8-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
 	},
 	[2]={
 		["season"]=2,
 		["start_time"]="2023-8-16 00:00:00",
-		["end_time"]="2023-9-15 00:00:00"
+		["end_time"]="2023-9-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
 	},
 	[3]={
 		["season"]=3,
 		["start_time"]="2023-9-15 00:00:00",
-		["end_time"]="2023-10-16 00:00:00"
+		["end_time"]="2023-10-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_1"
+	},
+	[4]={
+		["season"]=4,
+		["start_time"]="2023-10-16 00:00:00",
+		["end_time"]="2023-11-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_2"
+	},
+	[5]={
+		["season"]=5,
+		["start_time"]="2023-11-15 00:00:00",
+		["end_time"]="2023-12-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_3"
+	},
+	[6]={
+		["season"]=6,
+		["start_time"]="2023-12-15 00:00:00",
+		["end_time"]="2024-1-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_4"
+	},
+	[7]={
+		["season"]=7,
+		["start_time"]="2024-1-15 00:00:00",
+		["end_time"]="2024-2-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_5"
+	},
+	[8]={
+		["season"]=8,
+		["start_time"]="2024-2-15 00:00:00",
+		["end_time"]="2024-3-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_6"
+	},
+	[9]={
+		["season"]=9,
+		["start_time"]="2024-3-16 00:00:00",
+		["end_time"]="2024-4-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[10]={
+		["season"]=10,
+		["start_time"]="2024-4-15 00:00:00",
+		["end_time"]="2024-5-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[11]={
+		["season"]=11,
+		["start_time"]="2024-5-16 00:00:00",
+		["end_time"]="2024-6-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[12]={
+		["season"]=12,
+		["start_time"]="2024-6-15 00:00:00",
+		["end_time"]="2024-7-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[13]={
+		["season"]=13,
+		["start_time"]="2024-7-16 00:00:00",
+		["end_time"]="2024-8-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[14]={
+		["season"]=14,
+		["start_time"]="2024-8-15 00:00:00",
+		["end_time"]="2024-9-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[15]={
+		["season"]=15,
+		["start_time"]="2024-9-15 00:00:00",
+		["end_time"]="2024-10-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[16]={
+		["season"]=16,
+		["start_time"]="2024-10-15 00:00:00",
+		["end_time"]="2024-11-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[17]={
+		["season"]=17,
+		["start_time"]="2024-11-15 00:00:00",
+		["end_time"]="2024-12-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[18]={
+		["season"]=18,
+		["start_time"]="2024-12-15 00:00:00",
+		["end_time"]="2025-1-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[19]={
+		["season"]=19,
+		["start_time"]="2025-1-15 00:00:00",
+		["end_time"]="2025-2-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[20]={
+		["season"]=20,
+		["start_time"]="2025-2-15 00:00:00",
+		["end_time"]="2025-3-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
 	}
 }
 local config = {
-data=arena_time,count=3
+data=arena_time,count=20
 }
 return config

lua/app/config/attr.lua

@@ -222,6 +222,26 @@ local attr = {
 	[56]={
 		["id"]=56,
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -281,12 +301,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/avatar.lua

@@ -6,7 +6,8 @@ local avatar = {
 	},
 	[24]={
 		["iconId"]="avatar_2",
-		["item"]=44
+		["item"]=44,
+		["unlock_show"]=true
 	},
 	[1001]={
 		["iconId"]="1",
@@ -131,24 +132,80 @@ local avatar = {
 		["iconId"]="30",
 		["hero"]=54003
 	},
+	[14004]={
+		["iconId"]="32",
+		["hero"]=14004
+	},
+	[24004]={
+		["iconId"]="33",
+		["hero"]=24004
+	},
+	[34004]={
+		["iconId"]="34",
+		["hero"]=34004
+	},
+	[44004]={
+		["iconId"]="35",
+		["hero"]=44004
+	},
+	[54004]={
+		["iconId"]="36",
+		["hero"]=54004
+	},
 	[1400201]={
-		["iconId"]="skin_3",
+		["iconId"]="23_1",
 		["item"]=1400201
 	},
 	[3400101]={
-		["iconId"]="skin_1",
+		["iconId"]="18_1",
 		["item"]=3400101
 	},
+	[3400102]={
+		["iconId"]="18_2",
+		["item"]=3400102
+	},
 	[5300101]={
-		["iconId"]="skin_4",
+		["iconId"]="10_1",
 		["item"]=5300101
 	},
 	[5400101]={
-		["iconId"]="skin_2",
+		["iconId"]="20_1",
 		["item"]=5400101
+	},
+	[1400101]={
+		["iconId"]="16_1",
+		["item"]=1400101
+	},
+	[2300201]={
+		["iconId"]="7_1",
+		["item"]=2300201
+	},
+	[4400201]={
+		["iconId"]="25_1",
+		["item"]=4400201
+	},
+	[5400401]={
+		["iconId"]="36_1",
+		["item"]=5400401
+	},
+	[2400101]={
+		["iconId"]="17_1",
+		["item"]=2400101
+	},
+	[4400101]={
+		["iconId"]="19_1",
+		["item"]=4400101
+	},
+	[5400301]={
+		["iconId"]="30_1",
+		["item"]=5400301
+	},
+	[5400201]={
+		["iconId"]="26_1",
+		["item"]=5400201
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=50
 }
 return config

lua/app/config/avatar_frame.lua

@@ -15,14 +15,81 @@ local avatar_frame = {
 	},
 	[26]={
 		["iconId"]="avatar_frame_4",
-		["item"]=45
+		["item"]=45,
+		["unlock_show"]=true
 	},
 	[27]={
 		["iconId"]="avatar_frame_5",
-		["item"]=46
+		["item"]=46,
+		["unlock_show"]=true
+	},
+	[28]={
+		["iconId"]="avatar_frame_6",
+		["item"]=53,
+		["unlock_show"]=true
+	},
+	[29]={
+		["iconId"]="avatar_frame_7",
+		["item"]=54,
+		["unlock_show"]=true
+	},
+	[30]={
+		["iconId"]="avatar_frame_8",
+		["item"]=57,
+		["unlock_show"]=true
+	},
+	[31]={
+		["iconId"]="avatar_frame_9",
+		["item"]=58,
+		["unlock_show"]=true
+	},
+	[32]={
+		["iconId"]="avatar_frame_10",
+		["item"]=59,
+		["unlock_show"]=true
+	},
+	[33]={
+		["iconId"]="avatar_frame_11",
+		["item"]=60,
+		["unlock_show"]=true
+	},
+	[34]={
+		["iconId"]="avatar_frame_12",
+		["item"]=61,
+		["unlock_show"]=true
+	},
+	[35]={
+		["iconId"]="avatar_frame_13",
+		["item"]=62,
+		["unlock_show"]=true
+	},
+	[36]={
+		["iconId"]="avatar_frame_14",
+		["item"]=63,
+		["unlock_show"]=true
+	},
+	[37]={
+		["iconId"]="avatar_frame_15",
+		["item"]=64,
+		["unlock_show"]=true
+	},
+	[38]={
+		["iconId"]="avatar_frame_16",
+		["item"]=65,
+		["unlock_show"]=true
+	},
+	[39]={
+		["iconId"]="avatar_frame_17",
+		["item"]=66,
+		["unlock_show"]=true
+	},
+	[40]={
+		["iconId"]="avatar_frame_18",
+		["item"]=67,
+		["unlock_show"]=true
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=18
 }
 return config

lua/app/config/bounty_time.lua

@@ -2,20 +2,145 @@ local bounty_time = {
 	[1]={
 		["season"]=1,
 		["start_time"]="2023-6-20 00:00:00",
-		["end_time"]="2023-8-1 00:00:00"
+		["end_time"]="2023-8-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner",
+		["enter_ui_banner"]="bounty_btn_main_1"
 	},
 	[2]={
 		["season"]=2,
 		["start_time"]="2023-8-1 00:00:00",
-		["end_time"]="2023-9-1 00:00:00"
+		["end_time"]="2023-9-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_2",
+		["enter_ui_banner"]="bounty_btn_main_2"
 	},
 	[3]={
 		["season"]=3,
 		["start_time"]="2023-9-1 00:00:00",
-		["end_time"]="2023-10-1 00:00:00"
+		["end_time"]="2023-10-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_3",
+		["enter_ui_banner"]="bounty_btn_main_3"
+	},
+	[4]={
+		["season"]=4,
+		["start_time"]="2023-10-1 00:00:00",
+		["end_time"]="2023-11-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_4",
+		["enter_ui_banner"]="bounty_btn_main_4"
+	},
+	[5]={
+		["season"]=5,
+		["start_time"]="2023-11-1 00:00:00",
+		["end_time"]="2023-12-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_5",
+		["enter_ui_banner"]="bounty_btn_main_5"
+	},
+	[6]={
+		["season"]=6,
+		["start_time"]="2023-12-1 00:00:00",
+		["end_time"]="2024-1-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner",
+		["enter_ui_banner"]="bounty_btn_main_1"
+	},
+	[7]={
+		["season"]=7,
+		["start_time"]="2024-1-1 00:00:00",
+		["end_time"]="2024-2-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_2",
+		["enter_ui_banner"]="bounty_btn_main_2"
+	},
+	[8]={
+		["season"]=8,
+		["start_time"]="2024-2-1 00:00:00",
+		["end_time"]="2024-3-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_3",
+		["enter_ui_banner"]="bounty_btn_main_3"
+	},
+	[9]={
+		["season"]=9,
+		["start_time"]="2024-3-1 00:00:00",
+		["end_time"]="2024-4-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_4",
+		["enter_ui_banner"]="bounty_btn_main_4"
+	},
+	[10]={
+		["season"]=10,
+		["start_time"]="2024-4-1 00:00:00",
+		["end_time"]="2024-5-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_5",
+		["enter_ui_banner"]="bounty_btn_main_5"
+	},
+	[11]={
+		["season"]=11,
+		["start_time"]="2024-5-1 00:00:00",
+		["end_time"]="2024-6-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner",
+		["enter_ui_banner"]="bounty_btn_main_1"
+	},
+	[12]={
+		["season"]=12,
+		["start_time"]="2024-6-1 00:00:00",
+		["end_time"]="2024-7-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_2",
+		["enter_ui_banner"]="bounty_btn_main_2"
+	},
+	[13]={
+		["season"]=13,
+		["start_time"]="2024-7-1 00:00:00",
+		["end_time"]="2024-8-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_3",
+		["enter_ui_banner"]="bounty_btn_main_3"
+	},
+	[14]={
+		["season"]=14,
+		["start_time"]="2024-8-1 00:00:00",
+		["end_time"]="2024-9-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_4",
+		["enter_ui_banner"]="bounty_btn_main_4"
+	},
+	[15]={
+		["season"]=15,
+		["start_time"]="2024-9-1 00:00:00",
+		["end_time"]="2024-10-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_5",
+		["enter_ui_banner"]="bounty_btn_main_5"
+	},
+	[16]={
+		["season"]=16,
+		["start_time"]="2024-10-1 00:00:00",
+		["end_time"]="2024-11-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner",
+		["enter_ui_banner"]="bounty_btn_main_1"
+	},
+	[17]={
+		["season"]=17,
+		["start_time"]="2024-11-1 00:00:00",
+		["end_time"]="2024-12-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_2",
+		["enter_ui_banner"]="bounty_btn_main_2"
+	},
+	[18]={
+		["season"]=18,
+		["start_time"]="2024-12-1 00:00:00",
+		["end_time"]="2025-1-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_3",
+		["enter_ui_banner"]="bounty_btn_main_3"
+	},
+	[19]={
+		["season"]=19,
+		["start_time"]="2025-1-1 00:00:00",
+		["end_time"]="2025-2-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_4",
+		["enter_ui_banner"]="bounty_btn_main_4"
+	},
+	[20]={
+		["season"]=20,
+		["start_time"]="2025-2-1 00:00:00",
+		["end_time"]="2025-3-1 00:00:00",
+		["ui_banner"]="ui_bounty_banner_5",
+		["enter_ui_banner"]="bounty_btn_main_5"
 	}
 }
 local config = {
-data=bounty_time,count=3
+data=bounty_time,count=20
 }
 return config

lua/app/config/buff.lua

@@ -53,7 +53,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=1,
 		["decr"]=1,
-		["icon"]="dec_dmg_red_add"
+		["icon"]="dec_dmg_red_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[8]={
 		["id"]=8,
@@ -62,7 +64,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=2,
 		["decr"]=1,
-		["icon"]="dec_dmg_yellow_add"
+		["icon"]="dec_dmg_yellow_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[9]={
 		["id"]=9,
@@ -71,7 +75,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=3,
 		["decr"]=1,
-		["icon"]="dec_dmg_green_add"
+		["icon"]="dec_dmg_green_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[10]={
 		["id"]=10,
@@ -80,7 +86,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=4,
 		["decr"]=1,
-		["icon"]="dec_dmg_blue_add"
+		["icon"]="dec_dmg_blue_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[11]={
 		["id"]=11,
@@ -89,7 +97,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=5,
 		["decr"]=1,
-		["icon"]="dec_dmg_purple_add"
+		["icon"]="dec_dmg_purple_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[12]={
 		["id"]=12,
@@ -97,7 +107,9 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="dec_dmg_all_add"
+		["icon"]="dec_dmg_all_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[13]={
 		["id"]=13,
@@ -192,14 +204,16 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="weakness_all_add"
+		["icon"]="weakness_all_add",
+		["ispercent"]=1
 	},
 	[25]={
 		["id"]=25,
 		["name"]="atkp_color_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["limit_parameter"]=10000
 	},
 	[26]={
 		["id"]=26,
@@ -207,7 +221,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=1
+		["decr"]=1,
+		["limit_parameter"]=10000
 	},
 	[27]={
 		["id"]=27,
@@ -215,7 +230,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["limit_parameter"]=10000
 	},
 	[28]={
 		["id"]=28,
@@ -223,7 +239,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=1
+		["decr"]=1,
+		["limit_parameter"]=10000
 	},
 	[29]={
 		["id"]=29,
@@ -231,7 +248,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=1
+		["decr"]=1,
+		["limit_parameter"]=10000
 	},
 	[30]={
 		["id"]=30,
@@ -239,7 +257,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=1
+		["decr"]=1,
+		["limit_parameter"]=10000
 	},
 	[31]={
 		["id"]=31,
@@ -400,6 +419,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="burn",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_take"]={
 			36
 		}
@@ -410,6 +430,8 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="vulnerable",
+		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_get"]={
 			34
 		}
@@ -438,6 +460,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="poison",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_take"]={
 			35
 		}
@@ -461,6 +484,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="corrupt",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_get"]={
 			19
 		}
@@ -473,6 +497,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="bleed",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_take"]={
 			31
 		}
@@ -484,6 +509,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="weaken",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_continued"]={
 			33
 		}
@@ -532,7 +558,8 @@ local buff = {
 		["name"]="skill_hurt_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["limit_parameter"]=10000
 	},
 	[61]={
 		["id"]=61,
@@ -552,7 +579,8 @@ local buff = {
 		["stack"]=1,
 		["decr"]=1,
 		["icon"]="counterattack",
-		["show_name"]=true
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[63]={
 		["id"]=63,
@@ -561,6 +589,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="thorns",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_continued"]={
 			18
 		}
@@ -628,7 +657,8 @@ local buff = {
 		["id"]=72,
 		["name"]="death_summon",
 		["buff_type"]=1,
-		["decr"]=3
+		["decr"]=3,
+		["icon"]="death_summon"
 	},
 	[73]={
 		["id"]=73,
@@ -757,7 +787,7 @@ local buff = {
 		["decr"]=1,
 		["formula"]=3,
 		["icon"]="rebirth",
-		["fx_take"]={
+		["fx_disappear"]={
 			44
 		}
 	},
@@ -782,9 +812,119 @@ local buff = {
 		["decr"]=1,
 		["formula"]=3,
 		["icon"]="self_heal",
+		["show_name"]=true,
 		["fx_take"]={
 			300027
 		}
+	},
+	[87]={
+		["id"]=87,
+		["name"]="charm",
+		["buff_type"]=7,
+		["decr"]=2,
+		["icon"]="charm",
+		["show_name"]=true,
+		["fx_continued"]={
+			45
+		}
+	},
+	[88]={
+		["id"]=88,
+		["name"]="immune",
+		["buff_type"]=7,
+		["decr"]=1,
+		["icon"]="immune",
+		["show_name"]=true,
+		["fx_continued"]={
+			46
+		}
+	},
+	[89]={
+		["id"]=89,
+		["name"]="forever_first_hand",
+		["buff_type"]=1,
+		["decr"]=3,
+		["icon"]="first_hand"
+	},
+	[90]={
+		["id"]=90,
+		["name"]="forever_counterattack",
+		["buff_type"]=1,
+		["stack"]=1,
+		["decr"]=3,
+		["icon"]="counterattack",
+		["ispercent"]=1
+	},
+	[91]={
+		["id"]=91,
+		["name"]="forever_dec_dmg_red_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=1,
+		["decr"]=3,
+		["icon"]="dec_dmg_red_add",
+		["ispercent"]=1
+	},
+	[92]={
+		["id"]=92,
+		["name"]="forever_dec_dmg_yellow_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=2,
+		["decr"]=3,
+		["icon"]="dec_dmg_yellow_add",
+		["ispercent"]=1
+	},
+	[93]={
+		["id"]=93,
+		["name"]="forever_dec_dmg_green_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=3,
+		["decr"]=3,
+		["icon"]="dec_dmg_green_add",
+		["ispercent"]=1
+	},
+	[94]={
+		["id"]=94,
+		["name"]="forever_dec_dmg_blue_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=4,
+		["decr"]=3,
+		["icon"]="dec_dmg_blue_add",
+		["ispercent"]=1
+	},
+	[95]={
+		["id"]=95,
+		["name"]="forever_dec_dmg_purple_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=5,
+		["decr"]=3,
+		["icon"]="dec_dmg_purple_add",
+		["ispercent"]=1
+	},
+	[96]={
+		["id"]=96,
+		["name"]="forever_dec_dmg_all_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=3,
+		["icon"]="dec_dmg_all_add",
+		["ispercent"]=1
+	},
+	[97]={
+		["id"]=97,
+		["name"]="forever_thorns",
+		["buff_type"]=1,
+		["decr"]=3,
+		["icon"]="thorns",
+		["show_name"]=true,
+		["ispercent"]=1,
+		["fx_continued"]={
+			18
+		}
 	}
 }
 local keys = {
@@ -874,12 +1014,23 @@ local keys = {
 		["shield_rebound_100"]=buff[83],
 		["rebirth"]=buff[84],
 		["ocean_shield"]=buff[85],
-		["self_heal"]=buff[86]
+		["self_heal"]=buff[86],
+		["charm"]=buff[87],
+		["immune"]=buff[88],
+		["forever_first_hand"]=buff[89],
+		["forever_counterattack"]=buff[90],
+		["forever_dec_dmg_red_add"]=buff[91],
+		["forever_dec_dmg_yellow_add"]=buff[92],
+		["forever_dec_dmg_green_add"]=buff[93],
+		["forever_dec_dmg_blue_add"]=buff[94],
+		["forever_dec_dmg_purple_add"]=buff[95],
+		["forever_dec_dmg_all_add"]=buff[96],
+		["forever_thorns"]=buff[97]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=86
+count=97
 }
 return config

lua/app/config/chapter_board_bossrush.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: f136cacb0fc4a2e47b93053e37dcf71b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/chapter_board_dungeon_armor.lua

@@ -7519,7 +7519,7 @@ local chapter_board_dungeon_armor = {
 			},
 			{
 				0,
-				40
+				0
 			},
 			{
 				0,
@@ -13699,7 +13699,7 @@ local chapter_board_dungeon_armor = {
 			},
 			{
 				21,
-				0
+				5
 			},
 			{
 				0,

lua/app/config/chapter_board_dungeon_gold.lua

@@ -2187,7 +2187,7 @@ local chapter_board_dungeon_gold = {
 			},
 			{
 				7,
-				40
+				0
 			},
 			{
 				0,

lua/app/config/chapter_board_rune.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b20e2f77ac5696b46ad6551917a95e37
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/chapter_dungeon_equip.lua

@@ -545,7 +545,7 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1001,
 				["num"]=1,
-				["weight"]=45
+				["weight"]=49
 			},
 			{
 				["type"]=1,
@@ -557,7 +557,7 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=11
 			}
 		},
 		["rand_drop_num"]=10,
@@ -638,7 +638,7 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1001,
 				["num"]=1,
-				["weight"]=30
+				["weight"]=38
 			},
 			{
 				["type"]=1,
@@ -650,7 +650,7 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=12
 			}
 		},
 		["rand_drop_num"]=10,
@@ -731,19 +731,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1002,
 				["num"]=1,
-				["weight"]=60
+				["weight"]=69
 			},
 			{
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=30
+				["weight"]=23
 			},
 			{
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=10
+				["weight"]=8
 			}
 		},
 		["rand_drop_num"]=10,
@@ -761,16 +761,16 @@ local chapter_dungeon_equip = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1002,
+				["id"]=1003,
- 				["id_for_nothing"]="VwhcAQ==",
+ 				["id_for_nothing"]="VwhcAA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1003,
+				["id"]=1004,
- 				["id_for_nothing"]="VwhcAA==",
+ 				["id_for_nothing"]="VwhcBw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
@@ -824,19 +824,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1002,
 				["num"]=1,
-				["weight"]=45
+				["weight"]=68
 			},
 			{
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=40
+				["weight"]=26
 			},
 			{
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=6
 			}
 		},
 		["rand_drop_num"]=10,
@@ -917,19 +917,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1002,
 				["num"]=1,
-				["weight"]=30
+				["weight"]=60
 			},
 			{
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=50
+				["weight"]=35
 			},
 			{
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=5
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1010,13 +1010,13 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=67
+				["weight"]=72
 			},
 			{
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=25
+				["weight"]=20
 			},
 			{
 				["type"]=1,
@@ -1103,19 +1103,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=57
+				["weight"]=71
 			},
 			{
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=30
+				["weight"]=23
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=13
+				["weight"]=6
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1196,19 +1196,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1003,
 				["num"]=1,
-				["weight"]=46
+				["weight"]=64
 			},
 			{
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=36
+				["weight"]=32
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=18
+				["weight"]=4
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1289,19 +1289,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=66
+				["weight"]=79
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=30
+				["weight"]=15
 			},
 			{
 				["type"]=1,
 				["id"]=1006,
 				["num"]=1,
-				["weight"]=4
+				["weight"]=6
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1390,19 +1390,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=53
+				["weight"]=75
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=38
+				["weight"]=17
 			},
 			{
 				["type"]=1,
 				["id"]=1006,
 				["num"]=1,
-				["weight"]=9
+				["weight"]=8
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1483,19 +1483,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=43
+				["weight"]=75
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=42
+				["weight"]=19
 			},
 			{
 				["type"]=1,
 				["id"]=1006,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=6
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1576,19 +1576,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=40
+				["weight"]=72
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=40
+				["weight"]=20
 			},
 			{
 				["type"]=1,
 				["id"]=1006,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=8
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1669,19 +1669,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=37
+				["weight"]=72
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=38
+				["weight"]=22
 			},
 			{
 				["type"]=1,
 				["id"]=1006,
 				["num"]=1,
-				["weight"]=25
+				["weight"]=6
 			}
 		},
 		["rand_drop_num"]=10,
@@ -1762,19 +1762,19 @@ local chapter_dungeon_equip = {
 				["type"]=1,
 				["id"]=1004,
 				["num"]=1,
-				["weight"]=34
+				["weight"]=68
 			},
 			{
 				["type"]=1,
 				["id"]=1005,
 				["num"]=1,
-				["weight"]=36
+				["weight"]=24
 			},
 			{
 				["type"]=1,
 				["id"]=1006,
 				["num"]=1,
-				["weight"]=30
+				["weight"]=8
 			}
 		},
 		["rand_drop_num"]=10,

lua/app/config/chapter_dungeon_rune.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 933f13204a32ef6409995fe1b6367608
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/chapter_new_skin_fight.lua

@@ -0,0 +1,48 @@
+local chapter_new_skin_fight = {
+	[1]={
+		["board"]={
+			5
+		},
+		["scene"]="bg_debris",
+		["block_icon"]="battle_hinder_debris",
+		["chess_board"]="chessboard_2",
+		["monster"]={
+			10004
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
+	},
+	[2]={
+		["board"]={
+			12
+		},
+		["scene"]="bg_debris",
+		["block_icon"]="battle_hinder_debris",
+		["chess_board"]="chessboard_2",
+		["monster"]={
+			10104
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
+	}
+}
+local config = {
+data=chapter_new_skin_fight,count=2
+}
+return config

lua/app/config/chapter_new_skin_fight.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a1aa547b9a9ed53469674937286789c6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/collection.lua

@@ -815,9 +815,663 @@ local collection = {
  				["num_for_nothing"]="VApc"
 			}
 		}
+	},
+	[38]={
+		["point"]=1850,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[39]={
+		["point"]=1900,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[40]={
+		["point"]=1950,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[41]={
+		["point"]=2000,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=35000,
+ 				["num_for_nothing"]="VQ1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[42]={
+		["point"]=2050,
+		["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"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[43]={
+		["point"]=2100,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=45000,
+ 				["num_for_nothing"]="Ug1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[44]={
+		["point"]=2150,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=220,
+ 				["num_for_nothing"]="VApc"
+			}
+		}
+	},
+	[45]={
+		["point"]=2200,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[46]={
+		["point"]=2250,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[47]={
+		["point"]=2300,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[48]={
+		["point"]=2350,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=35000,
+ 				["num_for_nothing"]="VQ1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[49]={
+		["point"]=2400,
+		["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"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[50]={
+		["point"]=2450,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=45000,
+ 				["num_for_nothing"]="Ug1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[51]={
+		["point"]=2500,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=220,
+ 				["num_for_nothing"]="VApc"
+			}
+		}
+	},
+	[52]={
+		["point"]=2550,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[53]={
+		["point"]=2600,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[54]={
+		["point"]=2650,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[55]={
+		["point"]=2700,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=35000,
+ 				["num_for_nothing"]="VQ1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[56]={
+		["point"]=2750,
+		["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"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[57]={
+		["point"]=2800,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=45000,
+ 				["num_for_nothing"]="Ug1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[58]={
+		["point"]=2850,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=220,
+ 				["num_for_nothing"]="VApc"
+			}
+		}
+	},
+	[59]={
+		["point"]=2900,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[60]={
+		["point"]=2950,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[61]={
+		["point"]=3000,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[62]={
+		["point"]=3050,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=35000,
+ 				["num_for_nothing"]="VQ1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[63]={
+		["point"]=3100,
+		["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"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[64]={
+		["point"]=3150,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=45000,
+ 				["num_for_nothing"]="Ug1cA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[65]={
+		["point"]=3200,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=220,
+ 				["num_for_nothing"]="VApc"
+			}
+		}
+	},
+	[66]={
+		["point"]=3250,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[67]={
+		["point"]=3300,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
 	}
 }
 local config = {
-data=collection,count=37
+data=collection,count=67
 }
 return config

lua/app/config/const.lua

@@ -376,9 +376,146 @@ local const = {
 	},
 	["bounty_click"]={
 		["value"]=4
+	},
+	["activity_boss_rush_time"]={
+		["value"]=1
+	},
+	["activity_boss_rush_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	["activity_boss_rush_costadd"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	["activity_boss_rush_hp_add_1"]={
+		["value"]=1750
+	},
+	["activity_boss_rush_atk_add_1"]={
+		["value"]=1370
+	},
+	["activity_boss_rush_hp_add_2"]={
+		["value"]=2700
+	},
+	["activity_boss_rush_atk_add_2"]={
+		["value"]=2200
+	},
+	["activity_boss_rush_hp_add_3"]={
+		["value"]=4100
+	},
+	["activity_boss_rush_atk_add_3"]={
+		["value"]=3500
+	},
+	["activity_recurring_day"]={
+		["value"]=5
+	},
+	["runes_cost_base"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=55,
+ 			["id_for_nothing"]="Uw0=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		}
+	},
+	["runes_cost_add"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=55,
+ 			["id_for_nothing"]="Uw0=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		}
+	},
+	["runes_red_point"]={
+		["value"]=1000
+	},
+	["dungeon_rune_lvlimit"]={
+		["value"]=20
+	},
+	["dungeon_rune_revival"]={
+		["value"]=5
+	},
+	["dungeon_rune_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		}
+	},
+	["dungeon_rune_buylimit"]={
+		["value"]=5
+	},
+	["activity_pvp_time"]={
+		["value"]=1
+	},
+	["activity_pvp_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	["activity_pvp_costadd"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	["activity_pvp_win_times"]={
+		["value"]=10
+	},
+	["activity_pvp_lose_times"]={
+		["value"]=2
+	},
+	["activity_pvp_bounty_point"]={
+		["value"]=10
+	},
+	["activity_pvp_refresh_ad_times"]={
+		["value"]=1
+	},
+	["activity_pvp_refresh_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		}
+	},
+	["act_tourn_rank_free"]={
+		["value"]=90
+	},
+	["act_tourn_rank_pay"]={
+		["value"]=10
 	}
 }
 local config = {
-data=const,count=77
+data=const,count=104
 }
 return config

lua/app/config/dungeon_rune_rank.lua

@@ -0,0 +1,256 @@
+local dungeon_rune_rank = {
+	[1]={
+		["season"]=1,
+		["ranking"]={
+			1,
+			1
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[2]={
+		["season"]=1,
+		["ranking"]={
+			2,
+			2
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=201,
+ 				["num_for_nothing"]="VAhd"
+			}
+		}
+	},
+	[3]={
+		["season"]=1,
+		["ranking"]={
+			3,
+			3
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=202,
+ 				["num_for_nothing"]="VAhe"
+			}
+		}
+	},
+	[4]={
+		["season"]=1,
+		["ranking"]={
+			4,
+			10
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=203,
+ 				["num_for_nothing"]="VAhf"
+			}
+		}
+	},
+	[5]={
+		["season"]=1,
+		["ranking"]={
+			11,
+			50
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=204,
+ 				["num_for_nothing"]="VAhY"
+			}
+		}
+	},
+	[6]={
+		["season"]=1,
+		["ranking"]={
+			51,
+			100
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=205,
+ 				["num_for_nothing"]="VAhZ"
+			}
+		}
+	},
+	[7]={
+		["season"]=1,
+		["ranking"]={
+			101,
+			200
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=206,
+ 				["num_for_nothing"]="VAha"
+			}
+		}
+	},
+	[8]={
+		["season"]=1,
+		["ranking"]={
+			201,
+			500
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=207,
+ 				["num_for_nothing"]="VAhb"
+			}
+		}
+	},
+	[9]={
+		["season"]=1,
+		["ranking"]={
+			501,
+			1000
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=208,
+ 				["num_for_nothing"]="VAhU"
+			}
+		}
+	},
+	[10]={
+		["season"]=1,
+		["ranking"]={
+			1001,
+			9999
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=209,
+ 				["num_for_nothing"]="VAhV"
+			}
+		}
+	}
+}
+local config = {
+data=dungeon_rune_rank,count=10
+}
+return config

lua/app/config/dungeon_rune_rank.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 2c0c8d5c7e930d8469c0c44f32a109a4
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/dungeon_rune_time.lua

@@ -0,0 +1,16 @@
+local dungeon_rune_time = {
+	[1]={
+		["season"]=1,
+		["start_time"]="2023-9-19 00:00:00",
+		["end_time"]="2023-10-23 00:00:00"
+	},
+	[2]={
+		["season"]=2,
+		["start_time"]="2023-10-23 00:00:00",
+		["end_time"]="2023-11-22 00:00:00"
+	}
+}
+local config = {
+data=dungeon_rune_time,count=2
+}
+return config

lua/app/config/dungeon_rune_time.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 25674d56c20c532449e161b993925a2f
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/func_open.lua

@@ -102,9 +102,13 @@ local func_open = {
 	["activity_open"]={
 		["stage"]=4,
 		["pop_ups"]=1
+	},
+	["runes_open"]={
+		["stage"]=12,
+		["pop_ups"]=1
 	}
 }
 local config = {
-data=func_open,count=26
+data=func_open,count=27
 }
 return config

lua/app/config/fx.lua

@@ -189,6 +189,16 @@ local fx = {
 		["res"]="sfx_buff_fuhuo_b01",
 		["bind"]="root"
 	},
+	[45]={
+		["res"]="sfx_buff_charm_b01",
+		["loop"]=1,
+		["bind"]="root"
+	},
+	[46]={
+		["res"]="sfx_buff_immune_b01",
+		["loop"]=1,
+		["bind"]="root"
+	},
 	[100001]={
 		["res"]="sfx_m10001_b01",
 		["bind"]="root"
@@ -1401,6 +1411,174 @@ local fx = {
 		["res"]="sfx_m20048_b05",
 		["bind"]="root"
 	},
+	[200187]={
+		["res"]="sfx_m20049_b01",
+		["bind"]="root"
+	},
+	[200188]={
+		["res"]="sfx_m20049_b02",
+		["bind"]="root"
+	},
+	[200189]={
+		["res"]="sfx_m20049_b03",
+		["bind"]="root"
+	},
+	[200190]={
+		["res"]="sfx_m20049_b04",
+		["bind"]="root"
+	},
+	[200191]={
+		["res"]="sfx_m20050_b01",
+		["bind"]="root"
+	},
+	[200192]={
+		["res"]="sfx_m20050_b02",
+		["bind"]="root"
+	},
+	[200193]={
+		["res"]="sfx_m20050_b03",
+		["bind"]="root"
+	},
+	[200194]={
+		["res"]="sfx_m20050_b04",
+		["bind"]="root"
+	},
+	[200195]={
+		["res"]="sfx_m20050_b05",
+		["bind"]="root"
+	},
+	[200196]={
+		["res"]="sfx_m20051_b01",
+		["bind"]="root"
+	},
+	[200197]={
+		["res"]="sfx_m20051_b04",
+		["bind"]="root"
+	},
+	[200198]={
+		["res"]="sfx_m20052_b04",
+		["bind"]="root"
+	},
+	[200199]={
+		["res"]="sfx_m20052_b05",
+		["bind"]="root"
+	},
+	[200200]={
+		["res"]="sfx_m20052_b06",
+		["bind"]="root"
+	},
+	[200201]={
+		["res"]="sfx_m20052_b07",
+		["bind"]="root"
+	},
+	[200202]={
+		["res"]="sfx_m20053_a01",
+		["bind"]="root"
+	},
+	[200203]={
+		["res"]="sfx_m20053_a02",
+		["bind"]="root"
+	},
+	[200204]={
+		["res"]="sfx_m20053_a03",
+		["bind"]="root"
+	},
+	[200205]={
+		["res"]="sfx_m20053_a04",
+		["bind"]="root"
+	},
+	[200206]={
+		["res"]="sfx_m20053_a05",
+		["bind"]="root"
+	},
+	[200207]={
+		["res"]="sfx_m20054_a01",
+		["bind"]="root"
+	},
+	[200208]={
+		["res"]="sfx_m20054_a02",
+		["bind"]="root"
+	},
+	[200209]={
+		["res"]="sfx_m20054_a03",
+		["bind"]="root"
+	},
+	[200210]={
+		["res"]="sfx_m20054_a04",
+		["bind"]="root"
+	},
+	[200211]={
+		["res"]="sfx_m20054_a05",
+		["bind"]="root"
+	},
+	[200212]={
+		["res"]="sfx_m20054_a06",
+		["bind"]="root"
+	},
+	[200213]={
+		["res"]="sfx_m20054_a07",
+		["bind"]="root"
+	},
+	[200214]={
+		["res"]="sfx_m20055_a01",
+		["bind"]="root"
+	},
+	[200215]={
+		["res"]="sfx_m20055_a02",
+		["bind"]="root"
+	},
+	[200216]={
+		["res"]="sfx_m20055_a03",
+		["bind"]="root"
+	},
+	[200217]={
+		["res"]="sfx_m20055_a04",
+		["bind"]="root"
+	},
+	[200218]={
+		["res"]="sfx_m20055_a05",
+		["bind"]="root"
+	},
+	[200219]={
+		["res"]="sfx_m20056_b01",
+		["bind"]="root"
+	},
+	[200220]={
+		["res"]="sfx_m20056_b02",
+		["bind"]="root"
+	},
+	[200221]={
+		["res"]="sfx_m20056_b03",
+		["bind"]="root"
+	},
+	[200222]={
+		["res"]="sfx_m20057_b01",
+		["bind"]="root"
+	},
+	[200223]={
+		["res"]="sfx_m20057_b02",
+		["bind"]="root"
+	},
+	[200224]={
+		["res"]="sfx_m20057_b03",
+		["bind"]="root"
+	},
+	[200225]={
+		["res"]="sfx_m20057_b04",
+		["bind"]="root"
+	},
+	[200226]={
+		["res"]="sfx_m20058_b01",
+		["bind"]="root"
+	},
+	[200227]={
+		["res"]="sfx_m20058_b02",
+		["bind"]="root"
+	},
+	[200228]={
+		["res"]="sfx_m20058_b03",
+		["bind"]="root"
+	},
 	[300000]={
 		["res"]="sfx_p0001_b01",
 		["bind"]="root"
@@ -2007,6 +2185,156 @@ local fx = {
 		["res"]="sfx_p0036_b05",
 		["bind"]="root"
 	},
+	[300151]={
+		["res"]="sfx_p0037_b01",
+		["bind"]="root"
+	},
+	[300152]={
+		["res"]="sfx_p0037_b02",
+		["bind"]="root"
+	},
+	[300153]={
+		["res"]="sfx_p0037_b05",
+		["bind"]="root"
+	},
+	[300154]={
+		["res"]="sfx_p0038_b01",
+		["bind"]="root"
+	},
+	[300155]={
+		["res"]="sfx_p0038_b05",
+		["bind"]="root"
+	},
+	[300156]={
+		["res"]="sfx_p0039_b01",
+		["bind"]="root"
+	},
+	[300157]={
+		["res"]="sfx_p0039_b05",
+		["bind"]="root"
+	},
+	[300158]={
+		["res"]="sfx_p0040_b01",
+		["bind"]="root"
+	},
+	[300159]={
+		["res"]="sfx_p0040_b05",
+		["bind"]="root"
+	},
+	[300160]={
+		["res"]="sfx_p0041_b01",
+		["bind"]="root"
+	},
+	[300161]={
+		["res"]="sfx_p0041_b02",
+		["bind"]="root"
+	},
+	[300162]={
+		["res"]="sfx_p0041_b03",
+		["bind"]="root"
+	},
+	[300163]={
+		["res"]="sfx_p0041_b04",
+		["bind"]="root"
+	},
+	[300164]={
+		["res"]="sfx_p0041_b05",
+		["bind"]="root"
+	},
+	[300165]={
+		["res"]="sfx_p0043_b01",
+		["bind"]="root"
+	},
+	[300166]={
+		["res"]="sfx_p0043_b02",
+		["bind"]="root"
+	},
+	[300167]={
+		["res"]="sfx_p0043_b03",
+		["bind"]="root"
+	},
+	[300168]={
+		["res"]="sfx_p0043_b04",
+		["bind"]="root"
+	},
+	[300169]={
+		["res"]="sfx_p0043_b05",
+		["bind"]="root"
+	},
+	[300170]={
+		["res"]="sfx_p0043_b06",
+		["bind"]="root",
+		["bg"]=1
+	},
+	[300171]={
+		["res"]="sfx_p0044_b01",
+		["bind"]="root"
+	},
+	[300172]={
+		["res"]="sfx_p0044_b05",
+		["bind"]="root"
+	},
+	[300173]={
+		["res"]="sfx_p0044_b06",
+		["bind"]="root",
+		["bg"]=1
+	},
+	[300174]={
+		["res"]="sfx_p0045_b01",
+		["bind"]="root"
+	},
+	[300175]={
+		["res"]="sfx_p0045_b02",
+		["bind"]="root"
+	},
+	[300176]={
+		["res"]="sfx_p0045_b03",
+		["bind"]="root"
+	},
+	[300177]={
+		["res"]="sfx_p0045_b04",
+		["bind"]="root"
+	},
+	[300178]={
+		["res"]="sfx_p0045_b05",
+		["bind"]="root"
+	},
+	[300179]={
+		["res"]="sfx_p0046_b01",
+		["bind"]="root"
+	},
+	[300180]={
+		["res"]="sfx_p0046_b05",
+		["bind"]="root"
+	},
+	[300181]={
+		["res"]="sfx_p0047_b01",
+		["bind"]="root"
+	},
+	[300182]={
+		["res"]="sfx_p0047_b02",
+		["bind"]="root"
+	},
+	[300183]={
+		["res"]="sfx_p0048_b01",
+		["bind"]="root"
+	},
+	[300184]={
+		["res"]="sfx_p0048_b02",
+		["bind"]="root"
+	},
+	[300185]={
+		["res"]="sfx_p0048_b03",
+		["bind"]="root"
+	},
+	[300186]={
+		["res"]="sfx_p0048_b04",
+		["bind"]="root"
+	},
+	[300187]={
+		["res"]="sfx_p0048_b05",
+		["bind"]="root"
+	},
 	[400000]={
 		["res"]="sfx_p0012_b01",
 		["bind"]="root",
@@ -2763,9 +3091,196 @@ local fx = {
 		["res"]="sfx_p0036_b05",
 		["bind"]="root",
 		["flip"]=1
+	},
+	[400151]={
+		["res"]="sfx_p0037_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400152]={
+		["res"]="sfx_p0037_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400153]={
+		["res"]="sfx_p0037_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400154]={
+		["res"]="sfx_p0038_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400155]={
+		["res"]="sfx_p0038_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400156]={
+		["res"]="sfx_p0039_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400157]={
+		["res"]="sfx_p0039_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400158]={
+		["res"]="sfx_p0040_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400159]={
+		["res"]="sfx_p0040_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400160]={
+		["res"]="sfx_p0041_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400161]={
+		["res"]="sfx_p0041_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400162]={
+		["res"]="sfx_p0041_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400163]={
+		["res"]="sfx_p0041_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400164]={
+		["res"]="sfx_p0041_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400165]={
+		["res"]="sfx_p0043_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400166]={
+		["res"]="sfx_p0043_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400167]={
+		["res"]="sfx_p0043_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400168]={
+		["res"]="sfx_p0043_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400169]={
+		["res"]="sfx_p0043_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400170]={
+		["res"]="sfx_p0043_b06",
+		["bind"]="root",
+		["flip"]=1,
+		["bg"]=1
+	},
+	[400171]={
+		["res"]="sfx_p0044_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400172]={
+		["res"]="sfx_p0044_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400173]={
+		["res"]="sfx_p0044_b06",
+		["bind"]="root",
+		["flip"]=1,
+		["bg"]=1
+	},
+	[400174]={
+		["res"]="sfx_p0045_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400175]={
+		["res"]="sfx_p0045_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400176]={
+		["res"]="sfx_p0045_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400177]={
+		["res"]="sfx_p0045_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400178]={
+		["res"]="sfx_p0045_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400179]={
+		["res"]="sfx_p0046_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400180]={
+		["res"]="sfx_p0046_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400181]={
+		["res"]="sfx_p0047_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400182]={
+		["res"]="sfx_p0047_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400183]={
+		["res"]="sfx_p0048_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400184]={
+		["res"]="sfx_p0048_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400185]={
+		["res"]="sfx_p0048_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400186]={
+		["res"]="sfx_p0048_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400187]={
+		["res"]="sfx_p0048_b05",
+		["bind"]="root",
+		["flip"]=1
 	}
 }
 local config = {
-data=fx,count=649
+data=fx,count=767
 }
 return config

lua/app/config/grid_edge_type.lua

@@ -12,9 +12,23 @@ local grid_edge_type = {
 		["icon"]="battle_obstacle_coral_3",
 		["next_type"]=2,
 		["break_sfx"]="sfx_piece_shanhu_b01"
+	},
+	[4]={
+		["icon"]="battle_obstacle_stick_3",
+		["break_sfx"]="sfx_piece_shanhu_b01"
+	},
+	[5]={
+		["icon"]="battle_obstacle_stick_2",
+		["next_type"]=4,
+		["break_sfx"]="sfx_piece_shanhu_b01"
+	},
+	[6]={
+		["icon"]="battle_obstacle_stick_1",
+		["next_type"]=5,
+		["break_sfx"]="sfx_piece_shanhu_b01"
 	}
 }
 local config = {
-data=grid_edge_type,count=3
+data=grid_edge_type,count=6
 }
 return config

lua/app/config/grid_type.lua

@@ -440,7 +440,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_zhongrushi_b01"
 	},
 	[31]={
-		["icon"]="battle_obstacle_lron_1",
+		["icon"]="battle_obstacle_iron_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -453,7 +453,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_tiexie_b01"
 	},
 	[32]={
-		["icon"]="battle_obstacle_lron_2",
+		["icon"]="battle_obstacle_iron_2",
 		["next_type"]=31,
 		["break_condition"]={
 			1,
@@ -466,7 +466,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_tiexie_b01"
 	},
 	[33]={
-		["icon"]="battle_obstacle_lron_3",
+		["icon"]="battle_obstacle_iron_3",
 		["next_type"]=32,
 		["break_condition"]={
 			1,

lua/app/config/hero.lua

@@ -374,6 +374,67 @@ local hero = {
 			14003
 		}
 	},
+	[14004]={
+		["position"]=1,
+		["qlt"]=4,
+		["hurt_skill"]={
+			1400410,
+			1400411,
+			1400412,
+			1400413
+		},
+		["base_skill"]=1400420,
+		["rouge_skill"]=1400400,
+		["rouge_skill_1"]=1400401,
+		["rouge_skill_2"]=1400402,
+		["rouge_skill_3"]=1400403,
+		["rouge_skill_4"]=1400404,
+		["rouge_skill_5"]=1400405,
+		["rouge_skill_6"]=1400406,
+		["rouge_skill_7"]=1400407,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0037",
+		["icon"]="32",
+		["item_id"]=14004,
+		["collection_point"]=5,
+		["skin"]={
+			14004
+		}
+	},
 	[22001]={
 		["position"]=2,
 		["qlt"]=2,
@@ -559,7 +620,8 @@ local hero = {
 		["is_show"]=1,
 		["collection_point"]=3,
 		["skin"]={
-			23002
+			23002,
+			2300201
 		}
 	},
 	[24001]={
@@ -622,7 +684,8 @@ local hero = {
 		["is_show"]=1,
 		["collection_point"]=5,
 		["skin"]={
-			24001
+			24001,
+			2400101
 		}
 	},
 	[24002]={
@@ -748,6 +811,67 @@ local hero = {
 			24003
 		}
 	},
+	[24004]={
+		["position"]=2,
+		["qlt"]=4,
+		["hurt_skill"]={
+			2400410,
+			2400411,
+			2400412,
+			2400413
+		},
+		["base_skill"]=2400420,
+		["rouge_skill"]=2400400,
+		["rouge_skill_1"]=2400401,
+		["rouge_skill_2"]=2400402,
+		["rouge_skill_3"]=2400403,
+		["rouge_skill_4"]=2400404,
+		["rouge_skill_5"]=2400405,
+		["rouge_skill_6"]=2400406,
+		["rouge_skill_7"]=2400407,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0039",
+		["icon"]="33",
+		["item_id"]=24004,
+		["collection_point"]=5,
+		["skin"]={
+			24004
+		}
+	},
 	[32001]={
 		["position"]=3,
 		["qlt"]=2,
@@ -997,7 +1121,8 @@ local hero = {
 		["collection_point"]=5,
 		["skin"]={
 			34001,
-			3400101
+			3400101,
+			3400102
 		}
 	},
 	[34002]={
@@ -1124,6 +1249,68 @@ local hero = {
 			34003
 		}
 	},
+	[34004]={
+		["position"]=3,
+		["qlt"]=4,
+		["hurt_skill"]={
+			3400410,
+			3400411,
+			3400412,
+			3400413
+		},
+		["base_skill"]=3400420,
+		["rouge_skill"]=3400400,
+		["rouge_skill_1"]=3400401,
+		["rouge_skill_2"]=3400402,
+		["rouge_skill_3"]=3400403,
+		["rouge_skill_4"]=3400404,
+		["rouge_skill_5"]=3400405,
+		["rouge_skill_6"]=3400406,
+		["rouge_skill_7"]=3400407,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0040",
+		["icon"]="34",
+		["item_id"]=34004,
+		["is_show"]=1,
+		["collection_point"]=5,
+		["skin"]={
+			34004
+		}
+	},
 	[42001]={
 		["position"]=4,
 		["qlt"]=2,
@@ -1372,7 +1559,8 @@ local hero = {
 		["is_show"]=1,
 		["collection_point"]=5,
 		["skin"]={
-			44001
+			44001,
+			4400101
 		}
 	},
 	[44002]={
@@ -1435,7 +1623,8 @@ local hero = {
 		["is_show"]=1,
 		["collection_point"]=5,
 		["skin"]={
-			44002
+			44002,
+			4400201
 		}
 	},
 	[44003]={
@@ -1499,6 +1688,67 @@ local hero = {
 			44003
 		}
 	},
+	[44004]={
+		["position"]=4,
+		["qlt"]=4,
+		["hurt_skill"]={
+			4400410,
+			4400411,
+			4400412,
+			4400413
+		},
+		["base_skill"]=4400420,
+		["rouge_skill"]=4400400,
+		["rouge_skill_1"]=4400401,
+		["rouge_skill_2"]=4400402,
+		["rouge_skill_3"]=4400403,
+		["rouge_skill_4"]=4400404,
+		["rouge_skill_5"]=4400405,
+		["rouge_skill_6"]=4400406,
+		["rouge_skill_7"]=4400407,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0038",
+		["icon"]="35",
+		["item_id"]=44004,
+		["collection_point"]=5,
+		["skin"]={
+			44004
+		}
+	},
 	[52001]={
 		["position"]=5,
 		["qlt"]=2,
@@ -1811,7 +2061,8 @@ local hero = {
 		["is_show"]=1,
 		["collection_point"]=5,
 		["skin"]={
-			54002
+			54002,
+			5400201
 		}
 	},
 	[54003]={
@@ -1873,11 +2124,74 @@ local hero = {
 		["unlock_arena"]=3,
 		["collection_point"]=5,
 		["skin"]={
-			54003
+			54003,
+			5400301
+		}
+	},
+	[54004]={
+		["position"]=5,
+		["qlt"]=4,
+		["hurt_skill"]={
+			5400410,
+			5400411,
+			5400412,
+			5400413
+		},
+		["base_skill"]=5400420,
+		["rouge_skill"]=5400400,
+		["rouge_skill_1"]=5400401,
+		["rouge_skill_2"]=5400402,
+		["rouge_skill_3"]=5400403,
+		["rouge_skill_4"]=5400404,
+		["rouge_skill_5"]=5400405,
+		["rouge_skill_6"]=5400406,
+		["rouge_skill_7"]=5400407,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0041",
+		["icon"]="36",
+		["item_id"]=54004,
+		["collection_point"]=5,
+		["skin"]={
+			54004,
+			5400401
 		}
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/item.lua

@@ -212,6 +212,36 @@ local item = {
 				["id"]=54003,
 				["num"]=1,
 				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=14004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=24004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=34004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=44004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=54004,
+				["num"]=1,
+				["weight"]=100
 			}
 		}
 	},
@@ -1547,9 +1577,134 @@ local item = {
 				["id"]=54003,
 				["num"]=1,
 				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=14004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=24004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=34004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=44004,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=54004,
+				["num"]=1,
+				["weight"]=100
 			}
 		}
 	},
+	[49]={
+		["type"]=2,
+		["qlt"]=4,
+		["icon"]="49"
+	},
+	[50]={
+		["type"]=2,
+		["qlt"]=4,
+		["icon"]="50"
+	},
+	[51]={
+		["type"]=2,
+		["qlt"]=4,
+		["icon"]="51"
+	},
+	[52]={
+		["type"]=2,
+		["qlt"]=4,
+		["icon"]="52"
+	},
+	[53]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="53"
+	},
+	[54]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="54"
+	},
+	[55]={
+		["type"]=1,
+		["qlt"]=4,
+		["icon"]="55"
+	},
+	[56]={
+		["type"]=1,
+		["qlt"]=4,
+		["icon"]="56"
+	},
+	[57]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="57"
+	},
+	[58]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="58"
+	},
+	[59]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="59"
+	},
+	[60]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="60"
+	},
+	[61]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="61"
+	},
+	[62]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="62"
+	},
+	[63]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="63"
+	},
+	[64]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="64"
+	},
+	[65]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="65"
+	},
+	[66]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="66"
+	},
+	[67]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="67"
+	},
 	[1001]={
 		["type"]=2,
 		["qlt"]=1,
@@ -2202,6 +2357,12 @@ local item = {
 		["qlt"]=4,
 		["icon"]="14003"
 	},
+	[14004]={
+		["type"]=5,
+		["parameter"]=14004,
+		["qlt"]=4,
+		["icon"]="14004"
+	},
 	[22001]={
 		["type"]=5,
 		["parameter"]=22001,
@@ -2238,6 +2399,12 @@ local item = {
 		["qlt"]=4,
 		["icon"]="24003"
 	},
+	[24004]={
+		["type"]=5,
+		["parameter"]=24004,
+		["qlt"]=4,
+		["icon"]="24004"
+	},
 	[32001]={
 		["type"]=5,
 		["parameter"]=32001,
@@ -2274,6 +2441,12 @@ local item = {
 		["qlt"]=4,
 		["icon"]="34002"
 	},
+	[34004]={
+		["type"]=5,
+		["parameter"]=34004,
+		["qlt"]=4,
+		["icon"]="34004"
+	},
 	[42001]={
 		["type"]=5,
 		["parameter"]=42001,
@@ -2310,6 +2483,12 @@ local item = {
 		["qlt"]=4,
 		["icon"]="44003"
 	},
+	[44004]={
+		["type"]=5,
+		["parameter"]=44004,
+		["qlt"]=4,
+		["icon"]="44004"
+	},
 	[52001]={
 		["type"]=5,
 		["parameter"]=52001,
@@ -2346,6 +2525,12 @@ local item = {
 		["qlt"]=4,
 		["icon"]="54003"
 	},
+	[54004]={
+		["type"]=5,
+		["parameter"]=54004,
+		["qlt"]=4,
+		["icon"]="54004"
+	},
 	[1400201]={
 		["type"]=12,
 		["parameter"]=1400201,
@@ -2358,6 +2543,12 @@ local item = {
 		["qlt"]=4,
 		["icon"]="3400101"
 	},
+	[3400102]={
+		["type"]=12,
+		["parameter"]=3400102,
+		["qlt"]=3,
+		["icon"]="3400102"
+	},
 	[5300101]={
 		["type"]=12,
 		["parameter"]=5300101,
@@ -2375,9 +2566,51 @@ local item = {
 		["parameter"]=1400101,
 		["qlt"]=3,
 		["icon"]="1400101"
+	},
+	[2300201]={
+		["type"]=12,
+		["parameter"]=2300201,
+		["qlt"]=2,
+		["icon"]="2300201"
+	},
+	[4400201]={
+		["type"]=12,
+		["parameter"]=4400201,
+		["qlt"]=4,
+		["icon"]="4400201"
+	},
+	[5400401]={
+		["type"]=12,
+		["parameter"]=5400401,
+		["qlt"]=4,
+		["icon"]="5400401"
+	},
+	[2400101]={
+		["type"]=12,
+		["parameter"]=2400101,
+		["qlt"]=3,
+		["icon"]="2400101"
+	},
+	[4400101]={
+		["type"]=12,
+		["parameter"]=4400101,
+		["qlt"]=3,
+		["icon"]="4400101"
+	},
+	[5400301]={
+		["type"]=12,
+		["parameter"]=5400301,
+		["qlt"]=3,
+		["icon"]="5400301"
+	},
+	[5400201]={
+		["type"]=12,
+		["parameter"]=5400201,
+		["qlt"]=3,
+		["icon"]="5400201"
 	}
 }
 local config = {
-data=item,count=112
+data=item,count=144
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -429,7 +429,6 @@ local LocalizationGlobalConst =
 	SKIN_LIST = "SKIN_LIST",
 	BTN_LOCKED = "BTN_LOCKED",
 	SKIN_GOT_1 = "SKIN_GOT_1",
-	SKIN_GOT_2 = "SKIN_GOT_2",
 	SKIN_GOT_TIPS = "SKIN_GOT_TIPS",
 	GOTO_COIN_STORE_DESC = "GOTO_COIN_STORE_DESC",
 	HERO_DESC_12 = "HERO_DESC_12",
@@ -461,11 +460,181 @@ local LocalizationGlobalConst =
 	ARENA_DESC_40 = "ARENA_DESC_40",
 	ARENA_DESC_41 = "ARENA_DESC_41",
 	ARENA_DESC_42 = "ARENA_DESC_42",
-	EQUIP_DESC_26 = "EQUIP_DESC_26",
 	EQUIP_DESC_27 = "EQUIP_DESC_27",
+	EQUIP_DESC_28 = "EQUIP_DESC_28",
 	SEIZED_DESC_1 = "SEIZED_DESC_1",
 	SEIZED_DESC_2 = "SEIZED_DESC_2",
 	SEIZED_DESC_3 = "SEIZED_DESC_3",
+	ACT_FOURTEEN_TITLE_1 = "ACT_FOURTEEN_TITLE_1",
+	ACT_FOURTEEN_TITLE_2 = "ACT_FOURTEEN_TITLE_2",
+	ACT_FOURTEEN_TITLE_3 = "ACT_FOURTEEN_TITLE_3",
+	ACT_FOURTEEN_TITLE_4 = "ACT_FOURTEEN_TITLE_4",
+	ACT_FOURTEEN_DESC_1 = "ACT_FOURTEEN_DESC_1",
+	ACT_FOURTEEN_DESC_2 = "ACT_FOURTEEN_DESC_2",
+	ACT_FOURTEEN_DESC_3 = "ACT_FOURTEEN_DESC_3",
+	ACT_FOURTEEN_DESC_5 = "ACT_FOURTEEN_DESC_5",
+	ACT_FOURTEEN_DESC_6 = "ACT_FOURTEEN_DESC_6",
+	ACT_FOURTEEN_DESC_7 = "ACT_FOURTEEN_DESC_7",
+	ACT_FOURTEEN_DESC_8 = "ACT_FOURTEEN_DESC_8",
+	ACT_FOURTEEN_DESC_9 = "ACT_FOURTEEN_DESC_9",
+	ACT_BOSS_RUSH_DESC_1 = "ACT_BOSS_RUSH_DESC_1",
+	ACT_BOSS_RUSH_DESC_2 = "ACT_BOSS_RUSH_DESC_2",
+	ACT_BOSS_RUSH_DESC_3 = "ACT_BOSS_RUSH_DESC_3",
+	ACT_BOSS_RUSH_DESC_4 = "ACT_BOSS_RUSH_DESC_4",
+	ACT_BOSS_RUSH_DESC_5 = "ACT_BOSS_RUSH_DESC_5",
+	ACT_BOSS_RUSH_DESC_6 = "ACT_BOSS_RUSH_DESC_6",
+	ACT_BOSS_RUSH_DESC_7 = "ACT_BOSS_RUSH_DESC_7",
+	ACT_BOSS_RUSH_DESC_8 = "ACT_BOSS_RUSH_DESC_8",
+	ACT_BOSS_RUSH_DESC_9 = "ACT_BOSS_RUSH_DESC_9",
+	ACT_BOSS_RUSH_DESC_10 = "ACT_BOSS_RUSH_DESC_10",
+	ACT_BOSS_RUSH_DESC_11 = "ACT_BOSS_RUSH_DESC_11",
+	ACT_BOSS_RUSH_DESC_12 = "ACT_BOSS_RUSH_DESC_12",
+	ACT_BOSS_RUSH_DESC_13 = "ACT_BOSS_RUSH_DESC_13",
+	ACT_BOSS_RUSH_DESC_14 = "ACT_BOSS_RUSH_DESC_14",
+	ACT_BOSS_RUSH_DESC_15 = "ACT_BOSS_RUSH_DESC_15",
+	ACT_BOSS_RUSH_DESC_16 = "ACT_BOSS_RUSH_DESC_16",
+	ACT_BOSS_RUSH_DESC_17 = "ACT_BOSS_RUSH_DESC_17",
+	ACT_BOSS_RUSH_DESC_18 = "ACT_BOSS_RUSH_DESC_18",
+	ACT_BOSS_RUSH_DESC_19 = "ACT_BOSS_RUSH_DESC_19",
+	ACT_BOSS_RUSH_DESC_20 = "ACT_BOSS_RUSH_DESC_20",
+	ACT_BOSS_RUSH_DESC_21 = "ACT_BOSS_RUSH_DESC_21",
+	ACT_BOSS_RUSH_DESC_22 = "ACT_BOSS_RUSH_DESC_22",
+	ACT_BOSS_RUSH_DESC_23 = "ACT_BOSS_RUSH_DESC_23",
+	ACT_BOSS_RUSH_DESC_24 = "ACT_BOSS_RUSH_DESC_24",
+	ACT_BOSS_RUSH_DESC_25 = "ACT_BOSS_RUSH_DESC_25",
+	ACT_BOSS_RUSH_DESC_26 = "ACT_BOSS_RUSH_DESC_26",
+	ACT_BOSS_RUSH_DESC_27 = "ACT_BOSS_RUSH_DESC_27",
+	ACT_BOSS_RUSH_DESC_28 = "ACT_BOSS_RUSH_DESC_28",
+	ACT_BOSS_RUSH_DESC_29 = "ACT_BOSS_RUSH_DESC_29",
+	ACT_BOSS_RUSH_DESC_30 = "ACT_BOSS_RUSH_DESC_30",
+	ACT_BOSS_RUSH_DESC_31 = "ACT_BOSS_RUSH_DESC_31",
+	ACT_BOSS_RUSH_DESC_32 = "ACT_BOSS_RUSH_DESC_32",
+	ACT_BOSS_RUSH_DESC_33 = "ACT_BOSS_RUSH_DESC_33",
+	NOT_POP_TODAY = "NOT_POP_TODAY",
+	ACT_BOSS_RUSH_DESC_34 = "ACT_BOSS_RUSH_DESC_34",
+	DUNGEON_RUNE_TITLE = "DUNGEON_RUNE_TITLE",
+	DUNGEON_RUNE_DESC = "DUNGEON_RUNE_DESC",
+	DUNGEON_RUNE_HELP = "DUNGEON_RUNE_HELP",
+	DUNGEON_RUNE_QUEST_1 = "DUNGEON_RUNE_QUEST_1",
+	DUNGEON_RUNE_QUEST_2 = "DUNGEON_RUNE_QUEST_2",
+	DUNGEON_RUNE_QUEST_3 = "DUNGEON_RUNE_QUEST_3",
+	DUNGEON_RUNE_QUEST_4 = "DUNGEON_RUNE_QUEST_4",
+	DUNGEON_RUNE_TIP_2 = "DUNGEON_RUNE_TIP_2",
+	DUNGEON_RUNE_TIP_3 = "DUNGEON_RUNE_TIP_3",
+	DUNGEON_RUNE_TIP_4 = "DUNGEON_RUNE_TIP_4",
+	DUNGEON_RUNE_TIP_5 = "DUNGEON_RUNE_TIP_5",
+	DUNGEON_RUNE_TIP_6 = "DUNGEON_RUNE_TIP_6",
+	UNFINISHED = "UNFINISHED",
+	RUNES_DESC_1 = "RUNES_DESC_1",
+	RUNES_DESC_2 = "RUNES_DESC_2",
+	RUNES_DESC_3 = "RUNES_DESC_3",
+	RUNES_DESC_4 = "RUNES_DESC_4",
+	RUNES_DESC_5 = "RUNES_DESC_5",
+	RUNES_DESC_6 = "RUNES_DESC_6",
+	RUNES_DESC_7 = "RUNES_DESC_7",
+	RUNES_DESC_8 = "RUNES_DESC_8",
+	RUNES_DESC_9 = "RUNES_DESC_9",
+	RUNES_DESC_10 = "RUNES_DESC_10",
+	RUNES_DESC_11 = "RUNES_DESC_11",
+	RUNES_DESC_12 = "RUNES_DESC_12",
+	RUNES_DESC_13 = "RUNES_DESC_13",
+	RUNES_DESC_14 = "RUNES_DESC_14",
+	RUNES_DESC_15 = "RUNES_DESC_15",
+	RUNES_DESC_16 = "RUNES_DESC_16",
+	RUNES_DESC_17 = "RUNES_DESC_17",
+	RUNES_DESC_18 = "RUNES_DESC_18",
+	RUNES_DESC_19 = "RUNES_DESC_19",
+	RUNES_DESC_20 = "RUNES_DESC_20",
+	RUNES_DESC_21 = "RUNES_DESC_21",
+	RUNES_DESC_22 = "RUNES_DESC_22",
+	RUNES_DESC_23 = "RUNES_DESC_23",
+	RUNES_DESC_24 = "RUNES_DESC_24",
+	RUNES_DESC_25 = "RUNES_DESC_25",
+	RUNES_DESC_26 = "RUNES_DESC_26",
+	RUNES_DESC_27 = "RUNES_DESC_27",
+	RUNES_DESC_28 = "RUNES_DESC_28",
+	RUNES_DESC_29 = "RUNES_DESC_29",
+	RUNES_DESC_30 = "RUNES_DESC_30",
+	DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1",
+	DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2",
+	DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3",
+	DUNGEON_RUNE_DESC_4 = "DUNGEON_RUNE_DESC_4",
+	DUNGEON_RUNE_DESC_5 = "DUNGEON_RUNE_DESC_5",
+	DUNGEON_RUNE_DESC_6 = "DUNGEON_RUNE_DESC_6",
+	DUNGEON_RUNE_DESC_7 = "DUNGEON_RUNE_DESC_7",
+	DUNGEON_RUNE_DESC_8 = "DUNGEON_RUNE_DESC_8",
+	DUNGEON_RUNE_DESC_9 = "DUNGEON_RUNE_DESC_9",
+	DUNGEON_RUNE_DESC_10 = "DUNGEON_RUNE_DESC_10",
+	DUNGEON_RUNE_DESC_11 = "DUNGEON_RUNE_DESC_11",
+	ACTIVITY_MOON_DESC_1 = "ACTIVITY_MOON_DESC_1",
+	ACTIVITY_MOON_DESC_2 = "ACTIVITY_MOON_DESC_2",
+	ACTIVITY_MOON_DESC_3 = "ACTIVITY_MOON_DESC_3",
+	ACTIVITY_MOON_DESC_4 = "ACTIVITY_MOON_DESC_4",
+	ACTIVITY_MOON_DESC_5 = "ACTIVITY_MOON_DESC_5",
+	ACTIVITY_MOON_DESC_6 = "ACTIVITY_MOON_DESC_6",
+	ACTIVITY_MOON_DESC_7 = "ACTIVITY_MOON_DESC_7",
+	ACTIVITY_MOON_DESC_8 = "ACTIVITY_MOON_DESC_8",
+	ACTIVITY_MOON_DESC_9 = "ACTIVITY_MOON_DESC_9",
+	ACTIVITY_MOON_DESC_10 = "ACTIVITY_MOON_DESC_10",
+	ACTIVITY_MOON_DESC_11 = "ACTIVITY_MOON_DESC_11",
+	ACTIVITY_MOON_DESC_12 = "ACTIVITY_MOON_DESC_12",
+	SEIZED_DESC_4 = "SEIZED_DESC_4",
+	ACT_PVP_DESC_1 = "ACT_PVP_DESC_1",
+	ACT_PVP_DESC_2 = "ACT_PVP_DESC_2",
+	ACT_PVP_DESC_3 = "ACT_PVP_DESC_3",
+	ACT_PVP_DESC_4 = "ACT_PVP_DESC_4",
+	ACT_PVP_DESC_5 = "ACT_PVP_DESC_5",
+	ACT_PVP_DESC_6 = "ACT_PVP_DESC_6",
+	ACT_PVP_DESC_7 = "ACT_PVP_DESC_7",
+	ACT_PVP_DESC_8 = "ACT_PVP_DESC_8",
+	ACT_PVP_DESC_9 = "ACT_PVP_DESC_9",
+	ACT_PVP_DESC_10 = "ACT_PVP_DESC_10",
+	ACT_PVP_DESC_11 = "ACT_PVP_DESC_11",
+	ACT_PVP_DESC_12 = "ACT_PVP_DESC_12",
+	ACT_PVP_DESC_13 = "ACT_PVP_DESC_13",
+	ACT_PVP_DESC_14 = "ACT_PVP_DESC_14",
+	ACT_PVP_DESC_15 = "ACT_PVP_DESC_15",
+	ACT_PVP_DESC_16 = "ACT_PVP_DESC_16",
+	ACT_PVP_DESC_17 = "ACT_PVP_DESC_17",
+	ACT_PVP_DESC_18 = "ACT_PVP_DESC_18",
+	ACT_PVP_DESC_19 = "ACT_PVP_DESC_19",
+	ACT_PVP_DESC_20 = "ACT_PVP_DESC_20",
+	ACT_PVP_DESC_21 = "ACT_PVP_DESC_21",
+	ACT_PVP_DESC_22 = "ACT_PVP_DESC_22",
+	ACT_PVP_DESC_23 = "ACT_PVP_DESC_23",
+	ACT_PVP_TALK_DESC_1 = "ACT_PVP_TALK_DESC_1",
+	ACT_PVP_TALK_DESC_2 = "ACT_PVP_TALK_DESC_2",
+	ACT_PVP_TALK_DESC_3 = "ACT_PVP_TALK_DESC_3",
+	ACT_PVP_TALK_DESC_4 = "ACT_PVP_TALK_DESC_4",
+	ACT_PVP_TALK_DESC_5 = "ACT_PVP_TALK_DESC_5",
+	ACT_PVP_TALK_DESC_6 = "ACT_PVP_TALK_DESC_6",
+	ACT_PVP_TALK_DESC_7 = "ACT_PVP_TALK_DESC_7",
+	ACT_PVP_TALK_DESC_8 = "ACT_PVP_TALK_DESC_8",
+	ACT_PVP_TALK_DESC_9 = "ACT_PVP_TALK_DESC_9",
+	ACT_PVP_DESC_24 = "ACT_PVP_DESC_24",
+	RUNES_QLT_1 = "RUNES_QLT_1",
+	RUNES_QLT_2 = "RUNES_QLT_2",
+	RUNES_QLT_3 = "RUNES_QLT_3",
+	RUNES_QLT_4 = "RUNES_QLT_4",
+	RUNES_QLT_5 = "RUNES_QLT_5",
+	RUNES_QLT_6 = "RUNES_QLT_6",
+	RUNES_QLT_7 = "RUNES_QLT_7",
+	RUNES_QLT_8 = "RUNES_QLT_8",
+	ACT_TOURN_WAVE_TITLE = "ACT_TOURN_WAVE_TITLE",
+	ACT_TOURN_WAVE_DESC_1 = "ACT_TOURN_WAVE_DESC_1",
+	ACT_TOURN_WAVE_DESC_2 = "ACT_TOURN_WAVE_DESC_2",
+	ACT_TOURN_WAVE_DESC_3 = "ACT_TOURN_WAVE_DESC_3",
+	ACT_TOURN_WAVE_HELP_1 = "ACT_TOURN_WAVE_HELP_1",
+	ACT_TOURN_WAVE_HELP_2 = "ACT_TOURN_WAVE_HELP_2",
+	ACT_TOURN_WAVE_BTN_1 = "ACT_TOURN_WAVE_BTN_1",
+	ACT_TOURN_WAVE_BTN_2 = "ACT_TOURN_WAVE_BTN_2",
+	ACT_TOURN_WAVE_BTN_3 = "ACT_TOURN_WAVE_BTN_3",
+	ACT_TOURN_ARENEA_TITLE = "ACT_TOURN_ARENEA_TITLE",
+	ACT_TOURN_ARENEA_DESC_1 = "ACT_TOURN_ARENEA_DESC_1",
+	ACT_TOURN_ARENEA_HELP_1 = "ACT_TOURN_ARENEA_HELP_1",
+	ACT_TOURN_ARENEA_HELP_2 = "ACT_TOURN_ARENEA_HELP_2",
+	ACT_TOURN_WAVE_DESC_4 = "ACT_TOURN_WAVE_DESC_4",
+	EVENT_COUNTDOWN = "EVENT_COUNTDOWN",
 }
 
 return LocalizationGlobalConst

lua/app/config/monster_activity.lua

@@ -0,0 +1,812 @@
+local monster_activity = {
+	[104]={
+		["monster_base"]=20001,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			10020
+		},
+		["monster_exp"]=15000
+	},
+	[204]={
+		["monster_base"]=20002,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30004,
+			30005,
+			30006
+		},
+		["skill"]={
+			10019
+		},
+		["monster_exp"]=15000
+	},
+	[304]={
+		["monster_base"]=20004,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30010,
+			30011,
+			30012
+		},
+		["skill"]={
+			10015
+		},
+		["monster_exp"]=15000
+	},
+	[404]={
+		["monster_base"]=20006,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30016,
+			30017,
+			30018
+		},
+		["skill"]={
+			10033
+		},
+		["passive_skill"]={
+			10010
+		},
+		["monster_exp"]=15000
+	},
+	[504]={
+		["monster_base"]=20007,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30019,
+			30020,
+			30021
+		},
+		["skill"]={
+			10060
+		},
+		["passive_skill"]={
+			10061
+		},
+		["monster_exp"]=15000
+	},
+	[604]={
+		["monster_base"]=20008,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30022,
+			30023,
+			30024
+		},
+		["skill"]={
+			10032
+		},
+		["passive_skill"]={
+			10009
+		},
+		["monster_exp"]=15000
+	},
+	[704]={
+		["monster_base"]=20012,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
+		},
+		["monster_exp"]=15000
+	},
+	[804]={
+		["monster_base"]=20014,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30040,
+			30041,
+			30042
+		},
+		["skill"]={
+			10016
+		},
+		["monster_exp"]=15000
+	},
+	[904]={
+		["monster_base"]=20015,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10070
+		},
+		["passive_skill"]={
+			10008
+		},
+		["monster_exp"]=15000
+	},
+	[1004]={
+		["monster_base"]=20023,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30067,
+			30068,
+			30069
+		},
+		["skill"]={
+			10063
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[1104]={
+		["monster_base"]=20009,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30025,
+			30026,
+			30027
+		},
+		["skill"]={
+			10039
+		},
+		["passive_skill"]={
+			10010,
+			10011
+		},
+		["monster_exp"]=15000
+	},
+	[1204]={
+		["monster_base"]=20011,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30031,
+			30032,
+			30033
+		},
+		["skill"]={
+			10018
+		},
+		["monster_exp"]=15000
+	},
+	[1304]={
+		["monster_base"]=20017,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30049,
+			30050,
+			30051
+		},
+		["skill"]={
+			10027
+		},
+		["monster_exp"]=15000
+	},
+	[1404]={
+		["monster_base"]=20019,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30055,
+			30056,
+			30057
+		},
+		["skill"]={
+			10045
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[1504]={
+		["monster_base"]=20022,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30064,
+			30065,
+			30066
+		},
+		["skill"]={
+			10023
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[1604]={
+		["monster_base"]=20026,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30076,
+			30077,
+			30078
+		},
+		["skill"]={
+			10064
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[1704]={
+		["monster_base"]=20028,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30162,
+			30163,
+			30164
+		},
+		["skill"]={
+			10142
+		},
+		["passive_skill"]={
+			10011
+		},
+		["monster_exp"]=15000
+	},
+	[1804]={
+		["monster_base"]=20029,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30085,
+			30086,
+			30087
+		},
+		["skill"]={
+			10065
+		},
+		["monster_exp"]=15000
+	},
+	[1904]={
+		["monster_base"]=20010,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30028,
+			30029,
+			30030
+		},
+		["skill"]={
+			10041,
+			10066
+		},
+		["passive_skill"]={
+			10008,
+			10009,
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[2004]={
+		["monster_base"]=20016,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30046,
+			30047,
+			30048
+		},
+		["skill"]={
+			10036
+		},
+		["passive_skill"]={
+			10010,
+			10011
+		},
+		["monster_exp"]=15000
+	},
+	[2104]={
+		["monster_base"]=20018,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30052,
+			30053,
+			30054
+		},
+		["skill"]={
+			10051
+		},
+		["passive_skill"]={
+			10011,
+			10012
+		},
+		["monster_exp"]=15000
+	},
+	[2204]={
+		["monster_base"]=20021,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30061,
+			30062,
+			30063
+		},
+		["skill"]={
+			10034
+		},
+		["passive_skill"]={
+			10011,
+			10008
+		},
+		["monster_exp"]=15000
+	},
+	[2304]={
+		["monster_base"]=20025,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30073,
+			30074,
+			30075
+		},
+		["skill"]={
+			10062
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[2404]={
+		["monster_base"]=20027,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30079,
+			30080,
+			30081
+		},
+		["skill"]={
+			10082
+		},
+		["monster_exp"]=15000
+	},
+	[2504]={
+		["monster_base"]=20035,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30100,
+			30101,
+			30102,
+			30113
+		},
+		["skill"]={
+			10076
+		},
+		["passive_skill"]={
+			10011,
+			10009
+		},
+		["monster_exp"]=15000
+	},
+	[2604]={
+		["monster_base"]=20036,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30103,
+			30104,
+			30105
+		},
+		["skill"]={
+			10077,
+			10078
+		},
+		["passive_skill"]={
+			10011
+		},
+		["monster_exp"]=15000
+	},
+	[2704]={
+		["monster_base"]=20044,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30147,
+			30148,
+			30149
+		},
+		["skill"]={
+			10130,
+			10131
+		},
+		["passive_skill"]={
+			10132,
+			10013,
+			10011
+		},
+		["monster_exp"]=15000
+	},
+	[2804]={
+		["monster_base"]=20003,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30007,
+			30008,
+			30009
+		},
+		["skill"]={
+			10029
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[2904]={
+		["monster_base"]=20005,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
+		},
+		["passive_skill"]={
+			10012
+		},
+		["monster_exp"]=15000
+	},
+	[3004]={
+		["monster_base"]=20020,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30058,
+			30059,
+			30060
+		},
+		["skill"]={
+			10047
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[3104]={
+		["monster_base"]=20030,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30088,
+			30089,
+			30090
+		},
+		["skill"]={
+			10056,
+			10057
+		},
+		["passive_skill"]={
+			10014
+		},
+		["monster_exp"]=15000
+	},
+	[3204]={
+		["monster_base"]=20034,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30097,
+			30098,
+			30099
+		},
+		["skill"]={
+			10074,
+			10075
+		},
+		["passive_skill"]={
+			10013,
+			10012
+		},
+		["monster_exp"]=15000
+	},
+	[3304]={
+		["monster_base"]=20037,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30106,
+			30107,
+			30108
+		},
+		["skill"]={
+			10079
+		},
+		["passive_skill"]={
+			10013,
+			10009,
+			10084
+		},
+		["monster_exp"]=15000
+	},
+	[3404]={
+		["monster_base"]=20045,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30150,
+			30151,
+			30152
+		},
+		["skill"]={
+			10133,
+			10134
+		},
+		["passive_skill"]={
+			10012
+		},
+		["monster_exp"]=15000
+	},
+	[3504]={
+		["monster_base"]=20046,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30153,
+			30154,
+			30155
+		},
+		["skill"]={
+			10135,
+			10136
+		},
+		["passive_skill"]={
+			10012
+		},
+		["monster_exp"]=15000
+	},
+	[3604]={
+		["monster_base"]=20013,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30037,
+			30038,
+			30039
+		},
+		["skill"]={
+			10049,
+			10050
+		},
+		["monster_exp"]=15000
+	},
+	[3704]={
+		["monster_base"]=20024,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30070,
+			30071,
+			30072
+		},
+		["skill"]={
+			10043,
+			10044
+		},
+		["passive_skill"]={
+			10012
+		},
+		["monster_exp"]=15000
+	},
+	[3804]={
+		["monster_base"]=20031,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30091,
+			30092,
+			30093
+		},
+		["skill"]={
+			10058,
+			10059
+		},
+		["passive_skill"]={
+			10008,
+			10011,
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[3904]={
+		["monster_base"]=20032,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30094,
+			30095,
+			30096
+		},
+		["skill"]={
+			10052,
+			10053,
+			10054
+		},
+		["passive_skill"]={
+			10008,
+			10010,
+			10013
+		},
+		["monster_exp"]=15000
+	},
+	[4004]={
+		["monster_base"]=20038,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30109,
+			30110,
+			30111,
+			30112
+		},
+		["skill"]={
+			10080,
+			10081
+		},
+		["passive_skill"]={
+			10083,
+			10009,
+			10011
+		},
+		["monster_exp"]=15000
+	},
+	[4104]={
+		["monster_base"]=20047,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30156,
+			30157,
+			30158
+		},
+		["skill"]={
+			10137,
+			10138
+		},
+		["passive_skill"]={
+			10013,
+			10010
+		},
+		["monster_exp"]=15000
+	},
+	[4204]={
+		["monster_base"]=20048,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30159,
+			30160,
+			30161
+		},
+		["skill"]={
+			10139,
+			10140
+		},
+		["passive_skill"]={
+			10141,
+			10014,
+			10009
+		},
+		["monster_exp"]=15000
+	},
+	[10004]={
+		["monster_base"]=30043,
+		["is_boss"]=1,
+		["hp"]=122725000,
+		["atk"]=455000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			50138,
+			50139,
+			50140,
+			50141
+		},
+		["skill"]={
+			50142,
+			50143
+		},
+		["monster_exp"]=350000
+	},
+	[10104]={
+		["monster_base"]=30044,
+		["is_boss"]=1,
+		["hp"]=122725000,
+		["atk"]=455000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			50144,
+			50145,
+			50146,
+			50147
+		},
+		["skill"]={
+			50148
+		},
+		["monster_exp"]=350000
+	}
+}
+local config = {
+data=monster_activity,count=44
+}
+return config

lua/app/config/monster_activity.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 228b857e2abcb754185db1ca23e6184e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/monster_base.lua

@@ -619,6 +619,56 @@ local monster_base = {
 		["body"]=1,
 		["model_ui"]=1.0
 	},
+	[20049]={
+		["model_id"]="m20049",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20050]={
+		["model_id"]="m20050",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20051]={
+		["model_id"]="m20051",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20052]={
+		["model_id"]="m20052",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20053]={
+		["model_id"]="m20053",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20054]={
+		["model_id"]="m20054",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20055]={
+		["model_id"]="m20055",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20056]={
+		["model_id"]="m20056",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20057]={
+		["model_id"]="m20057",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20058]={
+		["model_id"]="m20058",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
 	[30001]={
 		["model_id"]="p0001",
 		["body"]=2,
@@ -743,9 +793,19 @@ local monster_base = {
 		["model_id"]="p0026",
 		["body"]=2,
 		["model_ui"]=1.0
+	},
+	[30043]={
+		["model_id"]="p0043",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[30044]={
+		["model_id"]="p0044",
+		["body"]=2,
+		["model_ui"]=1.0
 	}
 }
 local config = {
-data=monster_base,count=149
+data=monster_base,count=161
 }
 return config

lua/app/config/monster_dungeon_equip.lua

@@ -82,8 +82,8 @@ local monster_dungeon_equip = {
 	},
 	[606]={
 		["monster_base"]=10060,
-		["hp"]=90860000,
+		["hp"]=94380000,
-		["atk"]=1540000,
+		["atk"]=1590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20175,
@@ -97,8 +97,8 @@ local monster_dungeon_equip = {
 	},
 	[706]={
 		["monster_base"]=10055,
-		["hp"]=110400000,
+		["hp"]=114720000,
-		["atk"]=2150000,
+		["atk"]=2220000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20160,
@@ -112,8 +112,8 @@ local monster_dungeon_equip = {
 	},
 	[806]={
 		["monster_base"]=10027,
-		["hp"]=198820000,
+		["hp"]=206450000,
-		["atk"]=2380000,
+		["atk"]=2450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20076,
@@ -127,8 +127,8 @@ local monster_dungeon_equip = {
 	},
 	[906]={
 		["monster_base"]=10064,
-		["hp"]=264180000,
+		["hp"]=274400000,
-		["atk"]=2470000,
+		["atk"]=2540000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20190,
@@ -143,8 +143,8 @@ local monster_dungeon_equip = {
 	[1006]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=480480000,
+		["hp"]=499100000,
-		["atk"]=2520000,
+		["atk"]=2590000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30114,
@@ -162,8 +162,8 @@ local monster_dungeon_equip = {
 	},
 	[1106]={
 		["monster_base"]=10015,
-		["hp"]=98780000,
+		["hp"]=105820000,
-		["atk"]=1680000,
+		["atk"]=1760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20040,
@@ -177,8 +177,8 @@ local monster_dungeon_equip = {
 	},
 	[1206]={
 		["monster_base"]=10025,
-		["hp"]=119880000,
+		["hp"]=128400000,
-		["atk"]=2340000,
+		["atk"]=2470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20070,
@@ -192,8 +192,8 @@ local monster_dungeon_equip = {
 	},
 	[1306]={
 		["monster_base"]=10030,
-		["hp"]=215800000,
+		["hp"]=231080000,
-		["atk"]=2590000,
+		["atk"]=2720000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -207,8 +207,8 @@ local monster_dungeon_equip = {
 	},
 	[1406]={
 		["monster_base"]=10018,
-		["hp"]=286720000,
+		["hp"]=307160000,
-		["atk"]=2690000,
+		["atk"]=2820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20049,
@@ -223,8 +223,8 @@ local monster_dungeon_equip = {
 	[1506]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=521500000,
+		["hp"]=558600000,
-		["atk"]=2740000,
+		["atk"]=2880000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30117,
@@ -242,8 +242,8 @@ local monster_dungeon_equip = {
 	},
 	[1606]={
 		["monster_base"]=10004,
-		["hp"]=118220000,
+		["hp"]=154330000,
-		["atk"]=2020000,
+		["atk"]=2400000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20010,
@@ -257,8 +257,8 @@ local monster_dungeon_equip = {
 	},
 	[1706]={
 		["monster_base"]=10049,
-		["hp"]=143890000,
+		["hp"]=187610000,
-		["atk"]=2820000,
+		["atk"]=3340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -272,8 +272,8 @@ local monster_dungeon_equip = {
 	},
 	[1806]={
 		["monster_base"]=10037,
-		["hp"]=259680000,
+		["hp"]=338400000,
-		["atk"]=3120000,
+		["atk"]=3690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20106,
@@ -287,8 +287,8 @@ local monster_dungeon_equip = {
 	},
 	[1906]={
 		["monster_base"]=10016,
-		["hp"]=351150000,
+		["hp"]=457950000,
-		["atk"]=3240000,
+		["atk"]=3830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20043,
@@ -303,8 +303,8 @@ local monster_dungeon_equip = {
 	[2006]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=638400000,
+		["hp"]=832350000,
-		["atk"]=3310000,
+		["atk"]=3910000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -323,8 +323,8 @@ local monster_dungeon_equip = {
 	},
 	[2106]={
 		["monster_base"]=10022,
-		["hp"]=126040000,
+		["hp"]=196880000,
-		["atk"]=2180000,
+		["atk"]=2930000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -338,8 +338,8 @@ local monster_dungeon_equip = {
 	},
 	[2206]={
 		["monster_base"]=10032,
-		["hp"]=153470000,
+		["hp"]=239400000,
-		["atk"]=3010000,
+		["atk"]=4070000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -353,8 +353,8 @@ local monster_dungeon_equip = {
 	},
 	[2306]={
 		["monster_base"]=10013,
-		["hp"]=276960000,
+		["hp"]=431760000,
-		["atk"]=3330000,
+		["atk"]=4470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -368,8 +368,8 @@ local monster_dungeon_equip = {
 	},
 	[2406]={
 		["monster_base"]=10001,
-		["hp"]=374550000,
+		["hp"]=584100000,
-		["atk"]=3480000,
+		["atk"]=4650000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20001,
@@ -384,8 +384,8 @@ local monster_dungeon_equip = {
 	[2506]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=680700000,
+		["hp"]=1061700000,
-		["atk"]=3540000,
+		["atk"]=4740000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30123,
@@ -403,8 +403,8 @@ local monster_dungeon_equip = {
 	},
 	[2606]={
 		["monster_base"]=10045,
-		["hp"]=140300000,
+		["hp"]=246750000,
-		["atk"]=2400000,
+		["atk"]=3430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -418,8 +418,8 @@ local monster_dungeon_equip = {
 	},
 	[2706]={
 		["monster_base"]=10056,
-		["hp"]=169470000,
+		["hp"]=298240000,
-		["atk"]=3320000,
+		["atk"]=4760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20163,
@@ -433,8 +433,8 @@ local monster_dungeon_equip = {
 	},
 	[2806]={
 		["monster_base"]=10003,
-		["hp"]=306100000,
+		["hp"]=538140000,
-		["atk"]=3660000,
+		["atk"]=5240000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20007,
@@ -448,8 +448,8 @@ local monster_dungeon_equip = {
 	},
 	[2906]={
 		["monster_base"]=10028,
-		["hp"]=415400000,
+		["hp"]=730420000,
-		["atk"]=3830000,
+		["atk"]=5440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -464,8 +464,8 @@ local monster_dungeon_equip = {
 	[3006]={
 		["monster_base"]=20041,
 		["is_boss"]=2,
-		["hp"]=754750000,
+		["hp"]=1327580000,
-		["atk"]=3970000,
+		["atk"]=5640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30126,
@@ -484,8 +484,8 @@ local monster_dungeon_equip = {
 	},
 	[3106]={
 		["monster_base"]=10052,
-		["hp"]=153460000,
+		["hp"]=308790000,
-		["atk"]=2630000,
+		["atk"]=4340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -499,8 +499,8 @@ local monster_dungeon_equip = {
 	},
 	[3206]={
 		["monster_base"]=10062,
-		["hp"]=185090000,
+		["hp"]=372990000,
-		["atk"]=3630000,
+		["atk"]=6030000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20181,
@@ -514,8 +514,8 @@ local monster_dungeon_equip = {
 	},
 	[3306]={
 		["monster_base"]=10036,
-		["hp"]=334280000,
+		["hp"]=672950000,
-		["atk"]=4000000,
+		["atk"]=6630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20103,
@@ -529,8 +529,8 @@ local monster_dungeon_equip = {
 	},
 	[3406]={
 		["monster_base"]=10061,
-		["hp"]=453650000,
+		["hp"]=913410000,
-		["atk"]=4190000,
+		["atk"]=6880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20178,
@@ -545,8 +545,8 @@ local monster_dungeon_equip = {
 	[3506]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=824060000,
+		["hp"]=1659900000,
-		["atk"]=4350000,
+		["atk"]=7140000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30129,
@@ -564,8 +564,8 @@ local monster_dungeon_equip = {
 	},
 	[3606]={
 		["monster_base"]=10030,
-		["hp"]=163330000,
+		["hp"]=347800000,
-		["atk"]=2810000,
+		["atk"]=5130000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -579,8 +579,8 @@ local monster_dungeon_equip = {
 	},
 	[3706]={
 		["monster_base"]=10015,
-		["hp"]=196740000,
+		["hp"]=419970000,
-		["atk"]=3870000,
+		["atk"]=7120000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20040,
@@ -594,8 +594,8 @@ local monster_dungeon_equip = {
 	},
 	[3806]={
 		["monster_base"]=10025,
-		["hp"]=355260000,
+		["hp"]=757380000,
-		["atk"]=4250000,
+		["atk"]=7820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20070,
@@ -609,8 +609,8 @@ local monster_dungeon_equip = {
 	},
 	[3906]={
 		["monster_base"]=10034,
-		["hp"]=481950000,
+		["hp"]=1028010000,
-		["atk"]=4460000,
+		["atk"]=8120000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -625,8 +625,8 @@ local monster_dungeon_equip = {
 	[4006]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=875620000,
+		["hp"]=1868130000,
-		["atk"]=4630000,
+		["atk"]=8430000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30117,
@@ -644,8 +644,8 @@ local monster_dungeon_equip = {
 	},
 	[4106]={
 		["monster_base"]=10054,
-		["hp"]=177360000,
+		["hp"]=403680000,
-		["atk"]=3070000,
+		["atk"]=6360000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -659,8 +659,8 @@ local monster_dungeon_equip = {
 	},
 	[4206]={
 		["monster_base"]=10037,
-		["hp"]=215560000,
+		["hp"]=492100000,
-		["atk"]=4230000,
+		["atk"]=8810000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20106,
@@ -674,8 +674,8 @@ local monster_dungeon_equip = {
 	},
 	[4306]={
 		["monster_base"]=10012,
-		["hp"]=386500000,
+		["hp"]=881630000,
-		["atk"]=4650000,
+		["atk"]=9690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -689,8 +689,8 @@ local monster_dungeon_equip = {
 	},
 	[4406]={
 		["monster_base"]=10049,
-		["hp"]=521660000,
+		["hp"]=1190900000,
-		["atk"]=4870000,
+		["atk"]=10070000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -705,8 +705,8 @@ local monster_dungeon_equip = {
 	[4506]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=947700000,
+		["hp"]=2163880000,
-		["atk"]=5140000,
+		["atk"]=10630000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -725,8 +725,8 @@ local monster_dungeon_equip = {
 	},
 	[4606]={
 		["monster_base"]=10042,
-		["hp"]=187920000,
+		["hp"]=446640000,
-		["atk"]=3250000,
+		["atk"]=6980000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20121,
@@ -740,8 +740,8 @@ local monster_dungeon_equip = {
 	},
 	[4706]={
 		["monster_base"]=10026,
-		["hp"]=228230000,
+		["hp"]=544500000,
-		["atk"]=4480000,
+		["atk"]=9680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -755,8 +755,8 @@ local monster_dungeon_equip = {
 	},
 	[4806]={
 		["monster_base"]=10019,
-		["hp"]=409000000,
+		["hp"]=975130000,
-		["atk"]=4940000,
+		["atk"]=10630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -770,8 +770,8 @@ local monster_dungeon_equip = {
 	},
 	[4906]={
 		["monster_base"]=10001,
-		["hp"]=551930000,
+		["hp"]=1317260000,
-		["atk"]=5160000,
+		["atk"]=11050000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20001,
@@ -786,8 +786,8 @@ local monster_dungeon_equip = {
 	[5006]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=1002610000,
+		["hp"]=2393200000,
-		["atk"]=5440000,
+		["atk"]=11660000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30132,
@@ -805,8 +805,8 @@ local monster_dungeon_equip = {
 	},
 	[5106]={
 		["monster_base"]=10045,
-		["hp"]=199440000,
+		["hp"]=516960000,
-		["atk"]=3450000,
+		["atk"]=7640000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -820,8 +820,8 @@ local monster_dungeon_equip = {
 	},
 	[5206]={
 		["monster_base"]=10056,
-		["hp"]=242090000,
+		["hp"]=629900000,
-		["atk"]=4750000,
+		["atk"]=10600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20163,
@@ -835,8 +835,8 @@ local monster_dungeon_equip = {
 	},
 	[5306]={
 		["monster_base"]=10003,
-		["hp"]=433750000,
+		["hp"]=1127880000,
-		["atk"]=5240000,
+		["atk"]=11640000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20007,
@@ -850,8 +850,8 @@ local monster_dungeon_equip = {
 	},
 	[5406]={
 		["monster_base"]=10028,
-		["hp"]=585310000,
+		["hp"]=1523650000,
-		["atk"]=5480000,
+		["atk"]=12110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -866,8 +866,8 @@ local monster_dungeon_equip = {
 	[5506]={
 		["monster_base"]=20041,
 		["is_boss"]=2,
-		["hp"]=1063140000,
+		["hp"]=2767910000,
-		["atk"]=5780000,
+		["atk"]=12780000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30126,
@@ -886,8 +886,8 @@ local monster_dungeon_equip = {
 	},
 	[5606]={
 		["monster_base"]=10029,
-		["hp"]=221510000,
+		["hp"]=606820000,
-		["atk"]=4040000,
+		["atk"]=9410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -901,8 +901,8 @@ local monster_dungeon_equip = {
 	},
 	[5706]={
 		["monster_base"]=10055,
-		["hp"]=267580000,
+		["hp"]=736090000,
-		["atk"]=5560000,
+		["atk"]=13050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20160,
@@ -916,8 +916,8 @@ local monster_dungeon_equip = {
 	},
 	[5806]={
 		["monster_base"]=10051,
-		["hp"]=484180000,
+		["hp"]=1331090000,
-		["atk"]=6110000,
+		["atk"]=14280000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20148,
@@ -931,8 +931,8 @@ local monster_dungeon_equip = {
 	},
 	[5906]={
 		["monster_base"]=10064,
-		["hp"]=650420000,
+		["hp"]=1790220000,
-		["atk"]=6400000,
+		["atk"]=14840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20190,
@@ -947,8 +947,8 @@ local monster_dungeon_equip = {
 	[6006]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=1181290000,
+		["hp"]=3252120000,
-		["atk"]=6660000,
+		["atk"]=15460000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30135,
@@ -966,8 +966,8 @@ local monster_dungeon_equip = {
 	},
 	[6106]={
 		["monster_base"]=10015,
-		["hp"]=227560000,
+		["hp"]=667040000,
-		["atk"]=4160000,
+		["atk"]=9800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20040,
@@ -981,8 +981,8 @@ local monster_dungeon_equip = {
 	},
 	[6206]={
 		["monster_base"]=10025,
-		["hp"]=274900000,
+		["hp"]=809090000,
-		["atk"]=5710000,
+		["atk"]=13600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20070,
@@ -996,8 +996,8 @@ local monster_dungeon_equip = {
 	},
 	[6306]={
 		["monster_base"]=10021,
-		["hp"]=497380000,
+		["hp"]=1463090000,
-		["atk"]=6280000,
+		["atk"]=14870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -1011,8 +1011,8 @@ local monster_dungeon_equip = {
 	},
 	[6406]={
 		["monster_base"]=10034,
-		["hp"]=668140000,
+		["hp"]=1967670000,
-		["atk"]=6580000,
+		["atk"]=15460000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -1027,8 +1027,8 @@ local monster_dungeon_equip = {
 	[6506]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=1213440000,
+		["hp"]=3574540000,
-		["atk"]=6850000,
+		["atk"]=16100000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30117,
@@ -1061,8 +1061,8 @@ local monster_dungeon_equip = {
 	},
 	[6706]={
 		["monster_base"]=10006,
-		["hp"]=282760000,
+		["hp"]=840560000,
-		["atk"]=5870000,
+		["atk"]=14090000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20016,
@@ -1076,8 +1076,8 @@ local monster_dungeon_equip = {
 	},
 	[6806]={
 		["monster_base"]=10054,
-		["hp"]=511630000,
+		["hp"]=1519980000,
-		["atk"]=6460000,
+		["atk"]=15410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -1091,8 +1091,8 @@ local monster_dungeon_equip = {
 	},
 	[6906]={
 		["monster_base"]=10024,
-		["hp"]=687320000,
+		["hp"]=2044100000,
-		["atk"]=6770000,
+		["atk"]=16020000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -1107,8 +1107,8 @@ local monster_dungeon_equip = {
 	[7006]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=1248040000,
+		["hp"]=3713450000,
-		["atk"]=7050000,
+		["atk"]=16690000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -1127,8 +1127,8 @@ local monster_dungeon_equip = {
 	},
 	[7106]={
 		["monster_base"]=10019,
-		["hp"]=273750000,
+		["hp"]=803480000,
-		["atk"]=4990000,
+		["atk"]=11720000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -1142,8 +1142,8 @@ local monster_dungeon_equip = {
 	},
 	[7206]={
 		["monster_base"]=10035,
-		["hp"]=330170000,
+		["hp"]=973390000,
-		["atk"]=6840000,
+		["atk"]=16260000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20100,
@@ -1157,8 +1157,8 @@ local monster_dungeon_equip = {
 	},
 	[7306]={
 		["monster_base"]=10026,
-		["hp"]=624370000,
+		["hp"]=1839910000,
-		["atk"]=7530000,
+		["atk"]=17820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -1172,8 +1172,8 @@ local monster_dungeon_equip = {
 	},
 	[7406]={
 		["monster_base"]=10041,
-		["hp"]=801000000,
+		["hp"]=2362590000,
-		["atk"]=7910000,
+		["atk"]=18530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20118,
@@ -1188,8 +1188,8 @@ local monster_dungeon_equip = {
 	[7506]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=1454090000,
+		["hp"]=4291920000,
-		["atk"]=8290000,
+		["atk"]=19420000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30138,
@@ -1207,8 +1207,8 @@ local monster_dungeon_equip = {
 	},
 	[7606]={
 		["monster_base"]=10053,
-		["hp"]=289120000,
+		["hp"]=854630000,
-		["atk"]=5270000,
+		["atk"]=12570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -1222,8 +1222,8 @@ local monster_dungeon_equip = {
 	},
 	[7706]={
 		["monster_base"]=10043,
-		["hp"]=348580000,
+		["hp"]=1035160000,
-		["atk"]=7220000,
+		["atk"]=17440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -1237,8 +1237,8 @@ local monster_dungeon_equip = {
 	},
 	[7806]={
 		["monster_base"]=10033,
-		["hp"]=659030000,
+		["hp"]=1956780000,
-		["atk"]=7960000,
+		["atk"]=19100000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -1252,8 +1252,8 @@ local monster_dungeon_equip = {
 	},
 	[7906]={
 		["monster_base"]=10028,
-		["hp"]=845550000,
+		["hp"]=2512580000,
-		["atk"]=8350000,
+		["atk"]=19870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -1268,8 +1268,8 @@ local monster_dungeon_equip = {
 	[8006]={
 		["monster_base"]=20041,
 		["is_boss"]=2,
-		["hp"]=1534760000,
+		["hp"]=4564360000,
-		["atk"]=8750000,
+		["atk"]=20820000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30126,
@@ -1288,8 +1288,8 @@ local monster_dungeon_equip = {
 	},
 	[8106]={
 		["monster_base"]=10036,
-		["hp"]=312170000,
+		["hp"]=951090000,
-		["atk"]=5690000,
+		["atk"]=14590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20103,
@@ -1303,8 +1303,8 @@ local monster_dungeon_equip = {
 	},
 	[8206]={
 		["monster_base"]=10017,
-		["hp"]=376280000,
+		["hp"]=1151740000,
-		["atk"]=7800000,
+		["atk"]=20240000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20046,
@@ -1318,8 +1318,8 @@ local monster_dungeon_equip = {
 	},
 	[8306]={
 		["monster_base"]=10023,
-		["hp"]=711080000,
+		["hp"]=2176890000,
-		["atk"]=8610000,
+		["atk"]=22160000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -1333,8 +1333,8 @@ local monster_dungeon_equip = {
 	},
 	[8406]={
 		["monster_base"]=10051,
-		["hp"]=912460000,
+		["hp"]=2795170000,
-		["atk"]=9020000,
+		["atk"]=23060000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20148,
@@ -1349,8 +1349,8 @@ local monster_dungeon_equip = {
 	[8506]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=1655840000,
+		["hp"]=5077610000,
-		["atk"]=9450000,
+		["atk"]=24160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30141,
@@ -1368,8 +1368,8 @@ local monster_dungeon_equip = {
 	},
 	[8606]={
 		["monster_base"]=10021,
-		["hp"]=339080000,
+		["hp"]=1067640000,
-		["atk"]=6160000,
+		["atk"]=16540000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -1383,8 +1383,8 @@ local monster_dungeon_equip = {
 	},
 	[8706]={
 		["monster_base"]=10034,
-		["hp"]=408050000,
+		["hp"]=1291170000,
-		["atk"]=8450000,
+		["atk"]=22950000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -1398,8 +1398,8 @@ local monster_dungeon_equip = {
 	},
 	[8806]={
 		["monster_base"]=10030,
-		["hp"]=771120000,
+		["hp"]=2440350000,
-		["atk"]=9340000,
+		["atk"]=25190000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -1413,8 +1413,8 @@ local monster_dungeon_equip = {
 	},
 	[8906]={
 		["monster_base"]=10018,
-		["hp"]=986810000,
+		["hp"]=3124970000,
-		["atk"]=9790000,
+		["atk"]=26200000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20049,
@@ -1429,8 +1429,8 @@ local monster_dungeon_equip = {
 	[9006]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=1790630000,
+		["hp"]=5676520000,
-		["atk"]=10230000,
+		["atk"]=27380000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30117,
@@ -1448,8 +1448,8 @@ local monster_dungeon_equip = {
 	},
 	[9106]={
 		["monster_base"]=10016,
-		["hp"]=357560000,
+		["hp"]=1140160000,
-		["atk"]=6490000,
+		["atk"]=17680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20043,
@@ -1463,8 +1463,8 @@ local monster_dungeon_equip = {
 	},
 	[9206]={
 		["monster_base"]=10054,
-		["hp"]=429930000,
+		["hp"]=1378840000,
-		["atk"]=8920000,
+		["atk"]=24530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -1478,8 +1478,8 @@ local monster_dungeon_equip = {
 	},
 	[9306]={
 		["monster_base"]=10006,
-		["hp"]=812430000,
+		["hp"]=2605900000,
-		["atk"]=9840000,
+		["atk"]=26950000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20016,
@@ -1493,8 +1493,8 @@ local monster_dungeon_equip = {
 	},
 	[9406]={
 		["monster_base"]=10020,
-		["hp"]=1039660000,
+		["hp"]=3336920000,
-		["atk"]=10320000,
+		["atk"]=28010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -1509,8 +1509,8 @@ local monster_dungeon_equip = {
 	[9506]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=1886200000,
+		["hp"]=6061330000,
-		["atk"]=10790000,
+		["atk"]=29270000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -1529,8 +1529,8 @@ local monster_dungeon_equip = {
 	},
 	[9606]={
 		["monster_base"]=10031,
-		["hp"]=375760000,
+		["hp"]=1221080000,
-		["atk"]=6820000,
+		["atk"]=19210000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20088,
@@ -1544,8 +1544,8 @@ local monster_dungeon_equip = {
 	},
 	[9706]={
 		["monster_base"]=10035,
-		["hp"]=451810000,
+		["hp"]=1476600000,
-		["atk"]=9380000,
+		["atk"]=26660000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20100,
@@ -1559,8 +1559,8 @@ local monster_dungeon_equip = {
 	},
 	[9806]={
 		["monster_base"]=10019,
-		["hp"]=853590000,
+		["hp"]=2790410000,
-		["atk"]=10350000,
+		["atk"]=29290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -1574,8 +1574,8 @@ local monster_dungeon_equip = {
 	},
 	[9906]={
 		["monster_base"]=10013,
-		["hp"]=1092340000,
+		["hp"]=3573300000,
-		["atk"]=10850000,
+		["atk"]=30430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -1590,8 +1590,8 @@ local monster_dungeon_equip = {
 	[10006]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=1981770000,
+		["hp"]=6490660000,
-		["atk"]=11340000,
+		["atk"]=31800000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30144,

lua/app/config/monster_dungeon_gold.lua

@@ -1,7 +1,7 @@
 local monster_dungeon_gold = {
 	[105]={
 		["monster_base"]=20033,
-		["hp"]=1295100000,
+		["hp"]=1152000000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -33,7 +33,7 @@ local monster_dungeon_gold = {
 	},
 	[205]={
 		["monster_base"]=20033,
-		["hp"]=1656600000,
+		["hp"]=1462500000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -65,7 +65,7 @@ local monster_dungeon_gold = {
 	},
 	[305]={
 		["monster_base"]=20033,
-		["hp"]=2185200000,
+		["hp"]=2038600000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -97,7 +97,7 @@ local monster_dungeon_gold = {
 	},
 	[405]={
 		["monster_base"]=20033,
-		["hp"]=3110700000,
+		["hp"]=2516000000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -129,7 +129,7 @@ local monster_dungeon_gold = {
 	},
 	[505]={
 		["monster_base"]=20033,
-		["hp"]=3382500000,
+		["hp"]=3334100000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -161,7 +161,7 @@ local monster_dungeon_gold = {
 	},
 	[605]={
 		["monster_base"]=20033,
-		["hp"]=4001400000,
+		["hp"]=5099300000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -193,7 +193,7 @@ local monster_dungeon_gold = {
 	},
 	[705]={
 		["monster_base"]=20033,
-		["hp"]=4346700000,
+		["hp"]=7281100000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -225,7 +225,7 @@ local monster_dungeon_gold = {
 	},
 	[805]={
 		["monster_base"]=20033,
-		["hp"]=4992900000,
+		["hp"]=9161100000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -257,7 +257,7 @@ local monster_dungeon_gold = {
 	},
 	[905]={
 		["monster_base"]=20033,
-		["hp"]=5440500000,
+		["hp"]=10407200000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -289,7 +289,7 @@ local monster_dungeon_gold = {
 	},
 	[1005]={
 		["monster_base"]=20033,
-		["hp"]=5791500000,
+		["hp"]=11509900000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -321,7 +321,7 @@ local monster_dungeon_gold = {
 	},
 	[1105]={
 		["monster_base"]=20033,
-		["hp"]=6256500000,
+		["hp"]=13311700000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -353,7 +353,7 @@ local monster_dungeon_gold = {
 	},
 	[1205]={
 		["monster_base"]=20033,
-		["hp"]=6771600000,
+		["hp"]=17004800000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -385,7 +385,7 @@ local monster_dungeon_gold = {
 	},
 	[1305]={
 		["monster_base"]=20033,
-		["hp"]=7282500000,
+		["hp"]=19465800000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -417,7 +417,7 @@ local monster_dungeon_gold = {
 	},
 	[1405]={
 		["monster_base"]=20033,
-		["hp"]=7428600000,
+		["hp"]=23027900000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={
@@ -449,7 +449,7 @@ local monster_dungeon_gold = {
 	},
 	[1505]={
 		["monster_base"]=20033,
-		["hp"]=7866600000,
+		["hp"]=26121700000,
 		["atk"]=30000000000,
 		["atk_times"]=0,
 		["skill"]={

lua/app/config/monster_dungeon_rune.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 0e8833dce7501504f85ac26561c2e3ad
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/monster_dungeon_shards.lua

@@ -21,7 +21,7 @@ local monster_dungeon_shards = {
 	[203]={
 		["monster_base"]=30001,
 		["hp"]=109200000,
-		["atk"]=930000,
+		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50055,
@@ -41,7 +41,7 @@ local monster_dungeon_shards = {
 	[303]={
 		["monster_base"]=30015,
 		["hp"]=170400000,
-		["atk"]=1050000,
+		["atk"]=1060000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50113,
@@ -79,8 +79,8 @@ local monster_dungeon_shards = {
 	},
 	[503]={
 		["monster_base"]=30008,
-		["hp"]=240000000,
+		["hp"]=274240000,
-		["atk"]=1590000,
+		["atk"]=1820000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50098,
@@ -99,8 +99,8 @@ local monster_dungeon_shards = {
 	},
 	[603]={
 		["monster_base"]=30003,
-		["hp"]=90000000,
+		["hp"]=102840000,
-		["atk"]=810000,
+		["atk"]=920000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50082,
@@ -118,8 +118,8 @@ local monster_dungeon_shards = {
 	},
 	[703]={
 		["monster_base"]=30002,
-		["hp"]=128640000,
+		["hp"]=142640000,
-		["atk"]=990000,
+		["atk"]=1090000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50027,
@@ -137,8 +137,8 @@ local monster_dungeon_shards = {
 	},
 	[803]={
 		["monster_base"]=30006,
-		["hp"]=186420000,
+		["hp"]=206890000,
-		["atk"]=1110000,
+		["atk"]=1240000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50061,
@@ -157,7 +157,7 @@ local monster_dungeon_shards = {
 	},
 	[903]={
 		["monster_base"]=30019,
-		["hp"]=246150000,
+		["hp"]=244280000,
 		["atk"]=1530000,
 		["atk_times"]=4,
 		["hurt_skill"]={
@@ -178,8 +178,8 @@ local monster_dungeon_shards = {
 	},
 	[1003]={
 		["monster_base"]=30011,
-		["hp"]=284400000,
+		["hp"]=290100000,
-		["atk"]=1710000,
+		["atk"]=1720000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50017,
@@ -197,7 +197,7 @@ local monster_dungeon_shards = {
 	},
 	[1103]={
 		["monster_base"]=30005,
-		["hp"]=130320000,
+		["hp"]=130440000,
 		["atk"]=1230000,
 		["atk_times"]=4,
 		["hurt_skill"]={
@@ -217,8 +217,8 @@ local monster_dungeon_shards = {
 	},
 	[1203]={
 		["monster_base"]=30003,
-		["hp"]=164880000,
+		["hp"]=180880000,
-		["atk"]=1320000,
+		["atk"]=1450000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50082,
@@ -236,8 +236,8 @@ local monster_dungeon_shards = {
 	},
 	[1303]={
 		["monster_base"]=30010,
-		["hp"]=250170000,
+		["hp"]=262230000,
-		["atk"]=1560000,
+		["atk"]=1630000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50032,
@@ -255,8 +255,8 @@ local monster_dungeon_shards = {
 	},
 	[1403]={
 		["monster_base"]=30020,
-		["hp"]=295440000,
+		["hp"]=309600000,
-		["atk"]=1890000,
+		["atk"]=1990000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50067,
@@ -274,8 +274,8 @@ local monster_dungeon_shards = {
 	},
 	[1503]={
 		["monster_base"]=30023,
-		["hp"]=363600000,
+		["hp"]=376800000,
-		["atk"]=2250000,
+		["atk"]=2300000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50125,
@@ -294,8 +294,8 @@ local monster_dungeon_shards = {
 	},
 	[1603]={
 		["monster_base"]=30004,
-		["hp"]=159120000,
+		["hp"]=168720000,
-		["atk"]=1560000,
+		["atk"]=1610000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50108,
@@ -313,8 +313,8 @@ local monster_dungeon_shards = {
 	},
 	[1703]={
 		["monster_base"]=30014,
-		["hp"]=209040000,
+		["hp"]=234000000,
-		["atk"]=1740000,
+		["atk"]=1890000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50007,
@@ -333,8 +333,8 @@ local monster_dungeon_shards = {
 	},
 	[1803]={
 		["monster_base"]=30021,
-		["hp"]=322830000,
+		["hp"]=339150000,
-		["atk"]=2100000,
+		["atk"]=2120000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50093,
@@ -352,8 +352,8 @@ local monster_dungeon_shards = {
 	},
 	[1903]={
 		["monster_base"]=30012,
-		["hp"]=440790000,
+		["hp"]=400430000,
-		["atk"]=2880000,
+		["atk"]=2570000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50037,
@@ -372,8 +372,8 @@ local monster_dungeon_shards = {
 	},
 	[2003]={
 		["monster_base"]=30016,
-		["hp"]=477000000,
+		["hp"]=466500000,
-		["atk"]=3030000,
+		["atk"]=2860000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50072,
@@ -391,8 +391,8 @@ local monster_dungeon_shards = {
 	},
 	[2103]={
 		["monster_base"]=30001,
-		["hp"]=203040000,
+		["hp"]=204240000,
-		["atk"]=2040000,
+		["atk"]=1950000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50055,
@@ -411,8 +411,8 @@ local monster_dungeon_shards = {
 	},
 	[2203]={
 		["monster_base"]=30015,
-		["hp"]=256320000,
+		["hp"]=283200000,
-		["atk"]=2190000,
+		["atk"]=2270000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50113,
@@ -431,8 +431,8 @@ local monster_dungeon_shards = {
 	},
 	[2303]={
 		["monster_base"]=30009,
-		["hp"]=370770000,
+		["hp"]=410380000,
-		["atk"]=2460000,
+		["atk"]=2550000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50012,
@@ -450,8 +450,8 @@ local monster_dungeon_shards = {
 	},
 	[2403]={
 		["monster_base"]=30022,
-		["hp"]=438090000,
+		["hp"]=484580000,
-		["atk"]=2910000,
+		["atk"]=3060000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50087,
@@ -470,8 +470,8 @@ local monster_dungeon_shards = {
 	},
 	[2503]={
 		["monster_base"]=30017,
-		["hp"]=531000000,
+		["hp"]=587100000,
-		["atk"]=3450000,
+		["atk"]=3470000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50049,
@@ -491,8 +491,8 @@ local monster_dungeon_shards = {
 	},
 	[2603]={
 		["monster_base"]=30002,
-		["hp"]=230400000,
+		["hp"]=299520000,
-		["atk"]=2370000,
+		["atk"]=2680000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50027,
@@ -510,8 +510,8 @@ local monster_dungeon_shards = {
 	},
 	[2703]={
 		["monster_base"]=30006,
-		["hp"]=290880000,
+		["hp"]=415200000,
-		["atk"]=2520000,
+		["atk"]=3100000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50061,
@@ -530,8 +530,8 @@ local monster_dungeon_shards = {
 	},
 	[2803]={
 		["monster_base"]=30019,
-		["hp"]=420510000,
+		["hp"]=601630000,
-		["atk"]=2820000,
+		["atk"]=3490000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50119,
@@ -551,8 +551,8 @@ local monster_dungeon_shards = {
 	},
 	[2903]={
 		["monster_base"]=30014,
-		["hp"]=496800000,
+		["hp"]=710330000,
-		["atk"]=3360000,
+		["atk"]=4150000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50007,
@@ -571,8 +571,8 @@ local monster_dungeon_shards = {
 	},
 	[3003]={
 		["monster_base"]=30025,
-		["hp"]=592200000,
+		["hp"]=843000000,
-		["atk"]=3930000,
+		["atk"]=4650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50103,
@@ -591,8 +591,8 @@ local monster_dungeon_shards = {
 	},
 	[3103]={
 		["monster_base"]=30021,
-		["hp"]=250560000,
+		["hp"]=427920000,
-		["atk"]=2610000,
+		["atk"]=3750000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50093,
@@ -610,8 +610,8 @@ local monster_dungeon_shards = {
 	},
 	[3203]={
 		["monster_base"]=30010,
-		["hp"]=316320000,
+		["hp"]=593040000,
-		["atk"]=2820000,
+		["atk"]=4320000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50032,
@@ -629,8 +629,8 @@ local monster_dungeon_shards = {
 	},
 	[3303]={
 		["monster_base"]=30020,
-		["hp"]=457230000,
+		["hp"]=859180000,
-		["atk"]=3120000,
+		["atk"]=4860000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50067,
@@ -648,8 +648,8 @@ local monster_dungeon_shards = {
 	},
 	[3403]={
 		["monster_base"]=30015,
-		["hp"]=540000000,
+		["hp"]=1014450000,
-		["atk"]=3690000,
+		["atk"]=5750000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50113,
@@ -668,8 +668,8 @@ local monster_dungeon_shards = {
 	},
 	[3503]={
 		["monster_base"]=30018,
-		["hp"]=652500000,
+		["hp"]=1148400000,
-		["atk"]=4440000,
+		["atk"]=6480000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50022,
@@ -687,8 +687,8 @@ local monster_dungeon_shards = {
 	},
 	[3603]={
 		["monster_base"]=30009,
-		["hp"]=276840000,
+		["hp"]=517080000,
-		["atk"]=2970000,
+		["atk"]=4800000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50012,
@@ -706,8 +706,8 @@ local monster_dungeon_shards = {
 	},
 	[3703]={
 		["monster_base"]=30022,
-		["hp"]=370770000,
+		["hp"]=761180000,
-		["atk"]=3210000,
+		["atk"]=5630000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50087,
@@ -726,8 +726,8 @@ local monster_dungeon_shards = {
 	},
 	[3803]={
 		["monster_base"]=30012,
-		["hp"]=534060000,
+		["hp"]=1098900000,
-		["atk"]=3630000,
+		["atk"]=6420000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50037,
@@ -746,8 +746,8 @@ local monster_dungeon_shards = {
 	},
 	[3903]={
 		["monster_base"]=30006,
-		["hp"]=675000000,
+		["hp"]=1388900000,
-		["atk"]=4470000,
+		["atk"]=7920000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50061,
@@ -766,8 +766,8 @@ local monster_dungeon_shards = {
 	},
 	[4003]={
 		["monster_base"]=30026,
-		["hp"]=829500000,
+		["hp"]=1622950000,
-		["atk"]=5190000,
+		["atk"]=8840000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50131,
@@ -787,8 +787,8 @@ local monster_dungeon_shards = {
 	},
 	[4103]={
 		["monster_base"]=30019,
-		["hp"]=302040000,
+		["hp"]=587520000,
-		["atk"]=3270000,
+		["atk"]=5840000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50119,
@@ -808,8 +808,8 @@ local monster_dungeon_shards = {
 	},
 	[4203]={
 		["monster_base"]=30014,
-		["hp"]=404430000,
+		["hp"]=864790000,
-		["atk"]=3540000,
+		["atk"]=6830000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50007,
@@ -828,8 +828,8 @@ local monster_dungeon_shards = {
 	},
 	[4303]={
 		["monster_base"]=30021,
-		["hp"]=582390000,
+		["hp"]=1248390000,
-		["atk"]=4020000,
+		["atk"]=7790000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50093,
@@ -847,8 +847,8 @@ local monster_dungeon_shards = {
 	},
 	[4403]={
 		["monster_base"]=30012,
-		["hp"]=735690000,
+		["hp"]=1577860000,
-		["atk"]=4920000,
+		["atk"]=9580000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50037,
@@ -867,8 +867,8 @@ local monster_dungeon_shards = {
 	},
 	[4503]={
 		["monster_base"]=30024,
-		["hp"]=915600000,
+		["hp"]=1804950000,
-		["atk"]=5820000,
+		["atk"]=10430000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50077,
@@ -886,8 +886,8 @@ local monster_dungeon_shards = {
 	},
 	[4603]={
 		["monster_base"]=30001,
-		["hp"]=321840000,
+		["hp"]=649920000,
-		["atk"]=3540000,
+		["atk"]=6460000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50055,
@@ -906,8 +906,8 @@ local monster_dungeon_shards = {
 	},
 	[4703]={
 		["monster_base"]=30015,
-		["hp"]=430710000,
+		["hp"]=956510000,
-		["atk"]=3840000,
+		["atk"]=7540000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50113,
@@ -926,8 +926,8 @@ local monster_dungeon_shards = {
 	},
 	[4803]={
 		["monster_base"]=30009,
-		["hp"]=620190000,
+		["hp"]=1380690000,
-		["atk"]=4320000,
+		["atk"]=8590000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50012,
@@ -945,8 +945,8 @@ local monster_dungeon_shards = {
 	},
 	[4903]={
 		["monster_base"]=30008,
-		["hp"]=783360000,
+		["hp"]=1745140000,
-		["atk"]=5280000,
+		["atk"]=10560000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50098,
@@ -965,8 +965,8 @@ local monster_dungeon_shards = {
 	},
 	[5003]={
 		["monster_base"]=30007,
-		["hp"]=973350000,
+		["hp"]=2081100000,
-		["atk"]=6270000,
+		["atk"]=11500000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50043,
@@ -985,8 +985,8 @@ local monster_dungeon_shards = {
 	},
 	[5103]={
 		["monster_base"]=30002,
-		["hp"]=348120000,
+		["hp"]=751680000,
-		["atk"]=3870000,
+		["atk"]=7120000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50027,
@@ -1004,8 +1004,8 @@ local monster_dungeon_shards = {
 	},
 	[5203]={
 		["monster_base"]=30020,
-		["hp"]=465630000,
+		["hp"]=1106280000,
-		["atk"]=4200000,
+		["atk"]=8310000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50067,
@@ -1023,8 +1023,8 @@ local monster_dungeon_shards = {
 	},
 	[5303]={
 		["monster_base"]=30019,
-		["hp"]=670140000,
+		["hp"]=1596870000,
-		["atk"]=4740000,
+		["atk"]=9470000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50119,
@@ -1044,8 +1044,8 @@ local monster_dungeon_shards = {
 	},
 	[5403]={
 		["monster_base"]=30011,
-		["hp"]=846360000,
+		["hp"]=2018410000,
-		["atk"]=5760000,
+		["atk"]=11600000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50017,
@@ -1063,8 +1063,8 @@ local monster_dungeon_shards = {
 	},
 	[5503]={
 		["monster_base"]=30025,
-		["hp"]=1034250000,
+		["hp"]=2337650000,
-		["atk"]=6750000,
+		["atk"]=12930000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50103,
@@ -1083,8 +1083,8 @@ local monster_dungeon_shards = {
 	},
 	[5603]={
 		["monster_base"]=30003,
-		["hp"]=362520000,
+		["hp"]=923520000,
-		["atk"]=4110000,
+		["atk"]=8330000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50082,
@@ -1102,8 +1102,8 @@ local monster_dungeon_shards = {
 	},
 	[5703]={
 		["monster_base"]=30010,
-		["hp"]=484770000,
+		["hp"]=1358980000,
-		["atk"]=4410000,
+		["atk"]=9700000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50032,
@@ -1121,8 +1121,8 @@ local monster_dungeon_shards = {
 	},
 	[5803]={
 		["monster_base"]=30006,
-		["hp"]=697680000,
+		["hp"]=1961640000,
-		["atk"]=5010000,
+		["atk"]=11050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50061,
@@ -1141,8 +1141,8 @@ local monster_dungeon_shards = {
 	},
 	[5903]={
 		["monster_base"]=30023,
-		["hp"]=881040000,
+		["hp"]=2479280000,
-		["atk"]=6030000,
+		["atk"]=13510000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50125,
@@ -1161,8 +1161,8 @@ local monster_dungeon_shards = {
 	},
 	[6003]={
 		["monster_base"]=30018,
-		["hp"]=1116150000,
+		["hp"]=2798250000,
-		["atk"]=7380000,
+		["atk"]=14670000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50022,
@@ -1180,8 +1180,8 @@ local monster_dungeon_shards = {
 	},
 	[6103]={
 		["monster_base"]=30014,
-		["hp"]=390240000,
+		["hp"]=1057320000,
-		["atk"]=4440000,
+		["atk"]=9580000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50007,
@@ -1200,8 +1200,8 @@ local monster_dungeon_shards = {
 	},
 	[6203]={
 		["monster_base"]=30022,
-		["hp"]=521730000,
+		["hp"]=1555760000,
-		["atk"]=4830000,
+		["atk"]=11150000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50087,
@@ -1220,8 +1220,8 @@ local monster_dungeon_shards = {
 	},
 	[6303]={
 		["monster_base"]=30012,
-		["hp"]=750600000,
+		["hp"]=2245770000,
-		["atk"]=5460000,
+		["atk"]=12690000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50037,
@@ -1240,8 +1240,8 @@ local monster_dungeon_shards = {
 	},
 	[6403]={
 		["monster_base"]=30016,
-		["hp"]=947580000,
+		["hp"]=2838240000,
-		["atk"]=6540000,
+		["atk"]=15490000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50072,
@@ -1259,8 +1259,8 @@ local monster_dungeon_shards = {
 	},
 	[6503]={
 		["monster_base"]=30026,
-		["hp"]=1161300000,
+		["hp"]=3279850000,
-		["atk"]=7740000,
+		["atk"]=17460000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50131,
@@ -1280,8 +1280,8 @@ local monster_dungeon_shards = {
 	},
 	[6603]={
 		["monster_base"]=30015,
-		["hp"]=398160000,
+		["hp"]=1251000000,
-		["atk"]=4560000,
+		["atk"]=11990000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50113,
@@ -1300,8 +1300,8 @@ local monster_dungeon_shards = {
 	},
 	[6703]={
 		["monster_base"]=30009,
-		["hp"]=532440000,
+		["hp"]=1840590000,
-		["atk"]=4950000,
+		["atk"]=13940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50012,
@@ -1319,8 +1319,8 @@ local monster_dungeon_shards = {
 	},
 	[6803]={
 		["monster_base"]=30021,
-		["hp"]=765720000,
+		["hp"]=2656890000,
-		["atk"]=5580000,
+		["atk"]=15870000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50093,
@@ -1338,8 +1338,8 @@ local monster_dungeon_shards = {
 	},
 	[6903]={
 		["monster_base"]=30017,
-		["hp"]=966720000,
+		["hp"]=3357760000,
-		["atk"]=6720000,
+		["atk"]=19330000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50049,
@@ -1359,8 +1359,8 @@ local monster_dungeon_shards = {
 	},
 	[7003]={
 		["monster_base"]=30024,
-		["hp"]=1230600000,
+		["hp"]=3876600000,
-		["atk"]=8280000,
+		["atk"]=21940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50077,
@@ -1378,8 +1378,8 @@ local monster_dungeon_shards = {
 	},
 	[7103]={
 		["monster_base"]=30020,
-		["hp"]=421920000,
+		["hp"]=1419240000,
-		["atk"]=4860000,
+		["atk"]=13870000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50067,
@@ -1397,8 +1397,8 @@ local monster_dungeon_shards = {
 	},
 	[7203]={
 		["monster_base"]=30019,
-		["hp"]=564060000,
+		["hp"]=2088030000,
-		["atk"]=5250000,
+		["atk"]=16120000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50119,
@@ -1418,8 +1418,8 @@ local monster_dungeon_shards = {
 	},
 	[7303]={
 		["monster_base"]=30014,
-		["hp"]=811080000,
+		["hp"]=3013920000,
-		["atk"]=5940000,
+		["atk"]=18350000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50007,
@@ -1438,8 +1438,8 @@ local monster_dungeon_shards = {
 	},
 	[7403]={
 		["monster_base"]=30008,
-		["hp"]=1023840000,
+		["hp"]=3809020000,
-		["atk"]=7140000,
+		["atk"]=22310000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50098,
@@ -1458,8 +1458,8 @@ local monster_dungeon_shards = {
 	},
 	[7503]={
 		["monster_base"]=30007,
-		["hp"]=1303320000,
+		["hp"]=4397590000,
-		["atk"]=8790000,
+		["atk"]=25320000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			50043,

lua/app/config/recovery.lua

@@ -7,9 +7,17 @@ local recovery = {
 	[22]={
 		["type"]=2,
 		["limit"]=5
+	},
+	[49]={
+		["type"]=2,
+		["limit"]=10
+	},
+	[50]={
+		["type"]=2,
+		["limit"]=10
 	}
 }
 local config = {
-data=recovery,count=2
+data=recovery,count=4
 }
 return config

lua/app/config/runes_level.lua

@@ -0,0 +1,117 @@
+local runes_level = {
+	[1]={
+		["weight_1"]=7950,
+		["weight_2"]=2000,
+		["weight_3"]=50,
+		["grid"]=2
+	},
+	[2]={
+		["weight_1"]=6620,
+		["weight_2"]=3200,
+		["weight_3"]=150,
+		["weight_4"]=30,
+		["grid"]=3,
+		["cost"]=100
+	},
+	[3]={
+		["weight_1"]=5754,
+		["weight_2"]=3680,
+		["weight_3"]=480,
+		["weight_4"]=66,
+		["weight_5"]=20,
+		["grid"]=4,
+		["cost"]=1000
+	},
+	[4]={
+		["weight_1"]=4595,
+		["weight_2"]=4260,
+		["weight_3"]=980,
+		["weight_4"]=112,
+		["weight_5"]=45,
+		["weight_6"]=8,
+		["grid"]=5,
+		["auto"]=1,
+		["cost"]=3000
+	},
+	[5]={
+		["weight_1"]=3784,
+		["weight_2"]=4550,
+		["weight_3"]=1360,
+		["weight_4"]=198,
+		["weight_5"]=88,
+		["weight_6"]=18,
+		["weight_7"]=2,
+		["grid"]=6,
+		["auto"]=1,
+		["cost"]=8000
+	},
+	[6]={
+		["weight_1"]=3312,
+		["weight_2"]=4350,
+		["weight_3"]=1780,
+		["weight_4"]=366,
+		["weight_5"]=156,
+		["weight_6"]=29,
+		["weight_7"]=6,
+		["weight_8"]=1,
+		["grid"]=6,
+		["auto"]=1,
+		["cost"]=20000
+	},
+	[7]={
+		["weight_1"]=2738,
+		["weight_2"]=4080,
+		["weight_3"]=2250,
+		["weight_4"]=612,
+		["weight_5"]=268,
+		["weight_6"]=40,
+		["weight_7"]=10,
+		["weight_8"]=2,
+		["grid"]=6,
+		["auto"]=1,
+		["cost"]=50000
+	},
+	[8]={
+		["weight_1"]=1893,
+		["weight_2"]=3780,
+		["weight_3"]=2835,
+		["weight_4"]=945,
+		["weight_5"]=472,
+		["weight_6"]=52,
+		["weight_7"]=19,
+		["weight_8"]=4,
+		["grid"]=6,
+		["auto"]=1,
+		["cost"]=100000
+	},
+	[9]={
+		["weight_1"]=1886,
+		["weight_2"]=2785,
+		["weight_3"]=3325,
+		["weight_4"]=1324,
+		["weight_5"]=582,
+		["weight_6"]=65,
+		["weight_7"]=25,
+		["weight_8"]=8,
+		["grid"]=6,
+		["auto"]=1,
+		["cost"]=200000
+	},
+	[10]={
+		["weight_1"]=1436,
+		["weight_2"]=2335,
+		["weight_3"]=3778,
+		["weight_4"]=1678,
+		["weight_5"]=636,
+		["weight_6"]=89,
+		["weight_7"]=36,
+		["weight_8"]=12,
+		["grid"]=6,
+		["auto"]=1,
+		["cost"]=500000
+	}
+}
+local config = {
+data=runes_level,count=10
+}
+return config

lua/app/config/runes_level.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: e6ea8405836891648a1824d14c935914
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/runes_sub.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d3b4590ed44e9e9418468f5166a09e7b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/runes_suit.lua

@@ -0,0 +1,266 @@
+local runes_suit = {
+	[1]={
+		["red_suit_attr"]={
+			{
+				["type"]="attr_hpp_red",
+				["num"]=800
+			},
+			{
+				["type"]="attr_hpp_red",
+				["num"]=1500
+			}
+		},
+		["yellow_suit_attr"]={
+			{
+				["type"]="attr_hpp_yellow",
+				["num"]=800
+			},
+			{
+				["type"]="attr_hpp_yellow",
+				["num"]=1500
+			}
+		},
+		["green_suit_attr"]={
+			{
+				["type"]="attr_hpp_green",
+				["num"]=800
+			},
+			{
+				["type"]="attr_hpp_green",
+				["num"]=1500
+			}
+		},
+		["blue_suit_attr"]={
+			{
+				["type"]="attr_hpp_blue",
+				["num"]=800
+			},
+			{
+				["type"]="attr_hpp_blue",
+				["num"]=1500
+			}
+		},
+		["purple_suit_attr"]={
+			{
+				["type"]="attr_hpp_purple",
+				["num"]=800
+			},
+			{
+				["type"]="attr_hpp_purple",
+				["num"]=1500
+			}
+		}
+	},
+	[2]={
+		["red_suit_attr"]={
+			{
+				["type"]="attr_atkp_red",
+				["num"]=800
+			},
+			{
+				["type"]="attr_atkp_red",
+				["num"]=1500
+			}
+		},
+		["yellow_suit_attr"]={
+			{
+				["type"]="attr_atkp_yellow",
+				["num"]=800
+			},
+			{
+				["type"]="attr_atkp_yellow",
+				["num"]=1500
+			}
+		},
+		["green_suit_attr"]={
+			{
+				["type"]="attr_atkp_green",
+				["num"]=800
+			},
+			{
+				["type"]="attr_atkp_green",
+				["num"]=1500
+			}
+		},
+		["blue_suit_attr"]={
+			{
+				["type"]="attr_atkp_blue",
+				["num"]=800
+			},
+			{
+				["type"]="attr_atkp_blue",
+				["num"]=1500
+			}
+		},
+		["purple_suit_attr"]={
+			{
+				["type"]="attr_atkp_purple",
+				["num"]=800
+			},
+			{
+				["type"]="attr_atkp_purple",
+				["num"]=1500
+			}
+		}
+	},
+	[3]={
+		["red_suit_attr"]={
+			{
+				["type"]="attr_crit_time_red",
+				["num"]=1500
+			},
+			{
+				["type"]="attr_crit_time_red",
+				["num"]=3000
+			}
+		},
+		["yellow_suit_attr"]={
+			{
+				["type"]="attr_crit_time_yellow",
+				["num"]=1500
+			},
+			{
+				["type"]="attr_crit_time_yellow",
+				["num"]=3000
+			}
+		},
+		["green_suit_attr"]={
+			{
+				["type"]="attr_crit_time_green",
+				["num"]=1500
+			},
+			{
+				["type"]="attr_crit_time_green",
+				["num"]=3000
+			}
+		},
+		["blue_suit_attr"]={
+			{
+				["type"]="attr_crit_time_blue",
+				["num"]=1500
+			},
+			{
+				["type"]="attr_crit_time_blue",
+				["num"]=3000
+			}
+		},
+		["purple_suit_attr"]={
+			{
+				["type"]="attr_crit_time_purple",
+				["num"]=1500
+			},
+			{
+				["type"]="attr_crit_time_purple",
+				["num"]=3000
+			}
+		}
+	},
+	[4]={
+		["red_suit_attr"]={
+			{
+				["type"]="attr_all_hurtp_red",
+				["num"]=500
+			},
+			{
+				["type"]="attr_all_hurtp_red",
+				["num"]=1000
+			}
+		},
+		["yellow_suit_attr"]={
+			{
+				["type"]="attr_all_hurtp_yellow",
+				["num"]=500
+			},
+			{
+				["type"]="attr_all_hurtp_yellow",
+				["num"]=1000
+			}
+		},
+		["green_suit_attr"]={
+			{
+				["type"]="attr_all_hurtp_green",
+				["num"]=500
+			},
+			{
+				["type"]="attr_all_hurtp_green",
+				["num"]=1000
+			}
+		},
+		["blue_suit_attr"]={
+			{
+				["type"]="attr_all_hurtp_blue",
+				["num"]=500
+			},
+			{
+				["type"]="attr_all_hurtp_blue",
+				["num"]=1000
+			}
+		},
+		["purple_suit_attr"]={
+			{
+				["type"]="attr_all_hurtp_purple",
+				["num"]=500
+			},
+			{
+				["type"]="attr_all_hurtp_purple",
+				["num"]=1000
+			}
+		}
+	},
+	[5]={
+		["red_suit_attr"]={
+			{
+				["type"]="attr_crit_red",
+				["num"]=800
+			},
+			{
+				["type"]="attr_crit_red",
+				["num"]=1500
+			}
+		},
+		["yellow_suit_attr"]={
+			{
+				["type"]="attr_crit_yellow",
+				["num"]=800
+			},
+			{
+				["type"]="attr_crit_yellow",
+				["num"]=1500
+			}
+		},
+		["green_suit_attr"]={
+			{
+				["type"]="attr_crit_green",
+				["num"]=800
+			},
+			{
+				["type"]="attr_crit_green",
+				["num"]=1500
+			}
+		},
+		["blue_suit_attr"]={
+			{
+				["type"]="attr_crit_blue",
+				["num"]=800
+			},
+			{
+				["type"]="attr_crit_blue",
+				["num"]=1500
+			}
+		},
+		["purple_suit_attr"]={
+			{
+				["type"]="attr_crit_purple",
+				["num"]=800
+			},
+			{
+				["type"]="attr_crit_purple",
+				["num"]=1500
+			}
+		}
+	}
+}
+local config = {
+data=runes_suit,count=5
+}
+return config

lua/app/config/runes_suit.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3f54f9a99395af74c93c846018949687
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}