新手14天乐

lua/app/common/bi_report.lua

@@ -140,6 +140,10 @@ BIReport.ITEM_GET_TYPE = {
 	OFFLINE_RECOVERY = "OfflineRecovery",
 	ACT_SUMMER = "ActSummer",
 	ACT_HERO_FUND = "ActHeroFund",
+	ACT_FOURTEEN_DAY_BOUNTY = "ActFourteenDayBounty",
+	ACT_FOURTEEN_DAY_TASK = "ActFourteenDayTask",
+	ACT_FOURTEEN_DAY_EXCHANGE = "ActFourteenDayExchange",
+	FOURTEEN_DAY_GIFT = "FourteenDayGift",
 }
 
 BIReport.ADS_CLICK_TYPE = {
@@ -208,7 +212,8 @@ BIReport.GIFT_TYPE = {
 	WEAPON_GIFT = "WeaponGift",
 	ARMOR_GIFT = "ArmorGift",
 	ACT_SUMMER = "ActSummer",
-	ACT_HERO_FUND = "ActHeroFund"
+	ACT_HERO_FUND = "ActHeroFund",
+	FOURTEEN_DAY_GIFT = "FourteenDayGift",
 }
 
 BIReport.COIN_TYPE = {

lua/app/common/data_manager.lua

@@ -34,6 +34,7 @@ function DataManager:init()
 	self:initManager("SummonData", "app/userdata/summon/summon_data")
 	self:initManager("AIHelperData", "app/userdata/game_setting/ai_helper_data")
 	self:initManager("HeroFundData", "app/userdata/activity/hero_fund/hero_fund_data")
+	self:initManager("FourteenDayData", "app/userdata/activity/fourteen_day/fourteen_day_data")
 end
 
 function DataManager:initManager(name, path)
@@ -120,6 +121,7 @@ function DataManager:clear()
 	self.TaskData:clear()
 	self.AIHelperData:clear()
 	self.HeroFundData:clear()
+	self.FourteenDayData:clear()
 	ModuleManager.TaskManager:clear()
 	self:clearTryOpenFunc()
 end
@@ -181,6 +183,7 @@ function DataManager:initWithServerData(data)
 		self.GrowthFundData:init(data.fund.funds)
 	end
 	self.HeroFundData:init(data.hero_fund)
+	self.FourteenDayData:init(data.fourteen_bounty)
 
 	-- 任务数据最后初始化,依赖其他模块的数据
 	self.TaskData:init()

lua/app/common/local_data.lua

@@ -40,6 +40,7 @@ local LOCAL_DATA_KEY = {
 	BATTLE_SNAPSHOT = "BATTLE_SNAPSHOT",
 	ACTIVITY_SUMMER_TODAY_SKIN = "ACTIVITY_SUMMER_TODAY_SKIN",
 	ACTIVITY_SUMMER_TODAY_HERO = "ACTIVITY_SUMMER_TODAY_HERO",
+	FOURTEEN_DAY_TODAY_EXCHANGE = "FOURTEEN_DAY_TODAY_EXCHANGE",
 }
 
 LocalData.KEYS = LOCAL_DATA_KEY
@@ -465,4 +466,16 @@ function LocalData:recordTodayActSummerWatchedHero()
 	self:setInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_HERO .. Time:getBeginningOfServerToday(), 1)
 end
 
+function LocalData:getTodayFourteenDayExchangeWatched()
+	return self:getInt(LOCAL_DATA_KEY.FOURTEEN_DAY_TODAY_EXCHANGE .. Time:getBeginningOfServerToday(), 0) == 1
+end
+
+function LocalData:recordTodayFourteenDayExchangeWatched()
+	if self:getTodayFourteenDayExchangeWatched() then
+		return
+	end
+	self:setInt(LOCAL_DATA_KEY.FOURTEEN_DAY_TODAY_EXCHANGE .. Time:getBeginningOfServerToday(), 1)
+	DataManager.FourteenDayData:setDirty()
+end
+
 return LocalData

lua/app/common/module_manager.lua

@@ -71,6 +71,8 @@ local MODULE_PATHS = {
 	SkinManager = "app/module/skin/skin_manager",
 	-- 英雄基金
 	HeroFundManager = "app/module/activity/hero_fund/hero_fund_manager",
+	-- 新手14天乐
+	FourteenDayManager = "app/module/activity/fourteen_day/fourteen_day_manager",
 }
 
 -- 这里的key对应func_open里的id

lua/app/common/pay_manager.lua

@@ -26,6 +26,7 @@ PayManager.PURCHARSE_ACT_TYPE = {
     ACT_HERO_FUND = 14,
     WEAPON_UPGRADE_GIFT = 15,
     ARMOR_UPGRADE_GIFT = 16,
+    FOURTEEN_DAY_GIFT = 17,
 }
 
 PayManager.PURCHARSE_TYPE_CONFIG = {
@@ -54,6 +55,7 @@ PayManager.BI_ITEM_GET_TYPE = {
         [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE,
@@ -79,6 +81,7 @@ PayManager.BI_GIFT_TYPE = {
         [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE,

lua/app/config/act_fourteen_bounty.lua

@@ -3,18 +3,18 @@ local act_fourteen_bounty = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=1100,
- 			["num_for_nothing"]="VwlcAw=="
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=8000,
+ 			["num_for_nothing"]="XghcAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=1100,
- 			["num_for_nothing"]="VwlcAw=="
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
 		}
 	},
 	[2]={
@@ -23,52 +23,52 @@ local act_fourteen_bounty = {
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=1101,
- 			["num_for_nothing"]="VwlcAg=="
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=1101,
- 			["num_for_nothing"]="VwlcAg=="
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=60,
+ 			["num_for_nothing"]="UAg="
 		}
 	},
 	[3]={
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=1102,
- 			["num_for_nothing"]="VwlcAQ=="
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=1102,
- 			["num_for_nothing"]="VwlcAQ=="
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
 		}
 	},
 	[4]={
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=1103,
- 			["num_for_nothing"]="VwlcAA=="
+			["id"]=10,
+ 			["id_for_nothing"]="Vwg=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=1103,
- 			["num_for_nothing"]="VwlcAA=="
+			["id"]=11,
+ 			["id_for_nothing"]="Vwk=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
 		}
 	},
 	[5]={
@@ -77,34 +77,34 @@ local act_fourteen_bounty = {
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=1104,
- 			["num_for_nothing"]="VwlcBw=="
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=1104,
- 			["num_for_nothing"]="VwlcBw=="
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
 		}
 	},
 	[6]={
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=1105,
- 			["num_for_nothing"]="VwlcBg=="
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=3,
  			["id_for_nothing"]="VQ==",
-			["num"]=1105,
- 			["num_for_nothing"]="VwlcBg=="
+			["num"]=60,
+ 			["num_for_nothing"]="UAg="
 		}
 	},
 	[7]={
@@ -113,20 +113,38 @@ local act_fourteen_bounty = {
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=1106,
- 			["num_for_nothing"]="VwlcBQ=="
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=1106,
- 			["num_for_nothing"]="VwlcBQ=="
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		}
+	},
+	[8]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
 		}
 	}
 }
 local config = {
-data=act_fourteen_bounty,count=7
+data=act_fourteen_bounty,count=8
 }
 return config

lua/app/config/act_fourteen_exchange.lua

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

lua/app/config/act_gift.lua

@@ -2558,9 +2558,198 @@ local act_gift = {
 		["limit_time"]=6,
 		["cd"]=1,
 		["value"]=800
+	},
+	[170102]={
+		["type"]=17,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[170202]={
+		["type"]=17,
+		["recharge_id"]=5,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=120,
+ 				["num_for_nothing"]="Vwpc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=5000,
+ 				["num_for_nothing"]="UwhcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["limit"]=5,
+		["value"]=800
+	},
+	[170302]={
+		["type"]=17,
+		["recharge_id"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			}
+		},
+		["limit"]=5,
+		["value"]=800
+	},
+	[170402]={
+		["type"]=17,
+		["recharge_id"]=13,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=720,
+ 				["num_for_nothing"]="UQpc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=20000,
+ 				["num_for_nothing"]="VAhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=400,
+ 				["num_for_nothing"]="Ughc"
+			}
+		},
+		["limit"]=5,
+		["value"]=900
+	},
+	[170502]={
+		["type"]=17,
+		["recharge_id"]=16,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=2000,
+ 				["num_for_nothing"]="VAhcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		},
+		["limit"]=5,
+		["value"]=900
+	},
+	[170602]={
+		["type"]=17,
+		["recharge_id"]=18,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=4200,
+ 				["num_for_nothing"]="UgpcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=100000,
+ 				["num_for_nothing"]="VwhcA2VR"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=2000,
+ 				["num_for_nothing"]="VAhcAw=="
+			}
+		},
+		["limit"]=5,
+		["value"]=1000
 	}
 }
 local config = {
-data=act_gift,count=79
+data=act_gift,count=85
 }
 return config

lua/app/config/arena_bounty_level.lua

