Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829

lua/app/common/data_manager.lua

@@ -142,6 +142,7 @@ function DataManager:initWithServerData(data)
 	self.DungeonData:initDungeonGold(data.chapter_gold_challenge)
 	self.DungeonData:initDungeonShards(data.chapter_shards_challenge)
 	self.EquipData:init(data.heroes_equips)
+	self.EquipData:initGifts(data.act_weapon_armor_gift)
 	self.SkinData:init(data.bag.skins)
 	-- HeroData要在EquipData和SkinData之后初始化，依赖它们的属性数据
 	self.HeroData:init(data.bag.heroes)

lua/app/common/pay_manager.lua

@@ -24,6 +24,8 @@ PayManager.PURCHARSE_ACT_TYPE = {
     ARMOR_GIFT = 12,
     ACT_SUMMER = 13,
     ACT_HERO_FUND = 14,
+    WEAPON_UPGRADE_GIFT = 15,
+    ARMOR_UPGRADE_GIFT = 16,
 }
 
 PayManager.PURCHARSE_TYPE_CONFIG = {
@@ -50,6 +52,8 @@ PayManager.BI_ITEM_GET_TYPE = {
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.ITEM_GET_TYPE.ACT_SUMMER,
         [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
+        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE,
@@ -73,6 +77,8 @@ PayManager.BI_GIFT_TYPE = {
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.GIFT_TYPE.ACT_SUMMER,
         [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
+        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE,

lua/app/config/arena_gift.lua

@@ -1,32 +1,6 @@
 local arena_gift = {
 	[1]={
-		["score"]=950,
+		["score"]=900,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=500,
- 				["num_for_nothing"]="Uwhc"
-			}
-		}
-	},
-	[2]={
-		["score"]=1000,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=22,
- 				["id_for_nothing"]="VAo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[3]={
-		["score"]=1050,
 		["reward"]={
 			{
 				["type"]=1,
@@ -38,43 +12,82 @@ local arena_gift = {
 			}
 		}
 	},
+	[2]={
+		["score"]=950,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=23002,
+ 				["id_for_nothing"]="VAtcA2c=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			}
+		}
+	},
+	[3]={
+		["score"]=1000,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=10,
+ 				["id_for_nothing"]="Vwg=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
 	[4]={
-		["score"]=1100,
+		["score"]=1050,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=500,
+				["num"]=5000,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="UwhcAw=="
+			}
+		}
+	},
+	[5]={
+		["score"]=1100,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			}
 		},
 		["unlock_hero"]={
 			54003
 		}
 	},
-	[5]={
+	[6]={
 		["score"]=1150,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=10,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="Vwg=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
-	[6]={
+	[7]={
 		["score"]=1200,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=13,
+				["id"]=6,
- 				["id_for_nothing"]="Vws=",
+ 				["id_for_nothing"]="UA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
@@ -83,140 +96,140 @@ local arena_gift = {
 			34003
 		}
 	},
-	[7]={
-		["score"]=1250,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=22,
- 				["id_for_nothing"]="VAo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
 	[8]={
-		["score"]=1300,
+		["score"]=1250,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			}
-		}
-	},
-	[9]={
-		["score"]=1350,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=8,
- 				["id_for_nothing"]="Xg==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[10]={
-		["score"]=1400,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
-			}
-		},
-		["unlock_hero"]={
-			24003
-		}
-	},
-	[11]={
-		["score"]=1450,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=8,
- 				["id_for_nothing"]="Xg==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[12]={
-		["score"]=1500,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=500,
+				["num"]=10000,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="VwhcA2U="
 			}
 		}
 	},
-	[13]={
+	[9]={
-		["score"]=1550,
+		["score"]=1300,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=11,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="Vwk=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[10]={
+		["score"]=1350,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
+			}
+		}
+	},
+	[11]={
+		["score"]=1400,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=54003,
+ 				["id_for_nothing"]="UwxcA2Y=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		},
+		["unlock_hero"]={
+			24003
+		}
+	},
+	[12]={
+		["score"]=1450,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=15000,
+ 				["num_for_nothing"]="Vw1cA2U="
+			}
+		}
+	},
+	[13]={
+		["score"]=1500,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=11,
+ 				["id_for_nothing"]="Vwk=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
 	[14]={
+		["score"]=1550,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
+			}
+		}
+	},
+	[15]={
 		["score"]=1600,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=13,
+				["id"]=34003,
- 				["id_for_nothing"]="Vws=",
+ 				["id_for_nothing"]="VQxcA2Y=",
-				["num"]=1,
+				["num"]=3,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="VQ=="
 			}
 		}
 	},
-	[15]={
+	[16]={
 		["score"]=1650,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=10,
+				["id"]=1,
- 				["id_for_nothing"]="Vwg=",
+ 				["id_for_nothing"]="Vw==",
-				["num"]=1,
+				["num"]=18000,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="VwBcA2U="
 			}
 		}
 	},
-	[16]={
+	[17]={
 		["score"]=1700,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=22,
+				["id"]=18,
- 				["id_for_nothing"]="VAo=",
+ 				["id_for_nothing"]="VwA=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
-	[17]={
+	[18]={
 		["score"]=1750,
 		["reward"]={
 			{
@@ -224,25 +237,25 @@ local arena_gift = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=30,
+				["num"]=100,
- 				["num_for_nothing"]="VQg="
+ 				["num_for_nothing"]="Vwhc"
 			}
 		}
 	},
-	[18]={
+	[19]={
 		["score"]=1800,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=24003,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="VAxcA2Y=",
-				["num"]=1,
+				["num"]=3,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="VQ=="
 			}
 		}
 	},
-	[19]={
+	[20]={
 		["score"]=1850,
 		["reward"]={
 			{
@@ -250,298 +263,298 @@ local arena_gift = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=500,
+				["num"]=20000,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="VAhcA2U="
 			}
 		}
 	},
-	[20]={
+	[21]={
 		["score"]=1900,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=11,
+				["id"]=18,
- 				["id_for_nothing"]="Vwk=",
+ 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[21]={
-		["score"]=1950,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=8,
- 				["id_for_nothing"]="Xg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
 	[22]={
+		["score"]=1950,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=120,
+ 				["num_for_nothing"]="Vwpc"
+			}
+		}
+	},
+	[23]={
 		["score"]=2000,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[24]={
+		["score"]=2050,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=500,
+				["num"]=24000,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="VAxcA2U="
 			}
 		}
 	},
-	[23]={
+	[25]={
-		["score"]=2050,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=8,
- 				["id_for_nothing"]="Xg==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[24]={
 		["score"]=2100,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=13,
+				["id"]=18,
- 				["id_for_nothing"]="Vws=",
+ 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[25]={
-		["score"]=2150,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
 	[26]={
+		["score"]=2150,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			}
+		}
+	},
+	[27]={
 		["score"]=2200,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=22,
+				["id"]=47,
- 				["id_for_nothing"]="VAo=",
+ 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
+				["num"]=8,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Xg=="
 			}
 		}
 	},
-	[27]={
+	[28]={
 		["score"]=2250,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=1,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw==",
-				["num"]=30,
+				["num"]=30000,
- 				["num_for_nothing"]="VQg="
+ 				["num_for_nothing"]="VQhcA2U="
 			}
 		}
 	},
-	[28]={
+	[29]={
 		["score"]=2300,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=18,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="VwA=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
-	[29]={
-		["score"]=2350,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=500,
- 				["num_for_nothing"]="Uwhc"
-			}
-		}
-	},
 	[30]={
-		["score"]=2400,
+		["score"]=2350,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=50,
+				["num"]=180,
- 				["num_for_nothing"]="Uwg="
+ 				["num_for_nothing"]="VwBc"
 			}
 		}
 	},
 	[31]={
-		["score"]=2450,
+		["score"]=2400,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=8,
- 				["id_for_nothing"]="Xg==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[32]={
-		["score"]=2500,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=500,
+				["num"]=30000,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="VQhcA2U="
+			}
+		}
+	},
+	[32]={
+		["score"]=2450,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
 	[33]={
+		["score"]=2500,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			}
+		}
+	},
+	[34]={
 		["score"]=2550,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=1,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="Vw==",
-				["num"]=1,
+				["num"]=40000,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="UghcA2U="
 			}
 		}
 	},
-	[34]={
+	[35]={
 		["score"]=2600,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=10,
+				["id"]=18,
- 				["id_for_nothing"]="Vwg=",
+ 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[35]={
-		["score"]=2650,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
 	[36]={
-		["score"]=2700,
+		["score"]=2650,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=22,
- 				["id_for_nothing"]="VAo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[37]={
-		["score"]=2750,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=30,
+				["num"]=200,
- 				["num_for_nothing"]="VQg="
+ 				["num_for_nothing"]="VAhc"
 			}
 		}
 	},
-	[38]={
+	[37]={
-		["score"]=2800,
+		["score"]=2700,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=1,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="Vw==",
+				["num"]=40000,
+ 				["num_for_nothing"]="UghcA2U="
+			}
+		}
+	},
+	[38]={
+		["score"]=2750,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
 	[39]={
+		["score"]=2800,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=12,
+ 				["num_for_nothing"]="Vwo="
+			}
+		}
+	},
+	[40]={
 		["score"]=2850,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=10,
+				["id"]=1,
- 				["id_for_nothing"]="Vwg=",
+ 				["id_for_nothing"]="Vw==",
-				["num"]=1,
+				["num"]=50000,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="UwhcA2U="
 			}
 		}
 	},
-	[40]={
+	[41]={
 		["score"]=2900,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=11,
+				["id"]=18,
- 				["id_for_nothing"]="Vwk=",
+ 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		}
-	},
-	[41]={
-		["score"]=2950,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=8,
- 				["id_for_nothing"]="Xg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
 	[42]={
+		["score"]=2950,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			}
+		}
+	},
+	[43]={
 		["score"]=3000,
 		["reward"]={
 			{
@@ -549,39 +562,39 @@ local arena_gift = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=500,
+				["num"]=50000,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="UwhcA2U="
 			}
 		}
 	},
-	[43]={
+	[44]={
 		["score"]=3050,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=15,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="Vw0=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
-	[44]={
+	[45]={
 		["score"]=3100,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=8,
+				["id"]=47,
- 				["id_for_nothing"]="Xg==",
+ 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
+				["num"]=15,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="Vw0="
 			}
 		}
 	}
 }
 local config = {
-data=arena_gift,count=44
+data=arena_gift,count=45
 }
 return config

lua/app/config/bounty_level.lua

