1352 changed files with 18819 additions and 696215 deletions
--- a/lua/app/bf/common/functions.lua
+++ b/lua/app/bf/common/functions.lua
@ -362,23 +362,6 @@ 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
--- a/lua/app/bf/unity/character_spine_object.lua
+++ b/lua/app/bf/unity/character_spine_object.lua
@ -51,13 +51,6 @@ function CharacterSpineObject:refreshSkeletonDataAsset(dataAsset)
 	self.characterSpineHelper:Reload()
 end

-function CharacterSpineObject:setSkin(skinName)
-	local skeletonGraphic = self:getSkeletonGraphic()
-	skeletonGraphic.initialSkinName = skinName
-	skeletonGraphic:Initialize(true)
-	self.characterSpineHelper:Reload()
-end
-
 function CharacterSpineObject:_genAllChildren()
 	local childMap = {}
 	if self.characterSpineHelper then
--- a/lua/app/bf/unity/ui_spine_object.lua
+++ b/lua/app/bf/unity/ui_spine_object.lua
@ -51,12 +51,6 @@ function UISpineObject:playAnim(animName, loop, forceRefresh, forceGetSG)
 	end
 end

-function UISpineObject:setSkin(skinName)
-	self.skeletonGraphic.initialSkinName = skinName
-	self.skeletonGraphic:Initialize(true)
-	self:getAnimationState(true)
-end
-
 function UISpineObject:getAnimationKeyFrameTime(animName)
 	if not self.animationKeyFrameTime then
 		self.animationKeyFrameTime = {}
@ -104,13 +98,9 @@ end
 function UISpineObject:playAnimComplete(animName, loop, forceRefresh, complete, forceGetSG)
 	local spineAnim = self:getAnimation(self:playAnim(animName, loop, forceRefresh, forceGetSG))
 	local duration = spineAnim.Duration
-	if self.playAnimCompleteSeq then
-		self.playAnimCompleteSeq:Kill()
-		self.playAnimCompleteSeq = nil
-	end
-	self.playAnimCompleteSeq = self:createBindTweenSequence()
-	self.playAnimCompleteSeq:AppendInterval(duration)
-	self.playAnimCompleteSeq:OnComplete(complete)
+	local sequence = self:createBindTweenSequence()
+	sequence:AppendInterval(duration)
+	sequence:OnComplete(complete)
 	return duration
 end