@@ -3253,8 +3253,8 @@ local arena_bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=23,
- 			["id_for_nothing"]="VAs=",
+			["id"]=1400101,
+ 			["id_for_nothing"]="VwxcA2RRfg==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		}

lua/app/config/arena_time.lua

@@ -16,9 +16,15 @@ local arena_time = {
 		["start_time"]="2023-9-15 00:00:00",
 		["end_time"]="2023-10-16 00:00:00",
 		["ui_banner"]="ui_arena_bounty_banner_1"
+	},
+	[4]={
+		["season"]=4,
+		["start_time"]="2023-10-16 00:00:00",
+		["end_time"]="2023-11-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_1"
 	}
 }
 local config = {
-data=arena_time,count=3
+data=arena_time,count=4
 }
 return config

lua/app/config/avatar.lua

@@ -6,7 +6,8 @@ local avatar = {
 	},
 	[24]={
 		["iconId"]="avatar_2",
-		["item"]=44
+		["item"]=44,
+		["unlock_show"]=true
 	},
 	[1001]={
 		["iconId"]="1",

lua/app/config/avatar_frame.lua

@@ -20,9 +20,19 @@ local avatar_frame = {
 	[27]={
 		["iconId"]="avatar_frame_5",
 		["item"]=46
+	},
+	[28]={
+		["iconId"]="avatar_frame_6",
+		["item"]=53,
+		["unlock_show"]=true
+	},
+	[29]={
+		["iconId"]="avatar_frame_7",
+		["item"]=54,
+		["unlock_show"]=true
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/chapter.lua

@@ -7580,8 +7580,8 @@ local chapter = {
  				["num_for_nothing"]="Vw=="
 			}
 		},
-		["idle_exp"]=30,
-		["idle_gold"]=55,
+		["idle_exp"]=35,
+		["idle_gold"]=87,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -7799,8 +7799,8 @@ local chapter = {
  				["num_for_nothing"]="Vw=="
 			}
 		},
-		["idle_exp"]=32,
-		["idle_gold"]=55,
+		["idle_exp"]=35,
+		["idle_gold"]=88,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -8018,8 +8018,8 @@ local chapter = {
  				["num_for_nothing"]="Vw=="
 			}
 		},
-		["idle_exp"]=32,
-		["idle_gold"]=56,
+		["idle_exp"]=36,
+		["idle_gold"]=88,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -8237,8 +8237,8 @@ local chapter = {
  				["num_for_nothing"]="Vw=="
 			}
 		},
-		["idle_exp"]=34,
-		["idle_gold"]=56,
+		["idle_exp"]=36,
+		["idle_gold"]=89,
 		["idle_drop"]={
 			{
 				["type"]=1,
@@ -8455,8 +8455,8 @@ local chapter = {
  				["num_for_nothing"]="Vw=="
 			}
 		},
-		["idle_exp"]=34,
-		["idle_gold"]=57,
+		["idle_exp"]=37,
+		["idle_gold"]=89,
 		["idle_drop"]={
 			{
 				["type"]=1,

lua/app/config/const.lua

@@ -405,9 +405,12 @@ local const = {
 	},
 	["activity_boss_rush_atk_add"]={
 		["value"]=100
+	},
+	["activity_recurring_day"]={
+		["value"]=15
 	}
 }
 local config = {
-data=const,count=82
+data=const,count=83
 }
 return config

lua/app/config/item.lua

@@ -1560,6 +1560,16 @@ local item = {
 		["qlt"]=4,
 		["icon"]="52"
 	},
+	[53]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="53"
+	},
+	[54]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="54"
+	},
 	[1001]={
 		["type"]=2,
 		["qlt"]=1,
@@ -2388,6 +2398,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=114
+data=item,count=116
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -461,8 +461,8 @@ local LocalizationGlobalConst =
 	ARENA_DESC_40 = "ARENA_DESC_40",
 	ARENA_DESC_41 = "ARENA_DESC_41",
 	ARENA_DESC_42 = "ARENA_DESC_42",
-	EQUIP_DESC_26 = "EQUIP_DESC_26",
 	EQUIP_DESC_27 = "EQUIP_DESC_27",
+	EQUIP_DESC_28 = "EQUIP_DESC_28",
 	SEIZED_DESC_1 = "SEIZED_DESC_1",
 	SEIZED_DESC_2 = "SEIZED_DESC_2",
 	SEIZED_DESC_3 = "SEIZED_DESC_3",
@@ -478,6 +478,39 @@ local LocalizationGlobalConst =
 	ACT_FOURTEEN_DESC_7 = "ACT_FOURTEEN_DESC_7",
 	ACT_FOURTEEN_DESC_8 = "ACT_FOURTEEN_DESC_8",
 	ACT_FOURTEEN_DESC_9 = "ACT_FOURTEEN_DESC_9",
+	ACT_BOSS_RUSH_DESC_1 = "ACT_BOSS_RUSH_DESC_1",
+	ACT_BOSS_RUSH_DESC_2 = "ACT_BOSS_RUSH_DESC_2",
+	ACT_BOSS_RUSH_DESC_3 = "ACT_BOSS_RUSH_DESC_3",
+	ACT_BOSS_RUSH_DESC_4 = "ACT_BOSS_RUSH_DESC_4",
+	ACT_BOSS_RUSH_DESC_5 = "ACT_BOSS_RUSH_DESC_5",
+	ACT_BOSS_RUSH_DESC_6 = "ACT_BOSS_RUSH_DESC_6",
+	ACT_BOSS_RUSH_DESC_7 = "ACT_BOSS_RUSH_DESC_7",
+	ACT_BOSS_RUSH_DESC_8 = "ACT_BOSS_RUSH_DESC_8",
+	ACT_BOSS_RUSH_DESC_9 = "ACT_BOSS_RUSH_DESC_9",
+	ACT_BOSS_RUSH_DESC_10 = "ACT_BOSS_RUSH_DESC_10",
+	ACT_BOSS_RUSH_DESC_11 = "ACT_BOSS_RUSH_DESC_11",
+	ACT_BOSS_RUSH_DESC_12 = "ACT_BOSS_RUSH_DESC_12",
+	ACT_BOSS_RUSH_DESC_13 = "ACT_BOSS_RUSH_DESC_13",
+	ACT_BOSS_RUSH_DESC_14 = "ACT_BOSS_RUSH_DESC_14",
+	ACT_BOSS_RUSH_DESC_15 = "ACT_BOSS_RUSH_DESC_15",
+	ACT_BOSS_RUSH_DESC_16 = "ACT_BOSS_RUSH_DESC_16",
+	ACT_BOSS_RUSH_DESC_17 = "ACT_BOSS_RUSH_DESC_17",
+	ACT_BOSS_RUSH_DESC_18 = "ACT_BOSS_RUSH_DESC_18",
+	ACT_BOSS_RUSH_DESC_19 = "ACT_BOSS_RUSH_DESC_19",
+	ACT_BOSS_RUSH_DESC_20 = "ACT_BOSS_RUSH_DESC_20",
+	ACT_BOSS_RUSH_DESC_21 = "ACT_BOSS_RUSH_DESC_21",
+	ACT_BOSS_RUSH_DESC_22 = "ACT_BOSS_RUSH_DESC_22",
+	ACT_BOSS_RUSH_DESC_23 = "ACT_BOSS_RUSH_DESC_23",
+	ACT_BOSS_RUSH_DESC_24 = "ACT_BOSS_RUSH_DESC_24",
+	ACT_BOSS_RUSH_DESC_25 = "ACT_BOSS_RUSH_DESC_25",
+	ACT_BOSS_RUSH_DESC_26 = "ACT_BOSS_RUSH_DESC_26",
+	ACT_BOSS_RUSH_DESC_27 = "ACT_BOSS_RUSH_DESC_27",
+	ACT_BOSS_RUSH_DESC_28 = "ACT_BOSS_RUSH_DESC_28",
+	ACT_BOSS_RUSH_DESC_29 = "ACT_BOSS_RUSH_DESC_29",
+	ACT_BOSS_RUSH_DESC_30 = "ACT_BOSS_RUSH_DESC_30",
+	ACT_BOSS_RUSH_DESC_31 = "ACT_BOSS_RUSH_DESC_31",
+	ACT_BOSS_RUSH_DESC_32 = "ACT_BOSS_RUSH_DESC_32",
+	ACT_BOSS_RUSH_DESC_33 = "ACT_BOSS_RUSH_DESC_33",
 }
 
 return LocalizationGlobalConst

