数据层

lua/app/common/bi_report.lua

@@ -160,6 +160,7 @@ BIReport.ITEM_GET_TYPE = {
 	ACT_PVP_OVER_CD = "ActPvpOverCd",
 	ACT_PVP_DAILY_REWARD = "ActPvpDailyReward",
 	ACT_PVP_BOUNTY = "ActPvpBounty",
+	ACT_PVP_BOUNTY_GIFT = "ActPvpBountyGift",
 	ACT_PVP_RANK_REWARD = "ActPvpRankReward",
 	ACT_PVP_BUY_BOUNTY_LEVEL = "ActPvpBuyBountyLevel",
 }
@@ -175,6 +176,8 @@ BIReport.ADS_CLICK_TYPE = {
 	ARENA_AD_BOX = "ArenaAdBox",
 	ARMOR_FUND_AD = "ArmorFundAd",
 	DUNGEON_RUNE_REBIRTH = "DungeonRuneRebirth",
+	ACT_PVP_AD_REFRESH_HERO = "ActPvpAdRefreshHero",
+	ACT_PVP_AD_REMATCH = "ActPvpAdRematch",
 
 	MALL_DAILY = "MallDaily",
 	MALL_DAILY_RESET = "MallDailyReset",
@@ -236,6 +239,7 @@ BIReport.GIFT_TYPE = {
 	ACT_SUMMER = "ActSummer",
 	ACT_HERO_FUND = "ActHeroFund",
 	FOURTEEN_DAY_GIFT = "FourteenDayGift",
+	ACT_PVP_BOUNTY_GIFT = "ActPvpBountyGift",
 }
 
 BIReport.COIN_TYPE = {

lua/app/common/data_manager.lua

@@ -451,10 +451,26 @@ function DataManager:getActivityExchangeByActId(actId)
 			end
 		end
 	end
-	Logger.printTable(self.activityExchangeMap)
 	return self.activityExchangeMap[actId]
 end
 
+---- 缓存一下活动排行榜
+function DataManager:getActivityRankByActId(actId)
+	if not self.activityRankMap then
+		self.activityRankMap = {}
+		local cfg = ConfigManager:getConfig("activity_rank")
+		for id, info in pairs(cfg) do
+			if info.act_id then
+				if not self.activityRankMap[info.act_id] then
+					self.activityRankMap[info.act_id] = {}
+				end
+				table.insert(self.activityRankMap[info.act_id], id)
+			end
+		end
+	end
+	return self.activityRankMap[actId]
+end
+
 function DataManager:dealOpenActivity(activityInfo)
 	local curTime = Time:getServerTime()
 	if not activityInfo then
@@ -486,9 +502,10 @@ DataManager.activityOpenFunc = {
 		DataManager.ActBossRushData:setActivityInfo(params)
 	end,
 	[3] = function(params)
-		ModuleManager.ActPvpManager:reqActData()
+		DataManager.ActPvpData:init({}) -- 默认初始化
 		DataManager.ActPvpData:setActivityId(params.id)
 		DataManager.ActPvpData:setActivityInfo(params)
+		ModuleManager.ActPvpManager:reqActData()
 	end,
 }
 

lua/app/common/event_manager.lua

@@ -63,6 +63,8 @@ EventManager.CUSTOM_EVENT = {
 	MAIN_UI_CHECK_SIDE_BAR = "MAIN_UI_CHECK_SIDE_BAR",
 	FORMATION_CHANGE = "FORMATION_CHANGE",
 	BATTLE_REBIRTH = "BATTLE_REBIRTH",
+
+	ACT_PVP_EVENT = "ACT_PVP_EVENT",
 }
 
 -- 此方法不能直接在外部调用，请使用例如BaseUI，BaseModule等封装好的接口

lua/app/common/pay_manager.lua

@@ -27,6 +27,7 @@ PayManager.PURCHARSE_ACT_TYPE = {
     WEAPON_UPGRADE_GIFT = 15,
     ARMOR_UPGRADE_GIFT = 16,
     FOURTEEN_DAY_GIFT = 17,
+    ACT_PVP_BOUNTY = 22,
 }
 
 PayManager.PURCHARSE_TYPE_CONFIG = {
@@ -56,6 +57,7 @@ PayManager.BI_ITEM_GET_TYPE = {
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.ITEM_GET_TYPE.ACT_PVP_BOUNTY_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE,
@@ -82,6 +84,7 @@ PayManager.BI_GIFT_TYPE = {
         [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
         [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT,
+        [PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.GIFT_TYPE.ACT_PVP_BOUNTY_GIFT,
     },
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE,

lua/app/config/act_gift.lua

@@ -2890,7 +2890,8 @@ local act_gift = {
 				["num"]=8,
  				["num_for_nothing"]="Xg=="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180202]={
 		["type"]=18,
@@ -3034,7 +3035,8 @@ local act_gift = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180302]={
 		["type"]=18,
@@ -3178,7 +3180,8 @@ local act_gift = {
 				["num"]=24,
  				["num_for_nothing"]="VAw="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180402]={
 		["type"]=18,
@@ -3322,7 +3325,8 @@ local act_gift = {
 				["num"]=36,
  				["num_for_nothing"]="VQ4="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180502]={
 		["type"]=18,
@@ -3466,7 +3470,8 @@ local act_gift = {
 				["num"]=96,
  				["num_for_nothing"]="Xw4="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180602]={
 		["type"]=18,
@@ -3610,7 +3615,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180702]={
 		["type"]=18,
@@ -3754,7 +3760,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180802]={
 		["type"]=18,
@@ -3898,7 +3905,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[180902]={
 		["type"]=18,
@@ -4042,7 +4050,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[181002]={
 		["type"]=18,
@@ -4186,7 +4195,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[181102]={
 		["type"]=18,
@@ -4330,7 +4340,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[181202]={
 		["type"]=18,
@@ -4474,7 +4485,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[181302]={
 		["type"]=18,
@@ -4618,7 +4630,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190102]={
 		["type"]=19,
@@ -4648,7 +4661,8 @@ local act_gift = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190202]={
 		["type"]=19,
@@ -4678,7 +4692,8 @@ local act_gift = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190302]={
 		["type"]=19,
@@ -4708,7 +4723,8 @@ local act_gift = {
 				["num"]=24,
  				["num_for_nothing"]="VAw="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190402]={
 		["type"]=19,
@@ -4738,7 +4754,8 @@ local act_gift = {
 				["num"]=36,
  				["num_for_nothing"]="VQ4="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190502]={
 		["type"]=19,
@@ -4768,7 +4785,8 @@ local act_gift = {
 				["num"]=96,
  				["num_for_nothing"]="Xw4="
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190602]={
 		["type"]=19,
@@ -4798,7 +4816,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190702]={
 		["type"]=19,
@@ -4828,7 +4847,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190802]={
 		["type"]=19,
@@ -4858,7 +4878,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[190902]={
 		["type"]=19,
@@ -4888,7 +4909,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[191002]={
 		["type"]=19,
@@ -4918,7 +4940,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[191102]={
 		["type"]=19,
@@ -4948,7 +4971,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[191202]={
 		["type"]=19,
@@ -4978,7 +5002,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[191302]={
 		["type"]=19,
@@ -5008,7 +5033,8 @@ local act_gift = {
 				["num"]=138,
  				["num_for_nothing"]="VwtU"
 			}
-		}
+		},
+		["limit"]=1
 	},
 	[200102]={
 		["type"]=20,

lua/app/config/activity.lua

@@ -18,9 +18,19 @@ local activity = {
 		["act_type"]=4,
 		["start_time"]="2023-09-28 00:00:00",
 		["end_time"]="2023-10-08 00:00:00"
+	},
+	[506]={
+		["act_type"]=2,
+		["start_time"]="2023-09-27 00:00:00",
+		["end_time"]="2023-10-05 00:00:00"
+	},
+	[606]={
+		["act_type"]=3,
+		["start_time"]="2023-10-04 00:00:00",
+		["end_time"]="2023-10-12 00:00:00"
 	}
 }
 local config = {
-data=activity,count=4
+data=activity,count=6
 }
 return config

lua/app/config/activity_exchange.lua

@@ -178,9 +178,189 @@ local activity_exchange = {
  			["num_for_nothing"]="Uw=="
 		},
 		["limit"]=999
+	},
+	[201]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14002,
+ 			["id_for_nothing"]="VwxcA2c=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=300,
+ 			["num_for_nothing"]="VQhc"
+		},
+		["limit"]=10
+	},
+	[202]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=34003,
+ 			["id_for_nothing"]="VQxcA2Y=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		},
+		["limit"]=10
+	},
+	[203]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=44001,
+ 			["id_for_nothing"]="UgxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		},
+		["limit"]=10
+	},
+	[204]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=54002,
+ 			["id_for_nothing"]="UwxcA2c=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		},
+		["limit"]=10
+	},
+	[205]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=15,
+ 			["id_for_nothing"]="Vw0=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=240,
+ 			["num_for_nothing"]="VAxc"
+		},
+		["limit"]=3
+	},
+	[206]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14,
+ 			["id_for_nothing"]="Vww=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["limit"]=3
+	},
+	[207]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=15,
+ 			["num_for_nothing"]="Vw0="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["limit"]=10
+	},
+	[208]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=800,
+ 			["num_for_nothing"]="Xghc"
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["limit"]=999
+	},
+	[209]={
+		["activity"]=506,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=13,
+ 			["id_for_nothing"]="Vws=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["limit"]=999
 	}
 }
 local config = {
-data=activity_exchange,count=9
+data=activity_exchange,count=18
 }
 return config

lua/app/config/activity_full_moon_quest.lua

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

lua/app/config/activity_pvp_board.lua.meta

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

lua/app/config/activity_pvp_wingift.lua

@@ -1,5 +1,6 @@
 local activity_pvp_wingift = {
 	[1]={
+		["win"]=1,
 		["reward"]={
 			{
 				["type"]=1,
@@ -20,6 +21,7 @@ local activity_pvp_wingift = {
 		}
 	},
 	[2]={
+		["win"]=4,
 		["reward"]={
 			{
 				["type"]=1,
@@ -40,6 +42,7 @@ local activity_pvp_wingift = {
 		}
 	},
 	[3]={
+		["win"]=7,
 		["reward"]={
 			{
 				["type"]=1,
@@ -60,6 +63,7 @@ local activity_pvp_wingift = {
 		}
 	},
 	[4]={
+		["win"]=10,
 		["reward"]={
 			{
 				["type"]=1,

lua/app/config/activity_rank.lua

@@ -1,5 +1,5 @@
 local activity_rank = {
-	[1]={
+	[101]={
 		["act_id"]=306,
 		["ranking"]={
 			1,
@@ -24,7 +24,7 @@ local activity_rank = {
 			}
 		}
 	},
-	[2]={
+	[102]={
 		["act_id"]=306,
 		["ranking"]={
 			2,
@@ -49,7 +49,7 @@ local activity_rank = {
 			}
 		}
 	},
-	[3]={
+	[103]={
 		["act_id"]=306,
 		["ranking"]={
 			3,
@@ -74,7 +74,7 @@ local activity_rank = {
 			}
 		}
 	},
-	[4]={
+	[104]={
 		["act_id"]=306,
 		["ranking"]={
 			4,
@@ -99,7 +99,7 @@ local activity_rank = {
 			}
 		}
 	},
-	[5]={
+	[105]={
 		["act_id"]=306,
 		["ranking"]={
 			11,
@@ -124,7 +124,7 @@ local activity_rank = {
 			}
 		}
 	},
-	[6]={
+	[106]={
 		["act_id"]=306,
 		["ranking"]={
 			51,
@@ -149,7 +149,7 @@ local activity_rank = {
 			}
 		}
 	},
-	[7]={
+	[107]={
 		["act_id"]=306,
 		["ranking"]={
 			501,
@@ -173,9 +173,184 @@ local activity_rank = {
  				["num_for_nothing"]="VAg="
 			}
 		}
+	},
+	[201]={
+		["act_id"]=606,
+		["ranking"]={
+			1,
+			1
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		}
+	},
+	[202]={
+		["act_id"]=606,
+		["ranking"]={
+			2,
+			2
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[203]={
+		["act_id"]=606,
+		["ranking"]={
+			3,
+			3
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=70,
+ 				["num_for_nothing"]="UQg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[204]={
+		["act_id"]=606,
+		["ranking"]={
+			4,
+			10
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[205]={
+		["act_id"]=606,
+		["ranking"]={
+			11,
+			50
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[206]={
+		["act_id"]=606,
+		["ranking"]={
+			51,
+			500
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=30,
+ 				["num_for_nothing"]="VQg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[207]={
+		["act_id"]=606,
+		["ranking"]={
+			501,
+			99999999
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
 	}
 }
 local config = {
-data=activity_rank,count=7
+data=activity_rank,count=14
 }
 return config

lua/app/config/avatar_frame.lua

@@ -15,21 +15,21 @@ local avatar_frame = {
 	},
 	[26]={
 		["iconId"]="avatar_frame_4",
-		["item"]=45
+		["item"]=45,
+		["unlock_show"]=true
 	},
 	[27]={
 		["iconId"]="avatar_frame_5",
-		["item"]=46
+		["item"]=46,
+		["unlock_show"]=true
 	},
 	[28]={
 		["iconId"]="avatar_frame_6",
-		["item"]=53,
+		["item"]=53
-		["unlock_show"]=true
 	},
 	[29]={
 		["iconId"]="avatar_frame_7",
-		["item"]=54,
+		["item"]=54
-		["unlock_show"]=true
 	}
 }
 local config = {

lua/app/config/buff.lua

@@ -53,7 +53,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=1,
 		["decr"]=1,
-		["icon"]="dec_dmg_red_add"
+		["icon"]="dec_dmg_red_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[8]={
 		["id"]=8,
@@ -62,7 +64,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=2,
 		["decr"]=1,
-		["icon"]="dec_dmg_yellow_add"
+		["icon"]="dec_dmg_yellow_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[9]={
 		["id"]=9,
@@ -71,7 +75,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=3,
 		["decr"]=1,
-		["icon"]="dec_dmg_green_add"
+		["icon"]="dec_dmg_green_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[10]={
 		["id"]=10,
@@ -80,7 +86,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=4,
 		["decr"]=1,
-		["icon"]="dec_dmg_blue_add"
+		["icon"]="dec_dmg_blue_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[11]={
 		["id"]=11,
@@ -89,7 +97,9 @@ local buff = {
 		["stack"]=2,
 		["position"]=5,
 		["decr"]=1,
-		["icon"]="dec_dmg_purple_add"
+		["icon"]="dec_dmg_purple_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[12]={
 		["id"]=12,
@@ -97,7 +107,9 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="dec_dmg_all_add"
+		["icon"]="dec_dmg_all_add",
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[13]={
 		["id"]=13,
@@ -192,7 +204,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="weakness_all_add"
+		["icon"]="weakness_all_add",
+		["ispercent"]=1
 	},
 	[25]={
 		["id"]=25,
@@ -406,6 +419,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="burn",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_take"]={
 			36
 		}
@@ -416,6 +430,8 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="vulnerable",
+		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_get"]={
 			34
 		}
@@ -444,6 +460,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="poison",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_take"]={
 			35
 		}
@@ -467,6 +484,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="corrupt",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_get"]={
 			19
 		}
@@ -479,6 +497,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="bleed",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_take"]={
 			31
 		}
@@ -490,6 +509,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="weaken",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_continued"]={
 			33
 		}
@@ -530,7 +550,7 @@ local buff = {
 		["id"]=59,
 		["name"]="first_hand",
 		["buff_type"]=1,
-		["decr"]=3,
+		["decr"]=1,
 		["icon"]="first_hand"
 	},
 	[60]={
@@ -559,7 +579,8 @@ local buff = {
 		["stack"]=1,
 		["decr"]=1,
 		["icon"]="counterattack",
-		["show_name"]=true
+		["show_name"]=true,
+		["ispercent"]=1
 	},
 	[63]={
 		["id"]=63,
@@ -568,6 +589,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="thorns",
 		["show_name"]=true,
+		["ispercent"]=1,
 		["fx_continued"]={
 			18
 		}
@@ -765,7 +787,7 @@ local buff = {
 		["decr"]=1,
 		["formula"]=3,
 		["icon"]="rebirth",
-		["fx_take"]={
+		["fx_disappear"]={
 			44
 		}
 	},
@@ -790,6 +812,7 @@ local buff = {
 		["decr"]=1,
 		["formula"]=3,
 		["icon"]="self_heal",
+		["show_name"]=true,
 		["fx_take"]={
 			300027
 		}
@@ -799,14 +822,103 @@ local buff = {
 		["name"]="charm",
 		["buff_type"]=7,
 		["decr"]=2,
-		["icon"]="charm"
+		["icon"]="charm",
+		["show_name"]=true
 	},
 	[88]={
 		["id"]=88,
 		["name"]="immune",
 		["buff_type"]=7,
 		["decr"]=1,
-		["icon"]="immune"
+		["icon"]="immune",
+		["show_name"]=true
+	},
+	[89]={
+		["id"]=89,
+		["name"]="forever_first_hand",
+		["buff_type"]=1,
+		["decr"]=3,
+		["icon"]="first_hand"
+	},
+	[90]={
+		["id"]=90,
+		["name"]="forever_counterattack",
+		["buff_type"]=1,
+		["stack"]=1,
+		["decr"]=3,
+		["icon"]="counterattack",
+		["ispercent"]=1
+	},
+	[91]={
+		["id"]=91,
+		["name"]="forever_dec_dmg_red_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=1,
+		["decr"]=3,
+		["icon"]="dec_dmg_red_add",
+		["ispercent"]=1
+	},
+	[92]={
+		["id"]=92,
+		["name"]="forever_dec_dmg_yellow_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=2,
+		["decr"]=3,
+		["icon"]="dec_dmg_yellow_add",
+		["ispercent"]=1
+	},
+	[93]={
+		["id"]=93,
+		["name"]="forever_dec_dmg_green_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=3,
+		["decr"]=3,
+		["icon"]="dec_dmg_green_add",
+		["ispercent"]=1
+	},
+	[94]={
+		["id"]=94,
+		["name"]="forever_dec_dmg_blue_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=4,
+		["decr"]=3,
+		["icon"]="dec_dmg_blue_add",
+		["ispercent"]=1
+	},
+	[95]={
+		["id"]=95,
+		["name"]="forever_dec_dmg_purple_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=5,
+		["decr"]=3,
+		["icon"]="dec_dmg_purple_add",
+		["ispercent"]=1
+	},
+	[96]={
+		["id"]=96,
+		["name"]="forever_dec_dmg_all_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=3,
+		["icon"]="dec_dmg_all_add",
+		["ispercent"]=1
+	},
+	[97]={
+		["id"]=97,
+		["name"]="forever_thorns",
+		["buff_type"]=1,
+		["decr"]=3,
+		["icon"]="thorns",
+		["show_name"]=true,
+		["ispercent"]=1,
+		["fx_continued"]={
+			18
+		}
 	}
 }
 local keys = {
@@ -898,12 +1010,21 @@ local keys = {
 		["ocean_shield"]=buff[85],
 		["self_heal"]=buff[86],
 		["charm"]=buff[87],
-		["immune"]=buff[88]
+		["immune"]=buff[88],
+		["forever_first_hand"]=buff[89],
+		["forever_counterattack"]=buff[90],
+		["forever_dec_dmg_red_add"]=buff[91],
+		["forever_dec_dmg_yellow_add"]=buff[92],
+		["forever_dec_dmg_green_add"]=buff[93],
+		["forever_dec_dmg_blue_add"]=buff[94],
+		["forever_dec_dmg_purple_add"]=buff[95],
+		["forever_dec_dmg_all_add"]=buff[96],
+		["forever_thorns"]=buff[97]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=88
+count=97
 }
 return config

lua/app/config/chapter_new_skin_fight.lua

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

lua/app/config/chapter_new_skin_fight.lua.meta

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

lua/app/config/const.lua

@@ -492,6 +492,19 @@ local const = {
 	["activity_pvp_bounty_point"]={
 		["value"]=10
 	},
+	["activity_pvp_refresh_ad_times"]={
+		["value"]=1
+	},
+	["activity_pvp_refresh_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		}
+	},
 	["activity_skin_fight_id_1"]={
 		["value"]=4104
 	},
@@ -510,6 +523,6 @@ local const = {
 	}
 }
 local config = {
-data=const,count=102
+data=const,count=104
 }
 return config

lua/app/config/fx.lua

@@ -2007,6 +2007,62 @@ local fx = {
 		["res"]="sfx_p0036_b05",
 		["bind"]="root"
 	},
+	[300151]={
+		["res"]="sfx_p0037_b01",
+		["bind"]="root"
+	},
+	[300152]={
+		["res"]="sfx_p0037_b02",
+		["bind"]="root"
+	},
+	[300153]={
+		["res"]="sfx_p0037_b05",
+		["bind"]="root"
+	},
+	[300154]={
+		["res"]="sfx_p0038_b01",
+		["bind"]="root"
+	},
+	[300155]={
+		["res"]="sfx_p0038_b05",
+		["bind"]="root"
+	},
+	[300156]={
+		["res"]="sfx_p0039_b01",
+		["bind"]="root"
+	},
+	[300157]={
+		["res"]="sfx_p0039_b05",
+		["bind"]="root"
+	},
+	[300158]={
+		["res"]="sfx_p0040_b01",
+		["bind"]="root"
+	},
+	[300159]={
+		["res"]="sfx_p0040_b05",
+		["bind"]="root"
+	},
+	[300160]={
+		["res"]="sfx_p0041_b01",
+		["bind"]="root"
+	},
+	[300161]={
+		["res"]="sfx_p0041_b02",
+		["bind"]="root"
+	},
+	[300162]={
+		["res"]="sfx_p0041_b03",
+		["bind"]="root"
+	},
+	[300163]={
+		["res"]="sfx_p0041_b04",
+		["bind"]="root"
+	},
+	[300164]={
+		["res"]="sfx_p0041_b05",
+		["bind"]="root"
+	},
 	[400000]={
 		["res"]="sfx_p0012_b01",
 		["bind"]="root",
@@ -2763,9 +2819,79 @@ local fx = {
 		["res"]="sfx_p0036_b05",
 		["bind"]="root",
 		["flip"]=1
+	},
+	[400151]={
+		["res"]="sfx_p0037_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400152]={
+		["res"]="sfx_p0037_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400153]={
+		["res"]="sfx_p0037_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400154]={
+		["res"]="sfx_p0038_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400155]={
+		["res"]="sfx_p0038_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400156]={
+		["res"]="sfx_p0039_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400157]={
+		["res"]="sfx_p0039_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400158]={
+		["res"]="sfx_p0040_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400159]={
+		["res"]="sfx_p0040_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400160]={
+		["res"]="sfx_p0041_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400161]={
+		["res"]="sfx_p0041_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400162]={
+		["res"]="sfx_p0041_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400163]={
+		["res"]="sfx_p0041_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400164]={
+		["res"]="sfx_p0041_b05",
+		["bind"]="root",
+		["flip"]=1
 	}
 }
 local config = {
-data=fx,count=649
+data=fx,count=677
 }
 return config

lua/app/config/grid_edge_type.lua

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

lua/app/config/grid_type.lua

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

lua/app/config/hero.lua

@@ -427,9 +427,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0028",
+		["model_id"]="p0037",
 		["icon"]="31",
-		["item_id"]=14003,
+		["item_id"]=14004,
 		["collection_point"]=5,
 		["skin"]={
 			14004
@@ -620,7 +620,8 @@ local hero = {
 		["is_show"]=1,
 		["collection_point"]=3,
 		["skin"]={
-			23002
+			23002,
+			2300201
 		}
 	},
 	[24001]={
@@ -862,9 +863,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0031",
+		["model_id"]="p0039",
 		["icon"]="27",
-		["item_id"]=24003,
+		["item_id"]=24004,
 		["collection_point"]=5,
 		["skin"]={
 			24004
@@ -1299,9 +1300,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0027",
+		["model_id"]="p0040",
 		["icon"]="28",
-		["item_id"]=34003,
+		["item_id"]=34004,
 		["is_show"]=1,
 		["collection_point"]=5,
 		["skin"]={
@@ -1736,9 +1737,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0030",
+		["model_id"]="p0038",
 		["icon"]="29",
-		["item_id"]=44003,
+		["item_id"]=44004,
 		["collection_point"]=5,
 		["skin"]={
 			44004
@@ -2174,9 +2175,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0029",
+		["model_id"]="p0041",
 		["icon"]="30",
-		["item_id"]=54003,
+		["item_id"]=54004,
 		["collection_point"]=5,
 		["skin"]={
 			54004

lua/app/config/item.lua

@@ -1585,6 +1585,11 @@ local item = {
 		["qlt"]=4,
 		["icon"]="55"
 	},
+	[56]={
+		["type"]=1,
+		["qlt"]=4,
+		["icon"]="56"
+	},
 	[1001]={
 		["type"]=2,
 		["qlt"]=1,
@@ -2440,9 +2445,15 @@ local item = {
 		["parameter"]=1400101,
 		["qlt"]=3,
 		["icon"]="1400101"
+	},
+	[2300201]={
+		["type"]=12,
+		["parameter"]=2300201,
+		["qlt"]=2,
+		["icon"]="2300201"
 	}
 }
 local config = {
-data=item,count=124
+data=item,count=126
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -526,14 +526,79 @@ local LocalizationGlobalConst =
 	DUNGEON_RUNE_TIP_3 = "DUNGEON_RUNE_TIP_3",
 	DUNGEON_RUNE_TIP_4 = "DUNGEON_RUNE_TIP_4",
 	DUNGEON_RUNE_TIP_5 = "DUNGEON_RUNE_TIP_5",
+	DUNGEON_RUNE_TIP_6 = "DUNGEON_RUNE_TIP_6",
 	UNFINISHED = "UNFINISHED",
-
+	RUNES_DESC_1 = "RUNES_DESC_1",
-	["DUNGEON_RUNE_DESC_1"]= "DUNGEON_RUNE_DESC_1",
+	RUNES_DESC_2 = "RUNES_DESC_2",
-    ["DUNGEON_RUNE_DESC_2"] = "DUNGEON_RUNE_DESC_2",
+	RUNES_DESC_3 = "RUNES_DESC_3",
-    ["DUNGEON_RUNE_DESC_3"] = "DUNGEON_RUNE_DESC_3",
+	RUNES_DESC_4 = "RUNES_DESC_4",
-    ["DUNGEON_RUNE_DESC_4"] = "DUNGEON_RUNE_DESC_4",
+	RUNES_DESC_5 = "RUNES_DESC_5",
-    ["DUNGEON_RUNE_DESC_5"] = "DUNGEON_RUNE_DESC_5",
+	RUNES_DESC_6 = "RUNES_DESC_6",
+	RUNES_DESC_7 = "RUNES_DESC_7",
+	RUNES_DESC_8 = "RUNES_DESC_8",
+	RUNES_DESC_9 = "RUNES_DESC_9",
+	RUNES_DESC_10 = "RUNES_DESC_10",
+	RUNES_DESC_11 = "RUNES_DESC_11",
+	RUNES_DESC_12 = "RUNES_DESC_12",
+	RUNES_DESC_13 = "RUNES_DESC_13",
+	RUNES_DESC_14 = "RUNES_DESC_14",
+	RUNES_DESC_15 = "RUNES_DESC_15",
+	RUNES_DESC_16 = "RUNES_DESC_16",
+	RUNES_DESC_17 = "RUNES_DESC_17",
+	RUNES_DESC_18 = "RUNES_DESC_18",
+	RUNES_DESC_19 = "RUNES_DESC_19",
+	RUNES_DESC_20 = "RUNES_DESC_20",
+	RUNES_DESC_21 = "RUNES_DESC_21",
+	RUNES_DESC_22 = "RUNES_DESC_22",
+	RUNES_DESC_23 = "RUNES_DESC_23",
+	RUNES_DESC_24 = "RUNES_DESC_24",
+	RUNES_DESC_25 = "RUNES_DESC_25",
+	RUNES_DESC_26 = "RUNES_DESC_26",
+	RUNES_DESC_27 = "RUNES_DESC_27",
+	RUNES_DESC_28 = "RUNES_DESC_28",
+	RUNES_DESC_29 = "RUNES_DESC_29",
+	RUNES_DESC_30 = "RUNES_DESC_30",
+	DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1",
+	DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2",
+	DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3",
+	DUNGEON_RUNE_DESC_4 = "DUNGEON_RUNE_DESC_4",
+	DUNGEON_RUNE_DESC_5 = "DUNGEON_RUNE_DESC_5",
 	DUNGEON_RUNE_DESC_6 = "DUNGEON_RUNE_DESC_6",
+	DUNGEON_RUNE_DESC_7 = "DUNGEON_RUNE_DESC_7",
+	DUNGEON_RUNE_DESC_8 = "DUNGEON_RUNE_DESC_8",
+	DUNGEON_RUNE_DESC_9 = "DUNGEON_RUNE_DESC_9",
+	DUNGEON_RUNE_DESC_10 = "DUNGEON_RUNE_DESC_10",
+	DUNGEON_RUNE_DESC_11 = "DUNGEON_RUNE_DESC_11",
+	ACTIVITY_MOON_DESC_1 = "ACTIVITY_MOON_DESC_1",
+	ACTIVITY_MOON_DESC_2 = "ACTIVITY_MOON_DESC_2",
+	ACTIVITY_MOON_DESC_3 = "ACTIVITY_MOON_DESC_3",
+	ACTIVITY_MOON_DESC_4 = "ACTIVITY_MOON_DESC_4",
+	ACTIVITY_MOON_DESC_5 = "ACTIVITY_MOON_DESC_5",
+	ACTIVITY_MOON_DESC_6 = "ACTIVITY_MOON_DESC_6",
+	ACTIVITY_MOON_DESC_7 = "ACTIVITY_MOON_DESC_7",
+	ACTIVITY_MOON_DESC_8 = "ACTIVITY_MOON_DESC_8",
+	ACTIVITY_MOON_DESC_9 = "ACTIVITY_MOON_DESC_9",
+	ACTIVITY_MOON_DESC_10 = "ACTIVITY_MOON_DESC_10",
+	ACTIVITY_MOON_DESC_11 = "ACTIVITY_MOON_DESC_11",
+	SEIZED_DESC_4 = "SEIZED_DESC_4",
+	ACT_PVP_DESC_1 = "ACT_PVP_DESC_1",
+	ACT_PVP_DESC_2 = "ACT_PVP_DESC_2",
+	ACT_PVP_DESC_3 = "ACT_PVP_DESC_3",
+	ACT_PVP_DESC_4 = "ACT_PVP_DESC_4",
+	ACT_PVP_DESC_5 = "ACT_PVP_DESC_5",
+	ACT_PVP_DESC_6 = "ACT_PVP_DESC_6",
+	ACT_PVP_DESC_7 = "ACT_PVP_DESC_7",
+	ACT_PVP_DESC_8 = "ACT_PVP_DESC_8",
+	ACT_PVP_DESC_9 = "ACT_PVP_DESC_9",
+	ACT_PVP_DESC_10 = "ACT_PVP_DESC_10",
+	ACT_PVP_DESC_11 = "ACT_PVP_DESC_11",
+	ACT_PVP_DESC_12 = "ACT_PVP_DESC_12",
+	ACT_PVP_DESC_13 = "ACT_PVP_DESC_13",
+	ACT_PVP_DESC_14 = "ACT_PVP_DESC_14",
+	ACT_PVP_DESC_15 = "ACT_PVP_DESC_15",
+	ACT_PVP_DESC_16 = "ACT_PVP_DESC_16",
+	ACT_PVP_DESC_17 = "ACT_PVP_DESC_17",
+	ACT_PVP_DESC_18 = "ACT_PVP_DESC_18",
 }
 
 return LocalizationGlobalConst

lua/app/config/monster_activity.lua

@@ -769,9 +769,52 @@ local monster_activity = {
 			10009
 		},
 		["monster_exp"]=15000
+	},
+	[10004]={
+		["monster_base"]=20047,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30156,
+			30157,
+			30158
+		},
+		["skill"]={
+			10137,
+			10138
+		},
+		["passive_skill"]={
+			10013,
+			10010
+		},
+		["monster_exp"]=15000
+	},
+	[10104]={
+		["monster_base"]=20048,
+		["is_boss"]=1,
+		["hp"]=107230000,
+		["atk"]=930000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30159,
+			30160,
+			30161
+		},
+		["skill"]={
+			10139,
+			10140
+		},
+		["passive_skill"]={
+			10141,
+			10014,
+			10009
+		},
+		["monster_exp"]=15000
 	}
 }
 local config = {
-data=monster_activity,count=42
+data=monster_activity,count=44
 }
 return config

lua/app/config/monster_base.lua

@@ -620,34 +620,54 @@ local monster_base = {
 		["model_ui"]=1.0
 	},
 	[20049]={
-
+		["model_id"]="m20039",
+		["body"]=1,
+		["model_ui"]=0.8
 	},
 	[20050]={
-
+		["model_id"]="m20040",
+		["body"]=1,
+		["model_ui"]=0.8
 	},
 	[20051]={
-
+		["model_id"]="m20041",
+		["body"]=1,
+		["model_ui"]=0.8
 	},
 	[20052]={
-
+		["model_id"]="m20042",
+		["body"]=1,
+		["model_ui"]=0.8
 	},
 	[20053]={
-
+		["model_id"]="m20043",
+		["body"]=1,
+		["model_ui"]=0.8
 	},
 	[20054]={
-
+		["model_id"]="m20044",
+		["body"]=1,
+		["model_ui"]=1.0
 	},
 	[20055]={
-
+		["model_id"]="m20045",
+		["body"]=1,
+		["model_ui"]=1.0
 	},
 	[20056]={
-
+		["model_id"]="m20046",
+		["body"]=1,
+		["model_ui"]=1.0
 	},
 	[20057]={
-
+		["model_id"]="m20047",
+		["body"]=1,
+		["model_ui"]=1.0
 	},
 	[20058]={
-
+		["model_id"]="m20048",
+		["body"]=1,
+		["model_ui"]=1.0
 	},
 	[30001]={
 		["model_id"]="p0001",

lua/app/config/monster_dungeon_rune.lua

@@ -2,8 +2,8 @@ local monster_dungeon_rune = {
 	[108]={
 		["none"]="大史莱姆（红）",
 		["monster_base"]=10027,
-		["hp"]=681920000,
+		["hp"]=999999999,
-		["atk"]=6080000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20076,
@@ -15,8 +15,8 @@ local monster_dungeon_rune = {
 	[208]={
 		["none"]="大史莱姆（黄）",
 		["monster_base"]=10025,
-		["hp"]=278310000,
+		["hp"]=999999999,
-		["atk"]=4040000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20070,
@@ -28,8 +28,8 @@ local monster_dungeon_rune = {
 	[308]={
 		["none"]="大史莱姆（蓝）",
 		["monster_base"]=10026,
-		["hp"]=278310000,
+		["hp"]=999999999,
-		["atk"]=4040000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -41,8 +41,8 @@ local monster_dungeon_rune = {
 	[408]={
 		["none"]="大史莱姆（绿）",
 		["monster_base"]=10024,
-		["hp"]=205490000,
+		["hp"]=999999999,
-		["atk"]=3950000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -54,8 +54,8 @@ local monster_dungeon_rune = {
 	[508]={
 		["none"]="盾刀骷髅兵",
 		["monster_base"]=10009,
-		["hp"]=482700000,
+		["hp"]=999999999,
-		["atk"]=5690000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -67,8 +67,8 @@ local monster_dungeon_rune = {
 	[608]={
 		["none"]="盾刀骷髅兵（有头盔）",
 		["monster_base"]=10039,
-		["hp"]=593840000,
+		["hp"]=999999999,
-		["atk"]=5780000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -80,8 +80,8 @@ local monster_dungeon_rune = {
 	[708]={
 		["none"]="哥布林匕首(蓝)",
 		["monster_base"]=10001,
-		["hp"]=474020000,
+		["hp"]=999999999,
-		["atk"]=5340000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -93,8 +93,8 @@ local monster_dungeon_rune = {
 	[808]={
 		["none"]="哥布林匕首(紫)",
 		["monster_base"]=10003,
-		["hp"]=554250000,
+		["hp"]=999999999,
-		["atk"]=5310000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20007,
@@ -106,8 +106,8 @@ local monster_dungeon_rune = {
 	[908]={
 		["none"]="哥布林法师（红）",
 		["monster_base"]=10008,
-		["hp"]=298160000,
+		["hp"]=999999999,
-		["atk"]=4390000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20022,
@@ -119,8 +119,8 @@ local monster_dungeon_rune = {
 	[1008]={
 		["none"]="哥布林法师(蓝)",
 		["monster_base"]=10005,
-		["hp"]=525000000,
+		["hp"]=999999999,
-		["atk"]=5020000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -132,8 +132,8 @@ local monster_dungeon_rune = {
 	[1108]={
 		["none"]="哥布林法师（绿）",
 		["monster_base"]=10006,
-		["hp"]=372560000,
+		["hp"]=999999999,
-		["atk"]=4530000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -145,8 +145,8 @@ local monster_dungeon_rune = {
 	[1208]={
 		["none"]="哥布林法师（紫）",
 		["monster_base"]=10007,
-		["hp"]=450590000,
+		["hp"]=999999999,
-		["atk"]=5230000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20019,
@@ -158,8 +158,8 @@ local monster_dungeon_rune = {
 	[1308]={
 		["none"]="哥布林斧头(红)",
 		["monster_base"]=10002,
-		["hp"]=426740000,
+		["hp"]=999999999,
-		["atk"]=4940000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20004,
@@ -171,8 +171,8 @@ local monster_dungeon_rune = {
 	[1408]={
 		["none"]="哥布林棍棒(绿)",
 		["monster_base"]=10004,
-		["hp"]=391500000,
+		["hp"]=999999999,
-		["atk"]=5410000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -184,8 +184,8 @@ local monster_dungeon_rune = {
 	[1508]={
 		["none"]="黑色食人花",
 		["monster_base"]=10050,
-		["hp"]=474020000,
+		["hp"]=999999999,
-		["atk"]=5340000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -197,8 +197,8 @@ local monster_dungeon_rune = {
 	[1608]={
 		["none"]="红色蝙蝠恶魔",
 		["monster_base"]=10052,
-		["hp"]=507910000,
+		["hp"]=999999999,
-		["atk"]=5800000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -210,8 +210,8 @@ local monster_dungeon_rune = {
 	[1708]={
 		["none"]="红色恶魔野猪",
 		["monster_base"]=10051,
-		["hp"]=347620000,
+		["hp"]=999999999,
-		["atk"]=4170000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20148,
@@ -223,8 +223,8 @@ local monster_dungeon_rune = {
 	[1808]={
 		["none"]="红色蜥蜴剑士",
 		["monster_base"]=10047,
-		["hp"]=324830000,
+		["hp"]=999999999,
-		["atk"]=4460000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20136,
@@ -236,8 +236,8 @@ local monster_dungeon_rune = {
 	[1908]={
 		["none"]="红色幽灵恶魔",
 		["monster_base"]=10055,
-		["hp"]=309200000,
+		["hp"]=999999999,
-		["atk"]=3730000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20160,
@@ -249,8 +249,8 @@ local monster_dungeon_rune = {
 	[2008]={
 		["none"]="红色蜘蛛",
 		["monster_base"]=10046,
-		["hp"]=507910000,
+		["hp"]=999999999,
-		["atk"]=5800000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20133,
@@ -262,8 +262,8 @@ local monster_dungeon_rune = {
 	[2108]={
 		["none"]="黄发剑士",
 		["monster_base"]=10030,
-		["hp"]=554250000,
+		["hp"]=999999999,
-		["atk"]=5310000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -275,8 +275,8 @@ local monster_dungeon_rune = {
 	[2208]={
 		["none"]="火山甲壳虫",
 		["monster_base"]=10061,
-		["hp"]=482700000,
+		["hp"]=999999999,
-		["atk"]=5690000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20178,
@@ -288,8 +288,8 @@ local monster_dungeon_rune = {
 	[2308]={
 		["none"]="火山岩石怪",
 		["monster_base"]=10060,
-		["hp"]=298160000,
+		["hp"]=999999999,
-		["atk"]=4390000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20175,
@@ -301,8 +301,8 @@ local monster_dungeon_rune = {
 	[2408]={
 		["none"]="剑盾士兵（黄发）",
 		["monster_base"]=10034,
-		["hp"]=298160000,
+		["hp"]=999999999,
-		["atk"]=4390000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -314,8 +314,8 @@ local monster_dungeon_rune = {
 	[2508]={
 		["none"]="剑盾士兵（蓝发）",
 		["monster_base"]=10035,
-		["hp"]=372560000,
+		["hp"]=999999999,
-		["atk"]=4530000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20100,
@@ -327,8 +327,8 @@ local monster_dungeon_rune = {
 	[2608]={
 		["none"]="骷髅弓箭手",
 		["monster_base"]=10038,
-		["hp"]=391500000,
+		["hp"]=999999999,
-		["atk"]=5410000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -340,8 +340,8 @@ local monster_dungeon_rune = {
 	[2708]={
 		["none"]="骷髅枪兵",
 		["monster_base"]=10010,
-		["hp"]=347620000,
+		["hp"]=999999999,
-		["atk"]=4170000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -353,8 +353,8 @@ local monster_dungeon_rune = {
 	[2808]={
 		["none"]="骷髅小法师",
 		["monster_base"]=10040,
-		["hp"]=482700000,
+		["hp"]=999999999,
-		["atk"]=5690000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -366,8 +366,8 @@ local monster_dungeon_rune = {
 	[2908]={
 		["none"]="蓝发剑士",
 		["monster_base"]=10031,
-		["hp"]=345780000,
+		["hp"]=999999999,
-		["atk"]=4720000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20088,
@@ -379,8 +379,8 @@ local monster_dungeon_rune = {
 	[3008]={
 		["none"]="蓝色蝙蝠恶魔",
 		["monster_base"]=10041,
-		["hp"]=391500000,
+		["hp"]=999999999,
-		["atk"]=5410000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20118,
@@ -392,8 +392,8 @@ local monster_dungeon_rune = {
 	[3108]={
 		["none"]="蓝色独眼蝙蝠",
 		["monster_base"]=10044,
-		["hp"]=191410000,
+		["hp"]=999999999,
-		["atk"]=3630000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -405,8 +405,8 @@ local monster_dungeon_rune = {
 	[3208]={
 		["none"]="蓝色恶魔野猪",
 		["monster_base"]=10042,
-		["hp"]=365170000,
+		["hp"]=999999999,
-		["atk"]=4980000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20121,
@@ -418,8 +418,8 @@ local monster_dungeon_rune = {
 	[3308]={
 		["none"]="绿色食人花",
 		["monster_base"]=10049,
-		["hp"]=409220000,
+		["hp"]=999999999,
-		["atk"]=4500000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -431,8 +431,8 @@ local monster_dungeon_rune = {
 	[3408]={
 		["none"]="绿色蜥蜴剑士",
 		["monster_base"]=10048,
-		["hp"]=482700000,
+		["hp"]=999999999,
-		["atk"]=5690000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -444,8 +444,8 @@ local monster_dungeon_rune = {
 	[3508]={
 		["none"]="魔都小枪兵（红）",
 		["monster_base"]=10057,
-		["hp"]=191410000,
+		["hp"]=999999999,
-		["atk"]=3630000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20166,
@@ -457,8 +457,8 @@ local monster_dungeon_rune = {
 	[3608]={
 		["none"]="魔都小枪兵（紫）",
 		["monster_base"]=10058,
-		["hp"]=164360000,
+		["hp"]=999999999,
-		["atk"]=3050000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20169,
@@ -470,8 +470,8 @@ local monster_dungeon_rune = {
 	[3708]={
 		["none"]="女巫师（蓝）",
 		["monster_base"]=10032,
-		["hp"]=525000000,
+		["hp"]=999999999,
-		["atk"]=5020000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -483,8 +483,8 @@ local monster_dungeon_rune = {
 	[3808]={
 		["none"]="女巫师（紫）",
 		["monster_base"]=10033,
-		["hp"]=278310000,
+		["hp"]=999999999,
-		["atk"]=4040000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -496,8 +496,8 @@ local monster_dungeon_rune = {
 	[3908]={
 		["none"]="青绿鬼火",
 		["monster_base"]=10054,
-		["hp"]=191410000,
+		["hp"]=999999999,
-		["atk"]=3630000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -509,8 +509,8 @@ local monster_dungeon_rune = {
 	[4008]={
 		["none"]="人类弓箭手（红）",
 		["monster_base"]=10036,
-		["hp"]=554250000,
+		["hp"]=999999999,
-		["atk"]=5310000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20103,
@@ -522,8 +522,8 @@ local monster_dungeon_rune = {
 	[4108]={
 		["none"]="人类弓箭手（绿）",
 		["monster_base"]=10037,
-		["hp"]=205490000,
+		["hp"]=999999999,
-		["atk"]=3950000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20106,
@@ -535,8 +535,8 @@ local monster_dungeon_rune = {
 	[4208]={
 		["none"]="人鱼双匕首（红）",
 		["monster_base"]=10065,
-		["hp"]=243300000,
+		["hp"]=999999999,
-		["atk"]=2900000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20187,
@@ -548,8 +548,8 @@ local monster_dungeon_rune = {
 	[4308]={
 		["none"]="人鱼双匕首（蓝）",
 		["monster_base"]=10063,
-		["hp"]=191500000,
+		["hp"]=999999999,
-		["atk"]=2660000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20184,
@@ -561,8 +561,8 @@ local monster_dungeon_rune = {
 	[4408]={
 		["none"]="兽人大刀兵（红）",
 		["monster_base"]=10014,
-		["hp"]=450590000,
+		["hp"]=999999999,
-		["atk"]=5230000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20037,
@@ -574,8 +574,8 @@ local monster_dungeon_rune = {
 	[4508]={
 		["none"]="兽人大刀兵（黄）",
 		["monster_base"]=10015,
-		["hp"]=507910000,
+		["hp"]=999999999,
-		["atk"]=5800000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20040,
@@ -587,8 +587,8 @@ local monster_dungeon_rune = {
 	[4608]={
 		["none"]="兽人大刀兵（蓝）",
 		["monster_base"]=10013,
-		["hp"]=205490000,
+		["hp"]=999999999,
-		["atk"]=3950000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -600,8 +600,8 @@ local monster_dungeon_rune = {
 	[4708]={
 		["none"]="兽人大刀兵（绿）",
 		["monster_base"]=10012,
-		["hp"]=482700000,
+		["hp"]=999999999,
-		["atk"]=5690000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -613,8 +613,8 @@ local monster_dungeon_rune = {
 	[4808]={
 		["none"]="兽人盾骨兵（红）",
 		["monster_base"]=10017,
-		["hp"]=593840000,
+		["hp"]=999999999,
-		["atk"]=5780000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20046,
@@ -626,8 +626,8 @@ local monster_dungeon_rune = {
 	[4908]={
 		["none"]="兽人盾骨兵（黄）",
 		["monster_base"]=10018,
-		["hp"]=593840000,
+		["hp"]=999999999,
-		["atk"]=5780000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20049,
@@ -639,8 +639,8 @@ local monster_dungeon_rune = {
 	[5008]={
 		["none"]="兽人盾骨兵（蓝）",
 		["monster_base"]=10019,
-		["hp"]=372560000,
+		["hp"]=999999999,
-		["atk"]=4530000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -652,8 +652,8 @@ local monster_dungeon_rune = {
 	[5108]={
 		["none"]="兽人盾骨兵（绿）",
 		["monster_base"]=10016,
-		["hp"]=593840000,
+		["hp"]=999999999,
-		["atk"]=5780000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20043,
@@ -665,8 +665,8 @@ local monster_dungeon_rune = {
 	[5208]={
 		["none"]="双斧莫西干（红）",
 		["monster_base"]=10029,
-		["hp"]=391500000,
+		["hp"]=999999999,
-		["atk"]=5410000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -678,8 +678,8 @@ local monster_dungeon_rune = {
 	[5308]={
 		["none"]="双斧莫西干（紫）",
 		["monster_base"]=10028,
-		["hp"]=298160000,
+		["hp"]=999999999,
-		["atk"]=4390000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -691,8 +691,8 @@ local monster_dungeon_rune = {
 	[5408]={
 		["none"]="水蜥蜴",
 		["monster_base"]=10064,
-		["hp"]=224450000,
+		["hp"]=999999999,
-		["atk"]=3190000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20190,
@@ -704,8 +704,8 @@ local monster_dungeon_rune = {
 	[5508]={
 		["none"]="小史莱姆（红）",
 		["monster_base"]=10023,
-		["hp"]=507910000,
+		["hp"]=999999999,
-		["atk"]=5800000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -717,8 +717,8 @@ local monster_dungeon_rune = {
 	[5608]={
 		["none"]="小史莱姆（黄）",
 		["monster_base"]=10021,
-		["hp"]=593840000,
+		["hp"]=999999999,
-		["atk"]=5780000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -730,8 +730,8 @@ local monster_dungeon_rune = {
 	[5708]={
 		["none"]="小史莱姆（蓝）",
 		["monster_base"]=10022,
-		["hp"]=205490000,
+		["hp"]=999999999,
-		["atk"]=3950000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -743,8 +743,8 @@ local monster_dungeon_rune = {
 	[5808]={
 		["none"]="小史莱姆（绿）",
 		["monster_base"]=10020,
-		["hp"]=602910000,
+		["hp"]=999999999,
-		["atk"]=5280000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -756,8 +756,8 @@ local monster_dungeon_rune = {
 	[5908]={
 		["none"]="紫色独眼蝙蝠",
 		["monster_base"]=10043,
-		["hp"]=474020000,
+		["hp"]=999999999,
-		["atk"]=5340000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -769,8 +769,8 @@ local monster_dungeon_rune = {
 	[6008]={
 		["none"]="紫色鬼火",
 		["monster_base"]=10053,
-		["hp"]=549890000,
+		["hp"]=999999999,
-		["atk"]=4690000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -782,8 +782,8 @@ local monster_dungeon_rune = {
 	[6108]={
 		["none"]="紫色幽灵恶魔",
 		["monster_base"]=10056,
-		["hp"]=191410000,
+		["hp"]=999999999,
-		["atk"]=3630000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20163,
@@ -795,8 +795,8 @@ local monster_dungeon_rune = {
 	[6208]={
 		["none"]="紫色蜘蛛",
 		["monster_base"]=10045,
-		["hp"]=205490000,
+		["hp"]=999999999,
-		["atk"]=3950000,
+		["atk"]=999999999,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -807,7 +807,7 @@ local monster_dungeon_rune = {
 	},
 	[6308]={
 		["none"]="深潜者",
-		["monster_base"]=20001,
+		["monster_base"]=20049,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -826,7 +826,7 @@ local monster_dungeon_rune = {
 	},
 	[6408]={
 		["none"]="黑山羊幼崽",
-		["monster_base"]=20002,
+		["monster_base"]=20050,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -845,7 +845,7 @@ local monster_dungeon_rune = {
 	},
 	[6508]={
 		["none"]="莎布·尼古拉斯",
-		["monster_base"]=20003,
+		["monster_base"]=20051,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -862,7 +862,7 @@ local monster_dungeon_rune = {
 	},
 	[6608]={
 		["none"]="奈亚拉托提普",
-		["monster_base"]=20004,
+		["monster_base"]=20052,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=0,
@@ -881,7 +881,7 @@ local monster_dungeon_rune = {
 	},
 	[6708]={
 		["none"]="神秘的兄弟神",
-		["monster_base"]=20005,
+		["monster_base"]=20053,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -900,7 +900,7 @@ local monster_dungeon_rune = {
 	},
 	[6808]={
 		["none"]="兰·提戈斯",
-		["monster_base"]=20006,
+		["monster_base"]=20054,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -920,7 +920,7 @@ local monster_dungeon_rune = {
 	},
 	[6908]={
 		["none"]="克希拉",
-		["monster_base"]=20007,
+		["monster_base"]=20055,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=0,
@@ -939,11 +939,14 @@ local monster_dungeon_rune = {
 			30206,
 			30207
 		},
+		["passive_skill"]={
+			10013
+		},
 		["monster_exp"]=0
 	},
 	[7008]={
 		["none"]="依德·雅",
-		["monster_base"]=20008,
+		["monster_base"]=20056,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -965,7 +968,7 @@ local monster_dungeon_rune = {
 	},
 	[7108]={
 		["none"]="旧日支配者",
-		["monster_base"]=20009,
+		["monster_base"]=20057,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=0,
@@ -979,7 +982,6 @@ local monster_dungeon_rune = {
 			30220
 		},
 		["passive_skill"]={
-			10013,
 			10014,
 			30218
 		},
@@ -987,7 +989,7 @@ local monster_dungeon_rune = {
 	},
 	[7208]={
 		["none"]="阿撒托斯",
-		["monster_base"]=20010,
+		["monster_base"]=20058,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -1001,7 +1003,8 @@ local monster_dungeon_rune = {
 			30226,
 			30227,
 			30228,
-			30229
+			30229,
+			30230
 		},
 		["passive_skill"]={
 			10013,

lua/app/config/runes_level.lua

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

lua/app/config/runes_suit.lua

@@ -3,51 +3,51 @@ local runes_suit = {
 		["red_suit_attr"]={
 			{
 				["type"]="attr_hpp_red",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_hpp_red",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["yellow_suit_attr"]={
 			{
 				["type"]="attr_hpp_yellow",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_hpp_yellow",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["green_suit_attr"]={
 			{
 				["type"]="attr_hpp_green",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_hpp_green",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["blue_suit_attr"]={
 			{
 				["type"]="attr_hpp_blue",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_hpp_blue",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["purple_suit_attr"]={
 			{
 				["type"]="attr_hpp_purple",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_hpp_purple",
-				["num"]=2500
+				["num"]=1500
 			}
 		}
 	},
@@ -55,51 +55,51 @@ local runes_suit = {
 		["red_suit_attr"]={
 			{
 				["type"]="attr_atkp_red",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_atkp_red",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["yellow_suit_attr"]={
 			{
 				["type"]="attr_atkp_yellow",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_atkp_yellow",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["green_suit_attr"]={
 			{
 				["type"]="attr_atkp_green",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_atkp_green",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["blue_suit_attr"]={
 			{
 				["type"]="attr_atkp_blue",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_atkp_blue",
-				["num"]=2500
+				["num"]=1500
 			}
 		},
 		["purple_suit_attr"]={
 			{
 				["type"]="attr_atkp_purple",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_atkp_purple",
-				["num"]=2500
+				["num"]=1500
 			}
 		}
 	},
@@ -107,51 +107,51 @@ local runes_suit = {
 		["red_suit_attr"]={
 			{
 				["type"]="attr_crit_time_red",
-				["num"]=2000
+				["num"]=1500
 			},
 			{
 				["type"]="attr_crit_time_red",
-				["num"]=4000
+				["num"]=3000
 			}
 		},
 		["yellow_suit_attr"]={
 			{
 				["type"]="attr_crit_time_yellow",
-				["num"]=2000
+				["num"]=1500
 			},
 			{
 				["type"]="attr_crit_time_yellow",
-				["num"]=4000
+				["num"]=3000
 			}
 		},
 		["green_suit_attr"]={
 			{
 				["type"]="attr_crit_time_green",
-				["num"]=2000
+				["num"]=1500
 			},
 			{
 				["type"]="attr_crit_time_green",
-				["num"]=4000
+				["num"]=3000
 			}
 		},
 		["blue_suit_attr"]={
 			{
 				["type"]="attr_crit_time_blue",
-				["num"]=2000
+				["num"]=1500
 			},
 			{
 				["type"]="attr_crit_time_blue",
-				["num"]=4000
+				["num"]=3000
 			}
 		},
 		["purple_suit_attr"]={
 			{
 				["type"]="attr_crit_time_purple",
-				["num"]=2000
+				["num"]=1500
 			},
 			{
 				["type"]="attr_crit_time_purple",
-				["num"]=4000
+				["num"]=3000
 			}
 		}
 	},
@@ -159,51 +159,51 @@ local runes_suit = {
 		["red_suit_attr"]={
 			{
 				["type"]="attr_all_hurtp_red",
-				["num"]=2000
+				["num"]=500
 			},
 			{
 				["type"]="attr_all_hurtp_red",
-				["num"]=4000
+				["num"]=1000
 			}
 		},
 		["yellow_suit_attr"]={
 			{
 				["type"]="attr_all_hurtp_yellow",
-				["num"]=2000
+				["num"]=500
 			},
 			{
 				["type"]="attr_all_hurtp_yellow",
-				["num"]=4000
+				["num"]=1000
 			}
 		},
 		["green_suit_attr"]={
 			{
 				["type"]="attr_all_hurtp_green",
-				["num"]=2000
+				["num"]=500
 			},
 			{
 				["type"]="attr_all_hurtp_green",
-				["num"]=4000
+				["num"]=1000
 			}
 		},
 		["blue_suit_attr"]={
 			{
 				["type"]="attr_all_hurtp_blue",
-				["num"]=2000
+				["num"]=500
 			},
 			{
 				["type"]="attr_all_hurtp_blue",
-				["num"]=4000
+				["num"]=1000
 			}
 		},
 		["purple_suit_attr"]={
 			{
 				["type"]="attr_all_hurtp_purple",
-				["num"]=2000
+				["num"]=500
 			},
 			{
 				["type"]="attr_all_hurtp_purple",
-				["num"]=4000
+				["num"]=1000
 			}
 		}
 	},
@@ -211,51 +211,51 @@ local runes_suit = {
 		["red_suit_attr"]={
 			{
 				["type"]="attr_crit_red",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_all_hurtp_red",
-				["num"]=2000
+				["num"]=1500
 			}
 		},
 		["yellow_suit_attr"]={
 			{
 				["type"]="attr_crit_yellow",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_all_hurtp_yellow",
-				["num"]=2000
+				["num"]=1500
 			}
 		},
 		["green_suit_attr"]={
 			{
 				["type"]="attr_crit_green",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_all_hurtp_green",
-				["num"]=2000
+				["num"]=1500
 			}
 		},
 		["blue_suit_attr"]={
 			{
 				["type"]="attr_crit_blue",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_all_hurtp_blue",
-				["num"]=2000
+				["num"]=1500
 			}
 		},
 		["purple_suit_attr"]={
 			{
 				["type"]="attr_crit_purple",
-				["num"]=1000
+				["num"]=800
 			},
 			{
 				["type"]="attr_all_hurtp_purple",
-				["num"]=2000
+				["num"]=1500
 			}
 		}
 	}

lua/app/config/skill_rogue.lua

@@ -1636,7 +1636,7 @@ local skill_rogue = {
 		["qlt"]=4,
 		["type"]=1,
 		["parameter"]={
-			1400325
+			1400425
 		},
 		["skill_position"]=1,
 		["icon"]="270"
@@ -2572,6 +2572,15 @@ local skill_rogue = {
 		["qlt"]=4,
 		["type"]=12,
 		["skill_position"]=2,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=2400424,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=4,
 		["icon"]="240"
 	},
 	[2400406]={
@@ -5314,14 +5323,14 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=9,
+		["type"]=12,
 		["skill_position"]=5,
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=5400321,
+				["num"]=5400421,
 				["ratio"]=10000,
-				["round"]=999
+				["round"]=1
 			}
 		},
 		["obj"]=7,
@@ -5336,7 +5345,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=5400322,
+				["num"]=5400422,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -5353,7 +5362,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=5400323,
+				["num"]=5400423,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -5372,7 +5381,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=5400324,
+				["num"]=5400424,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -5381,8 +5390,6 @@ local skill_rogue = {
 		["icon"]="261"
 	},
 	[5400406]={
-		["unlock"]=5400402,
-		["cover_unlock"]=5400402,
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
@@ -5391,9 +5398,9 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=5400325,
+				["num"]=5400425,
 				["ratio"]=10000,
-				["round"]=999
+				["round"]=1
 			}
 		},
 		["obj"]=7,
@@ -5408,7 +5415,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=5400326,
+				["num"]=5400426,
 				["ratio"]=10000,
 				["round"]=1
 			}

lua/app/config/skin.lua

@@ -88,7 +88,7 @@ local skin = {
 		["hero_id"]=14003
 	},
 	[14004]={
-		["model_id"]="p0028",
+		["model_id"]="p0037",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=14004
@@ -111,6 +111,32 @@ local skin = {
 		["skin_point"]=0,
 		["hero_id"]=23002
 	},
+	[2300201]={
+		["model_id"]="p0042",
+		["qlt"]=2,
+		["bonus"]={
+			{
+				["type"]="atk_yellow",
+				["num"]=300000
+			},
+			{
+				["type"]="attr_hp_yellow",
+				["num"]=1000000
+			}
+		},
+		["icon"]="7_1",
+		["got"]=1,
+		["skin_point"]=5,
+		["hero_id"]=23002,
+		["item_id"]=2300201,
+		["skill_show"]={
+			23002011,
+			23002012,
+			23002013,
+			23002014,
+			23002015
+		}
+	},
 	[24001]={
 		["model_id"]="p0007",
 		["qlt"]=1,
@@ -130,7 +156,7 @@ local skin = {
 		["hero_id"]=24003
 	},
 	[24004]={
-		["model_id"]="p0031",
+		["model_id"]="p0039",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=24004
@@ -198,7 +224,7 @@ local skin = {
 		["hero_id"]=34003
 	},
 	[34004]={
-		["model_id"]="p0027",
+		["model_id"]="p0040",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=34004
@@ -240,7 +266,7 @@ local skin = {
 		["hero_id"]=44003
 	},
 	[44004]={
-		["model_id"]="p0030",
+		["model_id"]="p0038",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=44004
@@ -334,13 +360,13 @@ local skin = {
 		["hero_id"]=54003
 	},
 	[54004]={
-		["model_id"]="p0029",
+		["model_id"]="p0041",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=54004
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/skin_skill.lua

@@ -376,9 +376,84 @@ local skin_skill = {
 			200
 		},
 		["fx_self_mirror"]=400150
+	},
+	[23002011]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000001
+		},
+		["name_act"]="attack01",
+		["fx_self"]=300050,
+		["fx_self_mirror"]=400000
+	},
+	[23002012]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			1000002
+		},
+		["name_act"]="attack02",
+		["fx_self"]=300051,
+		["fx_self_mirror"]=400001
+	},
+	[23002013]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000003
+		},
+		["name_act"]="attack03",
+		["fx_self"]=300052,
+		["fx_self_mirror"]=400002
+	},
+	[23002014]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000004
+		},
+		["name_act"]="attack04",
+		["fx_self"]=300053,
+		["fx_self_mirror"]=400003
+	},
+	[23002015]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]={
+			2300220
+		},
+		["name_act"]="skill01",
+		["fx_self"]=300054,
+		["bullet_time"]={
+			800,
+			3000,
+			400
+		},
+		["fx_self_mirror"]=400004
 	}
 }
 local config = {
-data=skin_skill,count=25
+data=skin_skill,count=30
 }
 return config

lua/app/config/strings/cn/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="防具"
+	},
+	["runes_open"]={
+		["name"]="符文"
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -515,33 +515,90 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_34"] = "退出将按照当前波次结算，是否退出？",
     ["DUNGEON_RUNE_TITLE"] = "塔中密室",
     ["DUNGEON_RUNE_DESC"] = "挑战极限，获取符文！",
-    ["DUNGEON_RUNE_HELP"] = "1. 每30天为一个周期，每个周期会重置密室探索进度。/n2. 通关后可消耗【银羽毛】重复挑战，争取最小回合数，更新副本排行！/n3. 挑战道具【金羽毛】和重复挑战道具【银羽毛】每日重置。",
+    ["DUNGEON_RUNE_HELP"] = "1. 每天将重置10枚【金羽毛】和10枚【银羽毛】。/n2.挑战未通关层将需要消耗1枚【金羽毛】，通关后可获得1次通关奖励。/n3. 每10层为首领层，首领层通关后可消耗【银羽毛】扫荡获得【符文精粹】。",
     ["DUNGEON_RUNE_MIN"] = "历史通关最小回合数：{0}",
-    ["DUNGEON_RUNE_QUEST_1"] = "{0}回合内通关",
+    ["DUNGEON_RUNE_QUEST_1"] = "{0}回合内完成目标",
-    ["DUNGEON_RUNE_QUEST_2"] = "通关时消除{0}个{1}",
+    ["DUNGEON_RUNE_QUEST_2"] = "消除{0}个{1}",
-    ["DUNGEON_RUNE_QUEST_3"] = "通关时消除{0}个障碍物",
+    ["DUNGEON_RUNE_QUEST_3"] = "消除{0}个此障碍物",
     ["DUNGEON_RUNE_QUEST_4"] = "击杀{0}个小怪",
     ["DUNGEON_RUNE_TIP_1"] = "塔中密室循环结算后，可在此领取奖励。",
     ["DUNGEON_RUNE_TIP_2"] = "还不能放弃……",
-    ["DUNGEON_RUNE_TIP_3"] = "观看广告即刻复活！",
+    ["DUNGEON_RUNE_TIP_3"] = "回合数用完，观看广告获得额外回合！",
     ["DUNGEON_RUNE_TIP_4"] = "血量回复至50%",
     ["DUNGEON_RUNE_TIP_5"] = "回合数+5！",
+    ["DUNGEON_RUNE_TIP_6"] = "生命值为0，观看广告即刻复活！",
     ["UNFINISHED"] = "未完成",
-
+    ["RUNES_DESC_1"] = "符文铸台:{0}级",
-    ["DUNGEON_RUNE_DESC_1"]= "目标",
+    ["RUNES_DESC_2"] = "符文套装",
+    ["RUNES_DESC_3"] = "符文铸台{0}级解锁",
+    ["RUNES_DESC_4"] = "一键淬炼",
+    ["RUNES_DESC_5"] = "淬炼",
+    ["RUNES_DESC_6"] = "符文",
+    ["RUNES_DESC_7"] = "符文铸台等级",
+    ["RUNES_DESC_8"] = "1.消耗符文精粹提升符文铸台等级。\n2.符文铸台等级提升将解锁付文栏，有概率淬炼出高品质符文。\n3.所有英雄符文铸台等级互通。\n4.同一种属性，最多只会出现2条。",
+    ["RUNES_DESC_9"] = "符文套装效果",
+    ["RUNES_DESC_10"] = "生命套装",
+    ["RUNES_DESC_11"] = "攻击套装",
+    ["RUNES_DESC_12"] = "增伤套装",
+    ["RUNES_DESC_13"] = "暴击套装",
+    ["RUNES_DESC_14"] = "爆伤套装",
+    ["RUNES_DESC_15"] = "Lv1:2件套:{0}",
+    ["RUNES_DESC_16"] = "Lv2:4件套:{0}",
+    ["RUNES_DESC_17"] = "符文每日礼包",
+    ["RUNES_DESC_18"] = "强化材料不足",
+    ["RUNES_DESC_19"] = "符文精华不足，洋葱头也没办法",
+    ["RUNES_DESC_20"] = "符文之塔获得",
+    ["RUNES_DESC_21"] = "一键淬炼，只有在出现S和SS符文或符文精粹不足时停止，是否开始？",
+    ["RUNES_DESC_22"] = "符文属性",
+    ["RUNES_DESC_23"] = "无套装效果",
+    ["RUNES_DESC_24"] = "请先激活英雄",
+    ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文",
+    ["RUNES_DESC_26"] = "Lv{0}",
+    ["RUNES_DESC_27"] = "符文铸台{0}级后开启",
+    ["RUNES_DESC_28"] = "您有S级以上的属性未锁定，是否要继续淬炼？",
+    ["RUNES_DESC_29"] = "停止",
+    ["RUNES_DESC_30"] = "自动淬炼中...",
+    ["DUNGEON_RUNE_DESC_1"] = "目标",
     ["DUNGEON_RUNE_DESC_2"] = "再次挑战",
     ["DUNGEON_RUNE_DESC_3"] = "通关获得",
     ["DUNGEON_RUNE_DESC_4"] = "扫荡获得",
     ["DUNGEON_RUNE_DESC_5"] = "通关后可扫荡",
     ["DUNGEON_RUNE_DESC_6"] = "战绩",
-    ["DUNGEON_RUNE_DESC_7"] = "狠心拒绝",
+    ["DUNGEON_RUNE_DESC_7"] = "放弃机会",
     ["DUNGEON_RUNE_DESC_8"] = "本赛季",
     ["DUNGEON_RUNE_DESC_9"] = "上赛季",
     ["DUNGEON_RUNE_DESC_10"] = "最高：{0}",
     ["DUNGEON_RUNE_DESC_11"] = "回合数：{0}",
-
+    ["ACTIVITY_MOON_DESC_1"] = "圆月庆典",
+    ["ACTIVITY_MOON_DESC_2"] = "自选礼包",
+    ["ACTIVITY_MOON_DESC_3"] = "新英雄",
+    ["ACTIVITY_MOON_DESC_4"] = "英雄自选礼包",
+    ["ACTIVITY_MOON_DESC_5"] = "新英雄-女武神",
+    ["ACTIVITY_MOON_DESC_6"] = "请先购买上一礼包",
+    ["ACTIVITY_MOON_DESC_7"] = "英雄自选",
+    ["ACTIVITY_MOON_DESC_8"] = "可自选已激活的英雄",
+    ["ACTIVITY_MOON_DESC_9"] = "圆月庆典皮肤，限时登场！",
+    ["ACTIVITY_MOON_DESC_10"] = "{0}皮肤礼包",
+    ["ACTIVITY_MOON_DESC_11"] = "所有任务均已完成！",
+    ["SEIZED_DESC_4"] = "我们检测到您正在使用非法客户端，您将无法进行游戏，请前往正规应用商店下载。",
     ["ACT_PVP_DESC_1"] = "是否消耗{0}钻石进入酒馆",
-    
+    ["ACT_PVP_DESC_2"] = "进入",
+    ["ACT_PVP_DESC_3"] = "胜场 {0}/{1}  输场{2}/{3}",
+    ["ACT_PVP_DESC_4"] = "酒馆基金",
+    ["ACT_PVP_DESC_5"] = "每日累胜奖励",
+    ["ACT_PVP_DESC_6"] = "梦魇酒馆",
+    ["ACT_PVP_DESC_7"] = "{0}胜",
+    ["ACT_PVP_DESC_8"] = "请选择{0}英雄",
+    ["ACT_PVP_DESC_9"] = "点击英雄可查看详情",
+    ["ACT_PVP_DESC_10"] = "免费刷新",
+    ["ACT_PVP_DESC_11"] = "下轮待选英雄",
+    ["ACT_PVP_DESC_12"] = "选择",
+    ["ACT_PVP_DESC_13"] = "是否消耗{0}钻石刷新",
+    ["ACT_PVP_DESC_14"] = "总胜场数",
+    ["ACT_PVP_DESC_15"] = "酒馆积分",
+    ["ACT_PVP_DESC_16"] = "酒馆描述",
+    ["ACT_PVP_DESC_17"] = "累计胜场",
+    ["ACT_PVP_DESC_18"] = "排行榜帮助",
 }
 
 return localization_global

lua/app/config/strings/cn/hero.lua

@@ -51,7 +51,8 @@ local hero = {
 		["desc"]="手中的太刀如龙飞舞那是无与伦比的剑术。"
 	},
 	[24004]={
-		["name"]="李"
+		["name"]="李",
+		["desc"]="暂时不写，也用不到！"
 	},
 	[32001]={
 		["name"]="洋葱头",
@@ -78,7 +79,8 @@ local hero = {
 		["desc"]="迅猛如风，保护水之王国免受邪恶势力的侵害。"
 	},
 	[34004]={
-		["name"]="绿意之刺"
+		["name"]="绿意之刺",
+		["desc"]="暂时不写，也用不到！"
 	},
 	[42001]={
 		["name"]="冰心",
@@ -105,7 +107,8 @@ local hero = {
 		["desc"]="在她的月轮双刃下，夜晚的星辰在她的指尖舞动，魔法的月光照亮了她无限的智慧~"
 	},
 	[44004]={
-		["name"]="牧魂者"
+		["name"]="牧魂者",
+		["desc"]="暂时不写，也用不到！"
 	},
 	[52001]={
 		["name"]="忍者伦",
@@ -132,7 +135,8 @@ local hero = {
 		["desc"]="曾经王国中最杰出的骑士之一，命运使他堕落成为一名诅咒巨剑的使用者。"
 	},
 	[54004]={
-		["name"]="女武神"
+		["name"]="女武神",
+		["desc"]="暂时不写，也用不到！"
 	}
 }
 local config = {

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

@@ -215,6 +215,10 @@ local item = {
 		["name"]="符文精粹",
 		["desc"]="淬炼符文所用"
 	},
+	[56]={
+		["name"]="圆月",
+		["desc"]="圆月庆典用的任务积分。"
+	},
 	[1001]={
 		["name"]="暗淡陨铁",
 		["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。"
@@ -473,6 +477,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

lua/app/config/strings/cn/monster_base.lua

@@ -318,34 +318,44 @@ local monster_base = {
 		["name"]="遗迹守护者"
 	},
 	[20049]={
-		["name"]="深潜者"
+		["name"]="深潜者",
+		["desc"]="来自黑暗的野兽，他的啃噬让冒险家的每一步都带着【流血】的负面状态。当他的血量低于一定值时，他会陷入癫狂，伤害提升的同时也会让自己受伤加重，抓紧时机，与他速战速决！"
 	},
 	[20050]={
-		["name"]="黑山羊幼崽"
+		["name"]="黑山羊幼崽",
+		["desc"]="它们无穷无尽，死而复生，尽情地释放【腐败】，抓住它们虚弱的一瞬，给予它们致命一击！"
 	},
 	[20051]={
-		["name"]="莎布·尼古拉斯"
+		["name"]="莎布·尼古拉斯",
+		["desc"]="祂并不凶残，但你陷入泥沼奋力挣扎的模样令祂愉悦。"
 	},
 	[20052]={
-		["name"]="奈亚拉托提普"
+		["name"]="奈亚拉托提普",
+		["desc"]="他愤怒，于是手起刀落；他哀怨，于是前进的路上铺满了荆棘；他欢愉，于是赐予治愈；他喜悦，于是藤蔓爬满来者的腿。你无法得知他面具下的真实表情，一如你无法得知他接下来的行动。"
 	},
 	[20053]={
-		["name"]="神秘的兄弟神"
+		["name"]="神秘的兄弟神",
+		["desc"]="他们是一体两面，是铜墙铁壁，也是柔枝嫩条，唯有死亡能够给连枝带去分离。"
 	},
 	[20054]={
-		["name"]="兰·提戈斯"
+		["name"]="兰·提戈斯",
+		["desc"]="邪恶会沉浸于血液带来的快感之中，而你正是为铲除邪恶而来。"
 	},
 	[20055]={
-		["name"]="克希拉"
+		["name"]="克希拉",
+		["desc"]="它是原本密室的守护者，如今已步入失控，混乱地释放魔法保全自己，攻击一切来访者。"
 	},
 	[20056]={
-		["name"]="依德·雅"
+		["name"]="依德·雅",
+		["desc"]="看上去没什么攻击性，但确确实实地拦在了你的路上，或许猛烈且集中的攻势能带走他。"
 	},
 	[20057]={
-		["name"]="旧日支配者"
+		["name"]="旧日支配者",
+		["desc"]="祂只是静静地在那里，压迫感便袭来。祂不欢迎陌生的访者，轻轻抬手，便是一阵腥风血雨。"
 	},
 	[20058]={
-		["name"]="阿撒托斯"
+		["name"]="阿撒托斯",
+		["desc"]="只是凝视着它，你就觉得有什么东西不一样了，记住，一味地莽攻并不可取。"
 	},
 	[30001]={
 		["name"]="洋葱头"

lua/app/config/strings/cn/skill.lua

@@ -90,7 +90,7 @@ local skill = {
 		["desc"]="堕落之剑:额外造成一次大量技能伤害，附加<color=#3cff28><u>腐败</u></color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[1400420]={
-		["desc"]="九尾祥瑞：将周围<color=#3cff28>4</color>个元素变色，并造成多次大量技能伤害。"
+		["desc"]="九尾祥瑞：将周围<color=#3cff28>4</color>个元素变色，并造成一次大量技能伤害。"
 	},
 	[2400420]={
 		["desc"]="啊，打！：使用后本次伤害提升，并额外造成多次大量技能伤害。"
@@ -99,7 +99,7 @@ local skill = {
 		["desc"]="刺杀艺术：使用后本次伤害提升，并额外造成多次大量技能伤害。"
 	},
 	[4400420]={
-		["desc"]="飞棺降物：额外造成一次技能伤害，附加<color=#fcb501><u>冰霜</u></color>效果，<color=#3cff28>1</color>回合。"
+		["desc"]="飞棺降物：额外造成多次技能伤害，附加<color=#fcb501><u>冰霜</u></color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[5400420]={
 		["desc"]="武神意志：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"

lua/app/config/strings/cn/skill_rogue.lua

@@ -852,7 +852,7 @@ local skill_rogue = {
 		["desc"]="堕落之剑附加的<color=#3cff28>昏睡</color>效果，回合数<color=#3cff28>+1</color>。"
 	},
 	[1400400]={
-		["desc"]="解锁九尾祥瑞：将周围<color=#3cff28>4</color>个元素变色，并造成多次大量技能伤害。"
+		["desc"]="解锁九尾祥瑞：将周围<color=#3cff28>4</color>个元素变色，并造成一次大量技能伤害。"
 	},
 	[1400401]={
 		["desc"]="九尾祥瑞可附加<color=#3cff28>魅惑</color>效果，<color=#3cff28>1</color>回合。"
@@ -876,28 +876,28 @@ local skill_rogue = {
 		["desc"]="九尾祥瑞激活所需能量<color=#3cff28>-2</color>。"
 	},
 	[2400400]={
-		["desc"]="解锁双截龙棍：使用后本次伤害提升，并额外造成多次大量技能伤害。"
+		["desc"]="解锁啊，打！：使用后本次伤害提升，并额外造成多次大量技能伤害。"
 	},
 	[2400401]={
-		["desc"]="双截龙棍技能伤害提升。"
+		["desc"]="啊，打！技能伤害提升。"
 	},
 	[2400402]={
-		["desc"]="双截龙棍沿＋方向可额外消除<color=#3cff28>4</color>格。"
+		["desc"]="啊，打！沿＋方向可额外消除<color=#3cff28>4</color>格。"
 	},
 	[2400403]={
 		["desc"]="龙哥普攻有<color=#3cff28>5%</color>概率附加<color=#3cff28>眩晕</color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[2400404]={
-		["desc"]="双截龙棍沿X方向可额外消除<color=#3cff28>4</color>格。"
+		["desc"]="啊，打！沿X方向可额外消除<color=#3cff28>4</color>格。"
 	},
 	[2400405]={
-		["desc"]="双截龙棍可附加<color=#3cff28>流血</color>效果，<color=#3cff28>2</color>回合。"
+		["desc"]="啊，打！可附加<color=#3cff28>流血</color>效果，<color=#3cff28>2</color>回合。"
 	},
 	[2400406]={
 		["desc"]="<color=#fcff28>Combo</color>:龙哥普攻对<color=#3cff28>冰霜</color>和<color=#3cff28>流血</color>敌人额外增伤。"
 	},
 	[2400407]={
-		["desc"]="双截龙棍附加的<color=#3cff28>眩晕</color>效果概率提高至<color=#3cff28>10%</color>，回合数<color=#3cff28>+1</color>。"
+		["desc"]="啊，打！附加的<color=#3cff28>眩晕</color>效果概率提高至<color=#3cff28>10%</color>，回合数<color=#3cff28>+1</color>。"
 	},
 	[3400400]={
 		["desc"]="解锁刺杀艺术：使用后本次伤害提升，并额外造成多次大量技能伤害。"
@@ -924,7 +924,7 @@ local skill_rogue = {
 		["desc"]="绿意之刺链接<color=#3cff28>6</color>个元素及以上时，技能攻击额外释放一次。"
 	},
 	[4400400]={
-		["desc"]="解锁飞棺降物：额外造成一次技能伤害，附加<color=#fcb501>冰霜</color>效果，<color=#3cff28>1</color>回合。"
+		["desc"]="解锁飞棺降物：额外造成多次技能伤害，附加<color=#fcb501>冰霜</color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[4400401]={
 		["desc"]="已逝行者普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。"
@@ -936,7 +936,7 @@ local skill_rogue = {
 		["desc"]="飞棺降物附加的<color=#3cff28>冰霜</color>效果，回合数<color=#3cff28>+1</color>。"
 	},
 	[4400404]={
-		["desc"]="<color=#fcff28>Combo</color>:已逝行者普攻对<color=#3cff28>腐败</color>敌人将恢复生命。"
+		["desc"]="<color=#fcff28>Combo</color>:已逝行者普攻<color=#3cff28>腐败</color>敌人将恢复生命。"
 	},
 	[4400405]={
 		["desc"]="飞棺降物释放后为团队附加<color=#3cff28>重生</color>效果，<color=#3cff28>1</color>回合。"
@@ -954,7 +954,7 @@ local skill_rogue = {
 		["desc"]="武神意志随机消除元素<color=#3cff28>+2</color>。"
 	},
 	[5400402]={
-		["desc"]="<color=#fcff28>Combo</color>:女武神普攻<color=#3cff28>冰霜</color>敌人有<color=#3cff28>10%</color>概率附加<color=#3cff28>冻结</color>效果，1回合。"
+		["desc"]="武神意志使用后将场上随机<color=#3cff28>3</color>个元素变为紫色元素。"
 	},
 	[5400403]={
 		["desc"]="武神意志释放后为团队附加<color=#3cff28>免疫</color>效果，<color=#3cff28>1</color>回合。"
@@ -966,7 +966,7 @@ local skill_rogue = {
 		["desc"]="武神意志附加的<color=#3cff28>免疫</color>效果，回合数<color=#3cff28>+1</color>。"
 	},
 	[5400406]={
-		["desc"]="女武神普攻附加的<color=#3cff28>冻结</color>效果，回合数<color=#3cff28>+1</color>。"
+		["desc"]="武神意志使用后随机增加一种技能的能量<color=#3cff28>2</color>点。"
 	},
 	[5400407]={
 		["desc"]="武神意志释放后为团队附加<color=#3cff28>不死</color>效果，<color=#3cff28>2</color>回合。"

lua/app/config/strings/cn/skin.lua

@@ -35,6 +35,9 @@ local skin = {
 	[23002]={
 		["value"]="初始"
 	},
+	[2300201]={
+		["value"]="Z丫"
+	},
 	[24001]={
 		["value"]="初始"
 	},
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/cn/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="让我们去获取一下防具强化材料吧！"
+	},
+	["tutorial_txt_15"]={
+		["value"]="每名英雄可以最多拥有6个符文。"
+	},
+	["tutorial_txt_16"]={
+		["value"]="符文可以组成套装，提升额外属性。"
+	},
+	["tutorial_txt_17"]={
+		["value"]="符文品质将根据符文铸台的等级提升。"
+	},
+	["tutorial_txt_18"]={
+		["value"]="符文铸台等级所有英雄共享。"
+	},
+	["tutorial_txt_19"]={
+		["value"]="让我们先去获取一下符文材料【符文精粹】吧！"
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/de/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -160,6 +160,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 
@@ -355,6 +358,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

lua/app/config/strings/de/skin.lua

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 
+	},
+	[2300201]={
+
 	},
 	[24001]={
 
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/de/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/en/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="Armor"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Stage {0} Unlocked",
     ["NOT_POP_TODAY"] = "Don't remind me today",
     ["ACT_BOSS_RUSH_DESC_34"] = "When you quit, the battle will be settled according to the current wave, do you quit?",
+    ["SEIZED_DESC_4"] = "We have detected that you are using an illegal client. You cannot continue playing the game. Please download the game from an authorized app store.",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="Dim Meteorite",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Initial"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Initial"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/en/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="Let's obtain some armor enhancement materials first!"
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/es/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="Armadura"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Desbloqueo de la etapa {0}",
     ["NOT_POP_TODAY"] = "No más notas por hoy",
     ["ACT_BOSS_RUSH_DESC_34"] = "¿Después de la salida, la batalla se liquidará de acuerdo con la ola actual, ¿ se retirará?",
+    ["SEIZED_DESC_4"] = "Hemos detectado que estás utilizando un cliente ilegal, que no te permitirá seguir jugando. Por favor descarga la aplicación correcta en la tienda oficial de aplicaciones.",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="Meteorito Opaco",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Inicial"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Inicial"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/es/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="Consigue primero los materiales para refuerzo de armadura."
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/fr/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -160,6 +160,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 
@@ -355,6 +358,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

lua/app/config/strings/fr/skin.lua

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 
+	},
+	[2300201]={
+
 	},
 	[24001]={
 
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/fr/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/id/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="Armor"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} membuka kunci",
     ["NOT_POP_TODAY"] = "Jangan ingatkan lagi hari ini",
     ["ACT_BOSS_RUSH_DESC_34"] = "Setelah keluar, pertempuran akan diselesaikan menurut gelombang saat ini. Apakah Anda ingin keluar?",
+    ["SEIZED_DESC_4"] = "Anda terdeteksi telah menggunakan platform tidak resmi, sehingga Anda tidak akan dapat memainkan game ini. Harap kunjungi aplikasi resmi untuk mengunduh. Terima kasih.",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="Chondrite",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Awal"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Awal"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/id/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="Dapatkan material booster DEF!"
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/ja/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="防具"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "フェーズ{0}ロック解除",
     ["NOT_POP_TODAY"] = "今日は見ない",
     ["ACT_BOSS_RUSH_DESC_34"] = "撤退後は、現在の波次決済に従って戦いますが、撤退しますか？",
+    ["SEIZED_DESC_4"] = "不正なクライアントを使用していることが判明したため、引き続きプレイできません。アプリストアにてゲームをダウンロードしてください。",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="薄暗い隕石",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="デフォルト"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="デフォルト"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/ja/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="防具の強化材料を入手しましょう！"
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/ko/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="방어구"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "{0}단계 잠금 해제",
     ["NOT_POP_TODAY"] = "오늘 더 이상 알림 받지 않음",
     ["ACT_BOSS_RUSH_DESC_34"] = "퇴장 후, 현재 라운드 결산에 따라 전투, 퇴장하시겠습니까?",
+    ["SEIZED_DESC_4"] = "불법 클라이언트 사용이 감지되었습니다. 게임을 진행할 수 없으며 스토어에 가서 공식 게임 어플을 다운 받아 주세요.",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="알렌데 운석",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="초기"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="초기"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/ko/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="함께 방어구 강화 재료를 획득해 보아요!"
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/pt/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="Armadura"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} desbloqueando",
     ["NOT_POP_TODAY"] = "Não me notifique por hoje.",
     ["ACT_BOSS_RUSH_DESC_34"] = "Depois de sair, a batalha será resolvida de acordo com a onda actual. Você quer sair?",
+    ["SEIZED_DESC_4"] = "Detectamos que está operando um programa não oficial e, por isso, você não pode continuar jogando. Por favor, vá até a uma loja de aplicativos oficial para baixar nosso jogo.",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="Ferro Meteórico Opaco",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Inicial"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Inicial"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/pt/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="Vamos buscar alguns materiais de reforço para as armaduras!"
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/ru/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -160,6 +160,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 
@@ -355,6 +358,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

lua/app/config/strings/ru/skin.lua

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 
+	},
+	[2300201]={
+
 	},
 	[24001]={
 
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/ru/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/th/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="เกราะ"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "ขั้นตอนที่ {0} ปลดล็อค",
     ["NOT_POP_TODAY"] = "วันนี้ไม่เตือนอีก",
     ["ACT_BOSS_RUSH_DESC_34"] = "เมื่อออกแล้วจะชำระค่าต่อสู้ตามคลื่นปัจจุบัน จะออกหรือไม่",
+    ["SEIZED_DESC_4"] = "เราตรวจพบว่าคุณกำลังใช้ไคลเอนต์ที่ผิดกฎหมาย คุณจะไม่สามารถเล่นเกมได้ โปรดไปที่ App Store อย่างเป็นทางการเพื่อดาวน์โหลด",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="อุกกาบาตทื่อ",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="เริ่มต้น"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="เริ่มต้น"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/th/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="ไปหาวัสดุตีบวกเกราะกันเถอะ!"
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/vi/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="Phòng Cụ"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Giai đoạn {0} Mở khóa",
     ["NOT_POP_TODAY"] = "Hôm nay không nhắc lại",
     ["ACT_BOSS_RUSH_DESC_34"] = "Sau khi rút lui, sẽ dựa theo sóng hiện tại thanh toán chiến đấu, có rút lui hay không?",
+    ["SEIZED_DESC_4"] = "Chúng tôi phát hiện bạn đang sử dụng client không hợp lệ, không thể vào game được, hãy đến Cửa Hàng ứng dụng chính thống tải về",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="Thiên Thạch Ảm Đạm",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Ban Đầu"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Ban Đầu"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/strings/vi/tutorial.lua

@@ -40,9 +40,24 @@ local tutorial = {
 	},
 	["tutorial_txt_14"]={
 		["value"]="Tiếp theo chúng ta hãy nhận vật liệu cường hóa phòng cụ!"
+	},
+	["tutorial_txt_15"]={
+
+	},
+	["tutorial_txt_16"]={
+
+	},
+	["tutorial_txt_17"]={
+
+	},
+	["tutorial_txt_18"]={
+
+	},
+	["tutorial_txt_19"]={
+
 	}
 }
 local config = {
-data=tutorial,count=14
+data=tutorial,count=19
 }
 return config

lua/app/config/strings/zh/func_open.lua

@@ -52,9 +52,12 @@ local func_open = {
 	},
 	["equip_armor_open"]={
 		["name"]="防具"
+	},
+	["runes_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=18
+data=func_open,count=19
 }
 return config

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

@@ -512,6 +512,7 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "階段{0}解鎖",
     ["NOT_POP_TODAY"] = "今日不再提醒",
     ["ACT_BOSS_RUSH_DESC_34"] = "退出後，將按照當前波次結算戰鬥，是否退出？",
+    ["SEIZED_DESC_4"] = "我們檢測到您正在使用非法客戶端，您將無法進行遊戲，請前往正規應用商店下載。",
 }
 
 return localization_global

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

@@ -211,6 +211,9 @@ local item = {
 	},
 	[55]={
 
+	},
+	[56]={
+
 	},
 	[1001]={
 		["name"]="暗淡隕鐵",
@@ -470,6 +473,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=118
+data=item,count=119
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="初始"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="初始"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config