--- a/lua/app/bf/unity/uiprefab_object.lua
+++ b/lua/app/bf/unity/uiprefab_object.lua
@ -763,9 +763,6 @@ function UIPrefabObject:addRedPoint(offsetX, offsetY, scale, iconName, count, na
 	if not self.redPoint then
 		if not self.loadRpOver then
 			self.loadRpOver = true
-			if self:isDestroyed() or CS.BF.Utils.IsNull(self:getGameObject()) then
-				return
-			end
 			UIPrefabManager:loadUIWidgetAsync("assets/prefabs/ui/common/red_point_cell.prefab", self, function(prefabObject)
 				self.redPoint = prefabObject
 				prefabObject:initPrefabHelper()
--- a/lua/app/common/audio_manager.lua
+++ b/lua/app/common/audio_manager.lua
@ -8,9 +8,6 @@ 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 = {
@ -39,12 +36,6 @@ AudioManager.EFFECT_ID = {
    BOSS_WARNING = "assets/arts/sounds/sfx/battle/warning_boss.wav",
    LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.wav",
    FUNC_OPEN = "assets/arts/sounds/sfx/ui/func_open.wav",
-    BATTLE_BOX_OPEN = "assets/arts/sounds/sfx/ui/ui_battle_open_box.wav",
-    EQUIP_WEAPON_UP = "assets/arts/sounds/sfx/ui/equip_up.wav",
-    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 = {
--- a/lua/app/common/bi_report.lua
+++ b/lua/app/common/bi_report.lua
--- a/lua/app/common/config_manager.lua
+++ b/lua/app/common/config_manager.lua
@ -111,12 +111,6 @@ function ConfigManager:preLoadConfig()
 	end
 	handleMonsterGrow("monster_chapter")
 	handleMonsterGrow("monster_daily_challenge")
-	handleMonsterGrow("monster_dungeon_gold")
-	handleMonsterGrow("monster_dungeon_shards")
-	handleMonsterGrow("monster_dungeon_equip")
-	handleMonsterGrow("monster_dungeon_armor")
-	handleMonsterGrow("monster_activity")
-	handleMonsterGrow("monster_dungeon_rune")

 	self.configs["monster"] = {
 		data = monsterFullData,
--- a/lua/app/common/data_manager.lua
+++ b/lua/app/common/data_manager.lua
@ -9,23 +9,15 @@ function DataManager:init()
 	self:initManager("PlayerData", "app/userdata/player/player_data")
 	self:initManager("ChapterData", "app/userdata/chapter/chapter_data")
 	self:initManager("DailyChallengeData", "app/userdata/daily_challenge/daily_challenge_data")
-	self:initManager("DungeonData", "app/userdata/dungeon/dungeon_data")
-	self:initManager("ArenaData", "app/userdata/arena/arena_data")
-	self:initManager("CollectionData", "app/userdata/collection/collection_data")
 	self:initManager("HeroData", "app/userdata/hero/hero_data")
 	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")
 	self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data")
 	self:initManager("MailData", "app/userdata/mail/mail_data")
 	self:initManager("ActivityData", "app/userdata/activity/activity_data")
 	self:initManager("GoldPigData", "app/userdata/activity/gold_pig/gold_pig_data")
 	self:initManager("BountyData", "app/userdata/bounty/bounty_data")
-	self:initManager("ArenaBountyData", "app/userdata/arena/arena_bounty_data")
 	self:initManager("TaskData", "app/userdata/task/task_data")
 	self:initManager("DailyTaskData", "app/userdata/task/daily_task_data")
 	self:initManager("IdleData", "app/userdata/idle/idle_data")
@ -33,14 +25,6 @@ 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)
@ -48,7 +32,7 @@ function DataManager:initManager(name, path)
 		self._cacheManager[name] = self[name]
 	end

-	if (name == "BattleData" or name == "BattlePVPData") and self._cacheManager[name] then
+	if name == "BattleData" and self._cacheManager[name] then
 	else
 		self[name] = require(path):create()
 	end
@ -85,16 +69,13 @@ function DataManager:checkDataBind()
 			if name == "BagData" then
 				changeBindFunc(baseData.ItemData, self[name].ItemData)
 			else
-				if baseData ~= self[name] then
-					changeBindFunc(baseData, self[name])
-				end
+				changeBindFunc(baseData, self[name])
 			end
 		end
    end
 end

 function DataManager:clear()
-	self.loginSuccess = false
 	self.initWithServer = false
 	if self.cacheTimer then
        SchedulerManager:unscheduleGlobal(self.cacheTimer)
@ -104,39 +85,23 @@ function DataManager:clear()
 	self.PlayerData:clear()
 	self.ChapterData:clear()
 	self.DailyChallengeData:clear()
-	self.DungeonData:clear()
-	self.ArenaData:clear()
-	self.CollectionData:clear()
 	self.HeroData:clear()
 	self.BagData:clear()
-	self.EquipData:clear()
-	self.SkinData:clear()
-	self.RunesData:clear()
 	self.FormationData:clear()
 	self.ActivityData:clear()
 	self.MailData:clear()
 	self.GoldPigData:clear()
 	self.BountyData:clear()
-	self.ArenaBountyData:clear()
 	self.DailyTaskData:clear()
 	self.IdleData:clear()
 	self.GrowthFundData: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)
@ -144,38 +109,24 @@ function DataManager:initWithServerData(data)
 	Time:setServerTimeZone(0)
 	Time:updateServerTime(data.now_ts)
 	Time:updateServerTimeToday(data.today_ts)
+	self.initWithServer = true

 	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())
 	self.todayFirstLogin = data.today_first_login
 	self.PlayerData:init(data)
 	self.ChapterData:init(data.chapter)
 	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)
-	self.RunesData:init(data.rune)
-	-- HeroData要在EquipData、SkinData、RunesData之后初始化，依赖它们的属性数据
 	self.HeroData:init(data.bag.heroes)
 	self.BagData:init(data.bag)
-	self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge)
-	self.DungeonData:initDungeonArmor(data.chapter_armor_challenge)
-	self.CollectionData:init(data.collection)
+	self.FormationData:init(data.fight_info)
 	self.TutorialData:init(data.guide)
 	self.MailData:init(data.mail_info)
+	self.ActivityData:init()
 	self.GoldPigData:init(data.pig, true)
 	self.BountyData:init(data.bounty)
-	self.ArenaBountyData:init(data.arena_bounty)
-	self.ArenaData:initGiftInfo(data.act_arena_gift, true)
 	-- 任务要在BountyData之后初始化，依赖BountyData的数据
 	self.DailyTaskData:init(data.task_daily)
 	self.IdleData:init(data.idle)
@ -184,56 +135,29 @@ function DataManager:initWithServerData(data)
 	self.ShopData:initActGift(data.act) -- 礼包购买信息
 	self.ShopData:initMallDaily(data.mall_daily) -- 每日特惠
 	self.ShopData:initCommonDailyGoldGift(data.mall_idle and data.mall_idle.ad_count) -- 常驻金币礼包
-	self.ShopData:initGrowUpGift(data.act_grow_up_gift2) -- 成长礼包
+	self.ShopData:initGrowUpGift(data.act_grow_up_gift, data.now_ts) -- 成长礼包
 	self.ShopData:initLevelUpGift(data.act_level_up_gift) -- 助力/金币礼包
-	self.ShopData:initIntroductGift(data.act_introductory_gift) -- 入门礼包
-	-- 活动要在礼包后初始化
-	self.ActivityData:init()
-	-- 商店礼包都初始化完了后检查一下每日红点
-	self.ShopData:checkShopDiscountRedPoint()
-	self.ShopData:checkLoginPopInfo() -- 需要写在shopdata所有初始化之后
 	self.SummonData:init(data.summon, true)
-	self.AIHelperData:init(nil, true)
 	-- 成长基金要在ShopData和PlayerDataBagData还有之后初始化，依赖这些数据
 	if data.fund then
 		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()
 	self:scheduleGlobal()
 	self:checkDataBind()
-	ModuleManager.ArenaManager:reqArenaInfo()
-
-	self:dealOpenActivity(data.activities)
-	-- 写在最后，防止某些数据还未初始化，就被bi访问报错
-	self.initWithServer = true
 end

 -- 是否首次登录
 function DataManager:getIsFirstLogin()
 	local nowTime = Time:getServerTime()
-	local offset = nowTime - (self.registerTs or 0)
-	if math.abs(offset) <= 10 and self:getIsTodayFirstLogin() then -- 允许误差
+	if self.registerTs%86400 == nowTime %8640 and self:getIsTodayFirstLogin() then
 		return true
 	end
 	return false
 end

-- 是否在新号24小时内
-function DataManager:getIsInCreate24Hour()
-	local nowTime = Time:getServerTime()
-	local passTime = nowTime - (self.registerTs or 0)
-	return passTime < 86400
-end
-
-function DataManager:getRegisterTs()
-	return self.registerTs or 0
-end
-
 function DataManager:getIsTodayFirstLogin()
 	return self.todayFirstLogin or false
 end
@ -430,149 +354,4 @@ 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
--- a/lua/app/common/event_manager.lua
+++ b/lua/app/common/event_manager.lua
@ -29,48 +29,13 @@ EventManager.CUSTOM_EVENT = {
 	SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC",
 	GO_SHOP = "GO_SHOP", -- 跳转商店
 	UPDATE_MAIN_MALL_HEIGHT = "UPDATE_MAIN_MALL_HEIGHT", -- 更新主要商品的高度
-	CHANGE_MAIN_COMP_MODULE = "CHANGE_MAIN_COMP_MODULE", -- 切换主界面模块
+	GO_DAILY_CHALLENGE = "GO_DAILY_CHALLENGE", -- 跳转每日挑战
+	GO_CHAPTER = "GO_CHAPTER", -- 跳转主线章节
 	CLOSE_BOX_HERO_UI = "CLOSE_BOX_HERO_UI",
 	CLOSE_BOX_OPEN_UI = "CLOSE_BOX_OPEN_UI",
 	BIND_ACCOUNT_SUCCESS = "BIND_ACCOUNT_SUCCESS",
-	CDKEY_FINISH = "CDKEY_FINISH",								-- CDKEY
-	DUNGEON_DAY_CHANGE = "DUNGEON_DAY_CHANGE",-- 副本跨天更新
-	DUNGEON_CHALLENGE = "DUNGEON_CHALLENGE",-- 副本开始挑战
-	DUNGEON_SWEEP = "DUNGEON_SWEEP",-- 副本开始扫荡
-	PLAYER_INFO_CLICK_AVATAR = "PLAYER_INFO_CLICK_AVATAR",-- 个人信息选择头像
-	PLAYER_INFO_CLICK_FRAME = "PLAYER_INFO_CLICK_FRAME",-- 个人信息选择头像框
-	RENAME_SUCCESS = "RENAME_SUCCESS",-- 重命名成功
-	GETED_REWARD_SUCCESS = "GETED_REWARD_SUCCESS",-- 获取奖励成功
-	-- 竞技场
-	ARENA_SEASON_SETTLEMENT = "ARENA_SEASON_SETTLEMENT",-- 赛季结算
-	ARENA_SEASON_END = "ARENA_SEASON_END",-- 赛季结束
-	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",
 	-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
 	-- 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等封装好的接口
--- a/lua/app/common/i18n_manager.lua
+++ b/lua/app/common/i18n_manager.lua
@ -28,21 +28,21 @@ local CONFIG_PATH = "app/config/strings/%s/"

 local SUPPORT_LANGUAGE_LIST = {
 	GConst.LANGUAGE.ENGLISH,
-	GConst.LANGUAGE.JAPANESE, -- 日本
-	GConst.LANGUAGE.KOREAN, -- 韩国
-	GConst.LANGUAGE.CHINESE_TC,
 	GConst.LANGUAGE.CHINESE,
-	-- GConst.LANGUAGE.RUSSIAN, -- 俄罗斯
-	GConst.LANGUAGE.PORTUGUESE, -- 葡萄牙
-	GConst.LANGUAGE.VIETNAMESE, -- 越南
-	GConst.LANGUAGE.INDONESIA, -- 印度尼西亚
-	GConst.LANGUAGE.THAILAND, -- 泰国
+	GConst.LANGUAGE.CHINESE_TC,
+	-- -- GConst.LANGUAGE.RUSSIAN, -- 俄罗斯
+	-- -- GConst.LANGUAGE.THAILAND, -- 泰国
+	-- GConst.LANGUAGE.INDONESIA, -- 印度尼西亚
+	-- GConst.LANGUAGE.VIETNAMESE, -- 越南
 	-- GConst.LANGUAGE.FRENCH, -- 法语
-	-- GConst.LANGUAGE.ITALIAN, -- 意大利
+	-- -- GConst.LANGUAGE.ITALIAN, -- 意大利
 	-- GConst.LANGUAGE.GERMAN, -- 德国
-	GConst.LANGUAGE.SPANISH, -- 西班牙
-	-- GConst.LANGUAGE.TURKISH, -- 土耳其
-	-- GConst.LANGUAGE.MALAYSIA, -- 马来西亚
+	-- -- GConst.LANGUAGE.SPANISH, -- 西班牙
+	-- GConst.LANGUAGE.PORTUGUESE, -- 葡萄牙
+	-- -- GConst.LANGUAGE.TURKISH, -- 土耳其
+	-- -- GConst.LANGUAGE.MALAYSIA, -- 马来西亚
+	-- GConst.LANGUAGE.JAPANESE, -- 日本
+	-- GConst.LANGUAGE.KOREAN, -- 韩国
 }

 local SUPPORT_SERVER_LANGUAGE = {
@ -57,8 +57,25 @@ local SUPPORT_SERVER_LANGUAGE = {
 	[GConst.LANGUAGE.VIETNAMESE] = "vi_VN",
 	[GConst.LANGUAGE.JAPANESE] = "ja_JP",
 	[GConst.LANGUAGE.KOREAN] = "ko_KR",
-	[GConst.LANGUAGE.SPANISH] = "es_ES",
-	[GConst.LANGUAGE.PORTUGUESE] = "pt_BR",
+}
+
+local LANGUAGE_NAME_KEY = {
+	[GConst.LANGUAGE.ENGLISH] = 1,
+	[GConst.LANGUAGE.CHINESE] = 1,
+	[GConst.LANGUAGE.CHINESE_TC] = 1,
+	[GConst.LANGUAGE.FRENCH] = 1,
+	-- [GConst.LANGUAGE.ITALIAN] = 1,
+	[GConst.LANGUAGE.GERMAN] = 1,
+	-- [GConst.LANGUAGE.SPANISH] = 1,
+	-- [GConst.LANGUAGE.RUSSIAN] = 1,
+	[GConst.LANGUAGE.PORTUGUESE] = 1,
+	-- [GConst.LANGUAGE.TURKISH] = 1,
+	-- [GConst.LANGUAGE.THAILAND] = 1,
+	-- [GConst.LANGUAGE.MALAYSIA] = 1,
+	[GConst.LANGUAGE.INDONESIA] = 1,
+	[GConst.LANGUAGE.VIETNAMESE] = 1,
+	[GConst.LANGUAGE.JAPANESE] = 1,
+	[GConst.LANGUAGE.KOREAN] = 1,
 }

 local MOBILE_LANG_MAP = {
@ -84,6 +101,7 @@ local LANGUAGE_NOMARL_SPRITE = {
 	[GConst.LANGUAGE.ENGLISH] = "setting_language_en1",
 	[GConst.LANGUAGE.CHINESE] = "setting_language_cn1",
 	[GConst.LANGUAGE.CHINESE_TC] = "setting_language_tw1",
+
 	[GConst.LANGUAGE.FRENCH] = "setting_language_fr1",
 	[GConst.LANGUAGE.ITALIAN] = "setting_language_it1",
 	[GConst.LANGUAGE.GERMAN] = "setting_language_de1",
@ -101,6 +119,7 @@ local LANGUAGE_HIGHLIGHT_SPRITE = {
 	[GConst.LANGUAGE.ENGLISH] = "setting_language_en2",
 	[GConst.LANGUAGE.CHINESE] = "setting_language_cn2",
 	[GConst.LANGUAGE.CHINESE_TC] = "setting_language_tw2",
+
 	[GConst.LANGUAGE.FRENCH] = "setting_language_fr2",
 	[GConst.LANGUAGE.ITALIAN] = "setting_language_it2",
 	[GConst.LANGUAGE.GERMAN] = "setting_language_de2",
@ -129,13 +148,7 @@ function I18N:init()
 end

 function I18N:supportLanguage(language)
-	if self.supportLanguageMap == nil then
-		self.supportLanguageMap = {}
-		for k, v in ipairs(SUPPORT_LANGUAGE_LIST) do
-			self.supportLanguageMap[v] = true
-		end
-	end
-	return self.supportLanguageMap[language]
+	return LANGUAGE_NAME_KEY[language]
 end

 function I18N:setLanguage(language, firstInit)
--- a/lua/app/common/local_data.lua
+++ b/lua/app/common/local_data.lua
@ -13,10 +13,7 @@ local LOCAL_DATA_KEY = {
 	LAST_LOGIN_URL = "LAST_LOGIN_URL",
 	LAST_LOGIN_NAME = "LAST_LOGIN_NAME",
 	LAST_LOGIN_IP = "LAST_LOGIN_IP",
-	LAST_LOGIN_INFO = "LAST_LOGIN_INFO", -- 上一次登录成功的信息
-	LAST_LOGIN_TYPE = "LAST_LOGIN_TYPE", -- 上次登录类型 token不记录
 	ACCOUNT_INFO = "ACCOUNT_INFO",
-	SEND_QUEUE = "SEND_QUEUE",
 	SDK_LOGIN_TYPE = "SDK_LOGIN_TYPE",

 	NEED_UPDATE = "NEED_UPDATE",								-- 需要更新
@ -31,19 +28,6 @@ local LOCAL_DATA_KEY = {
 	GATE = "GATE",
 	BOUNTY_POP_TIME = "BOUNTY_POP_TIME",
 	CHALLENGE_TASK_POP_TIME = "CHALLENGE_TASK_POP_TIME",
-	NEW_AVATAR_AND_FRAME = "NEW_AVATAR_AND_FRAME",
-	SHOP_DISCOUNT_RED_POINT_TIME = "SHOP_DISCOUNT_RED_POINT_TIME",
-	ARENA_BOUNTY_POP_TIME = "ARENA_BOUNTY_POP_TIME",
-	LINK_TOUCH_CANCEL_COUNT = "LINK_TOUCH_CANCEL_COUNT",
-	ARENA_TODAY_BATTLE_COUNT = "ARENA_TODAY_BATTLE_COUNT",
-	TRIAL_HERO = "TRIAL_HERO",
-	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
@ -108,7 +92,7 @@ end

 -- 跟角色挂钩的唯一id
 function LocalData:getRoleKey(key)
-	local uid = DataManager.PlayerData:getAcountId()
+	local uid = DataManager.PlayerData:getUid()
 	if uid == "" then
 		Logger.logError("check roleid error!")
 	end
@ -235,19 +219,10 @@ function LocalData:setLastLoginInfo(loginType, id, token)
 	self:setString(LOCAL_DATA_KEY.LAST_LOGIN_INFO, str)
 end

-function LocalData:setLastLoginType(loginType)
-	self:setString(LOCAL_DATA_KEY.LAST_LOGIN_TYPE, loginType)
-end
-
 function LocalData:getLastLoginInfo()
 	local str = self:getString(LOCAL_DATA_KEY.LAST_LOGIN_INFO, "{}")
-	local info = json.decode(str) or {}
+	local info = json.decode(str)
 	info.type = info.type or NetManager.LOGIN_TYPE.ANONYMOUS
-	if type(info.type) == "number" then
-		if info.type == SDKManager.BF_LOGIN_TYPE.GOOGLE then
-			info.type = NetManager.LOGIN_TYPE.GOOGLE
-		end
-	end
 	info.id = info.id or DeviceHelper:getDeviceId()
 	info.token = info.token
 	return info
@ -379,128 +354,4 @@ function LocalData:getChallengeTaskPopTime()
 	return self:getInt(LOCAL_DATA_KEY.CHALLENGE_TASK_POP_TIME, 0)
 end

-function LocalData:getShopDiscountRedPointTime()
-	return self:getInt(LOCAL_DATA_KEY.SHOP_DISCOUNT_RED_POINT_TIME, 0)
-end
-
-function LocalData:setShopDiscountRedPointTime(time)
-	self:setInt(LOCAL_DATA_KEY.SHOP_DISCOUNT_RED_POINT_TIME, time)
-end
-
-function LocalData:getNewAvatarAndFrame()
-	local info = json.decode(self:getString(LOCAL_DATA_KEY.NEW_AVATAR_AND_FRAME, "{}"))
-	-- Logger.logHighlight("获取新头像/头像框状态")
-	-- Logger.printTable(info)
-	return info
-end
-
-function LocalData:setNewAvatarAndFrame(info)
-	-- Logger.logHighlight("保存新头像/头像框状态")
-	-- Logger.printTable(info)
-	if not info then
-		return
-	end
-	local str = json.encode(info)
-	self:setString(LOCAL_DATA_KEY.NEW_AVATAR_AND_FRAME, str)
-end
-
-function LocalData:setArenaBountyPopTime(time)
-	self:setInt(LOCAL_DATA_KEY.ARENA_BOUNTY_POP_TIME, time)
-end
-
-function LocalData:getArenaBountyPopTime()
-	return self:getInt(LOCAL_DATA_KEY.ARENA_BOUNTY_POP_TIME, 0)
-end
-
-function LocalData:setLinkTouchCancelCount(count)
-	self:setInt(LOCAL_DATA_KEY.LINK_TOUCH_CANCEL_COUNT, count)
-end
-
-function LocalData:getLinkTouchCancelCount()
-	return self:getInt(LOCAL_DATA_KEY.LINK_TOUCH_CANCEL_COUNT, 0)
-end
-
-function LocalData:getTodayArenaBattleCount()
-	return self:getInt(LOCAL_DATA_KEY.ARENA_TODAY_BATTLE_COUNT .. Time:getBeginningOfServerToday(), 0)
-end
-
-function LocalData:recordTodayArenaBattle()
-	local value = self:getTodayArenaBattleCount()
-	self:setInt(LOCAL_DATA_KEY.ARENA_TODAY_BATTLE_COUNT .. Time:getBeginningOfServerToday(), value + 1)
-end
-
-function LocalData:MarkTrailHero()
-	self:setInt(LocalData:getRoleKey(LOCAL_DATA_KEY.TRIAL_HERO), 1)
-end
-
-function LocalData:GetMarktrailHero()
-	return self:getInt(LocalData:getRoleKey(LOCAL_DATA_KEY.TRIAL_HERO), 0)
-end
-
-function LocalData:saveBattleSnapshot(snapshot)
-	if EDITOR_MODE then
-		Logger.logHighlight(json.encode(snapshot))
-	end
-	self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot))
-	LocalData:save()
-end
-
-function LocalData:getBattleSnapshot()
-	local dealedSnapshot = self:getString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), "{}")
-	if EDITOR_MODE then
-		Logger.logHighlight(dealedSnapshot)
-	end
-	return json.decode(dealedSnapshot)
-end
-
-function LocalData:getTodayActSummerWatchedSkin()
-	return self:getInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_SKIN .. Time:getBeginningOfServerToday(), 0) == 1
-end
-
-function LocalData:recordTodayActSummerWatchedSkin()
-	self:setInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_SKIN .. Time:getBeginningOfServerToday(), 1)
-end
-
-function LocalData:getTodayActSummerWatchedHero()
-	return self:getInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_HERO .. Time:getBeginningOfServerToday(), 0) == 1
-end
-
-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
--- a/lua/app/common/module_manager.lua
+++ b/lua/app/common/module_manager.lua
@ -39,8 +39,6 @@ local MODULE_PATHS = {
 	CommerceManager = "app/module/commerce/commerce_manager",
 	-- 战令
 	BountyManager = "app/module/bounty/bounty_manager",
-	-- 竞技场战令
-	ArenaBountyManager = "app/module/arena/arena_bounty_manager",
 	-- 道具
 	ItemManager = "app/module/item/item_manager",
 	-- 商店
@ -53,40 +51,6 @@ local MODULE_PATHS = {
 	PlayerManager = "app/module/player/player_manager",
 	-- 账号
 	AccountManager= "app/module/account/account_manager",
-	-- 活动副本
-	DungeonManager = "app/module/dungeon/dungeon_manager",
-	-- 竞技场
-	ArenaManager = "app/module/arena/arena_manager",
-	-- 图鉴
-	CollectionManager = "app/module/collection/collection_manager",
-	-- 通用
-	CommonManager = "app/module/common/common_manager",
-	-- 武器副本
-	DungeonWeaponManager = "app/module/dungeon_weapon/dungeon_weapon_manager",
-	-- 防具副本
-	DungeonArmorManager = "app/module/dungeon_armor/dungeon_armor_manager",
-	-- 装备
-	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
@ -98,7 +62,6 @@ ModuleManager.MODULE_KEY = {
 	STORE_BOX_3_OPEN = "store_box_3_open",
 	BOUNTY_OPEN = "bounty_open",
 	IDLE_DROP = "idle_drop",
-	ACTIVITY = "activity_open",
 	MALL = "mall", -- 商城
 	MALL_DAILY = "mall_daily", -- 每日商城
 	DAILY_CHALLENGE = "daily_challenge", -- 每日挑战
@ -107,18 +70,6 @@ ModuleManager.MODULE_KEY = {
 	FIRST_RECHARGE = "first_charge", -- 首充礼包
 	BEGINNER_GIFT = "new_player_gift", -- 新手礼包
 	MAIL = "mail_open", -- 邮件
-	DUNGEON_SHARDS = "dungeon_shards_open", -- 碎片副本
-	DUNGEON_GOLD = "dungeon_gold_open", -- 金币副本
-	INTRODUCT_GIFT = "introduct_gift", -- 入门礼包
-	ARENA = "arena_open", -- 竞技场
-	ARENA_GIFT = "act_arena_gift", -- 竞技场礼包
-	COLLECT = "collection_open", -- 收集
-	DUNGEON_ARMOR = "dungeon_armor_open", -- 支线副本
-	DUNGEON_WEAPON = "dungeon_weapon_open", -- 装备副本
-	EQUIP_WEAPON = "equip_weapon_open", -- 武器
-	EQUIP_ARMOR = "equip_armor_open", -- 防具
-	SKIN = "skin_open", -- 皮肤
-	RUNES_OPEN = "runes_open", -- 符文
 }

 local _moduleMgrs = {}
@ -141,9 +92,6 @@ setmetatable(ModuleManager, MODULE_METATABLE)
 function ModuleManager:init()
 	ModuleManager.TaskManager:init()
 	ModuleManager.DailyChallengeManager:init()
-	ModuleManager.PlayerManager:init()
-	ModuleManager.SkinManager:init()
-	ModuleManager.TournArenaManager:init()
 end

 -- 功能是否开启
--- a/lua/app/common/pay_manager.lua
+++ b/lua/app/common/pay_manager.lua
@ -1,39 +1,22 @@
 local PayManager = class("PayManager", BaseModule)

+local BLESSING_GIFT_ID = 30001
+
 PayManager.PURCHARSE_TYPE = {
    ACT_GIFT = 1,
    ACT_GOLD_PIG = 2,
    CHAPTER_GIFT = 3,
-    GROW_UP_GIFT = 4,-- 已废弃
+    GROW_UP_GIFT = 4,
    MALL_TREASURE = 5,
-    GROW_UP_GIFT_NEW = 6,
 }

 PayManager.PURCHARSE_ACT_TYPE = {
    FIRST_RECHARGE = 1,
    COIN_GIFT = 2,
-    INTRODUCTORY_GIFT = 3,
    BEGINNER_GIFT = 4,
    LEVEL_UP_GIFT = 5,
    GROWTH_FUND = 6,
    BOUNTY = 7,
-    ARENA_BOUNTY = 8,
-    ARENA_GIFT = 9,
-    ARMOR_FUND = 10,
-    WEAPON_GIFT = 11,
-    ARMOR_GIFT = 12,
-    ACT_SUMMER = 13,
-    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 = {
@ -41,73 +24,37 @@ PayManager.PURCHARSE_TYPE_CONFIG = {
    [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = "act_gold_pig",
    [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = "mall_treasure",
    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "act_chapter_store",
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "act_growup_gift_new",
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "act_growup_gift",
 }

 PayManager.BI_ITEM_GET_TYPE = {
    [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
        [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = BIReport.ITEM_GET_TYPE.FIRST_RECHARGE,
        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = BIReport.ITEM_GET_TYPE.COIN_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.INTRODUCTORY_GIFT] = BIReport.ITEM_GET_TYPE.INTRODUCTORY_GIFT,
        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = BIReport.ITEM_GET_TYPE.BEGINNER_GIFT,
        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = BIReport.ITEM_GET_TYPE.LEVEL_UP_GIFT,
        [PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND] = BIReport.ITEM_GET_TYPE.GROWTH_FUND,
        [PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.ITEM_GET_TYPE.BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.ARENA_BOUNTY] = BIReport.ITEM_GET_TYPE.ARENA_BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.ARENA_GIFT] = BIReport.ITEM_GET_TYPE.ARENA_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.ITEM_GET_TYPE.ARMOR_FUND,
-        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.ITEM_GET_TYPE.ACT_SUMMER,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
-        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
-        [PayManager.PURCHARSE_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,
    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = BIReport.ITEM_GET_TYPE.ACT_CHAPTER_STORE,
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = BIReport.ITEM_GET_TYPE.GROW_UP_GIFT_NEW,
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = BIReport.ITEM_GET_TYPE.GROW_UP_GIFT,
 }

 PayManager.BI_GIFT_TYPE = {
    [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
        [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = BIReport.GIFT_TYPE.FIRST_RECHARGE,
        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = BIReport.GIFT_TYPE.COIN_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.INTRODUCTORY_GIFT] = BIReport.GIFT_TYPE.INTRODUCTORY_GIFT,
        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = BIReport.GIFT_TYPE.BEGINNER_GIFT,
        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = BIReport.GIFT_TYPE.LEVEL_UP_GIFT,
        [PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND] = BIReport.GIFT_TYPE.GROWTH_FUND,
        [PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.GIFT_TYPE.BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.ARENA_BOUNTY] = BIReport.GIFT_TYPE.ARENA_BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.ARENA_GIFT] = BIReport.GIFT_TYPE.ARENA_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.GIFT_TYPE.ARMOR_FUND,
-        [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.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,
    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = BIReport.GIFT_TYPE.ACT_CHAPTER_STORE,
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = BIReport.GIFT_TYPE.GROW_UP_GIFT_NEW,
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = BIReport.GIFT_TYPE.GROW_UP_GIFT,
 }

 function PayManager:getItemGetType(purchaseType, id)
@ -162,18 +109,6 @@ function PayManager:getGiftConfigInfo(purchaseType, id)
    return cfg[id]
 end

-function PayManager:getPackageRechargeId(purchaseType, id)
-    local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[purchaseType]
-    if not cfgName then
-        return
-    end
-    local cfg = ConfigManager:getConfig(cfgName)
-    if not cfg or not cfg[id] then
-        return
-    end
-    return cfg[id].recharge_id
-end
-
 function PayManager:purchasePackage(id, purchaseType)
    local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[purchaseType]
    if not cfgName then
@ -198,8 +133,8 @@ function PayManager:purchasePackage(id, purchaseType)
    self:checkAndPay(productId, id, purchaseType, rechargeId)
 end

-function PayManager:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback)
-    self:sendMsgToServer(purchaseToken, orderId, originOrderId, productId, function(binder, msgData)
+function PayManager:requestRewards(purchaseToken, orderId, originOrderId, notShowRewardsBox)
+    self:sendMsgToServer(purchaseToken, orderId, function(binder, msgData)
        if msgData.status == 0 then
            local showRewards = not notShowRewardsBox
            if DataManager.TutorialData and DataManager.TutorialData:getIsInTutorial() then -- 引导时不弹
@ -220,7 +155,6 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, produc
                local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.act_type]
                local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id]
                local rechargeId = cfgInfo.recharge_id
-                local beforCount = DataManager.PlayerData:getPayCounts(rechargeId)
                DataManager.PlayerData:addPayment(rechargeId)
                DataManager.ShopData:addPayment(rechargeId) -- 降档版本
                DataManager.ShopData:updateGiftInfo(gift)
@ -229,53 +163,23 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, produc
                    giftId = gift.id,
                    rechargeId = cfgInfo.recharge_id
                })
-                if beforCount <= 0 then
-                    BIReport:postFirstRechargeEvent(rechargeId)
-                end
            end)

            for _, info in ipairs(biPayGetInfo) do
-                local giftType = PayManager:getGiftType(info.giftType, info.giftId)
-                BIReport:postPayGet(giftType, info.giftId, info.rechargeId, orderId, originOrderId, 1, msgData.rewards or {})
+                BIReport:postPayGet(info.giftType, info.giftId, info.rechargeId, orderId, originOrderId, 1, msgData.rewards or {})
                local rechargeCfg = ConfigManager:getConfig("recharge")[info.rechargeId]
                if rechargeCfg then
                    BIReport:postPurchase(rechargeCfg.price, rechargeCfg.payId, originOrderId, orderId)
                end
            end

-            -- 支付上报
-            local data = {}
-            data.pay_money = DataManager.PlayerData:getTotalPayAmount()
-            data.pay_count = DataManager.PlayerData:getPayCount()
-            CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
-
            -- 支付验证成功后消耗此订单
-            if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
-                if purchaseToken then
-                    SDKManager:consumePurchase(purchaseToken)
-                end
-            elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
-                if productId then
-                    SDKManager:consumePurchase(productId)
-                    SDKManager:delIosOrder(productId)
-                end
-                if originOrderId ~= "gm" then
-                    SDKManager:delIosPayInfo(originOrderId)
-                end
+            if purchaseToken then
+                SDKManager:consumePurchase(purchaseToken)
            end
        elseif msgData.status == 1008 then -- 验证异常,但是需要消耗订单
-            if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
-                if purchaseToken then
-                    SDKManager:consumePurchase(purchaseToken)
-                end
-            elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
-                if productId then
-                    SDKManager:consumePurchase(productId)
-                    SDKManager:delIosOrder(productId)
-                end
-                if originOrderId ~= "gm" then
-                    SDKManager:delIosPayInfo(originOrderId)
-                end
+            if purchaseToken then
+                SDKManager:consumePurchase(purchaseToken)
            end
            Logger.logError("重复验证")
        else
@ -287,9 +191,6 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, produc
            }
            GFunc.showMessageBox(params)
        end
-        if callback then
-            callback()
-        end
    end)
 end

@ -302,9 +203,9 @@ function PayManager:checkAndPay(productId, id, purchaseType, rechargeId)
                    if msgData.uuid and msgData.uuid ~= GConst.EMPTY_STRING then
                        local giftType = PayManager:getGiftType(purchaseType, id)
                        BIReport:postPayTurn(giftType, id, rechargeId)
-                        SDKManager:pay(productId, msgData.uuid, rechargeId, giftType, purchaseType, id, function(purchaseToken, orderId, originOrderId)
+                        SDKManager:pay(productId, msgData.uuid, rechargeId, giftType, id, function(purchaseToken, orderId, originOrderId)
                            if purchaseToken and orderId then
-                                self:requestRewards(purchaseToken, orderId, originOrderId, productId)
+                                self:requestRewards(purchaseToken, orderId, originOrderId)
                            end
                        end)
                    else -- 没有支付信息，直接发奖
@ -326,8 +227,15 @@ function PayManager:checkAndPay(productId, id, purchaseType, rechargeId)
    end)
 end

-function PayManager:sendMsgToServer(purchaseToken, uuid, originOrderId, productId, callback)
-    local args = SDKManager:getPurchaseArgs(purchaseToken, uuid, originOrderId, productId)
+function PayManager:sendMsgToServer(purchaseToken, orderId, callback)
+    local args = {
+        uuid = {orderId},
+        channel = SDKManager:getSDKPayType(),
+        pay_token = purchaseToken
+    }
+    if EDITOR_MODE then
+        args.channel = SDKManager.PAY_TYPE.DEBUG
+    end
    self:sendMessage(ProtoMsgType.FromMsgEnum.ActPaidResultReq, args, {}, callback)
 end

--- a/lua/app/common/platform.lua
+++ b/lua/app/common/platform.lua
@ -87,7 +87,7 @@ end
 function Platform:getPlatformStr()
    if self.platformStr == nil then
        if self:isIosPlatform() then
-            self.platformStr = "iOS"
+            self.platformStr = "IOS"
        elseif self:isAndroidPlatform() then
            self.platformStr = "Android"
        else
--- a/lua/app/common/sdk_manager.lua
+++ b/lua/app/common/sdk_manager.lua
@ -40,9 +40,8 @@ SDKManager.LOGIN_TYPE = {
 SDKManager.PAY_TYPE = {
 	NONE = 0,
 	GOOGLE = 1,
-	APPLE = 2,
-	DEBUG = 10,
-	DEPRECATED_APPLE = 11,
+	IOS = 2,
+	DEBUG = 10
 }

 local PAY_TYPE_IN_APP = "inapp"
@ -68,12 +67,10 @@ function SDKManager:init()
 	local SDKMgr = CS.BF.BFMain.Instance.SDKMgr
 	self:initPay()
 	self:initPayListener()
-	-- 初始化AF的广告回传SDK
-	CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:InitAppsFlyerAdRevenue()
 	self:initAdsListener()

 	-- 拿到firebasetoken
-	self:initFireBaseToken()
+	-- self:initFireBaseToken()
 end

 -- 支付相关接口 ********************************************************************** 开始
@ -153,11 +150,6 @@ function SDKManager:getIsSupportSDKPay()
 	return SDKPayMgr:getIsSupportSDKPay()
 end

-- 获取支付参数
-function SDKManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
-	return SDKPayMgr:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
-end
-
 -- sdk将已完成的订单消耗掉
 function SDKManager:consumePurchase(token, callback)
 	SDKPayMgr:consumePurchase(token, callback)
@ -174,32 +166,14 @@ function SDKManager:checkPay(productId, callback)
 end

 -- 支付
-function SDKManager:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
-	SDKPayMgr:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+function SDKManager:pay(productId, orderId, rechargeId, giftType, giftId, callback)
+	SDKPayMgr:pay(productId, orderId, rechargeId, giftType, giftId, callback)
 end

 function SDKManager:doUncompletePay(callback)
 	SDKPayMgr:doUncompletePay(callback)
 end

-function SDKManager:getIosPayInfo(transactionID)
-	if SDKPayMgr.getIosPayInfo then
-		return SDKPayMgr:getIosPayInfo(transactionID)
-	end
-end
-
-function SDKManager:delIosPayInfo(transactionID)
-	if SDKPayMgr.delIosPayInfo then
-		return SDKPayMgr:delIosPayInfo(transactionID)
-	end
-end
-
-function SDKManager:delIosOrder(productId)
-	if SDKPayMgr.delIosOrder then
-		return SDKPayMgr:delIosOrder(productId)
-	end
-end
-
 -- 支付相关接口 ********************************************************************** 结束

 -- 获取设备语言
@ -215,10 +189,16 @@ end
 function SDKManager:initFireBaseToken()
 	CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr:GetFirebaseToken(function(token)
 		self.firebaseToken = token
-		CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:AdjustSetDeviceToken(token)
 	end)
 end

+function SDKManager:getFirebaseToken()
+	CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr:GetFirebaseToken(function(token)
+		self.firebaseToken = token
+	end)
+	return self.firebaseToken
+end
+
 function SDKManager:doNextFrame(callback)
 	SchedulerManager:performWithDelayGlobal(callback, 0)
 end
@ -264,12 +244,6 @@ function SDKManager:initAdsListener()
 		end)
 		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:SetAdEarnedRewardCallback(function(code, result)
 			if self.adCallback then
-				if DataManager.PlayerData then
-					DataManager.PlayerData:addAdCount()
-					local data = {}
-					data.ads_num = DataManager.PlayerData:getAdCount()
-					CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
-				end
 				self:adRewradAd()
 				self.adCallback()
 				BIReport:postAdRewardGet(self.adsClickType)
@ -277,19 +251,9 @@ function SDKManager:initAdsListener()
 				self.adCallback = nil
 			end
 		end)
-        CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:SetAdRevenuePaidEventCallback(function (result)
-            if result and result ~= GConst.EMPTY_STRING then
-                BIReport:postIronSourceAdRevenue(result)
-            end
-        end)
 	elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
 		-- 初始化一下
 		local adManager = CS.AdManager.Instance
-        adManager:SetAdRevenuePaidEventCallback(function (result)
-            if result and result ~= GConst.EMPTY_STRING then
-                BIReport:postAppLovinAdRevenue(result)
-            end
-        end)
 	end
 end

@ -308,12 +272,6 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback)

 	BIReport:postAdClick(adsClickType)
 	if EDITOR_MODE then
-		if DataManager.PlayerData then
-			DataManager.PlayerData:addAdCount()
-			local data = {}
-			data.ads_num = DataManager.PlayerData:getAdCount()
-			CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
-		end
 		self:adRewradAd()
 		if adCallback then
 			adCallback()
@ -356,12 +314,6 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback)
 		BIReport:postAdPlaySuccess(self.adsClickType)
 		CS.AdManager.Instance:ShowRewardedAd(function(code)
 			if code == 0 then
-				if DataManager.PlayerData then
-					DataManager.PlayerData:addAdCount()
-					local data = {}
-					data.ads_num = DataManager.PlayerData:getAdCount()
-					CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
-				end
 				self:adRewradAd()
 				if adCallback then
 					adCallback()
@ -375,9 +327,10 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback)
 end

 function SDKManager:adRewradAd(noReport)
+	Logger.logHighlight("-------------------")
 	ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_WATCH_AD)
 	if not noReport then
-		BIReport:postAdEvent()
+		-- BIReport:postAdEvent()
 	end
 end

@ -387,7 +340,6 @@ function SDKManager:getServerList(callback)
 		bundle_id = Platform:getIdentifier(),
 		version = Platform:getClientVersion(),
 		device_id = DeviceHelper:getDeviceId(),
-		language = I18N:getLanguageAndArea(),
 		env = "release",-- 暂时写死
 	}
 	local loginCenterUrl = CS.BF.BFPlatform.GetLoginCenterURL()