lua/app/config/strings/cn/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="激活刀姬翩然起舞皮肤获得。"
+	},
+	[1400101]={
+		["desc"]="遗迹战甲"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/cn/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="S2竞技场黄金头像框，英雄的光辉。"
+	},
+	[28]={
+		["desc"]="S3竞技场白银头像，勇气的代表。"
+	},
+	[29]={
+		["desc"]="S3竞技场黄金头像，实力的证明。"
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/cn/buff.lua

@@ -225,18 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="重生",
 		["desc"]="重生：持续期间被击败则会触发重生并恢复生命，回合结束时未触发重生也会恢复生命。",
 		["tips_desc"]="重生：持续期间被击败则会触发重生并恢复生命，回合结束时未触发重生也会恢复生命。",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="海洋护盾",
 		["desc"]="海洋护盾：承受一定伤害，免疫所有负面效果。",
+		["tips_desc"]="海洋护盾：承受一定伤害，免疫所有负面效果。",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="自愈",
 		["desc"]="自愈：回合结束时恢复生命。",
+		["tips_desc"]="自愈：回合结束时恢复生命。",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/cn/global.lua

@@ -461,8 +461,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "升段奖励",
     ["ARENA_DESC_41"] = "结算奖励",
     ["ARENA_DESC_42"] = "未领取奖励",
-    ["EQUIP_DESC_26"] = "武器直升{0}级礼包",
     ["EQUIP_DESC_27"] = "防具直升{0}级礼包",
+    ["EQUIP_DESC_28"] = "武器直升{0}级礼包",
     ["SEIZED_DESC_1"] = "检测到你的账号存在异常，请联系客服或删除账号使用新建账号继续游戏。",
     ["SEIZED_DESC_2"] = "联系客服",
     ["SEIZED_DESC_3"] = "删除账号",
@@ -478,6 +478,39 @@ local localization_global =
     ["ACT_FOURTEEN_DESC_7"] = "尚未解锁，请明日再来~",
     ["ACT_FOURTEEN_DESC_8"] = "完成当前阶段所有任务可获得：",
     ["ACT_FOURTEEN_DESC_9"] = "活动期间，每完成1个任务可获得100个【挑战点】",
+    ["ACT_BOSS_RUSH_DESC_1"] = "是否消耗{0}钻石战斗？",
+    ["ACT_BOSS_RUSH_DESC_2"] = "首领公开赛",
+    ["ACT_BOSS_RUSH_DESC_3"] = "今日高手",
+    ["ACT_BOSS_RUSH_DESC_4"] = "我今日最高：",
+    ["ACT_BOSS_RUSH_DESC_5"] = "我今日挑战：{0}次",
+    ["ACT_BOSS_RUSH_DESC_6"] = "今日剩余免费挑战次数：{0}",
+    ["ACT_BOSS_RUSH_DESC_7"] = "消耗:",
+    ["ACT_BOSS_RUSH_DESC_8"] = "虚位以待",
+    ["ACT_BOSS_RUSH_DESC_9"] = "参赛阵容",
+    ["ACT_BOSS_RUSH_DESC_10"] = "排行榜",
+    ["ACT_BOSS_RUSH_DESC_11"] = "首领巡礼",
+    ["ACT_BOSS_RUSH_DESC_12"] = "活动商店",
+    ["ACT_BOSS_RUSH_DESC_13"] = "首领公开赛弹窗描述",
+    ["ACT_BOSS_RUSH_DESC_14"] = "立即前往",
+    ["ACT_BOSS_RUSH_DESC_15"] = "首领巡礼",
+    ["ACT_BOSS_RUSH_DESC_16"] = "累计公开赛挑战波次，可领取首领巡礼奖励。",
+    ["ACT_BOSS_RUSH_DESC_17"] = "首领巡礼中获得【首领金币】兑换奖励，活动结束时【首领金币】奖杯回收，请尽快兑换。",
+    ["ACT_BOSS_RUSH_DESC_18"] = "兑换",
+    ["ACT_BOSS_RUSH_DESC_19"] = "剩余次数：{0}",
+    ["ACT_BOSS_RUSH_DESC_20"] = "昨日",
+    ["ACT_BOSS_RUSH_DESC_21"] = "今日",
+    ["ACT_BOSS_RUSH_DESC_22"] = "奖励",
+    ["ACT_BOSS_RUSH_DESC_23"] = "排名:{0}",
+    ["ACT_BOSS_RUSH_DESC_24"] = "排名",
+    ["ACT_BOSS_RUSH_DESC_25"] = "玩家",
+    ["ACT_BOSS_RUSH_DESC_26"] = "记录",
+    ["ACT_BOSS_RUSH_DESC_27"] = "1.排行榜将以当日最大波数进行排名，波数相同的玩家将对比最小回合数。\n2.排行榜每日0点（UTC-0）刷新重置，重置后可根据前一天的排名领取奖励，奖励过期未领将不会补发。",
+    ["ACT_BOSS_RUSH_DESC_28"] = "新纪录",
+    ["ACT_BOSS_RUSH_DESC_29"] = "巡回积分",
+    ["ACT_BOSS_RUSH_DESC_30"] = "挑战完成",
+    ["ACT_BOSS_RUSH_DESC_31"] = "1.首领出场顺序和地图每日都将进行变化。\n2.战斗开始后，您的英雄技能默认已激活，但强化技能还需要升级获得，战斗内最多提升60级。\n3.每日公开赛的排名都将结算一次，结算可获得大量【首领金币】，可用于活动商店兑换奖励。\n4.首领巡礼将根据您参与公开赛战斗的累计波次给与奖励。\n5.每日可免费挑战1次，后续挑战需要消耗钻石，请节准备好再开始挑战。",
+    ["ACT_BOSS_RUSH_DESC_32"] = "限时礼包，倾情回馈！",
+    ["ACT_BOSS_RUSH_DESC_33"] = "阶段{0}解锁",
 }
 
 return localization_global

lua/app/config/strings/cn/item.lua

@@ -195,6 +195,14 @@ local item = {
 		["name"]="首领金币",
 		["desc"]="首领公开赛可以进行兑换。"
 	},
+	[53]={
+		["name"]="S3赛季白银头像框",
+		["desc"]="S3竞技场白银头像框，勇气的代表。"
+	},
+	[54]={
+		["name"]="S3赛季黄金头像框",
+		["desc"]="S3竞技场黄金头像框，实力的证明。"
+	},
 	[1001]={
 		["name"]="暗淡陨铁",
 		["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。"
@@ -453,6 +461,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/cn/task_type.lua

@@ -90,31 +90,31 @@ local task_type = {
 		["desc"]="竞技场挑战次数"
 	},
 	[31]={
-		["desc"]="竞技场段位达到X"
+		["desc"]="竞技场段位达到{0}"
 	},
 	[32]={
-		["desc"]="深渊挑战 通关X"
+		["desc"]="深渊挑战通关{0}"
 	},
 	[33]={
-		["desc"]="时空裂隙 通关X"
+		["desc"]="时空裂隙通关{0}-{1}"
 	},
 	[34]={
-		["desc"]="矿车拦截 通关X"
+		["desc"]="矿车拦截通关{0}"
 	},
 	[35]={
-		["desc"]="灯神之塔 通关X"
+		["desc"]="灯神之塔通关{0}"
 	},
 	[36]={
-		["desc"]="每日挑战 胜利x次"
+		["desc"]="每日挑战胜利{0}次"
 	},
 	[37]={
-		["desc"]="开启主线宝箱 x个"
+		["desc"]="开启主线宝箱{0}个"
 	},
 	[38]={
-		["desc"]="武器升级 x次"
+		["desc"]="武器升级{0}次"
 	},
 	[39]={
-		["desc"]="防具升级 x次"
+		["desc"]="防具升级{0}次"
 	}
 }
 local config = {

lua/app/config/strings/de/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 
+	},
+	[1400101]={
+
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/de/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 
+	},
+	[28]={
+
+	},
+	[29]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/de/item.lua

@@ -145,6 +145,12 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+
+	},
+	[54]={
+
 	},
 	[1001]={
 
@@ -340,6 +346,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/en/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="Obtained after activating Graceful Dance."
+	},
+	[1400101]={
+		["desc"]="Relic Armor"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/en/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="S2 Gold Arena Avatar Frame, shining with heroic radiance."
+	},
+	[28]={
+		["desc"]="S3 Silver Arena Avatar Frame. It is reversed for hero."
+	},
+	[29]={
+		["desc"]="S3 Gold Arena Avatar Frame. Proof of your prowess."
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/en/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="Rebirth",
+		["desc"]="Rebirth: During the Rebirth, when you are defeated or the turn ends, it will trigger to restore HP.",
+		["tips_desc"]="Rebirth: During the Rebirth, when you are defeated or the turn ends, it will trigger to restore HP.",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="Ocean Shield",
+		["desc"]="Ocean Shield: Can take a certain amount of damage and stay immune to all debuffs.",
+		["tips_desc"]="Ocean Shield: Can take a certain amount of damage and stay immune to all debuffs.",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="Self-healing",
+		["desc"]="Self-healing: Restore HP at the end of the turn.",
+		["tips_desc"]="Self-healing: Restore HP at the end of the turn.",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/en/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "Promotion Rewards",
     ["ARENA_DESC_41"] = "Settlement Rewards",
     ["ARENA_DESC_42"] = "Unclaimed Rewards",
-    ["EQUIP_DESC_26"] = "Weapon Upgrade Lv.{0} Pack",
     ["EQUIP_DESC_27"] = "Armor Upgrade Lv.{0} Pack",
+    ["EQUIP_DESC_28"] = "Weapon Upgrade Lv.{0} Pack",
     ["SEIZED_DESC_1"] = "Detected abnormality on your account. Please contact customer service or delete the account and continue playing with a new account.",
     ["SEIZED_DESC_2"] = "Customer Service",
     ["SEIZED_DESC_3"] = "Delete Account",

lua/app/config/strings/en/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="S3 Silver Avatar Frame",
+		["desc"]="S3 Silver Arena Avatar Frame. It is reversed for hero."
+	},
+	[54]={
+		["name"]="S3 Gold Avatar Frame",
+		["desc"]="S3 Gold Arena Avatar Frame. Proof of your prowess."
 	},
 	[1001]={
 		["name"]="Dim Meteorite",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/es/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="Se obtiene tras activar Danza Elegante."
+	},
+	[1400101]={
+		["desc"]="Armadura de Ruinas"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/es/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe."
+	},
+	[28]={
+		["desc"]="Marco de avatar de plata Temporada S3, símbolo de valentía."
+	},
+	[29]={
+		["desc"]="Marco de avatar de oro Temporada S3, prueba de fuerza."
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/es/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="Resucitación",
+		["desc"]="Resucitación: se activa y restaura HP cuando el héroe es derrotado durante el efecto, o cuando llega el final de la ronda.",
+		["tips_desc"]="Resucitación: se activa y restaura HP cuando el héroe es derrotado durante el efecto, o cuando llega el final de la ronda.",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="Escudo Marino",
+		["desc"]="Escudo Marino: Soporta una cierta cantidad de daño y es inmune a todos los debuffs.",
+		["tips_desc"]="Escudo Marino: Soporta una cierta cantidad de daño y es inmune a todos los debuffs.",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="Autocura",
+		["desc"]="Autocura: Restaura HP al final de la ronda.",
+		["tips_desc"]="Autocura: Restaura HP al final de la ronda.",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/es/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "Recompensas de Subida de Ranking",
     ["ARENA_DESC_41"] = "Recompensas de Clasificación",
     ["ARENA_DESC_42"] = "Recompensas no colectadas",
-    ["EQUIP_DESC_26"] = "Paquete de Mejora de Arma al Nv. {0}",
     ["EQUIP_DESC_27"] = "Paquete de Mejora de Armadura al Nv. {0}",
+    ["EQUIP_DESC_28"] = "Paquete de Mejora de Arma al Nv. {0}",
     ["SEIZED_DESC_1"] = "Se ha detectado una anomalía en tu cuenta. Por favor contacta con Atención al Cliente, o elimina la cuenta actual y crear una nueva para continuar el juego.",
     ["SEIZED_DESC_2"] = "Atención al Cliente",
     ["SEIZED_DESC_3"] = "Eliminar Cuenta",

lua/app/config/strings/es/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="Marco de avatar de plata Temporada S3",
+		["desc"]="Marco de avatar de plata Temporada S3, símbolo de valentía."
+	},
+	[54]={
+		["name"]="Marco de avatar de oro Temporada S3",
+		["desc"]="Marco de avatar de oro Temporada S3, prueba de fuerza."
 	},
 	[1001]={
 		["name"]="Meteorito Opaco",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/fr/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 
+	},
+	[1400101]={
+
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/fr/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 
+	},
+	[28]={
+
+	},
+	[29]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/fr/item.lua

