引导

# Conflicts:
#	lua/app/config/fx.lua
#	lua/app/config/strings/cn/attr.lua
#	lua/app/config/strings/de/attr.lua
#	lua/app/config/strings/en/attr.lua
#	lua/app/config/strings/es/attr.lua
#	lua/app/config/strings/fr/attr.lua
#	lua/app/config/strings/id/attr.lua
#	lua/app/config/strings/ja/attr.lua
#	lua/app/config/strings/ko/attr.lua
#	lua/app/config/strings/pt/attr.lua
#	lua/app/config/strings/ru/attr.lua
#	lua/app/config/strings/th/attr.lua
#	lua/app/config/strings/vi/attr.lua
#	lua/app/config/strings/zh/attr.lua

lua/app/bf/unity/ui_spine_object.lua

@@ -40,7 +40,32 @@ function UISpineObject:getAnimationState(forceRefresh)
 	return self.animationState
 end
 
+---- loop必须为false
+function UISpineObject:playAnimOnPercent(animName, loop, forceRefresh, forceGetSG, percent)
+	local trackEntry = self:playAnim(animName, loop, forceRefresh, forceGetSG)
+	local spineAnim = self:getAnimation(trackEntry)
+	local duration = spineAnim.Duration
+	trackEntry.AnimationStart = percent * duration
+end
+
+function UISpineObject:playAnimOnUpdate(animName, loop, forceRefresh, forceGetSG, percent)
+	self:killAniCompleteSeq()
+	self:getAnimationState(forceGetSG)
+	local trackEntry = self:playAnim(animName, loop, forceRefresh, forceGetSG)
+	local spineAnim = self:getAnimation(trackEntry)
+	local startTime = spineAnim.Duration * percent
+
+	if self.animationState then
+		local trackEntry = self.animationState:SetAnimation(startTime, animName, loop)
+		if forceRefresh then
+			self.skeletonGraphic:Update(startTime)
+		end
+		return trackEntry
+	end
+end
+
 function UISpineObject:playAnim(animName, loop, forceRefresh, forceGetSG)
+	self:killAniCompleteSeq()
 	self:getAnimationState(forceGetSG)
 	if self.animationState then
 		local trackEntry = self.animationState:SetAnimation(0, animName, loop)
@@ -101,19 +126,41 @@ function UISpineObject:rePlayAnim(animName, loop, forceRefresh)
 	end
 end
 
-function UISpineObject:playAnimComplete(animName, loop, forceRefresh, complete, forceGetSG)
+function UISpineObject:playAnimCompleteOnPer(animName, loop, forceRefresh, complete, forceGetSG, customTime, customCallback, percent)
+	local trackEntry = self:playAnim(animName, loop, forceRefresh, forceGetSG)
+	local spineAnim = self:getAnimation(trackEntry)
+	local duration = spineAnim.Duration
+	self:killAniCompleteSeq()
+	self.animCompleteSeq = self:createBindTweenSequence()
+	self.animCompleteSeq:AppendInterval(duration - (percent * duration))
+	self.animCompleteSeq:AppendCallback(complete)
+	if customTime and customCallback then
+		self.animCompleteSeq:InsertCallback(customTime, customCallback)
+	end
+	trackEntry.AnimationStart = percent * duration
+end
+
+function UISpineObject:playAnimComplete(animName, loop, forceRefresh, complete, forceGetSG, customTime, customCallback)
 	local spineAnim = self:getAnimation(self:playAnim(animName, loop, forceRefresh, forceGetSG))
 	local duration = spineAnim.Duration
-	if self.playAnimCompleteSeq then
+	self:killAniCompleteSeq()
-		self.playAnimCompleteSeq:Kill()
+	self.animCompleteSeq = self:createBindTweenSequence()
-		self.playAnimCompleteSeq = nil
+	self.animCompleteSeq:AppendInterval(duration)
+	self.animCompleteSeq:AppendCallback(complete)
+	if customTime and customCallback then
+		self.animCompleteSeq:InsertCallback(customTime, customCallback)
 	end
-	self.playAnimCompleteSeq = self:createBindTweenSequence()
-	self.playAnimCompleteSeq:AppendInterval(duration)
-	self.playAnimCompleteSeq:OnComplete(complete)
 	return duration
 end
 
+
+function UISpineObject:killAniCompleteSeq()
+	if self.animCompleteSeq then
+		self.animCompleteSeq:Kill()
+		self.animCompleteSeq = nil
+	end
+end
+
 function UISpineObject:findAnim(animName)
 	self:getAnimationState()
 	if self.animationState then
@@ -129,13 +176,18 @@ function UISpineObject:getAnimation(trackEntry)
 	return trackEntry and trackEntry.Animation
 end
 
+function UISpineObject:setAttachment(slotName, attachmentName)
+	self:getSkeletonGraphic().Skeleton:SetAttachment(slotName, attachmentName)
+end
+
+
 function UISpineObject:getAnimSpeed()
 	if self.skeletonGraphic then
 		return self.skeletonGraphic.timeScale
 	end
 end
 
-function UISpineObject:setTimeScale(timeScale)
+function UISpineObject:setAnimSpeed(timeScale)
 	if self.skeletonGraphic then
 		self.skeletonGraphic.timeScale = timeScale
 	end
@@ -153,6 +205,18 @@ function UISpineObject:setIsUnScaledTime(value)
 	end
 end
 
+function UISpineObject:getAnimationDuration(animationName)
+	local spinAnimation = self:findAnim(animationName)
+    if spinAnimation == nil then
+        return 0
+    end
+    return spinAnimation.Duration
+end
+
+function UISpineObject:setDefaultMix(mixDuration)
+	self:getSkeletonGraphic().skeletonDataAsset:GetAnimationStateData().DefaultMix = mixDuration
+end
+
 function UISpineObject:clearTrack()
 	if self.animationState then
 		self.animationState:ClearTrack(0)

lua/app/bf/unity/uiprefab_object.lua

@@ -772,7 +772,7 @@ function UIPrefabObject:addRedPoint(offsetX, offsetY, scale, iconName, count, na
 				local uiMap = prefabObject:genAllChildren()
 				self.redPoint:setAnchoredPosition(offsetX or 0, offsetY or 0)
 				self.redPoint:setLocalScale(scale, scale, scale)
-				iconName = iconName or "common_point"
+				iconName = iconName or "common_info_1"
 				self.redPoint:setSprite(GConst.ATLAS_PATH.COMMON, iconName)
 				GFunc.getShakeSeq(self.redPoint, false, scale, true)
 				if native then
@@ -787,7 +787,7 @@ function UIPrefabObject:addRedPoint(offsetX, offsetY, scale, iconName, count, na
 			end)
 		end
 	else
-		iconName = iconName or "common_point"
+		iconName = iconName or "common_info_1"
 		self.redPoint:setSprite(GConst.ATLAS_PATH.COMMON, iconName)
 		self.redPoint:setAnchoredPosition(offsetX or 0, offsetY or 0)
 		self.redPoint:setActive(true)

lua/app/common/bi_report.lua

@@ -86,19 +86,15 @@ BIReport.ITEM_GET_TYPE = {
 	MALL_TREASURE = "MallTreasure", -- 常驻钻石礼包
 	MALL_DAILY = "MallDaily", -- 每日特惠
 	MALL_DAILY_RESET = "MallDailyReset",
-	FIRST_RECHARGE = "FirstRecharge",
 	COIN_GIFT = "CoinGift",
 	BEGINNER_GIFT = "BeginnerGift",
 	LEVEL_UP_GIFT = "LevelUpGift",
 	ACT_CHAPTER_STORE = "ActChapterStore", -- 章节礼包
 	SUMMON = "Summon",
 	PLAYER_LV_UP = "PlayerLvUp",
-	GOLD_PIG = "GoldPig",
 	BATTLE_SKILL_REFRESH = "BattleSkillRefresh",
 	GROWTH_FUND = "GrowthFund",
 	GROW_UP_GIFT_NEW = "GrowUpGiftNew", -- 新成长礼包
-	SEVEN_DAY_TASK = "SevenDayTask",
-	SEVEN_DAY_STEP_REWARD = "SevenDayStepReward",
 	DAILY_CHALLENGE = "DailyChallenge",              -- 每日挑战进入战斗扣体力
 	DAILY_CHALLENGE_END = "DailyChallengeEnd",		 -- 每日挑战结算
 	DAILY_CHALLENGE_RESET = "DailyChallengeReset",	 -- 每日挑战重置
@@ -180,10 +176,64 @@ BIReport.ITEM_GET_TYPE = {
 	FULL_MOON_TASK = "FullMoonTask",
 	FULL_MOON_TASK_PROG_REWARD = "FullMoonTaskProgReward",
 	FULL_MOON_SKIN_CHALLENGE_REWARD = "FullMoonSkinChallengeReward",
+
+	TASK_ACHIEVEMENT = "task_achievement",
+
+	-- 装备相关
+	EQUIP_WEAR = "equip_wear",
+	EQUIP_LV_UP = "equip_lv_up",
+	EQUIP_REFINE = "equip_refine",
+	EQUIP_RESOLVE = "equip_resolve",
+
+	-- 召唤
+	FORCE_SUMMON = "force_summon",
+	FORCE_SUMMON_WISH_HREO_ID = "force_summon_wish_hero_id",
+	ACT_SUMMON_HERO_GIFT = "act_summon_hero_gift",
+
+	-- 等级弹窗礼包
+	-- GIFT_POP_LV = "gift_pop_lv",
+	-- GIFT_POP_HERO_LV = "gift_pop_hero_lv",
+	GIFT_POP_CHAPTER = "gift_pop_chapter",
+
+	-- 商城相关
+	SHOP_CHAPTER = "shop_chapter",
+	-- SHOP_CORE_SOUL = "shop_core_soul",
+	SHOP_DAILY = "shop_daily",
+	SHOP_DAILY_REFRESH = "shop_daily_refresh",
+	SHOP_GEM = "shop_gem",
+	SHOP_GOLD = "shop_gold",
+	-- SHOP_EMBLEM = "shop_emblem",
+
+	-- 基金
+	FUND_GROW = "fund_grow",-- 基金
+	ACT_CHAPTER_FUND_REWARD = "act_chapter_fund_reward",
+	ACT_LEVEL_FUND_REWARD = "act_level_fund_reward",
+
+	-- 七日签到战令
+	SIGN_BOUNTY = "signin_bounty",
+	SIGN_BOUNTY_REWARD = "sign_bounty_reward", -- 补领上次奖励
+	SIGN_BOUNTY_RESIGH = "sign_bounty_resigh",
+	SIGN_BOUNTY_SIGH = "sign_bounty_sigh",
+	SIGN_MONTH_ACCUM_CLAIM = "signin_30_accum_claim",
+
+	-- 首充
+	FIRST_RECHARGE = "first_recharge",
+	-- 特权卡
+	PRIVILEGE_CARD = "privilege_card",
+	-- 七日乐
+	SEVEN_DAY_GIFT = "seven_day_gift",
+
+	BATTLE_REVIVE = "battle_revive",
+	CHAPTER_DOUBLE_REWARD = "chapter_double_reward",
 }
 
 BIReport.ADS_CLICK_TYPE = {
 	BATTLE_SKILL_REFRESH = "BattleSkillRefresh",
+	BATTLE_SKILL_ALL = "BattleSkillAll",
+	BATTLE_SKILL_DEITY = "BattleSkillDeity",
+	BATTLE_DOUBLE_BOX = "BattleDoubleBox",
+	BATTLE_REVIVE = "BattleRevive",
+	BATTLE_RESULT_DOUBLE = "BattleResultDouble",
 	AD_ENERGY = "AdEnergy",
 	TASK_DAILY_REFRESH = "TaskDailyRefresh",
 	TASK_DAILY_TASK = "TaskDailyTask",
@@ -201,6 +251,14 @@ BIReport.ADS_CLICK_TYPE = {
 	MALL_GOLD = "MallGold",
 	MALL_TREASURE = "MallTreasure",
 	MAIL = "Mail",
+	SUMMON_AD = "SummonAd",
+
+	AD_ACT_SEVEN_DAY_GIFT = "AdActSevenDayGift",
+	AD_ACT_SPRINT = "AdActSprint", -- 冲刺活动
+
+	AD_SHOP_GOLD = "AdShopGold",
+	AD_DAILY_SHOP = "AdDailyShop",
+	AD_DAILY_SHOP_REFRESH = "AdDailyShopRefresh",
 }
 
 BIReport.FIGHT_OPT_TYPE = {
@@ -245,7 +303,6 @@ BIReport.GIFT_TYPE = {
 	BEGINNER_GIFT = "BeginnerGift",
 	LEVEL_UP_GIFT = "LevelUpGift",
 	BOUNTY = "Bounty",
-	GOLD_PIG = "GoldPig",
 	MALL_TREASURE = "MallTreasure",
 	ACT_CHAPTER_STORE = "ActChapterStore",
 	GROWTH_FUND = "GrowthFund",
@@ -266,6 +323,30 @@ BIReport.GIFT_TYPE = {
 	RUNES_GIFT = "RunesGift",
 	TOURN_WAVE_GIFT = "TournWaveGift",
 	TOURN_ARENA_GIFT = "TournArenaGift",
+
+	-- 等级弹窗礼包
+	-- GIFT_POP_LV = "gift_pop_lv",
+	-- GIFT_POP_HERO_LV = "gift_pop_hero_lv",
+	GIFT_POP_CHAPTER = "gift_pop_chapter",
+
+	-- 商城相关
+	SHOP_CHAPTER = "shop_chapter",
+	-- SHOP_CORE_SOUL = "shop_core_soul",
+	SHOP_DAILY = "shop_daily",
+	SHOP_DAILY_REFRESH = "shop_daily_refresh",
+	SHOP_GEM = "shop_gem",
+	SHOP_GOLD = "shop_gold",
+	-- SHOP_EMBLEM = "shop_emblem",
+
+	-- 高级战令
+	BOUNTY_PRO_REWARD = "bounty_pro_reward",
+	FUND_GROW = "fund_grow",-- 成长基金
+
+	SIGN_BOUNTY = "sign_bounty",
+
+	PRIVILEGE_CARD = "privilege_card",
+
+	SEVEN_DAY_GIFT = "seven_day_gift",
 }
 
 BIReport.COIN_TYPE = {
@@ -345,6 +426,32 @@ BIReport.RUNES_FORMATION = {
 	CHAPTER = "chapter",
 }
 
+BIReport.PAY_DOUBLE = {
+	NORMAL = "Normal",
+	DOUBLED = "Doubled",
+}
+
+-- 冲刺活动
+BIReport.ACT_SPRINT_TYPE = {
+	SUMMON = "Summon",
+	SOUL_BOX = "SoulBox",
+	TREE = "Tree",
+}
+
+BIReport.VIDEO_AD_OPT_TYPE = {
+	CLICK = "click",
+	PLAY_SUCCESS = "play_success",
+	PLAY_FAIL = "play_fail",
+	GET_REWARD = "get_reward",
+	LOAD_RUSULT = "load_result",
+	GET_REWARD_SKIP_AD = "get_reward_skip_ad",
+}
+
+BIReport.SEVEN_DAY_GIFT_OPT = {
+	CLICK = "Click",
+	REWARD = "Reward",
+}
+
 -- b6
 local EVENT_NAME_EXIT = "client_exit"
 local EVENT_NAME_FIGHT = "client_fight"
@@ -377,6 +484,14 @@ local EVENT_NAME_MISCELLANEOUS_OPT = "event_name_miscellaneous_opt" -- 一些杂
 local EVENT_BOX_OPEN = "client_box_open"
 local EVENT_ACT_OPT = "client_act_opt"
 local EVENT_NAME_RUNES = "client_runes"
+local EVENT_NAME_PAY_ORDER_REPEAT = "client_pay_order_repeat"
+local EVENT_NAME_VIDEO_AD_OPT = "client_ad_opt"
+
+BIReport.TASK_OPT = {
+	TASK_REWARD = "TaskReward",
+	STAGE_REWARD = "StageReward",
+	ACHIEVEMENT_REWARD = "AchievementReward",
+}
 
 function BIReport:setIsNewPlayer(isNewPlayer)
 	self.isNewPlayer = isNewPlayer
@@ -412,6 +527,51 @@ function BIReport:clearAccountId()
 	CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:ClearThinkingAnalyticsAccountId()
 end
 
+function BIReport:TAUserAdd(args)
+	-- 测试包和编辑器模式不上报
+	if not Platform:getIsPublishChannel() or EDITOR_MODE then
+		self:printArgsStr("TAUserAdd", args)
+		return
+	end
+	-- 审核/白名单模式不上报
+	if CS.BF.BFMain.IsShenhe or CS.BF.BFMain.IsWhite then
+		return
+	end
+	if args and type(args) == "table" then
+		CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd(args)
+	end
+end
+
+function BIReport:TAUserSet(args)
+	-- 测试包和编辑器模式不上报报
+	if not Platform:getIsPublishChannel() or EDITOR_MODE then
+		self:printArgsStr("TAUserSet", args)
+		return
+	end
+	-- 审核/白名单模式不上报
+	if CS.BF.BFMain.IsShenhe or CS.BF.BFMain.IsWhite then
+		return
+	end
+	if args and type(args) == "table" then
+		CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(args)
+	end
+end
+
+function BIReport:TAUserSetOnce(args)
+	-- 测试包和编辑器模式不上报报
+	if not Platform:getIsPublishChannel() or EDITOR_MODE then
+		self:printArgsStr("TAUserSetOnce", args)
+		return
+	end
+	-- 审核/白名单模式不上报
+	if CS.BF.BFMain.IsShenhe or CS.BF.BFMain.IsWhite then
+		return
+	end
+	if args and type(args) == "table" then
+		CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSetOnce(args)
+	end
+end
+
 function BIReport:report(name, args)
 	self:printArgsStr(name, args)
 	-- 内网dev包和编辑器模式不上报
@@ -837,6 +997,52 @@ function BIReport:postFirstRechargeEvent(id)
 	CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr.FBSdk:LogAppEvent("fb_package_" .. cfg.price, json.encode(args))
 end
 
+function BIReport:postRechargeEvent(id)
+	-- 只有外网正式渠道真机包才上报
+	if not Platform:getIsPublishChannel() or EDITOR_MODE then
+		return
+	end
+	-- 审核/白名单模式不上报
+	if CS.BF.BFMain.IsShenhe or CS.BF.BFMain.IsWhite then
+		return
+	end
+	local postRechargeID = {
+		[3] = true, -- 2.99
+		[5] = true, -- 4.99
+		[10] = true, -- 9.99
+		[13] = true, -- 19.99
+		[15] = true, -- 29.99
+		[16] = true, -- 49.99
+	}
+	if not postRechargeID[id] then
+		return
+	end
+	local cfg = ConfigManager:getConfig("recharge")[id]
+	if not cfg then
+		return
+	end
+	self:postFirebaseLog("gg_package_" .. cfg.price, {})
+end
+
+function BIReport:postPurchaseAmountEvent(postAmount)
+	-- 只有外网正式渠道真机包才上报
+	if not Platform:getIsPublishChannel() or EDITOR_MODE then
+		return
+	end
+	-- 审核/白名单模式不上报
+	if CS.BF.BFMain.IsShenhe or CS.BF.BFMain.IsWhite then
+		return
+	end
+	if postAmount == 1 then
+		self:postFirebaseLog("purchase_1", {})
+		CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:PostAppsflyerEvent("purchase_1", json.encode({}))
+	end
+	if postAmount == 5 then
+		self:postFirebaseLog("purchase_5", {})
+		CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:PostAppsflyerEvent("purchase_5", json.encode({}))
+	end
+end
+
 -- 上报24小时内部分章节第一次失败的用户
 function BIReport:postFirstDayGradeFailEvent(chapterId)
 	-- 只有外网正式渠道真机包才上报
@@ -1291,91 +1497,172 @@ function BIReport:postAdRewardGet(adsType)
 	self:report(EVENT_NAME_AD_OPT, args)
 end
 
--- 支付sdk初始化成功
+-- 支付sdk初始化状态
-function BIReport:postPayInitSuccess()
+function BIReport:postPayInitStatus(optType, desc)
 	local args = {
-		event_type = BIReport.PAY_OPT_TYPE.INIT_SUC,
+		opt_type = optType,
+		desc = desc or GConst.EMPTY_STRING,
 	}
 	self:report(EVENT_NAME_PAY_OPT, args)
 end
 
--- 支付sdk初始化失败
+-- 创建订单
-function BIReport:postPayInitFailed(failedDesc)
+function BIReport:postPayCreateOrder(giftType, id, rechargeId, uuid, isFromBattle, purchaseType)
 	local args = {
-		pay_failed_desc = failedDesc or GConst.EMPTY_STRING,
+		opt_type = BIReport.PAY_OPT_TYPE.CREATE_ORDER,
-		event_type = BIReport.PAY_OPT_TYPE.INIT_FAILED,
+		gift_type = giftType,
+		commodity_id = id,
+		uuid_string = uuid,
+		recharge_id = rechargeId,
+		from_battle = isFromBattle,
+		purchase_type = purchaseType,
 	}
 	self:report(EVENT_NAME_PAY_OPT, args)
 end
 
 -- 点击商品购买按钮
-function BIReport:postPayClick(giftType, id, rechargeId)
+function BIReport:postPayClick(giftType, id, rechargrId, payDouble, isFromBattle, purchaseType)
+	-- Commodity_ID	商品ID	点击商品按钮时	String	商品ID
+	-- Commodity_State	商品状态		String	Normal=正常，Doubled=奖励翻倍
+	-- IsNew	是否是新用户		Boolean	是否为当天新用户，True = 是，False = 否
 	local args = {
+		opt_type = BIReport.PAY_OPT_TYPE.CLICK,
 		gift_type = giftType,
 		commodity_id = id,
-		recharge_id = rechargeId,
+		commodity_state = payDouble,
-		event_type = BIReport.PAY_OPT_TYPE.CLICK,
+		recharge_id = rechargrId,
+		from_battle = isFromBattle,
+		purchase_type = purchaseType,
 	}
 	self:report(EVENT_NAME_PAY_OPT, args)
 end
 
 -- 跳转购买界面
-function BIReport:postPayTurn(giftType, id, rechargeId)
+function BIReport:postPayTurn(giftType, id, rechargrId, payDouble, isFromBattle, purchaseType)
+	-- Commodity_ID	商品ID	跳转到支付界面时	String	商品ID
+	-- 	Commodity_State	商品状态		String	Normal=正常，Doubled=奖励翻倍
+	-- 	IsNew	是否是新用户		Boolean	是否为当天新用户，True = 是，False = 否
 	local args = {
+		opt_type = BIReport.PAY_OPT_TYPE.BUY,
 		gift_type = giftType,
 		commodity_id = id,
-		recharge_id = rechargeId,
+		commodity_state = payDouble,
-		event_type = BIReport.PAY_OPT_TYPE.BUY,
+		recharge_id = rechargrId,
+		from_battle = isFromBattle,
+		purchase_type = purchaseType,
 	}
 	self:report(EVENT_NAME_PAY_OPT, args)
 end
 
 -- 取消购买
-function BIReport:postPayCancel(productId, orderId, rechargeId, giftType, id)
+function BIReport:postPayCancel(productId, orderId, rechargeId, giftType, giftId, isFromBattle, purchaseType)
 	local args = {
-		pay_product_id = productId,
+		opt_type = BIReport.PAY_OPT_TYPE.CANCEL,
-		pay_order_id = orderId,
+		product_id = productId,
+		order_id = orderId,
 		recharge_id = rechargeId,
 		gift_type = giftType,
-		commodity_id = id,
+		commodity_id = giftId,
-		event_type = BIReport.PAY_OPT_TYPE.CANCEL,
+		from_battle = isFromBattle,
+		purchase_type = purchaseType
 	}
 	self:report(EVENT_NAME_PAY_OPT, args)
 end
 
 -- 购买失败
-function BIReport:postPayFailed(productId, orderId, rechargeId, failedType, giftType, id)
+function BIReport:postPayFailed(productId, orderId, rechargeId, failedType, giftType, giftId, isFromBattle, purchaseType)
 	local args = {
-		pay_product_id = productId,
+		opt_type = BIReport.PAY_OPT_TYPE.FAILED,
-		pay_order_id = orderId,
+		product_id = productId,
+		order_id = orderId,
 		recharge_id = rechargeId,
-		pay_failed_type = failedType,
+		failed_type = failedType,
 		gift_type = giftType,
-		commodity_id = id,
+		commodity_id = giftId,
-		event_type = BIReport.PAY_OPT_TYPE.FAILED,
+		from_battle = isFromBattle,
+		purchase_type = purchaseType
 	}
 	self:report(EVENT_NAME_PAY_OPT, args)
 end
 
--- -- 获得购买物品
+-- 未完成订单
-function BIReport:postPayGet(giftType, id, rechargeId, orderId, originOrderId, buyNum, rewards)
+function BIReport:postPayResendOrder(productId, orderId)
 	local args = {
+		opt_type = BIReport.PAY_OPT_TYPE.RESEND,
+		product_id = productId,
+		order_id = orderId
+	}
+	self:report(EVENT_NAME_PAY_OPT, args)
+end
+
+-- 消耗订单
+function BIReport:postPayConsumeOrder(productId, debugInfo)
+	local args = {
+		opt_type = BIReport.PAY_OPT_TYPE.CONSUME,
+		product_id = productId,
+		debug_info = debugInfo
+	}
+	self:report(EVENT_NAME_PAY_OPT, args)
+end
+
+function BIReport:postPayDoUncompleteOrder(productId, transactionID, orderId)
+	local args = {
+		opt_type = BIReport.PAY_OPT_TYPE.UNCOMPLETEORDER,
+		product_id = productId,
+		transaction_id = transactionID,
+		orderId = orderId
+	}
+	self:report(EVENT_NAME_PAY_OPT, args)
+end
+
+-- 本地找不到信息，尝试向服务器请求补单(IOS专用)
+function BIReport:postPayTryReissueOrder(productId, orderId)
+	local args = {
+		opt_type = BIReport.PAY_OPT_TYPE.TRY_REISSUE_ORDER,
+		product_id = productId,
+		order_id = orderId,
+		platform = VersionCompatible:getPayPlatform(),
+		-- streamer = PayManager:getPayStreamer()
+	}
+	self:report(EVENT_NAME_PAY_OPT, args)
+end
+
+-- 获得购买物品
+function BIReport:postPayGet(giftType, id, rechargrId, payDouble, orderId, originOrderId, buyNum, rewards, isFromBattle, isDaiJinJuan, purchaseType)
+	-- Commodity_ID	商品ID	获得支付回调发放购买物品时	String	商品ID
+	-- 	GiftType	礼包类型		String	Gife表内的ICON名称
+	-- 	BuyNum	购买次数		Int	购买物品次数
+	-- 	CommodityItem	奖励物品		String	获得奖类型|数量
+	-- 	Dill_ID	返回物品订单号		String	返回货品订单号
+	-- 	MaxChapter	最大章节		Int	已解锁的最大章节
+	-- 	Commodity_State	商品状态		String	Normal=正常，Doubled=奖励翻倍
+	-- 	IsNew	是否是新用户		Boolean	是否为当天新用户，True = 是，False = 否
+	payDouble = payDouble or BIReport.PAY_DOUBLE.NORMAL
+	local itemStr = GFunc.getRewardsStr(rewards)
+	local args = {
+		opt_type = BIReport.PAY_OPT_TYPE.REWARD,
 		gift_type = giftType,
 		commodity_id = id,
-		buy_num = buyNum,
+		commodity_state = payDouble,
-		origin_order_id = tostring(originOrderId),
+		commodity_item = itemStr,
-		recharge_id = rechargeId,
+		buy_count = buyNum,
-		event_type = BIReport.PAY_OPT_TYPE.REWARD,
+		uuid_string = orderId,
+		origin_order_id_new = tostring(originOrderId),
+		recharge_id = rechargrId,
+		from_battle = isFromBattle,
+		dai_jin_juan_pay = isDaiJinJuan,
+		purchase_type = purchaseType,
+		platform = VersionCompatible:getPayPlatform(),
 	}
 	if GFunc.isShenhe() then
-		args.event_type = BIReport.PAY_OPT_TYPE.APPLE_REVIEW_REWARD
+		args.opt_type = BIReport.PAY_OPT_TYPE.APPLE_REVIEW_REWARD
 	elseif GFunc.isInWhitelist() then
-		args.event_type = BIReport.PAY_OPT_TYPE.WHITELIST_REWARD
+		args.opt_type = BIReport.PAY_OPT_TYPE.WHITELIST_REWARD
 	end
 	self:report(EVENT_NAME_PAY_OPT, args)
 
 	if EDITOR_MODE then
-		if not giftType or not id or not rechargeId then
+		if not giftType or not id or not rechargrId then
 			local params = {
 				content = "BI Report postPayGet has no basic params",
 				boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
@@ -1387,6 +1674,25 @@ function BIReport:postPayGet(giftType, id, rechargeId, orderId, originOrderId, b
 	end
 end
 
+-- 重复订单
+function BIReport:postRepeatPayOrder(productId, originOrderId, orderId, isFromBattle)
+	local args = {
+		product_id = productId,
+		origin_order_id = tostring(originOrderId),
+		order_id = orderId,
+		from_battle = isFromBattle
+	}
+	self:report(EVENT_NAME_PAY_ORDER_REPEAT, args)
+end
+
+function BIReport:postPayUIShow(giftType, giftId)
+	local args = {
+		gift_type = giftType,
+		commodity_id = giftId,
+	}
+	self:report(EVENT_NAME_PAY_UI_SHOW, args)
+end
+
 -- 登录成功
 function BIReport:postAccountLoginFinish(loginType)
 	local args = {
@@ -1460,6 +1766,16 @@ function BIReport:postDailyTaskFinish(taskType, cfgId, taskId, refresh)
 	self:report(EVENT_NAME_DAILY_TASK, args)
 end
 
+function BIReport:postTaskAchievementOpt(id, stage, rewards)
+	local args = {
+		opt_type = BIReport.TASK_OPT.ACHIEVEMENT_REWARD,
+		achievement_id = id,
+		achievement_stage = stage,
+		reward_str = rewards and GFunc.getRewardsStr(rewards) or nil,
+	}
+	self:report(EVENT_NAME_DAILY_TASK, args)
+end
+
 -- 邮箱
 function BIReport:postMailOpen(mailId)
 	-- IsNew	是否是新用户
@@ -1558,17 +1874,6 @@ function BIReport:postPlayerLvUp(fromLevel, toLevel)
 	self:report(EVENT_NAME_PLAYER_LV_UP, args)
 end
 
--- 内购相关界面展示,包括弹出/主动打开(如果是打开商城页签,钻石礼包只上报id2,章节礼包只上报首个可购买章节id)
--- giftType为BIReport.GIFT_TYPE
-function BIReport:postPayUIShow(giftType, giftId, showType)
-	local args = {
-		gift_type = giftType,
-		commodity_id = giftId,
-		show_type = showType
-	}
-	self:report(EVENT_NAME_PAY_UI_SHOW, args)
-end
-
 function BIReport:postBountyLevelUp(bountyType, level, exp, season)
 	local args = {
 		event_type = BIReport.BOUNTY_OPT_TYPE.BOUNTY_LEVEL_UP,
@@ -1800,4 +2105,17 @@ function BIReport:postRunes(event_type, runes)
 	self:report(EVENT_NAME_RUNES, args)
 end
 
+-- 视频广告相关
+function BIReport:postVideoAdOpt(optType, adName, result)
+	if optType == nil or adName == nil then
+		Logger.logFatal("视频广告上报为空  optType:" .. tostring(optType) .. " adName:" .. tostring(adName))
+	end
+
+	local args = {
+		opt_type = optType,
+		ad_name = adName,
+	}
+	self:report(EVENT_NAME_VIDEO_AD_OPT, args)
+end
+
 return BIReport

lua/app/common/bi_report_v2.lua

@@ -0,0 +1,222 @@
+local BIReportV2 = {}
+
+-- 所有上报事件
+
+local EVENT_NAME_PRODUCTION_SALES_V2 = "client_production_sales_v2"				-- 产销
+local EVENT_NAME_FIGHT_V2 = "client_fight_v2"									-- 玩法
+local EVENT_NAME_LEVEL_UP_V2 = "client_level_up_v2"								-- 升级
+local EVENT_NAME_OPERATION_V2 = "client_operation_v2"							-- 操作
+
+
+BIReportV2.PRODUCTION_SALES_TYPE = {
+	ITEM = "道具",
+	CURRENCY = "货币"
+}
+
+BIReportV2.PRODUCTION_SALES_EVENT_TYPE = {
+	USE = "获得",
+	GET = "消耗"
+}
+
+BIReportV2.FIGHT_TYPE = {
+	FIGHT_BEGIN = "开始",
+	FIGHT_END = "结束"
+}
+
+BIReportV2.FIGHT_NAME = {
+	[1] = "主线关卡",
+	[2] = "日常副本",
+	[3] = "爬塔",
+	[4] = "世界BOSS",
+	[5] = "精英挑战",
+	[6] = "元素地牢",
+	[18] = "竞技场",
+}
+BIReportV2.FIGHT_NAME_DUNGEON_GOLD = "金币副本"
+BIReportV2.FIGHT_NAME_DUNGEON_MATERIAL = "材料副本"
+
+BIReportV2.FIGHT_RESULT = {
+	WIN = "胜利",
+	FAIL = "失败",
+	FINISH = "完成",
+	QUIT = "退出",
+	UNKNOW = "未知"
+}
+
+BIReportV2.OPERATION_TYPE = {
+	CLICK = "点击",
+	SHOW = "展示",
+}
+
+BIReportV2.LEVEL_UP_TYPE = {
+	GET_PLAYER_EXP = "获取账号经验",
+}
+
+BIReportV2.OPERATION_UI_NAME = {
+	LOGIN_UI = "登陆",
+	FIRST_RECHARGE_PAGE_1 = "首充第一档",
+	FIRST_RECHARGE_PAGE_2 = "首充第二档",
+	FIRST_RECHARGE_PAGE_3 = "首充第三档",
+	POP_CHAPTER_UI = "章节弹出礼包",
+	ROUTINE_GIFT_1 = "新手礼包",
+	ROUTINE_GIFT_2 = "日礼包",
+	ROUTINE_GIFT_3 = "周礼包",
+	ROUTINE_GIFT_4 = "月礼包",
+	PRIVILEGE_CARD = "特权卡",
+	PRIVILEGE_CARD_1 = "特权每日福利",
+	PRIVILEGE_CARD_2 = "免广告",
+	PRIVILEGE_CARD_3 = "月卡",
+	PRIVILEGE_CARD_4 = "终身卡",
+	PRIVILEGE_CARD_5 = "挑战征服卡",
+	FUND_LEVEL = "成长基金",
+	FUND_CHAPTER = "关卡基金",
+	BOUNTY_COLLECTION = "宝物战令",
+	TOWER_BOUNTY = "爬塔战令",
+	SING_WEEK = "7日签到",
+	SIGN_MONTH = "30日签到",
+	ACT_SEVENDAY_TASK = "七天乐任务",
+	ACT_SEVENDAY_GIFT = "七天乐礼包",
+	ACT_SEVENDAY_TASK_2 = "七天乐任务第二期",
+	ACT_SEVENDAY_GIFT_2 = "七天乐礼包第二期",
+	ACT_SEVENDAY_LOOP_TASK_1 = "七日达标1循环任务",
+	ACT_SEVENDAY_LOOP_GIFT_1 = "七日达标1循环礼包",
+	ACT_SEVENDAY_LOOP_TASK_2 = "七日达标2循环任务",
+	ACT_SEVENDAY_LOOP_GIFT_2 = "七日达标2循环礼包",
+	ACT_SEVENDAY_LOOP_TASK_3 = "七日达标3循环任务",
+	ACT_SEVENDAY_LOOP_GIFT_3 = "七日达标3循环礼包",
+	SHOP_CHAPTER = "商店章节礼包",
+	SHOP_DAILY_STORE = "每日商店",
+	SHOP_GEM_STORE = "钻石礼包",
+	SHOP_GOLD_STORE = "金币礼包",
+	MAIN_SHOP = "商城",
+	ACT_SUMMON_LOGIN = "卡池活动登录福利",
+	ACT_SUMMON_UPGRADE_1 = "卡池活动英雄升级1",
+	ACT_SUMMON_UPGRADE_2 = "卡池活动英雄升级2",
+	ACT_SUMMON_GEM = "特惠礼包",
+	ACT_SUMMON_RECHARGE = "连冲豪礼",
+	SUMMON_MAIN = "普通召唤",
+	SUMMON_ACT_1 = "召唤界面:电闪雷鸣",
+	SUMMON_ACT_2 = "召唤界面:虎豹之争",
+	GIFT_CHAIN_POP = "连锁礼包弹窗",
+	ACT_SPRINT_NEW_SUMMON = "普通召唤新手冲刺活动版本2-加签到任务不改",
+	ACT_SPRINT_NEW_BOX = "史诗芯魂宝箱新手冲刺活动版本2-加签到任务不改",
+	ACT_SPRINT_LOOP_SUMMON = "普通召唤冲刺-循环版版本2",
+	ACT_SPRINT_LOOP_BOX = "史诗芯魂冲刺-循环版版本2",
+	ACT_SPRINT_LOOP_TREE = "钻石消耗冲刺-循环版版本2",
+}
+
+BIReportV2.UI_PATH_NAME = {
+
+}
+
+function BIReportV2:postProductionSales(productionType, eventType, id, num, getType)
+	local args = {
+		itemCategory = productionType,  -- 产销类型
+		itemId = id, 					-- 产销物品id
+		quantity = num,					-- 产销数量
+		approach = getType,				-- 产销途径
+		eventType = eventType,			-- 产销事件
+	}
+	BIReport:report(EVENT_NAME_PRODUCTION_SALES_V2, args)
+end
+
+function BIReportV2:postItemProductionSales(optType, itemId, itemNum, getType)
+	if itemNum == 0 then
+		return
+	end
+	self:postProductionSales(BIReportV2.PRODUCTION_SALES_TYPE.ITEM, optType, itemId, itemNum, getType)
+end
+
+function BIReportV2:postCurrencyProductionSales(optType, itemId, itemNum, getType)
+	if itemNum == 0 then
+		return
+	end
+	self:postProductionSales(BIReportV2.PRODUCTION_SALES_TYPE.CURRENCY, optType, itemId, itemNum, getType)
+end
+
+function BIReportV2:getFightName(battleType, id)
+	local fightName = battleType
+	if battleType == ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON then
+		local dungeonDailyType = DataManager.DungeonDailyData:getDungeonDailyTypeByChapterId(id)
+		if dungeonDailyType == GConst.DungeonConst.DUNGEON_DAILY_TYPE.GOLD then
+			fightName = BIReportV2.FIGHT_NAME_DUNGEON_GOLD
+		elseif dungeonDailyType == GConst.DungeonConst.DUNGEON_DAILY_TYPE.MATERIAL then
+			fightName = BIReportV2.FIGHT_NAME_DUNGEON_MATERIAL
+		end
+	else
+		fightName = BIReportV2.FIGHT_NAME[battleType] or tostring(battleType)
+	end
+	return fightName
+end
+
+function BIReportV2:getFightResult(battleType, fightResult)
+	if battleType == ModuleManager.BattleManager.BATTLE_TYPE.TOWER then
+		return BIReportV2.FIGHT_RESULT.FINISH
+	else
+		if fightResult == BIReport.FIGHT_END_TYPE.WIN then
+			return BIReportV2.FIGHT_RESULT.WIN
+		elseif fightResult == BIReport.FIGHT_END_TYPE.FAIL then
+			return BIReportV2.FIGHT_RESULT.FAIL
+		elseif fightResult == BIReport.FIGHT_END_TYPE.QUIT then
+			return BIReportV2.FIGHT_RESULT.QUIT
+		else
+			return BIReportV2.FIGHT_RESULT.UNKNOW
+		end
+	end
+end
+
+function BIReportV2:postFightBegin(battleType, id)
+	local args = {
+		playType = self:getFightName(battleType, id),
+		playName = id,
+		eventType = BIReportV2.FIGHT_TYPE.FIGHT_BEGIN
+	}
+	BIReport:report(EVENT_NAME_FIGHT_V2, args)
+end
+
+function BIReportV2:postFightEnd(battleType, id, fightResult, time, ext)
+	local args = {
+		playType = self:getFightName(battleType, id),
+		playName = id,
+		playResult = self:getFightResult(battleType, fightResult),
+		ext1 = ext,
+		playTime = time,
+		eventType = BIReportV2.FIGHT_TYPE.FIGHT_END
+	}
+	BIReport:report(EVENT_NAME_FIGHT_V2, args)
+end
+
+function BIReportV2:postLevelUp(exp, getType, beforeLevel, afterLevel)
+	local args = {
+		exp = exp,
+		approach = getType,
+		beforeLevel = beforeLevel,
+		afterLevel = afterLevel,
+		eventType = BIReportV2.LEVEL_UP_TYPE.GET_PLAYER_EXP
+	}
+	BIReport:report(EVENT_NAME_LEVEL_UP_V2, args)
+end
+
+function BIReportV2:postOperation(uiName)
+	if uiName == nil then
+		return
+	end
+	local args = {
+		operationName = uiName,
+		eventType = BIReportV2.OPERATION_TYPE.CLICK
+	}
+	BIReport:report(EVENT_NAME_OPERATION_V2, args)
+end
+
+function BIReportV2:postOpenUI(uiPath)
+	if uiPath == nil then
+		return
+	end
+	local uiName = BIReportV2.UI_PATH_NAME[uiPath]
+	if uiName == nil then
+		return
+	end
+	self:postOperation(uiName)
+end
+
+return BIReportV2

lua/app/common/bi_report_v2.lua.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0598bbbceeebf3444bc6ac70ab44861a
+guid: efc4642fbd8c94d8c9f76f2ccc1ec37d
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

lua/app/common/config_manager.lua

@@ -111,12 +111,12 @@ function ConfigManager:preLoadConfig()
 	end
 	handleMonsterGrow("monster_chapter")
 	handleMonsterGrow("monster_daily_challenge")
-	handleMonsterGrow("monster_dungeon_gold")
+	-- handleMonsterGrow("monster_dungeon_gold")
-	handleMonsterGrow("monster_dungeon_shards")
+	-- handleMonsterGrow("monster_dungeon_shards")
-	handleMonsterGrow("monster_dungeon_equip")
+	-- handleMonsterGrow("monster_dungeon_equip")
-	handleMonsterGrow("monster_dungeon_armor")
+	-- handleMonsterGrow("monster_dungeon_armor")
 	handleMonsterGrow("monster_activity")
-	handleMonsterGrow("monster_dungeon_rune")
+	handleMonsterGrow("monster_dungeon")
 
 	self.configs["monster"] = {
 		data = monsterFullData,

lua/app/common/data_manager.lua

@@ -13,34 +13,45 @@ function DataManager:init()
 	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("HeroDataOther", "app/userdata/hero/hero_data_other")
 	self:initManager("BagData", "app/userdata/bag/bag_data")
 	self:initManager("EquipData", "app/userdata/equip/equip_data")
+	self:initManager("EquipDataOther", "app/userdata/equip/equip_data_other")
 	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("ActTaskData", "app/userdata/activity/act_task_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")
-	self:initManager("GrowthFundData", "app/userdata/fund/growth_fund_data")
-	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("TalentData", "app/userdata/talent/talent_data")
-	self:initManager("ActBossRushData", "app/userdata/activity/act_boss_rush/act_boss_rush_data")
+	self:initManager("GiftPopData", "app/userdata/gift_pop/gift_pop_data")
-	self:initManager("FourteenDayData", "app/userdata/activity/fourteen_day/fourteen_day_data")
+	self:initManager("PaymentData", "app/userdata/payment/payment_data")
-	self:initManager("ActPvpData", "app/userdata/activity/act_pvp/act_pvp_data")
+
+	self:initManager("FundLevelData", "app/userdata/fund_level/fund_level_data")
+	self:initManager("SignWeekData", "app/userdata/sign/sign_week_data")
+	self:initManager("SignMonthData", "app/userdata/sign/sign_month_data")
+	self:initManager("ChapterFundData", "app/userdata/chapter_fund/chapter_fund_data")
+	self:initManager("ActSevenDayData", "app/userdata/activity/act_seven_day/act_seven_day_data")
+
+	-- 冲刺活动
+	self:initManager("ActTimeData", "app/userdata/activity/act_time_data")
+	self:initManager("ActGiftData", "app/userdata/activity/act_gift_data")
+	self:initManager("ActSprintData", "app/userdata/activity/act_sprint/act_sprint_data")
+	self:initManager("ActSprintSummonDataAll", "app/userdata/activity/act_sprint/act_sprint_summon_data_all")
+	-- 特权卡
+	self:initManager("PrivilegeCardData", "app/userdata/privilege_card/privilege_card_data")
+	-- 日常副本
+	self:initManager("DungeonDailyData", "app/userdata/dungeon/dungeon_daily_data")
 end
 
 function DataManager:initManager(name, path)
@@ -101,39 +112,9 @@ function DataManager:clear()
 		self.cacheTimer = nil
 	end
 	self.cdCallBack = {}
-	self.PlayerData:clear()
+	for _, v in pairs(self._cacheManager) do
-	self.ChapterData:clear()
+		v:clear()
-	self.DailyChallengeData:clear()
+	end
-	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
@@ -144,10 +125,10 @@ function DataManager:initWithServerData(data)
 	Time:setServerTimeZone(0)
 	Time:updateServerTime(data.now_ts)
 	Time:updateServerTimeToday(data.today_ts)
+	self.loginCount = data.stat and data.stat.login_day_count or 1
 
 	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()
@@ -156,51 +137,60 @@ function DataManager:initWithServerData(data)
 	self.PlayerData:init(data)
 	self.ChapterData:init(data.chapter)
 	self.DailyChallengeData:init(data.chapter_daily_challenge)
-	self.DungeonData:initDungeonGold(data.chapter_gold_challenge)
+	self.FormationData:init(data.formations)
-	self.DungeonData:initDungeonShards(data.chapter_shards_challenge)
+	self.EquipData:init(data.equip)
-	-- FormationData要在RunesData之前初始化，依赖阵容数据进行上报
+	-- self.SkinData:init(data.bag.skins)
-	self.FormationData:init(data.fight_info)
+	self.TalentData:init(data.talent)
-	self.EquipData:init(data.heroes_equips)
+	-- HeroData要在EquipData、SkinData、TalentData之后初始化，依赖它们的属性数据
-	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.TutorialData:init(data.guide)
 	self.MailData:init(data.mail_info)
-	self.GoldPigData:init(data.pig, true)
+
-	self.BountyData:init(data.bounty)
+	self.PaymentData:initData(data.stat)
+    self.PaymentData:initActGift(data.gift)
+	-- 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.DailyTaskData:init(data.task_daily, data.task_achievement)
 	self.IdleData:init(data.idle)
-	self.SevenDayData:init(data.seven_day)
+	self.ShopData:init()
-	self.ShopData:initBase()
+	self.ShopData:refreshDailyShop(data.mall_daily_store)
-	self.ShopData:initActGift(data.act) -- 礼包购买信息
+	self.PrivilegeCardData:init(data.card)
-	self.ShopData:initMallDaily(data.mall_daily) -- 每日特惠
+	self.ShopData:refreshGoldShop(data.mall_gold)
-	self.ShopData:initCommonDailyGoldGift(data.mall_idle and data.mall_idle.ad_count) -- 常驻金币礼包
+	-- self.ShopData:refreshEmblemShop(data.mall_mythic_store)
-	self.ShopData:initGrowUpGift(data.act_grow_up_gift2) -- 成长礼包
+	-- self.ShopData:initVit(data.energy_limit)
-	self.ShopData:initLevelUpGift(data.act_level_up_gift) -- 助力/金币礼包
+	-- self.ShopData:initThirdPayOrder(data.third_pay)
-	self.ShopData:initIntroductGift(data.act_introductory_gift) -- 入门礼包
+	-- self.ShopData:initThirdPayGiftOrder(data.third_pay)
+	-- self.ShopData:initBase()
+	-- self.ShopData:initActGift(data.act) -- 礼包购买信息
+	-- self.ShopData:initMallDaily(data.mall_daily_store) -- 每日特惠
+	-- self.ShopData:initCommonDailyGoldGift(data.mall_idle and data.mall_idle.ad_count) -- 常驻金币礼包
+	-- self.ShopData:initGrowUpGift(data.act_grow_up_gift2) -- 成长礼包
+	-- self.ShopData:initLevelUpGift(data.act_level_up_gift) -- 助力/金币礼包
+	-- self.ShopData:initIntroductGift(data.act_introductory_gift) -- 入门礼包
+	-- 基金
+	self.FundLevelData:initData(data.fund) -- levelGiftData要放到PaymentData后面，因为要处理数据
+	self.ChapterFundData:initData(data.chapter_fund)
+	self.SignWeekData:initData(data.sign)
+	self.SignMonthData:initData(data.sign_30)
 	-- 活动要在礼包后初始化
-	self.ActivityData:init()
+	self.ActTimeData:init(data.activities) -- 全活动时间, after PlayerData
+	self.ActivityData:initExchangeData(data.activity_exchange)
+	self.ActTaskData:initTaskData(data.activity_score_task, data.activity_task)
+	self.ActSprintData:init(data.activity_rush_exchange)
+	self.ActSevenDayData:initData(data.seven_day)
+	-- self.ActSprintSummonDataAll:initTaskData(data.activity_score_task, data.activity_task)
+	-- 副本
+    self.DungeonData:init()
+    self.DungeonDailyData:init(data.dungeon)
+
 	-- 商店礼包都初始化完了后检查一下每日红点
-	self.ShopData:checkShopDiscountRedPoint()
+	-- self.ShopData:checkShopDiscountRedPoint()
-	self.ShopData:checkLoginPopInfo() -- 需要写在shopdata所有初始化之后
+	-- self.ShopData:checkLoginPopInfo() -- 需要写在shopdata所有初始化之后
-	self.SummonData:init(data.summon, true)
+	self.SummonData:init(data.summon_data, data.summon_shop)
 	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()
@@ -208,11 +198,18 @@ function DataManager:initWithServerData(data)
 	self:checkDataBind()
 	ModuleManager.ArenaManager:reqArenaInfo()
 
-	self:dealOpenActivity(data.activities)
 	-- 写在最后，防止某些数据还未初始化，就被bi访问报错
 	self.initWithServer = true
 end
 
+function DataManager:setAuthInfo(authInfo)
+    self.authInfo = authInfo
+end
+
+function DataManager:getAuthInfo()
+    return self.authInfo
+end
+
 -- 是否首次登录
 function DataManager:getIsFirstLogin()
 	local nowTime = Time:getServerTime()
@@ -310,7 +307,20 @@ function DataManager:scheduleGlobal()
 		return
 	end
 
-	self.crossDayTS = Time:getOverOfServerToday()
+	if EDITOR_MODE then
+		Logger.logHighlight("==========================================================")
+		Logger.logHighlight("本地显示日期：" .. Time:formatTimeYMD())
+		Logger.logHighlight("当前时间戳：" .. Time:getServerTime())
+		Logger.logHighlight("本日时间戳：" .. Time:getDayBeginTimeStamp() .. "-" .. Time:getDayOverTimeStamp())
+		Logger.logHighlight("本周时间戳：" ..
+		Time:getWeekBeginTimeStamp() .. "-" .. Time:getWeekOverTimeStamp() .. "   当前处于本周第" .. Time:getDayofWeek() .. "天")
+		Logger.logHighlight("本月时间戳：" ..
+		Time:getMonthBeginTimeStamp() ..
+		"-" .. Time:getMonthOverTimeStamp() .. "   当前处于本月第" .. Time:getDayofMonth() .. "天")
+		Logger.logHighlight("==========================================================")
+	end
+
+	self.crossDayTS = Time:getDayOverTimeStamp()
 	self.cacheTimer = SchedulerManager:scheduleGlobal(function(inter)
 		for k, v in ipairs(self.cdCallBack) do
 			if self[v] and self[v].updateCd then
@@ -319,19 +329,120 @@ function DataManager:scheduleGlobal()
 		end
 
 		if Time:getServerTime() > self.crossDayTS then
-			self.crossDayTS = Time:getOverOfServerToday()
+			self.crossDayTS = Time:getDayOverTimeStamp()
+			self.weekOverTime = Time:getWeekOverTimeStamp()
+			self.monthOverTime = Time:getMonthOverTimeStamp()
+			self.loginCount = self.loginCount + 1
+			-- 跨天先刷新活动时间
+			DataManager.ActTimeData:refreshActTime(true)
+			Logger.logHighlight("跨天===========================================================================")
 			if self.crossDayCallbacks then
 				for i, info in ipairs(self.crossDayCallbacks) do
 					if info.func and info.open then
 						info.func()
 					end
 				end
+				-- DataManager.GiftPopData:activeLoginPopGift()
+			end
+			self:doCrossDay()
+			-- 登录天数
+			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.LOGIN_NUM)
+			self:tryOpenModules() -- 开服天数限制的
+			EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CROSS_DAY)
+			-- 重置
+			if self.timeEveryDayCallbacks then
+				for k, v in ipairs(self.timeEveryDayCallbacks) do
+					v.triggerToday = false
+				end
+			end
+		end
+
+		-- 每日特定时间消息
+		if self.timeEveryDayCallbacks then
+			local timeToday = Time:getDayBeginTimeStamp(Time:getServerTime() + 1)
+			local passTime = Time:getServerTime() - timeToday
+			for k, v in ipairs(self.timeEveryDayCallbacks) do
+				if not v.triggerToday and v.func and v.open and passTime > v.time then
+					v.triggerToday = true
+					v.func()
+				end
 			end
-			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_LOGIN_DAY)
 		end
 	end, 1)
 end
 
+function DataManager:doCrossDay()
+    local delayTime = math.random(1, 10000) / 1000
+    SchedulerManager:performWithDelayGlobal(function()
+        ModuleManager.MaincityManager:reqPassDay()
+    end, delayTime)
+end
+
+function DataManager:onCrossDay(info)
+    -- if info.activities then
+    -- 	self.ActTimeData:init(info.activities) -- 全活动时间, after PlayerData
+    -- end
+    if info.door then
+    	self.DoorData:init(info.door)
+    end
+    if info.mall_daily_store then
+        self.ShopData:refreshDailyShop(info.mall_daily_store)
+    end
+    if info.elemental_dungeon then
+        self.ElementData:init(info.elemental_dungeon)
+    end
+    if info.dispatch then
+        self.DispatchData:init(info.dispatch)
+    end
+end
+
+function DataManager:registerTimeEveryDayFunc(bindId, time, func)
+    if not bindId or not time or not func then
+        return
+    end
+
+    if not self.timeEveryDayCallbacks then
+        self.timeEveryDayCallbacks = {}
+    end
+
+    local timeToday = Time:getDayBeginTimeStamp(Time:getServerTime() + 1)
+    local passTime = Time:getServerTime() - timeToday
+
+    for i, info in ipairs(self.timeEveryDayCallbacks) do
+        if info.bindId == bindId then
+            self.timeEveryDayCallbacks[i].func = func
+            self.timeEveryDayCallbacks[i].time = time
+            self.timeEveryDayCallbacks[i].triggerToday = passTime > time
+            self.timeEveryDayCallbacks[i].open = true
+            return
+        end
+    end
+
+    table.insert(self.timeEveryDayCallbacks, {
+        bindId = bindId,
+        func = func,
+        time = time,
+        triggerToday = passTime > time,
+        open = true
+    })
+end
+
+function DataManager:unRegisterTimeEveryDayFunc(bindId)
+    if not bindId then
+        return
+    end
+
+    if not self.timeEveryDayCallbacks then
+        return
+    end
+    for i, info in ipairs(self.timeEveryDayCallbacks) do
+        if info.bindId == bindId then
+            self.timeEveryDayCallbacks[i].open = false
+            return
+        end
+    end
+end
+
 function DataManager:tryOpenModules()
 	if not self.tryOpenCallbacks then
 		return
@@ -370,28 +481,6 @@ function DataManager:clearTryOpenFunc()
 	end
 end
 
-function DataManager:getSignInfo()
-	local nowTime = Time:getServerTime()
-	local lastSignTime = self.signInfo.latest_at // 1000
-	local todayBeginTime = nowTime - nowTime % 86400
-	local canSign = lastSignTime < todayBeginTime
-	if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SIGNIN) then
-		canSign = false
-	end
-	return self.signInfo.count or 0, canSign, self.hasSigned
-end
-
-function DataManager:setSignCount(count)
-	self.hasSigned = true
-	self.signInfo.count = count
-	self.signInfo.latest_at = Time:getServerTime() * 1000
-	--Logger.logHighlight("签到成功次数："..count)
-end
-
-function DataManager:resetSignInInfo()
-	self.hasSigned = false
-end
-
 function DataManager:setLoginSuccess(success)
 	self.loginSuccess = success
 end
@@ -400,179 +489,9 @@ function DataManager:getLoginSuccess()
 	return self.loginSuccess
 end
 
--- 获取建号时间
+-- 获取登录天数
-function DataManager:getCreatePlayerTime()
+function DataManager:getLoginCount()
-    return self.createPlayerTime or Time:getServerTime()
+    return self.loginCount or 1
 end
 
--- 记录sync了多少次数据，如果以后游戏中要回到登录界面，则此值应当被清除
-function DataManager:markSyncDataCount()
-	if not self.syncDataCount then
-		self.syncDataCount = 1
-	else
-		self.syncDataCount = self.syncDataCount + 1
-	end
-end
-
-function DataManager:getSyncDataCount()
-	return self.syncDataCount or 0
-end
-
-function DataManager:needDealGm()
-	return self:getSyncDataCount() >= 2
-end
-
-function DataManager:getManager(name, path)
-	if self[name] then
-		return self[name]
-	end
-	self[name] = require(path):create()
-	return self[name]
-end
-
----- 缓存一下活动战令
-function DataManager:getActivityBountyLevelByActId(actId)
-	if not self.activityBountyLevelMap then
-		self.activityBountyLevelMap = {}
-		local cfg = ConfigManager:getConfig("activity_bounty_level")
-		for id, info in pairs(cfg) do
-			if info.act_id then
-				if not self.activityBountyLevelMap[info.act_id] then
-					self.activityBountyLevelMap[info.act_id] = {}
-				end
-				table.insert(self.activityBountyLevelMap[info.act_id], id)
-			end
-		end
-	end
-	return self.activityBountyLevelMap[actId]
-end
-
----- 缓存一下活动兑换商店
-function DataManager:getActivityExchangeByActId(actId)
-	if not self.activityExchangeMap then
-		self.activityExchangeMap = {}
-		local cfg = ConfigManager:getConfig("activity_exchange")
-		for id, info in pairs(cfg) do
-			if info.activity then
-				if not self.activityExchangeMap[info.activity] then
-					self.activityExchangeMap[info.activity] = {}
-				end
-				table.insert(self.activityExchangeMap[info.activity], id)
-			end
-		end
-	end
-	return self.activityExchangeMap[actId]
-end
-
----- 缓存一下活动排行榜
-function DataManager:getActivityRankByActId(actId)
-	if not self.activityRankMap then
-		self.activityRankMap = {}
-		local cfg = ConfigManager:getConfig("activity_rank")
-		for id, info in pairs(cfg) do
-			if info.act_id then
-				if not self.activityRankMap[info.act_id] then
-					self.activityRankMap[info.act_id] = {}
-				end
-				table.insert(self.activityRankMap[info.act_id], id)
-			end
-		end
-	end
-	return self.activityRankMap[actId]
-end
-
-function DataManager:dealOpenActivity(activityInfo)
-	local curTime = Time:getServerTime()
-	if not activityInfo then
-		return
-	end
-
-	local newActivityList = {}
-	local map = {}
-	for _, info in ipairs(activityInfo) do
-		if info.type then
-			if not map[info.type] then
-				map[info.type] = info
-			else
-				if map[info.type].start_at > info.start_at then
-					map[info.type] = info
-				end
-			end
-		end
-	end
-	for actType, info in pairs(map) do
-		table.insert(newActivityList, info)
-	end
-
-	local dealTypeMap = {}
-	for _, info in ipairs(newActivityList) do
-		local startTime = GFunc.formatTimeStep(info.start_at)
-		if startTime <= curTime and curTime <= GFunc.formatTimeStep(info.end_at) then
-			local reqFunc = DataManager.activityOpenFunc[info.type]
-			if reqFunc and not dealTypeMap[info.type] then
-				dealTypeMap[info.type] = true
-				reqFunc(info)
-			end
-		elseif startTime > curTime then
-			local waitOpenFunc = DataManager.waitOpenActivity[info.type]
-			if waitOpenFunc and not dealTypeMap[info.type] then
-				dealTypeMap[info.type] = true
-				waitOpenFunc(info)
-			end
-		end
-	end
-end
-
-DataManager.activityOpenFunc = {
-	[2] = function(params)
-		DataManager.ActBossRushData:setActivityInfo(params)
-		ModuleManager.ActBossRushManager:reqActData()
-	end,
-	[3] = function(params)
-		DataManager.ActPvpData:setActivityId(params.id)
-		DataManager.ActPvpData:setActivityInfo(params)
-		DataManager.ActPvpData:init({}) -- 默认初始化
-		ModuleManager.ActPvpManager:reqActData()
-	end,
-	[4] = function(params)
-		DataManager.FullMoonData:setActStatus(params)
-		ModuleManager.FullMoonManager:reqActData()
-		ModuleManager.FullMoonManager:initTimer()
-	end,
-	[5] = function(params)
-		DataManager.TournWaveData:setActStatus(params)
-		ModuleManager.TournWaveManager:reqActData()
-		ModuleManager.TournWaveManager:initTimer()
-	end,
-	[6] = function(params)
-		DataManager.TournArenaData:setActStatus(params)
-		ModuleManager.TournArenaManager:reqActData()
-		ModuleManager.TournArenaManager:initTimer()
-	end,
-}
-
-DataManager.waitOpenActivity = {
-	[2] = function(params)
-		DataManager.ActBossRushData:init({activity_id = params.id}) -- 默认初始化
-		DataManager.ActBossRushData:setActivityInfo(params)
-	end,
-	[3] = function(params)
-		DataManager.ActPvpData:setActivityId(params.id)
-		DataManager.ActPvpData:setActivityInfo(params)
-		DataManager.ActPvpData:init({}) -- 默认初始化
-	end,
-	[4] = function(params)
-		DataManager.FullMoonData:setActStatus(params)
-		ModuleManager.FullMoonManager:initTimer()
-	end,
-	[5] = function(params)
-		DataManager.TournWaveData:setActStatus(params)
-		ModuleManager.TournWaveManager:initTimer()
-	end,
-	[6] = function(params)
-		DataManager.TournArenaData:setActStatus(params)
-		ModuleManager.TournArenaManager:initTimer()
-	end,
-}
-
 return DataManager

lua/app/common/event_manager.lua

@@ -54,8 +54,6 @@ EventManager.CUSTOM_EVENT = {
 	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",
@@ -71,6 +69,29 @@ EventManager.CUSTOM_EVENT = {
 	BATTLE_REBIRTH = "BATTLE_REBIRTH",
 
 	ACT_PVP_EVENT = "ACT_PVP_EVENT",
+
+	-- b13
+	FORCE_SUMMON_WISH_HERO_ID = "FORCE_SUMMON_WISH_HERO_ID",--心愿英雄设置
+	FORCE_SUMMON_WISH_CLAIM = "FORCE_SUMMON_WISH_CLAIM",--心愿奖励领取
+	NO_AD_ACTIVE = "NO_AD_ACTIVE", -- 免广告卡激活
+	-- b10
+	FORCE_SUMMON = "FORCE_SUMMON",
+	FORCE_SUMMON_NEXT = "FORCE_SUMMON_NEXT",
+	FORCE_SUMMON_NEXT_FINISH = "FORCE_SUMMON_NEXT_FINISH",
+	FORCE_SUMMON_CHECK_PATH = "FORCE_SUMMON_CHECK_PATH",
+	FORCE_SUMMON_CHECK_PATH_GM = "FORCE_SUMMON_CHECK_PATH_GM",
+	UPDATE_SIDE_BAR = "UPDATE_SIDE_BAR",
+
+	-- 活动
+	CHANGE_ACTIVITY_PAGE = "CHANGE_ACTIVITY_PAGE",
+	BATTLE_REVIVE = "BATTLE_REVIVE",
+	BATTLE_REVIVE_FAILED = "BATTLE_REVIVE_FAILED",
+	BATTLE_DOUBLE_REWARD = "BATTLE_DOUBLE_REWARD",
+
+	REFRESH_MAIN_CITY_BOTTOM = "REFRESH_MAIN_CITY_BOTTOM",
+
+
+	CROSS_DAY = "CROSS_DAY",-- 跨天
 }
 
 -- 此方法不能直接在外部调用，请使用例如BaseUI，BaseModule等封装好的接口

lua/app/common/local_data.lua

@@ -9,6 +9,7 @@ local LOCAL_DATA_KEY = {
 	SELECTED_LANGUAGE = "SELECTED_LANGUAGE",
 	GM_SHOW_FLOATING_ICON = "GM_SHOW_FLOATING_ICON",
 	MESSAGE_BOX_SHOW_TODAY = "MESSAGE_BOX_SHOW_TODAY",
+	MESSAGE_BOX_SHOW_TODAY_VALUE = "MESSAGE_BOX_SHOW_TODAY_VALUE",
 	GAME_QUALITY_LEVEL = "GAME_QUALITY_LEVEL",										-- 游戏设置品质等级
 	LAST_LOGIN_URL = "LAST_LOGIN_URL",
 	LAST_LOGIN_NAME = "LAST_LOGIN_NAME",
@@ -18,6 +19,7 @@ local LOCAL_DATA_KEY = {
 	ACCOUNT_INFO = "ACCOUNT_INFO",
 	SEND_QUEUE = "SEND_QUEUE",
 	SDK_LOGIN_TYPE = "SDK_LOGIN_TYPE",
+	TRUTORIAL_SKIP_FLAG = "TRUTORIAL_SKIP_FLAG",
 
 	NEED_UPDATE = "NEED_UPDATE",								-- 需要更新
 	IOS_ORDER_ID = "IOS_ORDER_ID",
@@ -44,6 +46,9 @@ local LOCAL_DATA_KEY = {
 	FOURTEEN_DAY_TODAY_EXCHANGE = "FOURTEEN_DAY_TODAY_EXCHANGE",
 	ACT_BOSS_RUSH_EXCHANGE = "ACT_BOSS_RUSH_EXCHANGE",
 	ACT_PVP_SHOW_HELP = "ACT_PVP_SHOW_HELP",
+	FUNC_OPEN = "FUNC_OPEN",
+	FUNC_OPEN_POP = "FUNC_OPEN_POP",
+	SUMMON_SKIP = "SUMMON_SKIP",
 }
 
 LocalData.KEYS = LOCAL_DATA_KEY
@@ -156,6 +161,14 @@ function LocalData:setMessageBoxShowTodayTime(key, value)
 	self:setInt(LOCAL_DATA_KEY.MESSAGE_BOX_SHOW_TODAY .. key, value)
 end
 
+function LocalData:getMessageBoxShowTodayValue(key)
+    return self:getInt(LOCAL_DATA_KEY.MESSAGE_BOX_SHOW_TODAY_VALUE .. key, 0)
+end
+
+function LocalData:setMessageBoxShowTodayValue(key, value)
+    self:setInt(LOCAL_DATA_KEY.MESSAGE_BOX_SHOW_TODAY_VALUE .. key, value)
+end
+
 function LocalData:getGameQualityLevel()
 	return self:getInt(LOCAL_DATA_KEY.GAME_QUALITY_LEVEL, 0)
 end
@@ -503,4 +516,40 @@ function LocalData:recordActPvpShowHelpTag(actId)
 	self:setInt(LOCAL_DATA_KEY.ACT_PVP_SHOW_HELP .. actId, 1)
 end
 
+function LocalData:getTutorialSkip()
+	return self:getInt(LOCAL_DATA_KEY.TRUTORIAL_SKIP_FLAG, 0)
+end
+
+function LocalData:setTutorialSkip(value)
+	self:setInt(LOCAL_DATA_KEY.TRUTORIAL_SKIP_FLAG, value)
+end
+
+function LocalData:getFuncOpenPopSkip()
+	return self:getInt(self:getRoleKey(LOCAL_DATA_KEY.FUNC_OPEN_POP), 0)
+end
+
+function LocalData:setFuncOpenPopSkip(value)
+	self:setInt(self:getRoleKey(LOCAL_DATA_KEY.FUNC_OPEN_POP), value)
+end
+
+function LocalData:getFuncOpenShowList()
+	local jsonStr = self:getString(self:getRoleKey(LOCAL_DATA_KEY.FUNC_OPEN), "{}")
+	return json.decode(jsonStr)
+end
+
+function LocalData:setFuncOpenShowList(list)
+	local jsonStr = json.encode(list)
+	self:setString(self:getRoleKey(LOCAL_DATA_KEY.FUNC_OPEN), jsonStr)
+end
+
+function LocalData:getSummonSkipFlag()
+	local jsonStr = self:getInt(self:getRoleKey(LOCAL_DATA_KEY.SUMMON_SKIP), 0)
+	return json.decode(jsonStr)
+end
+
+function LocalData:setSummonSkipFlag(flag)
+	self:setInt(self:getRoleKey(LOCAL_DATA_KEY.SUMMON_SKIP), flag)
+end
+
+
 return LocalData

lua/app/common/module_manager.lua

@@ -27,8 +27,6 @@ local MODULE_PATHS = {
 	DailyChallengeManager = "app/module/daily_challenge/daily_challenge_manager",
 	-- 挂机
 	IdleManager = "app/module/idle/idle_manager",
-	-- 七天乐
-	SevenDayManager = "app/module/activity/seven_day/seven_day_manager",
 	-- 基金
 	FundManager = "app/module/fund/fund_manager",
 	-- 设置
@@ -71,27 +69,29 @@ local MODULE_PATHS = {
 	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",
+	TalentManager = "app/module/talent/talent_manager",
+	BagManager = "app/module/bag/bag_manager",
+	-- 战力/攻击力toast
+	PowerToastManager = "app/ui/common/power_toast_manager",
+	-- 成长基金
+	FundLevelManager = "app/module/fund_level/fund_level_manager",
+	-- 关卡基金
+	FundChapterManager = "app/module/fund_chapter/fund_chapter_manager",
+	-- 签到
+	SignManager = "app/module/sign/sign_manager",
+	-- 活动七天乐
+	ActSevenDayManager = "app/module/activity/act_seven_day/act_seven_day_manager",
+	-- 特权卡
+	PrivilegeCardManager = "app/module/privilege/privilege_card_manager",
+	-- 冲刺活动
+	ActSprintManager = "app/module/activity/act_sprint/act_sprint_manager",
 }
 
 -- 这里的key对应func_open里的id
 ModuleManager.MODULE_KEY = {
-	GOLD_PIG = "act_gold_pig",
 	SEVEN_DAY = "act_sevenday",
 	TASK = "task",
 	STORE_BOX_OPEN = "store_box_open",
@@ -102,13 +102,11 @@ ModuleManager.MODULE_KEY = {
 	MALL = "mall", -- 商城
 	MALL_DAILY = "mall_daily", -- 每日商城
 	DAILY_CHALLENGE = "daily_challenge", -- 每日挑战
-	FUND = "act_level_gift", -- 成长基金
 	ACT_GIFT_SHOW_OPEN = "act_gift_show_open", -- 弹窗礼包通用开启条件
 	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", -- 竞技场礼包
@@ -119,6 +117,26 @@ ModuleManager.MODULE_KEY = {
 	EQUIP_ARMOR = "equip_armor_open", -- 防具
 	SKIN = "skin_open", -- 皮肤
 	RUNES_OPEN = "runes_open", -- 符文
+	COMPANY_OPEN = "company_open", -- 公司页签开启条件		
+	TALENT_OPEN = "talent_open", -- 天赋功能开启条件
+	DUNGEON_OPEN = "dungeon_open", -- 玩法入口页签开启条件
+	SUMMON_OPEN = "summon_open", -- 英雄抽卡功能开启条件（包括普通和高级抽）
+	BOUNTY = "bounty",
+	-- 基金
+	ACT_LEVEL_GIFT = "act_level_gift", -- 成长基金
+	CHAPTER_FUND = "fund_chapter", -- 关卡基金
+	-- 签到
+	SIGN_BOUNTY = "signin_bounty",
+	SIGN_MONTH = "signin_30",
+	-- 七天乐
+	ACT_SEVENDAY = "act_sevenday",
+	ACT_SEVENDAY_2 = "act_sevenday_2",
+	ACT_GOGOGO = "act_gogogo",
+	-- 免广告卡
+	CARD_AD = "card_ad",
+	DUNGEON_GOLD = "dungeon_gold", -- 金币副本
+	DUNGEON_RES = "dungeon_res", -- 材料副本
+	CARD_MONTHLY = "card_monthly",
 }
 
 local _moduleMgrs = {}
@@ -143,7 +161,6 @@ function ModuleManager:init()
 	ModuleManager.DailyChallengeManager:init()
 	ModuleManager.PlayerManager:init()
 	ModuleManager.SkinManager:init()
-	ModuleManager.TournArenaManager:init()
 end
 
 -- 功能是否开启
@@ -152,19 +169,96 @@ function ModuleManager:getIsOpen(key, hideToast)
 	if cfg == nil then
 		return true
 	end
-	-- 优先判断等级
+	-- 且
+	if cfg.sever_time then
+		local serverDay = DataManager.PlayerData:getServerOpenDay()
+		local isOpen = serverDay >= cfg.sever_time
+		if not hideToast and not isOpen then
+			if cfg.level then
+				GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_LEVEL_SEVER, cfg.level, serverDay, cfg.sever_time))
+			elseif cfg.stage then
+				local str = DataManager.ChapterData:getChapterNameXYMode(cfg.stage)
+				GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_STAGE_SEVER, str, serverDay, cfg.sever_time))
+			else
+				-- 策划说必定有level或stage
+			end
+		end
+		if not isOpen then
+			return false
+		end
+	end
+	if cfg.time then
+		local createDay = DataManager.PlayerData:getCreateDay()
+		local isOpen = createDay >= cfg.time
+		if not hideToast and not isOpen then
+			if cfg.level then
+				GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_LEVEL_SEVER, cfg.level, createDay, cfg.time))
+			elseif cfg.stage then
+				local str = DataManager.ChapterData:getChapterNameXYMode(cfg.stage)
+				GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_STAGE_SEVER, str, createDay, cfg.time))
+			else
+				-- 策划说必定有level或stage
+			end
+		end
+		if not isOpen then
+			return false
+		end
+	end
 	if cfg.level then
 		local isOpen = DataManager.PlayerData:getLv() >= cfg.level
 		if not hideToast and not isOpen then
 			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_LEVEL, cfg.level))
 		end
-		return isOpen
+		if not isOpen then
-	elseif cfg.stage then -- 没有填等级字段就判断关卡
+			return false
-		local isOpen = DataManager.ChapterData:getMaxChapterId() >= cfg.stage
-		if not hideToast and not isOpen then
-			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_STAGE, cfg.stage))
 		end
-		return isOpen
+	end
+	if cfg.stage then
+		local isOpen = DataManager.ChapterData:getChapterPassed(cfg.stage)
+		if not hideToast and not isOpen then
+			local str = DataManager.ChapterData:getChapterNameXYMode(cfg.stage)
+			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_STAGE, str))
+		end
+		if not isOpen then
+			return false
+		end
+	end
+
+	-- 或
+	local stage2, time2
+	if cfg.stage_2 then
+		local isOpen = DataManager.ChapterData:getChapterPassed(cfg.stage_2)
+		if isOpen then
+			return true
+		else
+			stage2 = cfg.stage_2
+		end
+	end
+	if cfg.time_2 then
+		local createDay = DataManager.PlayerData:getCreateDay()
+		local isOpen = createDay >= cfg.time_2
+		if isOpen then
+			return true
+		else
+			time2 = cfg.time_2
+		end
+	end
+	if stage2 and time2 then
+		if not hideToast then
+			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_STAGE_OR_SEVER, stage2, time2))
+		end
+		return false
+	elseif stage2 and not cfg.time_2 then
+		if not hideToast then
+			local str = DataManager.ChapterData:getChapterNameXYMode(stage2)
+			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_STAGE, str))
+		end
+		return false
+	elseif time2 and not cfg.stage_2 then
+		if not hideToast then
+			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.FUNC_OPEN_SEVER, time2))
+		end
+		return false
 	end
 	return true
 end
@@ -203,6 +297,14 @@ function ModuleManager:getOpenStageId(key)
 	return cfg.stage
 end
 
+function ModuleManager:getOpenDay(key)
+    local cfg = ConfigManager:getConfig("func_open")[key]
+    if not cfg or cfg.time == nil then
+		return
+	end
+	return cfg.time
+end
+
 function ModuleManager:clear()
 	for k, v in ipairs(_moduleMgrs) do
 		v:_clear()

lua/app/common/pay_manager.lua

@@ -2,114 +2,167 @@ local PayManager = class("PayManager", BaseModule)
 
 PayManager.PURCHARSE_TYPE = {
 	ACT_GIFT = 1,
-    ACT_GOLD_PIG = 2,
+	SHOP_GEM = 2,
-    CHAPTER_GIFT = 3,
+	-- GIFT_ROUTINE = 3,
-    GROW_UP_GIFT = 4,-- 已废弃
+	-- GIFT_JOLLYMAX = 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,
 	FIRST_RECHARGE = 1,
-    COIN_GIFT = 2,
+    PRIVILEGE_CARD = 2,
-    INTRODUCTORY_GIFT = 3,
+	BOUNTY = 3,
-    BEGINNER_GIFT = 4,
+	FUND = 4,
-    LEVEL_UP_GIFT = 5,
+	SIGN_BOUNTY = 5,
-    GROWTH_FUND = 6,
+	GIFT_POP_CHAPTER = 10, -- 章节礼包
-    BOUNTY = 7,
+	ACT_COMMON = 11,-- 活动礼包通用11,具体礼包类型使用activity表中的act_type
-    ARENA_BOUNTY = 8,
+	ACT_SEVEN_DAY = 15, -- 七天乐
-    ARENA_GIFT = 9,
+}
-    ARMOR_FUND = 10,
+
-    WEAPON_GIFT = 11,
+PayManager.ACT_COMMON_TYPE = {
-    ARMOR_GIFT = 12,
+	-- ACT_SUMMON_HERO_GIFT = 1,
-    ACT_SUMMER = 13,
+	ACT_SPRINT_SUMMON_GIFT = 2,
-    ACT_HERO_FUND = 14,
+	-- ACT_SPRINT_BOX_GIFT = 3,
-    WEAPON_UPGRADE_GIFT = 15,
+	-- ACT_SPRINT_SUMMON_GIFT_V2 = 4,
-    ARMOR_UPGRADE_GIFT = 16,
+	-- ACT_SPRINT_BOX_GIFT_V2 = 5,
-    FOURTEEN_DAY_GIFT = 17,
+	-- ACT_SPRINT_TREE_GIFT = 6,
-    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 = {
 	[PayManager.PURCHARSE_TYPE.ACT_GIFT] = "act_gift",
-    [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = "act_gold_pig",
+	[PayManager.PURCHARSE_TYPE.SHOP_GEM] = "mall_treasure",
-    [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = "mall_treasure",
+	-- [PayManager.PURCHARSE_TYPE.GIFT_ROUTINE] = "gift_routine",
-    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "act_chapter_store",
+	-- [PayManager.PURCHARSE_TYPE.GIFT_JOLLYMAX] = "gift_jollymax",
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "act_growup_gift_new",
 }
 
 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.PRIVILEGE_CARD] = BIReport.ITEM_GET_TYPE.PRIVILEGE_CARD,
-        [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.FUND] = BIReport.ITEM_GET_TYPE.FUND_GROW,
-        [PayManager.PURCHARSE_ACT_TYPE.ARENA_GIFT] = BIReport.ITEM_GET_TYPE.ARENA_GIFT,
+		[PayManager.PURCHARSE_ACT_TYPE.SIGN_BOUNTY] = BIReport.ITEM_GET_TYPE.SIGN_BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.ITEM_GET_TYPE.ARMOR_FUND,
+		[PayManager.PURCHARSE_ACT_TYPE.GIFT_POP_CHAPTER] = BIReport.ITEM_GET_TYPE.GIFT_POP_CHAPTER,
-        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
+		[PayManager.PURCHARSE_ACT_TYPE.ACT_COMMON] = {},
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
+		[PayManager.PURCHARSE_ACT_TYPE.ACT_SEVEN_DAY] = BIReport.ITEM_GET_TYPE.SEVEN_DAY_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.ITEM_GET_TYPE.ACT_SUMMER,
+		-- [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = BIReport.ITEM_GET_TYPE.FIRST_RECHARGE,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
+		-- [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = BIReport.ITEM_GET_TYPE.COIN_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.INTRODUCTORY_GIFT] = BIReport.ITEM_GET_TYPE.INTRODUCTORY_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = BIReport.ITEM_GET_TYPE.BEGINNER_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = BIReport.ITEM_GET_TYPE.LEVEL_UP_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.ITEM_GET_TYPE.ACT_PVP_BOUNTY_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND] = BIReport.ITEM_GET_TYPE.GROWTH_FUND,
-        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_HERO_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.ITEM_GET_TYPE.BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_NEW_HERO_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ARENA_BOUNTY] = BIReport.ITEM_GET_TYPE.ARENA_BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_SKIN_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ARENA_GIFT] = BIReport.ITEM_GET_TYPE.ARENA_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.ITEM_GET_TYPE.RUNES_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.ITEM_GET_TYPE.ARMOR_FUND,
-        [PayManager.PURCHARSE_ACT_TYPE.TOURN_WAVE_GIFT] = BIReport.ITEM_GET_TYPE.TOURN_WAVE_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.TOURN_ARENA_GIFT] = BIReport.ITEM_GET_TYPE.TOURN_ARENA_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.SHOP_GEM] = BIReport.ITEM_GET_TYPE.SHOP_GEM,
-    [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.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.PRIVILEGE_CARD] = BIReport.GIFT_TYPE.PRIVILEGE_CARD,
-        [PayManager.PURCHARSE_ACT_TYPE.INTRODUCTORY_GIFT] = BIReport.GIFT_TYPE.INTRODUCTORY_GIFT,
+		[PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.GIFT_TYPE.BOUNTY_PRO_REWARD,
-        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = BIReport.GIFT_TYPE.BEGINNER_GIFT,
+		[PayManager.PURCHARSE_ACT_TYPE.FUND] = BIReport.GIFT_TYPE.FUND_GROW,
-        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = BIReport.GIFT_TYPE.LEVEL_UP_GIFT,
+		[PayManager.PURCHARSE_ACT_TYPE.SIGN_BOUNTY] = BIReport.GIFT_TYPE.SIGN_BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND] = BIReport.GIFT_TYPE.GROWTH_FUND,
+		[PayManager.PURCHARSE_ACT_TYPE.GIFT_POP_CHAPTER] = BIReport.GIFT_TYPE.GIFT_POP_CHAPTER,
-        [PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.GIFT_TYPE.BOUNTY,
+		[PayManager.PURCHARSE_ACT_TYPE.ACT_COMMON] = {},
-        [PayManager.PURCHARSE_ACT_TYPE.ARENA_BOUNTY] = BIReport.GIFT_TYPE.ARENA_BOUNTY,
+		[PayManager.PURCHARSE_ACT_TYPE.ACT_SEVEN_DAY] = BIReport.GIFT_TYPE.SEVEN_DAY_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ARENA_GIFT] = BIReport.GIFT_TYPE.ARENA_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = BIReport.GIFT_TYPE.FIRST_RECHARGE,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.GIFT_TYPE.ARMOR_FUND,
+		-- [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = BIReport.GIFT_TYPE.COIN_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.INTRODUCTORY_GIFT] = BIReport.GIFT_TYPE.INTRODUCTORY_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = BIReport.GIFT_TYPE.BEGINNER_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.GIFT_TYPE.ACT_SUMMER,
+		-- [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = BIReport.GIFT_TYPE.LEVEL_UP_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.GIFT_TYPE.ACT_HERO_FUND,
+		-- [PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND] = BIReport.GIFT_TYPE.GROWTH_FUND,
-        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.GIFT_TYPE.BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ARENA_BOUNTY] = BIReport.GIFT_TYPE.ARENA_BOUNTY,
-        [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ARENA_GIFT] = BIReport.GIFT_TYPE.ARENA_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.GIFT_TYPE.ACT_PVP_BOUNTY_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.GIFT_TYPE.ARMOR_FUND,
-        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_HERO_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_NEW_HERO_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_SKIN_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.GIFT_TYPE.ACT_SUMMER,
-        [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.GIFT_TYPE.RUNES_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.GIFT_TYPE.ACT_HERO_FUND,
-        [PayManager.PURCHARSE_ACT_TYPE.TOURN_WAVE_GIFT] = BIReport.GIFT_TYPE.TOURN_WAVE_GIFT,
+		-- [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
-        [PayManager.PURCHARSE_ACT_TYPE.TOURN_ARENA_GIFT] = BIReport.GIFT_TYPE.TOURN_ARENA_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.SHOP_GEM] = BIReport.GIFT_TYPE.SHOP_GEM,
-    [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,
 }
 
+function PayManager:getActCommonTypeByActId(id)
+	local actType
+	local cfg = ConfigManager:getConfig("activity")
+	for actId, info in pairs(cfg) do
+		local actGiftIds = info.act_gift
+		if actGiftIds then
+			for _, giftId in ipairs(actGiftIds) do
+				if giftId == id then
+					actType = info.act_type
+					break
+				end
+			end
+		end
+	end
+	-- 一些特殊活动特殊处理
+	if actType == nil then
+		local cfg = ConfigManager:getConfig("act_bounty")
+		for actId, info in pairs(cfg) do
+			if id == info.reward_pro_pay and info.activity then
+				local cfg = ConfigManager:getConfig("activity")[info.activity]
+				if cfg and cfg.act_type then
+					actType = cfg.act_type
+				end
+			end
+		end
+	end
+	return actType
+end
+
 function PayManager:getItemGetType(purchaseType, id)
 	local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[purchaseType]
 	if not cfgName then
@@ -122,7 +175,15 @@ function PayManager:getItemGetType(purchaseType, id)
 	end
 	local subType = cfg[id].type
 	if subType then
+		if subType == PayManager.PURCHARSE_ACT_TYPE.ACT_COMMON then
+			local commonType = self:getActCommonTypeByActId(id)
+			if commonType then
+				return typeMap[cfg[id].type][commonType]
+			end
+			return
+		else
 			return typeMap[cfg[id].type]
+		end
 	else
 		if type(typeMap) ~= "table" then
 			return typeMap
@@ -142,7 +203,15 @@ function PayManager:getGiftType(purchaseType, id)
 	end
 	local subType = cfg[id].type
 	if subType then
+		if subType == PayManager.PURCHARSE_ACT_TYPE.ACT_COMMON then  
+			local commonType = self:getActCommonTypeByActId(id)
+			if commonType then
+				return typeMap[cfg[id].type][commonType]
+			end
+			return
+		else
 			return typeMap[cfg[id].type]
+		end
 	else
 		if type(typeMap) ~= "table" then
 			return typeMap
@@ -174,7 +243,8 @@ function PayManager:getPackageRechargeId(purchaseType, id)
 	return cfg[id].recharge_id
 end
 
-function PayManager:purchasePackage(id, purchaseType)
+function PayManager:purchasePackage(id, purchaseType, freeShowRewards, doubleType, isFromBattle)
+	local isFromBattle = isFromBattle or false -- 标记是否是战斗中购买
 	local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[purchaseType]
 	if not cfgName then
 		return
@@ -192,62 +262,213 @@ function PayManager:purchasePackage(id, purchaseType)
 		if rechargeCfg == nil then
 			return
 		end
-        productId = rechargeCfg.payId
+		productId = rechargeCfg[VersionCompatible:getRechargePayId()]
-        BIReport:postPayClick(giftType, id, rechargeId)
+		BIReport:postPayClick(giftType, id, rechargeId, doubleType, isFromBattle, purchaseType)
+		self:showPayselectUI(rechargeId, function(useDaiJinJuan)
+			if not useDaiJinJuan then
+				self:checkAndPay(productId, id, purchaseType, rechargeId, doubleType, freeShowRewards, isFromBattle)
+			else
+				self:reqGiftPay(productId, id, purchaseType, rechargeId, doubleType, freeShowRewards, isFromBattle, true)
+			end
+		end)
+	else
+		self:checkAndPay(productId, id, purchaseType, rechargeId, doubleType, freeShowRewards, isFromBattle)
 	end
-    self:checkAndPay(productId, id, purchaseType, rechargeId)
 end
 
-function PayManager:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback)
+function PayManager:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback, cmdId, payDouble, isFromBattle, isSpecialOrder, wayCode)
-    self:sendMsgToServer(purchaseToken, orderId, originOrderId, productId, function(binder, msgData)
+	local args = SDKManager:getPurchaseArgs(purchaseToken, orderId, originOrderId, productId)
-        if msgData.status == 0 then
+	if isSpecialOrder then
+		args = SDKManager:getPurchaseArgs2(purchaseToken, orderId, originOrderId, productId)
+	end
+	self:sendMessage(ProtoMsgType.FromMsgEnum.GiftPaidResultReq, args, function(binder, result)
+		if result.err_code ~= GConst.ERROR_STR.SUCCESS then
+			if result.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, nil, "repeat consume")
+						SDKManager:delIosOrder(productId)
+					end
+					if originOrderId ~= "gm" then
+						SDKManager:delIosPayInfo(originOrderId)
+					end
+				else
+					if purchaseToken then
+						SDKManager:consumePurchase(purchaseToken)
+					end
+				end
+				Logger.logError("重复验证")
+				BIReport:postRepeatPayOrder(productId, originOrderId, orderId, isFromBattle)
+
+				if callback then
+					callback(false)
+				end
+			elseif result.status == 1003 then -- 订单异常
+				local params = {
+					content = I18N:getGlobalText(I18N.GlobalConst.PAY_FAILED_DESC_1),
+					boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
+					okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+				}
+				GFunc.showMessageBox(params)
+
+				if callback then
+					callback(false)
+				end
+			elseif result.status == 1001 then -- 订单异常
+				-- 支付失败，服务器未找到此订单，所以消耗此订单，直接算掉单
+				if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
+					if purchaseToken then
+						SDKManager:consumePurchase(purchaseToken)
+						GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.PAY_FAILED_DESC_1))
+					end
+				elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
+					if productId then
+						SDKManager:consumePurchase(productId, nil, "repeat consume")
+						SDKManager:delIosOrder(productId)
+						GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.PAY_FAILED_DESC_1))
+					end
+					if originOrderId ~= "gm" then
+						SDKManager:delIosPayInfo(originOrderId)
+					end
+				end
+			else
+				-- Logger.logError("支付验证失败:%s", result.status)
+				self:retrySendPayRecord(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback, cmdId, payDouble, isFromBattle, isSpecialOrder, wayCode)
+			end
+			return
+		end
+
 		local showRewards = not notShowRewardsBox
 		if DataManager.TutorialData and DataManager.TutorialData:getIsInTutorial() then -- 引导时不弹
 			showRewards = false
 		end
 
 		if showRewards then
-                if not EDITOR_MODE and not ModuleManager.AccountManager:getIsBinded() then -- 没绑定账户信息，提示去绑定
+			-- if not EDITOR_MODE and not DataManager.PlayerData:isBinded() then -- 没绑定账户信息，提示去绑定
-                    ModuleManager.AccountManager:showBindUI()
+			--     ModuleManager.AccountManager:showBindUI()
+			-- end
+			if result.rewards and table.nums(result.rewards) > 0 then
+				local unlockIds = {}
+				for k, v in ipairs(result.rewards) do
+					if v.type == GConst.REWARD_TYPE.ITEM then
+						local cfg = ConfigManager:getConfig("item")[v.item.id]
+						if cfg.type == GConst.ItemConst.ITEM_TYPE.FORCE then 
+							if DataManager.ForceData:getForceIsNew(v.item.id) then
+								table.insert(unlockIds, v.item.id)
+								DataManager.ForceData:setForceIsNew(v.item.id, true)
 							end
-                if msgData.rewards and table.nums(msgData.rewards) > 0 then
+						end
-                    GFunc.showRewardBox(msgData.rewards)
+					end
+				end
+				GFunc.showRewardBox(result.rewards, {unlockIds = unlockIds})
 			end
 		end
 
 		local biPayGetInfo = {}
-            table.foreach(msgData.gift, function(i, gift)
+		local changeRechargeMap = {}
-                local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.act_type]
+		local oneKeyRechargeId = 0
+		local oneKeyGiftId = 0
+
+		-- 打包购买
+		table.foreach(result.gift, function(i, gift)
+			local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.gift_type]
 			local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id]
 			local rechargeId = cfgInfo.recharge_id
-                local beforCount = DataManager.PlayerData:getPayCounts(rechargeId)
+			if cfgInfo.one_key then
-                DataManager.PlayerData:addPayment(rechargeId)
+				oneKeyRechargeId = rechargeId
-                DataManager.ShopData:addPayment(rechargeId) -- 降档版本
+				oneKeyGiftId = gift.id
-                DataManager.ShopData:updateGiftInfo(gift)
+			end
+		end)
+
+		table.foreach(result.gift, function(i, gift)
+			local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.gift_type]
+			local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id]
+			local rechargeId = cfgInfo.recharge_id
+
+			DataManager.PaymentData:updateGiftInfo(gift, result.rewards)
+			if oneKeyGiftId <= 0 or oneKeyGiftId == gift.id then
+				local beforCount = DataManager.PaymentData:getPayCount()[rechargeId] or 0
+				DataManager.PaymentData:addPayment(rechargeId)
 				table.insert(biPayGetInfo, {
-                    giftType = gift.act_type,
+					giftType = gift.gift_type,
 					giftId = gift.id,
 					rechargeId = cfgInfo.recharge_id
 				})
 				if beforCount <= 0 then
 					BIReport:postFirstRechargeEvent(rechargeId)
 				end
+				BIReport:postRechargeEvent(rechargeId)
+				changeRechargeMap[rechargeId] = (changeRechargeMap[rechargeId] or 0) + 1
+			end
 		end)
 
+		-- 支付分成比例,不同支付方式不一样
+		-- if payProportion == nil then
+		--     payProportion = 1
+		-- elseif type(payProportion) ~= "number" then
+		--     payProportion = 1
+		-- end
 		for _, info in ipairs(biPayGetInfo) do
-                local giftType = PayManager:getGiftType(info.giftType, info.giftId)
+			local giftType = self:getGiftType(info.giftType, info.giftId)
-                BIReport:postPayGet(giftType, info.giftId, info.rechargeId, orderId, originOrderId, 1, msgData.rewards or {})
+			BIReport:postPayGet(giftType, info.giftId, info.rechargeId, payDouble, orderId, originOrderId, 1, result.rewards or {}, isFromBattle, nil, info.giftType)
 			local rechargeCfg = ConfigManager:getConfig("recharge")[info.rechargeId]
 			if rechargeCfg then
-                    BIReport:postPurchase(rechargeCfg.price, rechargeCfg.payId, originOrderId, orderId)
+				if VersionCompatible:getIsPackageRU() and wayCode then
+					self:calcDukPayProportion(rechargeCfg, wayCode, function (price)
+						BIReport:postPurchase(nil, price, rechargeCfg.price, rechargeCfg[VersionCompatible:getRechargePayId()], originOrderId, orderId, rechargeCfg)
+					end)
+				elseif VersionCompatible:getIsPackageRUHW() and wayCode then
+					self:calcHWPayProportion(rechargeCfg.price, wayCode, function (price)
+						BIReport:postPurchase(nil, price, rechargeCfg.price, rechargeCfg[VersionCompatible:getRechargePayId()], originOrderId, orderId, rechargeCfg)
+					end)
+				else
+					if productId then
+						local currencyCode = SDKManager:getPriceCurrencyCode(productId)
+						local price = SDKManager:getProductPriceAmountMicros(productId) or rechargeCfg.price
+						if price <= 0 then
+							currencyCode = nil
+							price = rechargeCfg.price
+						end
+						BIReport:postPurchase(currencyCode, price, rechargeCfg.price, rechargeCfg[VersionCompatible:getRechargePayId()], originOrderId, orderId, rechargeCfg)
+					else
+						BIReport:postPurchase(nil, rechargeCfg.price, rechargeCfg.price, rechargeCfg[VersionCompatible:getRechargePayId()], originOrderId, orderId, rechargeCfg)
+					end
+				end
+			end
+		end
+
+		if oneKeyRechargeId > 0 then
+			changeRechargeMap = {}
+			changeRechargeMap[oneKeyRechargeId] = 1
+		end
+		if changeRechargeMap then
+			local score = 0
+			local changeCount = 0
+			local cfg = ConfigManager:getConfig("recharge")
+			for id, count in pairs(changeRechargeMap) do
+				local info = cfg[id]
+				if info then
+					if info.score then
+						score = score + info.score * count
+						changeCount = changeCount + count
+					end
+				end
+			end
+			if score > 0 then
+				ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.RECHARGE_NUM, score)
+				ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.RECHARGE_NUM_2, score)
 			end
 		end
 
 		-- 支付上报
 		local data = {}
-            data.pay_money = DataManager.PlayerData:getTotalPayAmount()
+		data.pay_money = DataManager.PaymentData:getPayTotal()
-            data.pay_count = DataManager.PlayerData:getPayCount()
+		data.pay_count = DataManager.PaymentData:getAllPayCount()
-            CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
+		BIReport:TAUserSet(data)
 
 		-- 支付验证成功后消耗此订单
 		if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
@@ -256,79 +477,375 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, produc
 			end
 		elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
 			if productId then
-                    SDKManager:consumePurchase(productId)
+				SDKManager:consumePurchase(productId, nil, "success consume")
 				SDKManager:delIosOrder(productId)
 			end
 			if originOrderId ~= "gm" then
 				SDKManager:delIosPayInfo(originOrderId)
 			end
-            end
+		else
-        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
-            end
-            Logger.logError("重复验证")
-        else
-            Logger.logError("支付验证失败:%s", msgData.status)
-            local params = {
-                content = I18N:getGlobalText(I18N.GlobalConst.PAY_FAILED_DESC_1),
-                boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
-                okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
-            }
-            GFunc.showMessageBox(params)
 		end
+
 		if callback then
-            callback()
+			callback(true)
 		end
 	end)
 end
 
-function PayManager:checkAndPay(productId, id, purchaseType, rechargeId)
+-- 三方礼包处理
+function PayManager:requestThirdGiftRewards(gifts)
+	local changeRechargeMap = {}
+	local gem = 0
+	table.foreach(gifts, function(i, gift)
+		local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.gift_type]
+		local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id]
+		local rechargeId = cfgInfo.recharge_id
+
+		if gift.gift_type == PayManager.PURCHARSE_TYPE.SHOP_GEM then
+			local isDouble = DataManager.PaymentData:getGemStoreDoubleCount(gift.id) > 0
+			gem = gem + cfgInfo.reward[1].num
+			if isDouble then
+				gem = gem + cfgInfo.reward[1].num
+			end
+		end
+
+		local beforCount = DataManager.PaymentData:getPayCount()[rechargeId] or 0
+		DataManager.PaymentData:addPayment(rechargeId)
+		DataManager.PaymentData:updateGiftInfo(gift)
+		changeRechargeMap[rechargeId] = (changeRechargeMap[rechargeId] or 0) + 1
+	end)
+
+	if gem > 0 then
+		DataManager.GiftRoutineData:addScore(gem)
+	end
+
+	-- if changeRechargeMap then
+	-- 	local score = 0
+	-- 	local changeCount = 0
+	-- 	local cfg = ConfigManager:getConfig("recharge")
+	-- 	for id, count in pairs(changeRechargeMap) do
+	-- 		local info = cfg[id]
+	-- 		if info then
+	-- 			if info.score then
+	-- 				score = score + info.score * count
+	-- 				changeCount = changeCount + count
+	-- 			end
+	-- 		end
+	-- 	end
+
+	-- 支付上报
+	local data = {}
+	data.pay_money = DataManager.PaymentData:getPayTotal()
+	data.pay_count = DataManager.PaymentData:getAllPayCount()
+	BIReport:TAUserSet(data)
+end
+
+-- 三方礼包处理
+function PayManager:requestThirdJollyMaxGiftRewards(gifts)
+	table.foreach(gifts, function(i, gift)
+		local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.gift_type]
+		local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id]
+		DataManager.PaymentData:updateJollyMaxGiftInfo(gift)
+	end)
+
+	-- 支付上报
+	local data = {}
+	data.pay_money = DataManager.PaymentData:getPayTotal()
+	data.pay_count = DataManager.PaymentData:getAllPayCount()
+	BIReport:TAUserSet(data)
+end
+
+function PayManager:checkAndPay(productId, id, purchaseType, rechargeId, payDouble, freeShowRewards, isFromBattle)
 	-- 检查是否可以支付
 	SDKManager:checkPay(productId, function(code)
 		if code == 0 then
-            self:sendMessage(ProtoMsgType.FromMsgEnum.ActPayReq, {id = id, act_type = purchaseType}, {}, function(binder, msgData)
+			self:reqGiftPay(productId, id, purchaseType, rechargeId, payDouble, freeShowRewards, isFromBattle)
-                if msgData.status == 0 then
-                    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)
-                            if purchaseToken and orderId then
-                                self:requestRewards(purchaseToken, orderId, originOrderId, productId)
-                            end
-                        end)
-                    else -- 没有支付信息，直接发奖
-                        if table.nums(msgData.rewards) > 0 then
-                            GFunc.showRewardBox(msgData.rewards)
-                        end
-                        local giftData = {}
-                        giftData.act_type = msgData.act_type
-                        giftData.id = msgData.id
-                        giftData.buy_count = DataManager.ShopData:getGiftBoughtNum(msgData.act_type, msgData.id) + 1
-                        giftData.latest_buy_at = Time:getServerTime() * 1000 -- 服务器都是毫秒
-                        DataManager.ShopData:updateGiftInfo(giftData)
-                    end
-                else
-                    Logger.logError("预支付失败")
-                end
-            end)
 		end
 	end)
 end
 
-function PayManager:sendMsgToServer(purchaseToken, uuid, originOrderId, productId, callback)
+function PayManager:reqGiftPay(productId, id, purchaseType, rechargeId, payDouble, freeShowRewards, isFromBattle, useDaiJinJuan)
-    local args = SDKManager:getPurchaseArgs(purchaseToken, uuid, originOrderId, productId)
+	self:sendMessage(ProtoMsgType.FromMsgEnum.GiftPayReq, {id = id, gift_type = purchaseType, voucher = useDaiJinJuan == true}, function(sender, result)
-    self:sendMessage(ProtoMsgType.FromMsgEnum.ActPaidResultReq, args, {}, callback)
+		if result.err_code ~= GConst.ERROR_STR.SUCCESS then
+			Logger.logError("预支付失败")
+			return
 		end
 
+		local giftType = PayManager:getGiftType(purchaseType, id)
+		if result.uuid and result.uuid ~= GConst.EMPTY_STRING then
+			BIReport:postPayCreateOrder(giftType, id, rechargeId, result.uuid, isFromBattle, purchaseType)
+			local giftType = PayManager:getGiftType(purchaseType, id)
+			BIReport:postPayTurn(giftType, id, rechargeId, payDouble, isFromBattle, purchaseType)
+			SDKManager:pay(productId, result.uuid, rechargeId, giftType, purchaseType, id, function(purchaseToken, orderId, originOrderId)
+				if purchaseToken and orderId then
+					local notShowRewardBox = freeShowRewards == false -- 原本传的是nil，默认必须展示奖励弹窗，现在改成能控制
+					self:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardBox, nil, nil, payDouble, isFromBattle)
+				end
+			end, freeShowRewards)
+		else -- 没有支付信息，直接发奖
+			if freeShowRewards or useDaiJinJuan then
+				if table.nums(result.rewards) > 0 then
+					GFunc.showRewardBox(result.rewards)
+				end
+			end
+
+			local giftData = {}
+			giftData.gift_type = result.gift_type
+			giftData.id = result.id
+			giftData.buy_count = DataManager.PaymentData:getGiftBoughtNum(result.gift_type, result.id) + 1
+			giftData.latest_buy_at = Time:getServerTime() -- * 1000 -- 服务器都是毫秒
+			DataManager.PaymentData:updateGiftInfo(giftData, result.rewards)
+
+			if useDaiJinJuan then -- 代金卷也要上报
+				local biPayGetInfo = {}
+				local changeRechargeMap = {}
+				local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[result.gift_type]
+				local cfgInfo = ConfigManager:getConfig(cfgName)[result.id]
+				local rechargeId = cfgInfo.recharge_id
+				-- local beforCount = DataManager.PaymentData:getPayCount()[rechargeId] or 0
+				-- DataManager.PaymentData:addPayment(rechargeId)
+				table.insert(biPayGetInfo, {
+					giftType = result.gift_type,
+					giftId = result.id,
+					rechargeId = cfgInfo.recharge_id
+				})
+				-- if beforCount <= 0 then
+				--     BIReport:postFirstRechargeEvent(rechargeId)
+				-- end
+				-- BIReport:postRechargeEvent(rechargeId)
+				changeRechargeMap[rechargeId] = (changeRechargeMap[rechargeId] or 0) + 1
+		
+				for _, info in ipairs(biPayGetInfo) do
+					local giftType = self:getGiftType(info.giftType, info.giftId)
+					BIReport:postPayGet(giftType, info.giftId, info.rechargeId, payDouble, "", "", 1, result.rewards or {}, isFromBattle, useDaiJinJuan, info.giftType)
+				--     local rechargeCfg = ConfigManager:getConfig("recharge")[info.rechargeId]
+				--     if rechargeCfg then
+				--         BIReport:postPurchase(nil, rechargeCfg.price, rechargeCfg[VersionCompatible:getRechargePayId()], nil, nil)
+				--     end
+				end
+				-- 暂时屏蔽上报
+				
+				if changeRechargeMap then
+					local score = 0
+					local changeCount = 0
+					local cfg = ConfigManager:getConfig("recharge")
+					for id, count in pairs(changeRechargeMap) do
+						local info = cfg[id]
+						if info then
+							if info.score then
+								score = score + info.score * count
+								changeCount = changeCount + count
+							end
+						end
+					end
+					
+					if score > 0 then
+						-- ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_RECHARGE_SCORE, {num = score})
+					end
+					if changeCount > 0 then
+						-- ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_TOTAL_RECHARGE, {num = changeCount})
+					end
+				end
+		
+				-- 支付上报
+				local data = {}
+				data.pay_money = DataManager.PaymentData:getPayTotal()
+				data.pay_count = DataManager.PaymentData:getAllPayCount()
+				BIReport:TAUserSet(data)
+			end
+		end
+	end)
+end
+
+function PayManager:retrySendPayRecord(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback, cmdId, payDouble, isFromBattle, isSpecialOrder, wayCode)
+	if self.retryPaySid then
+		SchedulerManager:unscheduleGlobal(self.retryPaySid)
+	end
+	self.retryPaySid = SchedulerManager:performWithDelayGlobal(function()
+		self.retryPaySid = nil
+		if not NetManager:getIsBusy() then
+			return self:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback, cmdId, payDouble, isFromBattle, isSpecialOrder, wayCode)
+		end
+		return self:retrySendPayRecord(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback, cmdId, payDouble, isFromBattle, isSpecialOrder, wayCode)
+	end, 5)
+end
+
+function PayManager:showPayselectUI(rechargeId, callback)
+	local num = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ACT_DAIJINJUAN)
+	if num <= 0 then
+		callback(false)
+		return
+	end
+
+	if DataManager.PaymentData:getDefaultPayWay() == DataManager.PaymentData.PAY_WAY.DIRECTE then
+		callback(false)
+		return
+	end
+
+	local rechargeCfg = ConfigManager:getConfig("recharge")[rechargeId]
+	if rechargeCfg and rechargeCfg.vouchers and rechargeCfg.vouchers.num <= 0 then
+		callback(false)
+		return
+	end
+
+	UIManager:showUI("app/ui/shop/pay_select_ui", {rechargeId = rechargeId, callback = callback})
+end
+
+--@region dukpay payProportion
+-- 更新公式为：应结算美元（去所有分成）= (商品售价RUB-该笔手续费)/结算汇率
+-- 目前的实际公式为:(商品售价RUB-该笔手续费)/87.42, 其中card，SBP，Tinkoff单笔支付手续费小于5RUB时，按照5RUB计算
+function PayManager:calcDukPayProportion(rechargeCfg, wayCode, callback)
+	local price = rechargeCfg.price_ru
+	local serviceCharge = 0
+	if wayCode == "BANK_CARD" then
+		serviceCharge = price * 0.04
+		if serviceCharge < 5 then
+			serviceCharge = 5
+		end
+	elseif wayCode == "SBP" then
+		serviceCharge = price * 0.025
+		if serviceCharge < 5 then
+			serviceCharge = 5
+		end
+	elseif wayCode == "SBER_PAY" then
+		serviceCharge = price * 0.055
+	elseif wayCode == "TINKOFF_PAY" then
+		serviceCharge = price * 0.045
+		if serviceCharge < 5 then
+			serviceCharge = 5
+		end
+	elseif wayCode == "YOOMONEY" then
+		serviceCharge = price * 0.055
+	end
+	local finalPrice = (price - serviceCharge)/87.42
+	callback(finalPrice)
+end
+--@endregion
+
+--@region hw payProportion
+function PayManager:calcHWPayProportion(price, wayCode, callback)
+	-- （（金额*0.96）- 5RUB*汇率（个别支付方式没有）)*0.935*0.8
+	local finalPrice = price
+	if not wayCode then
+		callback(finalPrice)
+		return
+	end
+	-- 花币
+	local way1 = {
+		["0"] = true,
+		["21"] = true,
+		["81"] = true,
+	}
+	-- Voucher
+	local way2 = {
+		["19"] = true,
+		["45"] = true,
+		["49"] = true,
+	}
+	-- 手机话费
+	local way3 = {
+		["6"] = true,
+		["23"] = true,
+		["70"] = true,
+	}
+	-- 银行卡/信用卡
+	local way4 = {
+		["3"] = true,
+		["4"] = true,
+		["13"] = true,
+		["16"] = true,
+		["17"] = true,
+		["20"] = true,
+		["24"] = true,
+		["31"] = true,
+		["32"] = true,
+		["33"] = true,
+		["34"] = true,
+		["35"] = true,
+		["36"] = true,
+		["37"] = true,
+		["38"] = true,
+		["39"] = true,
+		["40"] = true,
+		["41"] = true,
+		["42"] = true,
+		["43"] = true,
+		["44"] = true,
+		["46"] = true,
+		["47"] = true,
+		["48"] = true,
+		["61"] = true,
+		["62"] = true,
+		["63"] = true,
+		["64"] = true,
+		["65"] = true,
+		["66"] = true,
+		["67"] = true,
+		["68"] = true,
+		["69"] = true,
+		["71"] = true,
+		["72"] = true,
+		["73"] = true,
+		["74"] = true,
+		["75"] = true,
+		["76"] = true,
+		["77"] = true,
+		["78"] = true,
+		["79"] = true,
+		["80"] = true,
+		["82"] = true,
+		["83"] = true,
+		["84"] = true,
+		["85"] = true,
+		["86"] = true,
+		["88"] = true,
+		["89"] = true,
+		["90"] = true,
+		["93"] = true,
+		["94"] = true,
+		["95"] = true,
+		["97"] = true,
+		["98"] = true,
+		["99"] = true,
+		["100"] = true,
+		["102"] = true,
+		["103"] = true,
+		["105"] = true,
+		["106"] = true,
+		["108"] = true,
+		["109"] = true,
+		["110"] = true,
+		["113"] = true,
+	}
+	-- 此单结算金额=(99-99*4%-99*16.67%)*85%*【0.011*(1-1.5%)】-10*【0.011*(1-1.5%)】=0.61 USD（四舍五入小数点保留后两位）
+	local rate = 0.7
+	if Time:getServerTime() >= 1740787200 then
+		rate = 0.85
+	end
+	if way1[wayCode] then
+		finalPrice = (price * (1 - 0.07 - 0.1667) * rate - 10) * (0.011 * 0.985)
+	elseif way2[wayCode] then
+		finalPrice = (price * (1 - 0.025 - 0.1667) * rate - 10) * (0.011 * 0.985)
+	elseif way3[wayCode] then
+		finalPrice = (price * (1 - 0.1 - 0.1667) * rate - 10) * (0.011 * 0.985)
+	elseif way4[wayCode] then
+		finalPrice = (price * (1 - 0.04 - 0.1667) * rate - 10) * (0.011 * 0.985)
+	else
+		callback(finalPrice)
+		return
+	end
+	finalPrice = math.floor(finalPrice * 1000)
+	local a = finalPrice % 10
+	if a >= 5 then
+		finalPrice = ((finalPrice + 10) // 10) / 100
+	else
+		finalPrice = (finalPrice // 10) / 100
+	end
+	callback(finalPrice)
+end
+--@endregion
+
 return PayManager

lua/app/common/platform.lua

@@ -1,36 +1,26 @@
 local Platform = {}
 
-local bfGateInfo = CS.BF.BFPlatform.GetCurrentGateInfo()
-Platform.bfGateInfo = bfGateInfo
-
 ---- 获取包名
 function Platform:getIdentifier()
+	if not Platform:getIsPublishChannel() and VersionCompatible:supportSimulatedPackageName() then
+		return CS.BF.BFMain.DPPackageName
+	end
 	return CS.UnityEngine.Application.identifier
 end
 
----- 是否是内网包
+---- 是否是内网开发包
 function Platform:getIsDevChannel()
-    return CS.BF.BFPlatform.IsDevChannel()
+	return IS_DEV
 end
 
----- 是否是release包
+---- 是否是外网测试包
-function Platform:getIsReleaseChannel()
+function Platform:getIsTestChannel()
-    return CS.BF.BFPlatform.IsReleaseChannel()
+	return IS_TEST
 end
 
----- 是否是发布渠道
+---- 是否是正式发布包
 function Platform:getIsPublishChannel()
-	return CS.BF.BFPlatform.IsPublishChannel()
+	return IS_PUBLISH
-end
-
----- 获取主链接域名
-function Platform:getMainDomain()
-    return bfGateInfo.mainDomain
-end
-
----- 获取主链接端口
-function Platform:getMainPort()
-    return bfGateInfo.mainPort
 end
 
 -- 平台
@@ -97,4 +87,69 @@ function Platform:getPlatformStr()
 	return self.platformStr
 end
 
+-- 判断是否是T3地区
+function Platform:getPlatformIsT3()
+	local systemLanguage = CS.UnityEngine.Application.systemLanguage
+	local isAndroid = self:isAndroidPlatform()
+	local isT3 = false
+	-- 测试模式打开
+	if EDITOR_MODE then
+		return true
+	end
+
+	-- 需要Android 且 T3地区 才会开放,目前按照系统语言来处理
+	if isAndroid then
+		-- 除美国、日本、韩国、台湾、德国、法国、英国、加拿大、澳大利亚以外的的地区为T3。
+		isT3 = true
+		if systemLanguage == CS.UnityEngine.SystemLanguage.English then -- 英语(美国/英国/加拿大/澳大利亚)
+			isT3 = false
+		elseif systemLanguage == CS.UnityEngine.SystemLanguage.Japanese then -- 日语(日本)
+			isT3 = false
+		elseif systemLanguage == CS.UnityEngine.SystemLanguage.Korean then -- 韩语(韩国)
+			isT3 = false
+		elseif systemLanguage == CS.UnityEngine.SystemLanguage.ChineseTraditional then -- 繁体(台湾)
+			isT3 = false
+		elseif systemLanguage == CS.UnityEngine.SystemLanguage.German then -- 德语(德国)
+			isT3 = false
+		elseif systemLanguage == CS.UnityEngine.SystemLanguage.French then -- 法语(法国/加拿大)
+			isT3 = false
+		end
+	else
+		return false
+	end
+
+	return isT3
+end
+
+function Platform:getPlatformIsThirdPay()
+	local systemLanguage = CS.UnityEngine.Application.systemLanguage
+	local isAndroid = self:isAndroidPlatform()
+	local isThirdPay = false
+	-- unity模式 并且是越南语的 情况下 打开三方支付
+	if EDITOR_MODE and I18N:getCurLanguage() == GConst.LANGUAGE.VIETNAMESE then
+		return true
+	end
+
+	if isAndroid and not CS.BF.BFMain.IsShenhe then
+		-- if systemLanguage == CS.UnityEngine.SystemLanguage.Russian then
+		--     isThirdPay = true
+		-- end
+
+		-- if self:getIdentifier() == "" then
+		--     isThirdPay = true
+		-- end
+	end
+	return isThirdPay
+end
+
+function Platform:getAdvertisingID()
+	if not self.advertisingID then
+		self.advertisingID = "none"
+		-- self.advertisingID = CS.BF.AdvertisingIDManager.GetAdvertisingID()
+	end
+
+	return self.advertisingID
+end
+
+
 return Platform

lua/app/common/scheduler_manager.lua

@@ -157,6 +157,7 @@ if NOT_PUBLISH then
                 [SDKManager.tryLoadRewardedAdDelay] = true,
                 [ScrollRectBase.refillCells] = true,
                 [DataManager.scheduleGlobal] = true,
+                [DataManager.doCrossDay] = true,
                 [NetManager.performWithDelayGlobal] = true,
                 [NetManager.scheduleGlobal] = true,
             }

lua/app/common/sdk_manager.lua

@@ -11,7 +11,9 @@ SDKManager.BF_LOGIN_TYPE = {
 	FACEBOOK = 3,
 	TEST = 4,
 	GOOGLE = 5,
-	APPLE = 6
+	APPLE = 6,
+	VKID = 7,
+	FACEBOOK_LIMITED = 8,
 }
 
 SDKManager.BF_LOGIN_RESULT = {
@@ -34,13 +36,20 @@ SDKManager.LOGIN_TYPE = {
 	[4] = "test",
 	[5] = "google",
 	[6] = "apple",
+	[7] = "vk",
+	[8] = "facebook_limited"
 }
 
 -- 支付方式
 SDKManager.PAY_TYPE = {
 	NONE = 0,
 	GOOGLE = 1,
-	APPLE = 2,
+	IOS = 2,
+	Coda = 3,
+	RuStore = 4,
+	ENJOY = 5,
+	DUKPAY = 6,
+	HW = 7,
 	DEBUG = 10,
 	DEPRECATED_APPLE = 11,
 }
@@ -63,17 +72,40 @@ function SDKManager:init()
 	-- 标记状态
 	self.isLogining = false
 	self.isLogouting = false
+	self.isWatchingAD = false
+	self.isThirdPay = false
+	if Platform:getPlatformIsThirdPay() then
+		self.isThirdPay = true
+	end
+
+	self.iosPayInfos = LocalData:getIosPayInfo()
+	self.iosOrders = LocalData:getIosOrders()
 
 	-- lazy 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()
+
+	-- 尝试拿取AF的ConversionData
+	-- self:tryGetAFConversionData()
+
+	-- 初始化deeplink
+	if VersionCompatible:supportDeepLink() then
+		self:initDeepLink()
+	end
+	self:tryGetAFConversionData()
+end
+
+function SDKManager:refreshThirdPay()
+	self.isThirdPay = false
+	if Platform:getPlatformIsThirdPay() then
+		self.isThirdPay = true
+	end
 end
 
 -- 支付相关接口 ********************************************************************** 开始
@@ -125,8 +157,8 @@ function SDKManager:queryProducts(callback)
 end
 
 -- 处理未完成的订单
-function SDKManager:doUncompleteOrder(callback, productId)
+function SDKManager:doUncompleteOrder(callback, productId, freeShowRewards)
-	SDKPayMgr:doUncompleteOrder(callback, productId)
+	SDKPayMgr:doUncompleteOrder(callback, productId, freeShowRewards)
 end
 
 -- sdk接口 得到特定商品的price
@@ -158,9 +190,14 @@ function SDKManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, product
 	return SDKPayMgr:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
 end
 
+-- ios补单专用
+function SDKManager:getPurchaseArgs2(purchaseToken, uuid, channelOrderId, productId)
+	return SDKPayMgr:getPurchaseArgs2(purchaseToken, uuid, channelOrderId, productId)
+end
+
 -- sdk将已完成的订单消耗掉
-function SDKManager:consumePurchase(token, callback)
+function SDKManager:consumePurchase(token, callback, debugInfo)
-	SDKPayMgr:consumePurchase(token, callback)
+	SDKPayMgr:consumePurchase(token, callback, debugInfo)
 end
 
 -- 检查是否可以支付
@@ -174,8 +211,8 @@ function SDKManager:checkPay(productId, callback)
 end
 
 -- 支付
-function SDKManager:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+function SDKManager:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback, freeShowRewards)
-	SDKPayMgr:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
+	SDKPayMgr:pay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback, freeShowRewards)
 end
 
 function SDKManager:doUncompletePay(callback)
@@ -215,24 +252,39 @@ 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
 
 ---  广告
 function SDKManager:isAdLoaded()
+	if VersionCompatible:getIsPackageRUHW() then
 		if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
-		return CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr.AdLoaded
+			return CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr.AdLoaded
-	elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
+		elseif EDITOR_MODE then
+			return true
+		else
+			return false
+		end
+	else
+		if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android or
+			CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
 			return CS.AdManager.Instance:IsRewardedAdReady()
 		elseif EDITOR_MODE then
 			return true
 		end
-	return false
+	end
+	return true
 end
 
 function SDKManager:tryLoadRewardedAdDelay()
@@ -242,47 +294,52 @@ function SDKManager:tryLoadRewardedAdDelay()
 	end
 	self.adDelaySid = SchedulerManager:performWithDelayGlobal(function()
 		self.adDelaySid = nil
-		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:TryLoadRewardedAd()
+		if VersionCompatible:getIsPackageRUHW() then
+			CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr:TryLoadRewardedAd()
+		end
 	end, 5)
 end
 
+function SDKManager:tryLoadInterstitialAdDelay()
+	if self.interstitialAdDelaySid then
+		SchedulerManager:unscheduleGlobal(self.interstitialAdDelaySid)
+		self.interstitialAdDelaySid = nil
+	end
+	self.interstitialAdDelaySid = SchedulerManager:performWithDelayGlobal(function()
+		self.interstitialAdDelaySid = nil
+	end, 5)
+end
+
+
 function SDKManager:initAdsListener()
-	if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
+	if VersionCompatible:getIsPackageRUHW() then
-		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:SetAdShowCallback(function(code)
+		CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr:SetAdShowCallback(function (code)
 			-- code 为0 表示广告播放成功
 			if code == 0 then
-				BIReport:postAdPlaySuccess(self.adsClickType)
+				BIReport:postVideoAdOpt(BIReport.VIDEO_AD_OPT_TYPE.PLAY_SUCCESS, self.adsClickType)
 			else
 				self:tryLoadRewardedAdDelay()
 			end
 		end)
-		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:SetAdLoadedCallback(function(code)
+		CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr:SetAdLoadedCallback(function (code)
 			-- code 为0 表示广告加载成功
 			if code ~= 0 then
 				self:tryLoadRewardedAdDelay()
 			end
 		end)
-		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:SetAdEarnedRewardCallback(function(code, result)
+		CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr: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)
+				self.isWatchingAD = false -- 标记看广告
+				BIReport:postVideoAdOpt(BIReport.VIDEO_AD_OPT_TYPE.GET_REWARD, self.adsClickType)
 				self.adsClickType = nil
 				self.adCallback = nil
 			end
 		end)
-        CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:SetAdRevenuePaidEventCallback(function (result)
+	else
-            if result and result ~= GConst.EMPTY_STRING then
+		if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android or
-                BIReport:postIronSourceAdRevenue(result)
+			CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
-            end
-        end)
-	elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
 			-- 初始化一下
 			local adManager = CS.AdManager.Instance
 			adManager:SetAdRevenuePaidEventCallback(function (result)
@@ -292,36 +349,10 @@ function SDKManager:initAdsListener()
 			end)
 		end
 	end
-
-function SDKManager:showFullScreenAds(adsClickType, adCallback)
-	if EDITOR_MODE then
-		if not adsClickType then
-			local params = {
-				content = "SDKManager showFullScreenAds has no adsClickType",
-				boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
-				okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
-			}
-			GFunc.showMessageBox(params)
-			Logger.log("SDKManager showFullScreenAds has no adsClickType")
-		end
 end
 
-	BIReport:postAdClick(adsClickType)
+function SDKManager:showFullScreenAds(adsClickType, adCallback, ignoreShowMessageBox)
-	if EDITOR_MODE then
+	if NetManager:isNotReachable() 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()
-		end
-		return true
-	end
-	if NetManager:isNotReachable() then
-		-- 没有网
 		GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_NETWORK))
 		return false
 	end
@@ -329,61 +360,174 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback)
 		GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NETWORK_ERROE_1))
 		return false
 	end
-	-- if DataManager.MallActData:skipAd() then
+
-	-- 	self:adRewradAd(true)
+	BIReport:postVideoAdOpt(BIReport.VIDEO_AD_OPT_TYPE.CLICK, adsClickType)
-	-- 	if adCallback then
+
-	-- 		adCallback()
+	if DataManager.PaymentData:getIsSkipAd() then
+		self:adRewradAd()
+		if adCallback then
+			adCallback()
+		end
+		BIReport:postVideoAdOpt(BIReport.VIDEO_AD_OPT_TYPE.GET_REWARD_SKIP_AD, adsClickType)
+		return true
+	end
+
+	if not ignoreShowMessageBox and DataManager.PrivilegeCardData:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.CARD_AD) then
+		-- local params = {}
+		-- params.content = I18N:getGlobalText(I18N.GlobalConst.ADS_DESC_13)
+		-- params.boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL
+		-- params.showToday = GConst.MESSAGE_BOX_SHOW_TODAY.MONTHLY_CARD_AD
+		-- params.okText = I18N:getGlobalText(I18N.GlobalConst.SKIN_FORCE_DESC_8)
+		-- params.cancelText = I18N:getGlobalText(I18N.GlobalConst.AD_FREE_DESC_9)
+		-- params.notShowCallCancel = true
+		-- params.okFunc = function()
+		--     self:_showFullScreenAds(adsClickType, adCallback)
 		-- end
-	-- 	return true
+		-- GFunc.showMessageBox(params)
-	-- end
+
-	if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
+		local params = {}
-		if not CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr.AdLoaded then
+		params.content = I18N:getGlobalText(I18N.GlobalConst.ADS_DESC_13)
+		params.showToday = GConst.MESSAGE_BOX_SHOW_TODAY.MONTHLY_CARD_AD
+		params.okFunc = function()
+			if DataManager.PaymentData:getIsSkipAd() then
+				self:adRewradAd()
+				if adCallback then
+					adCallback()
+				end
+				BIReport:postVideoAdOpt(BIReport.VIDEO_AD_OPT_TYPE.GET_REWARD_SKIP_AD, adsClickType)
+				return
+			end
+			self:_showFullScreenAds(adsClickType, adCallback)
+		end
+		GFunc.showAdMesssageBox(params)
+	else
+		self:_showFullScreenAds(adsClickType, adCallback)
+	end
+	return true
+end
+
+function SDKManager:_showFullScreenAds(adsClickType, adCallback)
+	if EDITOR_MODE then
+		self:adRewradAd()
+		if adCallback then
+			adCallback()
+		end
+		return true
+	end
+	if VersionCompatible:getIsPackageRUHW() then
+		if not CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr.AdLoaded then
 			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_ADS))
 			return false
 		end
-		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:SetAdPlacement(adsClickType)
+		-- CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr:SetAdPlacement(adsClickType)
-		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr.AdLoaded = false
+		CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr.AdLoaded = false
 		self.adCallback = adCallback
 		self.adsClickType = adsClickType
-		CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr:ShowFullScreenAds()
+		CS.BF.BFMain.Instance.SDKMgr.BFHWAdSDKMgr:ShowFullScreenAds()
-		return true
+		self.isWatchingAD = true -- 标记看广告
-	elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
+	else
+		if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android or
+			CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
 			if not CS.AdManager.Instance:IsRewardedAdReady() then
 				GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_ADS))
 				return false
 			end
 			self.adsClickType = adsClickType
-		BIReport:postAdPlaySuccess(self.adsClickType)
+			BIReport:postVideoAdOpt(BIReport.VIDEO_AD_OPT_TYPE.PLAY_SUCCESS, self.adsClickType)
 			CS.AdManager.Instance:ShowRewardedAd(function (code)
 				if code == 0 then
-				if DataManager.PlayerData then
+					if not self.watchAdCount then
-					DataManager.PlayerData:addAdCount()
+						self.watchAdCount = 1
-					local data = {}
-					data.ads_num = DataManager.PlayerData:getAdCount()
-					CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
 					end
 					self:adRewradAd()
 					if adCallback then
 						adCallback()
 					end
-				BIReport:postAdRewardGet(self.adsClickType)
+					self.isWatchingAD = false -- 标记看广告
+					BIReport:postVideoAdOpt(BIReport.VIDEO_AD_OPT_TYPE.GET_REWARD, self.adsClickType)
 					self.adsClickType = nil
 				end
 			end)
+			self.isWatchingAD = true -- 标记看广告
 			return true
 		end
 	end
+	return true
+end
+
+function SDKManager:getIsWatchingAD()
+	return self.isWatchingAD
+end
+
+function SDKManager:clearWatchAdCount()
+	self.watchAdCount = nil
+end
 
 function SDKManager:adRewradAd(noReport)
+	-- 看广告
 	ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_WATCH_AD)
 	if not noReport then
+		DataManager.PlayerData:addAdCount()
 		BIReport:postAdEvent()
 	end
 end
 
+function SDKManager:showInterstitial(interstitialAdType, adCallback)
+	if EDITOR_MODE then
+		if not interstitialAdType then
+			local params = {
+				content = "SDKManager showInterstitial has no adsClickType",
+				boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
+				okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+			}
+			GFunc.showMessageBox(params)
+			Logger.log("SDKManager showInterstitial has no adsClickType")
+		end
+	end
+	BIReport:postInterstitialAdOpt(BIReport.INTERSTITIAL_AD_OPT_TYPE.SHOW, interstitialAdType)
+	if EDITOR_MODE then
+		if adCallback then
+			adCallback()
+		end
+		return
+	end
+
+	if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android or
+		CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
+		if not CS.AdManager.Instance:IsInterstitialReady() then
+			if adCallback then
+				adCallback()
+			end
+			return
+		end
+		BIReport:postInterstitialAdOpt(BIReport.INTERSTITIAL_AD_OPT_TYPE.SUCCESS, interstitialAdType)
+		self.isWatchingAD = true
+		CS.AdManager.Instance:ShowInterstitial(function(code)
+			self.isWatchingAD = false
+			if adCallback then
+				adCallback()
+				adCallback = nil
+			end
+		end)
+	elseif EDITOR_MODE then
+		if adCallback then
+			adCallback()
+			adCallback = nil
+		end
+	end
+end
+---  广告
+-- function SDKManager:getProjectId()
+-- 	return CS.BF.BFMain.ProjectId
+-- end
+
+-- function SDKManager:getEnv()
+-- 	return CS.BF.BFMain.ProjectEnv
+-- end
+
 function SDKManager:getServerList(callback)
 	local postData = {
-		project_id = "b6",
+		project_id = "c1",
 		bundle_id = Platform:getIdentifier(),
 		version = Platform:getClientVersion(),
 		device_id = DeviceHelper:getDeviceId(),
@@ -417,9 +561,9 @@ function SDKManager:login(callback, loginType)
 			Logger.log("三方当前正在登陆中")
 			return
 		end
+	
 		self.isLogining = true
 		self:_login(function(code, msg)
-			Logger.log("login finish:%s %s", code, msg)
 			if code == SDKManager.BF_LOGIN_RESULT.Success then
 				if not msg then
 					self.isLogining = false
@@ -435,6 +579,7 @@ function SDKManager:login(callback, loginType)
 					self.isLogining = false
 					return
 				end
+	
 				local userId = loginResult.UserId
 				local token = loginResult.Token
 				local params = {}
@@ -450,6 +595,18 @@ function SDKManager:login(callback, loginType)
 						id = tostring(userId),
 						token = tostring(token)
 					}
+				elseif loginType == SDKManager.BF_LOGIN_TYPE.FACEBOOK then
+					params = {
+						type = "facebook",
+						id = tostring(userId),
+						token = tostring(token)
+					}
+				elseif loginType == SDKManager.BF_LOGIN_TYPE.VKID then
+					params = {
+						type = "vkid",
+						id = tostring(userId),
+						token = tostring(token)
+					}
 				end
 				if callback then
 					callback(params)
@@ -460,8 +617,28 @@ function SDKManager:login(callback, loginType)
 	end, loginType)
 end
 
+function SDKManager:getLoginTypeFacebook()
+	-- if Platform:isIosPlatform() then
+	-- 	return NetManager.LOGIN_TYPE.FACEBOOK_LIMITED
+	-- else
+		return NetManager.LOGIN_TYPE.FACEBOOK
+	-- end
+end
+
+function SDKManager:getServerLoginType(loginType)
+	-- if Platform:isIosPlatform() then
+	-- 	if loginType == SDKManager.BF_LOGIN_TYPE.FACEBOOK then
+	-- 		return SDKManager.LOGIN_TYPE[SDKManager.BF_LOGIN_TYPE.FACEBOOK_LIMITED]
+	-- 	else
+	-- 		return SDKManager.LOGIN_TYPE[loginType]
+	-- 	end
+	-- else
+		return SDKManager.LOGIN_TYPE[loginType]
+	-- end
+end
+
 function SDKManager:_logout(callback, loginType)
-    if loginType == SDKManager.BF_LOGIN_TYPE.FACEBOOK or loginType == SDKManager.BF_LOGIN_TYPE.GOOGLE then
+	if loginType == SDKManager.BF_LOGIN_TYPE.FACEBOOK or loginType == SDKManager.BF_LOGIN_TYPE.GOOGLE or loginType == SDKManager.BF_LOGIN_TYPE.VKID then
 		CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr:SetLuaLogoutCallback(callback)
 		CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr:Logout(loginType)
 	else
@@ -476,9 +653,12 @@ function SDKManager:logout(callback, loginType)
 		Logger.log("当前正在登出中")
 		return
 	end
+
 	self.isLogouting = true
+
+
 	self:_logout(function(code, msg)
-        if code == SDKManager.BF_LOGIN_RESULT.Success then
+		if (code == SDKManager.BF_LOGIN_RESULT.Success) then
 			if callback then
 				callback()
 			end
@@ -486,7 +666,9 @@ function SDKManager:logout(callback, loginType)
 			if msg and msg ~= "" then
 				local jData = json.decode(msg)
 				if jData then
-                    Logger.logError("登出失败 result:%s  type:%s  msg:%s", code, jData.loginType, jData.msg)
+					local type = jData.loginType
+					local msg = jData.msg
+					Logger.logError("登出失败 result:%s  type:%s  msg:%s", code, type, msg)
 				else
 					Logger.logError("登出失败 result:%s", code)
 				end
@@ -501,4 +683,105 @@ function SDKManager:logout(callback, loginType)
 	end, loginType)
 end
 
+function SDKManager:tryGetAFConversionData()
+	-- if CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:IsGetConversionDataOver() then
+	-- 	BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.AF_CONVERSION_DATA, CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:GetAFConversionData())
+	-- end
+end
+
+function SDKManager:tryPostAFRequestResponse()
+	-- if CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:IsGetAFOnRequestResponse() then
+	-- 	local msg = string.format("code:%s, msg:%s", CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:GetAFOnRequestResponseStatusCode(), CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:GetAFOnRequestResponseErrorDescription())
+	-- 	BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.AF_ON_REQUEST_RESPONSE, msg)
+	-- end
+end
+
+function SDKManager:getAFConversionObj()
+	-- if self._afConversionObj == nil then
+	-- 	if CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:IsGetConversionDataOver() then
+	-- 		local data = CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:GetAFConversionData()
+	-- 		if data and data ~= "" then
+	-- 			self._afConversionObj = json.decode(data)
+	-- 		end
+	-- 	end
+	-- end
+	-- return self._afConversionObj
+end
+
+-- 是否显示GDPR条例
+function SDKManager:isPrivacyOptionsRequired()
+	return false
+	-- if EDITOR_MODE then
+	--     return false
+	-- end
+	-- if not VersionCompatible:getIsSupportGDPR() then
+	--     return false
+	-- end
+	-- if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
+	--     return CS.AdManager.Instance:IsPrivacyOptionsRequired()
+	-- elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
+	--     return CS.AdManager.Instance:IsPrivacyOptionsRequired()
+	-- else
+	--     return false
+	-- end
+end
+
+-- 展示GDPR隐私条款
+function SDKManager:showPrivacyOptionsForm()
+	-- if not VersionCompatible:getIsSupportGDPR() then
+	--     return
+	-- end
+	-- if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
+	--     CS.AdManager.Instance:ShowPrivacyOptionsForm()
+	-- elseif CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.IPhonePlayer then
+	--     CS.AdManager.Instance:ShowPrivacyOptionsForm()
+	-- end
+end
+
+function SDKManager:requestStoreReview()
+	if VersionCompatible:supportRuStoreReview() then
+		CS.BF.BFMain.Instance.SDKMgr.BFNativeSDKMgr:RuRequestStoreReview()
+	else
+		CS.BF.BFMain.Instance.SDKMgr.BFNativeSDKMgr:RequestStoreReview()
+	end
+end
+
+--@region dukpay
+function SDKManager:initDukpayOrders(orders)
+	if SDKPayMgr.initUncompleteOrders then
+		SDKPayMgr:initUncompleteOrders(orders)
+	end
+end
+
+function SDKManager:onServerPushDukpay(data)
+	if data and SDKPayMgr.handleCompleteOrder then
+		SDKPayMgr:handleCompleteOrder(data.order)
+	end
+end
+--@endregion
+
+-- 初始化deeplink
+function SDKManager:initDeepLink()
+	-- 注册监听
+	CS.BF.BFMain.Instance.SDKMgr.DeepLinkMgr:SetLuaDeepLinkActiveCallback(function(deeplinkUrl)
+		local deeplinkParams
+		if deeplinkUrl and deeplinkUrl ~= "" then
+			deeplinkParams = GFunc.getUrlParams(deeplinkUrl)
+		end
+
+		if deeplinkParams then
+			Logger.printTable(deeplinkParams)
+		end
+	end)
+end
+
+-- 获取deeplink url
+function SDKManager:getDeepLinkUrl()
+	if VersionCompatible:supportDeepLink() then
+		return CS.BF.BFMain.Instance.SDKMgr.DeepLinkMgr:GetDeepLinkURL()
+	else
+		return ""
+	end
+end
+
 return SDKManager

lua/app/common/sdk_pay_default_manager.lua

@@ -40,11 +40,15 @@ end
 function SDKPayDefaultManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
 	local args = {
 		channel = self:getSDKPayType(),
-		params = {uuid, productId}
+		params = {tostring(uuid), tostring(productId)}
 	}
 	return args
 end
 
+function SDKPayDefaultManager:getPurchaseArgs2(purchaseToken, uuid, channelOrderId, productId)
+	return self:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
+end
+
 -- 获取支付方式,目前只有google支付
 function SDKPayDefaultManager:getIsSupportSDKPay()
 	return false
@@ -72,7 +76,7 @@ function SDKPayDefaultManager:doUncompleteOrder(callback, productId)
 end
 
 -- sdk将已完成的订单消耗掉
-function SDKPayDefaultManager:consumePurchase(token, callback)
+function SDKPayDefaultManager:consumePurchase(token, callback, debugInfo)
 end
 
 return SDKPayDefaultManager

lua/app/common/sdk_pay_google_manager.lua

@@ -45,10 +45,11 @@ function SDKPayGoogleManager:queryProducts(callback)
 			local inAppList = {} -- 内购类
 			local subsList = {} -- 订阅list
 			for _, rechargeInfo in ipairs(rechargeCfg) do
+				local payId = rechargeInfo[VersionCompatible:getRechargePayId()]
 				if rechargeInfo.subscribe then
-					table.insert(subsList, rechargeInfo.payId)
+					table.insert(subsList, payId)
 				else
-					table.insert(inAppList, rechargeInfo.payId)
+					table.insert(inAppList, payId)
 				end
 			end
 			self.products = {}
@@ -221,7 +222,13 @@ function SDKPayGoogleManager:getProductPriceAmountMicros(skuId)
 	if self.products and #self.products > 0 then
 		for _, data in ipairs(self.products) do
 			if data.sku == skuId then
-				return data.priceAmountMicros
+				--[[string (int64 format)
+				订阅价格。对于价格不含税的国家/地区，该价格不含税。对于价格含税的国家/地区，该价格含税。价格以微单位表示，100 万个微单位代表一个单位的货币。例如，如果订阅价格为 1.99 欧元，则 priceAmountMicros 为 1990000。]]
+				local value = tonumber(data.priceAmountMicros or 0)
+				if value then
+					value = value / 1000000
+				end
+				return value or 0
 			end
 		end
 	end
@@ -270,14 +277,14 @@ function SDKPayGoogleManager:checkPay(productId, callback)
 					callback(0)
 				elseif code == 1 then -- 指定的productId存在支付状态中的订单
 					local params = {
-						content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+						content = I18N:getGlobalText(I18N.GlobalConst.SETTINGS_DESC_38),
 						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),
+						content = I18N:getGlobalText(I18N.GlobalConst.SETTINGS_DESC_38),
 						boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
 						okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
 					}
@@ -296,14 +303,14 @@ function SDKPayGoogleManager:checkPay(productId, callback)
 							callback(0)
 						elseif code == 1 then -- 指定的productId存在支付状态中的订单
 							local params = {
-								content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+								content = I18N:getGlobalText(I18N.GlobalConst.SETTINGS_DESC_38),
 								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),
+								content = I18N:getGlobalText(I18N.GlobalConst.SETTINGS_DESC_38),
 								boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
 								okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
 							}
@@ -355,12 +362,12 @@ function SDKPayGoogleManager:doGooglePay(productId, orderId, rechargeId, giftTyp
 			end
 		elseif code == 1 then
 			-- 支付取消
-			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_25))
+			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.SETTINGS_DESC_37))
-			BIReport:postPayCancel(productId, orderId, rechargeId, giftType, giftId)
+			BIReport:postPayCancel(productId, orderId, rechargeId, giftType, giftId, false, purchaseType)
 		else
 			-- 支付失败
 			Logger.log("pay failed")
-			BIReport:postPayFailed(productId, orderId, rechargeId, msg or GConst.EMPTY_STRING, giftType, giftId)
+			BIReport:postPayFailed(productId, orderId, rechargeId, msg or GConst.EMPTY_STRING, giftType, giftId, false, purchaseType)
 		end
 	end)
 end

lua/app/common/sdk_pay_ios_manager.lua

@@ -17,51 +17,61 @@ function SDKPayiOSManager:initPay(callback)
 			if callback then
 				callback()
 			end
-			BIReport:postPayInitSuccess()
+			BIReport:postPayInitStatus(BIReport.PAY_OPT_TYPE.INIT_SUC)
 		else
 			Logger.log(errorStr)
-			BIReport:postPayInitFailed(errorStr)
+			BIReport:postPayInitStatus(BIReport.PAY_OPT_TYPE.INIT_FAILED, errorStr)
 		end
 	end
 
 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr.buyCallback = function(isSuccess, result, errorStr)
+		local reportPayParams
+		if result and result.transactionID and self.iosPayInfos and self.iosPayInfos[result.transactionID] then
+			reportPayParams = self.iosPayInfos[result.transactionID]
+		end
+
+		BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "buyCallback(init) -- success:" .. tostring(isSuccess))
+
 		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
+					PayManager:requestRewards(result.receipt, nil, result.transactionID, result.definition.id, nil, nil, nil, nil, nil, true)
+					BIReport:postPayTryReissueOrder(result.definition.id, result.transactionID)
+				end
+				BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "buyCallback(init) -- payParams is not nil:" .. tostring(payParams ~= nil))
+			else
+				local purchaseType
+				if reportPayParams then
+					purchaseType = tonumber(reportPayParams.purchaseType)
+				end
 				-- 回调时机太早的话，就先保存起来，等后续补单的时候一起补
 				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
-			        -- 之前没有记录只能算掉单了
+					BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "not have order", nil, nil, nil, purchaseType)
-			        self:delIosPayInfo(result.transactionID)
+					self:saveIosPayInfo(result.transactionID, result.receipt, nil, result.definition.id)
-			        self:delIosOrder(result.definition.id)
-			        self:consumePurchase(result.definition.id)
-			        BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "not have order")
 				end
+				BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "buyCallback(init) -- order is not nil:" .. tostring(order ~= nil))
+			end
+			if result then
+				BIReport:postPayResendOrder(result.definition and result.definition.id, result.transactionID)
+			else
+				BIReport:postPayResendOrder()
 			end
 		else
+			local purchaseType
+			if reportPayParams then
+				purchaseType = tonumber(reportPayParams.purchaseType)
+			end
 			if errorStr and errorStr ~= "" then
-			    BIReport:postPayFailed(result.definition.id, result.transactionID, nil, errorStr)
+				BIReport:postPayFailed(result.definition.id, result.transactionID, nil, errorStr, nil, nil, nil, purchaseType)
 			else
-			    BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "1")
+				BIReport:postPayFailed(result.definition.id, result.transactionID, nil, "1", nil, nil, nil, purchaseType)
 			end
 		end
 	end
@@ -69,7 +79,8 @@ function SDKPayiOSManager:initPay(callback)
 	local rechargeCfg = ConfigManager:getConfig("recharge")
 	local products = {}
 	for i,v in ipairs(rechargeCfg) do
-		table.insert(products, {productId = v.payId, type = CS.UnityEngine.Purchasing.ProductType.Consumable})
+		local payId = v[VersionCompatible:getRechargePayId()]
+		table.insert(products, {productId = payId, type = CS.UnityEngine.Purchasing.ProductType.Consumable})
 	end
 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:Init(products)
 end
@@ -81,10 +92,13 @@ function SDKPayiOSManager:queryProducePrice()
 	local rechargeCfg = ConfigManager:getConfig("recharge")
 	self.products = {}
 	for _, v in ipairs(rechargeCfg) do
-		local price = CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:GetLocalizedPrice(v.payId)
+		local payId = v[VersionCompatible:getRechargePayId()]
+		local price = CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:GetLocalizedPrice(payId)
+		local currencyCode = CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:GetLocalizedIsoCurrencyCode(payId)
+		local priceAmountMicros = CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:GetLocalizedPriceAmount(payId)
 		if price and price ~= "" then
-			Logger.log("product = %s, price = %s", v.payId, price)
+			Logger.log("product = %s, price = %s", payId, price)
-			table.insert(self.products, {sku = v.payId, price = price})
+			table.insert(self.products, {sku = payId, price = price, priceCurrencyCode = currencyCode, priceAmountMicros = priceAmountMicros})
 		end
 	end
 	return self.products
@@ -103,6 +117,7 @@ function SDKPayiOSManager:doUncompleteOrder(callback, productId)
 	local orders = self.iosPayInfos
 	if orders == nil then
 		self.handleUncompleteOrder = false
+		BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "doUncompleteOrder orders == nil")
 		return callback and callback()
 	end
 	local uncompleteList = {}
@@ -111,6 +126,7 @@ function SDKPayiOSManager:doUncompleteOrder(callback, productId)
 	end
 	if #uncompleteList <= 0 then
 		self.handleUncompleteOrder = false
+		BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "doUncompleteOrder #uncompleteList <= 0")
 		return callback and callback()
 	end
 	local index = 1
@@ -125,15 +141,24 @@ function SDKPayiOSManager:doUncompleteOrder(callback, productId)
 				index = index + 1
 				handleOrder(uncompleteList[index])
 			end)
+			BIReport:postPayDoUncompleteOrder(uncompleteOrder.productId, uncompleteOrder.transactionID, uncompleteOrder.order)
+		elseif uncompleteOrder.transactionID then
+			PayManager:requestRewards(uncompleteOrder.receipt, nil, uncompleteOrder.transactionID, uncompleteOrder.productId, true, function()
+				index = index + 1
+				handleOrder(uncompleteList[index])
+			end, nil, nil, nil, true)
+			BIReport:postPayTryReissueOrder(uncompleteOrder.productId, uncompleteOrder.transactionID)
 		else
 			SDKManager:delIosPayInfo(uncompleteOrder.transactionID)
 			SDKManager:delIosOrder(uncompleteOrder.productId)
 			self:consumePurchase(uncompleteOrder.productId, function()
 				index = index + 1
 				handleOrder(uncompleteList[index])
-			end)
+			end, "handle order")
+			BIReport:postPayDoUncompleteOrder(uncompleteOrder.productId, uncompleteOrder.transactionID)
 		end
 	end
+	BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "doUncompleteOrder handleOrder:" .. tostring(#uncompleteList))
 	handleOrder(uncompleteList[index])
 end
 
@@ -204,6 +229,15 @@ function SDKPayiOSManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, p
 	return args
 end
 
+-- 异常订单时,使用该参数通知服务器校验
+function SDKPayiOSManager:getPurchaseArgs2(purchaseToken, uuid, channelOrderId, productId)
+	local args = {
+		channel = SDKManager.PAY_TYPE.IOS,
+		params = {channelOrderId}
+	}
+	return args
+end
+
 -- 获取支付方式,目前只有google支付
 function SDKPayiOSManager:getIsSupportSDKPay()
 	return true
@@ -227,7 +261,7 @@ function SDKPayiOSManager:checkPay(productId, callback)
 			elseif code == 1 then
 				-- 指定的productId存在支付状态中的订单
 				local params = {
-					content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+					content = I18N:getGlobalText(I18N.GlobalConst.SETTINGS_DESC_38),
 					boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
 					okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
 				}
@@ -235,7 +269,7 @@ function SDKPayiOSManager:checkPay(productId, callback)
 			elseif code == 2 then
 				-- 指定的productId存在未完成的订单消耗失败的情况
 				local params = {
-					content = I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_23),
+					content = I18N:getGlobalText(I18N.GlobalConst.SETTINGS_DESC_38),
 					boxType = GConst.MESSAGE_BOX_TYPE.MB_OK,
 					okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
 				}
@@ -254,17 +288,19 @@ function SDKPayiOSManager:pay(productId, orderId, rechargeId, giftType, purchase
 end
 
 -- sdk将已完成的订单消耗掉
-function SDKPayiOSManager:consumePurchase(productId, callback)
+function SDKPayiOSManager:consumePurchase(productId, callback, debugInfo)
 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:ConsumePurchase(productId)
 	if callback then
 		callback(0)
 	end
+	BIReport:postPayConsumeOrder(productId, debugInfo)
 end
 
 function SDKPayiOSManager:doIosPay(productId, orderId, rechargeId, giftType, purchaseType, giftId, callback)
 	self.blockTouch = true
 	UIManager:showWaitPay()
 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr.buyCallback = function(isSuccess, result, errorStr)
+		BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "buyCallback(pay) -- success:" .. tostring(isSuccess) .. "  blockTouch:" .. tostring(self.blockTouch))
 		if self.blockTouch then
 			self.blockTouch = false
 			UIManager:hideWaitPay()
@@ -279,9 +315,9 @@ function SDKPayiOSManager:doIosPay(productId, orderId, rechargeId, giftType, pur
 				end
 			else
 				if errorStr and errorStr ~= "" then
-					BIReport:postPayFailed(productId, orderId, rechargeId, errorStr, giftType, giftId)
+					BIReport:postPayFailed(productId, orderId, rechargeId, errorStr, giftType, giftId, nil, purchaseType)
 				else
-					BIReport:postPayFailed(productId, orderId, rechargeId, "1", giftType, giftId)
+					BIReport:postPayFailed(productId, orderId, rechargeId, "1", giftType, giftId, nil, purchaseType)
 				end
 			end
 			self:delIosOrder(productId)
@@ -296,20 +332,26 @@ function SDKPayiOSManager:doIosPay(productId, orderId, rechargeId, giftType, pur
 				local order = self.iosOrders[result.definition.id]
 				if order then
 					PayManager:requestRewards(result.receipt, order.order, result.transactionID, result.definition.id)
+				elseif result.transactionID then -- 服务器检验
+					PayManager:requestRewards(result.receipt, nil, result.transactionID, result.definition.id, nil, nil, nil, nil, nil, true)
+					BIReport:postPayTryReissueOrder(result.definition.id, result.transactionID)
 				else
 					self:delIosPayInfo(result.transactionID)
 					self:delIosOrder(result.definition.id)
-					self:consumePurchase(result.definition.id)
+					self:consumePurchase(result.definition.id, nil, "pay consume")
+					if payParams then
 						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)
+						BIReport:postPayFailed(result.definition.id, result.transactionID, rechargeId, "error order", giftType, giftId, nil, purchaseType)
+					end
 				end
 			end
 		end
 	end
 	self:saveIosOrder(productId, orderId, purchaseType, giftId)
+	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:SetApplicationUsername(orderId)
 	CS.BF.BFMain.Instance.SDKMgr.IosPaySDKMgr:Buy(productId, orderId)
 end
 
@@ -328,6 +370,8 @@ function SDKPayiOSManager:doUncompletePay(callback)
 	if self:_getIsIosInitialized() then
 		self.alreadyFinishUncompletePay = true
 		self:doUncompleteOrder()
+
+		BIReport:postDebugInfo(BIReport.DEBUG_INFO_TYPE.PAY, "doUncompletePay")
 	end
 end
 

lua/app/common/server_push_manager.lua

@@ -16,14 +16,13 @@ function ServerPushManager:initWhenLogin()
     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.MallDailyResetNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onMallDailyReset)
+    -- 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.BossRushBoughtNtf, ModuleManager.ActBossRushManager, ModuleManager.ActBossRushManager.rspBossRushBoughtNtf)
-    self:addServerPushListener(ProtoMsgType.FromMsgEnum.RuneUpdateNtf, ModuleManager.RunesManager, ModuleManager.RunesManager.rspUpdate)
+    -- self:addServerPushListener(ProtoMsgType.FromMsgEnum.RuneUpdateNtf, ModuleManager.RunesManager, ModuleManager.RunesManager.rspUpdate)
 end
 
 ---- 移除全局推送监听

lua/app/common/spine_manager.lua

@@ -34,6 +34,17 @@ function SpineManager:loadUISpineWidgetAsync(name, parent, callback)
 	end)
 end
 
+function SpineManager:loadUIHeroSpineWidgetAsync(name, parent, callback)
+	local path = string.format(HERO_SPINE_ASSET_PATH, name, name)
+	ResourceManager:loadOriginAssetAsync(path, TYPE_OF_SPINE_ASSET, function(spineAssetPath, spineAsset)
+		if parent and parent:isDestroyed() then
+			ResourceManager:unload(spineAssetPath)
+			return
+		end
+		self:loadUISpinePrefabAsync(parent, spineAssetPath, spineAsset, callback)
+	end)
+end
+
 function SpineManager:loadUISpinePrefabAsync(parent, spineAssetPath, spineAsset, callback)
 	ResourceManager:loadAsync(UI_SPINE_PREFAB_PATH, TYPE_OF_GAME_OBJECT, function(prefabPath, prefab)
 		if parent and parent:isDestroyed() then

lua/app/common/time.lua

@@ -8,13 +8,24 @@ local SECONDS_PRE_DAY = 86400
 local SECONDS_PRE_HOUR = 3600
 local SECONDS_PRE_MINUTE = 60
 local DAY_PER_HOUR = 24
+local DAY_PRE_WEEK = 7
 
 local ZERO_TIME_STR = "00:00:00"
 local ZERO_TIME_STR_2 = "00:00"
 
 local UnityTime = CS.UnityEngine.Time
 
--- 获取服务器的当前时间戳
+-- 获取时间格式(时间戳转本地时间格式)
+function Time:getTimeFormat(timestamp)
+    return os.date('*t', timestamp)
+end
+
+-- 获取时间格式(时间戳转世界时间格式)
+function Time:getTimeFormatUTC(timestamp)
+    return os.date('!*t', timestamp)
+end
+
+-- 获取服务器的当前时间戳（当前服务器是UTC-0）
 function Time:getServerTime()
     if not self.serverTime then
         return os.time()
@@ -22,6 +33,19 @@ function Time:getServerTime()
     return self.serverTime + self.differenceTime + GFunc.getTickCount()
 end
 
+-- 获取服务器的转本地时区的当前时间戳
+function Time:getServerTimeLocal()
+    return self:getServerTime() + self:getTimeZoneOffset() * SECONDS_PRE_HOUR
+end
+
+-- 获取服务器的当前时间戳(毫秒级)
+function Time:getServerTime2()
+    if not self.serverTime2 then
+        return os.time() * 1000
+    end
+    return self.serverTime2 + self.differenceTime2 + GFunc.getTickCount2()
+end
+
 function Time:getRealtimeSinceStartup()
     return UnityTime.realtimeSinceStartup
 end
@@ -60,39 +84,27 @@ function Time:getCertainTimeByStr(timeStr)
     local hour = timeTab[4]
     local minute = timeTab[5]
     local second = timeTab[6]
-    local time = os.time({day = day, month = month, year = year, hour = hour, min = minute, sec = second}) + Time:getClientTimeZone()*3600
+    local timeStr = { day = day, month = month, year = year, hour = hour, min = minute, sec = second }
+    local time = Time:getCertainTime(timeStr) + Time:getTimeZoneOffset() * SECONDS_PRE_HOUR
     return math.floor(time)
 end
 
 -- 格式化时间，返回os.data(finalTime)
 function Time:formatTimeExact(time)
     local endTime = self:getServerTime() + time
-    return os.date("*t", endTime)
+    return self:getTimeFormat(endTime)
 end
 
--- 格式化y/m/d时间，返回os.data(finalTime)
-function Time:formatTimeYMD(time)
-    time = time or Time:getServerTime()
-    local date = os.date("!*t", time)
-    return date.year .. "/" .. date.month .. "/" .. date.day
-end
-
--- 格式化y/m/d/h/m/s时间，返回os.data(finalTime)
-function Time:formatTimeYMDHMS(time)
-    time = time or Time:getServerTime()
-    local date = os.date("!*t", time)
-    return date.year .. "/" .. date.month .. "/" .. date.day .. " " .. date.hour .. ":" .. date.min .. ":" .. date.sec
-end
-
-
 function Time:updateServerTimeToday(todayTime)
     todayTime = todayTime or 0
-    self.todayTime = GFunc.formatTimeStep(todayTime)
+    self.todayTime = todayTime // 1000
 end
 
 function Time:updateServerTime(serverTime)
     self.serverTime = (serverTime or 0) // 1000
+    self.serverTime2 = serverTime or 0 -- 毫秒级
     self.differenceTime = -GFunc.getTickCount()
+    self.differenceTime2 = -GFunc.getTickCount2()
     if EDITOR_MODE then
         Logger.log("updateServerTime:%s", self.differenceTime)
     end
@@ -104,7 +116,8 @@ function Time:updateByServer(serverTime, todayTime)
 end
 
 function Time:setServerTimeZone(timeZone)
-    self.timeZoneOffset = timeZone - self:getClientTimeZone()
+    self.timeZoneOffset = math.floor(timeZone - self:getClientTimeZone())
+    self.serverTimeZone = timeZone
 end
 
 function Time:getClientTimeZone()
@@ -120,50 +133,12 @@ function Time:getTimeZoneOffset()
 end
 
 function Time:getBeginningOfServerToday()
-    if Time:getServerTime() > self.todayTime + 86400 then
+    if self:getServerTime() > self.todayTime + 86400 then
         self.todayTime = self.todayTime + 86400
     end
     return self.todayTime
 end
 
-function Time:getOverOfServerToday(time)
-    if time then
-        local passS = time % SECONDS_PRE_DAY
-        if passS > 0 then
-            return time + SECONDS_PRE_DAY - passS
-        end
-        return time + SECONDS_PRE_DAY
-    end
-    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}
-    return beginDay - self:getTimeZoneOffset()*SECONDS_PRE_HOUR
-end
-
-function Time:getBeginningOfOneDay(t)
-    local now = os.date('*t', t + self:getTimeZoneOffset()*SECONDS_PRE_HOUR)
-    local beginDay = os.time{year = now.year, month = now.month, day = now.day, hour = 0}
-    return beginDay - self:getTimeZoneOffset()*SECONDS_PRE_HOUR
-end
-
--- 判断时间是否是大于等于今天
-function Time:getTimeIsToday(time)
-    local todayBegin = self:getBeginningOfToday()
-    return time >= todayBegin
-end
-
 function Time:splitTime(time)
     time = math.floor(time)
     local reduceD = time % SECONDS_PRE_DAY
@@ -177,8 +152,8 @@ end
 
 -- 根据秒换算成向上取整hour的时间
 function Time:getCeilHourTime(time)
-    local count = time // 3600
+    local count = time // SECONDS_PRE_HOUR
-    if time % 3600 > 0 then
+    if time % SECONDS_PRE_HOUR > 0 then
         count = count + 1
     end
     return count
@@ -193,19 +168,7 @@ function Time:getCeilPerSecend(time, per)
     return count
 end
 
-function Time:getDayofWeek(time)
+-- 格式化文案 ----------------------------------------------------------------------------------------------------------------------------------------
-    local curTime = time or self:getServerTime()
-    local day = tonumber(os.date("%w", curTime))
-    day = day == 0 and 7 or day
-    return day
-end
-
-function Time:getDayofWeekUTC(time)
-    local curTime = time or self:getServerTime()
-    local day = tonumber(os.date("!%w", curTime))
-    day = day == 0 and 7 or day
-    return day
-end
 
 -- 00:00:00
 function Time:formatNumTime(time)
@@ -265,61 +228,165 @@ function Time:formatBeforeTimeStr(time)
     end
 end
 
----- 得到time周开始时的时间戳
+-- 格式化y/m/d时间，返回os.data(finalTime)
+function Time:formatTimeYMD(time)
+    time = time or self:getServerTime()
+    local date = self:getTimeFormat(time)
+    return date.year .. "/" .. date.month .. "/" .. date.day
+end
+
+-- 格式化y/m/d/h/m/s时间，返回os.data(finalTime)
+function Time:formatTimeYMDHMS(time)
+    time = time or Time:getServerTime()
+    local date = self:getTimeFormat(time)
+    return date.year .. "/" .. date.month .. "/" .. date.day .. " " .. date.hour .. ":" .. date.min .. ":" .. date.sec
+end
+
+-- 格式化y-m-d h:m:s时间，返回os.data(finalTime)
+function Time:formatTimeYMDHMS2(time)
+    time = time or Time:getServerTime()
+    local date = self:getTimeFormat(time)
+    return date.year .. "-" .. date.month .. "-" .. date.day .. " " .. date.hour .. ":" .. date.min .. ":" .. date.sec
+end
+
+-- 日相关时间接口 ------------------------------------------------------------------------------------------------------------------------
+
+-- time日开始时的时间戳
+function Time:getDayBeginTimeStamp(time)
+    time = time or self:getServerTime()
+    local now = self:getTimeFormatUTC(time)
+    local beginDay = os.time { year = now.year, month = now.month, day = now.day, hour = 0 }
+    return math.floor(beginDay - self:getTimeZoneOffset() * SECONDS_PRE_HOUR)
+end
+
+-- time日结束时的时间戳
+function Time:getDayOverTimeStamp(time)
+    time = time or self:getServerTime()
+    local dateTable = self:getTimeFormatUTC(time)
+    local nextDay = os.time { year = dateTable.year, month = dateTable.month, day = dateTable.day + 1, hour = 0, min = 0, sec = 0 }
+    return math.floor(nextDay - self:getTimeZoneOffset() * SECONDS_PRE_HOUR)
+end
+
+-- 获取今日剩余时间
+function Time:getTodaySurplusTime()
+    local result = self:getDayOverTimeStamp() - self:getServerTime()
+    if result < 0 then
+        result = 0
+    end
+    return result
+end
+
+-- 判断时间是否是大于等于今天
+function Time:getTimeIsToday(time)
+    local todayBegin = self:getDayBeginTimeStamp()
+    return time >= todayBegin
+end
+
+-- 获取今天距目标日期的天数
+function Time:getDistanceDays(time)
+    local nowNum = self:getDayBeginTimeStamp(self:getServerTime())
+    local targetNum = self:getDayBeginTimeStamp(time)
+    return (nowNum - targetNum) / 24 / 60 / 60
+end
+
+-- 周相关时间接口 ------------------------------------------------------------------------------------------------------------------------
+
+-- time周开始时的时间戳
 function Time:getWeekBeginTimeStamp(time)
     time = time or self:getServerTime()
     local remainDay = -self:getDayofWeek(time)
-    return self:getOverOfServerToday(time) + remainDay * SECONDS_PRE_DAY
+    return math.floor(self:getDayOverTimeStamp(time) + remainDay * SECONDS_PRE_DAY)
 end
 
----- 得到time周结束时的时间戳
+-- time周结束时的时间戳
 function Time:getWeekOverTimeStamp(time)
     time = time or self:getServerTime()
     local remainDay = 7 - self:getDayofWeek(time)
-    return self:getOverOfServerToday(time) + remainDay * SECONDS_PRE_DAY
+    return math.floor(self:getDayOverTimeStamp(time) + remainDay * SECONDS_PRE_DAY)
 end
 
----- 得到time月结束的时间戳
+-- 获取本周剩余时间
+function Time:getWeekSurplusTime()
+    local result = self:getWeekOverTimeStamp() - self:getServerTime()
+    if result < 0 then
+        result = 0
+    end
+    return result
+end
+
+-- time时间在周第几天
+function Time:getDayofWeek(time)
+    local curTime = time or self:getServerTime()
+    local day = tonumber(os.date("!%w", curTime))
+    day = day == 0 and 7 or day
+    return day
+end
+
+-- 月相关时间接口 ------------------------------------------------------------------------------------------------------------------------
+
+-- time月开始的时间戳
+function Time:getMonthBeginTimeStamp(time)
+    time = time or self:getServerTime()
+    local day = self:getDayofMonth(time) - 1
+    return math.floor(self:getDayBeginTimeStamp(time) - day * SECONDS_PRE_DAY)
+end
+
+-- time月结束的时间戳
 function Time:getMonthOverTimeStamp(time)
     time = time or self:getServerTime()
-    local now = os.date('!*t', time)
+    local now = self:getTimeFormatUTC(time)
     now.month = now.month + 1
     if now.month > 12 then
         now.year = now.year + now.month // 12
         now.month = now.month % 12
     end
     local remainDay = os.date("%d", os.time({ year = now.year, month = now.month, day = 0 })) - now.day
-    return self:getOverOfServerToday(time) + remainDay * SECONDS_PRE_DAY
+    return math.floor(self:getDayOverTimeStamp(time) + remainDay * SECONDS_PRE_DAY)
 end
 
----- 得到当前处于本月的第几天
+-- time时间在月第几天
-function Time:getDayByTimeStamp(time)
+function Time:getDayofMonth(time)
     time = time or self:getServerTime()
-    local now = os.date('!*t', time)
+    local now = self:getTimeFormatUTC(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}
+function Time:getXDaySecond(day)
-    return weekTab[now.wday]
+    return day * SECONDS_PRE_DAY
 end
 
--- 获取今天距目标日期的天数
+function Time:getAWeekSecond()
-function Time:getDistanceDays(time)
+    return self:getXDaySecond(DAY_PRE_WEEK)
-    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
+--以秒为单位  计算时间差  返回 是否达到时间，剩余时间00:00:00
-function Time:convertServerTimeStringToTimestamp(str)
+function Time:checkTimeByMinutes(lastTriggerTime, minutes)
-    local dateTime = CS.System.DateTime.Parse(str)
+    -- 计算从上次触发到现在经过的秒数
-	local dateTimeOffset = CS.System.DateTimeOffset(dateTime)
+    local currentTime = Time:getServerTime()
-	return dateTimeOffset:ToUnixTimeSeconds()
+    local elapsedSeconds = currentTime - lastTriggerTime
+    Logger.logHighlight(elapsedSeconds)
+    local freeSeconds = minutes * 60
+    -- 计算是否达到时间
+    if elapsedSeconds >= freeSeconds then
+        Logger.logHighlight(freeSeconds)
+        return true, nil
+    else
+        -- 计算剩余的秒数
+        local remainingSeconds = freeSeconds - elapsedSeconds
+        Logger.logHighlight(remainingSeconds)
+        -- 计算小时数
+        local hours = math.floor(remainingSeconds / 3600)
+        -- 计算剩余的分钟数
+        local minutes = math.floor((remainingSeconds % 3600) / 60)
+        -- 计算剩余的秒数
+        local seconds = remainingSeconds % 60
+
+        -- 格式化时间为 00:00:00 的形式
+        local formattedTime = string.format("%02d:%02d:%02d", hours, minutes, seconds)
+        return false, formattedTime
+    end
 end
 
 return Time

lua/app/common/version_compatible.lua

@@ -1,5 +1,274 @@
 local VersionCompatible = {}
 
 local CLIENT_VERSION = CS.BF.BFMain.CLIENT_VERSION or 0
+local PACKAGE_NAME = "com.gearpaw.defenders.td.game"
+local PACKAGE_NAME_RU = "com.gearpaw.defenders.td.game.ru"
+local PACKAGE_NAME_RUSTORE = "com.fortune.td.game.rustore"
+local PACKAGE_NAME_RUHW = "com.fortune.td.game.ru.hw"
+
+--@region 版本相关
+function VersionCompatible:canUpdateMailVersion()
+	return CLIENT_VERSION > 1
+end
+
+function VersionCompatible:supportDataEncryptVersion()
+	return CLIENT_VERSION > 1
+end
+
+function VersionCompatible:supportMonsterMoveReturnVersion()
+	return CLIENT_VERSION > 2
+end
+
+function VersionCompatible:supportDeepLink()
+	return CLIENT_VERSION > 3
+end
+--@endregion
+
+--@region 包相关
+function VersionCompatible:getIsGlobalPackage()
+	return Platform:getIdentifier() == PACKAGE_NAME
+end
+
+function VersionCompatible:getIsRUPackage()
+	return self:getIsPackageRU() or self:getIsPackageRUStore() or self:getIsPackageRUHW()
+end
+
+function VersionCompatible:getIsPackageRU()
+	return Platform:getIdentifier() == PACKAGE_NAME_RU
+end
+
+function VersionCompatible:getIsPackageRUStore()
+	return Platform:getIdentifier() == PACKAGE_NAME_RUSTORE
+end
+
+function VersionCompatible:getIsPackageRUHW()
+	return Platform:getIdentifier() == PACKAGE_NAME_RUHW
+end
+--@endregion
+
+--@region 跳转相关
+function VersionCompatible:getDiscordUrl()
+	return GConst.GameSettingConst.DISCORD_URL
+end
+
+function VersionCompatible:getDiscordUrlVN()
+	return GConst.GameSettingConst.DISCORD_URL_VN
+end
+
+function VersionCompatible:getFacebookUrl()
+	local currLanguage = I18N:getCurLanguage()
+	if currLanguage == GConst.LANGUAGE.CHINESE_TC or
+		currLanguage == GConst.LANGUAGE.CHINESE then
+		return GConst.GameSettingConst.FACEBOOK_URL_TW
+	else
+		return GConst.GameSettingConst.FACEBOOK_URL
+	end
+end
+
+function VersionCompatible:getVKUrl()
+	return GConst.GameSettingConst.VK_URL
+end
+--@endregion
+
+--@region 支付相关
+function VersionCompatible:getRechargePayId()
+	if self:getIsRUPackage() then
+		return "payId_ru"
+	end
+	return "payId_tw"
+end
+
+-- 获取支付渠道
+function VersionCompatible:getPayPlatform()
+	if Platform:isAndroidPlatform() then
+		if self:getIsPackageRU() then
+			return "dukpay"
+		elseif self:getIsPackageRUStore() then
+			return "rustore"
+		elseif self:getIsPackageRUHW() then
+			return "hw"
+		end
+	end
+	return nil
+end
+--@endregion
+
+--@region fb支持
+function VersionCompatible:supportFb()
+	if self:getIsRUPackage() then
+		return false
+	end
+	return true
+end
+--@endregion
+
+--@region AppsFlyerAdRevenue
+function VersionCompatible:getIsSupportAFAdRevenue()
+	if self:getIsPackageRU()
+		or self:getIsPackageRUStore()
+		-- or Platform:getIdentifier() == PACKAGE_NAME_US
+		-- or Platform:getIdentifier() == PACKAGE_NAME_VN
+													then
+		return false
+	end
+	return true
+end
+--@endregion
+
+--@region Firebase支持
+function VersionCompatible:getIsSupportFirebase()
+	if self:getIsRUPackage() then
+		return false
+	end
+	return true
+end
+--@endregion
+
+--@region VK支持
+function VersionCompatible:getIsSupportVKBind()
+	if self:getIsRUPackage() then
+		return true
+	end
+	return false
+end
+
+function VersionCompatible:supportVK()
+	if self:getIsRUPackage() then
+		return true
+	end
+	return false
+end
+--@endregion
+
+--@region Google支持
+function VersionCompatible:getIsSupportGoogle()
+	if self:getIsRUPackage() then
+		return false
+	end
+	return true
+end
+--@endregion
+
+function VersionCompatible:supportDiscord()
+	if self:getIsRUPackage() then
+		return false
+	end
+	return true
+end
+
+--@region 渠道分成
+-- 不同渠道的支付上报分成比例
+function VersionCompatible:getAFPayProportion()
+	-- rustore的分成比例
+	if self:getIsPackageRUStore() and Platform:isAndroidPlatform() then
+		return 0.62976
+	end
+	return 1
+end
+--@endregion
+
+--@region 俄罗斯相关
+function VersionCompatible:getIsSupportGDPR()
+	if self:getIsRUPackage() then
+		return false
+	end
+	return true
+end
+
+--@region dakpay
+function VersionCompatible:supportRuDukpay()
+	if self:getIsPackageRU() and Platform:isAndroidPlatform() then
+		return true
+	end
+	return false
+end
+--@endregion
+
+--@region rustore
+function VersionCompatible:supportRuStorePay()
+	if self:getIsPackageRUStore() then
+		return true
+	end
+	return false
+end
+
+-- android 俄罗斯商店好评
+function VersionCompatible:supportRuStoreReview()
+	if self:getIsPackageRUStore() and Platform:isAndroidPlatform() then
+		return true
+	end
+	return false
+end
+--@endregion
+
+--@region hw支付
+function VersionCompatible:supportRuHW()
+	if self:getIsPackageRUHW() and Platform:isAndroidPlatform() then
+		return true
+	end
+	return false
+end
+--@endregion
+--@endregion
+
+--@region 渠道相关
+-- 是否有俄语
+function VersionCompatible:getIsSupportRussian()
+	if EDITOR_MODE then
+		return true
+	end
+	return self:getIsRUPackage()
+end
+
+function VersionCompatible:getIsVnChannel()
+	return I18N:getCurLanguage() == GConst.LANGUAGE.VIETNAMESE
+end
+--@endregion
+
+function VersionCompatible:getServiceUrl()
+    return GConst.GameSettingConst.SERVICE_URL
+end
+
+function VersionCompatible:getPrivacyUrl()
+    return GConst.GameSettingConst.PRIVACY_URL
+end
+
+--@region 深度链接相关
+
+-- 支持日志
+function VersionCompatible:supportLogInReleaseEnv()
+	if self:supportDeepLink() then
+		return CS.BF.BFMain.DPSupportLog
+	end
+
+	return false
+end
+
+-- 支持GM
+function VersionCompatible:supportGMInReleaseEnv()
+	if self:supportDeepLink() then
+		return CS.BF.BFMain.DPSupportGM
+	end
+
+	return false
+end
+
+-- 支持修改包名
+function VersionCompatible:supportSimulatedPackageName()
+	if self._supportSimulatedPackageName == nil then
+		if CS.BF.BFMain.DPPackageName == GConst.EMPTY_STRING then
+			self._supportSimulatedPackageName = false
+		else
+			if CS.BF.BFMain.DPPackageName == PACKAGE_NAME or
+				CS.BF.BFMain.DPPackageName == PACKAGE_NAME_RU then
+				self._supportSimulatedPackageName = true
+			else
+				self._supportSimulatedPackageName = false
+			end
+		end
+	end
+	return self._supportSimulatedPackageName
+end
+--#endregion
 
 return VersionCompatible

lua/app/common/white_res_manager.lua

@@ -5,16 +5,14 @@ local WhiteResManager = {}
 local GAME_RES_WHITE_LIST = {
     -- ui
     GConst.ATLAS_PATH.COMMON,
-    GConst.ATLAS_PATH.ACT_COMMON,
+    GConst.ATLAS_PATH.UI_ACT_COMMON,
     -- icon
     GConst.ATLAS_PATH.ICON_SKILL,
-    GConst.ATLAS_PATH.ICON_SKILL_BIG,
     GConst.ATLAS_PATH.ICON_SKILL_ROGUE,
     GConst.ATLAS_PATH.ICON_ITEM,
     GConst.ATLAS_PATH.ICON_HERO,
     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,
 }

lua/app/config/act_bounty.lua

@@ -0,0 +1,176 @@
+local act_bounty = {
+	[101]={
+		["activity"]=10001,
+		["type"]=1,
+		["parameter"]=1,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		},
+		["reward_pro"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			}
+		},
+		["reward_pro_pay"]=1064000001
+	},
+	[102]={
+		["activity"]=10001,
+		["type"]=1,
+		["parameter"]=2,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		},
+		["reward_pro"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			}
+		},
+		["reward_pro_pay"]=1064000001
+	},
+	[103]={
+		["activity"]=10001,
+		["type"]=1,
+		["parameter"]=3,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		},
+		["reward_pro"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			}
+		},
+		["reward_pro_pay"]=1064000001
+	},
+	[104]={
+		["activity"]=10001,
+		["type"]=1,
+		["parameter"]=4,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		},
+		["reward_pro"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			}
+		},
+		["reward_pro_pay"]=1064000001
+	},
+	[105]={
+		["activity"]=10001,
+		["type"]=1,
+		["parameter"]=5,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		},
+		["reward_pro"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			}
+		},
+		["reward_pro_pay"]=1064000001
+	}
+}
+local config = {
+data=act_bounty,count=5
+}
+return config

lua/app/config/act_bounty.lua.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d97c1d93669059f4990f3ff1b17f7b58
+guid: e6c27959d37fd427e8315a450d564be1
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

lua/app/config/act_exchange.lua

@@ -0,0 +1,322 @@
+local act_exchange = {
+	[10101]={
+		["sort"]=1,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["refresh_type"]=2,
+		["limit"]=1
+	},
+	[10102]={
+		["sort"]=5,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=3,
+		["limit"]=1,
+		["func_open"]="daily_challenge"
+	},
+	[10103]={
+		["sort"]=6,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=3,
+		["limit"]=1,
+		["func_open"]="daily_challenge"
+	},
+	[10104]={
+		["sort"]=7,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=3,
+		["limit"]=1
+	},
+	[10105]={
+		["sort"]=8,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=3,
+		["limit"]=1
+	},
+	[10106]={
+		["sort"]=9,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=8,
+		["func_open"]="daily_challenge"
+	},
+	[10107]={
+		["sort"]=11,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=8
+	},
+	[10108]={
+		["sort"]=14,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=50
+	},
+	[10109]={
+		["sort"]=15,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=50,
+		["func_open"]="arena_open"
+	},
+	[10110]={
+		["sort"]=2,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=3,
+		["limit"]=1,
+		["force_id"]=15001
+	},
+	[10111]={
+		["sort"]=3,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=3,
+		["limit"]=1,
+		["force_id"]=25001
+	},
+	[10112]={
+		["sort"]=10,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=8
+	},
+	[10113]={
+		["sort"]=4,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=3,
+		["limit"]=1,
+		["func_open"]="daily_challenge"
+	},
+	[10114]={
+		["sort"]=12,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=20,
+		["func_open"]="talent_open"
+	},
+	[10115]={
+		["sort"]=13,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=50,
+		["func_open"]="talent_open"
+	}
+}
+local config = {
+data=act_exchange,count=15
+}
+return config

lua/app/config/act_exchange.lua.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 72435753c4dcd0e419a2685ad64955d6
+guid: 879287732b71c4ea295fc202f0416b8b
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

lua/app/config/act_level_gift.lua.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3f6a2e3ef3d3e3045b4c3cc0fda335bc
+guid: ce80dee30975f4877bfe3c876f16cbe5
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

lua/app/config/act_month_signin.lua

@@ -0,0 +1,338 @@
+local act_month_signin = {
+	[1]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[2]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=50,
+ 			["num_for_nothing"]="Uwg="
+		}
+	},
+	[3]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=16,
+ 			["id_for_nothing"]="Vw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[4]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=67,
+ 			["id_for_nothing"]="UA8=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[5]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=68,
+ 			["id_for_nothing"]="UAA=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[6]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
+		}
+	},
+	[7]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["count_reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		}
+	},
+	[8]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=16,
+ 			["id_for_nothing"]="Vw4=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[9]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=67,
+ 			["id_for_nothing"]="UA8=",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
+		}
+	},
+	[10]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=68,
+ 			["id_for_nothing"]="UAA=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[11]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[12]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=150,
+ 			["num_for_nothing"]="Vw1c"
+		}
+	},
+	[13]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=17,
+ 			["id_for_nothing"]="Vw8=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[14]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=67,
+ 			["id_for_nothing"]="UA8=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["count_reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=18,
+ 			["id_for_nothing"]="VwA=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[15]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=68,
+ 			["id_for_nothing"]="UAA=",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
+		}
+	},
+	[16]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=4,
+ 			["num_for_nothing"]="Ug=="
+		}
+	},
+	[17]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		}
+	},
+	[18]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=17,
+ 			["id_for_nothing"]="Vw8=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[19]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=67,
+ 			["id_for_nothing"]="UA8=",
+			["num"]=4,
+ 			["num_for_nothing"]="Ug=="
+		}
+	},
+	[20]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=68,
+ 			["id_for_nothing"]="UAA=",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
+		}
+	},
+	[21]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["count_reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=68,
+ 			["id_for_nothing"]="UAA=",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		}
+	},
+	[22]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=250,
+ 			["num_for_nothing"]="VA1c"
+		}
+	},
+	[23]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=49,
+ 			["id_for_nothing"]="UgE=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[24]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=67,
+ 			["id_for_nothing"]="UA8=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		}
+	},
+	[25]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=68,
+ 			["id_for_nothing"]="UAA=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[26]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=6,
+ 			["num_for_nothing"]="UA=="
+		}
+	},
+	[27]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=300,
+ 			["num_for_nothing"]="VQhc"
+		}
+	},
+	[28]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=49,
+ 			["id_for_nothing"]="UgE=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[29]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=67,
+ 			["id_for_nothing"]="UA8=",
+			["num"]=6,
+ 			["num_for_nothing"]="UA=="
+		}
+	},
+	[30]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=68,
+ 			["id_for_nothing"]="UAA=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["count_reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=19,
+ 			["id_for_nothing"]="VwE=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	}
+}
+local config = {
+data=act_month_signin,count=30
+}
+return config

lua/app/config/act_month_signin.lua.meta

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

lua/app/config/act_sevenday_quest_reward.lua

@@ -1,79 +1,100 @@
 local act_sevenday_quest_reward = {
 	[1]={
-		["num"]=10,
+		["period"]=1,
+		["num"]=100,
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-			["num"]=100,
+				["num"]=500,
- 			["num_for_nothing"]="Vwhc"
+ 				["num_for_nothing"]="Uwhc"
+			}
 		}
 	},
 	[2]={
-		["num"]=20,
+		["period"]=1,
+		["num"]=200,
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=1,
+				["id"]=5,
- 			["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-			["num"]=2000,
+				["num"]=10,
- 			["num_for_nothing"]="VAhcAw=="
+ 				["num_for_nothing"]="Vwg="
+			}
 		}
 	},
 	[3]={
-		["num"]=30,
+		["period"]=1,
+		["num"]=300,
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=2,
+				["id"]=18,
- 			["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="VwA=",
-			["num"]=150,
+				["num"]=500,
- 			["num_for_nothing"]="Vw1c"
+ 				["num_for_nothing"]="Uwhc"
+			}
 		}
 	},
 	[4]={
-		["num"]=40,
+		["period"]=1,
+		["num"]=400,
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=13,
+				["id"]=43,
- 			["id_for_nothing"]="Vws=",
+ 				["id_for_nothing"]="Ugs=",
-			["num"]=3,
+				["num"]=1,
- 			["num_for_nothing"]="VQ=="
+ 				["num_for_nothing"]="Vw=="
+			}
 		}
 	},
 	[5]={
-		["num"]=50,
+		["period"]=1,
+		["num"]=500,
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-			["num"]=200,
+				["num"]=1000,
- 			["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VwhcAw=="
+			}
 		}
 	},
 	[6]={
-		["num"]=60,
+		["period"]=1,
+		["num"]=600,
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=14,
+				["id"]=5,
- 			["id_for_nothing"]="Vww=",
+ 				["id_for_nothing"]="Uw==",
-			["num"]=1,
+				["num"]=20,
- 			["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="VAg="
+			}
 		}
 	},
 	[7]={
-		["num"]=70,
+		["period"]=1,
+		["num"]=700,
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=34001,
+				["id"]=44,
- 			["id_for_nothing"]="VQxcA2Q=",
+ 				["id_for_nothing"]="Ugw=",
-			["num"]=3,
+				["num"]=1,
- 			["num_for_nothing"]="VQ=="
+ 				["num_for_nothing"]="Vw=="
+			}
 		}
 	}
 }

lua/app/config/act_task.lua

@@ -0,0 +1,318 @@
+local act_task = {
+	[101]={
+		["activity"]=10001,
+		["display"]=1,
+		["type"]=47,
+		["number_1"]=20,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[102]={
+		["activity"]=10001,
+		["display"]=1,
+		["type"]=47,
+		["number_1"]=50,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[103]={
+		["activity"]=10001,
+		["display"]=1,
+		["type"]=47,
+		["number_1"]=90,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[104]={
+		["activity"]=10001,
+		["display"]=1,
+		["type"]=47,
+		["number_1"]=140,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[105]={
+		["activity"]=10001,
+		["display"]=1,
+		["type"]=47,
+		["number_1"]=200,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[201]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=24,
+		["number_1"]=9,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[202]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=24,
+		["number_1"]=19,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[203]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=24,
+		["number_1"]=37,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[204]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=24,
+		["number_1"]=57,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			}
+		}
+	},
+	[205]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=25,
+		["number_1"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[206]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=25,
+		["number_1"]=20,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[207]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=25,
+		["number_1"]=30,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[208]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=25,
+		["number_1"]=40,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=50,
+ 				["id_for_nothing"]="Uwg=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[209]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=48,
+		["number_1"]=1,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[210]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=48,
+		["number_1"]=2,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			}
+		}
+	},
+	[211]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=48,
+		["number_1"]=3,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		}
+	},
+	[212]={
+		["activity"]=10001,
+		["display"]=2,
+		["type"]=48,
+		["number_1"]=4,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
+	}
+}
+local config = {
+data=act_task,count=17
+}
+return config

lua/app/config/act_task.lua.meta

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

lua/app/config/act_week_signin.lua

@@ -0,0 +1,146 @@
+local act_week_signin = {
+	[101]={
+		["season"]=2,
+		["day"]=1,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=600,
+ 			["num_for_nothing"]="UAhc"
+		}
+	},
+	[102]={
+		["season"]=2,
+		["day"]=2,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=60,
+ 			["num_for_nothing"]="UAg="
+		}
+	},
+	[103]={
+		["season"]=2,
+		["day"]=3,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=8,
+ 			["num_for_nothing"]="Xg=="
+		}
+	},
+	[104]={
+		["season"]=2,
+		["day"]=4,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=18,
+ 			["id_for_nothing"]="VwA=",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=18,
+ 			["id_for_nothing"]="VwA=",
+			["num"]=300,
+ 			["num_for_nothing"]="VQhc"
+		}
+	},
+	[105]={
+		["season"]=2,
+		["day"]=5,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=600,
+ 			["num_for_nothing"]="UAhc"
+		}
+	},
+	[106]={
+		["season"]=2,
+		["day"]=6,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=5000,
+ 			["num_for_nothing"]="UwhcAw=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=20000,
+ 			["num_for_nothing"]="VAhcA2U="
+		}
+	},
+	[107]={
+		["season"]=2,
+		["day"]=7,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=8,
+ 			["num_for_nothing"]="Xg=="
+		}
+	}
+}
+local config = {
+data=act_week_signin,count=7
+}
+return config

lua/app/config/act_week_signin.lua.meta

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

lua/app/config/activity.lua

@@ -1,371 +1,69 @@
 local activity = {
-	[106]={
+	[10001]={
-		["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",
+		["time_type"]=1,
-		["end_time"]="2023-09-21 00:00:00"
+		["start_time_1"]=1,
-	},
+		["end_time_1"]=8,
-	[306]={
+		["func_open"]="summon_open",
-		["act_type"]=3,
+		["version"]=1,
-		["start_time"]="2023-09-25 00:00:00",
+		["round_limit"]=5,
-		["end_time"]="2023-10-3 00:00:00"
+		["round_reward"]={
-	},
+			{
-	[406]={
+				["type"]=1,
-		["act_type"]=4,
+ 				["type_for_nothing"]="Vw==",
-		["start_time"]="2023-09-28 00:00:00",
+				["id"]=44,
-		["end_time"]="2023-10-08 00:00:00"
+ 				["id_for_nothing"]="Ugw=",
-	},
+				["num"]=1,
-	[506]={
+ 				["num_for_nothing"]="Vw=="
-		["act_type"]=2,
+			},
-		["start_time"]="2023-10-2 00:00:00",
+			{
-		["end_time"]="2023-10-10 00:00:00"
+				["type"]=1,
-	},
+ 				["type_for_nothing"]="Vw==",
-	[606]={
+				["id"]=16,
-		["act_type"]=3,
+ 				["id_for_nothing"]="Vw4=",
-		["start_time"]="2023-10-9 00:00:00",
+				["num"]=50,
-		["end_time"]="2023-10-17 00:00:00"
+ 				["num_for_nothing"]="Uwg="
-	},
+			}
-	[706]={
+		},
-		["act_type"]=5,
+		["act_gift"]={
-		["start_time"]="2023-10-16 00:00:00",
+			1060000001,
-		["end_time"]="2023-10-25 00:00:00"
+			1062000001,
-	},
+			1063000001,
-	[806]={
+			1063000101,
-		["act_type"]=2,
+			1063000201,
-		["start_time"]="2023-10-24 00:00:00",
+			1063000301,
-		["end_time"]="2023-11-01 00:00:00"
+			1063000401
-	},
+		},
-	[906]={
+		["show_reward"]={
-		["act_type"]=6,
+			{
-		["start_time"]="2023-10-31 00:00:00",
+				["type"]=1,
-		["end_time"]="2023-11-09 00:00:00"
+ 				["type_for_nothing"]="Vw==",
-	},
+				["id"]=2,
-	[1006]={
+ 				["id_for_nothing"]="VA==",
-		["act_type"]=3,
+				["num"]=1,
-		["start_time"]="2023-11-8 00:00:00",
+ 				["num_for_nothing"]="Vw=="
-		["end_time"]="2023-11-16 00:00:00"
+			},
-	},
+			{
-	[1106]={
+				["type"]=1,
-		["act_type"]=5,
+ 				["type_for_nothing"]="Vw==",
-		["start_time"]="2023-11-15 00:00:00",
+				["id"]=5,
-		["end_time"]="2023-11-24 00:00:00"
+ 				["id_for_nothing"]="Uw==",
-	},
+				["num"]=1,
-	[1206]={
+ 				["num_for_nothing"]="Vw=="
-		["act_type"]=2,
+			},
-		["start_time"]="2023-11-23 00:00:00",
+			{
-		["end_time"]="2023-12-01 00:00:00"
+				["type"]=1,
-	},
+ 				["type_for_nothing"]="Vw==",
-	[1306]={
+				["id"]=50,
-		["act_type"]=6,
+ 				["id_for_nothing"]="Uwg=",
-		["start_time"]="2023-11-30 00:00:00",
+				["num"]=1,
-		["end_time"]="2023-12-09 00:00:00"
+ 				["num_for_nothing"]="Vw=="
-	},
+			}
-	[1406]={
+		},
-		["act_type"]=3,
+		["act_name"]="ACT_GOGOGO_DESC_21"
-		["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
+data=activity,count=1
 }
 return config

lua/app/config/activity_boss_rush_rank.lua

@@ -2973,359 +2973,9 @@ local activity_boss_rush_rank = {
  				["num_for_nothing"]="VAg="
 			}
 		}
-	},
-	[1701]={
-		["activity"]=6806,
-		["ranking"]={
-			1,
-			1
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=100,
- 				["num_for_nothing"]="Vwhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		}
-	},
-	[1702]={
-		["activity"]=6806,
-		["ranking"]={
-			2,
-			2
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=80,
- 				["num_for_nothing"]="Xgg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[1703]={
-		["activity"]=6806,
-		["ranking"]={
-			3,
-			3
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=70,
- 				["num_for_nothing"]="UQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[1704]={
-		["activity"]=6806,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[1705]={
-		["activity"]=6806,
-		["ranking"]={
-			11,
-			50
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=40,
- 				["num_for_nothing"]="Ugg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			}
-		}
-	},
-	[1706]={
-		["activity"]=6806,
-		["ranking"]={
-			51,
-			500
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[1707]={
-		["activity"]=6806,
-		["ranking"]={
-			501,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	[1801]={
-		["activity"]=7206,
-		["ranking"]={
-			1,
-			1
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=100,
- 				["num_for_nothing"]="Vwhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		}
-	},
-	[1802]={
-		["activity"]=7206,
-		["ranking"]={
-			2,
-			2
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=80,
- 				["num_for_nothing"]="Xgg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[1803]={
-		["activity"]=7206,
-		["ranking"]={
-			3,
-			3
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=70,
- 				["num_for_nothing"]="UQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[1804]={
-		["activity"]=7206,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[1805]={
-		["activity"]=7206,
-		["ranking"]={
-			11,
-			50
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=40,
- 				["num_for_nothing"]="Ugg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			}
-		}
-	},
-	[1806]={
-		["activity"]=7206,
-		["ranking"]={
-			51,
-			500
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[1807]={
-		["activity"]=7206,
-		["ranking"]={
-			501,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
 	}
 }
 local config = {
-data=activity_boss_rush_rank,count=133
+data=activity_boss_rush_rank,count=119
 }
 return config

lua/app/config/activity_exchange.lua

@@ -3058,369 +3058,9 @@ local activity_exchange = {
  			["num_for_nothing"]="Uw=="
 		},
 		["limit"]=999
-	},
-	[1801]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44004,
- 			["id_for_nothing"]="UgxcA2E=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=300,
- 			["num_for_nothing"]="VQhc"
-		},
-		["limit"]=10
-	},
-	[1802]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=34003,
- 			["id_for_nothing"]="VQxcA2Y=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		},
-		["limit"]=10
-	},
-	[1803]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=24001,
- 			["id_for_nothing"]="VAxcA2Q=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		},
-		["limit"]=10
-	},
-	[1804]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=14001,
- 			["id_for_nothing"]="VwxcA2Q=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		},
-		["limit"]=10
-	},
-	[1805]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=15,
- 			["id_for_nothing"]="Vw0=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=240,
- 			["num_for_nothing"]="VAxc"
-		},
-		["limit"]=3
-	},
-	[1806]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=14,
- 			["id_for_nothing"]="Vww=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=100,
- 			["num_for_nothing"]="Vwhc"
-		},
-		["limit"]=3
-	},
-	[1807]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		},
-		["limit"]=10
-	},
-	[1808]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=800,
- 			["num_for_nothing"]="Xghc"
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		},
-		["limit"]=999
-	},
-	[1809]={
-		["activity"]=6806,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=13,
- 			["id_for_nothing"]="Vws=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		},
-		["limit"]=999
-	},
-	[1901]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=24004,
- 			["id_for_nothing"]="VAxcA2E=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=300,
- 			["num_for_nothing"]="VQhc"
-		},
-		["limit"]=10
-	},
-	[1902]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=34001,
- 			["id_for_nothing"]="VQxcA2Q=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		},
-		["limit"]=10
-	},
-	[1903]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=44002,
- 			["id_for_nothing"]="UgxcA2c=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		},
-		["limit"]=10
-	},
-	[1904]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=54002,
- 			["id_for_nothing"]="UwxcA2c=",
-			["num"]=3,
- 			["num_for_nothing"]="VQ=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		},
-		["limit"]=10
-	},
-	[1905]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=15,
- 			["id_for_nothing"]="Vw0=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=240,
- 			["num_for_nothing"]="VAxc"
-		},
-		["limit"]=3
-	},
-	[1906]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=14,
- 			["id_for_nothing"]="Vww=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=100,
- 			["num_for_nothing"]="Vwhc"
-		},
-		["limit"]=3
-	},
-	[1907]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=15,
- 			["num_for_nothing"]="Vw0="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		},
-		["limit"]=10
-	},
-	[1908]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=1,
- 			["id_for_nothing"]="Vw==",
-			["num"]=800,
- 			["num_for_nothing"]="Xghc"
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		},
-		["limit"]=999
-	},
-	[1909]={
-		["activity"]=7206,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=13,
- 			["id_for_nothing"]="Vws=",
-			["num"]=1,
- 			["num_for_nothing"]="Vw=="
-		},
-		["cost"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=52,
- 			["id_for_nothing"]="Uwo=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		},
-		["limit"]=999
 	}
 }
 local config = {
-data=activity_exchange,count=171
+data=activity_exchange,count=153
 }
 return config

lua/app/config/activity_rank.lua

@@ -6548,859 +6548,9 @@ local activity_rank = {
  				["num_for_nothing"]="VwhcA2U="
 			}
 		}
-	},
-	[4701]={
-		["act_id"]=6606,
-		["ranking"]={
-			1,
-			1
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		}
-	},
-	[4702]={
-		["act_id"]=6606,
-		["ranking"]={
-			2,
-			2
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=1000,
- 				["num_for_nothing"]="VwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[4703]={
-		["act_id"]=6606,
-		["ranking"]={
-			3,
-			3
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=800,
- 				["num_for_nothing"]="Xghc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[4704]={
-		["act_id"]=6606,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=600,
- 				["num_for_nothing"]="UAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[4705]={
-		["act_id"]=6606,
-		["ranking"]={
-			11,
-			50
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=400,
- 				["num_for_nothing"]="Ughc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			}
-		}
-	},
-	[4706]={
-		["act_id"]=6606,
-		["ranking"]={
-			51,
-			500
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=300,
- 				["num_for_nothing"]="VQhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[4707]={
-		["act_id"]=6606,
-		["ranking"]={
-			501,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	[4801]={
-		["act_id"]=6706,
-		["ranking"]={
-			1,
-			1
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[4802]={
-		["act_id"]=6706,
-		["ranking"]={
-			2,
-			2
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[4803]={
-		["act_id"]=6706,
-		["ranking"]={
-			3,
-			3
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[4804]={
-		["act_id"]=6706,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[4805]={
-		["act_id"]=6706,
-		["ranking"]={
-			11,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			}
-		}
-	},
-	[4901]={
-		["act_id"]=6906,
-		["ranking"]={
-			1,
-			1
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[4902]={
-		["act_id"]=6906,
-		["ranking"]={
-			2,
-			2
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[4903]={
-		["act_id"]=6906,
-		["ranking"]={
-			3,
-			3
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[4904]={
-		["act_id"]=6906,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[4905]={
-		["act_id"]=6906,
-		["ranking"]={
-			11,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			}
-		}
-	},
-	[5001]={
-		["act_id"]=7006,
-		["ranking"]={
-			1,
-			1
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			}
-		}
-	},
-	[5002]={
-		["act_id"]=7006,
-		["ranking"]={
-			2,
-			2
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=1000,
- 				["num_for_nothing"]="VwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[5003]={
-		["act_id"]=7006,
-		["ranking"]={
-			3,
-			3
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=800,
- 				["num_for_nothing"]="Xghc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[5004]={
-		["act_id"]=7006,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=600,
- 				["num_for_nothing"]="UAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[5005]={
-		["act_id"]=7006,
-		["ranking"]={
-			11,
-			50
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=400,
- 				["num_for_nothing"]="Ughc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			}
-		}
-	},
-	[5006]={
-		["act_id"]=7006,
-		["ranking"]={
-			51,
-			500
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=300,
- 				["num_for_nothing"]="VQhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[5007]={
-		["act_id"]=7006,
-		["ranking"]={
-			501,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=55,
- 				["id_for_nothing"]="Uw0=",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	[5101]={
-		["act_id"]=7106,
-		["ranking"]={
-			1,
-			1
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[5102]={
-		["act_id"]=7106,
-		["ranking"]={
-			2,
-			2
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[5103]={
-		["act_id"]=7106,
-		["ranking"]={
-			3,
-			3
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[5104]={
-		["act_id"]=7106,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[5105]={
-		["act_id"]=7106,
-		["ranking"]={
-			11,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			}
-		}
-	},
-	[5201]={
-		["act_id"]=7306,
-		["ranking"]={
-			1,
-			1
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	[5202]={
-		["act_id"]=7306,
-		["ranking"]={
-			2,
-			2
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			}
-		}
-	},
-	[5203]={
-		["act_id"]=7306,
-		["ranking"]={
-			3,
-			3
-		},
-		["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"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			}
-		}
-	},
-	[5204]={
-		["act_id"]=7306,
-		["ranking"]={
-			4,
-			10
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[5205]={
-		["act_id"]=7306,
-		["ranking"]={
-			11,
-			99999999
-		},
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			}
-		}
 	}
 }
 local config = {
-data=activity_rank,count=296
+data=activity_rank,count=262
 }
 return config

lua/app/config/arena_gift.lua

@@ -5,8 +5,8 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=5,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="Uw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
@@ -18,10 +18,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=23002,
+				["id"]=41,
- 				["id_for_nothing"]="VAtcA2c=",
+ 				["id_for_nothing"]="Ugk=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -31,10 +31,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=10,
+				["id"]=20,
- 				["id_for_nothing"]="Vwg=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=1,
+				["num"]=50,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Uwg="
 			}
 		}
 	},
@@ -44,10 +44,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=5000,
+				["num"]=2,
- 				["num_for_nothing"]="UwhcAw=="
+ 				["num_for_nothing"]="VA=="
 			}
 		}
 	},
@@ -57,14 +57,11 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=16,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw4=",
-				["num"]=50,
+				["num"]=5,
- 				["num_for_nothing"]="Uwg="
+ 				["num_for_nothing"]="Uw=="
 			}
-		},
-		["unlock_hero"]={
-			54003
 		}
 	},
 	[6]={
@@ -73,8 +70,8 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=10,
+				["id"]=42,
- 				["id_for_nothing"]="Vwg=",
+ 				["id_for_nothing"]="Ugo=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
@@ -86,14 +83,11 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=6,
+				["id"]=20,
- 				["id_for_nothing"]="UA==",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=1,
+				["num"]=50,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Uwg="
 			}
-		},
-		["unlock_hero"]={
-			34003
 		}
 	},
 	[8]={
@@ -102,10 +96,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=10000,
+				["num"]=2,
- 				["num_for_nothing"]="VwhcA2U="
+ 				["num_for_nothing"]="VA=="
 			}
 		}
 	},
@@ -115,8 +109,8 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=11,
+				["id"]=41,
- 				["id_for_nothing"]="Vwk=",
+ 				["id_for_nothing"]="Ugk=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
@@ -128,10 +122,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=42,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Ugo=",
-				["num"]=60,
+				["num"]=1,
- 				["num_for_nothing"]="UAg="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -141,14 +135,11 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=54003,
+				["id"]=20,
- 				["id_for_nothing"]="UwxcA2Y=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=3,
+				["num"]=50,
- 				["num_for_nothing"]="VQ=="
+ 				["num_for_nothing"]="Uwg="
 			}
-		},
-		["unlock_hero"]={
-			24003
 		}
 	},
 	[12]={
@@ -157,10 +148,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=15000,
+				["num"]=2,
- 				["num_for_nothing"]="Vw1cA2U="
+ 				["num_for_nothing"]="VA=="
 			}
 		}
 	},
@@ -170,8 +161,8 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=11,
+				["id"]=41,
- 				["id_for_nothing"]="Vwk=",
+ 				["id_for_nothing"]="Ugk=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
@@ -183,10 +174,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=16,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw4=",
-				["num"]=80,
+				["num"]=5,
- 				["num_for_nothing"]="Xgg="
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@@ -196,10 +187,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=34003,
+				["id"]=20,
- 				["id_for_nothing"]="VQxcA2Y=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=3,
+				["num"]=80,
- 				["num_for_nothing"]="VQ=="
+ 				["num_for_nothing"]="Xgg="
 			}
 		}
 	},
@@ -209,10 +200,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=18000,
+				["num"]=2,
- 				["num_for_nothing"]="VwBcA2U="
+ 				["num_for_nothing"]="VA=="
 			}
 		}
 	},
@@ -222,10 +213,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=18,
+				["id"]=42,
- 				["id_for_nothing"]="VwA=",
+ 				["id_for_nothing"]="Ugo=",
-				["num"]=1,
+				["num"]=2,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="VA=="
 			}
 		}
 	},
@@ -235,10 +226,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=43,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Ugs=",
-				["num"]=100,
+				["num"]=1,
- 				["num_for_nothing"]="Vwhc"
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -248,10 +239,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=24003,
+				["id"]=20,
- 				["id_for_nothing"]="VAxcA2Y=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=3,
+				["num"]=80,
- 				["num_for_nothing"]="VQ=="
+ 				["num_for_nothing"]="Xgg="
 			}
 		}
 	},
@@ -261,10 +252,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=20000,
+				["num"]=2,
- 				["num_for_nothing"]="VAhcA2U="
+ 				["num_for_nothing"]="VA=="
 			}
 		}
 	},
@@ -274,10 +265,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=18,
+				["id"]=41,
- 				["id_for_nothing"]="VwA=",
+ 				["id_for_nothing"]="Ugk=",
-				["num"]=1,
+				["num"]=2,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="VA=="
 			}
 		}
 	},
@@ -287,10 +278,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=16,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw4=",
-				["num"]=120,
+				["num"]=5,
- 				["num_for_nothing"]="Vwpc"
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@@ -300,10 +291,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=47,
+				["id"]=20,
- 				["id_for_nothing"]="Ug8=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=5,
+				["num"]=80,
- 				["num_for_nothing"]="Uw=="
+ 				["num_for_nothing"]="Xgg="
 			}
 		}
 	},
@@ -313,10 +304,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=24000,
+				["num"]=3,
- 				["num_for_nothing"]="VAxcA2U="
+ 				["num_for_nothing"]="VQ=="
 			}
 		}
 	},
@@ -326,10 +317,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=18,
+				["id"]=16,
- 				["id_for_nothing"]="VwA=",
+ 				["id_for_nothing"]="Vw4=",
-				["num"]=1,
+				["num"]=5,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@@ -339,10 +330,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=43,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Ugs=",
-				["num"]=150,
+				["num"]=1,
- 				["num_for_nothing"]="Vw1c"
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -352,10 +343,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=47,
+				["id"]=20,
- 				["id_for_nothing"]="Ug8=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=8,
+				["num"]=100,
- 				["num_for_nothing"]="Xg=="
+ 				["num_for_nothing"]="Vwhc"
 			}
 		}
 	},
@@ -365,10 +356,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=30000,
+				["num"]=3,
- 				["num_for_nothing"]="VQhcA2U="
+ 				["num_for_nothing"]="VQ=="
 			}
 		}
 	},
@@ -378,8 +369,8 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=18,
+				["id"]=17,
- 				["id_for_nothing"]="VwA=",
+ 				["id_for_nothing"]="Vw8=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
@@ -391,10 +382,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=16,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw4=",
-				["num"]=180,
+				["num"]=5,
- 				["num_for_nothing"]="VwBc"
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@@ -404,10 +395,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=43,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Ugs=",
-				["num"]=30000,
+				["num"]=1,
- 				["num_for_nothing"]="VQhcA2U="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -417,10 +408,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=14,
+				["id"]=20,
- 				["id_for_nothing"]="Vww=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=1,
+				["num"]=100,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Vwhc"
 			}
 		}
 	},
@@ -430,10 +421,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=47,
+				["id"]=17,
- 				["id_for_nothing"]="Ug8=",
+ 				["id_for_nothing"]="Vw8=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -443,10 +434,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=40000,
+				["num"]=3,
- 				["num_for_nothing"]="UghcA2U="
+ 				["num_for_nothing"]="VQ=="
 			}
 		}
 	},
@@ -456,10 +447,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=18,
+				["id"]=20,
- 				["id_for_nothing"]="VwA=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=1,
+				["num"]=100,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Vwhc"
 			}
 		}
 	},
@@ -469,10 +460,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=16,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw4=",
-				["num"]=200,
+				["num"]=5,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@@ -482,10 +473,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=43,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Ugs=",
-				["num"]=40000,
+				["num"]=1,
- 				["num_for_nothing"]="UghcA2U="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -495,10 +486,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=15,
+				["id"]=20,
- 				["id_for_nothing"]="Vw0=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=1,
+				["num"]=120,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Vwpc"
 			}
 		}
 	},
@@ -508,10 +499,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=47,
+				["id"]=17,
- 				["id_for_nothing"]="Ug8=",
+ 				["id_for_nothing"]="Vw8=",
-				["num"]=12,
+				["num"]=1,
- 				["num_for_nothing"]="Vwo="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -521,10 +512,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=5,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=50000,
+				["num"]=3,
- 				["num_for_nothing"]="UwhcA2U="
+ 				["num_for_nothing"]="VQ=="
 			}
 		}
 	},
@@ -534,10 +525,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=18,
+				["id"]=20,
- 				["id_for_nothing"]="VwA=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=1,
+				["num"]=120,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Vwpc"
 			}
 		}
 	},
@@ -547,10 +538,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=16,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw4=",
-				["num"]=300,
+				["num"]=5,
- 				["num_for_nothing"]="VQhc"
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@@ -560,10 +551,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=43,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Ugs=",
-				["num"]=50000,
+				["num"]=1,
- 				["num_for_nothing"]="UwhcA2U="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -573,10 +564,10 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=15,
+				["id"]=20,
- 				["id_for_nothing"]="Vw0=",
+ 				["id_for_nothing"]="VAg=",
-				["num"]=1,
+				["num"]=120,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Vwpc"
 			}
 		}
 	},
@@ -586,15 +577,262 @@ local arena_gift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=47,
+				["id"]=17,
- 				["id_for_nothing"]="Ug8=",
+ 				["id_for_nothing"]="Vw8=",
-				["num"]=15,
+				["num"]=1,
- 				["num_for_nothing"]="Vw0="
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[46]={
+		["score"]=3200,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[47]={
+		["score"]=3300,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			}
+		}
+	},
+	[48]={
+		["score"]=3400,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=16,
+ 				["id_for_nothing"]="Vw4=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[49]={
+		["score"]=3500,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=44,
+ 				["id_for_nothing"]="Ugw=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[50]={
+		["score"]=3600,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			}
+		}
+	},
+	[51]={
+		["score"]=3700,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=17,
+ 				["id_for_nothing"]="Vw8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[52]={
+		["score"]=3800,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[53]={
+		["score"]=3900,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			}
+		}
+	},
+	[54]={
+		["score"]=4000,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=16,
+ 				["id_for_nothing"]="Vw4=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[55]={
+		["score"]=4100,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=44,
+ 				["id_for_nothing"]="Ugw=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[56]={
+		["score"]=4200,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[57]={
+		["score"]=4300,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=17,
+ 				["id_for_nothing"]="Vw8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[58]={
+		["score"]=4400,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[59]={
+		["score"]=4500,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[60]={
+		["score"]=4600,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=16,
+ 				["id_for_nothing"]="Vw4=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[61]={
+		["score"]=4700,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=44,
+ 				["id_for_nothing"]="Ugw=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[62]={
+		["score"]=4800,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		}
+	},
+	[63]={
+		["score"]=4900,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[64]={
+		["score"]=5000,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=17,
+ 				["id_for_nothing"]="Vw8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	}
 }
 local config = {
-data=arena_gift,count=45
+data=arena_gift,count=64
 }
 return config

lua/app/config/arena_time.lua

@@ -1,126 +1,42 @@
 local arena_time = {
-	[1]={
+	[25]={
-		["season"]=1,
+		["season"]=25,
-		["start_time"]="2023-6-25 00:00:00",
+		["start_time"]="2025-7-15 00:00:00",
-		["end_time"]="2023-8-16 00:00:00",
+		["end_time"]="2025-8-15 00:00:00",
 		["ui_banner"]="ui_arena_bounty_banner"
 	},
-	[2]={
+	[26]={
-		["season"]=2,
+		["season"]=26,
-		["start_time"]="2023-8-16 00:00:00",
+		["start_time"]="2025-8-15 00:00:00",
-		["end_time"]="2023-9-15 00:00:00",
+		["end_time"]="2025-9-15 00:00:00",
 		["ui_banner"]="ui_arena_bounty_banner"
 	},
-	[3]={
+	[27]={
-		["season"]=3,
+		["season"]=27,
-		["start_time"]="2023-9-15 00:00:00",
+		["start_time"]="2025-9-15 00:00:00",
-		["end_time"]="2023-10-16 00:00:00",
+		["end_time"]="2025-10-15 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]={
+	[28]={
-		["season"]=10,
+		["season"]=28,
-		["start_time"]="2024-4-15 00:00:00",
+		["start_time"]="2025-10-15 00:00:00",
-		["end_time"]="2024-5-16 00:00:00",
+		["end_time"]="2025-11-15 00:00:00",
 		["ui_banner"]="ui_arena_bounty_banner"
 	},
-	[11]={
+	[29]={
-		["season"]=11,
+		["season"]=29,
-		["start_time"]="2024-5-16 00:00:00",
+		["start_time"]="2025-11-15 00:00:00",
-		["end_time"]="2024-6-15 00:00:00",
+		["end_time"]="2025-12-15 00:00:00",
 		["ui_banner"]="ui_arena_bounty_banner"
 	},
-	[12]={
+	[30]={
-		["season"]=12,
+		["season"]=30,
-		["start_time"]="2024-6-15 00:00:00",
+		["start_time"]="2025-12-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
+data=arena_time,count=6
 }
 return config

lua/app/config/attr.lua

@@ -1,247 +1,508 @@
 local attr = {
 	[1]={
 		["id"]=1,
-		["name"]="hp"
+		["name"]="hp",
+		["power"]=100
 	},
 	[2]={
 		["id"]=2,
-		["name"]="atk_red"
+		["name"]="atk_red",
+		["power"]=200
 	},
 	[3]={
 		["id"]=3,
-		["name"]="atk_yellow"
+		["name"]="atk_yellow",
+		["power"]=200
 	},
 	[4]={
 		["id"]=4,
-		["name"]="atk_green"
+		["name"]="atk_green",
+		["power"]=200
 	},
 	[5]={
 		["id"]=5,
-		["name"]="atk_blue"
+		["name"]="atk_blue",
+		["power"]=200
 	},
 	[6]={
 		["id"]=6,
-		["name"]="atk_purple"
+		["name"]="atk_purple",
+		["power"]=200
 	},
 	[7]={
 		["id"]=7,
-		["name"]="attr_crit_red"
+		["name"]="attr_crit_red",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[8]={
 		["id"]=8,
-		["name"]="attr_crit_yellow"
+		["name"]="attr_crit_yellow",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[9]={
 		["id"]=9,
-		["name"]="attr_crit_green"
+		["name"]="attr_crit_green",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[10]={
 		["id"]=10,
-		["name"]="attr_crit_blue"
+		["name"]="attr_crit_blue",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[11]={
 		["id"]=11,
-		["name"]="attr_crit_purple"
+		["name"]="attr_crit_purple",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[12]={
 		["id"]=12,
-		["name"]="attr_crit_time_red"
+		["name"]="attr_crit_time_red",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[13]={
 		["id"]=13,
-		["name"]="attr_crit_time_yellow"
+		["name"]="attr_crit_time_yellow",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[14]={
 		["id"]=14,
-		["name"]="attr_crit_time_green"
+		["name"]="attr_crit_time_green",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[15]={
 		["id"]=15,
-		["name"]="attr_crit_time_blue"
+		["name"]="attr_crit_time_blue",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[16]={
 		["id"]=16,
-		["name"]="attr_crit_time_purple"
+		["name"]="attr_crit_time_purple",
+		["power"]=500,
+		["is_percent"]=1
 	},
 	[17]={
 		["id"]=17,
-		["name"]="attr_cured_red"
+		["name"]="attr_cured_red",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[18]={
 		["id"]=18,
-		["name"]="attr_cured_yellow"
+		["name"]="attr_cured_yellow",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[19]={
 		["id"]=19,
-		["name"]="attr_cured_green"
+		["name"]="attr_cured_green",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[20]={
 		["id"]=20,
-		["name"]="attr_cured_blue"
+		["name"]="attr_cured_blue",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[21]={
 		["id"]=21,
-		["name"]="attr_cured_purple"
+		["name"]="attr_cured_purple",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[22]={
 		["id"]=22,
-		["name"]="attr_atkp_red"
+		["name"]="attr_atkp_red",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[23]={
 		["id"]=23,
-		["name"]="attr_atkp_yellow"
+		["name"]="attr_atkp_yellow",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[24]={
 		["id"]=24,
-		["name"]="attr_atkp_green"
+		["name"]="attr_atkp_green",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[25]={
 		["id"]=25,
-		["name"]="attr_atkp_blue"
+		["name"]="attr_atkp_blue",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[26]={
 		["id"]=26,
-		["name"]="attr_atkp_purple"
+		["name"]="attr_atkp_purple",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[27]={
 		["id"]=27,
-		["name"]="attr_hpp_red"
+		["name"]="attr_hpp_red",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[28]={
 		["id"]=28,
-		["name"]="attr_hpp_yellow"
+		["name"]="attr_hpp_yellow",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[29]={
 		["id"]=29,
-		["name"]="attr_hpp_green"
+		["name"]="attr_hpp_green",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[30]={
 		["id"]=30,
-		["name"]="attr_hpp_blue"
+		["name"]="attr_hpp_blue",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[31]={
 		["id"]=31,
-		["name"]="attr_hpp_purple"
+		["name"]="attr_hpp_purple",
+		["power"]=100,
+		["is_percent"]=1
 	},
 	[32]={
 		["id"]=32,
-		["name"]="attr_normal_hurt_red"
+		["name"]="attr_normal_hurt_red",
+		["power"]=50
 	},
 	[33]={
 		["id"]=33,
-		["name"]="attr_normal_hurt_yellow"
+		["name"]="attr_normal_hurt_yellow",
+		["power"]=50
 	},
 	[34]={
 		["id"]=34,
-		["name"]="attr_normal_hurt_green"
+		["name"]="attr_normal_hurt_green",
+		["power"]=50
 	},
 	[35]={
 		["id"]=35,
-		["name"]="attr_normal_hurt_blue"
+		["name"]="attr_normal_hurt_blue",
+		["power"]=50
 	},
 	[36]={
 		["id"]=36,
-		["name"]="attr_normal_hurt_purple"
+		["name"]="attr_normal_hurt_purple",
+		["power"]=50
 	},
 	[37]={
 		["id"]=37,
-		["name"]="attr_skill_hurt_red"
+		["name"]="attr_skill_hurt_red",
+		["power"]=50
 	},
 	[38]={
 		["id"]=38,
-		["name"]="attr_skill_hurt_yellow"
+		["name"]="attr_skill_hurt_yellow",
+		["power"]=50
 	},
 	[39]={
 		["id"]=39,
-		["name"]="attr_skill_hurt_green"
+		["name"]="attr_skill_hurt_green",
+		["power"]=50
 	},
 	[40]={
 		["id"]=40,
-		["name"]="attr_skill_hurt_blue"
+		["name"]="attr_skill_hurt_blue",
+		["power"]=50
 	},
 	[41]={
 		["id"]=41,
-		["name"]="attr_skill_hurt_purple"
+		["name"]="attr_skill_hurt_purple",
+		["power"]=50
 	},
 	[42]={
 		["id"]=42,
-		["name"]="attr_normal_hurtp_red"
+		["name"]="attr_normal_hurtp_red",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[43]={
 		["id"]=43,
-		["name"]="attr_normal_hurtp_yellow"
+		["name"]="attr_normal_hurtp_yellow",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[44]={
 		["id"]=44,
-		["name"]="attr_normal_hurtp_green"
+		["name"]="attr_normal_hurtp_green",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[45]={
 		["id"]=45,
-		["name"]="attr_normal_hurtp_blue"
+		["name"]="attr_normal_hurtp_blue",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[46]={
 		["id"]=46,
-		["name"]="attr_normal_hurtp_purple"
+		["name"]="attr_normal_hurtp_purple",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[47]={
 		["id"]=47,
-		["name"]="attr_skill_hurtp_red"
+		["name"]="attr_skill_hurtp_red",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[48]={
 		["id"]=48,
-		["name"]="attr_skill_hurtp_yellow"
+		["name"]="attr_skill_hurtp_yellow",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[49]={
 		["id"]=49,
-		["name"]="attr_skill_hurtp_green"
+		["name"]="attr_skill_hurtp_green",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[50]={
 		["id"]=50,
-		["name"]="attr_skill_hurtp_blue"
+		["name"]="attr_skill_hurtp_blue",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[51]={
 		["id"]=51,
-		["name"]="attr_skill_hurtp_purple"
+		["name"]="attr_skill_hurtp_purple",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[52]={
 		["id"]=52,
-		["name"]="attr_hp_red"
+		["name"]="attr_hp_red",
+		["power"]=50
 	},
 	[53]={
 		["id"]=53,
-		["name"]="attr_hp_yellow"
+		["name"]="attr_hp_yellow",
+		["power"]=50
 	},
 	[54]={
 		["id"]=54,
-		["name"]="attr_hp_green"
+		["name"]="attr_hp_green",
+		["power"]=50
 	},
 	[55]={
 		["id"]=55,
-		["name"]="attr_hp_blue"
+		["name"]="attr_hp_blue",
+		["power"]=50
 	},
 	[56]={
 		["id"]=56,
-		["name"]="attr_hp_purple"
+		["name"]="attr_hp_purple",
+		["power"]=50
 	},
 	[57]={
 		["id"]=57,
-		["name"]="attr_all_hurtp_red"
+		["name"]="attr_all_hurtp_red",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[58]={
 		["id"]=58,
-		["name"]="attr_all_hurtp_yellow"
+		["name"]="attr_all_hurtp_yellow",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[59]={
 		["id"]=59,
-		["name"]="attr_all_hurtp_green"
+		["name"]="attr_all_hurtp_green",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[60]={
 		["id"]=60,
-		["name"]="attr_all_hurtp_blue"
+		["name"]="attr_all_hurtp_blue",
+		["power"]=50,
+		["is_percent"]=1
 	},
 	[61]={
 		["id"]=61,
-		["name"]="attr_all_hurtp_purple"
+		["name"]="attr_all_hurtp_purple",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[62]={
+		["id"]=62,
+		["name"]="attr_atkp_red_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[63]={
+		["id"]=63,
+		["name"]="attr_atkp_yellow_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[64]={
+		["id"]=64,
+		["name"]="attr_atkp_green_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[65]={
+		["id"]=65,
+		["name"]="attr_atkp_blue_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[66]={
+		["id"]=66,
+		["name"]="attr_atkp_purple_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[67]={
+		["id"]=67,
+		["name"]="atk_all",
+		["power"]=50
+	},
+	[68]={
+		["id"]=68,
+		["name"]="attr_hp_all",
+		["power"]=50
+	},
+	[69]={
+		["id"]=69,
+		["name"]="attr_dmgdec_all",
+		["power"]=50
+	},
+	[70]={
+		["id"]=70,
+		["name"]="attr_crit_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[71]={
+		["id"]=71,
+		["name"]="attr_crit_time_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[72]={
+		["id"]=72,
+		["name"]="attr_normal_hurtp_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[73]={
+		["id"]=73,
+		["name"]="attr_skill_hurtp_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[74]={
+		["id"]=74,
+		["name"]="attr_atkp_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[75]={
+		["id"]=75,
+		["name"]="attr_atk",
+		["power"]=50
+	},
+	[76]={
+		["id"]=76,
+		["name"]="attr_hp",
+		["power"]=50
+	},
+	[77]={
+		["id"]=77,
+		["name"]="attr_normal_hurt",
+		["power"]=50
+	},
+	[78]={
+		["id"]=78,
+		["name"]="attr_skill_hurt",
+		["power"]=50
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec",
+		["power"]=50
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[81]={
+		["id"]=81,
+		["name"]="attr_monster_dmg",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[82]={
+		["id"]=82,
+		["name"]="attr_boss_dmg",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[83]={
+		["id"]=83,
+		["name"]="attr_normal_hurtp",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[84]={
+		["id"]=84,
+		["name"]="attr_skill_hurtp",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[85]={
+		["id"]=85,
+		["name"]="attr_hpp_red_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[86]={
+		["id"]=86,
+		["name"]="attr_hpp_yellow_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[87]={
+		["id"]=87,
+		["name"]="attr_hpp_green_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[88]={
+		["id"]=88,
+		["name"]="attr_hpp_blue_all",
+		["power"]=50,
+		["is_percent"]=1
+	},
+	[89]={
+		["id"]=89,
+		["name"]="attr_hpp_purple_all",
+		["power"]=50,
+		["is_percent"]=1
 	}
 }
 local keys = {
@@ -306,12 +567,40 @@ local keys = {
 		["attr_all_hurtp_yellow"]=attr[58],
 		["attr_all_hurtp_green"]=attr[59],
 		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61]
+		["attr_all_hurtp_purple"]=attr[61],
+		["attr_atkp_red_all"]=attr[62],
+		["attr_atkp_yellow_all"]=attr[63],
+		["attr_atkp_green_all"]=attr[64],
+		["attr_atkp_blue_all"]=attr[65],
+		["attr_atkp_purple_all"]=attr[66],
+		["atk_all"]=attr[67],
+		["attr_hp_all"]=attr[68],
+		["attr_dmgdec_all"]=attr[69],
+		["attr_crit_all"]=attr[70],
+		["attr_crit_time_all"]=attr[71],
+		["attr_normal_hurtp_all"]=attr[72],
+		["attr_skill_hurtp_all"]=attr[73],
+		["attr_atkp_all"]=attr[74],
+		["attr_atk"]=attr[75],
+		["attr_hp"]=attr[76],
+		["attr_normal_hurt"]=attr[77],
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80],
+		["attr_monster_dmg"]=attr[81],
+		["attr_boss_dmg"]=attr[82],
+		["attr_normal_hurtp"]=attr[83],
+		["attr_skill_hurtp"]=attr[84],
+		["attr_hpp_red_all"]=attr[85],
+		["attr_hpp_yellow_all"]=attr[86],
+		["attr_hpp_green_all"]=attr[87],
+		["attr_hpp_blue_all"]=attr[88],
+		["attr_hpp_purple_all"]=attr[89]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=61
+count=89
 }
 return config

lua/app/config/avatar.lua

@@ -1,211 +1,101 @@
 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",
+		["iconId"]="avatar_13001",
-		["hero"]=33002
+		["hero"]=13001,
+		["unlock"]=true
 	},
 	[14001]={
-		["iconId"]="14",
+		["iconId"]="avatar_14001",
-		["hero"]=43002
-	},
-	[15001]={
-		["iconId"]="15",
-		["hero"]=53002
-	},
-	[16001]={
-		["iconId"]="16",
 		["hero"]=14001
 	},
-	[17001]={
+	[15001]={
-		["iconId"]="17",
+		["iconId"]="avatar_15001",
-		["hero"]=24001
+		["hero"]=15001
 	},
-	[18001]={
+	[15002]={
-		["iconId"]="18",
+		["iconId"]="avatar_15002",
-		["hero"]=34001
+		["hero"]=15002
 	},
-	[19001]={
+	[16001]={
-		["iconId"]="19",
+		["iconId"]="avatar_16001",
-		["hero"]=44001
+		["hero"]=16001,
-	},
+		["unlock_show"]=true
-	[20001]={
-		["iconId"]="20",
-		["hero"]=54001
-	},
-	[21001]={
-		["iconId"]="22",
-		["hero"]=24002
-	},
-	[22001]={
-		["iconId"]="23",
-		["hero"]=14002
 	},
 	[23001]={
-		["iconId"]="24",
+		["iconId"]="avatar_23001",
-		["hero"]=34002
+		["hero"]=23001,
+		["unlock"]=true
 	},
 	[24001]={
-		["iconId"]="25",
+		["iconId"]="avatar_24001",
-		["hero"]=44002
+		["hero"]=24001
 	},
 	[25001]={
-		["iconId"]="26",
+		["iconId"]="avatar_25001",
-		["hero"]=54002
+		["hero"]=25001
 	},
-	[14003]={
+	[25002]={
-		["iconId"]="31",
+		["iconId"]="avatar_25002",
-		["hero"]=14003
+		["hero"]=25002
 	},
-	[24003]={
+	[26001]={
-		["iconId"]="27",
+		["iconId"]="avatar_26001",
-		["hero"]=24003
+		["hero"]=26001,
+		["unlock_show"]=true
 	},
-	[34003]={
+	[33001]={
-		["iconId"]="28",
+		["iconId"]="avatar_33001",
-		["hero"]=34003
+		["hero"]=33001,
+		["unlock"]=true
 	},
-	[44003]={
+	[34001]={
-		["iconId"]="29",
+		["iconId"]="avatar_34001",
-		["hero"]=44003
+		["hero"]=34001
 	},
-	[54003]={
+	[35001]={
-		["iconId"]="30",
+		["iconId"]="avatar_35001",
-		["hero"]=54003
+		["hero"]=35001
 	},
-	[14004]={
+	[35002]={
-		["iconId"]="32",
+		["iconId"]="avatar_35002",
-		["hero"]=14004
+		["hero"]=35002
 	},
-	[24004]={
+	[43001]={
-		["iconId"]="33",
+		["iconId"]="avatar_43001",
-		["hero"]=24004
+		["hero"]=43001,
+		["unlock"]=true
 	},
-	[34004]={
+	[44001]={
-		["iconId"]="34",
+		["iconId"]="avatar_44001",
-		["hero"]=34004
+		["hero"]=44001
 	},
-	[44004]={
+	[45001]={
-		["iconId"]="35",
+		["iconId"]="avatar_45001",
-		["hero"]=44004
+		["hero"]=45001
 	},
-	[54004]={
+	[45002]={
-		["iconId"]="36",
+		["iconId"]="avatar_45002",
-		["hero"]=54004
+		["hero"]=45002
 	},
-	[1400201]={
+	[53001]={
-		["iconId"]="23_1",
+		["iconId"]="avatar_53001",
-		["item"]=1400201
+		["hero"]=53001,
+		["unlock"]=true
 	},
-	[3400101]={
+	[54001]={
-		["iconId"]="18_1",
+		["iconId"]="avatar_54001",
-		["item"]=3400101
+		["hero"]=54001
 	},
-	[3400102]={
+	[55001]={
-		["iconId"]="18_2",
+		["iconId"]="avatar_55001",
-		["item"]=3400102
+		["hero"]=55001
 	},
-	[5300101]={
+	[55002]={
-		["iconId"]="10_1",
+		["iconId"]="avatar_55002",
-		["item"]=5300101
+		["hero"]=55002
-	},
-	[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
+data=avatar,count=22
 }
 return config

lua/app/config/avatar_frame.lua

@@ -2,94 +2,9 @@ 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
+data=avatar_frame,count=1
 }
 return config

lua/app/config/board_dungeon.lua.meta

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

lua/app/config/bounty_time.lua

@@ -124,23 +124,9 @@ local bounty_time = {
 		["end_time"]="2025-1-1 00:00:00",
 		["ui_banner"]="ui_bounty_banner_3",
 		["enter_ui_banner"]="bounty_btn_main_3"
-	},
-	[19]={
-		["season"]=19,
-		["start_time"]="2025-1-1 00:00:00",
-		["end_time"]="2025-2-1 00:00:00",
-		["ui_banner"]="ui_bounty_banner_4",
-		["enter_ui_banner"]="bounty_btn_main_4"
-	},
-	[20]={
-		["season"]=20,
-		["start_time"]="2025-2-1 00:00:00",
-		["end_time"]="2025-3-1 00:00:00",
-		["ui_banner"]="ui_bounty_banner_5",
-		["enter_ui_banner"]="bounty_btn_main_5"
 	}
 }
 local config = {
-data=bounty_time,count=20
+data=bounty_time,count=18
 }
 return config

lua/app/config/buff.lua

@@ -55,7 +55,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_red_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[8]={
 		["id"]=8,
@@ -66,7 +66,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_yellow_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[9]={
 		["id"]=9,
@@ -77,7 +77,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_green_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[10]={
 		["id"]=10,
@@ -88,7 +88,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_blue_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[11]={
 		["id"]=11,
@@ -99,7 +99,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_purple_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[12]={
 		["id"]=12,
@@ -109,7 +109,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_all_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[13]={
 		["id"]=13,
@@ -117,7 +117,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[14]={
 		["id"]=14,
@@ -125,7 +126,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[15]={
 		["id"]=15,
@@ -133,7 +135,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[16]={
 		["id"]=16,
@@ -141,7 +144,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[17]={
 		["id"]=17,
@@ -149,14 +153,16 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[18]={
 		["id"]=18,
 		["name"]="weakness_all_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[19]={
 		["id"]=19,
@@ -164,7 +170,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[20]={
 		["id"]=20,
@@ -172,7 +179,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[21]={
 		["id"]=21,
@@ -180,7 +188,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[22]={
 		["id"]=22,
@@ -188,7 +197,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[23]={
 		["id"]=23,
@@ -196,7 +206,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[24]={
 		["id"]=24,
@@ -205,7 +216,7 @@ local buff = {
 		["stack"]=2,
 		["decr"]=1,
 		["icon"]="weakness_all_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[25]={
 		["id"]=25,
@@ -213,7 +224,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[26]={
 		["id"]=26,
@@ -222,7 +234,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=1,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[27]={
 		["id"]=27,
@@ -231,7 +244,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=2,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[28]={
 		["id"]=28,
@@ -240,7 +254,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=3,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[29]={
 		["id"]=29,
@@ -249,7 +264,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=4,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[30]={
 		["id"]=30,
@@ -258,7 +274,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=5,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[31]={
 		["id"]=31,
@@ -276,7 +293,7 @@ local buff = {
 		["decr"]=1,
 		["formula"]=3,
 		["fx_get"]={
-			300027
+			47
 		}
 	},
 	[33]={
@@ -328,7 +345,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="high",
+		["icon"]="normal_attack_add",
 		["show_name"]=true,
 		["fx_get"]={
 			30
@@ -339,35 +356,44 @@ local buff = {
 		["name"]="block",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[39]={
 		["id"]=39,
 		["name"]="hpp_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[40]={
 		["id"]=40,
 		["name"]="crit_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["icon"]="crit_add",
+		["show_name"]=true,
+		["is_percent"]=1
 	},
 	[41]={
 		["id"]=41,
 		["name"]="crit_time_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["icon"]="crit_time_add",
+		["show_name"]=true,
+		["is_percent"]=1
 	},
 	[42]={
 		["id"]=42,
 		["name"]="exp_time_add",
 		["buff_type"]=7,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[43]={
 		["id"]=43,
@@ -419,7 +445,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="burn",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_take"]={
 			36
 		}
@@ -431,7 +457,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="vulnerable",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_get"]={
 			34
 		}
@@ -460,7 +486,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="poison",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_take"]={
 			35
 		}
@@ -484,7 +510,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="corrupt",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_get"]={
 			19
 		}
@@ -497,7 +523,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="bleed",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_take"]={
 			31
 		}
@@ -509,7 +535,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="weaken",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_continued"]={
 			33
 		}
@@ -580,7 +606,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="counterattack",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[63]={
 		["id"]=63,
@@ -589,7 +615,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="thorns",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_continued"]={
 			18
 		}
@@ -600,7 +626,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[65]={
 		["id"]=65,
@@ -608,7 +635,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[66]={
 		["id"]=66,
@@ -616,7 +644,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[67]={
 		["id"]=67,
@@ -624,7 +653,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[68]={
 		["id"]=68,
@@ -632,14 +662,16 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[69]={
 		["id"]=69,
 		["name"]="dmg_dec_all_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[70]={
 		["id"]=70,
@@ -853,7 +885,7 @@ local buff = {
 		["stack"]=1,
 		["decr"]=3,
 		["icon"]="counterattack",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[91]={
 		["id"]=91,
@@ -863,7 +895,7 @@ local buff = {
 		["position"]=1,
 		["decr"]=3,
 		["icon"]="dec_dmg_red_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[92]={
 		["id"]=92,
@@ -873,7 +905,7 @@ local buff = {
 		["position"]=2,
 		["decr"]=3,
 		["icon"]="dec_dmg_yellow_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[93]={
 		["id"]=93,
@@ -883,7 +915,7 @@ local buff = {
 		["position"]=3,
 		["decr"]=3,
 		["icon"]="dec_dmg_green_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[94]={
 		["id"]=94,
@@ -893,7 +925,7 @@ local buff = {
 		["position"]=4,
 		["decr"]=3,
 		["icon"]="dec_dmg_blue_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[95]={
 		["id"]=95,
@@ -903,7 +935,7 @@ local buff = {
 		["position"]=5,
 		["decr"]=3,
 		["icon"]="dec_dmg_purple_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[96]={
 		["id"]=96,
@@ -912,7 +944,7 @@ local buff = {
 		["stack"]=2,
 		["decr"]=3,
 		["icon"]="dec_dmg_all_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[97]={
 		["id"]=97,
@@ -921,10 +953,150 @@ local buff = {
 		["decr"]=3,
 		["icon"]="thorns",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_continued"]={
 			18
 		}
+	},
+	[98]={
+		["id"]=98,
+		["name"]="hpp_red_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=1,
+		["decr"]=1,
+		["is_percent"]=1
+	},
+	[99]={
+		["id"]=99,
+		["name"]="hpp_yellow_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=2,
+		["decr"]=1,
+		["is_percent"]=1
+	},
+	[100]={
+		["id"]=100,
+		["name"]="hpp_green_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=3,
+		["decr"]=1,
+		["is_percent"]=1
+	},
+	[101]={
+		["id"]=101,
+		["name"]="hpp_blue_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=4,
+		["decr"]=1,
+		["is_percent"]=1
+	},
+	[102]={
+		["id"]=102,
+		["name"]="hpp_purple_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=5,
+		["decr"]=1,
+		["is_percent"]=1
+	},
+	[103]={
+		["id"]=103,
+		["name"]="forever_normal_attack_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=3,
+		["icon"]="normal_attack_add",
+		["show_name"]=true,
+		["fx_get"]={
+			30
+		}
+	},
+	[104]={
+		["id"]=104,
+		["name"]="forever_uncontrolled",
+		["buff_type"]=7,
+		["decr"]=3,
+		["icon"]="immune",
+		["is_percent"]=1
+	},
+	[105]={
+		["id"]=105,
+		["name"]="attr_normal_hurtp_all_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=3,
+		["icon"]="attr_normal_hurtp_all_add",
+		["show_name"]=true,
+		["is_percent"]=1
+	},
+	[106]={
+		["id"]=106,
+		["name"]="red_refresh_weight",
+		["buff_type"]=7,
+		["stack"]=0,
+		["decr"]=3
+	},
+	[107]={
+		["id"]=107,
+		["name"]="yellow_refresh_weight",
+		["buff_type"]=7,
+		["stack"]=0,
+		["decr"]=3
+	},
+	[108]={
+		["id"]=108,
+		["name"]="green_refresh_weight",
+		["buff_type"]=7,
+		["stack"]=0,
+		["decr"]=3
+	},
+	[109]={
+		["id"]=109,
+		["name"]="blue_refresh_weight",
+		["buff_type"]=7,
+		["stack"]=0,
+		["decr"]=3
+	},
+	[110]={
+		["id"]=110,
+		["name"]="purple_refresh_weight",
+		["buff_type"]=7,
+		["stack"]=0,
+		["decr"]=3
+	},
+	[111]={
+		["id"]=111,
+		["name"]="random_universal",
+		["buff_type"]=7,
+		["stack"]=0,
+		["decr"]=3
+	},
+	[112]={
+		["id"]=112,
+		["name"]="main_hero_energyadd",
+		["buff_type"]=7,
+		["stack"]=0,
+		["decr"]=3
+	},
+	[113]={
+		["id"]=113,
+		["name"]="attr_monster_dmg_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=3,
+		["is_percent"]=1
+	},
+	[114]={
+		["id"]=114,
+		["name"]="attr_boss_dmg_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=3,
+		["is_percent"]=1
 	}
 }
 local keys = {
@@ -1025,12 +1197,29 @@ local keys = {
 		["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]
+		["forever_thorns"]=buff[97],
+		["hpp_red_add"]=buff[98],
+		["hpp_yellow_add"]=buff[99],
+		["hpp_green_add"]=buff[100],
+		["hpp_blue_add"]=buff[101],
+		["hpp_purple_add"]=buff[102],
+		["forever_normal_attack_add"]=buff[103],
+		["forever_uncontrolled"]=buff[104],
+		["attr_normal_hurtp_all_add"]=buff[105],
+		["red_refresh_weight"]=buff[106],
+		["yellow_refresh_weight"]=buff[107],
+		["green_refresh_weight"]=buff[108],
+		["blue_refresh_weight"]=buff[109],
+		["purple_refresh_weight"]=buff[110],
+		["random_universal"]=buff[111],
+		["main_hero_energyadd"]=buff[112],
+		["attr_monster_dmg_add"]=buff[113],
+		["attr_boss_dmg_add"]=buff[114]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=97
+count=114
 }
 return config

lua/app/config/chapter_dungeon.lua.meta

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

lua/app/config/const.lua

@@ -7,12 +7,14 @@ local const = {
 	},
 	["chapter_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
  				["id_for_nothing"]="VQ==",
-			["num"]=10,
+				["num"]=5,
- 			["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Uw=="
+			}
 		}
 	},
 	["shake_level_1"]={
@@ -30,77 +32,6 @@ local const = {
 	["crit_dmg"]={
 		["value"]=15000
 	},
-	["act_gold_pig_cd"]={
-		["value"]=12
-	},
-	["act_gold_pig_buy_cd"]={
-		["value"]=1
-	},
-	["act_gold_pig_first_id"]={
-		["value"]=201
-	},
-	["act_gold_pig_full_cd"]={
-		["value"]=12
-	},
-	["stamina_diamond_buy"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=30,
- 			["num_for_nothing"]="VQg="
-		}
-	},
-	["stamina_diamond_cost"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=30,
- 			["num_for_nothing"]="VQg="
-		}
-	},
-	["stamina_diamond_times"]={
-		["value"]=3
-	},
-	["stamina_ad_buy"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	["stamina_ad_times"]={
-		["value"]=5
-	},
-	["bounty_buy_cost"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=30,
- 			["num_for_nothing"]="VQg="
-		}
-	},
-	["bounty_chapter_exp"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=7,
- 			["id_for_nothing"]="UQ==",
-			["num"]=2,
- 			["num_for_nothing"]="VA=="
-		}
-	},
-	["bounty_senior_rise"]={
-		["value"]=10
-	},
 	["idle_maxtime"]={
 		["value"]=57600
 	},
@@ -117,23 +48,26 @@ local const = {
 		["value"]=2
 	},
 	["idle_drop_fast_times_2"]={
-		["value"]=1
+		["value"]=5
 	},
 	["idle_drop_fast_time"]={
 		["value"]=21600
 	},
 	["idle_drop_fast_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
  				["id_for_nothing"]="VQ==",
-			["num"]=30,
+				["num"]=5,
- 			["num_for_nothing"]="VQg="
+ 				["num_for_nothing"]="Uw=="
+			}
 		}
 	},
 	["refresh_skill_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -141,34 +75,11 @@ local const = {
 				["num"]=20,
  				["num_for_nothing"]="VAg="
 			}
-	},
-	["ad_refresh_skill"]={
-		["value"]=2
-	},
-	["diamond_refresh_skill"]={
-		["value"]=1
-	},
-	["mall_daily_ad_refresh"]={
-		["value"]=1
-	},
-	["mall_daily_diamond_refresh"]={
-		["value"]=2
-	},
-	["mall_daily_diamond_refresh_cost"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=30,
- 			["num_for_nothing"]="VQg="
 		}
 	},
-	["summn_first"]={
-		["value"]=52001
-	},
 	["daily_challenge_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -176,56 +87,17 @@ local const = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
+		}
 	},
 	["daily_challenge_limit"]={
 		["value"]=2
 	},
-	["act_gift_downshift_time"]={
-		["value"]=72
-	},
-	["act_gift_downshift_number"]={
-		["value"]=15
-	},
-	["act_sevenday_time"]={
-		["value"]=7
-	},
 	["model_daily_challenge"]={
 		["value"]=8000
 	},
-	["level_fund_hero_1"]={
-		["value"]=24001
-	},
-	["level_fund_hero_2"]={
-		["value"]=54001
-	},
-	["dungeon_gold_cost"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		}
-	},
-	["dungeon_gold_limit"]={
-		["value"]=2
-	},
-	["dungeon_shards_cost"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
-		}
-	},
-	["dungeon_shards_limit"]={
-		["value"]=2
-	},
 	["change_name_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -233,6 +105,7 @@ local const = {
 				["num"]=200,
  				["num_for_nothing"]="VAhc"
 			}
+		}
 	},
 	["arena_odds_min"]={
 		["value"]=4500
@@ -254,46 +127,54 @@ local const = {
 	},
 	["arena_fight_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=22,
+				["id"]=8,
- 			["id_for_nothing"]="VAo=",
+ 				["id_for_nothing"]="Xg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
+		}
 	},
 	["arena_notes_diamond_buy"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=22,
+				["id"]=8,
- 			["id_for_nothing"]="VAo=",
+ 				["id_for_nothing"]="Xg==",
-			["num"]=3,
+				["num"]=5,
- 			["num_for_nothing"]="VQ=="
+ 				["num_for_nothing"]="Uw=="
+			}
 		}
 	},
 	["arena_notes_diamond_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-			["num"]=30,
+				["num"]=100,
- 			["num_for_nothing"]="VQg="
+ 				["num_for_nothing"]="Vwhc"
+			}
 		}
 	},
 	["arena_notes_diamond_times"]={
-		["value"]=3
+		["value"]=2
 	},
 	["arena_notes_ad_buy"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-			["id"]=22,
+				["id"]=8,
- 			["id_for_nothing"]="VAo=",
+ 				["id_for_nothing"]="Xg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
+		}
 	},
 	["arena_notes_ad_times"]={
 		["value"]=5
@@ -303,6 +184,7 @@ local const = {
 	},
 	["arena_bounty_buy_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -310,6 +192,7 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["arena_bounty_senior_rise"]={
 		["value"]=10
@@ -338,11 +221,36 @@ local const = {
 	["arena_lose_adbox_limit"]={
 		["value"]=2
 	},
-	["dungeon_equip_limit"]={
+	["stamina_diamond_buy"]={
-		["value"]=8
-	},
-	["dungeon_armor_limit"]={
 		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=3,
+ 				["id_for_nothing"]="VQ==",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			}
+		}
+	},
+	["stamina_diamond_cost"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			}
+		}
+	},
+	["stamina_diamond_times"]={
+		["value"]=4
+	},
+	["stamina_ad_buy"]={
+		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -350,22 +258,106 @@ local const = {
 				["num"]=5,
  				["num_for_nothing"]="Uw=="
 			}
+		}
 	},
-	["dungeon_equip_cost"]={
+	["stamina_ad_times"]={
+		["value"]=3
+	},
+	["dungeon_gold_times"]={
+		["value"]=2
+	},
+	["dungeon_res_times"]={
+		["value"]=2
+	},
+	["card_monthly_dailyreward"]={
 		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
  				["id_for_nothing"]="VQ==",
-			["num"]=5,
+				["num"]=20,
- 			["num_for_nothing"]="Uw=="
+ 				["num_for_nothing"]="VAg="
+			}
 		}
 	},
-	["activity_bounty_day"]={
+	["card_monthly_days"]={
-		["value"]=6
+		["value"]=30
 	},
-	["activity_bounty_cost"]={
+	["card_monthly_refresh"]={
+		["value"]=1
+	},
+	["card_free_dailyreward"]={
 		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=30,
+ 				["num_for_nothing"]="VQg="
+			}
+		}
+	},
+	["mall_daily_free_refresh"]={
+		["value"]=1
+	},
+	["mall_daily_ad_refresh"]={
+		["value"]=2
+	},
+	["mall_daily_refresh"]={
+		["value"]=2
+	},
+	["mall_daily_refresh_cost"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		}
+	},
+	["dungeon_ticket_1"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	["dungeon_ticket_2"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=48,
+ 				["id_for_nothing"]="UgA=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	["act_bounty_buy_unlock"]={
+		["value"]=2
+	},
+	["act_bounty_buy_cost"]={
+		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -373,149 +365,140 @@ local const = {
 				["num"]=50,
  				["num_for_nothing"]="Uwg="
 			}
+		}
 	},
-	["bounty_click"]={
+	["act_sevenday_duration"]={
-		["value"]=4
+		["value"]=14
 	},
-	["activity_boss_rush_time"]={
+	["hero_skill_click"]={
+		["value_2"]={
+			2,
+			3,
+			4,
+			1,
+			1,
+			2,
+			3,
+			2,
+			4,
+			1,
+			2,
+			3,
+			3,
+			4,
+			4
+		}
+	},
+	["ads_refresh_rogue_limit"]={
 		["value"]=1
 	},
-	["activity_boss_rush_cost"]={
+	["ads_getall_rogue_limit"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	["activity_boss_rush_costadd"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	["activity_boss_rush_hp_add_1"]={
-		["value"]=1750
-	},
-	["activity_boss_rush_atk_add_1"]={
-		["value"]=1370
-	},
-	["activity_boss_rush_hp_add_2"]={
-		["value"]=2700
-	},
-	["activity_boss_rush_atk_add_2"]={
-		["value"]=2200
-	},
-	["activity_boss_rush_hp_add_3"]={
-		["value"]=4100
-	},
-	["activity_boss_rush_atk_add_3"]={
-		["value"]=3500
-	},
-	["activity_recurring_day"]={
-		["value"]=5
-	},
-	["runes_cost_base"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=55,
- 			["id_for_nothing"]="Uw0=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		}
-	},
-	["runes_cost_add"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=55,
- 			["id_for_nothing"]="Uw0=",
-			["num"]=5,
- 			["num_for_nothing"]="Uw=="
-		}
-	},
-	["runes_red_point"]={
-		["value"]=1000
-	},
-	["dungeon_rune_lvlimit"]={
-		["value"]=20
-	},
-	["dungeon_rune_revival"]={
-		["value"]=5
-	},
-	["dungeon_rune_cost"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		}
-	},
-	["dungeon_rune_buylimit"]={
-		["value"]=5
-	},
-	["activity_pvp_time"]={
 		["value"]=1
 	},
-	["activity_pvp_cost"]={
+	["ads_deity_get_limit"]={
-		["reward"]={
+		["value"]=1
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
 	},
-	["activity_pvp_costadd"]={
+	["ads_mystery_box_limit"]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=20,
- 			["num_for_nothing"]="VAg="
-		}
-	},
-	["activity_pvp_win_times"]={
-		["value"]=10
-	},
-	["activity_pvp_lose_times"]={
 		["value"]=2
 	},
-	["activity_pvp_bounty_point"]={
+	["ads_revive_limit"]={
-		["value"]=10
+		["value"]=3
 	},
-	["activity_pvp_refresh_ad_times"]={
+	["cost_revive"]={
-		["value"]=1
-	},
-	["activity_pvp_refresh_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-			["num"]=10,
+				["num"]=50,
- 			["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Uwg="
+			}
 		}
 	},
-	["act_tourn_rank_free"]={
+	["ads_double_rewards_limit"]={
-		["value"]=90
+		["value"]=2
 	},
-	["act_tourn_rank_pay"]={
+	["daily_challenge_ads_refresh_rogue_limit"]={
-		["value"]=10
+		["value"]=1
+	},
+	["daily_challenge_ads_getall_rogue_limit"]={
+		["value"]=1
+	},
+	["daily_challenge_ads_deity_get_limit"]={
+		["value"]=1
+	},
+	["daily_challenge_ads_revive_limit"]={
+		["value"]=3
+	},
+	["daily_challenge_cost_revive"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			}
+		}
+	},
+	["daily_challenge_ads_double_rewards_limit"]={
+		["value"]=2
+	},
+	["act_gogogo_round_reward_1"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=44,
+ 				["id_for_nothing"]="Ugw=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		}
+	},
+	["act_gogogo_round_limit_1"]={
+		["value"]=5
+	},
+	["dungeon_show_reward"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=18,
+ 				["id_for_nothing"]="VwA=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
 	}
 }
 local config = {
-data=const,count=104
+data=const,count=81
 }
 return config

lua/app/config/daily_challenge_level.lua

@@ -0,0 +1,741 @@
+local daily_challenge_level = {
+	[1]={
+		["max_chapter"]=11,
+		["wave_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		},
+		["task_daily_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=21,
+ 					["id_for_nothing"]="VAk=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=1,
+ 					["id_for_nothing"]="Vw==",
+					["num"]=500,
+ 					["num_for_nothing"]="Uwhc"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=21,
+ 					["id_for_nothing"]="VAk=",
+					["num"]=2,
+ 					["num_for_nothing"]="VA=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=150,
+ 					["num_for_nothing"]="Vw1c"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=22,
+ 					["id_for_nothing"]="VAo=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				}
+			}
+		},
+		["daily_challenge_difficulty"]={
+			74615,
+			12222
+		}
+	},
+	[2]={
+		["max_chapter"]=19,
+		["wave_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		},
+		["task_daily_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=22,
+ 					["id_for_nothing"]="VAo=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=1,
+ 					["id_for_nothing"]="Vw==",
+					["num"]=500,
+ 					["num_for_nothing"]="Uwhc"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=22,
+ 					["id_for_nothing"]="VAo=",
+					["num"]=2,
+ 					["num_for_nothing"]="VA=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=150,
+ 					["num_for_nothing"]="Vw1c"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=23,
+ 					["id_for_nothing"]="VAs=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				}
+			}
+		},
+		["daily_challenge_difficulty"]={
+			149231,
+			31778
+		}
+	},
+	[3]={
+		["max_chapter"]=27,
+		["wave_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=7,
+ 				["num_for_nothing"]="UQ=="
+			}
+		},
+		["task_daily_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=22,
+ 					["id_for_nothing"]="VAo=",
+					["num"]=2,
+ 					["num_for_nothing"]="VA=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=1,
+ 					["id_for_nothing"]="Vw==",
+					["num"]=500,
+ 					["num_for_nothing"]="Uwhc"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=23,
+ 					["id_for_nothing"]="VAs=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=150,
+ 					["num_for_nothing"]="Vw1c"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=23,
+ 					["id_for_nothing"]="VAs=",
+					["num"]=2,
+ 					["num_for_nothing"]="VA=="
+				}
+			}
+		},
+		["daily_challenge_difficulty"]={
+			216154,
+			45222
+		}
+	},
+	[4]={
+		["max_chapter"]=37,
+		["wave_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=8,
+ 				["num_for_nothing"]="Xg=="
+			}
+		},
+		["task_daily_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=23,
+ 					["id_for_nothing"]="VAs=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=1,
+ 					["id_for_nothing"]="Vw==",
+					["num"]=500,
+ 					["num_for_nothing"]="Uwhc"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=23,
+ 					["id_for_nothing"]="VAs=",
+					["num"]=2,
+ 					["num_for_nothing"]="VA=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=150,
+ 					["num_for_nothing"]="Vw1c"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=24,
+ 					["id_for_nothing"]="VAw=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				}
+			}
+		},
+		["daily_challenge_difficulty"]={
+			355385,
+			68556
+		}
+	},
+	[5]={
+		["max_chapter"]=47,
+		["wave_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=9,
+ 				["num_for_nothing"]="Xw=="
+			}
+		},
+		["task_daily_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=23,
+ 					["id_for_nothing"]="VAs=",
+					["num"]=2,
+ 					["num_for_nothing"]="VA=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=1,
+ 					["id_for_nothing"]="Vw==",
+					["num"]=500,
+ 					["num_for_nothing"]="Uwhc"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=24,
+ 					["id_for_nothing"]="VAw=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=150,
+ 					["num_for_nothing"]="Vw1c"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=25,
+ 					["id_for_nothing"]="VA0=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				}
+			}
+		},
+		["daily_challenge_difficulty"]={
+			631538,
+			115333
+		}
+	},
+	[6]={
+		["max_chapter"]=62,
+		["wave_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			}
+		},
+		["task_daily_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=24,
+ 					["id_for_nothing"]="VAw=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=1,
+ 					["id_for_nothing"]="Vw==",
+					["num"]=500,
+ 					["num_for_nothing"]="Uwhc"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=25,
+ 					["id_for_nothing"]="VA0=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=150,
+ 					["num_for_nothing"]="Vw1c"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=26,
+ 					["id_for_nothing"]="VA4=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				}
+			}
+		},
+		["daily_challenge_difficulty"]={
+			1163846,
+			196889
+		}
+	},
+	[7]={
+		["max_chapter"]=77,
+		["wave_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=12,
+ 				["num_for_nothing"]="Vwo="
+			}
+		},
+		["task_daily_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=25,
+ 					["id_for_nothing"]="VA0=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=1,
+ 					["id_for_nothing"]="Vw==",
+					["num"]=500,
+ 					["num_for_nothing"]="Uwhc"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=26,
+ 					["id_for_nothing"]="VA4=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=19,
+ 					["id_for_nothing"]="VwE=",
+					["num"]=150,
+ 					["num_for_nothing"]="Vw1c"
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=50,
+ 					["num_for_nothing"]="Uwg="
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=20,
+ 					["id_for_nothing"]="VAg=",
+					["num"]=100,
+ 					["num_for_nothing"]="Vwhc"
+				},
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=27,
+ 					["id_for_nothing"]="VA8=",
+					["num"]=1,
+ 					["num_for_nothing"]="Vw=="
+				}
+			}
+		},
+		["daily_challenge_difficulty"]={
+			2251538,
+			292556
+		}
+	}
+}
+local config = {
+data=daily_challenge_level,count=7
+}
+return config

lua/app/config/daily_challenge_level.lua.meta

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

lua/app/config/equip_refine.lua.meta

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

lua/app/config/equip_resonate.lua

@@ -0,0 +1,872 @@
+local equip_resonate = {
+	[1001]={
+		["type"]=1,
+		["lv"]=1,
+		["parameter"]={
+			10
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=200000
+			}
+		}
+	},
+	[1002]={
+		["type"]=1,
+		["lv"]=2,
+		["parameter"]={
+			20
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=800000
+			}
+		}
+	},
+	[1003]={
+		["type"]=1,
+		["lv"]=3,
+		["parameter"]={
+			30
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=2000000
+			}
+		}
+	},
+	[1004]={
+		["type"]=1,
+		["lv"]=4,
+		["parameter"]={
+			40
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=4000000
+			}
+		}
+	},
+	[1005]={
+		["type"]=1,
+		["lv"]=5,
+		["parameter"]={
+			50
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=7000000
+			}
+		}
+	},
+	[1006]={
+		["type"]=1,
+		["lv"]=6,
+		["parameter"]={
+			60
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=11200000
+			}
+		}
+	},
+	[1007]={
+		["type"]=1,
+		["lv"]=7,
+		["parameter"]={
+			70
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=16800000
+			}
+		}
+	},
+	[1008]={
+		["type"]=1,
+		["lv"]=8,
+		["parameter"]={
+			80
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=24000000
+			}
+		}
+	},
+	[1009]={
+		["type"]=1,
+		["lv"]=9,
+		["parameter"]={
+			90
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=33000000
+			}
+		}
+	},
+	[1010]={
+		["type"]=1,
+		["lv"]=10,
+		["parameter"]={
+			100
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=44000000
+			}
+		}
+	},
+	[1011]={
+		["type"]=1,
+		["lv"]=11,
+		["parameter"]={
+			110
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=57200000
+			}
+		}
+	},
+	[1012]={
+		["type"]=1,
+		["lv"]=12,
+		["parameter"]={
+			120
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=72800000
+			}
+		}
+	},
+	[1013]={
+		["type"]=1,
+		["lv"]=13,
+		["parameter"]={
+			130
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=91000000
+			}
+		}
+	},
+	[1014]={
+		["type"]=1,
+		["lv"]=14,
+		["parameter"]={
+			140
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=112000000
+			}
+		}
+	},
+	[1015]={
+		["type"]=1,
+		["lv"]=15,
+		["parameter"]={
+			150
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=136000000
+			}
+		}
+	},
+	[1016]={
+		["type"]=1,
+		["lv"]=16,
+		["parameter"]={
+			160
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=163200000
+			}
+		}
+	},
+	[1017]={
+		["type"]=1,
+		["lv"]=17,
+		["parameter"]={
+			170
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=193800000
+			}
+		}
+	},
+	[1018]={
+		["type"]=1,
+		["lv"]=18,
+		["parameter"]={
+			180
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=228000000
+			}
+		}
+	},
+	[1019]={
+		["type"]=1,
+		["lv"]=19,
+		["parameter"]={
+			190
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=266000000
+			}
+		}
+	},
+	[1020]={
+		["type"]=1,
+		["lv"]=20,
+		["parameter"]={
+			200
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=308000000
+			}
+		}
+	},
+	[2001]={
+		["type"]=2,
+		["lv"]=1,
+		["parameter"]={
+			1,
+			1
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=600000
+			}
+		}
+	},
+	[2002]={
+		["type"]=2,
+		["lv"]=2,
+		["parameter"]={
+			1,
+			2
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=1200000
+			}
+		}
+	},
+	[2003]={
+		["type"]=2,
+		["lv"]=3,
+		["parameter"]={
+			2,
+			1
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=2400000
+			}
+		}
+	},
+	[2004]={
+		["type"]=2,
+		["lv"]=4,
+		["parameter"]={
+			2,
+			2
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=4800000
+			}
+		}
+	},
+	[2005]={
+		["type"]=2,
+		["lv"]=5,
+		["parameter"]={
+			2,
+			3
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=9600000
+			}
+		}
+	},
+	[2006]={
+		["type"]=2,
+		["lv"]=6,
+		["parameter"]={
+			3,
+			1
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=14400000
+			}
+		}
+	},
+	[2007]={
+		["type"]=2,
+		["lv"]=7,
+		["parameter"]={
+			3,
+			2
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=21600000
+			}
+		}
+	},
+	[2008]={
+		["type"]=2,
+		["lv"]=8,
+		["parameter"]={
+			3,
+			3
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=32400000
+			}
+		}
+	},
+	[2009]={
+		["type"]=2,
+		["lv"]=9,
+		["parameter"]={
+			3,
+			4
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=48600000
+			}
+		}
+	},
+	[2010]={
+		["type"]=2,
+		["lv"]=10,
+		["parameter"]={
+			4,
+			1
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=72000000
+			}
+		}
+	},
+	[2011]={
+		["type"]=2,
+		["lv"]=11,
+		["parameter"]={
+			4,
+			2
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=102000000
+			}
+		}
+	},
+	[2012]={
+		["type"]=2,
+		["lv"]=12,
+		["parameter"]={
+			4,
+			3
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=144000000
+			}
+		}
+	},
+	[2013]={
+		["type"]=2,
+		["lv"]=13,
+		["parameter"]={
+			4,
+			4
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=201000000
+			}
+		}
+	},
+	[2014]={
+		["type"]=2,
+		["lv"]=14,
+		["parameter"]={
+			4,
+			5
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=282000000
+			}
+		}
+	},
+	[2015]={
+		["type"]=2,
+		["lv"]=15,
+		["parameter"]={
+			5,
+			1
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=390000000
+			}
+		}
+	},
+	[2016]={
+		["type"]=2,
+		["lv"]=16,
+		["parameter"]={
+			5,
+			2
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=525000000
+			}
+		}
+	},
+	[2017]={
+		["type"]=2,
+		["lv"]=17,
+		["parameter"]={
+			5,
+			3
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=690000000
+			}
+		}
+	},
+	[2018]={
+		["type"]=2,
+		["lv"]=18,
+		["parameter"]={
+			5,
+			4
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=900000000
+			}
+		}
+	},
+	[2019]={
+		["type"]=2,
+		["lv"]=19,
+		["parameter"]={
+			5,
+			5
+		},
+		["attr"]={
+			{
+				["type"]="attr_hp",
+				["num"]=1170000000
+			}
+		}
+	},
+	[3001]={
+		["type"]=3,
+		["lv"]=1,
+		["parameter"]={
+			5
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=500000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=1500000
+			}
+		}
+	},
+	[3002]={
+		["type"]=3,
+		["lv"]=2,
+		["parameter"]={
+			10
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=1500000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=4500000
+			}
+		}
+	},
+	[3003]={
+		["type"]=3,
+		["lv"]=3,
+		["parameter"]={
+			15
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=3000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=9000000
+			}
+		}
+	},
+	[3004]={
+		["type"]=3,
+		["lv"]=4,
+		["parameter"]={
+			20
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=5000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=15000000
+			}
+		}
+	},
+	[3005]={
+		["type"]=3,
+		["lv"]=5,
+		["parameter"]={
+			25
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=7500000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=22500000
+			}
+		}
+	},
+	[3006]={
+		["type"]=3,
+		["lv"]=6,
+		["parameter"]={
+			30
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=11250000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=33750000
+			}
+		}
+	},
+	[3007]={
+		["type"]=3,
+		["lv"]=7,
+		["parameter"]={
+			35
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=16250000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=48750000
+			}
+		}
+	},
+	[3008]={
+		["type"]=3,
+		["lv"]=8,
+		["parameter"]={
+			40
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=22500000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=67500000
+			}
+		}
+	},
+	[3009]={
+		["type"]=3,
+		["lv"]=9,
+		["parameter"]={
+			45
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=30000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=90000000
+			}
+		}
+	},
+	[3010]={
+		["type"]=3,
+		["lv"]=10,
+		["parameter"]={
+			50
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=38750000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=116250000
+			}
+		}
+	},
+	[3011]={
+		["type"]=3,
+		["lv"]=11,
+		["parameter"]={
+			55
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=50000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=150000000
+			}
+		}
+	},
+	[3012]={
+		["type"]=3,
+		["lv"]=12,
+		["parameter"]={
+			60
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=63750000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=191250000
+			}
+		}
+	},
+	[3013]={
+		["type"]=3,
+		["lv"]=13,
+		["parameter"]={
+			65
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=80000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=240000000
+			}
+		}
+	},
+	[3014]={
+		["type"]=3,
+		["lv"]=14,
+		["parameter"]={
+			70
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=98750000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=296250000
+			}
+		}
+	},
+	[3015]={
+		["type"]=3,
+		["lv"]=15,
+		["parameter"]={
+			75
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=120000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=360000000
+			}
+		}
+	},
+	[3016]={
+		["type"]=3,
+		["lv"]=16,
+		["parameter"]={
+			80
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=143750000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=431250000
+			}
+		}
+	},
+	[3017]={
+		["type"]=3,
+		["lv"]=17,
+		["parameter"]={
+			85
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=170000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=510000000
+			}
+		}
+	},
+	[3018]={
+		["type"]=3,
+		["lv"]=18,
+		["parameter"]={
+			90
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=198750000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=596250000
+			}
+		}
+	},
+	[3019]={
+		["type"]=3,
+		["lv"]=19,
+		["parameter"]={
+			95
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=230000000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=690000000
+			}
+		}
+	},
+	[3020]={
+		["type"]=3,
+		["lv"]=20,
+		["parameter"]={
+			100
+		},
+		["attr"]={
+			{
+				["type"]="attr_atk",
+				["num"]=263750000
+			},
+			{
+				["type"]="attr_hp",
+				["num"]=791250000
+			}
+		}
+	}
+}
+local config = {
+data=equip_resonate,count=59
+}
+return config

lua/app/config/equip_resonate.lua.meta

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

lua/app/config/func_open.lua

@@ -1,114 +1,112 @@
 local func_open = {
-	["act_gold_pig"]={
-		["stage"]=3,
-		["pop_ups"]=1
-	},
-	["bounty_open"]={
-		["stage"]=3,
-		["pop_ups"]=1
-	},
 	["task"]={
 		["stage"]=3,
 		["icon"]="module_unlock_task"
 	},
-	["act_level_gift"]={
-		["level"]=5,
-		["icon"]="module_unlock_fund"
-	},
 	["idle_drop"]={
 		["stage"]=2,
 		["icon"]="module_unlock_idle"
 	},
-	["act_sevenday"]={
-		["stage"]=2,
-		["icon"]="module_unlock_sevenday"
-	},
 	["mall"]={
 		["stage"]=2,
-		["pop_ups"]=1
+		["icon"]="module_unlock_mall"
 	},
 	["mall_daily"]={
-		["stage"]=4,
-		["icon"]="module_unlock_dailyshop"
-	},
-	["store_box_open"]={
 		["stage"]=2,
 		["pop_ups"]=1
 	},
-	["store_box_3_open"]={
-		["stage"]=5,
-		["pop_ups"]=1
-	},
 	["daily_challenge"]={
-		["stage"]=4,
+		["stage"]=11,
-		["icon"]="module_unlock_dailychallenge"
-	},
-	["act_gift_show_open"]={
-		["stage"]=2,
-		["pop_ups"]=1
-	},
-	["first_charge"]={
-		["stage"]=2,
-		["pop_ups"]=1
-	},
-	["new_player_gift"]={
-		["stage"]=2,
 		["pop_ups"]=1
 	},
 	["mail_open"]={
 		["stage"]=2,
 		["pop_ups"]=1
 	},
-	["dungeon_gold_open"]={
-		["stage"]=6,
-		["pop_ups"]=1
-	},
-	["dungeon_shards_open"]={
-		["stage"]=6,
-		["pop_ups"]=1
-	},
 	["arena_open"]={
-		["stage"]=5,
+		["stage"]=15,
 		["icon"]="module_unlock_arena"
 	},
 	["act_arena_gift"]={
+		["stage"]=15,
+		["pop_ups"]=1
+	},
+	["company_open"]={
 		["stage"]=5,
 		["pop_ups"]=1
 	},
-	["equip_weapon_open"]={
+	["talent_open"]={
-		["stage"]=8,
+		["stage"]=5,
-		["icon"]="module_unlock_weapon"
+		["icon"]="module_unlock_talent"
 	},
-	["equip_armor_open"]={
+	["dungeon_open"]={
-		["stage"]=10,
+		["stage"]=8,
+		["pop_ups"]=1
+	},
+	["summon_open"]={
+		["stage"]=3,
+		["icon"]="module_unlock_summon"
+	},
+	["first_charge_1"]={
+		["stage"]=1,
+		["pop_ups"]=1
+	},
+	["first_charge_2"]={
+		["stage"]=1,
+		["time"]=2,
+		["pop_ups"]=1
+	},
+	["first_charge_3"]={
+		["stage"]=18,
+		["time"]=3,
+		["pop_ups"]=1
+	},
+	["card_ad"]={
+		["stage"]=5,
+		["pop_ups"]=1
+	},
+	["card_monthly"]={
+		["stage"]=2,
+		["pop_ups"]=1
+	},
+	["act_sevenday"]={
+		["stage"]=3,
+		["pop_ups"]=1
+	},
+	["dungeon_gold"]={
+		["stage"]=8,
+		["icon"]="module_unlock_dungeon"
+	},
+	["dungeon_res"]={
+		["stage"]=8,
+		["pop_ups"]=1
+	},
+	["signin_bounty"]={
+		["stage"]=8,
+		["pop_ups"]=1
+	},
+	["signin_30"]={
+		["stage"]=3,
+		["pop_ups"]=1
+	},
+	["act_gogogo"]={
+		["stage"]=3,
+		["pop_ups"]=1
+	},
+	["hero_equip"]={
+		["stage"]=11,
 		["icon"]="module_unlock_equip"
 	},
-	["collection_open"]={
+	["act_level_gift"]={
-		["stage"]=5,
+		["level"]=3,
 		["pop_ups"]=1
 	},
-	["dungeon_weapon_open"]={
+	["fund_chapter"]={
-		["stage"]=8,
+		["stage"]=2,
-		["pop_ups"]=1
-	},
-	["dungeon_armor_open"]={
-		["stage"]=10,
-		["pop_ups"]=1
-	},
-	["skin_open"]={
-		["stage"]=4,
-		["pop_ups"]=1
-	},
-	["activity_open"]={
-		["stage"]=4,
-		["pop_ups"]=1
-	},
-	["runes_open"]={
-		["stage"]=12,
 		["pop_ups"]=1
 	}
 }
 local config = {
-data=func_open,count=27
+data=func_open,count=26
 }
 return config

lua/app/config/fund_chapter.lua.meta

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

lua/app/config/fund_level.lua.meta

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

lua/app/config/grid_type.lua

@@ -9,7 +9,7 @@ local grid_type = {
 		["cant_upset"]=1
 	},
 	[2]={
-		["icon"]="battle_obstacle_stone_2",
+		["icon"]="battle_obstacle_chilun_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -22,8 +22,8 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[3]={
-		["icon"]="battle_obstacle_stone_1",
+		["icon"]="battle_obstacle_huoshanshi_1",
-		["next_type"]=2,
+		["next_type"]=0,
 		["break_condition"]={
 			1,
 			3
@@ -32,40 +32,10 @@ local grid_type = {
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_za_b01"
-	},
-	[4]={
-		["icon"]="battle_obstacle_vine",
-		["next_type"]=0,
-		["break_condition"]={
-			2,
-			3
-		},
-		["break_count"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_za_b03"
-	},
-	[5]={
-		["icon"]="battle_obstacle_ice",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["break_stay_element"]=1,
-		["cant_link"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_za_b02"
 	},
-	[6]={
+	[4]={
-		["icon"]="battle_obstacle_lock",
+		["icon"]="battle_obstacle_huoshanshi_2",
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["break_sfx"]="sfx_piece_suolian_b01"
-	},
-	[7]={
-		["icon"]="battle_obstacle_stone_3",
 		["next_type"]=3,
 		["break_condition"]={
 			1,
@@ -75,11 +45,41 @@ local grid_type = {
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_zhuqiantk_b01"
+		["break_sfx"]="sfx_piece_za_b02"
+	},
+	[5]={
+		["icon"]="battle_obstacle_tengman",
+		["next_type"]=0,
+		["break_condition"]={
+			2,
+			3
+		},
+		["break_count"]=1,
+		["cant_upset"]=1,
+		["break_sfx"]="sfx_piece_za_b04"
+	},
+	[6]={
+		["icon"]="battle_obstacle_lock",
+		["can_fall"]=1,
+		["cant_link"]=1,
+		["break_sfx"]="sfx_piece_za_b08"
+	},
+	[7]={
+		["icon"]="battle_obstacle_suishi_1",
+		["next_type"]=0,
+		["break_condition"]={
+			1,
+			3
+		},
+		["break_count"]=1,
+		["cant_link"]=1,
+		["element_invalid"]=1,
+		["cant_upset"]=1,
+		["break_sfx"]="sfx_piece_za_b03"
 	},
 	[8]={
-		["icon"]="battle_obstacle_rocket_up",
+		["icon"]="battle_obstacle_suishi_2",
-		["next_type"]=0,
+		["next_type"]=7,
 		["break_condition"]={
 			1,
 			3
@@ -88,55 +88,35 @@ local grid_type = {
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["effect"]=1,
+		["break_sfx"]="sfx_piece_za_b03"
-		["effect_sfx"]="sfx_piece_huojian_b01",
-		["sfx_flow"]=1,
-		["effect_params"]={
-			1
-		},
-		["effect_trigger"]=2
 	},
 	[9]={
-		["icon"]="battle_obstacle_rocket_down",
+		["icon"]="battle_obstacle_bingkuai",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
 			3
 		},
 		["break_count"]=1,
+		["break_stay_element"]=1,
 		["cant_link"]=1,
-		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["effect"]=1,
+		["break_sfx"]="sfx_piece_za_b05"
-		["effect_sfx"]="sfx_piece_huojian_b01",
-		["sfx_flow"]=1,
-		["effect_params"]={
-			2
-		},
-		["effect_trigger"]=2
 	},
 	[10]={
-		["icon"]="battle_obstacle_rocket_left",
+		["icon"]="battle_obstacle_chushou",
 		["next_type"]=0,
 		["break_condition"]={
-			1,
+			2,
 			3
 		},
 		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["effect"]=1,
+		["break_sfx"]="sfx_piece_za_b06"
-		["effect_sfx"]="sfx_piece_huojian_b01",
-		["sfx_flow"]=1,
-		["effect_params"]={
-			3
-		},
-		["effect_trigger"]=2
 	},
 	[11]={
-		["icon"]="battle_obstacle_rocket_right",
+		["icon"]="battle_obstacle_jizhuangxiang_2",
-		["next_type"]=0,
+		["next_type"]=12,
 		["break_condition"]={
 			1,
 			3
@@ -145,48 +125,23 @@ local grid_type = {
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["effect"]=1,
+		["break_sfx"]="sfx_piece_za_b07"
-		["effect_sfx"]="sfx_piece_huojian_b01",
-		["sfx_flow"]=1,
-		["effect_params"]={
-			4
-		},
-		["effect_trigger"]=2
 	},
 	[12]={
-		["icon"]="battle_obstacle_leaf",
+		["icon"]="battle_obstacle_jizhuangxiang_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
 			3
 		},
 		["break_count"]=1,
-		["break_stay_element"]=1,
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_kucao_b01"
-	},
-	[13]={
-		["icon"]="battle_obstacle_jelly",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["break_stay_element"]=1,
-		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_guodong_b01",
+		["break_sfx"]="sfx_piece_za_b07"
-		["effect"]=5,
-		["effect_sfx"]="sfx_piece_guodong_b02",
-		["effect_trigger"]=1
 	},
 	[14]={
-		["icon"]="battle_obstacle_lamp",
+		["icon"]="battle_obstacle_shenxiang",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -194,12 +149,12 @@ local grid_type = {
 		},
 		["break_count"]=1,
 		["break_fly_to_character"]=1,
-		["bftc_icon"]="battle_obstacle_lamp",
+		["bftc_icon"]="battle_obstacle_shenxiang",
 		["bftc_time"]=0.4,
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_shendeng_b01",
+		["break_sfx"]="sfx_piece_shenxiang_b01",
 		["effect"]=3,
 		["effect_trigger"]=2
 	},
@@ -256,290 +211,9 @@ local grid_type = {
 		["cant_link"]=1,
 		["element_invalid"]=1,
 		["cant_upset"]=1
-	},
-	[18]={
-		["icon"]="battle_obstacle_stump_1",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_muzhuang_b01"
-	},
-	[19]={
-		["icon"]="battle_obstacle_stump_2",
-		["next_type"]=18,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_muzhuang_b01"
-	},
-	[20]={
-		["icon"]="battle_obstacle_stump_3",
-		["next_type"]=19,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_muzhuang_b01"
-	},
-	[21]={
-		["icon"]="battle_obstacle_blister",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["break_stay_element"]=1,
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_shuipao_b01",
-		["effect"]=5,
-		["effect_sfx"]="sfx_piece_shuipao_b02",
-		["effect_trigger"]=1
-	},
-	[22]={
-		["icon"]="battle_obstacle_silt",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["break_stay_element"]=1,
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_yuni_b01",
-		["effect"]=5,
-		["effect_sfx"]="sfx_piece_yuni_b02",
-		["effect_trigger"]=1
-	},
-	[23]={
-		["icon"]="battle_obstacle_poisonous_mist",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["break_stay_element"]=1,
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_duwu_b01",
-		["effect"]=5,
-		["effect_sfx"]="sfx_piece_duwu_b02",
-		["effect_trigger"]=1
-	},
-	[24]={
-		["icon"]="battle_obstacle_altar_1",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_jitang_b01"
-	},
-	[25]={
-		["icon"]="battle_obstacle_altar_2",
-		["next_type"]=24,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_jitang_b01"
-	},
-	[26]={
-		["icon"]="battle_obstacle_altar_3",
-		["next_type"]=25,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_jitang_b01"
-	},
-	[27]={
-		["icon"]="battle_obstacle_circle",
-		["next_type"]=0,
-		["break_condition"]={
-			2,
-			3
-		},
-		["break_count"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_fazhen_b01"
-	},
-	[28]={
-		["icon"]="battle_obstacle_stalactite_1",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_zhongrushi_b01"
-	},
-	[29]={
-		["icon"]="battle_obstacle_stalactite_2",
-		["next_type"]=28,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_zhongrushi_b01"
-	},
-	[30]={
-		["icon"]="battle_obstacle_stalactite_3",
-		["next_type"]=29,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_zhongrushi_b01"
-	},
-	[31]={
-		["icon"]="battle_obstacle_iron_1",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_tiexie_b01"
-	},
-	[32]={
-		["icon"]="battle_obstacle_iron_2",
-		["next_type"]=31,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_tiexie_b01"
-	},
-	[33]={
-		["icon"]="battle_obstacle_iron_3",
-		["next_type"]=32,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_tiexie_b01"
-	},
-	[34]={
-		["icon"]="battle_obstacle_lava",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["break_stay_element"]=1,
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_rongyan_b01",
-		["effect"]=5,
-		["effect_sfx"]="sfx_piece_rongyan_b02",
-		["effect_trigger"]=1
-	},
-	[35]={
-		["icon"]="battle_obstacle_tussock",
-		["next_type"]=0,
-		["break_condition"]={
-			1,
-			3
-		},
-		["break_count"]=1,
-		["break_stay_element"]=1,
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_caocong_b01"
-	},
-	[36]={
-		["icon"]="battle_obstacle_firesnake",
-		["next_type"]=0,
-		["spine_name"]="ui_battle_obstacle_firesnake",
-		["zoom"]=1.0,
-		["spine_idle"]="idle",
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_rongyan_b01",
-		["effect"]=6,
-		["effect_trigger"]=1
-	},
-	[37]={
-		["icon"]="battle_obstacle_waternake",
-		["next_type"]=0,
-		["spine_name"]="ui_battle_obstacle_waternake",
-		["zoom"]=1.0,
-		["spine_idle"]="idle",
-		["can_fall"]=1,
-		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1,
-		["break_sfx"]="sfx_piece_duwu_b01",
-		["effect"]=6,
-		["effect_trigger"]=1
 	}
 }
 local config = {
-data=grid_type,count=38
+data=grid_type,count=17
 }
 return config

lua/app/config/hero_fund.lua

@@ -0,0 +1,606 @@
+local hero_fund = {
+	[1]={
+		["stage"]=1,
+		["attr"]=500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[2]={
+		["stage"]=1,
+		["attr"]=1000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=101,
+ 			["num_for_nothing"]="Vwhd"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
+		}
+	},
+	[3]={
+		["stage"]=1,
+		["attr"]=1500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=102,
+ 			["num_for_nothing"]="Vwhe"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[4]={
+		["stage"]=1,
+		["attr"]=2000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=103,
+ 			["num_for_nothing"]="Vwhf"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=4,
+ 			["num_for_nothing"]="Ug=="
+		}
+	},
+	[5]={
+		["stage"]=1,
+		["attr"]=2500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=104,
+ 			["num_for_nothing"]="VwhY"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		}
+	},
+	[6]={
+		["stage"]=1,
+		["attr"]=3000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=105,
+ 			["num_for_nothing"]="VwhZ"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=6,
+ 			["num_for_nothing"]="UA=="
+		}
+	},
+	[7]={
+		["stage"]=1,
+		["attr"]=3500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=106,
+ 			["num_for_nothing"]="Vwha"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=7,
+ 			["num_for_nothing"]="UQ=="
+		}
+	},
+	[8]={
+		["stage"]=1,
+		["attr"]=4000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=107,
+ 			["num_for_nothing"]="Vwhb"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=8,
+ 			["num_for_nothing"]="Xg=="
+		}
+	},
+	[9]={
+		["stage"]=1,
+		["attr"]=4500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=108,
+ 			["num_for_nothing"]="VwhU"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=9,
+ 			["num_for_nothing"]="Xw=="
+		}
+	},
+	[10]={
+		["stage"]=1,
+		["attr"]=5000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=109,
+ 			["num_for_nothing"]="VwhV"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		}
+	},
+	[11]={
+		["stage"]=1,
+		["attr"]=5500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=110,
+ 			["num_for_nothing"]="Vwlc"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=11,
+ 			["num_for_nothing"]="Vwk="
+		}
+	},
+	[12]={
+		["stage"]=1,
+		["attr"]=6000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=111,
+ 			["num_for_nothing"]="Vwld"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=12,
+ 			["num_for_nothing"]="Vwo="
+		}
+	},
+	[13]={
+		["stage"]=1,
+		["attr"]=6500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=112,
+ 			["num_for_nothing"]="Vwle"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=13,
+ 			["num_for_nothing"]="Vws="
+		}
+	},
+	[14]={
+		["stage"]=1,
+		["attr"]=7000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=113,
+ 			["num_for_nothing"]="Vwlf"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=14,
+ 			["num_for_nothing"]="Vww="
+		}
+	},
+	[15]={
+		["stage"]=1,
+		["attr"]=7500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=114,
+ 			["num_for_nothing"]="VwlY"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=15,
+ 			["num_for_nothing"]="Vw0="
+		}
+	},
+	[16]={
+		["stage"]=2,
+		["attr"]=8000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=115,
+ 			["num_for_nothing"]="VwlZ"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=16,
+ 			["num_for_nothing"]="Vw4="
+		}
+	},
+	[17]={
+		["stage"]=2,
+		["attr"]=8500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=116,
+ 			["num_for_nothing"]="Vwla"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=17,
+ 			["num_for_nothing"]="Vw8="
+		}
+	},
+	[18]={
+		["stage"]=2,
+		["attr"]=9000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=117,
+ 			["num_for_nothing"]="Vwlb"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=18,
+ 			["num_for_nothing"]="VwA="
+		}
+	},
+	[19]={
+		["stage"]=2,
+		["attr"]=9500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=118,
+ 			["num_for_nothing"]="VwlU"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=19,
+ 			["num_for_nothing"]="VwE="
+		}
+	},
+	[20]={
+		["stage"]=2,
+		["attr"]=10000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=119,
+ 			["num_for_nothing"]="VwlV"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	[21]={
+		["stage"]=2,
+		["attr"]=10500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=120,
+ 			["num_for_nothing"]="Vwpc"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=21,
+ 			["num_for_nothing"]="VAk="
+		}
+	},
+	[22]={
+		["stage"]=2,
+		["attr"]=11000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=121,
+ 			["num_for_nothing"]="Vwpd"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=22,
+ 			["num_for_nothing"]="VAo="
+		}
+	},
+	[23]={
+		["stage"]=2,
+		["attr"]=11500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=122,
+ 			["num_for_nothing"]="Vwpe"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=23,
+ 			["num_for_nothing"]="VAs="
+		}
+	},
+	[24]={
+		["stage"]=2,
+		["attr"]=12000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=123,
+ 			["num_for_nothing"]="Vwpf"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=24,
+ 			["num_for_nothing"]="VAw="
+		}
+	},
+	[25]={
+		["stage"]=2,
+		["attr"]=12500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=124,
+ 			["num_for_nothing"]="VwpY"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=25,
+ 			["num_for_nothing"]="VA0="
+		}
+	},
+	[26]={
+		["stage"]=2,
+		["attr"]=13000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=125,
+ 			["num_for_nothing"]="VwpZ"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=26,
+ 			["num_for_nothing"]="VA4="
+		}
+	},
+	[27]={
+		["stage"]=2,
+		["attr"]=13500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=126,
+ 			["num_for_nothing"]="Vwpa"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=27,
+ 			["num_for_nothing"]="VA8="
+		}
+	},
+	[28]={
+		["stage"]=2,
+		["attr"]=14000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=127,
+ 			["num_for_nothing"]="Vwpb"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=28,
+ 			["num_for_nothing"]="VAA="
+		}
+	},
+	[29]={
+		["stage"]=2,
+		["attr"]=14500,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=128,
+ 			["num_for_nothing"]="VwpU"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=29,
+ 			["num_for_nothing"]="VAE="
+		}
+	},
+	[30]={
+		["stage"]=2,
+		["attr"]=15000,
+		["reward_free"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=129,
+ 			["num_for_nothing"]="VwpV"
+		},
+		["reward_mall"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	}
+}
+local config = {
+data=hero_fund,count=30
+}
+return config

lua/app/config/hero_fund.lua.meta

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

lua/app/config/hero_star.lua

@@ -0,0 +1,696 @@
+local hero_star = {
+	[1]={
+		["cost_3"]=1,
+		["cost_4"]=1,
+		["cost_5"]=1,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[2]={
+		["cost_3"]=3,
+		["cost_4"]=2,
+		["cost_5"]=1,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[3]={
+		["cost_3"]=5,
+		["cost_4"]=4,
+		["cost_5"]=2,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[4]={
+		["cost_3"]=7,
+		["cost_4"]=6,
+		["cost_5"]=3,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[5]={
+		["cost_3"]=10,
+		["cost_4"]=8,
+		["cost_5"]=4,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[6]={
+		["cost_3"]=20,
+		["cost_4"]=12,
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[7]={
+		["cost_3"]=30,
+		["cost_4"]=16,
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[8]={
+		["cost_3"]=40,
+		["cost_4"]=20,
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[9]={
+		["cost_3"]=60,
+		["cost_4"]=25,
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[10]={
+		["cost_3"]=80,
+		["cost_4"]=30,
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[11]={
+		["cost_3"]=120,
+		["cost_4"]=40,
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[12]={
+		["cost_3"]=140,
+		["cost_4"]=60,
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[13]={
+		["cost_3"]=160,
+		["cost_4"]=90,
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[14]={
+		["cost_3"]=180,
+		["cost_4"]=120,
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	},
+	[15]={
+		["cost_3"]=200,
+		["cost_4"]=150,
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=10
+			}
+		},
+		["attr_4"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=20
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
+		}
+	}
+}
+local config = {
+data=hero_star,count=15
+}
+return config

lua/app/config/hero_star.lua.meta

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

lua/app/config/localization/localization_global_const.lua

@@ -1,6 +1,5 @@
 local LocalizationGlobalConst = 
 {
-	MAIN_BTN_1 = "MAIN_BTN_1",
 	QLT_DESC_1 = "QLT_DESC_1",
 	QLT_DESC_2 = "QLT_DESC_2",
 	QLT_DESC_3 = "QLT_DESC_3",
@@ -40,7 +39,6 @@ local LocalizationGlobalConst =
 	HERO_DESC_9 = "HERO_DESC_9",
 	HERO_DESC_10 = "HERO_DESC_10",
 	BATTLE_DESC_8 = "BATTLE_DESC_8",
-	MAIN_BTN_2 = "MAIN_BTN_2",
 	MAIN_DESC_1 = "MAIN_DESC_1",
 	TIME_STR_DHM = "TIME_STR_DHM",
 	TIME_STR_M = "TIME_STR_M",
@@ -142,7 +140,6 @@ local LocalizationGlobalConst =
 	DAY_X_UNLOCK = "DAY_X_UNLOCK",
 	SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2",
 	FUNC_UNLOCK = "FUNC_UNLOCK",
-	MAIN_BTN_3 = "MAIN_BTN_3",
 	SHOP_DESC_1 = "SHOP_DESC_1",
 	SHOP_DESC_2 = "SHOP_DESC_2",
 	SHOP_DESC_3 = "SHOP_DESC_3",
@@ -635,6 +632,345 @@ local LocalizationGlobalConst =
 	ACT_TOURN_ARENEA_HELP_2 = "ACT_TOURN_ARENEA_HELP_2",
 	ACT_TOURN_WAVE_DESC_4 = "ACT_TOURN_WAVE_DESC_4",
 	EVENT_COUNTDOWN = "EVENT_COUNTDOWN",
+	SUMMON_FREE_TIME = "SUMMON_FREE_TIME",
+	SUMMON_FORCE_4 = "SUMMON_FORCE_4",
+	ITEM_NOT_ENOUGH_DESC = "ITEM_NOT_ENOUGH_DESC",
+	SUMMON_ONE = "SUMMON_ONE",
+	SUMMON_TEN = "SUMMON_TEN",
+	FREE_DESC_1 = "FREE_DESC_1",
+	SUMMON_DESC_1 = "SUMMON_DESC_1",
+	SUMMON_WISH_OK = "SUMMON_WISH_OK",
+	SUMMON_WISH_TITLE = "SUMMON_WISH_TITLE",
+	SUMMON_WISH_UNSELECT = "SUMMON_WISH_UNSELECT",
+	SUMMON_WISH_TIPS = "SUMMON_WISH_TIPS",
+	SUMMON_WISH_TIPS_2 = "SUMMON_WISH_TIPS_2",
+	BATTLE_FORCE_CHOOSE_DESC_2 = "BATTLE_FORCE_CHOOSE_DESC_2",
+	SUMMON_WISH_LOCK = "SUMMON_WISH_LOCK",
+	SUMMON_FORCE_3 = "SUMMON_FORCE_3",
+	CHAPTER_WAVE_REAWRD_1 = "CHAPTER_WAVE_REAWRD_1",
+	CHAPTER_WAVE_REAWRD_2 = "CHAPTER_WAVE_REAWRD_2",
+	CHAPTER_WAVE_REAWRD_3 = "CHAPTER_WAVE_REAWRD_3",
+	MAIN_BTN_1 = "MAIN_BTN_1",
+	MAIN_BTN_2 = "MAIN_BTN_2",
+	MAIN_BTN_3 = "MAIN_BTN_3",
+	MAIN_BTN_4 = "MAIN_BTN_4",
+	MAIN_BTN_5 = "MAIN_BTN_5",
+	CHAPTER_BOX_DESC_1 = "CHAPTER_BOX_DESC_1",
+	LV_UNLOCK = "LV_UNLOCK",
+	HERO_DESC_13 = "HERO_DESC_13",
+	HERO_DESC_14 = "HERO_DESC_14",
+	TALENT_DESC_1 = "TALENT_DESC_1",
+	TALENT_DESC_2 = "TALENT_DESC_2",
+	TALENT_DESC_3 = "TALENT_DESC_3",
+	TASK_DESC_2 = "TASK_DESC_2",
+	IDLE_DESC_1 = "IDLE_DESC_1",
+	SUMMON_DESC_2 = "SUMMON_DESC_2",
+	HERO_DESC_15 = "HERO_DESC_15",
+	HERO_DESC_16 = "HERO_DESC_16",
+	HERO_DESC_17 = "HERO_DESC_17",
+	HERO_DESC_18 = "HERO_DESC_18",
+	HERO_DESC_19 = "HERO_DESC_19",
+	HERO_DESC_20 = "HERO_DESC_20",
+	SUMMON_DESC_3 = "SUMMON_DESC_3",
+	SUMMON_DESC_4 = "SUMMON_DESC_4",
+	IDLE_DESC_2 = "IDLE_DESC_2",
+	SUMMON_DESC_5 = "SUMMON_DESC_5",
+	SUMMON_DESC_6 = "SUMMON_DESC_6",
+	SUMMON_DESC_7 = "SUMMON_DESC_7",
+	HERO_DESC_21 = "HERO_DESC_21",
+	HERO_DESC_22 = "HERO_DESC_22",
+	HERO_DESC_23 = "HERO_DESC_23",
+	BAG_DESC_1 = "BAG_DESC_1",
+	DAILY_CHALLENGE_DESC_2 = "DAILY_CHALLENGE_DESC_2",
+	DAILY_CHALLENGE_DESC_3 = "DAILY_CHALLENGE_DESC_3",
+	DAILY_CHALLENGE_DESC_4 = "DAILY_CHALLENGE_DESC_4",
+	DAILY_CHALLENGE_DESC_5 = "DAILY_CHALLENGE_DESC_5",
+	DAILY_CHALLENGE_DESC_6 = "DAILY_CHALLENGE_DESC_6",
+	DAILY_CHALLENGE_DESC_7 = "DAILY_CHALLENGE_DESC_7",
+	DAILY_CHALLENGE_DESC_8 = "DAILY_CHALLENGE_DESC_8",
+	EQUIP_DESC_30 = "EQUIP_DESC_30",
+	EQUIP_PARTS_1 = "EQUIP_PARTS_1",
+	EQUIP_PARTS_2 = "EQUIP_PARTS_2",
+	EQUIP_PARTS_3 = "EQUIP_PARTS_3",
+	EQUIP_PARTS_4 = "EQUIP_PARTS_4",
+	EQUIP_PARTS_5 = "EQUIP_PARTS_5",
+	EQUIP_PARTS_6 = "EQUIP_PARTS_6",
+	EQUIP_HERO_DESC_1 = "EQUIP_HERO_DESC_1",
+	EQUIP_HERO_LV_1 = "EQUIP_HERO_LV_1",
+	EQUIP_HERO_LV_2 = "EQUIP_HERO_LV_2",
+	EQUIP_HERO_LV_3 = "EQUIP_HERO_LV_3",
+	EQUIP_HERO_DESC_2 = "EQUIP_HERO_DESC_2",
+	EQUIP_HERO_DESC_3 = "EQUIP_HERO_DESC_3",
+	EQUIP_HERO_DESC_4 = "EQUIP_HERO_DESC_4",
+	EQUIP_HERO_DESC_5 = "EQUIP_HERO_DESC_5",
+	EQUIP_HERO_DESC_6 = "EQUIP_HERO_DESC_6",
+	EQUIP_HERO_DESC_7 = "EQUIP_HERO_DESC_7",
+	EQUIP_HERO_DESC_8 = "EQUIP_HERO_DESC_8",
+	EQUIP_HERO_DESC_9 = "EQUIP_HERO_DESC_9",
+	EQUIP_HERO_DESC_10 = "EQUIP_HERO_DESC_10",
+	EQUIP_HERO_DESC_11 = "EQUIP_HERO_DESC_11",
+	EQUIP_HERO_DESC_12 = "EQUIP_HERO_DESC_12",
+	EQUIP_HERO_DESC_13 = "EQUIP_HERO_DESC_13",
+	EQUIP_HERO_DESC_14 = "EQUIP_HERO_DESC_14",
+	EQUIP_HERO_DESC_15 = "EQUIP_HERO_DESC_15",
+	EQUIP_HERO_DESC_16 = "EQUIP_HERO_DESC_16",
+	EQUIP_HERO_DESC_17 = "EQUIP_HERO_DESC_17",
+	EQUIP_HERO_DESC_18 = "EQUIP_HERO_DESC_18",
+	EQUIP_HERO_DESC_19 = "EQUIP_HERO_DESC_19",
+	EQUIP_HERO_DESC_20 = "EQUIP_HERO_DESC_20",
+	EQUIP_HERO_DESC_21 = "EQUIP_HERO_DESC_21",
+	EQUIP_HERO_DESC_22 = "EQUIP_HERO_DESC_22",
+	EQUIP_HERO_DESC_23 = "EQUIP_HERO_DESC_23",
+	EQUIP_HERO_DESC_24 = "EQUIP_HERO_DESC_24",
+	EQUIP_HERO_DESC_25 = "EQUIP_HERO_DESC_25",
+	EQUIP_HERO_DESC_26 = "EQUIP_HERO_DESC_26",
+	EQUIP_HERO_DESC_27 = "EQUIP_HERO_DESC_27",
+	EQUIP_HERO_DESC_28 = "EQUIP_HERO_DESC_28",
+	EQUIP_HERO_DESC_29 = "EQUIP_HERO_DESC_29",
+	EQUIP_HERO_DESC_30 = "EQUIP_HERO_DESC_30",
+	EQUIP_HERO_DESC_31 = "EQUIP_HERO_DESC_31",
+	EQUIP_HERO_DESC_32 = "EQUIP_HERO_DESC_32",
+	EQUIP_HERO_DESC_33 = "EQUIP_HERO_DESC_33",
+	EQUIP_HERO_DESC_34 = "EQUIP_HERO_DESC_34",
+	EQUIP_HERO_ACTIVATION_1 = "EQUIP_HERO_ACTIVATION_1",
+	EQUIP_HERO_ACTIVATION_2 = "EQUIP_HERO_ACTIVATION_2",
+	EQUIP_HERO_M_1 = "EQUIP_HERO_M_1",
+	EQUIP_HERO_M_2 = "EQUIP_HERO_M_2",
+	EQUIP_HERO_M_3 = "EQUIP_HERO_M_3",
+	EQUIP_QLT_DESC_1 = "EQUIP_QLT_DESC_1",
+	EQUIP_QLT_DESC_2 = "EQUIP_QLT_DESC_2",
+	EQUIP_QLT_DESC_3 = "EQUIP_QLT_DESC_3",
+	EQUIP_QLT_DESC_4 = "EQUIP_QLT_DESC_4",
+	EQUIP_QLT_DESC_5 = "EQUIP_QLT_DESC_5",
+	LV_POINT = "LV_POINT",
+	EQUIP_HERO_1 = "EQUIP_HERO_1",
+	EQUIP_HERO_2 = "EQUIP_HERO_2",
+	EQUIP_HERO_3 = "EQUIP_HERO_3",
+	EQUIP_DESC_40 = "EQUIP_DESC_40",
+	EQUIP_DESC_48 = "EQUIP_DESC_48",
+	EQUIP_QLT_SELECT = "EQUIP_QLT_SELECT",
+	EQUIP_QLT_SELECT_ALL_1 = "EQUIP_QLT_SELECT_ALL_1",
+	EQUIP_QLT_SELECT_ALL_2 = "EQUIP_QLT_SELECT_ALL_2",
+	REBACK_MATERIAL_DESC = "REBACK_MATERIAL_DESC",
+	ACT_GOGOGO_DESC_1 = "ACT_GOGOGO_DESC_1",
+	ACT_GOGOGO_DESC_2 = "ACT_GOGOGO_DESC_2",
+	ACT_GOGOGO_DESC_3 = "ACT_GOGOGO_DESC_3",
+	ACT_GOGOGO_DESC_4 = "ACT_GOGOGO_DESC_4",
+	ACT_GOGOGO_DESC_5 = "ACT_GOGOGO_DESC_5",
+	ACT_GOGOGO_DESC_6 = "ACT_GOGOGO_DESC_6",
+	ACT_GOGOGO_DESC_7 = "ACT_GOGOGO_DESC_7",
+	ACT_GOGOGO_DESC_8 = "ACT_GOGOGO_DESC_8",
+	ACT_GOGOGO_DESC_9 = "ACT_GOGOGO_DESC_9",
+	ACT_GOGOGO_DESC_10 = "ACT_GOGOGO_DESC_10",
+	ACT_GOGOGO_DESC_11 = "ACT_GOGOGO_DESC_11",
+	ACT_GOGOGO_DESC_12 = "ACT_GOGOGO_DESC_12",
+	ACT_GOGOGO_DESC_13 = "ACT_GOGOGO_DESC_13",
+	ACT_GOGOGO_DESC_14 = "ACT_GOGOGO_DESC_14",
+	ACT_GOGOGO_DESC_15 = "ACT_GOGOGO_DESC_15",
+	ACT_GOGOGO_DESC_16 = "ACT_GOGOGO_DESC_16",
+	ACT_GOGOGO_DESC_17 = "ACT_GOGOGO_DESC_17",
+	ACT_GOGOGO_DESC_18 = "ACT_GOGOGO_DESC_18",
+	ACT_GOGOGO_DESC_19 = "ACT_GOGOGO_DESC_19",
+	ACT_GOGOGO_DESC_20 = "ACT_GOGOGO_DESC_20",
+	ACT_GOGOGO_DESC_21 = "ACT_GOGOGO_DESC_21",
+	ACT_GOGOGO_DESC_22 = "ACT_GOGOGO_DESC_22",
+	ACT_GOGOGO_DESC_23 = "ACT_GOGOGO_DESC_23",
+	ACT_GOGOGO_DESC_24 = "ACT_GOGOGO_DESC_24",
+	DAILY_CHALLENGE_DESC_9 = "DAILY_CHALLENGE_DESC_9",
+	FIRST_CHARGE_TITLE_1 = "FIRST_CHARGE_TITLE_1",
+	FIRST_CHARGE_TITLE_2 = "FIRST_CHARGE_TITLE_2",
+	FIRST_CHARGE_TITLE_3 = "FIRST_CHARGE_TITLE_3",
+	FIRST_CHARGE_TIPS_1 = "FIRST_CHARGE_TIPS_1",
+	FIRST_CHARGE_TIPS_2 = "FIRST_CHARGE_TIPS_2",
+	FIRST_CHARGE_TIPS_3 = "FIRST_CHARGE_TIPS_3",
+	FIRST_CHARGE_1 = "FIRST_CHARGE_1",
+	FIRST_CHARGE_2 = "FIRST_CHARGE_2",
+	FIRST_CHARGE_3 = "FIRST_CHARGE_3",
+	FIRST_CHARGE_4 = "FIRST_CHARGE_4",
+	FUND_CHAPTER_DESC_1 = "FUND_CHAPTER_DESC_1",
+	FUND_CHAPTER_DESC_2 = "FUND_CHAPTER_DESC_2",
+	FUND_CHAPTER_DESC_3 = "FUND_CHAPTER_DESC_3",
+	FUND_CHAPTER_DESC_4 = "FUND_CHAPTER_DESC_4",
+	FUND_CHAPTER_DESC_5 = "FUND_CHAPTER_DESC_5",
+	FUND_CHAPTER_DESC_6 = "FUND_CHAPTER_DESC_6",
+	FUND_DESC_1 = "FUND_DESC_1",
+	FUND_DESC_2 = "FUND_DESC_2",
+	FUND_DESC_3 = "FUND_DESC_3",
+	FUND_DESC_4 = "FUND_DESC_4",
+	FUND_DESC_5 = "FUND_DESC_5",
+	FUND_DESC_6 = "FUND_DESC_6",
+	FUND_TAG_DESC_1 = "FUND_TAG_DESC_1",
+	FUND_TAG_DESC_2 = "FUND_TAG_DESC_2",
+	FUND_TAG_DESC_3 = "FUND_TAG_DESC_3",
+	FUND_TAG_DESC_4 = "FUND_TAG_DESC_4",
+	FUND_TAG_DESC_5 = "FUND_TAG_DESC_5",
+	FUND_TAG_DESC_6 = "FUND_TAG_DESC_6",
+	FUND_TAG_DESC_7 = "FUND_TAG_DESC_7",
+	FUND_TAG_DESC_8 = "FUND_TAG_DESC_8",
+	FUND_TAG_DESC_9 = "FUND_TAG_DESC_9",
+	FUND_TAG_DESC_10 = "FUND_TAG_DESC_10",
+	FUND_TAG_DESC_11 = "FUND_TAG_DESC_11",
+	FUND_TAG_DESC_12 = "FUND_TAG_DESC_12",
+	FUND_TAG_DESC_13 = "FUND_TAG_DESC_13",
+	FUND_TAG_DESC_14 = "FUND_TAG_DESC_14",
+	FUND_TAG_DESC_15 = "FUND_TAG_DESC_15",
+	FUND_TAG_DESC_16 = "FUND_TAG_DESC_16",
+	FUND_TAG_DESC_17 = "FUND_TAG_DESC_17",
+	FUND_TAG_DESC_18 = "FUND_TAG_DESC_18",
+	FUND_TAG_DESC_19 = "FUND_TAG_DESC_19",
+	FUND_TAG_DESC_20 = "FUND_TAG_DESC_20",
+	FUND_TAG_DESC_21 = "FUND_TAG_DESC_21",
+	FUND_TAG_DESC_22 = "FUND_TAG_DESC_22",
+	FUND_TAG_DESC_23 = "FUND_TAG_DESC_23",
+	FUND_TAG_DESC_24 = "FUND_TAG_DESC_24",
+	FUND_TAG_DESC_25 = "FUND_TAG_DESC_25",
+	CHAPTER_TEAM_DESC_2 = "CHAPTER_TEAM_DESC_2",
+	ACT_BOUNTY_SIGNIN_DESC_1 = "ACT_BOUNTY_SIGNIN_DESC_1",
+	ACT_BOUNTY_SIGNIN_DESC_2 = "ACT_BOUNTY_SIGNIN_DESC_2",
+	ACT_BOUNTY_SIGNIN_DESC_3 = "ACT_BOUNTY_SIGNIN_DESC_3",
+	ACT_BOUNTY_SIGNIN_DESC_4 = "ACT_BOUNTY_SIGNIN_DESC_4",
+	ACT_BOUNTY_SIGNIN_DESC_5 = "ACT_BOUNTY_SIGNIN_DESC_5",
+	ACT_BOUNTY_SIGNIN_DESC_6 = "ACT_BOUNTY_SIGNIN_DESC_6",
+	ACT_BOUNTY_SIGNIN_DESC_7 = "ACT_BOUNTY_SIGNIN_DESC_7",
+	ACT_BOUNTY_SIGNIN_DESC_8 = "ACT_BOUNTY_SIGNIN_DESC_8",
+	ACT_BOUNTY_SIGNIN_DESC_9 = "ACT_BOUNTY_SIGNIN_DESC_9",
+	ACT_BOUNTY_SIGNIN_DESC_10 = "ACT_BOUNTY_SIGNIN_DESC_10",
+	ACT_30SIGNIN_1 = "ACT_30SIGNIN_1",
+	ACT_30SIGNIN_2 = "ACT_30SIGNIN_2",
+	ACT_30SIGNIN_3 = "ACT_30SIGNIN_3",
+	ACT_30SIGNIN_4 = "ACT_30SIGNIN_4",
+	ACT_30SIGNIN_5 = "ACT_30SIGNIN_5",
+	ACT_SEVENDAY = "ACT_SEVENDAY",
+	ACT_SEVENDAY_2 = "ACT_SEVENDAY_2",
+	ACT_SEVENDAY_HELP = "ACT_SEVENDAY_HELP",
+	GIFT_DESC_4 = "GIFT_DESC_4",
+	ADVENTURE_CLOSED = "ADVENTURE_CLOSED",
+	TIME_END_DESC_1 = "TIME_END_DESC_1",
+	GIFT_ROUTINE_DESC_1 = "GIFT_ROUTINE_DESC_1",
+	GIFT_ROUTINE_DESC_2 = "GIFT_ROUTINE_DESC_2",
+	GIFT_ROUTINE_DESC_3 = "GIFT_ROUTINE_DESC_3",
+	GIFT_ROUTINE_DESC_4 = "GIFT_ROUTINE_DESC_4",
+	GIFT_ROUTINE_DESC_5 = "GIFT_ROUTINE_DESC_5",
+	GIFT_ROUTINE_DESC_6 = "GIFT_ROUTINE_DESC_6",
+	GIFT_ROUTINE_DESC_7 = "GIFT_ROUTINE_DESC_7",
+	GIFT_ROUTINE_DESC_8 = "GIFT_ROUTINE_DESC_8",
+	GIFT_ROUTINE_DESC_9 = "GIFT_ROUTINE_DESC_9",
+	GIFT_ROUTINE_DESC_10 = "GIFT_ROUTINE_DESC_10",
+	GIFT_ROUTINE_DESC_11 = "GIFT_ROUTINE_DESC_11",
+	GIFT_ROUTINE_DESC_12 = "GIFT_ROUTINE_DESC_12",
+	GIFT_ROUTINE_DESC_13 = "GIFT_ROUTINE_DESC_13",
+	GIFT_ROUTINE_DESC_14 = "GIFT_ROUTINE_DESC_14",
+	GIFT_ROUTINE_DESC_15 = "GIFT_ROUTINE_DESC_15",
+	GIFT_ROUTINE_DESC_16 = "GIFT_ROUTINE_DESC_16",
+	GIFT_ROUTINE_DESC_17 = "GIFT_ROUTINE_DESC_17",
+	GIFT_ROUTINE_DESC_18 = "GIFT_ROUTINE_DESC_18",
+	GIFT_ROUTINE_DESC_19 = "GIFT_ROUTINE_DESC_19",
+	FREE_DESC = "FREE_DESC",
+	ACT_HERO_SUIT_DESC_4 = "ACT_HERO_SUIT_DESC_4",
+	ACT_HERO_SUIT_DESC_5 = "ACT_HERO_SUIT_DESC_5",
+	ACT_HERO_SUIT_DESC_6 = "ACT_HERO_SUIT_DESC_6",
+	EQUIP_DESC_31 = "EQUIP_DESC_31",
+	ADS_DESC_13 = "ADS_DESC_13",
+	ADS_DESC_15 = "ADS_DESC_15",
+	ADS_DESC_16 = "ADS_DESC_16",
+	AD_FREE_DESC_9 = "AD_FREE_DESC_9",
+	MONTHLY_CARD_5 = "MONTHLY_CARD_5",
+	MONTHLY_CARD_7 = "MONTHLY_CARD_7",
+	MONTHLY_CARD_12 = "MONTHLY_CARD_12",
+	MONTHLY_CARD_13 = "MONTHLY_CARD_13",
+	MONTHLY_CARD_14 = "MONTHLY_CARD_14",
+	MONTHLY_CARD_15 = "MONTHLY_CARD_15",
+	MONTHLY_CARD_17 = "MONTHLY_CARD_17",
+	PRIVILEGE_CARD_NAME_1 = "PRIVILEGE_CARD_NAME_1",
+	PRIVILEGE_CARD_NAME_2 = "PRIVILEGE_CARD_NAME_2",
+	PRIVILEGE_CARD_NAME_3 = "PRIVILEGE_CARD_NAME_3",
+	PRIVILEGE_CARD_DESC_1 = "PRIVILEGE_CARD_DESC_1",
+	PRIVILEGE_CARD_DESC_2 = "PRIVILEGE_CARD_DESC_2",
+	PRIVILEGE_CARD_DESC_3 = "PRIVILEGE_CARD_DESC_3",
+	PRIVILEGE_CARD_DESC_4 = "PRIVILEGE_CARD_DESC_4",
+	PRIVILEGE_CARD_DESC_5 = "PRIVILEGE_CARD_DESC_5",
+	PRIVILEGE_CARD_DESC_6 = "PRIVILEGE_CARD_DESC_6",
+	PRIVILEGE_CARD_DESC_7 = "PRIVILEGE_CARD_DESC_7",
+	STAR_UNLOCK = "STAR_UNLOCK",
+	HERO_DESC_24 = "HERO_DESC_24",
+	HERO_DESC_25 = "HERO_DESC_25",
+	HERO_DESC_26 = "HERO_DESC_26",
+	HERO_DESC_27 = "HERO_DESC_27",
+	HERO_DESC_28 = "HERO_DESC_28",
+	HERO_DESC_29 = "HERO_DESC_29",
+	HERO_DESC_30 = "HERO_DESC_30",
+	DUNGEON_TITLE_1 = "DUNGEON_TITLE_1",
+	DUNGEON_HELP_1 = "DUNGEON_HELP_1",
+	DUNGEON_DESC_1 = "DUNGEON_DESC_1",
+	DUNGEON_DESC_2 = "DUNGEON_DESC_2",
+	DUNGEON_DESC_3 = "DUNGEON_DESC_3",
+	DUNGEON_DESC_4 = "DUNGEON_DESC_4",
+	CHEAT_1 = "CHEAT_1",
+	BATTLE_DESC_18 = "BATTLE_DESC_18",
+	CHALLENGE_TEAM_10 = "CHALLENGE_TEAM_10",
+	HELP_DESC = "HELP_DESC",
+	SUMMON_HELP_1 = "SUMMON_HELP_1",
+	SUMMON_DESCR_1 = "SUMMON_DESCR_1",
+	SUMMON_DESCR_2 = "SUMMON_DESCR_2",
+	SUMMON_DESCR_3 = "SUMMON_DESCR_3",
+	SUMMON_DESCR_4 = "SUMMON_DESCR_4",
+	SUMMON_DESCR_5 = "SUMMON_DESCR_5",
+	SUMMON_DESCR_6 = "SUMMON_DESCR_6",
+	SUMMON_DESCR_7 = "SUMMON_DESCR_7",
+	SUMMON_DESCR_8 = "SUMMON_DESCR_8",
+	SEVEN_DAY_DESC_3 = "SEVEN_DAY_DESC_3",
+	SEVEN_DAY_DESC_4 = "SEVEN_DAY_DESC_4",
+	BATTLE_DESC_19 = "BATTLE_DESC_19",
+	BATTLE_DESC_20 = "BATTLE_DESC_20",
+	ADS_DESC_1 = "ADS_DESC_1",
+	ADS_DESC_2 = "ADS_DESC_2",
+	ADS_DESC_3 = "ADS_DESC_3",
+	ADS_DESC_4 = "ADS_DESC_4",
+	ADS_DESC_5 = "ADS_DESC_5",
+	ADS_DESC_6 = "ADS_DESC_6",
+	ADS_DESC_7 = "ADS_DESC_7",
+	ADS_DESC_9 = "ADS_DESC_9",
+	ADS_DESC_10 = "ADS_DESC_10",
+	ADS_DESC_11 = "ADS_DESC_11",
+	ADS_DESC_12 = "ADS_DESC_12",
+	ADS_DESC_14 = "ADS_DESC_14",
+	IDLE_DESC_8 = "IDLE_DESC_8",
+	IDLE_DESC_9 = "IDLE_DESC_9",
+	CARD_MONTHLY_DESC_33 = "CARD_MONTHLY_DESC_33",
+	NEXT_REFRESH_DESC = "NEXT_REFRESH_DESC",
+	DUNGEON_TITLE_6 = "DUNGEON_TITLE_6",
+	DUNGEON_TITLE_7 = "DUNGEON_TITLE_7",
+	DUNGEON_TITLE_8 = "DUNGEON_TITLE_8",
+	DUNGEON_TITLE_9 = "DUNGEON_TITLE_9",
+	FUNC_OPEN_STAGE_SEVER = "FUNC_OPEN_STAGE_SEVER",
+	FUNC_OPEN_LEVEL_SEVER = "FUNC_OPEN_LEVEL_SEVER",
+	FUNC_OPEN_STAGE_OR_SEVER = "FUNC_OPEN_STAGE_OR_SEVER",
+	ACT_TURNTABLE_DESC_5 = "ACT_TURNTABLE_DESC_5",
+	VALUE_DESC = "VALUE_DESC",
+	USING_DESC = "USING_DESC",
+	FUND_CHAPTER_TAG_DESC_1 = "FUND_CHAPTER_TAG_DESC_1",
+	FUND_CHAPTER_TAG_DESC_2 = "FUND_CHAPTER_TAG_DESC_2",
+	FUND_CHAPTER_TAG_DESC_3 = "FUND_CHAPTER_TAG_DESC_3",
+	FUND_CHAPTER_TAG_DESC_4 = "FUND_CHAPTER_TAG_DESC_4",
+	FUND_CHAPTER_TAG_DESC_5 = "FUND_CHAPTER_TAG_DESC_5",
+	FUND_CHAPTER_TAG_DESC_6 = "FUND_CHAPTER_TAG_DESC_6",
+	FUND_CHAPTER_TAG_DESC_7 = "FUND_CHAPTER_TAG_DESC_7",
+	FUND_CHAPTER_TAG_DESC_8 = "FUND_CHAPTER_TAG_DESC_8",
+	FUND_CHAPTER_TAG_DESC_9 = "FUND_CHAPTER_TAG_DESC_9",
+	FUND_CHAPTER_TAG_DESC_10 = "FUND_CHAPTER_TAG_DESC_10",
+	FUND_CHAPTER_TAG_DESC_11 = "FUND_CHAPTER_TAG_DESC_11",
+	FUND_CHAPTER_TAG_DESC_12 = "FUND_CHAPTER_TAG_DESC_12",
+	FUND_CHAPTER_TAG_DESC_13 = "FUND_CHAPTER_TAG_DESC_13",
+	FUND_CHAPTER_TAG_DESC_14 = "FUND_CHAPTER_TAG_DESC_14",
+	FUND_CHAPTER_TAG_DESC_15 = "FUND_CHAPTER_TAG_DESC_15",
+	FUND_CHAPTER_TAG_DESC_16 = "FUND_CHAPTER_TAG_DESC_16",
+	FUND_CHAPTER_TAG_DESC_17 = "FUND_CHAPTER_TAG_DESC_17",
+	FUND_CHAPTER_TAG_DESC_18 = "FUND_CHAPTER_TAG_DESC_18",
+	FUND_CHAPTER_TAG_DESC_19 = "FUND_CHAPTER_TAG_DESC_19",
+	FUND_CHAPTER_TAG_DESC_20 = "FUND_CHAPTER_TAG_DESC_20",
+	FUND_CHAPTER_TAG_DESC_21 = "FUND_CHAPTER_TAG_DESC_21",
+	FUND_CHAPTER_TAG_DESC_22 = "FUND_CHAPTER_TAG_DESC_22",
+	TALENT_HELP = "TALENT_HELP",
 }
 
 return LocalizationGlobalConst

lua/app/config/mall_daily_store.lua.meta

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

lua/app/config/mall_gold.lua

@@ -5,18 +5,19 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=600,
+			["num"]=1500,
- 			["num_for_nothing"]="UAhc"
+ 			["num_for_nothing"]="Vw1cAw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=25,
+			["num"]=60,
- 			["num_for_nothing"]="VA0="
+ 			["num_for_nothing"]="UAg="
 		},
-		["daily"]=2
+		["daily_ad"]=2,
+		["daily_free"]=1
 	},
 	[2]={
 		["gold"]={
@@ -24,16 +25,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3000,
+			["num"]=7500,
- 			["num_for_nothing"]="VQhcAw=="
+ 			["num_for_nothing"]="UQ1cAw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=99,
+			["num"]=300,
- 			["num_for_nothing"]="XwE="
+ 			["num_for_nothing"]="VQhc"
 		}
 	},
 	[3]={
@@ -42,16 +43,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=30000,
+			["num"]=75000,
- 			["num_for_nothing"]="VQhcA2U="
+ 			["num_for_nothing"]="UQ1cA2U="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=500,
+			["num"]=3000,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="VQhcAw=="
 		}
 	}
 }

lua/app/config/mall_treasure.lua

@@ -1,32 +1,19 @@
 local mall_treasure = {
 	[1]={
+		["recharge_id"]=1,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=6,
+				["num"]=120,
- 				["num_for_nothing"]="UA=="
+ 				["num_for_nothing"]="Vwpc"
-			}
-		},
-		["daily"]=5
-	},
-	[2]={
-		["recharge_id"]=2,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
 			}
 		},
 		["limit"]=1
 	},
-	[3]={
+	[2]={
 		["recharge_id"]=5,
 		["reward"]={
 			{
@@ -34,13 +21,13 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=150,
+				["num"]=600,
- 				["num_for_nothing"]="Vw1c"
+ 				["num_for_nothing"]="UAhc"
 			}
 		},
 		["limit"]=1
 	},
-	[4]={
+	[3]={
 		["recharge_id"]=10,
 		["reward"]={
 			{
@@ -48,13 +35,13 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=500,
+				["num"]=1200,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="VwpcAw=="
 			}
 		},
-		["limit"]=2
+		["limit"]=1
 	},
-	[5]={
+	[4]={
 		["recharge_id"]=13,
 		["reward"]={
 			{
@@ -62,27 +49,13 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=1000,
+				["num"]=2400,
- 				["num_for_nothing"]="VwhcAw=="
+ 				["num_for_nothing"]="VAxcAw=="
 			}
 		},
-		["limit"]=2
+		["limit"]=1
 	},
-	[6]={
+	[5]={
-		["recharge_id"]=15,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1500,
- 				["num_for_nothing"]="Vw1cAw=="
-			}
-		},
-		["limit"]=2
-	},
-	[7]={
 		["recharge_id"]=16,
 		["reward"]={
 			{
@@ -90,28 +63,14 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=2600,
+				["num"]=6000,
- 				["num_for_nothing"]="VA5cAw=="
+ 				["num_for_nothing"]="UAhcAw=="
 			}
 		},
-		["limit"]=3
+		["limit"]=1
 	},
-	[8]={
+	[6]={
 		["recharge_id"]=18,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=5800,
- 				["num_for_nothing"]="UwBcAw=="
-			}
-		},
-		["limit"]=3
-	},
-	[9]={
-		["recharge_id"]=19,
 		["reward"]={
 			{
 				["type"]=1,
@@ -122,10 +81,10 @@ local mall_treasure = {
  				["num_for_nothing"]="VwpcA2U="
 			}
 		},
-		["limit"]=3
+		["limit"]=1
 	}
 }
 local config = {
-data=mall_treasure,count=9
+data=mall_treasure,count=6
 }
 return config

lua/app/config/monster_base.lua

@@ -1,7 +1,7 @@
 local monster_base = {
 	[10001]={
 		["model_id"]="m10001",
-		["body"]=3,
+		["body"]=1,
 		["model_ui"]=1.0
 	},
 	[10002]={
@@ -49,6 +49,11 @@ local monster_base = {
 		["body"]=2,
 		["model_ui"]=1.0
 	},
+	[10011]={
+		["model_id"]="m10011",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
 	[10012]={
 		["model_id"]="m10012",
 		["body"]=2,
@@ -89,296 +94,6 @@ local monster_base = {
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[10020]={
-		["model_id"]="m10020",
-		["body"]=3,
-		["model_ui"]=1.0
-	},
-	[10021]={
-		["model_id"]="m10021",
-		["body"]=3,
-		["model_ui"]=1.0
-	},
-	[10022]={
-		["model_id"]="m10022",
-		["body"]=3,
-		["model_ui"]=1.0
-	},
-	[10023]={
-		["model_id"]="m10023",
-		["body"]=3,
-		["model_ui"]=1.0
-	},
-	[10024]={
-		["model_id"]="m10024",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10025]={
-		["model_id"]="m10025",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10026]={
-		["model_id"]="m10026",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10027]={
-		["model_id"]="m10027",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10028]={
-		["model_id"]="m10028",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10029]={
-		["model_id"]="m10029",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10030]={
-		["model_id"]="m10030",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10031]={
-		["model_id"]="m10031",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10032]={
-		["model_id"]="m10032",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10033]={
-		["model_id"]="m10033",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10034]={
-		["model_id"]="m10034",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10035]={
-		["model_id"]="m10035",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10036]={
-		["model_id"]="m10036",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10037]={
-		["model_id"]="m10037",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10038]={
-		["model_id"]="m10038",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10039]={
-		["model_id"]="m10039",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10040]={
-		["model_id"]="m10040",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10041]={
-		["model_id"]="m10041",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10042]={
-		["model_id"]="m10042",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10043]={
-		["model_id"]="m10043",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10044]={
-		["model_id"]="m10044",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10045]={
-		["model_id"]="m10045",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10046]={
-		["model_id"]="m10046",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10047]={
-		["model_id"]="m10047",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10048]={
-		["model_id"]="m10048",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10049]={
-		["model_id"]="m10049",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10050]={
-		["model_id"]="m10050",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10051]={
-		["model_id"]="m10051",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10052]={
-		["model_id"]="m10052",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10053]={
-		["model_id"]="m10053",
-		["body"]=3,
-		["model_ui"]=1.0
-	},
-	[10054]={
-		["model_id"]="m10054",
-		["body"]=3,
-		["model_ui"]=1.0
-	},
-	[10055]={
-		["model_id"]="m10055",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10056]={
-		["model_id"]="m10056",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10057]={
-		["model_id"]="m10057",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10058]={
-		["model_id"]="m10058",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10059]={
-		["model_id"]="m10059",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10060]={
-		["model_id"]="m10060",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10061]={
-		["model_id"]="m10061",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10062]={
-		["model_id"]="m10062",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10063]={
-		["model_id"]="m10063",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10064]={
-		["model_id"]="m10064",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10065]={
-		["model_id"]="m10065",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10066]={
-		["model_id"]="m10066",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10067]={
-		["model_id"]="m10067",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10068]={
-		["model_id"]="m10068",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10069]={
-		["model_id"]="m10069",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10070]={
-		["model_id"]="m10070",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10071]={
-		["model_id"]="m10071",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10072]={
-		["model_id"]="m10072",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10073]={
-		["model_id"]="m10073",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10074]={
-		["model_id"]="m10074",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10075]={
-		["model_id"]="m10075",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10076]={
-		["model_id"]="m10076",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
-	[10077]={
-		["model_id"]="m10077",
-		["body"]=2,
-		["model_ui"]=1.0
-	},
 	[20001]={
 		["model_id"]="m20001",
 		["body"]=1,
@@ -392,7 +107,7 @@ local monster_base = {
 	[20003]={
 		["model_id"]="m20003",
 		["body"]=1,
-		["model_ui"]=0.8
+		["model_ui"]=1.0
 	},
 	[20004]={
 		["model_id"]="m20004",
@@ -402,7 +117,7 @@ local monster_base = {
 	[20005]={
 		["model_id"]="m20005",
 		["body"]=1,
-		["model_ui"]=0.8
+		["model_ui"]=1.0
 	},
 	[20006]={
 		["model_id"]="m20006",
@@ -419,393 +134,178 @@ local monster_base = {
 		["body"]=1,
 		["model_ui"]=1.0
 	},
-	[20009]={
-		["model_id"]="m20009",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20010]={
-		["model_id"]="m20010",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20011]={
-		["model_id"]="m20011",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20012]={
-		["model_id"]="m20012",
-		["body"]=1,
-		["model_ui"]=1.2
-	},
-	[20013]={
-		["model_id"]="m20013",
-		["body"]=1,
-		["model_ui"]=1.2
-	},
-	[20014]={
-		["model_id"]="m20014",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20015]={
-		["model_id"]="m20015",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20016]={
-		["model_id"]="m20016",
-		["body"]=1,
-		["model_ui"]=1.2
-	},
-	[20017]={
-		["model_id"]="m20017",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20018]={
-		["model_id"]="m20018",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20019]={
-		["model_id"]="m20019",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20020]={
-		["model_id"]="m20020",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20021]={
-		["model_id"]="m20021",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20022]={
-		["model_id"]="m20022",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20023]={
-		["model_id"]="m20023",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20024]={
-		["model_id"]="m20024",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20025]={
-		["model_id"]="m20025",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20026]={
-		["model_id"]="m20026",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20027]={
-		["model_id"]="m20027",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20028]={
-		["model_id"]="m20028",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20029]={
-		["model_id"]="m20029",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20030]={
-		["model_id"]="m20030",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20031]={
-		["model_id"]="m20031",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20032]={
-		["model_id"]="m20032",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20033]={
-		["model_id"]="m20033",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20034]={
-		["model_id"]="m20034",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20035]={
-		["model_id"]="m20035",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20036]={
-		["model_id"]="m20036",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20037]={
-		["model_id"]="m20037",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20038]={
-		["model_id"]="m20038",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20039]={
-		["model_id"]="m20039",
-		["body"]=1,
-		["model_ui"]=0.8
-	},
-	[20040]={
-		["model_id"]="m20040",
-		["body"]=1,
-		["model_ui"]=0.8
-	},
-	[20041]={
-		["model_id"]="m20041",
-		["body"]=1,
-		["model_ui"]=0.8
-	},
-	[20042]={
-		["model_id"]="m20042",
-		["body"]=1,
-		["model_ui"]=0.8
-	},
-	[20043]={
-		["model_id"]="m20043",
-		["body"]=1,
-		["model_ui"]=0.8
-	},
-	[20044]={
-		["model_id"]="m20044",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20045]={
-		["model_id"]="m20045",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20046]={
-		["model_id"]="m20046",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20047]={
-		["model_id"]="m20047",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20048]={
-		["model_id"]="m20048",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20049]={
-		["model_id"]="m20049",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20050]={
-		["model_id"]="m20050",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20051]={
-		["model_id"]="m20051",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20052]={
-		["model_id"]="m20052",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20053]={
-		["model_id"]="m20053",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20054]={
-		["model_id"]="m20054",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20055]={
-		["model_id"]="m20055",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20056]={
-		["model_id"]="m20056",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20057]={
-		["model_id"]="m20057",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20058]={
-		["model_id"]="m20058",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
 	[30001]={
-		["model_id"]="p0001",
+		["model_id"]="m30001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30002]={
-		["model_id"]="p0002",
+		["model_id"]="m30002",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30003]={
-		["model_id"]="p0003",
+		["model_id"]="m30003",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30004]={
-		["model_id"]="p0004",
+		["model_id"]="m30001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30005]={
-		["model_id"]="p0005",
+		["model_id"]="m30002",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30006]={
-		["model_id"]="p0006",
+		["model_id"]="m30003",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30007]={
-		["model_id"]="p0007",
+		["model_id"]="m30001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30008]={
-		["model_id"]="p0008",
+		["model_id"]="m30002",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30009]={
-		["model_id"]="p0009",
+		["model_id"]="m30003",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
 	[30010]={
-		["model_id"]="p0010",
+		["model_id"]="m30001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30011]={
+	[413001]={
-		["model_id"]="p0011",
+		["model_id"]="p13001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30012]={
+	[414001]={
-		["model_id"]="p0012",
+		["model_id"]="p14001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30014]={
+	[415001]={
-		["model_id"]="p0014",
+		["model_id"]="p15001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30015]={
+	[415002]={
-		["model_id"]="p0015",
+		["model_id"]="p15002",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30016]={
+	[416001]={
-		["model_id"]="p0016",
+		["model_id"]="p16001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30017]={
+	[423001]={
-		["model_id"]="p0017",
+		["model_id"]="p23001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30018]={
+	[424001]={
-		["model_id"]="p0018",
+		["model_id"]="p24001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30019]={
+	[425001]={
-		["model_id"]="p0019",
+		["model_id"]="p25001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30020]={
+	[425002]={
-		["model_id"]="p0020",
+		["model_id"]="p25002",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30021]={
+	[426001]={
-		["model_id"]="p0021",
+		["model_id"]="p26001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30022]={
+	[433001]={
-		["model_id"]="p0022",
+		["model_id"]="p33001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30023]={
+	[434001]={
-		["model_id"]="p0023",
+		["model_id"]="p34001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30024]={
+	[435001]={
-		["model_id"]="p0024",
+		["model_id"]="p35001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30025]={
+	[435002]={
-		["model_id"]="p0025",
+		["model_id"]="p35002",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30026]={
+	[443001]={
-		["model_id"]="p0026",
+		["model_id"]="p43001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30043]={
+	[444001]={
-		["model_id"]="p0043",
+		["model_id"]="p44001",
 		["body"]=2,
 		["model_ui"]=1.0
 	},
-	[30044]={
+	[445001]={
-		["model_id"]="p0044",
+		["model_id"]="p45001",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[445002]={
+		["model_id"]="p45002",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[453001]={
+		["model_id"]="p53001",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[454001]={
+		["model_id"]="p54001",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[455001]={
+		["model_id"]="p55001",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[455002]={
+		["model_id"]="p55002",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[501001]={
+		["model_id"]="m30001",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[501002]={
+		["model_id"]="m30003",
 		["body"]=2,
 		["model_ui"]=1.0
 	}
 }
 local config = {
-data=monster_base,count=161
+data=monster_base,count=61
 }
 return config

lua/app/config/monster_dungeon.lua

@@ -0,0 +1,646 @@
+local monster_dungeon = {
+	[103]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=1800000,
+		["hp"]=240000000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[203]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=5600000,
+		["hp"]=680000000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[303]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=7200000,
+		["hp"]=920000000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[403]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=8460000,
+		["hp"]=1129820000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[503]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=11130000,
+		["hp"]=1662460000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[603]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=14100000,
+		["hp"]=2211230000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[703]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=18330000,
+		["hp"]=3002110000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[803]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=22640000,
+		["hp"]=3873680000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[903]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=29540000,
+		["hp"]=5326320000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1003]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=32810000,
+		["hp"]=6197890000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1103]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=37930000,
+		["hp"]=8167020000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1203]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=44910000,
+		["hp"]=11120700000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1303]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=51810000,
+		["hp"]=13719300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1403]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=57900000,
+		["hp"]=16011230000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1503]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=63910000,
+		["hp"]=18577540000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1603]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=72890000,
+		["hp"]=22919300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1703]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=82020000,
+		["hp"]=27712980000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1803]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=91520000,
+		["hp"]=33087720000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1903]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=101320000,
+		["hp"]=38898250000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[2003]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=113200000,
+		["hp"]=44418250000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[100103]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=1800000,
+		["hp"]=240000000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100203]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=5600000,
+		["hp"]=680000000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100303]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=7200000,
+		["hp"]=920000000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100403]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=8460000,
+		["hp"]=1129820000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100503]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=11130000,
+		["hp"]=1662460000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100603]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=14100000,
+		["hp"]=2211230000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100703]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=18330000,
+		["hp"]=3002110000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100803]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=22640000,
+		["hp"]=3873680000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[100903]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=29540000,
+		["hp"]=5326320000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101003]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=32810000,
+		["hp"]=6197890000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101103]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=37930000,
+		["hp"]=8167020000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101203]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=44910000,
+		["hp"]=11120700000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101303]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=51810000,
+		["hp"]=13719300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101403]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=57900000,
+		["hp"]=16011230000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101503]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=63910000,
+		["hp"]=18577540000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101603]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=72890000,
+		["hp"]=22919300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101703]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=82020000,
+		["hp"]=27712980000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101803]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=91520000,
+		["hp"]=33087720000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101903]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=101320000,
+		["hp"]=38898250000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[102003]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=113200000,
+		["hp"]=44418250000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	}
+}
+local config = {
+data=monster_dungeon,count=40
+}
+return config

lua/app/config/monster_dungeon.lua.meta

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

lua/app/config/player_initial.lua

@@ -3,8 +3,8 @@ local player_initial = {
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
-			["id"]=32001,
+			["id"]=23001,
- 			["id_for_nothing"]="VQpcA2Q=",
+ 			["id_for_nothing"]="VAtcA2Q=",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		}
@@ -13,8 +13,8 @@ local player_initial = {
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
-			["id"]=22001,
+			["id"]=33001,
- 			["id_for_nothing"]="VApcA2Q=",
+ 			["id_for_nothing"]="VQtcA2Q=",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		}
@@ -23,8 +23,8 @@ local player_initial = {
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
-			["id"]=42001,
+			["id"]=43001,
- 			["id_for_nothing"]="UgpcA2Q=",
+ 			["id_for_nothing"]="UgtcA2Q=",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		}

lua/app/config/recovery.lua

@@ -2,22 +2,15 @@ local recovery = {
 	[3]={
 		["type"]=1,
 		["time"]=600,
-		["limit"]=60
+		["limit"]=60,
+		["monthly_card"]=80
 	},
-	[22]={
+	[8]={
 		["type"]=2,
 		["limit"]=5
-	},
-	[49]={
-		["type"]=2,
-		["limit"]=10
-	},
-	[50]={
-		["type"]=2,
-		["limit"]=10
 	}
 }
 local config = {
-data=recovery,count=4
+data=recovery,count=2
 }
 return config