--- a/lua/app/common/sdk_pay_default_manager.lua
+++ b/lua/app/common/sdk_pay_default_manager.lua
@ -31,20 +31,9 @@ function SDKPayDefaultManager:getPriceCurrencyCode(skuId)
 end

 function SDKPayDefaultManager:getSDKPayType()
-	if EDITOR_MODE then
-        return SDKManager.PAY_TYPE.DEBUG
-    end
 	return SDKManager.PAY_TYPE.NONE
 end

-function SDKPayDefaultManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
-	local args = {
-		channel = self:getSDKPayType(),
-		params = {uuid, productId}
-	}
-	return args
-end
-
 -- 获取支付方式,目前只有google支付
 function SDKPayDefaultManager:getIsSupportSDKPay()
 	return false
@ -56,7 +45,7 @@ function SDKPayDefaultManager:checkPay(productId, callback)
 end

 -- 支付
-function SDKPayDefaultManager:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+function SDKPayDefaultManager:pay(productId, orderId, rechargeId, giftType, giftId, callback)
 	callback("", orderId)
 end

--- a/lua/app/common/sdk_pay_google_manager.lua
+++ b/lua/app/common/sdk_pay_google_manager.lua
@ -28,7 +28,7 @@ function SDKPayGoogleManager.onGooglePayDelayCallback(code, msg)
 			return
 		end
 		if result.obfuscatedAccountId then
-			PayManager:requestRewards(purchaseToken, result.obfuscatedAccountId, result.orderId, result.productId)
+			PayManager:requestRewards(purchaseToken, result.obfuscatedAccountId, result.orderId)
 		end
 	end
 end
@ -66,7 +66,6 @@ function SDKPayGoogleManager:queryProducts(callback)
 					if #subsList > 0 then
 						self:queryProductInfo(PAY_TYPE_SUBS, json.encode(subsList), function(code, msg)
 							if code == 0 then
-								self.queryProductsOver = true
 								if msg and msg ~= "" then -- 更新products
 									local jData = json.decode(msg)
 									if jData and #jData > 0 then
@ -81,7 +80,6 @@ function SDKPayGoogleManager:queryProducts(callback)
 							end
 						end)
 					else
-						self.queryProductsOver = true
 						if callback then
 							callback()
 						end
@ -127,12 +125,9 @@ function SDKPayGoogleManager:reqPayReward(uncompleteList, productId, callback)
 		elseif uncompleteOrder.purchaseToken then
 			-- 去服务器验证
 			if uncompleteOrder.obfuscatedAccountId then
-				PayManager:requestRewards(uncompleteOrder.purchaseToken, uncompleteOrder.obfuscatedAccountId, uncompleteOrder.orderId, uncompleteOrder.productId, true, function()
-					index = index + 1
-					handleOrder(uncompleteList[index])
-				end)
+				PayManager:requestRewards(uncompleteOrder.purchaseToken, uncompleteOrder.obfuscatedAccountId, uncompleteOrder.orderId, true)
 			else
-				self:consumePurchase(uncompleteOrder.purchaseToken, function()
+				SDKManager:consumePurchase(uncompleteOrder.purchaseToken, function()
 					index = index + 1
 					handleOrder(uncompleteList[index])
 				end)
@ -241,15 +236,11 @@ function SDKPayGoogleManager:getPriceCurrencyCode(skuId)
 end

 function SDKPayGoogleManager:getSDKPayType()
-	return SDKManager.PAY_TYPE.GOOGLE
-end
-
-function SDKPayGoogleManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
-	local args = {
-		channel = self:getSDKPayType(),
-		params = {purchaseToken, productId}
-	}
-	return args
+	if Platform:getIsPublishChannel() then
+		return SDKManager.PAY_TYPE.GOOGLE
+	else
+		return SDKManager.PAY_TYPE.NONE
+	end
 end

 -- 获取支付方式,目前只有google支付
@ -264,55 +255,51 @@ end
 -- 检查是否可以支付
 function SDKPayGoogleManager:checkPay(productId, callback)
 	if self:_getIsGoogleStoreConnected() then -- google商店是否初始化
-		self:queryProducts(function()
-			self:doUncompleteOrder(function(code) -- 先处理未完成的订单
-				if code == 0 then
-					callback(0)
-				elseif code == 1 then -- 指定的productId存在支付状态中的订单
-					local params = {
-						content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
-						boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
-						okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
-					}
-					GFunc.showMessageBox(params)
-				elseif code == 2 then -- 指定的productId存在未完成的订单消耗失败的情况
-					local params = {
-						content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
-						boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
-						okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
-					}
-					GFunc.showMessageBox(params)
-				else -- 存在未完成的订单消耗失败的情况，但是因为不是当前productId，所以允许继续支付
-					callback(0)
-				end
-			end, productId)
-		end)
+		self:doUncompleteOrder(function(code) -- 先处理未完成的订单
+			if code == 0 then
+				callback(0)
+			elseif code == 1 then -- 指定的productId存在支付状态中的订单
+				local params = {
+					content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+					boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
+					okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+				}
+				GFunc.showMessageBox(params)
+			elseif code == 2 then -- 指定的productId存在未完成的订单消耗失败的情况
+				local params = {
+					content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+					boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
+					okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+				}
+				GFunc.showMessageBox(params)
+			else -- 存在未完成的订单消耗失败的情况，但是因为不是当前productId，所以允许继续支付
+				callback(0)
+			end
+		end, productId)
 	else
 		self:connectGoogleStore(function(code)
 			if code == 0 then
-				self:queryProducts(function()
-					self:doUncompleteOrder(function(consumeSucc)
-						if code == 0 then
-							callback(0)
-						elseif code == 1 then -- 指定的productId存在支付状态中的订单
-							local params = {
-								content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
-								boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
-								okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
-							}
-							GFunc.showMessageBox(params)
-						elseif code == 2 then -- 指定的productId存在未完成的订单消耗失败的情况
-							local params = {
-								content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
-								boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
-								okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
-							}
-							GFunc.showMessageBox(params)
-						else -- 存在未完成的订单消耗失败的情况，但是因为不是当前productId，所以允许继续支付
-							callback(0)
-						end
-					end, productId)
-				end)
+				self:doUncompleteOrder(function(consumeSucc)
+					if code == 0 then
+						callback(0)
+					elseif code == 1 then -- 指定的productId存在支付状态中的订单
+						local params = {
+							content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+							boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
+							okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+						}
+						GFunc.showMessageBox(params)
+					elseif code == 2 then -- 指定的productId存在未完成的订单消耗失败的情况
+						local params = {
+							content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+							boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
+							okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+						}
+						GFunc.showMessageBox(params)
+					else -- 存在未完成的订单消耗失败的情况，但是因为不是当前productId，所以允许继续支付
+						callback(0)
+					end
+				end, productId)
 			else
 				local params = {
 					content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_22),
@ -326,8 +313,8 @@ function SDKPayGoogleManager:checkPay(productId, callback)
 end

 -- 支付
-function SDKPayGoogleManager:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
-	self:doGooglePay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+function SDKPayGoogleManager:pay(productId, orderId, rechargeId, giftType, giftId, callback)
+	self:doGooglePay(productId, orderId, rechargeId, giftType, giftId, callback)
 end

 -- 连接Google商店
@ -339,7 +326,7 @@ function SDKPayGoogleManager:connectGoogleStore(callback)
 	end)
 end

-function SDKPayGoogleManager:doGooglePay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+function SDKPayGoogleManager:doGooglePay(productId, orderId, rechargeId, giftType, giftId, callback)
 	local payType = PAY_TYPE_IN_APP
 	local rechargeCfg = ConfigManager:getConfig("recharge")[rechargeId]
 	if rechargeCfg.subscribe then
@ -402,4 +389,76 @@ function SDKPayGoogleManager:doUncompletePay(callback)
 	end
 end

+-- 第一步向服务器验证订单号
+-- function SDKPayGoogleManager:_checkPurchaseOrder(result, productId, callback)
+--     -- SDKPayGoogleManager:saveOrderId(result.orderId)
+--     if DataManager.PlayerData:isInPermanentOrders(result.obfuscatedAccountId) then
+--         return
+--     end
+--     local params = {}
+--     params.receipt = {}
+--     params.receipt.packageName = Platform:getIdentifier()
+--     params.receipt.productId = productId
+--     params.receipt.purchaseToken = result.purchaseToken
+--     params.receipt.subscription = false
+
+--     CS.BF.BFMain.Instance.ParseClientMgr:SetLuaCheckPurchaseOrderCallback(function (msg)
+--         local serverResult = json.decode(msg)
+--         local _result = serverResult.result
+--         Logger.printTable(serverResult)
+--         if _result and _result.data then
+--             if _result.code == 0 then
+--                 -- SDKPayGoogleManager:delOrderId(_result.data.orderId)
+--                 SDKPayGoogleManager:saveOrderId(_result.data.obfuscatedExternalAccountId, params)
+--                 SDKPayGoogleManager:checkPurchaseConsume(_result.data.obfuscatedExternalAccountId, params, callback)
+--                 -- if callback then
+--                 --     callback(_result.data.purchaseToken, _result.data.obfuscatedAccountId, _result.data.orderId)
+--                 -- end
+--             elseif _result.code == 137 then
+--                 -- SDKPayGoogleManager:delOrderId(_result.data.orderId)
+--                 SDKPayGoogleManager:consumePurchase(_result.data.purchaseToken)
+--             else
+--                 -- @TODO 重试
+--             end
+--         end
+
+--     end)
+--     CS.BF.BFMain.Instance.ParseClientMgr:CheckPurchaseGPOrder(json.encode(params))
+-- end
+
+-- 第二步向服务器申请消耗订单
+-- function SDKPayGoogleManager:checkPurchaseConsume(orderId, params, callback, callback1)
+--     if not orderId or not params then
+--         return
+--     end
+--     CS.BF.BFMain.Instance.ParseClientMgr:SetLuaCheckPurchaseConsumeCallback(function (msg)
+--         local serverResult = json.decode(msg)
+--         local _result = serverResult.result
+--         Logger.printTable(serverResult)
+--         if _result and _result.data then
+--             if _result.code == 0 or _result.code == 137 then
+--                 SDKPayGoogleManager:delOrderId(orderId)
+--                 SDKPayGoogleManager:savePermanentOrderId(orderId)
+--                 if callback then
+--                     callback(_result.data.purchaseToken, _result.data.obfuscatedExternalAccountId, _result.data.orderId)
+--                 else
+					-- PayManager:requestRewards(_result.data.purchaseToken, orderId)
+--                     SDKPayGoogleManager:consumePurchase(_result.data.purchaseToken)
+--                     if callback1 then
+--                         callback1()
+--                     end
+--                 end
+--             -- elseif _result.code == 137 then
+--             --     SDKPayGoogleManager:delOrderId(orderId)
+--             --     SDKPayGoogleManager:consumePurchase(_result.data.purchaseToken)
+--             else
+--                 -- @TODO 重试
+--             end
+--         end
+
+--     end)
+--     CS.BF.BFMain.Instance.ParseClientMgr:CheckPurchaseGPConsume(json.encode(params))
+-- end
+
+-- 支付相关接口 ********************************************************************** 结束
 return SDKPayGoogleManager
--- a/lua/app/common/sdk_pay_ios_manager.lua
+++ b/lua/app/common/sdk_pay_ios_manager.lua
@ -26,43 +26,39 @@ function SDKPayiOSManager:initPay(callback)

 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr.buyCallback = function(isSuccess, result, errorStr)
 		if isSuccess then
-			if self.handleUncompleteIosOrder then
-			    local payParams = self.iosPayInfos[result.transactionID]
-			    local needConsumePurchase = true
-			    if payParams ~= nil and payParams.order then
-					PayManager:requestRewards(result.receipt, payParams.order, result.transactionID, payParams.productId)
-					needConsumePurchase = false
-			    end
-			    if needConsumePurchase then
-			        self:delIosPayInfo(result.transactionID)
-			        self:delIosOrder(result.definition.id)
-			        self:consumePurchase(result.definition.id)
-					local giftId = tonumber(payParams.giftId)
-					local purchaseType = tonumber(payParams.purchaseType)
-					local giftType = PayManager:getGiftType(purchaseType, giftId)
-					local rechargeId = PayManager:getPackageRechargeId(purchaseType, giftId)
-			        BIReport:postPayFailed(result.definition.id, result.transactionID, rechargeId, "error order", giftType, giftId)
-			    end
-			else
-			    -- 回调时机太早的话，就先保存起来，等后续补单的时候一起补
-			    local order = self.iosOrders[result.definition.id]
-			    if order then
-			        self:saveIosPayInfo(result.transactionID, result.receipt, order.order, result.definition.id, order.purchaseType, order.giftId)
-			        self:delIosOrder(result.definition.id)
-			    else
-			        -- 之前没有记录只能算掉单了
-			        self:delIosPayInfo(result.transactionID)
-			        self:delIosOrder(result.definition.id)
-			        self:consumePurchase(result.definition.id)
-			        BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "not have order")
-			    end
-			end
+			-- if self.handleUncompleteIosOrder then
+			--     local payParams = self.iosPayInfos[result.transactionID]
+			--     local needConsumePurchase = true
+			--     if payParams ~= nil and payParams.order then
+					-- PayManager:requestRewards(result.receipt, payParams.order)
+					-- needConsumePurchase = false
+			--     end
+			--     if needConsumePurchase then
+			--         self:delIosPayInfo(result.transactionID)
+			--         self:delIosOrder(result.definition.id)
+			--         self:consumePurchase(result.definition.id)
+			--         BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "error order")
+			--     end
+			-- else
+			--     -- 回调时机太早的话，就先保存起来，等后续补单的时候一起补
+			--     local order = self.iosOrders[result.definition.id]
+			--     if order then
+			--         self:saveIosPayInfo(result.transactionID, result.receipt, order, result.definition.id)
+			--         self:delIosOrder(result.definition.id)
+			--     else
+			--         -- 之前没有记录只能算掉单了
+			--         self:delIosPayInfo(result.transactionID)
+			--         self:delIosOrder(result.definition.id)
+			--         self:consumePurchase(result.definition.id)
+			--         BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "not have order")
+			--     end
+			-- end
 		else