@@ -145,6 +145,12 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+
+	},
+	[54]={
+
 	},
 	[1001]={
 
@@ -340,6 +346,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/id/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="Dapat setelah lolos Tarian Anggun"
+	},
+	[1400101]={
+		["desc"]="Armor Relik"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/id/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="Bingkai Avatar Emas Arena S2.Pahlawan mulia."
+	},
+	[28]={
+		["desc"]="Bingkai Avatar Silver S3. Simbol keberanian."
+	},
+	[29]={
+		["desc"]="Bingkai Avatar Emas S3. Bukti kekuatan!"
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/id/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="Lahir Kembali",
+		["desc"]="Lahir Kembali: Kelahiran kembali dipicu dan memulihkan HP jika dikalahkan selama durasi, dan juga memulihkan HP jika tidak dipicu di akhir giliran.",
+		["tips_desc"]="Lahir Kembali: Kelahiran kembali dipicu dan memulihkan HP jika dikalahkan selama durasi, dan juga memulihkan HP jika tidak dipicu di akhir giliran.",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="Perisai Samudra",
+		["desc"]="Perisai Samudra: Menahan sejumlah DMG dan kebal terhadap semua efek negatif.",
+		["tips_desc"]="Perisai Samudra: Menahan sejumlah DMG dan kebal terhadap semua efek negatif.",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="Pemulihan Diri",
+		["desc"]="Pemulihan Diri: Mengembalikan HP di akhir giliran.",
+		["tips_desc"]="Pemulihan Diri: Mengembalikan HP di akhir giliran.",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/id/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "Hadiah Promosi",
     ["ARENA_DESC_41"] = "Hadiah Penyelesaian",
     ["ARENA_DESC_42"] = "Hadiah yang belum diklaim",
-    ["EQUIP_DESC_26"] = "Pack Peningkatan Senjata Lv.{0}",
     ["EQUIP_DESC_27"] = "Pack upgrade Armor Lv.{0}",
+    ["EQUIP_DESC_28"] = "Pack Peningkatan Senjata Lv.{0}",
     ["SEIZED_DESC_1"] = "Telah terdeteksi kondisi tidak normal pada akunmuu. Silakan hubungi layanan pelanggan atau hapus akun, dan gunakan akun baru untuk melanjutkan permainan.",
     ["SEIZED_DESC_2"] = "Hubungi Layanan Pelanggan",
     ["SEIZED_DESC_3"] = "Hapus Akun",

lua/app/config/strings/id/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="Bingkai Avatar Silver Musim S3",
+		["desc"]="Bingkai Avatar Silver S3. Simbol keberanian."
+	},
+	[54]={
+		["name"]="Bingkai Avatar Emas Musim S3",
+		["desc"]="Bingkai Avatar Emas S3. Bukti kekuatan!"
 	},
 	[1001]={
 		["name"]="Chondrite",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/ja/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="グレイスフルダンスをアクティブ化後獲得できる。"
+	},
+	[1400101]={
+		["desc"]="レリックアーマー"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/ja/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="S2闘技場ゴールドフレーム。ヒーローの輝き。"
+	},
+	[28]={
+		["desc"]="S3闘技場シルバーフレーム。勇気の証。"
+	},
+	[29]={
+		["desc"]="S3闘技場ゴールドフレーム。実力の証。"
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/ja/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="再生",
+		["desc"]="再生：持続期間中に撃破されると、再生を発動してHPを回復する。ターン終了時に再生を発動してもHPが回復される。",
+		["tips_desc"]="再生：持続期間中に撃破されると、再生を発動してHPを回復する。ターン終了時に再生を発動してもHPが回復される。",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="オーシャンシールド",
+		["desc"]="オーシャンシールド：一定量のダメージには耐えられ、全てのデバフ効果を無効化する。",
+		["tips_desc"]="オーシャンシールド：一定量のダメージには耐えられ、全てのデバフ効果を無効化する。",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="自己回復",
+		["desc"]="自己回復：ターン終了時にHPを回復する。",
+		["tips_desc"]="自己回復：ターン終了時にHPを回復する。",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/ja/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "ランクアップ報酬",
     ["ARENA_DESC_41"] = "決算報酬",
     ["ARENA_DESC_42"] = "未受取の報酬",
-    ["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック",
     ["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック",
+    ["EQUIP_DESC_28"] = "武器Lv{0}レベルアップパック",
     ["SEIZED_DESC_1"] = "アカウントに異常が検出されました。サポートセンターに連絡するか、アカウントを削除し、新しいアカウントを作成してゲームを続行してください。",
     ["SEIZED_DESC_2"] = "サポートセンターに連絡する",
     ["SEIZED_DESC_3"] = "アカウントを削除する",

lua/app/config/strings/ja/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="S3シーズンシルバーフレーム",
+		["desc"]="S3闘技場シルバーフレーム。勇気の証。"
+	},
+	[54]={
+		["name"]="S3シーズンゴールドフレーム",
+		["desc"]="S3闘技場ゴールドフレーム。実力の証。"
 	},
 	[1001]={
 		["name"]="薄暗い隕石",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/ko/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="날아오르는 춤(를) 활성화한 후, 획득할 수 있습니다."
+	},
+	[1400101]={
+		["desc"]="유적 갑옷"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/ko/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="S2 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다."
+	},
+	[28]={
+		["desc"]="S3 아레나 실버 아이콘 프레임, 용기를 대표합니다."
+	},
+	[29]={
+		["desc"]="S3 아레나 골드 아이콘 프레임, 검증받은 실력입니다."
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/ko/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="부활",
+		["desc"]="부활: 지속 시간 동안 패배하면 부활하여 HP를 회복하며 턴 종료 시 부활이 발동되지 않아도 HP를 회복합니다.",
+		["tips_desc"]="부활: 지속 시간 동안 패배하면 부활하여 HP를 회복하며 턴 종료 시 부활이 발동되지 않아도 HP를 회복합니다.",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="해양 방패",
+		["desc"]="해양 방패: 일정량의 피해를 감내하고 모든 부정적인 효과에 면역이 됩니다.",
+		["tips_desc"]="해양 방패: 일정량의 피해를 감내하고 모든 부정적인 효과에 면역이 됩니다.",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="자가 치유",
+		["desc"]="자가 치유: 턴이 끝날 때 HP를 회복합니다.",
+		["tips_desc"]="자가 치유: 턴이 끝날 때 HP를 회복합니다.",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/ko/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "승급 보상",
     ["ARENA_DESC_41"] = "정산 보상",
     ["ARENA_DESC_42"] = "미수령 보상",
-    ["EQUIP_DESC_26"] = "무기 {0}레벨 업그레이드 패키지",
     ["EQUIP_DESC_27"] = "방어구 {0}레벨 업그레이드 패키지",
+    ["EQUIP_DESC_28"] = "무기 {0}레벨 업그레이드 패키지",
     ["SEIZED_DESC_1"] = "계정에 이상이 발견되었습니다. 문제 해결을 위해 고객 서비스에 문의하거나 계정을 삭제하시고 새 계정을 사용하여 게임을 계속 진행하시기 바랍니다.",
     ["SEIZED_DESC_2"] = "고객 서비스 문의",
     ["SEIZED_DESC_3"] = "계정 삭제",

lua/app/config/strings/ko/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="S3 시즌 실버 아이콘 프레임",
+		["desc"]="S3 아레나 실버 아이콘 프레임, 용기를 대표합니다."
+	},
+	[54]={
+		["name"]="S3 시즌 골드 아이콘 프레임",
+		["desc"]="S3 아레나 골드 아이콘 프레임, 검증받은 실력입니다."
 	},
 	[1001]={
 		["name"]="알렌데 운석",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/pt/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="Ativar Dança Fluida para obter."
+	},
+	[1400101]={
+		["desc"]="Armadura das Ruínas"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/pt/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="Moldura de avatar de ouro da Arena S2, o brilho de um herói."
+	},
+	[28]={
+		["desc"]="Moldura de avatar de prata da Arena S3, um símbolo de coragem."
+	},
+	[29]={
+		["desc"]="Moldura de avatar de ouro da Arena S3, uma testemunha do poder."
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/pt/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="Renascimento",
+		["desc"]="Renascimento: ser derrotado enquanto o efeito durar desencadeará o renascimento e restaurará a vida. A vida também é restaurada se o renascimento não for acionado no final do turno.",
+		["tips_desc"]="Renascimento: ser derrotado enquanto o efeito durar desencadeará o renascimento e restaurará a vida. A vida também é restaurada se o renascimento não for acionado no final do turno.",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="Escudo Marinho",
+		["desc"]="Escudo Marinho: pode aguentar uma certa quantidade de dano e garantir imunidade a todas as penalidades.",
+		["tips_desc"]="Escudo Marinho: pode aguentar uma certa quantidade de dano e garantir imunidade a todas as penalidades.",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="Autocura",
+		["desc"]="Autocura: Restaura a vida no final do turno.",
+		["tips_desc"]="Autocura: Restaura a vida no final do turno.",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/pt/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "Recompensas pela subida de ranque",
     ["ARENA_DESC_41"] = "Recompensas de classificação",
     ["ARENA_DESC_42"] = "Recompensas não coletadas",
-    ["EQUIP_DESC_26"] = "Pacote de Melhoria de Arma a Nv.{0}",
     ["EQUIP_DESC_27"] = "Pacote de Melhoria de Armadura a Nv.{0}",
+    ["EQUIP_DESC_28"] = "Pacote de Melhoria de Arma a Nv.{0}",
     ["SEIZED_DESC_1"] = "Foi detectada alguma anormalidade com sua conta. Entre em contato com o atendimento ao cliente ou exclua a conta atual e crie uma nova conta para continuar jogando.",
     ["SEIZED_DESC_2"] = "Atendimento ao Cliente",
     ["SEIZED_DESC_3"] = "Excluir Conta",

lua/app/config/strings/pt/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="Moldura de Avatar de Prata da S3",
+		["desc"]="Moldura de avatar de prata da Arena S3, um símbolo de coragem."
+	},
+	[54]={
+		["name"]="Moldura de Avatar de Ouro da S3",
+		["desc"]="Moldura de avatar de ouro da Arena S3, uma testemunha do poder."
 	},
 	[1001]={
 		["name"]="Ferro Meteórico Opaco",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/ru/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 
+	},
+	[1400101]={
+
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/ru/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 
+	},
+	[28]={
+
+	},
+	[29]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/ru/item.lua

@@ -145,6 +145,12 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+
+	},
+	[54]={
+
 	},
 	[1001]={
 
@@ -340,6 +346,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/th/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="หลังจากการเปิดใช้งานเยื้องกรายเต้นรำจะได้รับ"
+	},
+	[1400101]={
+		["desc"]="เกราะรบซาก"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/th/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="กรอบรูปทองของอารีน่า S2 ความรุ่งโรจน์ของฮีโร่"
+	},
+	[28]={
+		["desc"]="กรอบรูปเงินของอารีน่า S3 ตัวแทนแห่งความกล้าหาญ"
+	},
+	[29]={
+		["desc"]="กรอบรูปทองของอารีน่า S3 พิสูจน์ความแข็งแกร่ง"
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/th/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="เกิดใหม่",
+		["desc"]="เกิดใหม่: ถูกเอาชนะระหว่างเวลาต่อเนื่องจะปลดปล่อยเกิดใหม่และฟื้นฟู HP เมื่อสิ้นสุดรอบ ยังไม่ปลดปล่อยเกิดใหม่ก็สามารถฟื้นฟู HP",
+		["tips_desc"]="เกิดใหม่: ถูกเอาชนะระหว่างเวลาต่อเนื่องจะปลดปล่อยเกิดใหม่และฟื้นฟู HP เมื่อสิ้นสุดรอบ ยังไม่ปลดปล่อยเกิดใหม่ก็สามารถฟื้นฟู HP",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="โล่ทะเล",
+		["desc"]="โล่ทะเล: สามารถรับดาเมจที่กำหนดได้ ภูมิคุ้มกันเอฟเฟกต์เชิงลบทั้งหมด",
+		["tips_desc"]="โล่ทะเล: สามารถรับดาเมจที่กำหนดได้ ภูมิคุ้มกันเอฟเฟกต์เชิงลบทั้งหมด",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="ฮีลออล",
+		["desc"]="ฮีลออล: ฟื้นฟู HP เมื่อสิ้นสุดรอบ",
+		["tips_desc"]="ฮีลออล: ฟื้นฟู HP เมื่อสิ้นสุดรอบ",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/th/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "รางวัลอัประดับ",
     ["ARENA_DESC_41"] = "รางวัลคำนวณ",
     ["ARENA_DESC_42"] = "รางวัลที่ยังไม่ได้รับ",
-    ["EQUIP_DESC_26"] = "แพ็คอัปอาวุธ {0} เลเวล",
     ["EQUIP_DESC_27"] = "แพ็คอัปเกราะ {0} เลเวล",
+    ["EQUIP_DESC_28"] = "แพ็คอัปอาวุธ {0} เลเวล",
     ["SEIZED_DESC_1"] = "ตรวจพบบัญชีของคุณผิดปกติ โปรดติดต่อฝ่ายบริการลูกค้าหรือลบบัญชีและใช้บัญชีใหม่เพื่อเล่นเกมต่อ",
     ["SEIZED_DESC_2"] = "ติดต่อฝ่ายบริการลูกค้า",
     ["SEIZED_DESC_3"] = "ลบบัญชี",

lua/app/config/strings/th/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="กรอบรูปเงินซีซั่น S3",
+		["desc"]="กรอบรูปเงินของอารีน่า S3 ตัวแทนแห่งความกล้าหาญ"
+	},
+	[54]={
+		["name"]="กรอบรูปทองซีซั่น S3",
+		["desc"]="กรอบรูปทองของอารีน่า S3 พิสูจน์ความแข็งแกร่ง"
 	},
 	[1001]={
 		["name"]="อุกกาบาตทื่อ",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/vi/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="Kích hoạt Nhảy Múa Nhanh Nhẹn nhận được."
+	},
+	[1400101]={
+		["desc"]="Giáp Di Tích"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/vi/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="Khung Avatar Vàng Đấu Trường S2, anh hùng tỏa sáng."
+	},
+	[28]={
+		["desc"]="Khung Avatar Bạc Đấu Trường S3, biểu tượng gan dạ."
+	},
+	[29]={
+		["desc"]="Khung Avatar Vàng Đấu Trường S3, biểu tượng thực lực."
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/vi/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="Trùng Sinh",
+		["desc"]="Trùng Sinh: Khi bị hạ gục trong thời gian duy trì sẽ kích hoạt Trùng Sinh và hồi HP, khi kết thúc hiệp chưa kích hoạt Trùng Sinh cũng sẽ hồi HP.",
+		["tips_desc"]="Trùng Sinh: Khi bị hạ gục trong thời gian duy trì sẽ kích hoạt Trùng Sinh và hồi HP, khi kết thúc hiệp chưa kích hoạt Trùng Sinh cũng sẽ hồi HP.",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="Khiên Hải Dương",
+		["desc"]="Khiên Hải Dương: Chịu một lượng ST nhất định, miễn dịch mọi debuff.",
+		["tips_desc"]="Khiên Hải Dương: Chịu một lượng ST nhất định, miễn dịch mọi debuff.",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="Chữa Trị",
+		["desc"]="Chữa Trị: Khi kết thúc hiệp sẽ hồi HP.",
+		["tips_desc"]="Chữa Trị: Khi kết thúc hiệp sẽ hồi HP.",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/vi/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "Thưởng Tăng Bậc",
     ["ARENA_DESC_41"] = "Thưởng Tổng Kết",
     ["ARENA_DESC_42"] = "Chưa nhận quà",
-    ["EQUIP_DESC_26"] = "Quà Tăng Ngay Vũ Khí Lv{0}",
     ["EQUIP_DESC_27"] = "Quà Tăng Ngay Phòng Cụ Lv{0}",
+    ["EQUIP_DESC_28"] = "Quà Tăng Ngay Vũ Khí Lv{0}",
     ["SEIZED_DESC_1"] = "Đã phát hiện tài khoản có bất thường, vui lòng liên hệ CSKH hoặc xóa TK và sử dụng TK mới để tiếp tục trò chơi.",
     ["SEIZED_DESC_2"] = "Liên hệ CSKH",
     ["SEIZED_DESC_3"] = "Xóa TK",

lua/app/config/strings/vi/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="Khung Avatar Bạc S3",
+		["desc"]="Khung Avatar Bạc Đấu Trường S3, biểu tượng gan dạ."
+	},
+	[54]={
+		["name"]="Khung Avatar Vàng S3",
+		["desc"]="Khung Avatar Vàng Đấu Trường S3, biểu tượng thực lực."
 	},
 	[1001]={
 		["name"]="Thiên Thạch Ảm Đạm",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/config/strings/zh/avatar.lua

@@ -106,9 +106,12 @@ local avatar = {
 	},
 	[5400101]={
 		["desc"]="啟動刀姬翩然起舞皮膚後獲得。"
+	},
+	[1400101]={
+		["desc"]="遺跡戰甲"
 	}
 }
 local config = {
-data=avatar,count=36
+data=avatar,count=37
 }
 return config

lua/app/config/strings/zh/avatar_frame.lua

@@ -13,9 +13,15 @@ local avatar_frame = {
 	},
 	[27]={
 		["desc"]="S2競技場黃金頭像框，英雄的光輝。"
+	},
+	[28]={
+		["desc"]="S3競技場白銀頭像框，勇氣的代表。"
+	},
+	[29]={
+		["desc"]="S3競技場黃金頭像框，實力的證明。"
 	}
 }
 local config = {
-data=avatar_frame,count=5
+data=avatar_frame,count=7
 }
 return config