@@ -3669,16 +3669,16 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=500,
+			["num"]=1000,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="VwhcAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=3000,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="VQhcAw=="
 		}
 	},
 	[323]={
@@ -3870,16 +3870,16 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=500,
+			["num"]=1000,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="VwhcAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=3000,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="VQhcAw=="
 		}
 	},
 	[333]={
@@ -4071,16 +4071,16 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=500,
+			["num"]=1000,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="VwhcAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=3000,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="VQhcAw=="
 		}
 	},
 	[343]={
@@ -4211,8 +4211,8 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1000,
+			["num"]=1500,
- 			["num_for_nothing"]="VwhcAw=="
+ 			["num_for_nothing"]="Vw1cAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
@@ -4272,16 +4272,16 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=500,
+			["num"]=1500,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="Vw1cAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=4500,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="Ug1cAw=="
 		}
 	},
 	[353]={
@@ -4473,16 +4473,16 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=500,
+			["num"]=1500,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="Vw1cAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=4500,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="Ug1cAw=="
 		}
 	},
 	[363]={
@@ -4674,16 +4674,16 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=500,
+			["num"]=1500,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="Vw1cAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=4500,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="Ug1cAw=="
 		}
 	},
 	[373]={
@@ -4774,16 +4774,16 @@ local bounty_level = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=500,
+			["num"]=1500,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="Vw1cAw=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=4500,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="Ug1cAw=="
 		}
 	},
 	[378]={

lua/app/config/localization/localization_global_const.lua

@@ -461,6 +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",
 }
 
 return LocalizationGlobalConst

lua/app/config/monster_dungeon_equip.lua