-			if errorStr and errorStr ~= "" then
-			    BIReport:postPayFailed(result.definition.id, result.transactionID, nil, errorStr)
-			else
-			    BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "1")
-			end
+			-- if errorStr and errorStr ~= "" then
+			--     BIReport:postPayFailed(result.definition.id, result.transactionID, nil, errorStr)
+			-- else
+			--     BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "1")
+			-- end
 		end
 	end

@ -96,13 +92,8 @@ end
 -- 处理未完成的订单
 function SDKPayiOSManager:doUncompleteOrder(callback, productId)
 	self.handleUncompleteIosOrder = true
-	if self.handleUncompleteOrder then
-		return callback and callback(1)
-	end
-	self.handleUncompleteOrder = true
 	local orders = self.iosPayInfos
 	if orders == nil then
-		self.handleUncompleteOrder = false
 		return callback and callback()
 	end
 	local uncompleteList = {}
@ -110,21 +101,16 @@ function SDKPayiOSManager:doUncompleteOrder(callback, productId)
 		table.insert(uncompleteList, v)
 	end
 	if #uncompleteList <= 0 then
-		self.handleUncompleteOrder = false
 		return callback and callback()
 	end
 	local index = 1
 	local function handleOrder(uncompleteOrder)
 		if uncompleteOrder == nil then
-			self.handleUncompleteOrder = false
 			return callback and callback()
 		end
 		-- 去服务器验证
 		if uncompleteOrder.order then
-			PayManager:requestRewards(uncompleteOrder.receipt, uncompleteOrder.order, uncompleteOrder.transactionID, uncompleteOrder.productId, true, function()
-				index = index + 1
-				handleOrder(uncompleteList[index])
-			end)
+			PayManager:requestRewards(uncompleteOrder.receipt, uncompleteOrder.order)
 		else
 			SDKManager:delIosPayInfo(uncompleteOrder.transactionID)
 			SDKManager:delIosOrder(uncompleteOrder.productId)
@ -189,19 +175,11 @@ function SDKPayiOSManager:getPriceCurrencyCode(skuId)
 end

 function SDKPayiOSManager:getSDKPayType()
-	return SDKManager.PAY_TYPE.DEPRECATED_APPLE
-end
-
-function SDKPayiOSManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
-	local purchaseTokenObj = json.decode(purchaseToken)
-	if purchaseTokenObj == nil then
-		return -- 解析错误
+	if Platform:getIsPublishChannel() then
+		return SDKManager.PAY_TYPE.IOS
+	else
+		return SDKManager.PAY_TYPE.NONE
 	end
-	local args = {
-		channel = self:getSDKPayType(),
-		params = {purchaseTokenObj.Payload, channelOrderId, uuid}
-	}
-	return args
 end

 -- 获取支付方式,目前只有google支付
@ -220,7 +198,7 @@ end
 -- 检查是否可以支付
 function SDKPayiOSManager:checkPay(productId, callback)
 	if self:_getIsIosInitialized() then
-		self:doUncompleteOrder(function(code)
+		SDKManager:doUncompleteOrder(function(code)
 			-- 先处理未完成的订单
 			if code == 0 then
 				callback(0)
@ -249,67 +227,45 @@ function SDKPayiOSManager:checkPay(productId, callback)
 end

 -- 支付
-function SDKPayiOSManager:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
-	self:doIosPay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+function SDKPayiOSManager:pay(productId, orderId, rechargeId, giftType, giftId, callback)
+	self:doIosPay(productId, orderId, rechargeId, giftType, giftId, callback)
 end

 -- sdk将已完成的订单消耗掉
-function SDKPayiOSManager:consumePurchase(productId, callback)
-	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:ConsumePurchase(productId)
+function SDKPayiOSManager:consumePurchase(token, callback)
+	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:ConsumePurchase(token)
 	if callback then
 		callback(0)
 	end
 end

-function SDKPayiOSManager:doIosPay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+function SDKPayiOSManager:doIosPay(productId, orderId, rechargeId, giftType, giftId, callback)
 	self.blockTouch = true
-	UIManager:showWaitPay()
+	UIManager:showWaitNet()
 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr.buyCallback = function(isSuccess, result, errorStr)
 		if self.blockTouch then
 			self.blockTouch = false
-			UIManager:hideWaitPay()
-			if isSuccess then
-				Logger.log("ios pay availableToPurchase = %s", result.availableToPurchase)
-				Logger.log("ios pay transactionID = %s", result.transactionID)
-				Logger.log("ios pay hasReceipt = %s", result.hasReceipt)
-				Logger.log("ios pay receipt = %s", result.receipt)
-				self:saveIosPayInfo(result.transactionID, result.receipt, orderId, productId, purchaseType, giftId)
-				if callback then
-					callback(result.receipt, orderId, result.transactionID)
-				end
+			UIManager:hideWaitNet()
+		end
+		if isSuccess then
+			Logger.log("ios pay availableToPurchase = %s", result.availableToPurchase)
+			Logger.log("ios pay transactionID = %s", result.transactionID)
+			Logger.log("ios pay hasReceipt = %s", result.hasReceipt)
+			Logger.log("ios pay receipt = %s", result.receipt)
+			self:saveIosPayInfo(result.transactionID, result.receipt, orderId, productId)
+			if callback then
+				callback(result.receipt, orderId, result.transactionID)
+			end
+		else
+			if errorStr and errorStr ~= "" then
+				BIReport:postPayFailed(productId, orderId, rechargeId, errorStr, giftType, giftId)
 			else
-				if errorStr and errorStr ~= "" then
-					BIReport:postPayFailed(productId, orderId, rechargeId, errorStr, giftType, giftId)
-				else
-					BIReport:postPayFailed(productId, orderId, rechargeId, "1", giftType, giftId)
-				end
-			end
-			self:delIosOrder(productId)
-		else -- 说明是其他未完成回调
-			local payParams = self.iosPayInfos[result.transactionID]
-			local needConsumePurchase = true
-			if payParams ~= nil and payParams.order then
-				PayManager:requestRewards(result.receipt, payParams.order, result.transactionID, payParams.productId)
-				needConsumePurchase = false
-			end
-			if needConsumePurchase then
-			    local order = self.iosOrders[result.definition.id]
-			    if order then
-					PayManager:requestRewards(result.receipt, order.order, result.transactionID, result.definition.id)
-			    else
-			        self:delIosPayInfo(result.transactionID)
-					self:delIosOrder(result.definition.id)
-					self:consumePurchase(result.definition.id)
-					local giftId = tonumber(payParams.giftId)
-					local purchaseType = tonumber(payParams.purchaseType)
-					local giftType = PayManager:getGiftType(purchaseType, giftId)
-					local rechargeId = PayManager:getPackageRechargeId(purchaseType, giftId)
-					BIReport:postPayFailed(result.definition.id, result.transactionID, rechargeId, "error order", giftType, giftId)
-			    end
+				BIReport:postPayFailed(productId, orderId, rechargeId, "1", giftType, giftId)
 			end
 		end
+		self:delIosOrder(productId)
 	end
-	self:saveIosOrder(productId, orderId, purchaseType, giftId)
+	self:saveIosOrder(productId, orderId)
 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:Buy(productId, orderId)
 end

@ -327,42 +283,26 @@ function SDKPayiOSManager:doUncompletePay(callback)

 	if self:_getIsIosInitialized() then
 		self.alreadyFinishUncompletePay = true
-		self:doUncompleteOrder()
+		SDKManager:doUncompleteOrder()
 	end
 end

 function SDKPayiOSManager:checkPurchaseOrder(result, productId, callback)
 end

-function SDKPayiOSManager:saveIosPayInfo(transactionID, receipt, order, productId, purchaseType, giftId)
+function SDKPayiOSManager:saveIosPayInfo(transactionID, receipt, order, productId)
 	self.iosPayInfos[transactionID] = {
 		order = order,
 		receipt = receipt,
 		transactionID = transactionID,
-		productId = productId,
-		purchaseType = purchaseType,
-		giftId = giftId
+		productId = productId
 	}
 	LocalData:setIosPayInfo(self.iosPayInfos)
 	LocalData:save()
 end

-function SDKPayiOSManager:delIosPayInfo(transactionID)
-	self.iosPayInfos[transactionID] = nil
-	LocalData:setIosPayInfo(self.iosPayInfos)
-	LocalData:save()
-end
-
-function SDKPayiOSManager:getIosPayInfo(transactionID)
-	return self.iosPayInfos[transactionID]
-end
-
-function SDKPayiOSManager:saveIosOrder(productId, order, purchaseType, giftId)
-	self.iosOrders[productId] = {
-		order = order,
-		purchaseType = purchaseType,
-		giftId = giftId
-	}
+function SDKPayiOSManager:saveIosOrder(productId, order)
+	self.iosOrders[productId] = order
 	LocalData:setIosOrders(self.iosOrders)
 	LocalData:save()
 end
@ -373,4 +313,82 @@ function SDKPayiOSManager:delIosOrder(productId)
 	LocalData:save()
 end

+-- 第一步向服务器验证订单号
+-- function SDKPayiOSManager:checkPurchaseIOSOrder(result, productId, callback)
+--     Logger.printTable(result)
+--     Logger.log(productId)
+--     local orderId = DataManager.PlayerData:getIosOrderId(result.transactionID)
+--     if not orderId then
+--         return
+--     end
+--     if DataManager.PlayerData:isInPermanentOrders(result.transactionID) then
+--         return
+--     end
+--     local params = {}
+--     -- params.receipt.packageName = Platform:getIdentifier()
+--     -- params.receipt.productId = productId
+--     params.receipt = result.receipt
+--     params.transaction_id = result.transactionID
+
+--     CS.BF.BFMain.Instance.ParseClientMgr:SetLuaCheckPurchaseIOSOrderCallback(function (msg)
+--         local serverResult = json.decode(msg)
+--         local _result = serverResult.result
+--         Logger.printTable(serverResult)
+--         -- 后端返回latest_receipt_info
+--         if _result and _result.data then
+--             if _result.code == 0 then
+--                 SDKPayiOSManager:saveOrderId(result.transactionID, params)
+--                 -- 第二次验证
+--                 SDKPayiOSManager:checkPurchaseConsume(result, params, callback)
+--             elseif _result.code == 137 then
+--                 -- SDKPayiOSManager:delOrderId(_result.data.orderId)
+--                 -- 消耗订单
+--                 -- SDKPayiOSManager:consumePurchase(_result.data.purchaseToken)
+--             else
+--                 -- @TODO 重试
+--             end
+--         end
+
+--     end)
+--     CS.BF.BFMain.Instance.ParseClientMgr:CheckPurchaseIOSOrder(json.encode(params))
+-- end
+
+-- 第二步向服务器申请消耗订单
+-- function SDKPayiOSManager:checkPurchaseConsume(result, params, callback, callback1)
+--     if not result or not params then
+--         return
+--     end
+--     local orderId = DataManager.PlayerData:getIosOrderId(result.transactionID)
+--     if not orderId then
+--         return
+--     end
+--     CS.BF.BFMain.Instance.ParseClientMgr:SetLuaCheckPurchaseIOSConsumeCallback(function (msg)
+--         local serverResult = json.decode(msg)
+--         local _result = serverResult.result
+--         Logger.printTable(serverResult)
+--         if _result and _result.data then
+--             if _result.code == 0 then
+--                 -- 处理本地存储订单
+--                 SDKPayiOSManager:delIosOrderId(result.transactionID)
+--                 SDKPayiOSManager:delOrderId(result.transactionID)
+--                 SDKPayiOSManager:savePermanentOrderId(result.transactionID)
+--                 if callback then
+--                     callback(result.receipt, orderId, result.transactionID)
+--                 else
+--                     -- SDKPayiOSManager:consumePurchase(_result.data.purchaseToken)
+					-- PayManager:requestRewards(_result.data.purchaseToken, orderId)
+--                     if callback1 then
+--                         callback1()
+--                     end
+--                 end
+--             elseif _result.code == 137 then
+--             else
+--                 -- @TODO 重试
+--             end
+--         end
+
+--     end)
+--     CS.BF.BFMain.Instance.ParseClientMgr:CheckPurchaseIOSConsume(json.encode(params))
+-- end
+-- 支付相关接口 ********************************************************************** 结束
 return SDKPayiOSManager
--- a/lua/app/common/server_push_manager.lua
+++ b/lua/app/common/server_push_manager.lua
@ -14,16 +14,11 @@ end
 function ServerPushManager:initWhenLogin()
    self:addServerPushListener(ProtoMsgType.FromMsgEnum.KickOutNtf, UIManager, UIManager.showKickOut)
    self:addServerPushListener(ProtoMsgType.FromMsgEnum.BountyBoughtNtf, ModuleManager.BountyManager, ModuleManager.BountyManager.onBoughtBountyFinish)
-    self:addServerPushListener(ProtoMsgType.FromMsgEnum.ArenaBountyBoughtNtf, ModuleManager.ArenaBountyManager, ModuleManager.ArenaBountyManager.onBoughtBountyFinish)
    self:addServerPushListener(ProtoMsgType.FromMsgEnum.NewMailNtf, ModuleManager.MailManager, ModuleManager.MailManager.needUpdateMail)
    self:addServerPushListener(ProtoMsgType.FromMsgEnum.PigLevelUpNtf, ModuleManager.ActivityManager, ModuleManager.ActivityManager.onBoughtGoldPigFinish)
    self:addServerPushListener(ProtoMsgType.FromMsgEnum.TriggerLevelUpGiftNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onTriggerLevelUpGift)
-    self:addServerPushListener(ProtoMsgType.FromMsgEnum.TriggerGrowUpGift2Ntf, ModuleManager.ShopManager, ModuleManager.ShopManager.onTriggerGrowUpGift)
+    self:addServerPushListener(ProtoMsgType.FromMsgEnum.TriggerGrowUpGiftNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onTriggerGrowUpGift)
    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

 ---- 移除全局推送监听
--- a/lua/app/common/time.lua
+++ b/lua/app/common/time.lua
@ -137,15 +137,6 @@ function Time:getOverOfServerToday(time)
    return self:getBeginningOfServerToday() + SECONDS_PRE_DAY
 end

-- 获取今日剩余时间
-function Time:getTodaySurplusTime()
-    local result = self:getOverOfServerToday() - self:getServerTime()
-    if result < 0 then
-		result = 0
-	end
-    return result
-end
-
 function Time:getBeginningOfToday()
 	local now = os.date('*t', self:getServerTime() + self:getTimeZoneOffset()*SECONDS_PRE_HOUR)
    local beginDay = os.time{year = now.year, month = now.month, day = now.day, hour = 0}
@ -246,25 +237,6 @@ function Time:formatNumTimeStr(time)
    end
 end

-- 大于1小时显示：X时前 globalkey:TIME_BEFORE_STR_H 小于1小时显示：X分钟前 globalkey:TIME_BEFORE_STR_M 小于1分钟显示：1分钟前
-function Time:formatBeforeTimeStr(time)
-    local passTime = Time:getServerTime() - time
-    if passTime <= 0 then
-        return GConst.EMPTY_STRING
-    end
-
-    local hour = math.floor(passTime // SECONDS_PRE_HOUR)
-    if hour >= 1 then -- 大于1小时显示：X时前
-        return I18N:getGlobalText(I18N.GlobalConst.TIME_BEFORE_STR_H, hour)
-    else
-        if passTime < SECONDS_PRE_MINUTE then
-            passTime = SECONDS_PRE_MINUTE
-        end
-        local min = math.floor(passTime // SECONDS_PRE_MINUTE)
-        return I18N:getGlobalText(I18N.GlobalConst.TIME_BEFORE_STR_M, min)
-    end
-end
-
 ---- 得到time周开始时的时间戳
 function Time:getWeekBeginTimeStamp(time)
    time = time or self:getServerTime()
@ -299,22 +271,6 @@ function Time:getDayByTimeStamp(time)
    return now.day
 end

-- 获取当前处于星期几
-function Time:getWeekByTimeStamp(time)
-    time = time or self:getServerTime()
-    local now = os.date('!*t', time)
-
-    local weekTab = {7, 1, 2, 3, 4, 5, 6}
-    return weekTab[now.wday]
-end
-
-- 获取今天距目标日期的天数
-function Time:getDistanceDays(time)
-    local nowNum = self:getBeginningOfOneDay(self:getServerTime())
-    local targetNum = self:getBeginningOfOneDay(time)
-    return (nowNum - targetNum)/24/60/60
-end
-
 -- 转换服务器时间字符串(ISO 8601)的对应的时间戳,例如2022-09-10T18:10:00.000Z
 function Time:convertServerTimeStringToTimestamp(str)
    local dateTime = CS.System.DateTime.Parse(str)
--- a/lua/app/common/white_res_manager.lua
+++ b/lua/app/common/white_res_manager.lua
@ -5,7 +5,6 @@ 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,
@ -15,8 +14,6 @@ local GAME_RES_WHITE_LIST = {
    GConst.ATLAS_PATH.ICON_HERO_2,
    GConst.ATLAS_PATH.ICON_BUFF,
    GConst.ATLAS_PATH.ICON_TASK,
-    GConst.ATLAS_PATH.ICON_AVATAR,
-    GConst.ATLAS_PATH.ICON_EQUIP,
 }

 ---- 预加载游戏资源
--- a/lua/app/config/act_chapter_store.lua
+++ b/lua/app/config/act_chapter_store.lua
@ -141,8 +141,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=1,
 				["num_for_nothing"]="Vw=="
 			}
@ -181,8 +181,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=1,
 				["num_for_nothing"]="Vw=="
 			}
@ -221,8 +221,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=3,
 				["num_for_nothing"]="VQ=="
 			}
@ -261,8 +261,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=3,
 				["num_for_nothing"]="VQ=="
 			}