lua/app/config/strings/zh/buff.lua

@@ -225,14 +225,23 @@ local buff = {
 	},
 	[84]={
 		["id"]=84,
+		["show_name"]="重生",
+		["desc"]="重生：持續期間被擊敗則會觸發重生並回復生命，回合結束時未觸發重生也會回復生命。",
+		["tips_desc"]="重生：持續期間被擊敗則會觸發重生並回復生命，回合結束時未觸發重生也會回復生命。",
 		["name"]="rebirth"
 	},
 	[85]={
 		["id"]=85,
+		["show_name"]="海洋護盾",
+		["desc"]="海洋護盾：承受一定傷害，免疫所有負面效果。",
+		["tips_desc"]="海洋護盾：承受一定傷害，免疫所有負面效果。",
 		["name"]="ocean_shield"
 	},
 	[86]={
 		["id"]=86,
+		["show_name"]="自癒",
+		["desc"]="自癒：回合結束時回復生命。",
+		["tips_desc"]="自癒：回合結束時回復生命。",
 		["name"]="self_heal"
 	}
 }

lua/app/config/strings/zh/global.lua

@@ -460,8 +460,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "升段獎勵",
     ["ARENA_DESC_41"] = "結算獎勵",
     ["ARENA_DESC_42"] = "未領取獎勵",