@@ -1,7 +1,7 @@
 local monster_dungeon_equip = {
 	[106]={
 		["monster_base"]=10056,
-		["hp"]=76930000,
+		["hp"]=81620000,
 		["atk"]=1390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -16,7 +16,7 @@ local monster_dungeon_equip = {
 	},
 	[206]={
 		["monster_base"]=10045,
-		["hp"]=93400000,
+		["hp"]=99240000,
 		["atk"]=1930000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -31,7 +31,7 @@ local monster_dungeon_equip = {
 	},
 	[306]={
 		["monster_base"]=10028,
-		["hp"]=153020000,
+		["hp"]=178640000,
 		["atk"]=2140000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -46,7 +46,7 @@ local monster_dungeon_equip = {
 	},
 	[406]={
 		["monster_base"]=10003,
-		["hp"]=203320000,
+		["hp"]=237440000,
 		["atk"]=2220000,
 		["atk_times"]=2,
 		["hurt_skill"]={
@@ -62,7 +62,7 @@ local monster_dungeon_equip = {
 	[506]={
 		["monster_base"]=20041,
 		["is_boss"]=2,
-		["hp"]=386900000,
+		["hp"]=431900000,
 		["atk"]=2260000,
 		["atk_times"]=4,
 		["hurt_skill"]={
@@ -82,7 +82,7 @@ local monster_dungeon_equip = {
 	},
 	[606]={
 		["monster_base"]=10060,
-		["hp"]=85320000,
+		["hp"]=90860000,
 		["atk"]=1540000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -97,7 +97,7 @@ local monster_dungeon_equip = {
 	},
 	[706]={
 		["monster_base"]=10055,
-		["hp"]=103120000,
+		["hp"]=110400000,
 		["atk"]=2150000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -112,7 +112,7 @@ local monster_dungeon_equip = {
 	},
 	[806]={
 		["monster_base"]=10027,
-		["hp"]=168890000,
+		["hp"]=198820000,
 		["atk"]=2380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -127,7 +127,7 @@ local monster_dungeon_equip = {
 	},
 	[906]={
 		["monster_base"]=10064,
-		["hp"]=224600000,
+		["hp"]=264180000,
 		["atk"]=2470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -143,7 +143,7 @@ local monster_dungeon_equip = {
 	[1006]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=426150000,
+		["hp"]=480480000,
 		["atk"]=2520000,
 		["atk_times"]=4,
 		["hurt_skill"]={
@@ -162,7 +162,7 @@ local monster_dungeon_equip = {
 	},
 	[1106]={
 		["monster_base"]=10015,
-		["hp"]=93300000,
+		["hp"]=98780000,
 		["atk"]=1680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -177,7 +177,7 @@ local monster_dungeon_equip = {
 	},
 	[1206]={
 		["monster_base"]=10025,
-		["hp"]=112820000,
+		["hp"]=119880000,
 		["atk"]=2340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -192,7 +192,7 @@ local monster_dungeon_equip = {
 	},
 	[1306]={
 		["monster_base"]=10030,
-		["hp"]=191790000,
+		["hp"]=215800000,
 		["atk"]=2590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -207,7 +207,7 @@ local monster_dungeon_equip = {
 	},
 	[1406]={
 		["monster_base"]=10018,
-		["hp"]=255070000,
+		["hp"]=286720000,
 		["atk"]=2690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -223,7 +223,7 @@ local monster_dungeon_equip = {
 	[1506]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=494490000,
+		["hp"]=521500000,
 		["atk"]=2740000,
 		["atk_times"]=4,
 		["hurt_skill"]={
@@ -242,8 +242,8 @@ local monster_dungeon_equip = {
 	},
 	[1606]={
 		["monster_base"]=10004,
-		["hp"]=119700000,
+		["hp"]=118220000,
-		["atk"]=1830000,
+		["atk"]=2020000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20010,
@@ -257,8 +257,8 @@ local monster_dungeon_equip = {
 	},
 	[1706]={
 		["monster_base"]=10049,
-		["hp"]=143630000,
+		["hp"]=143890000,
-		["atk"]=2540000,
+		["atk"]=2820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -272,8 +272,8 @@ local monster_dungeon_equip = {
 	},
 	[1806]={
 		["monster_base"]=10037,
-		["hp"]=235050000,
+		["hp"]=259680000,
-		["atk"]=2810000,
+		["atk"]=3120000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20106,
@@ -287,8 +287,8 @@ local monster_dungeon_equip = {
 	},
 	[1906]={
 		["monster_base"]=10016,
-		["hp"]=312870000,
+		["hp"]=351150000,
-		["atk"]=2920000,
+		["atk"]=3240000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20043,
@@ -303,8 +303,8 @@ local monster_dungeon_equip = {
 	[2006]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=566760000,
+		["hp"]=638400000,
-		["atk"]=2980000,
+		["atk"]=3310000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -323,8 +323,8 @@ local monster_dungeon_equip = {
 	},
 	[2106]={
 		["monster_base"]=10022,
-		["hp"]=136880000,
+		["hp"]=126040000,
-		["atk"]=2010000,
+		["atk"]=2180000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -338,8 +338,8 @@ local monster_dungeon_equip = {
 	},
 	[2206]={
 		["monster_base"]=10032,
-		["hp"]=163040000,
+		["hp"]=153470000,
-		["atk"]=2780000,
+		["atk"]=3010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -353,8 +353,8 @@ local monster_dungeon_equip = {
 	},
 	[2306]={
 		["monster_base"]=10013,
-		["hp"]=267170000,
+		["hp"]=276960000,
-		["atk"]=3070000,
+		["atk"]=3330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -368,8 +368,8 @@ local monster_dungeon_equip = {
 	},
 	[2406]={
 		["monster_base"]=10001,
-		["hp"]=355450000,
+		["hp"]=374550000,
-		["atk"]=3200000,
+		["atk"]=3480000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20001,
@@ -384,8 +384,8 @@ local monster_dungeon_equip = {
 	[2506]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=643710000,
+		["hp"]=680700000,
-		["atk"]=3260000,
+		["atk"]=3540000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30123,
@@ -403,8 +403,8 @@ local monster_dungeon_equip = {
 	},
 	[2606]={
 		["monster_base"]=10045,
-		["hp"]=147550000,
+		["hp"]=140300000,
-		["atk"]=2190000,
+		["atk"]=2400000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -418,8 +418,8 @@ local monster_dungeon_equip = {
 	},
 	[2706]={
 		["monster_base"]=10056,
-		["hp"]=175200000,
+		["hp"]=169470000,
-		["atk"]=3030000,
+		["atk"]=3320000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20163,
@@ -433,8 +433,8 @@ local monster_dungeon_equip = {
 	},
 	[2806]={
 		["monster_base"]=10003,
-		["hp"]=287270000,
+		["hp"]=306100000,
-		["atk"]=3340000,
+		["atk"]=3660000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20007,
@@ -448,8 +448,8 @@ local monster_dungeon_equip = {
 	},
 	[2906]={
 		["monster_base"]=10028,
-		["hp"]=382140000,
+		["hp"]=415400000,
-		["atk"]=3490000,
+		["atk"]=3830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -464,8 +464,8 @@ local monster_dungeon_equip = {
 	[3006]={
 		["monster_base"]=20041,
 		["is_boss"]=2,
-		["hp"]=691660000,
+		["hp"]=754750000,
-		["atk"]=3560000,
+		["atk"]=3970000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30126,
@@ -484,8 +484,8 @@ local monster_dungeon_equip = {
 	},
 	[3106]={
 		["monster_base"]=10052,
-		["hp"]=161570000,
+		["hp"]=153460000,
-		["atk"]=2380000,
+		["atk"]=2630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -499,8 +499,8 @@ local monster_dungeon_equip = {
 	},
 	[3206]={
 		["monster_base"]=10062,
-		["hp"]=191650000,
+		["hp"]=185090000,
-		["atk"]=3300000,
+		["atk"]=3630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20181,
@@ -514,8 +514,8 @@ local monster_dungeon_equip = {
 	},
 	[3306]={
 		["monster_base"]=10036,
-		["hp"]=313710000,
+		["hp"]=334280000,
-		["atk"]=3620000,
+		["atk"]=4000000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20103,
@@ -529,8 +529,8 @@ local monster_dungeon_equip = {
 	},
 	[3406]={
 		["monster_base"]=10061,
-		["hp"]=417370000,
+		["hp"]=453650000,
-		["atk"]=3790000,
+		["atk"]=4190000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20178,
@@ -545,8 +545,8 @@ local monster_dungeon_equip = {
 	[3506]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=754850000,
+		["hp"]=824060000,
-		["atk"]=3870000,
+		["atk"]=4350000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30129,
@@ -564,8 +564,8 @@ local monster_dungeon_equip = {
 	},
 	[3606]={
 		["monster_base"]=10030,
-		["hp"]=175230000,
+		["hp"]=163330000,
-		["atk"]=2580000,
+		["atk"]=2810000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -579,8 +579,8 @@ local monster_dungeon_equip = {
 	},
 	[3706]={
 		["monster_base"]=10015,
-		["hp"]=207360000,
+		["hp"]=196740000,
-		["atk"]=3560000,
+		["atk"]=3870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20040,
@@ -594,8 +594,8 @@ local monster_dungeon_equip = {
 	},
 	[3806]={
 		["monster_base"]=10025,
-		["hp"]=338580000,
+		["hp"]=355260000,
-		["atk"]=3900000,
+		["atk"]=4250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20070,
@@ -609,8 +609,8 @@ local monster_dungeon_equip = {
 	},
 	[3906]={
 		["monster_base"]=10034,
-		["hp"]=450950000,
+		["hp"]=481950000,
-		["atk"]=4090000,
+		["atk"]=4460000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -625,8 +625,8 @@ local monster_dungeon_equip = {
 	[4006]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=814970000,
+		["hp"]=875620000,
-		["atk"]=4170000,
+		["atk"]=4630000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30117,
@@ -644,8 +644,8 @@ local monster_dungeon_equip = {
 	},
 	[4106]={
 		["monster_base"]=10054,
-		["hp"]=182360000,
+		["hp"]=177360000,
-		["atk"]=2660000,
+		["atk"]=3070000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -659,8 +659,8 @@ local monster_dungeon_equip = {
 	},
 	[4206]={
 		["monster_base"]=10037,
-		["hp"]=215460000,
+		["hp"]=215560000,
-		["atk"]=3660000,
+		["atk"]=4230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20106,
@@ -674,8 +674,8 @@ local monster_dungeon_equip = {
 	},
 	[4306]={
 		["monster_base"]=10012,
-		["hp"]=351510000,
+		["hp"]=386500000,
-		["atk"]=4010000,
+		["atk"]=4650000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -689,8 +689,8 @@ local monster_dungeon_equip = {
 	},
 	[4406]={
 		["monster_base"]=10049,
-		["hp"]=468340000,
+		["hp"]=521660000,
-		["atk"]=4210000,
+		["atk"]=4870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -705,8 +705,8 @@ local monster_dungeon_equip = {
 	[4506]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=846340000,
+		["hp"]=947700000,
-		["atk"]=4290000,
+		["atk"]=5140000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -725,8 +725,8 @@ local monster_dungeon_equip = {
 	},
 	[4606]={
 		["monster_base"]=10042,
-		["hp"]=187110000,
+		["hp"]=187920000,
-		["atk"]=2740000,
+		["atk"]=3250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20121,
@@ -740,8 +740,8 @@ local monster_dungeon_equip = {
 	},
 	[4706]={
 		["monster_base"]=10026,
-		["hp"]=220970000,
+		["hp"]=228230000,
-		["atk"]=3780000,
+		["atk"]=4480000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -755,8 +755,8 @@ local monster_dungeon_equip = {
 	},
 	[4806]={
 		["monster_base"]=10019,
-		["hp"]=360430000,
+		["hp"]=409000000,
-		["atk"]=4140000,
+		["atk"]=4940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -770,8 +770,8 @@ local monster_dungeon_equip = {
 	},
 	[4906]={
 		["monster_base"]=10001,
-		["hp"]=480060000,
+		["hp"]=551930000,
-		["atk"]=4340000,
+		["atk"]=5160000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20001,
@@ -786,8 +786,8 @@ local monster_dungeon_equip = {
 	[5006]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=867510000,
+		["hp"]=1002610000,
-		["atk"]=4430000,
+		["atk"]=5440000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30132,
@@ -805,8 +805,8 @@ local monster_dungeon_equip = {
 	},
 	[5106]={
 		["monster_base"]=10045,
-		["hp"]=200880000,
+		["hp"]=199440000,
-		["atk"]=2910000,
+		["atk"]=3450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -820,8 +820,8 @@ local monster_dungeon_equip = {
 	},
 	[5206]={
 		["monster_base"]=10056,
-		["hp"]=236460000,
+		["hp"]=242090000,
-		["atk"]=4010000,
+		["atk"]=4750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20163,
@@ -835,8 +835,8 @@ local monster_dungeon_equip = {
 	},
 	[5306]={
 		["monster_base"]=10003,
-		["hp"]=385650000,
+		["hp"]=433750000,
-		["atk"]=4400000,
+		["atk"]=5240000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20007,
@@ -850,8 +850,8 @@ local monster_dungeon_equip = {
 	},
 	[5406]={
 		["monster_base"]=10028,
-		["hp"]=513230000,
+		["hp"]=585310000,
-		["atk"]=4600000,
+		["atk"]=5480000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -866,8 +866,8 @@ local monster_dungeon_equip = {
 	[5506]={
 		["monster_base"]=20041,
 		["is_boss"]=2,
-		["hp"]=927400000,
+		["hp"]=1063140000,
-		["atk"]=4690000,
+		["atk"]=5780000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30126,
@@ -886,8 +886,8 @@ local monster_dungeon_equip = {
 	},
 	[5606]={
 		["monster_base"]=10029,
-		["hp"]=202710000,
+		["hp"]=221510000,
-		["atk"]=2990000,
+		["atk"]=4040000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -901,8 +901,8 @@ local monster_dungeon_equip = {
 	},
 	[5706]={
 		["monster_base"]=10055,
-		["hp"]=238240000,
+		["hp"]=267580000,
-		["atk"]=4130000,
+		["atk"]=5560000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20160,
@@ -916,8 +916,8 @@ local monster_dungeon_equip = {
 	},
 	[5806]={
 		["monster_base"]=10051,
-		["hp"]=388530000,
+		["hp"]=484180000,
-		["atk"]=4530000,
+		["atk"]=6110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20148,
@@ -931,8 +931,8 @@ local monster_dungeon_equip = {
 	},
 	[5906]={
 		["monster_base"]=10064,
-		["hp"]=517080000,
+		["hp"]=650420000,
-		["atk"]=4730000,
+		["atk"]=6400000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20190,
@@ -947,8 +947,8 @@ local monster_dungeon_equip = {
 	[6006]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=933980000,
+		["hp"]=1181290000,
-		["atk"]=4820000,
+		["atk"]=6660000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30135,
@@ -966,8 +966,8 @@ local monster_dungeon_equip = {
 	},
 	[6106]={
 		["monster_base"]=10015,
-		["hp"]=216480000,
+		["hp"]=227560000,
-		["atk"]=3180000,
+		["atk"]=4160000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20040,
@@ -981,8 +981,8 @@ local monster_dungeon_equip = {
 	},
 	[6206]={
 		["monster_base"]=10025,
-		["hp"]=254320000,
+		["hp"]=274900000,
-		["atk"]=4380000,
+		["atk"]=5710000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20070,
@@ -996,8 +996,8 @@ local monster_dungeon_equip = {
 	},
 	[6306]={
 		["monster_base"]=10021,
-		["hp"]=415070000,
+		["hp"]=497380000,
-		["atk"]=4810000,
+		["atk"]=6280000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -1011,8 +1011,8 @@ local monster_dungeon_equip = {
 	},
 	[6406]={
 		["monster_base"]=10034,
-		["hp"]=552120000,
+		["hp"]=668140000,
-		["atk"]=5030000,
+		["atk"]=6580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -1027,8 +1027,8 @@ local monster_dungeon_equip = {
 	[6506]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=996810000,
+		["hp"]=1213440000,
-		["atk"]=5130000,
+		["atk"]=6850000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30117,
@@ -1046,8 +1046,8 @@ local monster_dungeon_equip = {
 	},
 	[6606]={
 		["monster_base"]=10049,
-		["hp"]=221080000,
+		["hp"]=151200000,
-		["atk"]=3280000,
+		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -1061,8 +1061,8 @@ local monster_dungeon_equip = {
 	},
 	[6706]={
 		["monster_base"]=10006,
-		["hp"]=259330000,
+		["hp"]=282760000,
-		["atk"]=4500000,
+		["atk"]=5870000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20016,
@@ -1076,8 +1076,8 @@ local monster_dungeon_equip = {
 	},
 	[6806]={
 		["monster_base"]=10054,
-		["hp"]=423100000,
+		["hp"]=511630000,
-		["atk"]=4950000,
+		["atk"]=6460000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -1091,8 +1091,8 @@ local monster_dungeon_equip = {
 	},
 	[6906]={
 		["monster_base"]=10024,
-		["hp"]=562720000,
+		["hp"]=687320000,
-		["atk"]=5180000,
+		["atk"]=6770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -1107,8 +1107,8 @@ local monster_dungeon_equip = {
 	[7006]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=1015810000,
+		["hp"]=1248040000,
-		["atk"]=5280000,
+		["atk"]=7050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -1127,8 +1127,8 @@ local monster_dungeon_equip = {
 	},
 	[7106]={
 		["monster_base"]=10019,
-		["hp"]=225650000,
+		["hp"]=273750000,
-		["atk"]=3370000,
+		["atk"]=4990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -1142,8 +1142,8 @@ local monster_dungeon_equip = {
 	},
 	[7206]={
 		["monster_base"]=10035,
-		["hp"]=264660000,
+		["hp"]=330170000,
-		["atk"]=4630000,
+		["atk"]=6840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20100,
@@ -1157,8 +1157,8 @@ local monster_dungeon_equip = {
 	},
 	[7306]={
 		["monster_base"]=10026,
-		["hp"]=431730000,
+		["hp"]=624370000,
-		["atk"]=5090000,
+		["atk"]=7530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -1172,8 +1172,8 @@ local monster_dungeon_equip = {
 	},
 	[7406]={
 		["monster_base"]=10041,
-		["hp"]=574040000,
+		["hp"]=801000000,
-		["atk"]=5330000,
+		["atk"]=7910000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20118,
@@ -1188,8 +1188,8 @@ local monster_dungeon_equip = {
 	[7506]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=1036280000,
+		["hp"]=1454090000,
-		["atk"]=5440000,
+		["atk"]=8290000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30138,
@@ -1207,8 +1207,8 @@ local monster_dungeon_equip = {
 	},
 	[7606]={
 		["monster_base"]=10053,
-		["hp"]=233950000,
+		["hp"]=289120000,
-		["atk"]=3470000,
+		["atk"]=5270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -1222,8 +1222,8 @@ local monster_dungeon_equip = {
 	},
 	[7706]={
 		["monster_base"]=10043,
-		["hp"]=273880000,
+		["hp"]=348580000,
-		["atk"]=4760000,
+		["atk"]=7220000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -1237,8 +1237,8 @@ local monster_dungeon_equip = {
 	},
 	[7806]={
 		["monster_base"]=10033,
-		["hp"]=446810000,
+		["hp"]=659030000,
-		["atk"]=5230000,
+		["atk"]=7960000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -1252,8 +1252,8 @@ local monster_dungeon_equip = {
 	},
 	[7906]={
 		["monster_base"]=10028,
-		["hp"]=594050000,
+		["hp"]=845550000,
-		["atk"]=5480000,
+		["atk"]=8350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -1268,8 +1268,8 @@ local monster_dungeon_equip = {
 	[8006]={
 		["monster_base"]=20041,
 		["is_boss"]=2,
-		["hp"]=1072430000,
+		["hp"]=1534760000,
-		["atk"]=5590000,
+		["atk"]=8750000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30126,
@@ -1288,8 +1288,8 @@ local monster_dungeon_equip = {
 	},
 	[8106]={
 		["monster_base"]=10036,
-		["hp"]=132000000,
+		["hp"]=312170000,
-		["atk"]=870000,
+		["atk"]=5690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20103,
@@ -1303,8 +1303,8 @@ local monster_dungeon_equip = {
 	},
 	[8206]={
 		["monster_base"]=10017,
-		["hp"]=284280000,
+		["hp"]=376280000,
-		["atk"]=4890000,
+		["atk"]=7800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20046,
@@ -1318,8 +1318,8 @@ local monster_dungeon_equip = {
 	},
 	[8306]={
 		["monster_base"]=10023,
-		["hp"]=463670000,
+		["hp"]=711080000,
-		["atk"]=5380000,
+		["atk"]=8610000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -1333,8 +1333,8 @@ local monster_dungeon_equip = {
 	},
 	[8406]={
 		["monster_base"]=10051,
-		["hp"]=616180000,
+		["hp"]=912460000,
-		["atk"]=5640000,
+		["atk"]=9020000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20148,
@@ -1349,8 +1349,8 @@ local monster_dungeon_equip = {
 	[8506]={
 		["monster_base"]=20040,
 		["is_boss"]=2,
-		["hp"]=1112410000,
+		["hp"]=1655840000,
-		["atk"]=5750000,
+		["atk"]=9450000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30141,
@@ -1368,8 +1368,8 @@ local monster_dungeon_equip = {
 	},
 	[8606]={
 		["monster_base"]=10021,
-		["hp"]=251150000,
+		["hp"]=339080000,
-		["atk"]=3770000,
+		["atk"]=6160000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -1383,8 +1383,8 @@ local monster_dungeon_equip = {
 	},
 	[8706]={
 		["monster_base"]=10034,
-		["hp"]=293630000,
+		["hp"]=408050000,
-		["atk"]=5170000,
+		["atk"]=8450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -1398,8 +1398,8 @@ local monster_dungeon_equip = {
 	},
 	[8806]={
 		["monster_base"]=10030,
-		["hp"]=478890000,
+		["hp"]=771120000,
-		["atk"]=5680000,
+		["atk"]=9340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -1413,8 +1413,8 @@ local monster_dungeon_equip = {
 	},
 	[8906]={
 		["monster_base"]=10018,
-		["hp"]=636450000,
+		["hp"]=986810000,
-		["atk"]=5960000,
+		["atk"]=9790000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20049,
@@ -1429,8 +1429,8 @@ local monster_dungeon_equip = {
 	[9006]={
 		["monster_base"]=20039,
 		["is_boss"]=2,
-		["hp"]=1148710000,
+		["hp"]=1790630000,
-		["atk"]=6080000,
+		["atk"]=10230000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30117,
@@ -1448,8 +1448,8 @@ local monster_dungeon_equip = {
 	},
 	[9106]={
 		["monster_base"]=10016,
-		["hp"]=261840000,
+		["hp"]=357560000,
-		["atk"]=3970000,
+		["atk"]=6490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20043,
@@ -1463,8 +1463,8 @@ local monster_dungeon_equip = {
 	},
 	[9206]={
 		["monster_base"]=10054,
-		["hp"]=305680000,
+		["hp"]=429930000,
-		["atk"]=5440000,
+		["atk"]=8920000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -1478,8 +1478,8 @@ local monster_dungeon_equip = {
 	},
 	[9306]={
 		["monster_base"]=10006,
-		["hp"]=498740000,
+		["hp"]=812430000,
-		["atk"]=5980000,
+		["atk"]=9840000,
 		["atk_times"]=2,
 		["hurt_skill"]={
 			20016,
@@ -1493,8 +1493,8 @@ local monster_dungeon_equip = {
 	},
 	[9406]={
 		["monster_base"]=10020,
-		["hp"]=662690000,
+		["hp"]=1039660000,
-		["atk"]=6280000,
+		["atk"]=10320000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -1509,8 +1509,8 @@ local monster_dungeon_equip = {
 	[9506]={
 		["monster_base"]=20043,
 		["is_boss"]=2,
-		["hp"]=1196050000,
+		["hp"]=1886200000,
-		["atk"]=6410000,
+		["atk"]=10790000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30120,
@@ -1529,8 +1529,8 @@ local monster_dungeon_equip = {
 	},
 	[9606]={
 		["monster_base"]=10031,
-		["hp"]=270070000,
+		["hp"]=375760000,
-		["atk"]=4190000,
+		["atk"]=6820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20088,
@@ -1544,8 +1544,8 @@ local monster_dungeon_equip = {
 	},
 	[9706]={
 		["monster_base"]=10035,
-		["hp"]=315240000,
+		["hp"]=451810000,
-		["atk"]=5740000,
+		["atk"]=9380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20100,
@@ -1559,8 +1559,8 @@ local monster_dungeon_equip = {
 	},
 	[9806]={
 		["monster_base"]=10019,
-		["hp"]=514070000,
+		["hp"]=853590000,
-		["atk"]=6320000,
+		["atk"]=10350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -1574,8 +1574,8 @@ local monster_dungeon_equip = {
 	},
 	[9906]={
 		["monster_base"]=10013,
-		["hp"]=682910000,
+		["hp"]=1092340000,
-		["atk"]=6630000,
+		["atk"]=10850000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -1590,8 +1590,8 @@ local monster_dungeon_equip = {
 	[10006]={
 		["monster_base"]=20042,
 		["is_boss"]=2,
-		["hp"]=1232640000,
+		["hp"]=1981770000,
-		["atk"]=6760000,
+		["atk"]=11340000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30144,

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

@@ -461,6 +461,8 @@ local localization_global =
     ["ARENA_DESC_40"] = "升段奖励",
     ["ARENA_DESC_41"] = "结算奖励",
     ["ARENA_DESC_42"] = "未领取奖励",
+    ["EQUIP_DESC_26"] = "武器直升{0}级礼包",
+    ["EQUIP_DESC_27"] = "防具直升{0}级礼包",
 }
 
 return localization_global

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "You might obtain <color=#ff8bf8>Epic</color>~",
     ["ARENA_DESC_36"] = "Try",
+    ["ONE_KEY_GET_DESC"] = "Claim All",
+    ["ACTIVITY_OVER_EDSC"] = "Event has ended",
+    ["PART_IN_DESC"] = "Participate",
+    ["HERO_FUND_DESCC_1"] = "New event [Lunar Benediction] is open",
+    ["HERO_FUND_DESCC_2"] = "Lunar Benediction",
+    ["HERO_FUND_DESCC_3"] = "With the Lunar Benediction, obtain rewards by progressing through waves in battles.",
+    ["HERO_FUND_DESCC_4"] = "New event [Advanced Challenge] is open",
+    ["ARENA_DESC_37"] = "Unlock Hero:",
+    ["ARENA_DESC_38"] = "Unlocked Heroes:",
+    ["ARENA_DESC_39"] = "Promotion rewards are one-time",
+    ["ARENA_DESC_40"] = "Promotion Rewards",
+    ["ARENA_DESC_41"] = "Settlement Rewards",
+    ["ARENA_DESC_42"] = "Unclaimed Rewards",
+    ["EQUIP_DESC_26"] = "Weapon Upgrade Lv.{0} Pack",
+    ["EQUIP_DESC_27"] = "Armor Upgrade Lv.{0} Pack",
 }
 
 return localization_global

lua/app/config/strings/en/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="Alluring Nightmare can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[3400204]={
-		["desc"]="The chance of Drowsy inflicted by Alluring Nightmare increases to <color=#3cff28>80%</color>."
+		["desc"]="The chance of <color=#3cff28>Drowsy</color> inflicted by Alluring Nightmare increases to <color=#3cff28>80%</color> for <color=#3cff28>+1</color> turn."
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>Combo</color>: Nightmare's normal attack to <color=#3cff28>Drowsy</color> enemy will inflict <color=#3cff28>Imprison</color> for <color=#3cff28>2</color> turns."

lua/app/config/strings/en/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="Initial"
 	},
 	[1400101]={
-
+		["value"]="Relic Armor"
 	},
 	[14002]={
 		["value"]="Initial"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "Héroe <color=#ff8bf8>épico</color> posible",
     ["ARENA_DESC_36"] = "Prueba tu suerte",
+    ["ONE_KEY_GET_DESC"] = "Colectar todo",
+    ["ACTIVITY_OVER_EDSC"] = "El evento ha terminado",
+    ["PART_IN_DESC"] = "Participar",
+    ["HERO_FUND_DESCC_1"] = "Comienza el nuevo evento: Bendición de la Luna",
+    ["HERO_FUND_DESCC_2"] = "Bendición de la Luna",
+    ["HERO_FUND_DESCC_3"] = "Con Bendición de la Luna, obtendrás generosas recompensas pasando las olas en la batalla.",
+    ["HERO_FUND_DESCC_4"] = "Comienza el nuevo evento: Desafío Avanzado",
+    ["ARENA_DESC_37"] = "Héroes bloqueados:",
+    ["ARENA_DESC_38"] = "Héroes desbloqueados:",
+    ["ARENA_DESC_39"] = "Las recompensas de subida de ranking se conceden una sola vez",
+    ["ARENA_DESC_40"] = "Recompensas de Subida de Ranking",
+    ["ARENA_DESC_41"] = "Recompensas de Clasificación",
+    ["ARENA_DESC_42"] = "Recompensas no colectadas",
+    ["EQUIP_DESC_26"] = "Paquete de Mejora de Arma al Nv. {0}",
+    ["EQUIP_DESC_27"] = "Paquete de Mejora de Armadura al Nv. {0}",
 }
 
 return localization_global

lua/app/config/strings/es/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="Pesadilla Hermosa elimina <color=#3cff28>4</color> bloques extras en direcciones de X."
 	},
 	[3400204]={
-		["desc"]="Aumenta el chance de <color=#3cff28>Dormido</color> aplicado por Pesadilla Hermosa a <color=#3cff28>80%</color>."
+		["desc"]="Aumenta el chance de <color=#3cff28>Dormido</color> aplicado por Pesadilla Hermosa a <color=#3cff28>80%</color> durante <color=#3cff28>+1</color> rondas."
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>Combo</color>: el ataque común de Íncubo a enemigos <color=#3cff28>Dormidos</color> aplicará <color=#3cff28>Encarcelamiento</color> durante <color=#3cff28>2</color> rondas."

lua/app/config/strings/es/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="Inicial"
 	},
 	[1400101]={
-
+		["value"]="Armadura de Ruinas"
 	},
 	[14002]={
 		["value"]="Inicial"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "Mungkin dapat <color=#ff8bf8>Epik</color>",
     ["ARENA_DESC_36"] = "Coba",
+    ["ONE_KEY_GET_DESC"] = "Klaim Cepat",
+    ["ACTIVITY_OVER_EDSC"] = "Event telah berakhir",
+    ["PART_IN_DESC"] = "Partisipasi",
+    ["HERO_FUND_DESCC_1"] = "Event baru Berkah Lunar dibuka",
+    ["HERO_FUND_DESCC_2"] = "Berkah Lunar",
+    ["HERO_FUND_DESCC_3"] = "Dapatkan hadiah melimpah dengan melewati ombak dalam pertempuran saat memiliki Berkah Lunar.",
+    ["HERO_FUND_DESCC_4"] = "Event baru Tantangan Advanced dibuka",
+    ["ARENA_DESC_37"] = "Buka Hero:",
+    ["ARENA_DESC_38"] = "Hero terbuka:",
+    ["ARENA_DESC_39"] = "Hadiah promosi hanya satu kali",
+    ["ARENA_DESC_40"] = "Hadiah Promosi",
+    ["ARENA_DESC_41"] = "Hadiah Penyelesaian",
+    ["ARENA_DESC_42"] = "Hadiah yang belum diklaim",
+    ["EQUIP_DESC_26"] = "Pack Peningkatan Senjata Lv.{0}",
+    ["EQUIP_DESC_27"] = "Pack upgrade Armor Lv.{0}",
 }
 
 return localization_global

lua/app/config/strings/id/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="Nightmare Z dapat menghapus <color=#3cff28>4</color> grid tambahan pada arah X."
 	},
 	[3400204]={
-		["desc"]="Efek <color=#3cff28>Kantuk</color> Nightmare Z meningkatkan peluang hingga <color=#3cff28>80%</color>。"
+		["desc"]="Peluang <color=#3cff28>Kantuk</color> yang ditimbulkan oleh Nightmare Z meningkat <color=#3cff28>80%</color> selama <color=#3cff28>+1</color> giliran."
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>Combo</color>: ATK Nightmare Z <color=#3cff28>Kantuk</color> musuh akan memiliki efek <color=#3cff28>Larangan</color> yang melekat selama <color=#3cff28>2</color> giliran."

lua/app/config/strings/id/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="Awal"
 	},
 	[1400101]={
-
+		["value"]="Armor Relik"
 	},
 	[14002]={
 		["value"]="Awal"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "<color=#ff8bf8>エピック</color>を獲得可能~",
     ["ARENA_DESC_36"] = "運試し",
+    ["ONE_KEY_GET_DESC"] = "一括受取",
+    ["ACTIVITY_OVER_EDSC"] = "イベントは終了しました",
+    ["PART_IN_DESC"] = "参加する",
+    ["HERO_FUND_DESCC_1"] = "新イベント月の祝福が解放",
+    ["HERO_FUND_DESCC_2"] = "月の祝福",
+    ["HERO_FUND_DESCC_3"] = "月の祝福を入手した後、バトル中にクリア回数を累計すると豪華な報酬を獲得できます。",
+    ["HERO_FUND_DESCC_4"] = "新イベントランクアップ挑戦が解放",
+    ["ARENA_DESC_37"] = "ヒーロー解放：",
+    ["ARENA_DESC_38"] = "解放済のヒーロー：",
+    ["ARENA_DESC_39"] = "ランクアップ報酬は一回のみ受取可能です",
+    ["ARENA_DESC_40"] = "ランクアップ報酬",
+    ["ARENA_DESC_41"] = "決算報酬",
+    ["ARENA_DESC_42"] = "未受取の報酬",
+    ["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック",
+    ["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック",
 }
 
 return localization_global

lua/app/config/strings/ja/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="「アリュールナイトメア」は追加でX方向<color=#3cff28>4</color>マスを消す。"
 	},
 	[3400204]={
-		["desc"]="「アリュールナイトメア」の<color=#3cff28>昏睡</color>効果の確率は<color=#3cff28>80%</color>に増加する。"
+		["desc"]="「アリュールナイトメア」の<color=#3cff28>昏睡</color>効果の確率は<color=#3cff28>80%</color>に増加し、ターン数が<color=#3cff28>+1</color>。"
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>ヒット</color>:夢魔の通常攻撃が<color=#3cff28>昏睡</color>状態の敵に<color=#3cff28>2</color>ターン<color=#3cff28>拘束</color>効果を付与する。"

lua/app/config/strings/ja/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="デフォルト"
 	},
 	[1400101]={
-
+		["value"]="レリックアーマー"
 	},
 	[14002]={
 		["value"]="デフォルト"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "행운의 신이 당신에게 미소 짓는다면 <color=#ff8bf8>에픽</color> 품질을 손에 넣을 수도 있습니다~",
     ["ARENA_DESC_36"] = "시도해보기",
+    ["ONE_KEY_GET_DESC"] = "모두 받기",
+    ["ACTIVITY_OVER_EDSC"] = "이벤트가 종료되었습니다.",
+    ["PART_IN_DESC"] = "참여",
+    ["HERO_FUND_DESCC_1"] = "새로운 이벤트 달의 축복이 시작됩니다.",
+    ["HERO_FUND_DESCC_2"] = "달의 축복",
+    ["HERO_FUND_DESCC_3"] = "달의 축복을 받게 되면 전투에서 클리어한 웨이브를 누적하여 푸짐한 보상을 받을 수 있습니다.",
+    ["HERO_FUND_DESCC_4"] = "신규 이벤트 고급 도전 오픈",
+    ["ARENA_DESC_37"] = "영웅 잠금 해제:",
+    ["ARENA_DESC_38"] = "잠금 해제된 영웅:",
+    ["ARENA_DESC_39"] = "승급 보상은 일회성 보상입니다.",
+    ["ARENA_DESC_40"] = "승급 보상",
+    ["ARENA_DESC_41"] = "정산 보상",
+    ["ARENA_DESC_42"] = "미수령 보상",
+    ["EQUIP_DESC_26"] = "무기 {0}레벨 업그레이드 패키지",
+    ["EQUIP_DESC_27"] = "방어구 {0}레벨 업그레이드 패키지",
 }
 
 return localization_global

lua/app/config/strings/ko/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="아름다운 악몽이 X 방향을 따라 추가로 <color=#3cff28>4</color>개의 그리드를 소멸할 수 있습니다."
 	},
 	[3400204]={
-		["desc"]="아름다운 악몽이 <color=#3cff28>수면</color> 효과를 부여할 확률이 <color=#3cff28>80%</color>로 증가합니다."
+		["desc"]="아름다운 악몽이 <color=#3cff28>수면</color> 효과를 부여하는 확률이 <color=#3cff28>80%</color>로 증가하고 턴 횟수 <color=#3cff28>+1</color>"
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>Combo</color>:인큐버스의 일반 공격이 <color=#3cff28>2</color>턴 동안 <color=#3cff28>수면</color> 상태의 적에게 <color=#3cff28>속박</color> 효과를 부여합니다."

lua/app/config/strings/ko/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="초기"
 	},
 	[1400101]={
-
+		["value"]="유적 갑옷"
 	},
 	[14002]={
 		["value"]="초기"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "Pode aparecer um <color=#ff8bf8>Épico</color>!",
     ["ARENA_DESC_36"] = "Tentar a Sorte",
+    ["ONE_KEY_GET_DESC"] = "Coletar tudo",
+    ["ACTIVITY_OVER_EDSC"] = "O evento terminou.",
+    ["PART_IN_DESC"] = "Participar",
+    ["HERO_FUND_DESCC_1"] = "Começou o novo evento: Bênção da Lua",
+    ["HERO_FUND_DESCC_2"] = "Bênção da Lua",
+    ["HERO_FUND_DESCC_3"] = "Com a Bênção da Lua, receberá recompensas generosas acumulando o número de ondas de batalha.",
+    ["HERO_FUND_DESCC_4"] = "Começou o novo evento: Desafio de Avanço",
+    ["ARENA_DESC_37"] = "Heróis a desbloquear:",
+    ["ARENA_DESC_38"] = "Heróis desbloqueados:",
+    ["ARENA_DESC_39"] = "As recompensas de aprimoramento só podem ser coletadas uma vez.",
+    ["ARENA_DESC_40"] = "Recompensas pela subida de ranque",
+    ["ARENA_DESC_41"] = "Recompensas de classificação",
+    ["ARENA_DESC_42"] = "Recompensas não coletadas",
+    ["EQUIP_DESC_26"] = "Pacote de Melhoria de Arma a Nv.{0}",
+    ["EQUIP_DESC_27"] = "Pacote de Melhoria de Armadura a Nv.{0}",
 }
 
 return localization_global

lua/app/config/strings/pt/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="Belo Pesadelo pode eliminar <color=#3cff28>4</color> quadrados adicionais na direção X."
 	},
 	[3400204]={
-		["desc"]="A probabilidade do efeito <color=#3cff28>sono</color> adicionado por Belo Pesadelo aumenta para <color=#3cff28>80%</color>."
+		["desc"]="Aumenta a chance de acionamento do efeito <color=#3cff28>sonolento</color> pelo Pesadelo da Beleza para <color=#3cff28>80%</color>, com <color=#3cff28>+1</color> turno de duração."
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>Combo</color>: Ataque normal de Succubus a inimigos <color=#3cff28>adormecidos</color> adiciona o efeito <color=#3cff28>aprisionamento</color> por <color=#3cff28>2</color> turnos."

lua/app/config/strings/pt/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="Inicial"
 	},
 	[1400101]={
-
+		["value"]="Armadura das Ruínas"
 	},
 	[14002]={
 		["value"]="Inicial"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "อาจได้รับ<color=#ff8bf8>อีพิท</color>นะ~",
     ["ARENA_DESC_36"] = "ลองเสี่ยงโชค",
+    ["ONE_KEY_GET_DESC"] = "รับทั้งหมด",
+    ["ACTIVITY_OVER_EDSC"] = "กิจกรรมสิ้นสุดแล้ว",
+    ["PART_IN_DESC"] = "เข้าร่วม",
+    ["HERO_FUND_DESCC_1"] = "เปิดกจกรรใหม่ดวงจันทร์แล้ว",
+    ["HERO_FUND_DESCC_2"] = "พรแห่งดวงจันทร์",
+    ["HERO_FUND_DESCC_3"] = "หลังจากได้รับพรแห่งดวงจันทร์แล้ว สะสมผ่านจำนวนรอบในการต่อสู้จะได้รับรางวัลมากมาย",
+    ["HERO_FUND_DESCC_4"] = "เปิดกิจกรรมใหม่ท้าทายขั้นสูแล้ว",
+    ["ARENA_DESC_37"] = "ปลดล็อคฮีโร่:",
+    ["ARENA_DESC_38"] = "ฮีโร่ที่ปลดล็อค:",
+    ["ARENA_DESC_39"] = "รางวัลอัประดับเป็นรางวัลแบบครั้งเดียว",
+    ["ARENA_DESC_40"] = "รางวัลอัประดับ",
+    ["ARENA_DESC_41"] = "รางวัลคำนวณ",
+    ["ARENA_DESC_42"] = "รางวัลที่ยังไม่ได้รับ",
+    ["EQUIP_DESC_26"] = "แพ็คอัปอาวุธ {0} เลเวล",
+    ["EQUIP_DESC_27"] = "แพ็คอัปเกราะ {0} เลเวล",
 }
 
 return localization_global

lua/app/config/strings/th/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม<color=#3cff28>4</color>ช่องตามทิศทาง X"
 	},
 	[3400204]={
-		["desc"]="เอฟเฟกต์<color=#3cff28>หลับ</color>ที่เพิ่มโดยฝันร้ายที่สวยงามสาม โอกาสเพิ่มขึ้นถึง<color=#3cff28>80%</color>"
+		["desc"]="โอกาสเอฟเฟกต์<color=#3cff28>หลับ</color>ที่เพิ่มโดยฝันร้ายที่สวยงามเพิ่มขึ้นถึง<color=#3cff28>80%</color> จำนวนรอบ<color=#3cff28>+1</color>"
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>คอมโบ</color>: เมื่อฝันร้ายโจมตีทั่วไปศัตรู<color=#3cff28>หลับ</color>จะเพิ่มเอฟเฟกต์<color=#3cff28>กักขัง</color> <color=#3cff28>2</color>รอบ"

lua/app/config/strings/th/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="เริ่มต้น"
 	},
 	[1400101]={
-
+		["value"]="เกราะรบซาก"
 	},
 	[14002]={
 		["value"]="เริ่มต้น"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "Có thể ra <color=#ff8bf8>Sử Thi</color>",
     ["ARENA_DESC_36"] = "Thử Vận May",
+    ["ONE_KEY_GET_DESC"] = "Nhận Nhanh",
+    ["ACTIVITY_OVER_EDSC"] = "Sự kiện đã kết thúc",
+    ["PART_IN_DESC"] = "Tham Gia",
+    ["HERO_FUND_DESCC_1"] = "Mở sự kiện mới Chúc Phúc Ánh Trăng",
+    ["HERO_FUND_DESCC_2"] = "Chúc Phúc Ánh Trăng",
+    ["HERO_FUND_DESCC_3"] = "Sau khi có Chúc Phúc Ánh Trăng, tích lũy số đợt vượt qua khi chiến đấu được nhận quà hậu hĩnh.",
+    ["HERO_FUND_DESCC_4"] = "Mở sự kiện mới Khiêu Chiến Tăng Bậc",
+    ["ARENA_DESC_37"] = "Mở anh hùng:",
+    ["ARENA_DESC_38"] = "Anh hùng đã mở:",
+    ["ARENA_DESC_39"] = "Thưởng Tăng Bậc là phần thưởng một lần",
+    ["ARENA_DESC_40"] = "Thưởng Tăng Bậc",
+    ["ARENA_DESC_41"] = "Thưởng Tổng Kết",
+    ["ARENA_DESC_42"] = "Chưa nhận quà",
+    ["EQUIP_DESC_26"] = "Quà Tăng Ngay Vũ Khí Lv{0}",
+    ["EQUIP_DESC_27"] = "Quà Tăng Ngay Phòng Cụ Lv{0}",
 }
 
 return localization_global

lua/app/config/strings/vi/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm <color=#3cff28>4</color> ô."
 	},
 	[3400204]={
-		["desc"]="Ác Mộng Tươi Đẹp kèm hiệu quả <color=#3cff28>Ngủ Say</color>, TL tăng đến <color=#3cff28>80%</color>."
+		["desc"]="Ác Mộng Tươi Đẹp kèm hiệu quả <color=#3cff28>Ngủ Say</color>, TL tăng đến <color=#3cff28>80%</color>, số hiệp <color=#3cff28>+1</color>."
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>Combo</color>: Khi Incubus đánh thường kẻ địch <color=#3cff28>Ngủ Say</color> sẽ kèm hiệu quả <color=#3cff28>Giam Cầm</color>, <color=#3cff28>2</color> hiệp."

lua/app/config/strings/vi/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="Ban Đầu"
 	},
 	[1400101]={
-
+		["value"]="Giáp Di Tích"
 	},
 	[14002]={
 		["value"]="Ban Đầu"

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

@@ -447,6 +447,21 @@ local localization_global =
     ["ACT_DESC_12"] = "LV",
     ["ARENA_DESC_35"] = "可能出<color=#ff8bf8>史詩</color>哦~",
     ["ARENA_DESC_36"] = "試試手氣",
+    ["ONE_KEY_GET_DESC"] = "一鍵領取",
+    ["ACTIVITY_OVER_EDSC"] = "活動已結束",
+    ["PART_IN_DESC"] = "參與",
+    ["HERO_FUND_DESCC_1"] = "新活動月之祝福開啟",
+    ["HERO_FUND_DESCC_2"] = "月之祝福",
+    ["HERO_FUND_DESCC_3"] = "擁有月之祝福後，在戰鬥中累積通關波次可獲得豐厚獎勵。",
+    ["HERO_FUND_DESCC_4"] = "新活動進階挑戰開啟",
+    ["ARENA_DESC_37"] = "解鎖英雄：",
+    ["ARENA_DESC_38"] = "已解鎖英雄：",
+    ["ARENA_DESC_39"] = "升段獎勵為一次性獎勵",
+    ["ARENA_DESC_40"] = "升段獎勵",
+    ["ARENA_DESC_41"] = "結算獎勵",
+    ["ARENA_DESC_42"] = "未領取獎勵",
+    ["EQUIP_DESC_26"] = "武器直升{0}級禮包",
+    ["EQUIP_DESC_27"] = "防具直升{0}級禮包",
 }
 
 return localization_global

lua/app/config/strings/zh/skill_rogue.lua

@@ -480,7 +480,7 @@ local skill_rogue = {
 		["desc"]="美麗夢魘沿X方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[3400204]={
-		["desc"]="美麗夢魘附帶的<color=#3cff28>昏睡</color>效果，機率提高到<color=#3cff28>80%</color>。"
+		["desc"]="美麗夢魘附帶的<color=#3cff28>昏睡</color>效果，機率提高到<color=#3cff28>80%</color>，回合數<color=#3cff28>+1</color>。"
 	},
 	[3400205]={
 		["desc"]="<color=#fcff28>Combo</color>:夢魔普攻<color=#3cff28>昏睡</color>敵人將附帶<color=#3cff28>禁錮</color>效果，<color=#3cff28>2</color>回合。"

lua/app/config/strings/zh/skin.lua

@@ -12,7 +12,7 @@ local skin = {
 		["value"]="初始"
 	},
 	[1400101]={
-
+		["value"]="遺跡戰甲"
 	},
 	[14002]={
 		["value"]="初始"

lua/app/module/equip/equip_manager.lua

@@ -1,5 +1,40 @@
 local EquipManager = class("EquipManager", BaseModule)
 
+-- 展示材料获取弹窗(英雄id，部位，材料id，材料数量)
+function EquipManager:showItemGetPop(heroId, part, id, num)
+    self:reqEquipUpgradeGift(heroId, part)
+
+    UIManager:showUI("app/ui/dungeon/item_get_ui", {heroId = heroId, part = part, id = id, value = num})
+end
+
+-- 检查装备礼包状态定时器
+function EquipManager:updateEquipGiftTimer(isClear)
+    self:unscheduleAll()
+
+    if not isClear then
+        local time = DataManager.EquipData:getGiftNearestRemainTime()
+        if time and time > 0 then
+            Logger.logHighlight("设置装备礼包倒计时:"..time)
+            self.giftSid = self:performWithDelayGlobal(function()
+                DataManager.EquipData:onGiftStateChange()
+            end, time)
+        end
+    end
+end
+
+-- 请求触发装备升级礼包
+function EquipManager:reqEquipUpgradeGift(heroId, part)
+    if DataManager.EquipData:getGiftId(heroId, part) ~= nil then
+        return
+    end
+
+    self:sendMessage(ProtoMsgType.FromMsgEnum.TriggerWeaponArmorGiftReq, {hero_id = heroId, equip_position = part}, {}, self.rspEquipUpgradeGift, nil)
+end
+
+function EquipManager:rspEquipUpgradeGift(result)
+    DataManager.EquipData:initGifts(result.info)
+end
+
 -- 升级装备
 function EquipManager:reqUpgrade(id, part)
     local entity = DataManager.EquipData:getEquip(id, part)
@@ -15,7 +50,7 @@ function EquipManager:reqUpgrade(id, part)
     for index, cost in ipairs(entity:getUpgradeMaterials()) do
         if cost.num > DataManager.BagData.ItemData:getItemNumById(cost.id) then
             GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_8))
-            UIManager:showUI("app/ui/dungeon/item_get_ui", {id = cost.id, value = cost.num})
+            self:showItemGetPop(id, part, cost.id, cost.num)
             return
         end
     end

lua/app/ui/dungeon/cell/dungeon_target_cell.lua

@@ -14,10 +14,12 @@ function DungeonTargetCell:init()
     self.txPowerNum = uiMap["dungeon_target_cell.right.power.tx_num"]
 end
 
-function DungeonTargetCell:refresh(target, getWay, id)
+function DungeonTargetCell:refresh(targetId, targetNum, getWay, id)
     self.getWay = getWay or self.getWay
     self.dungeonId = id or self.dungeonId
-    self.target = target or self.target
+    if targetId and targetNum then
+        self.target = {id = targetId, value = targetNum}
+    end
 
     if self.getWay == GConst.DungeonConst.TYPE.WEAPON then
         self:showWeapon()

lua/app/ui/dungeon/item_get_ui.lua

@@ -1,5 +1,10 @@
 local ItemGetUI = class("ItemGetUI", BaseUI)
 
+local COMMON_MAIN_POSY = 0
+local COMMON_CLOSE_POSY = 280
+local GIFT_MAIN_POSY = 220
+local GIFT_CLOSE_POSY = 140
+
 function ItemGetUI:isFullScreen()
     return false
 end
@@ -13,29 +18,52 @@ function ItemGetUI:onPressBackspace()
 end
 
 function ItemGetUI:onClose()
+    if self.giftCountdownSid then
+		self.txCountdown:unscheduleGlobal(self.giftCountdownSid)
+	end
 end
 
 function ItemGetUI:ctor(parmas)
-    self.target = parmas
+    self.equipEntity = DataManager.EquipData:getEquip(parmas.heroId, parmas.part)
+    self.targetId = parmas.id
+    self.targetNum = parmas.value
 end
 
 function ItemGetUI:onLoadRootComplete()
     local uiMap = self.root:genAllChildren()
 
-    self.txTitle = uiMap["item_get_ui.content.title.tx_title"]
     self.btnClose = uiMap["item_get_ui.content.btn_close"]
+    -- 主界面
+    self.panelMain = uiMap["item_get_ui.panel_main"]
+    self.txTitle = uiMap["item_get_ui.content.title.tx_title"]
     self.rewardCell = uiMap["item_get_ui.content.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
     self.txDesc = uiMap["item_get_ui.content.tx_desc"]
     self.txGet = uiMap["item_get_ui.content.tx_get"]
     self.scrollRectComp = uiMap["item_get_ui.content.scroll_view"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+    -- 礼包界面
+    self.panelGift = uiMap["item_get_ui.panel_gift"]
+    self.txGiftTitle = uiMap["item_get_ui.panel_gift.tx_title"]
+    self.txCountdown = uiMap["item_get_ui.panel_gift.time_node.tx_countdown"]
+    self.btnBuy = uiMap["item_get_ui.panel_gift.buy_btn"]
+    self.txBuy = uiMap["item_get_ui.panel_gift.buy_btn.tx_buy"]
+    self.rewardNodeLayout = uiMap["item_get_ui.panel_gift.item_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
+    self.rewardCellList = {}
+    for i = 1, 4 do
+        table.insert(self.rewardCellList, CellManager:addCellComp(uiMap["item_get_ui.panel_gift.item_node.pop_reward_cell_" .. i], GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL))
+    end
 
     self.scrollRectComp:addInitCallback(function()
 		return "app/ui/dungeon/cell/dungeon_target_cell"
 	end)
 	self.scrollRectComp:addRefreshCallback(function(index, cell)
-		cell:refresh(self.target, self.wayType, self.wayList[index])
+		cell:refresh(self.targetId, self.targetNum, self.wayType, self.wayList[index])
 	end)
 
+    self.btnBuy:addClickListener(function()
+        if self.giftId then
+            PayManager:purchasePackage(self.giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT)
+        end
+    end)
     self.btnClose:addClickListener(function()
         self:closeUI()
     end)
@@ -48,15 +76,18 @@ function ItemGetUI:onLoadRootComplete()
     self:bind(DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR), "isDirty", function()
         self:onRefresh()
 	end)
+    self:bind(DataManager.EquipData, "isDirty", function()
+        self:onRefresh()
+	end)
 end
 
 function ItemGetUI:onRefresh()
-    self.txTitle:setText(I18N:getText("item", self.target.id, "name"))
+    self.txTitle:setText(I18N:getText("item", self.targetId, "name"))
-    self.txDesc:setText(I18N:getText("item", self.target.id, "desc"))
+    self.txDesc:setText(I18N:getText("item", self.targetId, "desc"))
     self.txGet:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_23))
-    self.rewardCell:refreshItemById(self.target.id)
+    self.rewardCell:refreshItemById(self.targetId)
 
-    local itemCfg = ConfigManager:getConfig("item")[self.target.id]
+    local itemCfg = ConfigManager:getConfig("item")[self.targetId]
     if itemCfg == nil or itemCfg.get_way_type == nil or itemCfg.get_way == nil or #itemCfg.get_way == 0 then
         self:closeUI()
         return
@@ -87,6 +118,46 @@ function ItemGetUI:onRefresh()
 
     self.scrollRectComp:clearCells()
 	self.scrollRectComp:refillCells(#self.wayList)
+
+    self:checkShowPanelGift()
+end
+
+-- 展示礼包界面
+function ItemGetUI:checkShowPanelGift()
+    self.panelGift:setActive(false)
+    self.panelMain:setAnchoredPositionY(COMMON_MAIN_POSY)
+    self.btnClose:setAnchoredPositionY(COMMON_CLOSE_POSY)
+
+    self.giftId = DataManager.EquipData:getGiftId(self.equipEntity:getHeroId(), self.equipEntity:getPart())
+    if self.giftId == nil then
+        return
+    end
+
+    self.panelGift:setActive(true)
+    self.panelMain:setAnchoredPositionY(GIFT_MAIN_POSY)
+    self.btnClose:setAnchoredPositionY(GIFT_CLOSE_POSY)
+
+    local gift = DataManager.ShopData:getActGiftConfig()[self.giftId]
+    self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id))
+    self.txGiftTitle:setText(DataManager.EquipData:getGiftTitle(self.giftId))
+    for i, cell in ipairs(self.rewardCellList) do
+        if gift.reward[i] then
+            cell:setVisible(true, 0.8)
+            cell:refresh(gift.reward[i].id, gift.reward[i].num, true)
+        else
+            cell:setVisible(false, 0.8)
+        end
+    end
+    self.rewardNodeLayout:RefreshLayout()
+
+    -- 倒计时
+	if self.giftCountdownSid then
+		self.txCountdown:unscheduleGlobal(self.giftCountdownSid)
+	end
+    self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.EquipData:getGiftRemainTime(self.giftId)))
+	self.giftCountdownSid = self.txCountdown:scheduleGlobal(function()
+        self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.EquipData:getGiftRemainTime(self.giftId)))
+	end, 1)
 end
 
 return ItemGetUI

lua/app/ui/hero/armor_info_comp.lua

@@ -189,7 +189,7 @@ function ArmorInfoComp:refreshSelectArmor()
             end)
             add:setActive(costNum - haveNum > 0)
             icon:addClickListener(function()
-                UIManager:showUI("app/ui/dungeon/item_get_ui", {id = costId, value = costNum - haveNum < 0 and 0 or costNum - haveNum})
+                ModuleManager.EquipManager:showItemGetPop(armorEntity:getHeroId(), armorEntity:getPart(), costId, costNum - haveNum < 0 and 0 or costNum - haveNum)
             end)
         else
             costNode:setActive(false)

lua/app/ui/hero/weapon_info_comp.lua

@@ -153,7 +153,7 @@ function WeaponInfoComp:refresh()
             end)
             add:setActive(costNum - haveNum > 0)
             icon:addClickListener(function()
-                UIManager:showUI("app/ui/dungeon/item_get_ui", {id = costId, value = costNum - haveNum < 0 and 0 or costNum - haveNum})
+                ModuleManager.EquipManager:showItemGetPop(self.weaponEntity:getHeroId(), self.weaponEntity:getPart(), costId, costNum - haveNum < 0 and 0 or costNum - haveNum)
             end)
         else
             costNode:setActive(false)

lua/app/ui/main_city/cell/side_bar_armor_gift_cell.lua

@@ -1,19 +1,29 @@
 local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell"
 local SideBarArmorGiftCell = class("SideBarArmorGiftCell", SideBarBaseCellComp)
-local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT
+local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT
 
 function SideBarArmorGiftCell:getIsOpen()
-    return DataManager.ShopData:hasGift(GIFT_TYPE)
+    -- return DataManager.ShopData:hasGift(GIFT_TYPE)
+    return #DataManager.EquipData:getGiftIdsByType(GIFT_TYPE) > 0
 end
 
 function SideBarArmorGiftCell:getSpineName()
-    return "ui_main_btn_equipgift"
+    return "ui_main_equipgift"
+end
+
+function SideBarArmorGiftCell:getSpineAnimationName()
+    return "animation"
 end
 
 function SideBarArmorGiftCell:onClick()
-    local gift = DataManager.ShopData:getGift(GIFT_TYPE)
+    -- local gift = DataManager.ShopData:getGift(GIFT_TYPE)
-    if gift then
+    -- if gift then
-        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
+    --     ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
+    -- end
+
+    local ids = DataManager.EquipData:getGiftIdsByType(GIFT_TYPE)
+    if #ids > 0 then
+        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, ids, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
     end
 end
 
@@ -35,22 +45,29 @@ function SideBarArmorGiftCell:updateTime()
 end
 
 function SideBarArmorGiftCell:_refreshTime()
-    local gift = DataManager.ShopData:getGift(GIFT_TYPE)
+    -- local gift = DataManager.ShopData:getGift(GIFT_TYPE)
-    if gift then
+    -- if gift then
-        local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id]
+    --     local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id]
-        if cfgInfo then
+    --     if cfgInfo then
-            local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE)
+    --         local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE)
+    --         if remainTime >= 0 then
+    --             self.timeTx:setText(GFunc.getTimeStr(remainTime))
+    --         else
+    --             self.timeTx:setText("00:00:00")
+    --         end
+    --     else
+    --         self.timeTx:setText("00:00:00")
+    --     end
+    -- else
+    --     self.timeTx:setText("00:00:00")
+    -- end
+
+    local remainTime = DataManager.EquipData:getGiftNearestRemainTime(GIFT_TYPE)
     if remainTime >= 0 then
         self.timeTx:setText(GFunc.getTimeStr(remainTime))
     else
         self.timeTx:setText("00:00:00")
     end
-        else
-            self.timeTx:setText("00:00:00")
-        end
-    else
-        self.timeTx:setText("00:00:00")
-    end
 end
 
 return SideBarArmorGiftCell

lua/app/ui/main_city/cell/side_bar_weapon_gift_cell.lua

@@ -1,19 +1,25 @@
 local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell"
 local SideBarWeaponGiftCell = class("SideBarWeaponGiftCell", SideBarBaseCellComp)
-local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT
+local GIFT_TYPE = PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT
 
 function SideBarWeaponGiftCell:getIsOpen()
-    return DataManager.ShopData:hasGift(GIFT_TYPE)
+    -- return DataManager.ShopData:hasGift(GIFT_TYPE)
+    return #DataManager.EquipData:getGiftIdsByType(GIFT_TYPE) > 0
 end
 
 function SideBarWeaponGiftCell:getSpineName()
-    return "ui_main_btn_weapongift"
+    return "ui_main_weapon"
 end
 
 function SideBarWeaponGiftCell:onClick()
-    local gift = DataManager.ShopData:getGift(GIFT_TYPE)
+    -- local gift = DataManager.ShopData:getGift(GIFT_TYPE)
-    if gift then
+    -- if gift then
-        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
+    --     ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
+    -- end
+
+    local ids = DataManager.EquipData:getGiftIdsByType(GIFT_TYPE)
+    if #ids > 0 then
+        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, ids, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
     end
 end
 
@@ -35,22 +41,29 @@ function SideBarWeaponGiftCell:updateTime()
 end
 
 function SideBarWeaponGiftCell:_refreshTime()
-    local gift = DataManager.ShopData:getGift(GIFT_TYPE)
+    -- local gift = DataManager.ShopData:getGift(GIFT_TYPE)
-    if gift then
+    -- if gift then
-        local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id]
+    --     local cfgInfo = DataManager.ShopData:getActGiftConfig()[gift.id]
-        if cfgInfo then
+    --     if cfgInfo then
-            local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE)
+    --         local remainTime = DataManager.ShopData:getGiftRemainTime(GIFT_TYPE)
+    --         if remainTime >= 0 then
+    --             self.timeTx:setText(GFunc.getTimeStr(remainTime))
+    --         else
+    --             self.timeTx:setText("00:00:00")
+    --         end
+    --     else
+    --         self.timeTx:setText("00:00:00")
+    --     end
+    -- else
+    --     self.timeTx:setText("00:00:00")
+    -- end
+
+    local remainTime = DataManager.EquipData:getGiftNearestRemainTime(GIFT_TYPE)
     if remainTime >= 0 then
         self.timeTx:setText(GFunc.getTimeStr(remainTime))
     else
         self.timeTx:setText("00:00:00")
     end
-        else
-            self.timeTx:setText("00:00:00")
-        end
-    else
-        self.timeTx:setText("00:00:00")
-    end
 end
 
 return SideBarWeaponGiftCell

lua/app/ui/shop/gift_pop_ui.lua

@@ -8,6 +8,8 @@ local GIFT_BG_NAME = {
         [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png",
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png",
+        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png",
+        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png",
     },
 	[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
     [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
@@ -21,6 +23,8 @@ local GIFT_BG_BANNER_NAME = {
         [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png",
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_8_2.png",
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_7_2.png",
+        [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_8_2.png",
+        [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_7_2.png",
     },
 	[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png",
     [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png",
@@ -45,10 +49,14 @@ function GiftPopUI:ctor(params)
 	params = params or {}
 
 	self.actType = params.type
+    if type(params.id) == "table" then
+        self.actIds = params.id
+        self.actId = self.actIds[1]
+    else
         self.actId = params.id
+    end
     self.onlySelf = params.onlySelf -- 有此标记时 关闭直接关闭界面
     self.showType = params.showType
-    self.buyCount = DataManager.ShopData:getGiftBoughtNum(self.actType, self.actId) -- 触发时该礼包的购买数量
 end
 
 function GiftPopUI:isFullScreen()
@@ -93,6 +101,30 @@ function GiftPopUI:onLoadRootComplete()
 	self.buyBtnTx = self.uiMap["gift_pop_ui.bg.buy_btn.text"]
 	self.buyBtnIcon = self.uiMap["gift_pop_ui.bg.buy_btn.icon"]
 
+    -- 界面切换
+    self.nodeSwitch = self.uiMap["gift_pop_ui.switch_node"]
+    self.btnRight = self.uiMap["gift_pop_ui.switch_node.btn_right"]
+    self.btnLeft = self.uiMap["gift_pop_ui.switch_node.btn_left"]
+    self.pointsRoot = self.uiMap["gift_pop_ui.switch_node.points"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
+    self.points = {}
+    for i = 1, 10 do
+        table.insert(self.points, self.uiMap["gift_pop_ui.switch_node.points.point_" .. i])
+    end
+
+    self.btnRight:addClickListener(function()
+		local idx = table.indexof(self.actIds, self.actId)
+        if idx and idx + 1 <= #self.actIds then
+            self.actId = self.actIds[idx + 1]
+        end
+        self:refresh()
+	end)
+    self.btnLeft:addClickListener(function()
+		local idx = table.indexof(self.actIds, self.actId)
+        if idx and idx - 1 > 0 then
+            self.actId = self.actIds[idx - 1]
+        end
+        self:refresh()
+	end)
 	self.buyBtn:addClickListener(function()
 		self:onClickGift()
 	end)
@@ -118,15 +150,22 @@ function GiftPopUI:refresh(needCheck)
             self:checkNextPopGiftOrClose()
             return
         end
+    else
+        self.buyCount = DataManager.ShopData:getGiftBoughtNum(self.actType, self.actId) -- 触发时该礼包的购买数量
     end
+
     if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then
-        local type = PayManager:getGiftConfigInfo(self.actType, self.actId).type
+        local giftType = PayManager:getGiftConfigInfo(self.actType, self.actId).type
-        self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType][type]))
+        if giftType == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT or giftType == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT then
+            self.titleTx:setText(DataManager.EquipData:getGiftTitle(self.actId))
+        else
+            self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType][giftType]))
+        end
         self.banner:setVisible(false)
-        self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType][type], function()
+        self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType][giftType], function()
             self.banner:setVisible(true)
         end)
-        self.bg:setTexture(GIFT_BG_NAME[self.actType][type])
+        self.bg:setTexture(GIFT_BG_NAME[self.actType][giftType])
     else
         self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType]))
         self.banner:setVisible(false)
@@ -188,6 +227,7 @@ function GiftPopUI:refresh(needCheck)
     BIReport:postPayUIShow(giftType, self.actId, self.showType)
 
     self:updateTime()
+    self:showSwitch()
 end
 
 function GiftPopUI:updateTime()
@@ -214,6 +254,14 @@ function GiftPopUI:updateTime()
                     self:checkNextPopGiftOrClose()
                 end
                 self.timeText:setText(Time:formatNumTime(remainTime))
+            elseif cfgInfo and (cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT or cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT) then-- 新装备礼包
+                hasTime = true
+                local remainTime = DataManager.EquipData:getGiftRemainTime(self.actId)
+                if remainTime <= 0 then
+                    remainTime = 0
+                    self:checkNextPopGiftOrClose()
+                end
+                self.timeText:setText(Time:formatNumTime(remainTime))
             end
         end
     elseif self.actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW then -- 成长礼包
@@ -259,4 +307,27 @@ function GiftPopUI:checkNextPopGiftOrClose()
     end
 end
 
+-- 显示切换相关内容
+function GiftPopUI:showSwitch()
+    if self.actIds == nil or #self.actIds <= 1 then
+        self.nodeSwitch:setActive(false)
+        return
+    end
+
+    self.nodeSwitch:setActive(true)
+    local curIdx = table.indexof(self.actIds, self.actId)
+    self.btnRight:setActive(curIdx < #self.actIds)
+    self.btnLeft:setActive(curIdx > 1)
+
+    for index, item in ipairs(self.points) do
+        if self.actIds[index] then
+            item:setActive(true)
+            item:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP).alpha = self.actIds[index] == self.actId and 1 or 0.5
+        else
+            item:setActive(false)
+        end
+    end
+    self.pointsRoot:RefreshLayout()
+end
+
 return GiftPopUI

lua/app/userdata/equip/equip_data.lua

@@ -6,6 +6,7 @@ function EquipData:ctor()
 end
 
 function EquipData:clear()
+    ModuleManager.EquipManager:updateEquipGiftTimer(true)
 end
 
 function EquipData:init(data)
@@ -140,4 +141,122 @@ function EquipData:onUpgradeEquip(heroId, part)
     DataManager.HeroData:getHeroById(heroId):onEquipAttrChange()
 end
 
+-- 装备礼包相关 -----------------------------------------------------------------------------
+
+-- 初始化礼包信息
+function EquipData:initGifts(data)
+    self.gifts = data.active_gifts or GConst.EMPTY_TABLE
+
+    Logger.logHighlight("初始化装备礼包")
+    Logger.printTable(self.gifts)
+
+    ModuleManager.EquipManager:updateEquipGiftTimer()
+    self:setDirty()
+end
+
+-- 获取礼包最近的结束时间
+function EquipData:getGiftNearestRemainTime(actType)
+    local checkList = actType ~= nil and self:getGiftIdsByType(actType) or table.keys(self.gifts)
+    local nearest = nil
+
+    for idx, id in pairs(checkList) do
+        local time = self:getGiftRemainTime(id)
+        if nearest == nil or nearest > time then
+            nearest = time
+        end
+    end
+
+    return nearest
+end
+
+-- 获取所有存在的该类型礼包
+function EquipData:getGiftIdsByType(actType)
+    local ids = {}
+    for id, trigger in pairs(self.gifts) do
+        local cfg = DataManager.ShopData:getActGiftConfig()[id]
+        if cfg and actType == cfg.type and self:getGiftRemainTime(id) > 0 then
+            table.insert(ids, id)
+        end
+    end
+    table.sort(ids, function(a, b) return a > b end)
+
+    return ids
+end
+
+-- 获取当前存在的对应礼包
+function EquipData:getGiftId(heroId, part)
+    local giftType
+    if part == GConst.EquipConst.PART_TYPE.WEAPON then
+        giftType = PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT
+    else
+        giftType = PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT
+    end
+
+    if giftType == nil then
+        return nil
+    end
+
+    local level = DataManager.EquipData:getEquip(heroId, part):getLevel()
+    for idx, id in pairs(self:getGiftIdsByType(giftType)) do
+        if self:meetGiftLevelRange(id, level) and self:getGiftRemainTime(id) > 0 then
+            return id
+        end
+    end
+
+    return nil
+end
+
+-- 是否满足礼包的等级条件
+function EquipData:meetGiftLevelRange(giftId, level)
+    local cfg = DataManager.ShopData:getActGiftConfig()[giftId]
+    if cfg == nil or cfg.parameter_pro == nil then
+        return
+    end
+
+    return level >= cfg.parameter_pro[1] and level <= cfg.parameter_pro[2]
+end
+
+-- 获取礼包剩余时间
+function EquipData:getGiftRemainTime(giftId)
+    if self.gifts[giftId] == nil then
+        return 0
+    end
+
+    local cfg = DataManager.ShopData:getActGiftConfig()[giftId]
+    if cfg == nil then
+        return 0
+    end
+
+    local duration = cfg.limit_time * 60 * 60
+
+    return (self.gifts[giftId] // 1000) + duration - Time:getServerTime()
+end
+
+-- 获取礼包显示的标题
+function EquipData:getGiftTitle(giftId)
+    local gift = DataManager.ShopData:getActGiftConfig()[giftId]
+    if gift == nil then
+        return nil
+    end
+
+    if gift.type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT then
+        return I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_26, gift.parameter_pro[1] + 20)
+    elseif gift.type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT then
+        return I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_27, gift.parameter_pro[1] + 20)
+    end
+end
+
+-- 礼包状态改变
+function EquipData:onGiftStateChange()
+    Logger.logHighlight("装备礼包状态改变")
+    self:setDirty()
+end
+
+-- 购买礼包成功
+function EquipData:onBuyGiftSuccess(giftId)
+    Logger.logHighlight("购买装备礼包成功："..giftId)
+    self.gifts[giftId] = nil
+    self:setDirty()
+end
+
 return EquipData

lua/app/userdata/shop/shop_data.lua

@@ -56,6 +56,18 @@ function ShopData:getActGiftConfig()
     return ConfigManager:getConfig("act_gift")
 end
 
+-- 获取配置的所有该类型的礼包
+function ShopData:getGiftsByType(giftType)
+    local gifts = {}
+    for id, data in pairs(DataManager.ShopData:getActGiftConfig()) do
+        if data.type == giftType then
+            gifts[id] = data
+        end
+    end
+
+    return gifts
+end
+
 -- 已购买的礼包
 function ShopData:getActGiftMap()
     return self.giftMap
@@ -114,6 +126,8 @@ function ShopData:updateGiftInfo(gift)
                     DataManager.ArenaData:onBoughtGift(giftId)
                 elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT or cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT then
                     self:onGiftBuySuccess(cfg[giftId].type)
+                elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT or cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT then
+                    DataManager.EquipData:onBuyGiftSuccess(giftId)
                 elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER then
                     DataManager.ActivityData:onBuyBountyGrade(giftId)
                 end