@ -301,8 +301,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=6,
 				["num_for_nothing"]="UA=="
 			}
@ -341,8 +341,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=6,
 				["num_for_nothing"]="UA=="
 			}
@ -381,8 +381,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=8,
 				["num_for_nothing"]="Xg=="
 			}
@ -421,8 +421,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=8,
 				["num_for_nothing"]="Xg=="
 			}
@ -461,8 +461,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=8,
 				["num_for_nothing"]="Xg=="
 			}
@ -501,8 +501,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=20,
 				["num_for_nothing"]="VAg="
 			}
@ -541,8 +541,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=20,
 				["num_for_nothing"]="VAg="
 			}
@ -581,8 +581,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=20,
 				["num_for_nothing"]="VAg="
 			}
@ -621,8 +621,8 @@ local act_chapter_store = {
 			{
 				["type"]=1,
 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=20,
 				["num_for_nothing"]="VAg="
 			}
@ -1190,409 +1190,9 @@ local act_chapter_store = {
 		["original"]=19,
 		["recharge_id"]=16,
 		["value"]=10
-	},
-	[3103]={
-		["chapter"]=31,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
-			},
-			{
-				["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=16,
-		["value"]=11
-	},
-	[3203]={
-		["chapter"]=32,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
-			},
-			{
-				["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=16,
-		["value"]=11
-	},
-	[3303]={
-		["chapter"]=33,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
-			},
-			{
-				["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=16,
-		["value"]=11
-	},
-	[3403]={
-		["chapter"]=34,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
-			},
-			{
-				["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=16,
-		["value"]=11
-	},
-	[3503]={
-		["chapter"]=35,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
-			},
-			{
-				["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=16,
-		["value"]=11
-	},
-	[3603]={
-		["chapter"]=36,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=17,
-		["value"]=12
-	},
-	[3703]={
-		["chapter"]=37,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=17,
-		["value"]=12
-	},
-	[3803]={
-		["chapter"]=38,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=17,
-		["value"]=12
-	},
-	[3903]={
-		["chapter"]=39,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=17,
-		["value"]=12
-	},
-	[4003]={
-		["chapter"]=40,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		},
-		["original"]=19,
-		["recharge_id"]=17,
-		["value"]=12
 	}
 }
 local config = {
-data=act_chapter_store,count=40
+data=act_chapter_store,count=30
 }
 return config
--- a/lua/app/config/act_dungeon_armor_fund.lua
+++ b/lua/app/config/act_dungeon_armor_fund.lua
@ -1,696 +0,0 @@
-local act_dungeon_armor_fund = {
-	[1]={
-		["stage"]=1,
-		["stage"]=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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[2]={
-		["stage"]=4,
-		["stage"]=4,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			}
-		}
-	},
-	[3]={
-		["stage"]=6,
-		["stage"]=6,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[4]={
-		["stage"]=10,
-		["stage"]=10,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[5]={
-		["stage"]=12,
-		["stage"]=12,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[6]={
-		["stage"]=16,
-		["stage"]=16,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		}
-	},
-	[7]={
-		["stage"]=18,
-		["stage"]=18,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=7,
- 				["num_for_nothing"]="UQ=="
-			}
-		}
-	},
-	[8]={
-		["stage"]=22,
-		["stage"]=22,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
-			}
-		}
-	},
-	[9]={
-		["stage"]=24,
-		["stage"]=24,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=9,
- 				["num_for_nothing"]="Xw=="
-			}
-		}
-	},
-	[10]={
-		["stage"]=28,
-		["stage"]=28,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		}
-	},
-	[11]={
-		["stage"]=30,
-		["stage"]=30,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=11,
- 				["num_for_nothing"]="Vwk="
-			}
-		}
-	},
-	[12]={
-		["stage"]=31,
-		["stage"]=31,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=12,
- 				["num_for_nothing"]="Vwo="
-			}
-		}
-	},
-	[13]={
-		["stage"]=34,
-		["stage"]=34,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=13,
- 				["num_for_nothing"]="Vws="
-			}
-		}
-	},
-	[14]={
-		["stage"]=36,
-		["stage"]=36,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=14,
- 				["num_for_nothing"]="Vww="
-			}
-		}
-	},
-	[15]={
-		["stage"]=38,
-		["stage"]=38,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=15,
- 				["num_for_nothing"]="Vw0="
-			}
-		}
-	},
-	[16]={
-		["stage"]=40,
-		["stage"]=40,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=16,
- 				["num_for_nothing"]="Vw4="
-			}
-		}
-	},
-	[17]={
-		["stage"]=42,
-		["stage"]=42,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=17,
- 				["num_for_nothing"]="Vw8="
-			}
-		}
-	},
-	[18]={
-		["stage"]=44,
-		["stage"]=44,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=18,
- 				["num_for_nothing"]="VwA="
-			}
-		}
-	},
-	[19]={
-		["stage"]=46,
-		["stage"]=46,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=19,
- 				["num_for_nothing"]="VwE="
-			}
-		}
-	},
-	[20]={
-		["stage"]=48,
-		["stage"]=48,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	[21]={
-		["stage"]=50,
-		["stage"]=50,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=21,
- 				["num_for_nothing"]="VAk="
-			}
-		}
-	},
-	[22]={
-		["stage"]=52,
-		["stage"]=52,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=22,
- 				["num_for_nothing"]="VAo="
-			}
-		}
-	},
-	[23]={
-		["stage"]=54,
-		["stage"]=54,
-		["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"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=23,
- 				["num_for_nothing"]="VAs="
-			}
-		}
-	}
-}
-local config = {
-data=act_dungeon_armor_fund,count=23
-}
-return config
--- a/lua/app/config/act_fourteen_bounty.lua
+++ b/lua/app/config/act_fourteen_bounty.lua
@ -1,150 +0,0 @@
-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
--- a/lua/app/config/act_fourteen_bounty.lua.meta
+++ b/lua/app/config/act_fourteen_bounty.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 98e6ac4cce3094f4ca2032007239b1f9
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/act_fourteen_exchange.lua
+++ b/lua/app/config/act_fourteen_exchange.lua
@ -1,306 +0,0 @@
-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
--- a/lua/app/config/act_fourteen_quest.lua
+++ b/lua/app/config/act_fourteen_quest.lua
@ -1,897 +0,0 @@
-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
--- a/lua/app/config/act_fourteen_quest.lua.meta
+++ b/lua/app/config/act_fourteen_quest.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: ae4732ca8e76a1243ad3c6e8d72d01b3
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/act_gift.lua
+++ b/lua/app/config/act_gift.lua
--- a/lua/app/config/act_gold_pig.lua
+++ b/lua/app/config/act_gold_pig.lua
@ -5,11 +5,8 @@ local act_gold_pig = {
 		["battle_diamond"]=100,
 		["min_diamond"]=300,
 		["max_diamond"]=600,
-		["battle_gold"]=1000,
-		["min_gold"]=3000,
-		["max_gold"]=6000,
 		["recharge_id"]=5,
-		["value"]=600
+		["value"]=400
 	},
 	[201]={
 		["before_id"]=101,
@ -17,11 +14,8 @@ local act_gold_pig = {
 		["battle_diamond"]=250,
 		["min_diamond"]=1000,
 		["max_diamond"]=2000,
-		["battle_gold"]=2500,
-		["min_gold"]=10000,
-		["max_gold"]=20000,
 		["recharge_id"]=10,
-		["value"]=999
+		["value"]=700
 	},
 	[301]={
 		["before_id"]=201,
@ -29,11 +23,8 @@ local act_gold_pig = {
 		["battle_diamond"]=300,
 		["min_diamond"]=1500,
 		["max_diamond"]=3000,
-		["battle_gold"]=3000,
-		["min_gold"]=15000,
-		["max_gold"]=30000,
 		["recharge_id"]=12,
-		["value"]=999
+		["value"]=700
 	},
 	[401]={
 		["before_id"]=301,
@ -41,11 +32,8 @@ local act_gold_pig = {
 		["battle_diamond"]=400,
 		["min_diamond"]=2000,
 		["max_diamond"]=4000,
-		["battle_gold"]=4000,
-		["min_gold"]=20000,
-		["max_gold"]=40000,
 		["recharge_id"]=13,
-		["value"]=999
+		["value"]=700
 	},
 	[501]={
 		["before_id"]=401,
@ -53,11 +41,8 @@ local act_gold_pig = {
 		["battle_diamond"]=500,
 		["min_diamond"]=2500,
 		["max_diamond"]=5000,
-		["battle_gold"]=5000,
-		["min_gold"]=25000,
-		["max_gold"]=50000,
 		["recharge_id"]=14,
-		["value"]=999
+		["value"]=700
 	},
 	[601]={
 		["before_id"]=501,
@ -65,11 +50,8 @@ local act_gold_pig = {
 		["battle_diamond"]=600,
 		["min_diamond"]=3000,
 		["max_diamond"]=6000,
-		["battle_gold"]=6000,
-		["min_gold"]=30000,
-		["max_gold"]=60000,
 		["recharge_id"]=15,
-		["value"]=999
+		["value"]=700
 	},
 	[701]={
 		["before_id"]=601,
@ -77,11 +59,8 @@ local act_gold_pig = {
 		["battle_diamond"]=1000,
 		["min_diamond"]=5000,
 		["max_diamond"]=10000,
-		["battle_gold"]=10000,
-		["min_gold"]=50000,
-		["max_gold"]=100000,
 		["recharge_id"]=16,
-		["value"]=999
+		["value"]=700
 	}
 }
 local config = {
--- a/lua/app/config/act_growup_gift.lua
+++ b/lua/app/config/act_growup_gift.lua
@ -1,5 +1,5 @@
 local act_growup_gift = {
-	[10104]={
+	[1014]={
 		["hero_id"]=14001,
 		["recharge_id"]=7,
 		["reward"]={
@ -34,7 +34,7 @@ local act_growup_gift = {
 		["limit"]=1,
 		["value"]=800
 	},
-	[10204]={
+	[1024]={
 		["hero_id"]=14001,
 		["recharge_id"]=10,
 		["reward"]={
@ -69,7 +69,7 @@ local act_growup_gift = {
 		["limit"]=1,
 		["value"]=800
 	},
-	[10304]={
+	[1034]={
 		["hero_id"]=14001,
 		["recharge_id"]=13,
 		["reward"]={
@ -104,7 +104,7 @@ local act_growup_gift = {
 		["limit"]=1,
 		["value"]=800
 	},
-	[10404]={
+	[1044]={
 		["hero_id"]=14001,
 		["recharge_id"]=15,
 		["reward"]={
@ -139,7 +139,7 @@ local act_growup_gift = {
 		["limit"]=1,
 		["value"]=800
 	},
-	[10504]={
+	[1054]={
 		["hero_id"]=14001,
 		["recharge_id"]=17,
 		["reward"]={
@ -174,7 +174,7 @@ local act_growup_gift = {
 		["limit"]=1,
 		["value"]=800
 	},
-	[10604]={
+	[1064]={
 		["hero_id"]=14001,
 		["recharge_id"]=18,
 		["reward"]={
@ -210,7 +210,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["last"]=1
 	},
-	[11104]={
+	[2014]={
 		["hero_id"]=24001,
 		["recharge_id"]=7,
 		["reward"]={
@ -246,7 +246,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[11204]={
+	[2024]={
 		["hero_id"]=24001,
 		["recharge_id"]=10,
 		["reward"]={
@ -282,7 +282,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[11304]={
+	[2034]={
 		["hero_id"]=24001,
 		["recharge_id"]=13,
 		["reward"]={
@ -318,7 +318,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[11404]={
+	[2044]={
 		["hero_id"]=24001,
 		["recharge_id"]=15,
 		["reward"]={
@ -354,7 +354,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[11504]={
+	[2054]={
 		["hero_id"]=24001,
 		["recharge_id"]=17,
 		["reward"]={
@ -390,7 +390,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[11604]={
+	[2064]={
 		["hero_id"]=24001,
 		["recharge_id"]=18,
 		["reward"]={
@ -427,7 +427,7 @@ local act_growup_gift = {
 		["value_2"]=1,
 		["last"]=1
 	},
-	[12104]={
+	[3014]={
 		["hero_id"]=34001,
 		["recharge_id"]=7,
 		["reward"]={
@ -463,7 +463,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[12204]={
+	[3024]={
 		["hero_id"]=34001,
 		["recharge_id"]=10,
 		["reward"]={
@ -499,7 +499,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[12304]={
+	[3034]={
 		["hero_id"]=34001,
 		["recharge_id"]=13,
 		["reward"]={
@ -535,7 +535,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[12404]={
+	[3044]={
 		["hero_id"]=34001,
 		["recharge_id"]=15,
 		["reward"]={
@ -571,7 +571,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[12504]={
+	[3054]={
 		["hero_id"]=34001,
 		["recharge_id"]=17,
 		["reward"]={
@ -607,7 +607,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[12604]={
+	[3064]={
 		["hero_id"]=34001,
 		["recharge_id"]=18,
 		["reward"]={
@ -644,7 +644,7 @@ local act_growup_gift = {
 		["value_2"]=1,
 		["last"]=1
 	},
-	[13104]={
+	[4014]={
 		["hero_id"]=44001,
 		["recharge_id"]=7,
 		["reward"]={
@ -680,7 +680,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[13204]={
+	[4024]={
 		["hero_id"]=44001,
 		["recharge_id"]=10,
 		["reward"]={
@ -716,7 +716,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[13304]={
+	[4034]={
 		["hero_id"]=44001,
 		["recharge_id"]=13,
 		["reward"]={
@ -752,7 +752,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[13404]={
+	[4044]={
 		["hero_id"]=44001,
 		["recharge_id"]=15,
 		["reward"]={
@ -788,7 +788,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[13504]={
+	[4054]={
 		["hero_id"]=44001,
 		["recharge_id"]=17,
 		["reward"]={
@ -824,7 +824,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[13604]={
+	[4064]={
 		["hero_id"]=44001,
 		["recharge_id"]=18,
 		["reward"]={
@ -861,7 +861,7 @@ local act_growup_gift = {
 		["value_2"]=1,
 		["last"]=1
 	},
-	[14104]={
+	[5014]={
 		["hero_id"]=54001,
 		["recharge_id"]=7,
 		["reward"]={
@ -897,7 +897,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[14204]={
+	[5024]={
 		["hero_id"]=54001,
 		["recharge_id"]=10,
 		["reward"]={
@ -933,7 +933,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[14304]={
+	[5034]={
 		["hero_id"]=54001,
 		["recharge_id"]=13,
 		["reward"]={
@ -969,7 +969,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[14404]={
+	[5044]={
 		["hero_id"]=54001,
 		["recharge_id"]=15,
 		["reward"]={
@ -1005,7 +1005,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[14504]={
+	[5054]={
 		["hero_id"]=54001,
 		["recharge_id"]=17,
 		["reward"]={
@ -1041,7 +1041,7 @@ local act_growup_gift = {
 		["value"]=800,
 		["value_2"]=1
 	},
-	[14604]={
+	[5064]={
 		["hero_id"]=54001,
 		["recharge_id"]=18,
 		["reward"]={
--- a/lua/app/config/act_growup_gift_new.lua
+++ b/lua/app/config/act_growup_gift_new.lua
@ -1,210 +0,0 @@
-local act_growup_gift_new = {
-	[10105]={
-		["before_id"]=10105,
-		["next_id"]=10205,
-		["recharge_id"]=7,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=100,
- 				["num_for_nothing"]="Vwhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
-			}
-		},
-		["limit_time"]=3,
-		["cd"]=12,
-		["value"]=800
-	},
-	[10205]={
-		["before_id"]=10105,
-		["next_id"]=10305,
-		["recharge_id"]=10,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=150,
- 				["num_for_nothing"]="Vw1c"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=12,
- 				["num_for_nothing"]="Vwo="
-			}
-		},
-		["limit_time"]=3,
-		["cd"]=12,
-		["value"]=800
-	},
-	[10305]={
-		["before_id"]=10205,
-		["next_id"]=10405,
-		["recharge_id"]=13,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=300,
- 				["num_for_nothing"]="VQhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=24,
- 				["num_for_nothing"]="VAw="
-			}
-		},
-		["limit_time"]=3,
-		["cd"]=12,
-		["value"]=800
-	},
-	[10405]={
-		["before_id"]=10305,
-		["next_id"]=10505,
-		["recharge_id"]=15,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=450,
- 				["num_for_nothing"]="Ug1c"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=24000,
- 				["num_for_nothing"]="VAxcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=36,
- 				["num_for_nothing"]="VQ4="
-			}
-		},
-		["limit_time"]=3,
-		["cd"]=12,
-		["value"]=800
-	},
-	[10505]={
-		["before_id"]=10405,
-		["next_id"]=10605,
-		["recharge_id"]=17,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1000,
- 				["num_for_nothing"]="VwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=34000,
- 				["num_for_nothing"]="VQxcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=96,
- 				["num_for_nothing"]="Xw4="
-			}
-		},
-		["limit_time"]=3,
-		["cd"]=12,
-		["value"]=800
-	},
-	[10605]={
-		["before_id"]=10505,
-		["next_id"]=10605,
-		["recharge_id"]=18,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1500,
- 				["num_for_nothing"]="Vw1cAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=42000,
- 				["num_for_nothing"]="UgpcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=138,
- 				["num_for_nothing"]="VwtU"
-			}
-		},
-		["limit_time"]=3,
-		["cd"]=12,
-		["value"]=800
-	}
-}
-local config = {
-data=act_growup_gift_new,count=6
-}
-return config
--- a/lua/app/config/act_growup_gift_new.lua.meta
+++ b/lua/app/config/act_growup_gift_new.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: c44451c35b355aa438b34e5700d4e237
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/act_sevenday_quest.lua
+++ b/lua/app/config/act_sevenday_quest.lua
@ -170,7 +170,7 @@ local act_sevenday_quest = {
 	},
 	[14]={
 		["day"]=2,
-		["number"]=4,
+		["number"]=5,
 		["type"]=25,
 		["reward"]={
 			["type"]=1,
@ -196,7 +196,7 @@ local act_sevenday_quest = {
 	},
 	[16]={
 		["day"]=2,
-		["number"]=5,
+		["number"]=7,
 		["type"]=23,
 		["reward"]={
 			["type"]=1,
@ -274,7 +274,7 @@ local act_sevenday_quest = {
 	},
 	[22]={
 		["day"]=3,
-		["number"]=5,
+		["number"]=6,
 		["type"]=24,
 		["reward"]={
 			["type"]=1,
@ -300,7 +300,7 @@ local act_sevenday_quest = {
 	},
 	[24]={
 		["day"]=3,
-		["number"]=8,
+		["number"]=9,
 		["type"]=27,
 		["reward"]={
 			["type"]=1,
@ -313,7 +313,7 @@ local act_sevenday_quest = {
 	},
 	[25]={
 		["day"]=3,
-		["number"]=7,
+		["number"]=10,
 		["type"]=23,
 		["reward"]={
 			["type"]=1,
@ -404,7 +404,7 @@ local act_sevenday_quest = {
 	},
 	[32]={
 		["day"]=4,
-		["number"]=6,
+		["number"]=8,
 		["type"]=24,
 		["reward"]={
 			["type"]=1,
@ -430,7 +430,7 @@ local act_sevenday_quest = {
 	},
 	[34]={
 		["day"]=4,
-		["number"]=5,
+		["number"]=6,
 		["type"]=25,
 		["reward"]={
 			["type"]=1,
@ -443,7 +443,7 @@ local act_sevenday_quest = {
 	},
 	[35]={
 		["day"]=4,
-		["number"]=9,
+		["number"]=11,
 		["type"]=27,
 		["reward"]={
 			["type"]=1,
@ -456,7 +456,7 @@ local act_sevenday_quest = {
 	},
 	[36]={
 		["day"]=4,
-		["number"]=9,
+		["number"]=13,
 		["type"]=23,
 		["reward"]={
 			["type"]=1,
@ -534,7 +534,7 @@ local act_sevenday_quest = {
 	},
 	[42]={
 		["day"]=5,
-		["number"]=7,
+		["number"]=8,
 		["type"]=24,
 		["reward"]={
 			["type"]=1,
@ -560,7 +560,7 @@ local act_sevenday_quest = {
 	},
 	[44]={
 		["day"]=5,
-		["number"]=6,
+		["number"]=7,
 		["type"]=25,
 		["reward"]={
 			["type"]=1,
@ -573,7 +573,7 @@ local act_sevenday_quest = {
 	},
 	[45]={
 		["day"]=5,
-		["number"]=10,
+		["number"]=13,
 		["type"]=27,
 		["reward"]={
 			["type"]=1,
@ -586,7 +586,7 @@ local act_sevenday_quest = {
 	},
 	[46]={
 		["day"]=5,
-		["number"]=12,
+		["number"]=16,
 		["type"]=23,
 		["reward"]={
 			["type"]=1,
@ -677,7 +677,7 @@ local act_sevenday_quest = {
 	},
 	[53]={
 		["day"]=6,
-		["number"]=9,
+		["number"]=10,
 		["type"]=24,
 		["reward"]={
 			["type"]=1,
@ -703,7 +703,7 @@ local act_sevenday_quest = {
 	},
 	[55]={
 		["day"]=6,
-		["number"]=11,
+		["number"]=15,
 		["type"]=27,
 		["reward"]={
 			["type"]=1,
@ -716,7 +716,7 @@ local act_sevenday_quest = {
 	},
 	[56]={
 		["day"]=6,
-		["number"]=14,
+		["number"]=18,
 		["type"]=23,
 		["reward"]={
 			["type"]=1,
@ -820,7 +820,7 @@ local act_sevenday_quest = {
 	},
 	[64]={
 		["day"]=7,
-		["number"]=10,
+		["number"]=12,
 		["type"]=24,
 		["reward"]={
 			["type"]=1,
@ -846,7 +846,7 @@ local act_sevenday_quest = {
 	},
 	[66]={
 		["day"]=7,
-		["number"]=7,
+		["number"]=8,
 		["type"]=25,
 		["reward"]={
 			["type"]=1,
@ -859,7 +859,7 @@ local act_sevenday_quest = {
 	},
 	[67]={
 		["day"]=7,
-		["number"]=12,
+		["number"]=16,
 		["type"]=27,
 		["reward"]={
 			["type"]=1,
@ -872,7 +872,7 @@ local act_sevenday_quest = {
 	},
 	[68]={
 		["day"]=7,
-		["number"]=16,
+		["number"]=21,
 		["type"]=23,
 		["reward"]={
 			["type"]=1,
--- a/lua/app/config/activity.lua
+++ b/lua/app/config/activity.lua
@ -1,371 +0,0 @@
-local activity = {
-	[106]={
-		["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=73
-}
-return config
--- a/lua/app/config/activity.lua.meta
+++ b/lua/app/config/activity.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: fe4c1620192e0df40af27ef7fd1a21b6
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_boss_rush_chapter.lua
+++ b/lua/app/config/activity_boss_rush_chapter.lua
--- a/lua/app/config/activity_boss_rush_chapter.lua.meta
+++ b/lua/app/config/activity_boss_rush_chapter.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 3b9c06b8307dd0b4cb53ae035d53aa11
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_boss_rush_exchange.lua
+++ b/lua/app/config/activity_boss_rush_exchange.lua
@ -1,158 +0,0 @@
-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
--- a/lua/app/config/activity_boss_rush_exchange.lua.meta
+++ b/lua/app/config/activity_boss_rush_exchange.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 8c8d75a1f2e364844b081ef20888e140
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_boss_rush_rank.lua
+++ b/lua/app/config/activity_boss_rush_rank.lua
--- a/lua/app/config/activity_boss_rush_rank.lua.meta
+++ b/lua/app/config/activity_boss_rush_rank.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 472bee3e9223f3c4aa8b407e72891bc3
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_bounty_level.lua
+++ b/lua/app/config/activity_bounty_level.lua
--- a/lua/app/config/activity_bounty_level.lua.meta
+++ b/lua/app/config/activity_bounty_level.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 60cbee20c73d9fe49b70a17eba0931e6
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_bounty_task.lua
+++ b/lua/app/config/activity_bounty_task.lua
@ -1,138 +0,0 @@
-local activity_bounty_task = {
-	[1]={
-		["type"]=22,
-		["number"]={
-			1,
-			2,
-			3,
-			4,
-			5,
-			6,
-			7
-		},
-		["reward"]={
-			100,
-			100,
-			100,
-			100,
-			100,
-			100,
-			100
-		},
-		["icon"]="11"
-	},
-	[2]={
-		["type"]=1,
-		["number"]={
-			10,
-			20,
-			30,
-			40,
-			50,
-			60,
-			70
-		},
-		["reward"]={
-			150,
-			150,
-			150,
-			150,
-			200,
-			200,
-			200
-		},
-		["icon"]="10"
-	},
-	[3]={
-		["type"]=11,
-		["number"]={
-			50,
-			100,
-			150,
-			200,
-			250,
-			300,
-			350
-		},
-		["reward"]={
-			100,
-			100,
-			100,
-			100,
-			100,
-			100,
-			100
-		},
-		["icon"]="7"
-	},
-	[4]={
-		["type"]=12,
-		["number"]={
-			10,
-			20,
-			30,
-			40,
-			50,
-			60,
-			70
-		},
-		["reward"]={
-			100,
-			100,
-			100,
-			100,
-			150,
-			150,
-			150
-		},
-		["icon"]="9"
-	},
-	[5]={
-		["type"]=30,
-		["number"]={
-			5,
-			10,
-			15,
-			20,
-			25,
-			30,
-			35
-		},
-		["reward"]={
-			100,
-			100,
-			100,
-			100,
-			150,
-			150,
-			150
-		},
-		["icon"]="12"
-	},
-	[6]={
-		["type"]=19,
-		["number"]={
-			50,
-			100,
-			150,
-			200,
-			250,
-			300,
-			350
-		},
-		["reward"]={
-			100,
-			100,
-			100,
-			100,
-			150,
-			150,
-			150
-		},
-		["icon"]="9"
-	}
-}
-local config = {
-data=activity_bounty_task,count=6
-}
-return config
--- a/lua/app/config/activity_bounty_task.lua.meta
+++ b/lua/app/config/activity_bounty_task.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: d61c8b9ff81efe2428f8d9f200681630
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_exchange.lua
+++ b/lua/app/config/activity_exchange.lua
--- a/lua/app/config/activity_exchange.lua.meta
+++ b/lua/app/config/activity_exchange.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 59cc689139c1fb0429cd581fc781710e
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_full_moon_quest.lua
+++ b/lua/app/config/activity_full_moon_quest.lua
@ -1,149 +0,0 @@
-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
--- a/lua/app/config/activity_full_moon_quest.lua.meta
+++ b/lua/app/config/activity_full_moon_quest.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 5c90db40ed5e599489d9e1e3ba84a45b
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_full_moon_reward.lua
+++ b/lua/app/config/activity_full_moon_reward.lua
@ -1,127 +0,0 @@
-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
--- a/lua/app/config/activity_full_moon_reward.lua.meta
+++ b/lua/app/config/activity_full_moon_reward.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 227e65a00ca4e834f9375489a586b270
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_herofund.lua
+++ b/lua/app/config/activity_herofund.lua
@ -1,627 +0,0 @@
-local activity_herofund = {
-	[1]={
-		["exp"]=0,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		}
-	},
-	[2]={
-		["exp"]=30,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=1500,
- 			["num_for_nothing"]="Vw1cAw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=4000,
- 			["num_for_nothing"]="UghcAw=="
-		}
-	},
-	[3]={
-		["exp"]=60,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	[4]={
-		["exp"]=90,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=13,
- 			["id_for_nothing"]="Vws=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=13,
- 			["id_for_nothing"]="Vws=",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=13,
- 			["id_for_nothing"]="Vws=",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		}
-	},
-	[5]={
-		["exp"]=120,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=1500,
- 			["num_for_nothing"]="Vw1cAw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=4000,
- 			["num_for_nothing"]="UghcAw=="
-		}
-	},
-	[6]={
-		["exp"]=150,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=30,
- 			["num_for_nothing"]="VQg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		}
-	},
-	[7]={
-		["exp"]=180,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	[8]={
-		["exp"]=210,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=1500,
- 			["num_for_nothing"]="Vw1cAw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=4000,
- 			["num_for_nothing"]="UghcAw=="
-		}
-	},
-	[9]={
-		["exp"]=240,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=10,
- 			["id_for_nothing"]="Vwg=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=10,
- 			["id_for_nothing"]="Vwg=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=10,
- 			["id_for_nothing"]="Vwg=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		}
-	},
-	[10]={
-		["exp"]=270,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=11,
- 			["id_for_nothing"]="Vwk=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=47,
- 			["id_for_nothing"]="Ug8=",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		}
-	},
-	[11]={
-		["exp"]=300,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	[12]={
-		["exp"]=330,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=30,
- 			["num_for_nothing"]="VQg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=50,
- 			["num_for_nothing"]="Uwg="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=100,
- 			["num_for_nothing"]="Vwhc"
-		}
-	},
-	[13]={
-		["exp"]=360,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=1500,
- 			["num_for_nothing"]="Vw1cAw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=4000,
- 			["num_for_nothing"]="UghcAw=="
-		}
-	},
-	[14]={
-		["exp"]=390,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	[15]={
-		["exp"]=420,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		}
-	},
-	[16]={
-		["exp"]=450,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=1500,
- 			["num_for_nothing"]="Vw1cAw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=4000,
- 			["num_for_nothing"]="UghcAw=="
-		}
-	},
-	[17]={
-		["exp"]=480,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	[18]={
-		["exp"]=510,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=30,
- 			["num_for_nothing"]="VQg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=50,
- 			["num_for_nothing"]="Uwg="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=100,
- 			["num_for_nothing"]="Vwhc"
-		}
-	},
-	[19]={
-		["exp"]=540,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=11,
- 			["id_for_nothing"]="Vwk=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=47,
- 			["id_for_nothing"]="Ug8=",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		}
-	},
-	[20]={
-		["exp"]=570,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=1500,
- 			["num_for_nothing"]="Vw1cAw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=4000,
- 			["num_for_nothing"]="UghcAw=="
-		}
-	},
-	[21]={
-		["exp"]=600,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	[22]={
-		["exp"]=630,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=1500,
- 			["num_for_nothing"]="Vw1cAw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=4000,
- 			["num_for_nothing"]="UghcAw=="
-		}
-	},
-	[23]={
-		["exp"]=660,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		},
-		["reward_pro_max"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44003,
- 			["id_for_nothing"]="UgxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		}
-	}
-}
-local config = {
-data=activity_herofund,count=23
-}
-return config
--- a/lua/app/config/activity_herofund.lua.meta
+++ b/lua/app/config/activity_herofund.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: c683a9fc124b89c4a8e10278b027d723
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_pvp.lua
+++ b/lua/app/config/activity_pvp.lua
@ -1,958 +0,0 @@
-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
--- a/lua/app/config/activity_pvp.lua.meta
+++ b/lua/app/config/activity_pvp.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 50e07ebaa9427ca4fbea89c4d5688dfe
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_pvp_board.lua
+++ b/lua/app/config/activity_pvp_board.lua
--- a/lua/app/config/activity_pvp_board.lua.meta
+++ b/lua/app/config/activity_pvp_board.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 0ea07987f5138fd4783f9cb9509cf506
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_pvp_robot.lua
+++ b/lua/app/config/activity_pvp_robot.lua
--- a/lua/app/config/activity_pvp_robot.lua.meta
+++ b/lua/app/config/activity_pvp_robot.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: fd03cb791b45ac0439c466dc70d9e54e
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_pvp_wingift.lua
+++ b/lua/app/config/activity_pvp_wingift.lua
@ -1,90 +0,0 @@
-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
--- a/lua/app/config/activity_pvp_wingift.lua.meta
+++ b/lua/app/config/activity_pvp_wingift.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 7912de26d4904f2449669a964a5a42c2
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_rank.lua
+++ b/lua/app/config/activity_rank.lua
--- a/lua/app/config/activity_rank.lua.meta
+++ b/lua/app/config/activity_rank.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 640f37c0816009d4caa2c985b412047c
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/activity_tourn_arena_point.lua
+++ b/lua/app/config/activity_tourn_arena_point.lua
@ -1,54 +0,0 @@
-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
--- a/lua/app/config/activity_tourn_arena_point.lua.meta
+++ b/lua/app/config/activity_tourn_arena_point.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 3e83ace12d9f46c4b8aef7f8f3521dcc
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/arena_board.lua
+++ b/lua/app/config/arena_board.lua
--- a/lua/app/config/arena_board.lua.meta
+++ b/lua/app/config/arena_board.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 17267e9c640f5fe41949ec6d96024d81
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/arena_bounty_level.lua
+++ b/lua/app/config/arena_bounty_level.lua
--- a/lua/app/config/arena_bounty_level.lua.meta
+++ b/lua/app/config/arena_bounty_level.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: d625b12e9e77e0741b7bdd369d12a1c8
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/arena_gift.lua
+++ b/lua/app/config/arena_gift.lua
@ -1,600 +0,0 @@
-local arena_gift = {
-	[1]={
-		["score"]=900,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=8,
- 				["id_for_nothing"]="Xg==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[2]={
-		["score"]=950,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=23002,
- 				["id_for_nothing"]="VAtcA2c=",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		}
-	},
-	[3]={
-		["score"]=1000,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[4]={
-		["score"]=1050,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			}
-		}
-	},
-	[5]={
-		["score"]=1100,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
-			}
-		},
-		["unlock_hero"]={
-			54003
-		}
-	},
-	[6]={
-		["score"]=1150,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[7]={
-		["score"]=1200,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["unlock_hero"]={
-			34003
-		}
-	},
-	[8]={
-		["score"]=1250,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			}
-		}
-	},
-	[9]={
-		["score"]=1300,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=11,
- 				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[10]={
-		["score"]=1350,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
-			}
-		}
-	},
-	[11]={
-		["score"]=1400,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=54003,
- 				["id_for_nothing"]="UwxcA2Y=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		},
-		["unlock_hero"]={
-			24003
-		}
-	},
-	[12]={
-		["score"]=1450,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=15000,
- 				["num_for_nothing"]="Vw1cA2U="
-			}
-		}
-	},
-	[13]={
-		["score"]=1500,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=11,
- 				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[14]={
-		["score"]=1550,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=80,
- 				["num_for_nothing"]="Xgg="
-			}
-		}
-	},
-	[15]={
-		["score"]=1600,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=34003,
- 				["id_for_nothing"]="VQxcA2Y=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[16]={
-		["score"]=1650,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
-			}
-		}
-	},
-	[17]={
-		["score"]=1700,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[18]={
-		["score"]=1750,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=100,
- 				["num_for_nothing"]="Vwhc"
-			}
-		}
-	},
-	[19]={
-		["score"]=1800,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=24003,
- 				["id_for_nothing"]="VAxcA2Y=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[20]={
-		["score"]=1850,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=20000,
- 				["num_for_nothing"]="VAhcA2U="
-			}
-		}
-	},
-	[21]={
-		["score"]=1900,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[22]={
-		["score"]=1950,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=120,
- 				["num_for_nothing"]="Vwpc"
-			}
-		}
-	},
-	[23]={
-		["score"]=2000,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[24]={
-		["score"]=2050,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=24000,
- 				["num_for_nothing"]="VAxcA2U="
-			}
-		}
-	},
-	[25]={
-		["score"]=2100,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[26]={
-		["score"]=2150,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=150,
- 				["num_for_nothing"]="Vw1c"
-			}
-		}
-	},
-	[27]={
-		["score"]=2200,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
-			}
-		}
-	},
-	[28]={
-		["score"]=2250,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			}
-		}
-	},
-	[29]={
-		["score"]=2300,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[30]={
-		["score"]=2350,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=180,
- 				["num_for_nothing"]="VwBc"
-			}
-		}
-	},
-	[31]={
-		["score"]=2400,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			}
-		}
-	},
-	[32]={
-		["score"]=2450,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[33]={
-		["score"]=2500,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		}
-	},
-	[34]={
-		["score"]=2550,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=40000,
- 				["num_for_nothing"]="UghcA2U="
-			}
-		}
-	},
-	[35]={
-		["score"]=2600,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[36]={
-		["score"]=2650,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			}
-		}
-	},
-	[37]={
-		["score"]=2700,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=40000,
- 				["num_for_nothing"]="UghcA2U="
-			}
-		}
-	},
-	[38]={
-		["score"]=2750,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[39]={
-		["score"]=2800,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=12,
- 				["num_for_nothing"]="Vwo="
-			}
-		}
-	},
-	[40]={
-		["score"]=2850,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			}
-		}
-	},
-	[41]={
-		["score"]=2900,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[42]={
-		["score"]=2950,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=300,
- 				["num_for_nothing"]="VQhc"
-			}
-		}
-	},
-	[43]={
-		["score"]=3000,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			}
-		}
-	},
-	[44]={
-		["score"]=3050,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[45]={
-		["score"]=3100,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=15,
- 				["num_for_nothing"]="Vw0="
-			}
-		}
-	}
-}
-local config = {
-data=arena_gift,count=45
-}
-return config
--- a/lua/app/config/arena_gift.lua.meta
+++ b/lua/app/config/arena_gift.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 505a5ee453a5c8c4eb2542c5844eab6f
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/arena_rank.lua
+++ b/lua/app/config/arena_rank.lua
--- a/lua/app/config/arena_rank.lua.meta
+++ b/lua/app/config/arena_rank.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 635619ab3c013814e8fdbe737468f967
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/arena_robot.lua
+++ b/lua/app/config/arena_robot.lua
@ -1,876 +0,0 @@
-local arena_robot = {
-	[1]={
-		["name"]="Gresham",
-		["score"]=917,
-		["level"]=9,
-		["avatar"]=3001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				3
-			},
-			{
-				22001,
-				3
-			},
-			{
-				32001,
-				3
-			},
-			{
-				42001,
-				3
-			},
-			{
-				52001,
-				3
-			}
-		}
-	},
-	[2]={
-		["name"]="Gilroy",
-		["score"]=929,
-		["level"]=10,
-		["avatar"]=1001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				5
-			},
-			{
-				22001,
-				5
-			},
-			{
-				32001,
-				5
-			},
-			{
-				42001,
-				5
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[3]={
-		["name"]="Landry",
-		["score"]=941,
-		["level"]=10,
-		["avatar"]=4001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				5
-			},
-			{
-				22001,
-				5
-			},
-			{
-				32001,
-				5
-			},
-			{
-				42001,
-				5
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[4]={
-		["name"]="Eva",
-		["score"]=953,
-		["level"]=9,
-		["avatar"]=2001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				5
-			},
-			{
-				22001,
-				5
-			},
-			{
-				32001,
-				5
-			},
-			{
-				43001,
-				3
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[5]={
-		["name"]="Prosperous",
-		["score"]=959,
-		["level"]=9,
-		["avatar"]=5001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				5
-			},
-			{
-				22001,
-				5
-			},
-			{
-				32001,
-				5
-			},
-			{
-				43001,
-				3
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[6]={
-		["name"]="Fleming",
-		["score"]=964,
-		["level"]=8,
-		["avatar"]=4001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				5
-			},
-			{
-				22001,
-				5
-			},
-			{
-				33001,
-				3
-			},
-			{
-				43001,
-				4
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[7]={
-		["name"]="Lola",
-		["score"]=969,
-		["level"]=8,
-		["avatar"]=5001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				5
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				3
-			},
-			{
-				43001,
-				4
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[8]={
-		["name"]="Frances",
-		["score"]=978,
-		["level"]=9,
-		["avatar"]=3001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				6
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				3
-			},
-			{
-				43001,
-				5
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[9]={
-		["name"]="Keith",
-		["score"]=987,
-		["level"]=7,
-		["avatar"]=2001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				12001,
-				6
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				4
-			},
-			{
-				43001,
-				5
-			},
-			{
-				52001,
-				5
-			}
-		}
-	},
-	[10]={
-		["name"]="Winston",
-		["score"]=996,
-		["level"]=11,
-		["avatar"]=1001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				3
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				4
-			},
-			{
-				43001,
-				5
-			},
-			{
-				52001,
-				6
-			}
-		}
-	},
-	[11]={
-		["name"]="Halsey",
-		["score"]=1006,
-		["level"]=12,
-		["avatar"]=5001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				3
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				5
-			},
-			{
-				43001,
-				5
-			},
-			{
-				52001,
-				6
-			}
-		}
-	},
-	[12]={
-		["name"]="Stuart",
-		["score"]=1018,
-		["level"]=14,
-		["avatar"]=5001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				4
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				5
-			},
-			{
-				43001,
-				5
-			},
-			{
-				52001,
-				6
-			}
-		}
-	},
-	[13]={
-		["name"]="Dark-Haired",
-		["score"]=1029,
-		["level"]=13,
-		["avatar"]=1001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				4
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				5
-			},
-			{
-				43001,
-				5
-			},
-			{
-				52001,
-				6
-			}
-		}
-	},
-	[14]={
-		["name"]="Hilda",
-		["score"]=1036,
-		["level"]=10,
-		["avatar"]=2001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				5
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				5
-			},
-			{
-				43001,
-				6
-			},
-			{
-				52001,
-				6
-			}
-		}
-	},
-	[15]={
-		["name"]="Idelle",
-		["score"]=1046,
-		["level"]=13,
-		["avatar"]=2001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				5
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				5
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				4
-			}
-		}
-	},
-	[16]={
-		["name"]="Sibley",
-		["score"]=1055,
-		["level"]=11,
-		["avatar"]=3001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				5
-			},
-			{
-				22001,
-				6
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				4
-			}
-		}
-	},
-	[17]={
-		["name"]="Wolf",
-		["score"]=1065,
-		["level"]=11,
-		["avatar"]=1001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				5
-			},
-			{
-				22001,
-				7
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				4
-			}
-		}
-	},
-	[18]={
-		["name"]="Renata",
-		["score"]=1073,
-		["level"]=13,
-		["avatar"]=3001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				6
-			},
-			{
-				22001,
-				7
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				4
-			}
-		}
-	},
-	[19]={
-		["name"]="Lane",
-		["score"]=1084,
-		["level"]=10,
-		["avatar"]=4001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				6
-			},
-			{
-				22001,
-				7
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				5
-			}
-		}
-	},
-	[20]={
-		["name"]="Fabian",
-		["score"]=1095,
-		["level"]=13,
-		["avatar"]=4001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				6
-			},
-			{
-				23002,
-				4
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				5
-			}
-		}
-	},
-	[21]={
-		["name"]="Peace",
-		["score"]=1104,
-		["level"]=14,
-		["avatar"]=1001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				6
-			},
-			{
-				23002,
-				4
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				5
-			}
-		}
-	},
-	[22]={
-		["name"]="Tanya",
-		["score"]=1110,
-		["level"]=15,
-		["avatar"]=2001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				6
-			},
-			{
-				23002,
-				4
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				5
-			}
-		}
-	},
-	[23]={
-		["name"]="Trix",
-		["score"]=1118,
-		["level"]=13,
-		["avatar"]=5001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				6
-			},
-			{
-				23002,
-				5
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				6
-			},
-			{
-				53002,
-				6
-			}
-		}
-	},
-	[24]={
-		["name"]="Eugene",
-		["score"]=1129,
-		["level"]=16,
-		["avatar"]=5001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				6
-			},
-			{
-				23002,
-				5
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				7
-			},
-			{
-				53002,
-				6
-			}
-		}
-	},
-	[25]={
-		["name"]="Loralie",
-		["score"]=1140,
-		["level"]=14,
-		["avatar"]=1001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				7
-			},
-			{
-				23002,
-				5
-			},
-			{
-				33001,
-				6
-			},
-			{
-				43001,
-				7
-			},
-			{
-				53002,
-				6
-			}
-		}
-	},
-	[26]={
-		["name"]="Henrietta",
-		["score"]=1150,
-		["level"]=13,
-		["avatar"]=3001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				7
-			},
-			{
-				23002,
-				5
-			},
-			{
-				33001,
-				7
-			},
-			{
-				43002,
-				7
-			},
-			{
-				53002,
-				6
-			}
-		}
-	},
-	[27]={
-		["name"]="Willette",
-		["score"]=1159,
-		["level"]=14,
-		["avatar"]=4001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				7
-			},
-			{
-				23002,
-				6
-			},
-			{
-				33001,
-				7
-			},
-			{
-				43002,
-				7
-			},
-			{
-				53002,
-				6
-			}
-		}
-	},
-	[28]={
-		["name"]="Orlena",
-		["score"]=1167,
-		["level"]=14,
-		["avatar"]=3001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				7
-			},
-			{
-				23002,
-				6
-			},
-			{
-				33001,
-				7
-			},
-			{
-				43002,
-				7
-			},
-			{
-				53002,
-				7
-			}
-		}
-	},
-	[29]={
-		["name"]="Irving",
-		["score"]=1178,
-		["level"]=15,
-		["avatar"]=2001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				7
-			},
-			{
-				23002,
-				6
-			},
-			{
-				33001,
-				7
-			},
-			{
-				43002,
-				7
-			},
-			{
-				53002,
-				7
-			}
-		}
-	},
-	[30]={
-		["name"]="Phyllis",
-		["score"]=1190,
-		["level"]=16,
-		["avatar"]=4001,
-		["avatar_frame"]=1000,
-		["hero_id"]={
-			{
-				13001,
-				7
-			},
-			{
-				23002,
-				7
-			},
-			{
-				33001,
-				7
-			},
-			{
-				43002,
-				7
-			},
-			{
-				53002,
-				7
-			}
-		}
-	}
-}
-local config = {
-data=arena_robot,count=30
-}
-return config
--- a/lua/app/config/arena_robot.lua.meta
+++ b/lua/app/config/arena_robot.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 0e3b6b7101c448b44b25e8c24d852b50
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/arena_time.lua
+++ b/lua/app/config/arena_time.lua
@ -1,126 +0,0 @@
-local arena_time = {
-	[1]={
-		["season"]=1,
-		["start_time"]="2023-6-25 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",
-		["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",
-		["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=20
-}
-return config
--- a/lua/app/config/arena_time.lua.meta
+++ b/lua/app/config/arena_time.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 87929dc99a2abfb4c950dc84179717da
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/attr.lua
+++ b/lua/app/config/attr.lua
@ -22,226 +22,6 @@ local attr = {
 	[6]={
 		["id"]=6,
 		["name"]="atk_purple"
-	},
-	[7]={
-		["id"]=7,
-		["name"]="attr_crit_red"
-	},
-	[8]={
-		["id"]=8,
-		["name"]="attr_crit_yellow"
-	},
-	[9]={
-		["id"]=9,
-		["name"]="attr_crit_green"
-	},
-	[10]={
-		["id"]=10,
-		["name"]="attr_crit_blue"
-	},
-	[11]={
-		["id"]=11,
-		["name"]="attr_crit_purple"
-	},
-	[12]={
-		["id"]=12,
-		["name"]="attr_crit_time_red"
-	},
-	[13]={
-		["id"]=13,
-		["name"]="attr_crit_time_yellow"
-	},
-	[14]={
-		["id"]=14,
-		["name"]="attr_crit_time_green"
-	},
-	[15]={
-		["id"]=15,
-		["name"]="attr_crit_time_blue"
-	},
-	[16]={
-		["id"]=16,
-		["name"]="attr_crit_time_purple"
-	},
-	[17]={
-		["id"]=17,
-		["name"]="attr_cured_red"
-	},
-	[18]={
-		["id"]=18,
-		["name"]="attr_cured_yellow"
-	},
-	[19]={
-		["id"]=19,
-		["name"]="attr_cured_green"
-	},
-	[20]={
-		["id"]=20,
-		["name"]="attr_cured_blue"
-	},
-	[21]={
-		["id"]=21,
-		["name"]="attr_cured_purple"
-	},
-	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
-	},
-	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
-	},
-	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
-	},
-	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
-	},
-	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
-	},
-	[27]={
-		["id"]=27,
-		["name"]="attr_hpp_red"
-	},
-	[28]={
-		["id"]=28,
-		["name"]="attr_hpp_yellow"
-	},
-	[29]={
-		["id"]=29,
-		["name"]="attr_hpp_green"
-	},
-	[30]={
-		["id"]=30,
-		["name"]="attr_hpp_blue"
-	},
-	[31]={
-		["id"]=31,
-		["name"]="attr_hpp_purple"
-	},
-	[32]={
-		["id"]=32,
-		["name"]="attr_normal_hurt_red"
-	},
-	[33]={
-		["id"]=33,
-		["name"]="attr_normal_hurt_yellow"
-	},
-	[34]={
-		["id"]=34,
-		["name"]="attr_normal_hurt_green"
-	},
-	[35]={
-		["id"]=35,
-		["name"]="attr_normal_hurt_blue"
-	},
-	[36]={
-		["id"]=36,
-		["name"]="attr_normal_hurt_purple"
-	},
-	[37]={
-		["id"]=37,
-		["name"]="attr_skill_hurt_red"
-	},
-	[38]={
-		["id"]=38,
-		["name"]="attr_skill_hurt_yellow"
-	},
-	[39]={
-		["id"]=39,
-		["name"]="attr_skill_hurt_green"
-	},
-	[40]={
-		["id"]=40,
-		["name"]="attr_skill_hurt_blue"
-	},
-	[41]={
-		["id"]=41,
-		["name"]="attr_skill_hurt_purple"
-	},
-	[42]={
-		["id"]=42,
-		["name"]="attr_normal_hurtp_red"
-	},
-	[43]={
-		["id"]=43,
-		["name"]="attr_normal_hurtp_yellow"
-	},
-	[44]={
-		["id"]=44,
-		["name"]="attr_normal_hurtp_green"
-	},
-	[45]={
-		["id"]=45,
-		["name"]="attr_normal_hurtp_blue"
-	},
-	[46]={
-		["id"]=46,
-		["name"]="attr_normal_hurtp_purple"
-	},
-	[47]={
-		["id"]=47,
-		["name"]="attr_skill_hurtp_red"
-	},
-	[48]={
-		["id"]=48,
-		["name"]="attr_skill_hurtp_yellow"
-	},
-	[49]={
-		["id"]=49,
-		["name"]="attr_skill_hurtp_green"
-	},
-	[50]={
-		["id"]=50,
-		["name"]="attr_skill_hurtp_blue"
-	},
-	[51]={
-		["id"]=51,
-		["name"]="attr_skill_hurtp_purple"
-	},
-	[52]={
-		["id"]=52,
-		["name"]="attr_hp_red"
-	},
-	[53]={
-		["id"]=53,
-		["name"]="attr_hp_yellow"
-	},
-	[54]={
-		["id"]=54,
-		["name"]="attr_hp_green"
-	},
-	[55]={
-		["id"]=55,
-		["name"]="attr_hp_blue"
-	},
-	[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 = {
@ -251,67 +31,12 @@ local keys = {
 		["atk_yellow"]=attr[3],
 		["atk_green"]=attr[4],
 		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["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]
+		["atk_purple"]=attr[6]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=61
+count=6
 }
 return config
--- a/lua/app/config/avatar.lua
+++ b/lua/app/config/avatar.lua
@ -1,211 +0,0 @@
-local avatar = {
-	[23]={
-		["iconId"]="avatar_1",
-		["item"]=23,
-		["unlock_show"]=true
-	},
-	[24]={
-		["iconId"]="avatar_2",
-		["item"]=44,
-		["unlock_show"]=true
-	},
-	[1001]={
-		["iconId"]="1",
-		["hero"]=12001
-	},
-	[2001]={
-		["iconId"]="2",
-		["hero"]=22001,
-		["unlock"]=true
-	},
-	[3001]={
-		["iconId"]="3",
-		["hero"]=32001,
-		["unlock"]=true
-	},
-	[4001]={
-		["iconId"]="4",
-		["hero"]=42001,
-		["unlock"]=true
-	},
-	[5001]={
-		["iconId"]="5",
-		["hero"]=52001
-	},
-	[6001]={
-		["iconId"]="6",
-		["hero"]=13001
-	},
-	[7001]={
-		["iconId"]="7",
-		["hero"]=23002
-	},
-	[8001]={
-		["iconId"]="8",
-		["hero"]=33001
-	},
-	[9001]={
-		["iconId"]="9",
-		["hero"]=43001
-	},
-	[10001]={
-		["iconId"]="10",
-		["hero"]=53001
-	},
-	[11001]={
-		["iconId"]="11",
-		["hero"]=13002
-	},
-	[12001]={
-		["iconId"]="12",
-		["hero"]=23001
-	},
-	[13001]={
-		["iconId"]="13",
-		["hero"]=33002
-	},
-	[14001]={
-		["iconId"]="14",
-		["hero"]=43002
-	},
-	[15001]={
-		["iconId"]="15",
-		["hero"]=53002
-	},
-	[16001]={
-		["iconId"]="16",
-		["hero"]=14001
-	},
-	[17001]={
-		["iconId"]="17",
-		["hero"]=24001
-	},
-	[18001]={
-		["iconId"]="18",
-		["hero"]=34001
-	},
-	[19001]={
-		["iconId"]="19",
-		["hero"]=44001
-	},
-	[20001]={
-		["iconId"]="20",
-		["hero"]=54001
-	},
-	[21001]={
-		["iconId"]="22",
-		["hero"]=24002
-	},
-	[22001]={
-		["iconId"]="23",
-		["hero"]=14002
-	},
-	[23001]={
-		["iconId"]="24",
-		["hero"]=34002
-	},
-	[24001]={
-		["iconId"]="25",
-		["hero"]=44002
-	},
-	[25001]={
-		["iconId"]="26",
-		["hero"]=54002
-	},
-	[14003]={
-		["iconId"]="31",
-		["hero"]=14003
-	},
-	[24003]={
-		["iconId"]="27",
-		["hero"]=24003
-	},
-	[34003]={
-		["iconId"]="28",
-		["hero"]=34003
-	},
-	[44003]={
-		["iconId"]="29",
-		["hero"]=44003
-	},
-	[54003]={
-		["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"]="23_1",
-		["item"]=1400201
-	},
-	[3400101]={
-		["iconId"]="18_1",
-		["item"]=3400101
-	},
-	[3400102]={
-		["iconId"]="18_2",
-		["item"]=3400102
-	},
-	[5300101]={
-		["iconId"]="10_1",
-		["item"]=5300101
-	},
-	[5400101]={
-		["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=50
-}
-return config
--- a/lua/app/config/avatar.lua.meta
+++ b/lua/app/config/avatar.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: fe59ab7c592d4c141b9fa28289bc898d
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/avatar_frame.lua
+++ b/lua/app/config/avatar_frame.lua
@ -1,95 +0,0 @@
-local avatar_frame = {
-	[1000]={
-		["iconId"]="avatar_frame_1",
-		["unlock"]=true
-	},
-	[24]={
-		["iconId"]="avatar_frame_2",
-		["item"]=24,
-		["unlock_show"]=true
-	},
-	[25]={
-		["iconId"]="avatar_frame_3",
-		["item"]=25,
-		["unlock_show"]=true
-	},
-	[26]={
-		["iconId"]="avatar_frame_4",
-		["item"]=45,
-		["unlock_show"]=true
-	},
-	[27]={
-		["iconId"]="avatar_frame_5",
-		["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=18
-}
-return config
--- a/lua/app/config/avatar_frame.lua.meta
+++ b/lua/app/config/avatar_frame.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 8d387a3ff3bff68488370d1ca79c39d5
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/bounty_level.lua
+++ b/lua/app/config/bounty_level.lua
--- a/lua/app/config/bounty_time.lua
+++ b/lua/app/config/bounty_time.lua
@ -1,146 +1,16 @@
 local bounty_time = {
 	[1]={
 		["season"]=1,
-		["start_time"]="2023-6-20 00:00:00",
-		["end_time"]="2023-8-1 00:00:00",
-		["ui_banner"]="ui_bounty_banner",
-		["enter_ui_banner"]="bounty_btn_main_1"
+		["start_time"]="2023-6-1 00:00:00",
+		["end_time"]="2023-7-1 00:00:00"
 	},
 	[2]={
 		["season"]=2,
-		["start_time"]="2023-8-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",
-		["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"
+		["start_time"]="2023-7-1 00:00:00",
+		["end_time"]="2023-8-1 00:00:00"
 	}
 }
 local config = {
-data=bounty_time,count=20
+data=bounty_time,count=2
 }
 return config
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@ -53,9 +53,7 @@ local buff = {
 		["stack"]=2,
 		["position"]=1,
 		["decr"]=1,
-		["icon"]="dec_dmg_red_add",
-		["show_name"]=true,
-		["ispercent"]=1
+		["icon"]="dec_dmg_red_add"
 	},
 	[8]={
 		["id"]=8,
@ -64,9 +62,7 @@ local buff = {
 		["stack"]=2,
 		["position"]=2,
 		["decr"]=1,
-		["icon"]="dec_dmg_yellow_add",
-		["show_name"]=true,
-		["ispercent"]=1
+		["icon"]="dec_dmg_yellow_add"
 	},
 	[9]={
 		["id"]=9,
@ -75,9 +71,7 @@ local buff = {
 		["stack"]=2,
 		["position"]=3,
 		["decr"]=1,
-		["icon"]="dec_dmg_green_add",
-		["show_name"]=true,
-		["ispercent"]=1
+		["icon"]="dec_dmg_green_add"
 	},
 	[10]={
 		["id"]=10,
@ -86,9 +80,7 @@ local buff = {
 		["stack"]=2,
 		["position"]=4,
 		["decr"]=1,
-		["icon"]="dec_dmg_blue_add",
-		["show_name"]=true,
-		["ispercent"]=1
+		["icon"]="dec_dmg_blue_add"
 	},
 	[11]={
 		["id"]=11,
@ -97,9 +89,7 @@ local buff = {
 		["stack"]=2,
 		["position"]=5,
 		["decr"]=1,
-		["icon"]="dec_dmg_purple_add",
-		["show_name"]=true,
-		["ispercent"]=1
+		["icon"]="dec_dmg_purple_add"
 	},
 	[12]={
 		["id"]=12,
@ -107,9 +97,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="dec_dmg_all_add",
-		["show_name"]=true,
-		["ispercent"]=1
+		["icon"]="dec_dmg_all_add"
 	},
 	[13]={
 		["id"]=13,
@ -204,16 +192,14 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="weakness_all_add",
-		["ispercent"]=1
+		["icon"]="weakness_all_add"
 	},
 	[25]={
 		["id"]=25,
 		["name"]="atkp_color_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1,
-		["limit_parameter"]=10000
+		["decr"]=1
 	},
 	[26]={
 		["id"]=26,
@ -221,8 +207,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=1,
-		["limit_parameter"]=10000
+		["decr"]=1
 	},
 	[27]={
 		["id"]=27,
@ -230,8 +215,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=1,
-		["limit_parameter"]=10000
+		["decr"]=1
 	},
 	[28]={
 		["id"]=28,
@ -239,8 +223,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=1,
-		["limit_parameter"]=10000
+		["decr"]=1
 	},
 	[29]={
 		["id"]=29,
@ -248,8 +231,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=1,
-		["limit_parameter"]=10000
+		["decr"]=1
 	},
 	[30]={
 		["id"]=30,
@ -257,8 +239,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=1,
-		["limit_parameter"]=10000
+		["decr"]=1
 	},
 	[31]={
 		["id"]=31,
@ -285,7 +266,6 @@ local buff = {
 		["buff_type"]=8,
 		["decr"]=2,
 		["icon"]="stun",
-		["show_name"]=true,
 		["control_priority"]=2,
 		["fx_continued"]={
 			13
@ -317,7 +297,6 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="normal_attack_dec",
-		["show_name"]=true,
 		["fx_get"]={
 			32
 		}
@ -329,7 +308,6 @@ local buff = {
 		["stack"]=2,
 		["decr"]=1,
 		["icon"]="high",
-		["show_name"]=true,
 		["fx_get"]={
 			30
 		}
@ -418,8 +396,6 @@ local buff = {
 		["decr"]=2,
 		["formula"]=4,
 		["icon"]="burn",
-		["show_name"]=true,
-		["ispercent"]=1,
 		["fx_take"]={
 			36
 		}
@ -430,8 +406,6 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="vulnerable",
-		["show_name"]=true,
-		["ispercent"]=1,
 		["fx_get"]={
 			34
 		}
@ -442,7 +416,6 @@ local buff = {
 		["buff_type"]=7,
 		["decr"]=2,
 		["icon"]="frozen",
-		["show_name"]=true,
 		["control_priority"]=1,
 		["fx_continued"]={
 			16
@ -459,8 +432,6 @@ local buff = {
 		["decr"]=2,
 		["formula"]=4,
 		["icon"]="poison",
-		["show_name"]=true,
-		["ispercent"]=1,
 		["fx_take"]={
 			35
 		}
@ -471,7 +442,6 @@ local buff = {
 		["buff_type"]=7,
 		["decr"]=2,
 		["icon"]="imprison",
-		["show_name"]=true,
 		["control_priority"]=4,
 		["fx_get"]={
 			29
@ -483,8 +453,6 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="corrupt",
-		["show_name"]=true,
-		["ispercent"]=1,
 		["fx_get"]={
 			19
 		}
@ -496,8 +464,6 @@ local buff = {
 		["decr"]=2,
 		["formula"]=4,
 		["icon"]="bleed",
-		["show_name"]=true,
-		["ispercent"]=1,
 		["fx_take"]={
 			31
 		}
@ -508,8 +474,6 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="weaken",
-		["show_name"]=true,
-		["ispercent"]=1,
 		["fx_continued"]={
 			33
 		}
@ -521,7 +485,6 @@ local buff = {
 		["stack"]=1,
 		["decr"]=2,
 		["icon"]="lethargy",
-		["show_name"]=true,
 		["control_priority"]=3,
 		["fx_continued"]={
 			28
@ -533,7 +496,6 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="curse",
-		["show_name"]=true,
 		["fx_get"]={
 			37
 		}
@ -543,8 +505,7 @@ local buff = {
 		["name"]="lock",
 		["buff_type"]=7,
 		["decr"]=2,
-		["icon"]="lock",
-		["show_name"]=true
+		["icon"]="lock"
 	},
 	[59]={
 		["id"]=59,
@ -558,8 +519,7 @@ local buff = {
 		["name"]="skill_hurt_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1,
-		["limit_parameter"]=10000
+		["decr"]=1
 	},
 	[61]={
 		["id"]=61,
@ -567,7 +527,6 @@ local buff = {
 		["buff_type"]=7,
 		["decr"]=1,
 		["icon"]="undead",
-		["show_name"]=true,
 		["fx_continued"]={
 			15
 		}
@ -578,9 +537,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=1,
 		["decr"]=1,
-		["icon"]="counterattack",
-		["show_name"]=true,
-		["ispercent"]=1
+		["icon"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
@ -588,8 +545,6 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=1,
 		["icon"]="thorns",
-		["show_name"]=true,
-		["ispercent"]=1,
 		["fx_continued"]={
 			18
 		}
@ -657,8 +612,7 @@ local buff = {
 		["id"]=72,
 		["name"]="death_summon",
 		["buff_type"]=1,
-		["decr"]=3,
-		["icon"]="death_summon"
+		["decr"]=3
 	},
 	[73]={
 		["id"]=73,
@ -698,233 +652,6 @@ local buff = {
 		["fx_disappear"]={
 			27
 		}
-	},
-	[76]={
-		["id"]=76,
-		["name"]="invalid_control",
-		["buff_type"]=7,
-		["decr"]=3
-	},
-	[77]={
-		["id"]=77,
-		["name"]="end_dmg_addition_all_add",
-		["buff_type"]=1,
-		["stack"]=2,
-		["decr"]=1
-	},
-	[78]={
-		["id"]=78,
-		["name"]="end_dmg_dec_all_add",
-		["buff_type"]=1,
-		["stack"]=2,
-		["decr"]=2
-	},
-	[79]={
-		["id"]=79,
-		["name"]="invincible_shield",
-		["buff_type"]=7,
-		["stack"]=3,
-		["decr"]=3,
-		["icon"]="invincible_shield",
-		["fx_continued"]={
-			38
-		},
-		["fx_disappear"]={
-			39
-		}
-	},
-	[80]={
-		["id"]=80,
-		["name"]="shield_ice_02",
-		["buff_type"]=2,
-		["decr"]=3,
-		["icon"]="shield_ice",
-		["fx_continued"]={
-			40
-		},
-		["fx_disappear"]={
-			41
-		}
-	},
-	[81]={
-		["id"]=81,
-		["name"]="skill_hurt_add_show",
-		["buff_type"]=1,
-		["stack"]=2,
-		["decr"]=1,
-		["icon"]="skill_hurt_add"
-	},
-	[82]={
-		["id"]=82,
-		["name"]="shield_ice_rebound_200",
-		["buff_type"]=2,
-		["decr"]=3,
-		["icon"]="shield_ice",
-		["fx_continued"]={
-			26
-		},
-		["fx_disappear"]={
-			27
-		}
-	},
-	[83]={
-		["id"]=83,
-		["name"]="shield_rebound_100",
-		["buff_type"]=2,
-		["decr"]=3,
-		["icon"]="shield",
-		["fx_continued"]={
-			22
-		},
-		["fx_disappear"]={
-			23
-		}
-	},
-	[84]={
-		["id"]=84,
-		["name"]="rebirth",
-		["buff_type"]=7,
-		["decr"]=1,
-		["formula"]=3,
-		["icon"]="rebirth",
-		["fx_disappear"]={
-			44
-		}
-	},
-	[85]={
-		["id"]=85,
-		["name"]="ocean_shield",
-		["buff_type"]=2,
-		["decr"]=1,
-		["icon"]="ocean_shield1",
-		["fx_continued"]={
-			42
-		},
-		["fx_disappear"]={
-			43
-		}
-	},
-	[86]={
-		["id"]=86,
-		["name"]="self_heal",
-		["buff_type"]=6,
-		["stack"]=2,
-		["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 = {
@ -1003,34 +730,12 @@ local keys = {
 		["death_summon"]=buff[72],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75],
-		["invalid_control"]=buff[76],
-		["end_dmg_addition_all_add"]=buff[77],
-		["end_dmg_dec_all_add"]=buff[78],
-		["invincible_shield"]=buff[79],
-		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81],
-		["shield_ice_rebound_200"]=buff[82],
-		["shield_rebound_100"]=buff[83],
-		["rebirth"]=buff[84],
-		["ocean_shield"]=buff[85],
-		["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]
+		["shield_ice_rebound_400"]=buff[75]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=97
+count=75
 }
 return config
--- a/lua/app/config/chapter.lua
+++ b/lua/app/config/chapter.lua
--- a/lua/app/config/chapter_board.lua
+++ b/lua/app/config/chapter_board.lua
--- a/lua/app/config/chapter_board_bossrush.lua
+++ b/lua/app/config/chapter_board_bossrush.lua
--- a/lua/app/config/chapter_board_bossrush.lua.meta
+++ b/lua/app/config/chapter_board_bossrush.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: f136cacb0fc4a2e47b93053e37dcf71b
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/chapter_board_daily_challenge.lua
+++ b/lua/app/config/chapter_board_daily_challenge.lua
--- a/lua/app/config/chapter_board_dungeon_armor.lua
+++ b/lua/app/config/chapter_board_dungeon_armor.lua
--- a/lua/app/config/chapter_board_dungeon_armor.lua.meta
+++ b/lua/app/config/chapter_board_dungeon_armor.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: f26f90b4112d5fb42996aec8429097e1
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/chapter_board_dungeon_equip.lua
+++ b/lua/app/config/chapter_board_dungeon_equip.lua
--- a/lua/app/config/chapter_board_dungeon_equip.lua.meta
+++ b/lua/app/config/chapter_board_dungeon_equip.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 6dcd756f94cb3b14b89e8890d2dad6f3
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/chapter_board_dungeon_gold.lua
+++ b/lua/app/config/chapter_board_dungeon_gold.lua
--- a/lua/app/config/chapter_board_dungeon_gold.lua.meta
+++ b/lua/app/config/chapter_board_dungeon_gold.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 73d00bf5a93c7794fba21a87ba4219bf
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/chapter_board_dungeon_shards.lua
+++ b/lua/app/config/chapter_board_dungeon_shards.lua
--- a/lua/app/config/chapter_board_dungeon_shards.lua.meta
+++ b/lua/app/config/chapter_board_dungeon_shards.lua.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 51246369e9c9d4d41a0d34baf00350e1
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/config/chapter_board_rune.lua
+++ b/lua/app/config/chapter_board_rune.lua
--- a/Show More
+++ b/Show More