-    ["EQUIP_DESC_26"] = "武器直升{0}級禮包",
     ["EQUIP_DESC_27"] = "防具直升{0}級禮包",
+    ["EQUIP_DESC_28"] = "武器直升{0}級禮包",
     ["SEIZED_DESC_1"] = "檢測到你的賬號存在異常，請聯繫客服或刪除賬號使用新建賬號繼續遊戲。",
     ["SEIZED_DESC_2"] = "聯繫客服",
     ["SEIZED_DESC_3"] = "刪除賬號",

lua/app/config/strings/zh/item.lua

@@ -192,6 +192,14 @@ local item = {
 	},
 	[52]={
 
+	},
+	[53]={
+		["name"]="S3賽季白銀頭像框",
+		["desc"]="S3競技場白銀頭像框，勇氣的代表。"
+	},
+	[54]={
+		["name"]="S3賽季黃金頭像框",
+		["desc"]="S3競技場黃金頭像框，實力的證明。"
 	},
 	[1001]={
 		["name"]="暗淡隕鐵",
@@ -451,6 +459,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=113
+data=item,count=115
 }
 return config

lua/app/global/global_const.lua

@@ -20,6 +20,7 @@ local CONST_PATHS = {
 	GameSettingConst = "app/module/game_setting/game_setting_const",
 	CollectionConst = "app/module/collection/collection_const",
 	ActivityConst = "app/module/activity/activity_const",
+	FourteenDayConst = "app/module/activity/fourteen_day/fourteen_day_const",
 }
 
 if EDITOR_MODE then
@@ -181,6 +182,7 @@ GConst.TYPEOF_LUA_CLASS = {
 	PLAYER_INFO_CELL = "app/ui/common/cell/player_info_cell",
 	PLAYER_HEAD_CELL = "app/ui/common/cell/player_head_cell",
 	REWARD_CELL = "app/ui/common/cell/reward_cell",
+	BOUNTY_REWARD_CELL = "app/ui/common/cell/bounty_reward_cell",
 	LARGE_HERO_CELL = "app/ui/common/cell/large_hero_cell",
 	POP_HERO_CELL = "app/ui/shop/cell/pop_hero_cell",
 	POP_REWARD_CELL = "app/ui/shop/cell/pop_reward_cell",
@@ -194,6 +196,7 @@ GConst.TYPEOF_LUA_CLASS = {
 
 GConst.ATLAS_PATH = {
 	COMMON = "assets/arts/atlas/ui/common.asset",
+	ACT_COMMON = "assets/arts/atlas/ui/act_common.asset",
 	MAIN = "assets/arts/atlas/ui/main.asset",
 	BATTLE = "assets/arts/atlas/ui/battle.asset",
 	DAILY_CHALLENGE = "assets/arts/atlas/ui/daily_challenge.asset",

lua/app/module/activity/fourteen_day.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a8cccd7f512852a408f6f2ced012eb95
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

lua/app/module/activity/fourteen_day/fourteen_day_const.lua

@@ -0,0 +1,12 @@
+local FourteenDayConst = {}
+
+-- 战令档位
+FourteenDayConst.BOUNTY_GRADE_TYPE = {
+    FREE = 0,
+    PAY = 1,
+}
+
+-- 战令礼包id
+FourteenDayConst.BOUNTY_GIFT_ID = 140405
+
+return  FourteenDayConst

lua/app/module/activity/fourteen_day/fourteen_day_const.lua.meta

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

lua/app/module/activity/fourteen_day/fourteen_day_manager.lua

@@ -0,0 +1,56 @@
+local FourteenDayManager = class("FourteenDayManager", BaseModule)
+
+function FourteenDayManager:showFourteenDayUI()
+    local time = DataManager.FourteenDayData:getEndRemainTime()
+    if time > 0 then
+        UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_entrance_ui")
+    else
+        UIManager:showUI("app/ui/activity/fourteen_day/fourteen_day_task_ui")
+    end
+end
+
+-- 购买活动战令
+function FourteenDayManager:buyBounty()
+    PayManager:purchasePackage(GConst.FourteenDayConst.BOUNTY_GIFT_ID, PayManager.PURCHARSE_TYPE.ACT_GIFT)
+end
+
+-- 请求任务奖励
+function FourteenDayManager:reqTaskReward(id)
+    self:sendMessage(ProtoMsgType.FromMsgEnum.FourteenBountyTaskAwardReq, {id = id}, {}, self.rspTaskReward, BIReport.ITEM_GET_TYPE.ACT_FOURTEEN_DAY_TASK)
+end
+
+function FourteenDayManager:rspTaskReward(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        DataManager.FourteenDayData:onReceivedTaskReward(result.reqData.id)
+    end
+end
+
+-- 请求战令奖励
+function FourteenDayManager:reqBountyReward(id, grade)
+    local list = {}
+    table.insert(list, {id = id, grade = grade})
+    self:sendMessage(ProtoMsgType.FromMsgEnum.FourteenBountyAwardReq, {id_with_lv = list}, {}, self.rspBountyReward, BIReport.ITEM_GET_TYPE.ACT_FOURTEEN_DAY_BOUNTY)
+end
+
+function FourteenDayManager:rspBountyReward(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        DataManager.FourteenDayData:onReceivedBountyReward(result.id_with_lv)
+
+        GFunc.showRewardBox(result.rewards)
+    end
+end
+
+-- 请求兑换奖励
+function FourteenDayManager:reqExchangeReward(id)
+    self:sendMessage(ProtoMsgType.FromMsgEnum.FourteenBountyExchangeAwardReq, {id = id}, {}, self.rspExchangeReward, BIReport.ITEM_GET_TYPE.ACT_FOURTEEN_DAY_EXCHANGE)
+end
+
+function FourteenDayManager:rspExchangeReward(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        DataManager.FourteenDayData:onReceivedExchangeReward(result.reqData.id)
+
+        GFunc.showRewardBox(result.rewards)
+    end
+end
+
+return FourteenDayManager

lua/app/module/activity/fourteen_day/fourteen_day_manager.lua.meta

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

lua/app/module/chapter/chapter_manager.lua

@@ -19,6 +19,8 @@ function ChapterManager:openBoxFinish(result)
         DataManager.ChapterData:openBox(reqData.chapter_id, reqData.wave)
 
         BIReport:postChapterOpenBox(reqData.chapter_id, DataManager.ChapterData:getChapterBoxNum(reqData.chapter_id, reqData.wave), result.rewards)
+
+        ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX)
     end
 end
 

lua/app/module/daily_challenge/daily_challenge_manager.lua

@@ -126,6 +126,8 @@ function DailyChallengeManager:endChallengeFinish(result)
             end
         end
         BIReport:postDailyChallengeTaskState(completedCount, taskInfo)
+
+        ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_DAILY_CHALLENGE_SUCCESS)
     end
 end
 

lua/app/module/equip/equip_manager.lua

@@ -81,6 +81,12 @@ end
 function EquipManager:rspUpgrade(result)
     if result.err_code == GConst.ERROR_STR.SUCCESS then
         DataManager.EquipData:onUpgradeEquip(result.reqData.hero_id, result.reqData.position)
+
+        if result.reqData.position == GConst.EquipConst.PART_TYPE.WEAPON then
+            ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON)
+        else
+            ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR)
+        end
     end
 end
 

lua/app/module/item/item_const.lua

@@ -16,6 +16,7 @@ ItemConst.ITEM_ID_BOX_LV_5 = 18
 ItemConst.ITEM_ID_RANDOM_FRAGMENT = 19
 ItemConst.ITEM_ID_ARENA_BOUNTY_EXP = 21
 ItemConst.ITEM_ID_ARENA_TICKET = 22
+ItemConst.ITEM_ID_FOURTEEN_DAY_EXCHANGE = 51
 
 ItemConst.ITEM_TYPE = {
 	RES = 1,

lua/app/module/maincity/maincity_const.lua

@@ -30,6 +30,7 @@ MainCityConst.MAIN_MODULE = {
 MainCityConst.LEFT_SIDE_BARS = {
 	"app/ui/main_city/cell/side_bar_idle_cell",
 	"app/ui/main_city/cell/side_bar_growth_fund_cell",
+	"app/ui/main_city/cell/side_bar_fourteen_day_cell",
 	"app/ui/main_city/cell/side_bar_hero_fund_cell",
 	"app/ui/main_city/cell/side_bar_seven_days_cell",
 	"app/ui/main_city/cell/side_bar_activity_cell",

lua/app/module/task/task_const.lua

@@ -31,6 +31,15 @@ TaskConst.TASK_TYPE = {
     X_OPEN_SHOP_BOX_LEVEL_1 = 28,                               -- 商城里的1级抽卡宝箱
     X_OPEN_SHOP_BOX_LEVEL_2 = 29,                               -- 商城里的2级抽卡宝箱
     X_ARENA_CHALLENGE = 30,                 -- 竞技场挑战
+    X_ARENA_GRADING = 31,                   -- 竞技场段位
+    X_DUNGEON_SHARDS = 32,                  -- 副本通x关：碎片
+    X_DUNGEON_ARMOR = 33,                   -- 副本通x关：防具
+    X_DUNGEON_GOLD = 34,                    -- 副本通x关：金币
+    X_DUNGEON_WEAPON = 35,                  -- 副本通x关：武器
+    X_DAILY_CHALLENGE_SUCCESS = 36,         -- 每日挑战通关次数
+    X_OPEN_CHAPTER_BOX = 37,                -- 开启主线宝箱x个
+    X_UPGRADE_WEAPON = 38,                  -- 武器升级x次
+    X_UPGRADE_ARMOR = 39,                   -- 防具升级x次
 }
 
 return TaskConst

lua/app/module/task/task_manager.lua

@@ -274,6 +274,42 @@ function TaskManager:xArenaChallenge()
     self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE, 1)
 end
 
+function TaskManager:xArenaGradingScore(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING, count)
+end
+
+function TaskManager:xDungeonShards(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_SHARDS, count)
+end
+
+function TaskManager:xDungeonGold(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_GOLD, count)
+end
+
+function TaskManager:xDungeonWeapon(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_WEAPON, count)
+end
+
+function TaskManager:xDungeonArmor(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR, count)
+end
+
+function TaskManager:xDailyChallengeSuccess()
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_DAILY_CHALLENGE_SUCCESS, 1)
+end
+
+function TaskManager:xOpenChapterBox()
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX, 1)
+end
+
+function TaskManager:xUpgradeWeapon()
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON, 1)
+end
+
+function TaskManager:xUpgradeArmor()
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR, 1)
+end
+
 ---- 没有特殊说明，方法均返回任务增量
 TaskManager.TYPE_DEAL_FUNC = {
     [GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd,
@@ -304,6 +340,15 @@ TaskManager.TYPE_DEAL_FUNC = {
     [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_2] = TaskManager.xOpenShopBoxLevel2,
     [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3] = TaskManager.xOpenShopBoxLevel3,
     [GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE] = TaskManager.xArenaChallenge,
+    [GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING] = TaskManager.xArenaGradingScore,
+    [GConst.TaskConst.TASK_TYPE.X_DUNGEON_SHARDS] = TaskManager.xDungeonShards,
+    [GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR] = TaskManager.xDungeonArmor,
+    [GConst.TaskConst.TASK_TYPE.X_DUNGEON_GOLD] = TaskManager.xDungeonGold,
+    [GConst.TaskConst.TASK_TYPE.X_DUNGEON_WEAPON] = TaskManager.xDungeonWeapon,
+    [GConst.TaskConst.TASK_TYPE.X_DAILY_CHALLENGE_SUCCESS] = TaskManager.xDailyChallengeSuccess,
+    [GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX] = TaskManager.xOpenChapterBox,
+    [GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON] = TaskManager.xUpgradeWeapon,
+    [GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR] = TaskManager.xUpgradeArmor,
 }
 
 function TaskManager:taskGoto(taskType)

lua/app/proto/proto_msg_type.lua

@@ -26,6 +26,8 @@ local ProtoMsgType = {
         [448797406] = "ChapterArmorChallengeHeroesRsp",
         [516281556] = "GuideFundMarkReq",
         [516283389] = "GuideFundMarkRsp",
+        [524551468] = "FourteenBountyAwardReq",
+        [524553301] = "FourteenBountyAwardRsp",
         [531558517] = "PigPlayUpdateNtf",
         [554454681] = "EnergyByDiamondReq",
         [554456514] = "EnergyByDiamondRsp",
@@ -33,6 +35,8 @@ local ProtoMsgType = {
         [606210585] = "DailyChallengeTaskAwardRsp",
         [613793796] = "WatchADReq",
         [613795629] = "WatchADRsp",
+        [697000709] = "FourteenBountyTaskAwardReq",
+        [697002542] = "FourteenBountyTaskAwardRsp",
         [737107384] = "BuyMallIdleReq",
         [737109217] = "BuyMallIdleRsp",
         [822916593] = "MatchReq",
@@ -53,6 +57,8 @@ local ProtoMsgType = {
         [1068771132] = "ReconnectRsp",
         [1070841461] = "LoginReq",
         [1070843294] = "LoginRsp",
+        [1326064687] = "FourteenBountyExchangeAwardReq",
+        [1326066520] = "FourteenBountyExchangeAwardRsp",
         [1371198132] = "ChapterShardsChallengeSettlementReq",
         [1371199965] = "ChapterShardsChallengeSettlementRsp",
         [1433352538] = "ChapterDailyChallengeResetReq",
@@ -242,6 +248,8 @@ local ProtoMsgType = {
         ChapterArmorChallengeHeroesRsp = 448797406,
         GuideFundMarkReq = 516281556,
         GuideFundMarkRsp = 516283389,
+        FourteenBountyAwardReq = 524551468,
+        FourteenBountyAwardRsp = 524553301,
         PigPlayUpdateNtf = 531558517,
         EnergyByDiamondReq = 554454681,
         EnergyByDiamondRsp = 554456514,
@@ -249,6 +257,8 @@ local ProtoMsgType = {
         DailyChallengeTaskAwardRsp = 606210585,
         WatchADReq = 613793796,
         WatchADRsp = 613795629,
+        FourteenBountyTaskAwardReq = 697000709,
+        FourteenBountyTaskAwardRsp = 697002542,
         BuyMallIdleReq = 737107384,
         BuyMallIdleRsp = 737109217,
         MatchReq = 822916593,
@@ -269,6 +279,8 @@ local ProtoMsgType = {
         ReconnectRsp = 1068771132,
         LoginReq = 1070841461,
         LoginRsp = 1070843294,
+        FourteenBountyExchangeAwardReq = 1326064687,
+        FourteenBountyExchangeAwardRsp = 1326066520,
         ChapterShardsChallengeSettlementReq = 1371198132,
         ChapterShardsChallengeSettlementRsp = 1371199965,
         ChapterDailyChallengeResetReq = 1433352538,
@@ -458,6 +470,8 @@ local ProtoMsgType = {
         ChapterArmorChallengeHeroesRsp = "ChapterArmorChallengeHeroesRsp",
         GuideFundMarkReq = "GuideFundMarkReq",
         GuideFundMarkRsp = "GuideFundMarkRsp",
+        FourteenBountyAwardReq = "FourteenBountyAwardReq",
+        FourteenBountyAwardRsp = "FourteenBountyAwardRsp",
         PigPlayUpdateNtf = "PigPlayUpdateNtf",
         EnergyByDiamondReq = "EnergyByDiamondReq",
         EnergyByDiamondRsp = "EnergyByDiamondRsp",
@@ -465,6 +479,8 @@ local ProtoMsgType = {
         DailyChallengeTaskAwardRsp = "DailyChallengeTaskAwardRsp",
         WatchADReq = "WatchADReq",
         WatchADRsp = "WatchADRsp",
+        FourteenBountyTaskAwardReq = "FourteenBountyTaskAwardReq",
+        FourteenBountyTaskAwardRsp = "FourteenBountyTaskAwardRsp",
         BuyMallIdleReq = "BuyMallIdleReq",
         BuyMallIdleRsp = "BuyMallIdleRsp",
         MatchReq = "MatchReq",
@@ -485,6 +501,8 @@ local ProtoMsgType = {
         ReconnectRsp = "ReconnectRsp",
         LoginReq = "LoginReq",
         LoginRsp = "LoginRsp",
+        FourteenBountyExchangeAwardReq = "FourteenBountyExchangeAwardReq",
+        FourteenBountyExchangeAwardRsp = "FourteenBountyExchangeAwardRsp",
         ChapterShardsChallengeSettlementReq = "ChapterShardsChallengeSettlementReq",
         ChapterShardsChallengeSettlementRsp = "ChapterShardsChallengeSettlementRsp",
         ChapterDailyChallengeResetReq = "ChapterDailyChallengeResetReq",

lua/app/ui/activity/fourteen_day.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e405abdcb4030e64dba3631b38b997ee
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

lua/app/ui/activity/fourteen_day/cell.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c817462bfb12094bab1174e31e48e1d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua

@@ -0,0 +1,52 @@
+local FourteenDayBountyCell = class("FourteenDayBountyCell", BaseCell)
+
+function FourteenDayBountyCell:init()
+    local uiMap = self:getUIMap()
+    self.imgLevel = uiMap["fourteen_day_bounty_cell.level"]
+    self.txLevel = uiMap["fourteen_day_bounty_cell.level.tx_level"]
+    self.line = uiMap["fourteen_day_bounty_cell.line"]
+    self.bountyRewardCell1 = uiMap["fourteen_day_bounty_cell.bounty_reward_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL)
+    self.bountyRewardCell2 = uiMap["fourteen_day_bounty_cell.bounty_reward_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.BOUNTY_REWARD_CELL)
+end
+
+function FourteenDayBountyCell:refresh(id)
+    self.txLevel:setText(id)
+    self.line:setActive(id < #DataManager.FourteenDayData:getBountyCfg())
+
+    self.bountyRewardCell1:refresh(
+        DataManager.FourteenDayData:getBountyGradeReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE), false, 
+        not DataManager.FourteenDayData:isBountyGradeUnlock(GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE), 
+        DataManager.FourteenDayData:isReceivedBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE))
+	self.bountyRewardCell2:refresh(
+        DataManager.FourteenDayData:getBountyGradeReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY), true, 
+        not DataManager.FourteenDayData:isBountyGradeUnlock(GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY), 
+        DataManager.FourteenDayData:isReceivedBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY))
+
+	if DataManager.FourteenDayData:getActiveDays() >= id then
+		self.imgLevel:setImageGray(false)
+		if DataManager.FourteenDayData:canGetBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE) then
+            self.bountyRewardCell1:showLight()
+            self.bountyRewardCell1:addClickListener(function()
+                ModuleManager.FourteenDayManager:reqBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.FREE)
+            end)
+		else
+			self.bountyRewardCell1:hideLight()
+            self.bountyRewardCell1:addClickListener(nil)
+		end
+		if DataManager.FourteenDayData:canGetBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY) then
+            self.bountyRewardCell2:showLight()
+            self.bountyRewardCell2:addClickListener(function()
+                ModuleManager.FourteenDayManager:reqBountyReward(id, GConst.FourteenDayConst.BOUNTY_GRADE_TYPE.PAY)
+            end)
+		else
+			self.bountyRewardCell2:hideLight()
+            self.bountyRewardCell2:addClickListener(nil)
+		end
+	else
+		self.imgLevel:setImageGray(true)
+		self.bountyRewardCell1:hideLight()
+		self.bountyRewardCell2:hideLight()
+	end
+end
+
+return FourteenDayBountyCell

lua/app/ui/activity/fourteen_day/cell/fourteen_day_bounty_cell.lua.meta

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

lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua

@@ -0,0 +1,52 @@
+local FourteenDayExchangeCell = class("FourteenDayExchangeCell", BaseCell)
+
+function FourteenDayExchangeCell:init()
+    local uiMap = self:getUIMap()
+    self.rewardCell = uiMap["fourteen_day_exchange_cell.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+    self.txLimit = uiMap["fourteen_day_exchange_cell.tx_limit"]
+    self.cost = uiMap["fourteen_day_exchange_cell.cost"]
+    self.imgCost = uiMap["fourteen_day_exchange_cell.cost.img_cost"]
+    self.txCost = uiMap["fourteen_day_exchange_cell.cost.tx_num"]
+    self.lock = uiMap["fourteen_day_exchange_cell.lock"]
+    self.txLock = uiMap["fourteen_day_exchange_cell.lock.tx_lock"]
+
+    self:addClickListener(function()
+        if DataManager.FourteenDayData:canExchange(self.id) then
+            ModuleManager.FourteenDayManager:reqExchangeReward(self.id)
+        end
+    end)
+end
+
+function FourteenDayExchangeCell:refresh(id)
+    self.id = id
+
+    if DataManager.FourteenDayData:isExchangeUnlock(self.id) then
+        -- 已解锁
+        self.cost:setActive(true)
+        self.txLimit:setActive(true)
+        self.lock:setActive(false)
+        local time = DataManager.FourteenDayData:getExchangeRemainTime(self.id)
+        if time > 0 then
+            self.txLimit:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, time))
+        else
+            self.txLimit:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, "<color=#FF6464>"..time.."</color>"))
+        end
+        local costNum = DataManager.FourteenDayData:getExchangeCostNum(self.id)
+        if DataManager.FourteenDayData:getExchangeItemNum() >= costNum then
+            self.txCost:setText(costNum)
+        else
+            self.txCost:setText("<color=#FF6464>"..costNum.."</color>")
+        end
+        GFunc.centerImgAndTx(self.imgCost, self.txCost)
+    else
+        -- 未解锁
+        self.cost:setActive(false)
+        self.txLimit:setActive(false)
+        self.lock:setActive(true)
+        self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_33, DataManager.FourteenDayData:getExchangeUnlockCondition(self.id)))
+    end
+    
+    self.rewardCell:refreshByConfig(DataManager.FourteenDayData:getExchangeReward(self.id))
+end
+
+return FourteenDayExchangeCell

lua/app/ui/activity/fourteen_day/cell/fourteen_day_exchange_cell.lua.meta

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