升级

lua/app/config/act_sevenday_quest_reward.lua

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

lua/app/config/activity.lua

@@ -1,69 +1,331 @@
 local activity = {
-	[10001]={
+	[106]={
+		["act_type"]=1,
+		["start_time"]="2023-08-22 00:00:00",
+		["end_time"]="2023-08-29 00:00:00"
+	},
+	[206]={
 		["act_type"]=2,
-		["time_type"]=1,
+		["start_time"]="2023-09-13 00:00:00",
-		["start_time_1"]=1,
+		["end_time"]="2023-09-21 00:00:00"
-		["end_time_1"]=8,
-		["func_open"]="summon_open",
-		["version"]=1,
-		["round_limit"]=5,
-		["round_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=44,
- 				["id_for_nothing"]="Ugw=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
 	},
-			{
+	[306]={
-				["type"]=1,
+		["act_type"]=3,
- 				["type_for_nothing"]="Vw==",
+		["start_time"]="2023-09-25 00:00:00",
-				["id"]=2,
+		["end_time"]="2023-10-3 00:00:00"
- 				["id_for_nothing"]="VA==",
-				["num"]=1000,
- 				["num_for_nothing"]="VwhcAw=="
-			}
 	},
-		["act_gift"]={
+	[406]={
-			1060000001,
+		["act_type"]=4,
-			1062000001,
+		["start_time"]="2023-09-28 00:00:00",
-			1062000101,
+		["end_time"]="2023-10-08 00:00:00"
-			1062000201,
-			1062000301,
-			1063000001,
-			1063000101
 	},
-		["show_reward"]={
+	[506]={
-			{
+		["act_type"]=2,
-				["type"]=1,
+		["start_time"]="2023-10-2 00:00:00",
- 				["type_for_nothing"]="Vw==",
+		["end_time"]="2023-10-10 00:00:00"
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
 	},
-			{
+	[606]={
-				["type"]=1,
+		["act_type"]=3,
- 				["type_for_nothing"]="Vw==",
+		["start_time"]="2023-10-9 00:00:00",
-				["id"]=5,
+		["end_time"]="2023-10-17 00:00:00"
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
 	},
-			{
+	[706]={
-				["type"]=1,
+		["act_type"]=5,
- 				["type_for_nothing"]="Vw==",
+		["start_time"]="2023-10-16 00:00:00",
-				["id"]=6,
+		["end_time"]="2023-10-25 00:00:00"
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
 	},
-		["act_name"]="ACT_GOGOGO_DESC_21"
+	[806]={
+		["act_type"]=2,
+		["start_time"]="2023-10-24 00:00:00",
+		["end_time"]="2023-11-01 00:00:00"
+	},
+	[906]={
+		["act_type"]=6,
+		["start_time"]="2023-10-31 00:00:00",
+		["end_time"]="2023-11-09 00:00:00"
+	},
+	[1006]={
+		["act_type"]=3,
+		["start_time"]="2023-11-8 00:00:00",
+		["end_time"]="2023-11-16 00:00:00"
+	},
+	[1106]={
+		["act_type"]=5,
+		["start_time"]="2023-11-15 00:00:00",
+		["end_time"]="2023-11-24 00:00:00"
+	},
+	[1206]={
+		["act_type"]=2,
+		["start_time"]="2023-11-23 00:00:00",
+		["end_time"]="2023-12-01 00:00:00"
+	},
+	[1306]={
+		["act_type"]=6,
+		["start_time"]="2023-11-30 00:00:00",
+		["end_time"]="2023-12-09 00:00:00"
+	},
+	[1406]={
+		["act_type"]=3,
+		["start_time"]="2023-12-8 00:00:00",
+		["end_time"]="2023-12-16 00:00:00"
+	},
+	[1506]={
+		["act_type"]=5,
+		["start_time"]="2023-12-15 00:00:00",
+		["end_time"]="2023-12-24 00:00:00"
+	},
+	[1606]={
+		["act_type"]=2,
+		["start_time"]="2023-12-23 00:00:00",
+		["end_time"]="2023-12-31 00:00:00"
+	},
+	[1706]={
+		["act_type"]=6,
+		["start_time"]="2023-12-30 00:00:00",
+		["end_time"]="2024-01-08 00:00:00"
+	},
+	[1806]={
+		["act_type"]=3,
+		["start_time"]="2024-01-07 00:00:00",
+		["end_time"]="2024-01-15 00:00:00"
+	},
+	[1906]={
+		["act_type"]=5,
+		["start_time"]="2024-01-14 00:00:00",
+		["end_time"]="2024-01-23 00:00:00"
+	},
+	[2006]={
+		["act_type"]=2,
+		["start_time"]="2024-01-22 00:00:00",
+		["end_time"]="2024-01-30 00:00:00"
+	},
+	[2106]={
+		["act_type"]=6,
+		["start_time"]="2024-01-29 00:00:00",
+		["end_time"]="2024-02-07 00:00:00"
+	},
+	[2206]={
+		["act_type"]=3,
+		["start_time"]="2024-02-06 00:00:00",
+		["end_time"]="2024-02-14 00:00:00"
+	},
+	[2306]={
+		["act_type"]=5,
+		["start_time"]="2024-02-13 00:00:00",
+		["end_time"]="2024-02-22 00:00:00"
+	},
+	[2406]={
+		["act_type"]=2,
+		["start_time"]="2024-02-21 00:00:00",
+		["end_time"]="2024-02-29 00:00:00"
+	},
+	[2506]={
+		["act_type"]=6,
+		["start_time"]="2024-02-28 00:00:00",
+		["end_time"]="2024-03-08 00:00:00"
+	},
+	[2606]={
+		["act_type"]=3,
+		["start_time"]="2024-03-07 00:00:00",
+		["end_time"]="2024-03-15 00:00:00"
+	},
+	[2706]={
+		["act_type"]=5,
+		["start_time"]="2024-03-14 00:00:00",
+		["end_time"]="2024-03-23 00:00:00"
+	},
+	[2806]={
+		["act_type"]=2,
+		["start_time"]="2024-03-22 00:00:00",
+		["end_time"]="2024-03-30 00:00:00"
+	},
+	[2906]={
+		["act_type"]=6,
+		["start_time"]="2024-03-29 00:00:00",
+		["end_time"]="2024-04-07 00:00:00"
+	},
+	[3006]={
+		["act_type"]=3,
+		["start_time"]="2024-04-06 00:00:00",
+		["end_time"]="2024-04-14 00:00:00"
+	},
+	[3106]={
+		["act_type"]=5,
+		["start_time"]="2024-04-13 00:00:00",
+		["end_time"]="2024-04-22 00:00:00"
+	},
+	[3206]={
+		["act_type"]=2,
+		["start_time"]="2024-04-21 00:00:00",
+		["end_time"]="2024-04-29 00:00:00"
+	},
+	[3306]={
+		["act_type"]=6,
+		["start_time"]="2024-04-28 00:00:00",
+		["end_time"]="2024-05-07 00:00:00"
+	},
+	[3406]={
+		["act_type"]=3,
+		["start_time"]="2024-05-06 00:00:00",
+		["end_time"]="2024-05-14 00:00:00"
+	},
+	[3506]={
+		["act_type"]=5,
+		["start_time"]="2024-05-13 00:00:00",
+		["end_time"]="2024-05-22 00:00:00"
+	},
+	[3606]={
+		["act_type"]=2,
+		["start_time"]="2024-05-21 00:00:00",
+		["end_time"]="2024-05-29 00:00:00"
+	},
+	[3706]={
+		["act_type"]=6,
+		["start_time"]="2024-05-28 00:00:00",
+		["end_time"]="2024-06-06 00:00:00"
+	},
+	[3806]={
+		["act_type"]=3,
+		["start_time"]="2024-06-05 00:00:00",
+		["end_time"]="2024-06-13 00:00:00"
+	},
+	[3906]={
+		["act_type"]=5,
+		["start_time"]="2024-06-12 00:00:00",
+		["end_time"]="2024-06-21 00:00:00"
+	},
+	[4006]={
+		["act_type"]=2,
+		["start_time"]="2024-06-20 00:00:00",
+		["end_time"]="2024-06-28 00:00:00"
+	},
+	[4106]={
+		["act_type"]=6,
+		["start_time"]="2024-06-27 00:00:00",
+		["end_time"]="2024-07-06 00:00:00"
+	},
+	[4206]={
+		["act_type"]=3,
+		["start_time"]="2024-07-05 00:00:00",
+		["end_time"]="2024-07-13 00:00:00"
+	},
+	[4306]={
+		["act_type"]=5,
+		["start_time"]="2024-07-12 00:00:00",
+		["end_time"]="2024-07-21 00:00:00"
+	},
+	[4406]={
+		["act_type"]=2,
+		["start_time"]="2024-07-20 00:00:00",
+		["end_time"]="2024-07-28 00:00:00"
+	},
+	[4506]={
+		["act_type"]=6,
+		["start_time"]="2024-07-27 00:00:00",
+		["end_time"]="2024-08-05 00:00:00"
+	},
+	[4606]={
+		["act_type"]=3,
+		["start_time"]="2024-08-04 00:00:00",
+		["end_time"]="2024-08-12 00:00:00"
+	},
+	[4706]={
+		["act_type"]=5,
+		["start_time"]="2024-08-11 00:00:00",
+		["end_time"]="2024-08-20 00:00:00"
+	},
+	[4806]={
+		["act_type"]=2,
+		["start_time"]="2024-08-19 00:00:00",
+		["end_time"]="2024-08-27 00:00:00"
+	},
+	[4906]={
+		["act_type"]=6,
+		["start_time"]="2024-08-26 00:00:00",
+		["end_time"]="2024-09-04 00:00:00"
+	},
+	[5006]={
+		["act_type"]=3,
+		["start_time"]="2024-09-03 00:00:00",
+		["end_time"]="2024-09-11 00:00:00"
+	},
+	[5106]={
+		["act_type"]=5,
+		["start_time"]="2024-09-10 00:00:00",
+		["end_time"]="2024-09-19 00:00:00"
+	},
+	[5206]={
+		["act_type"]=2,
+		["start_time"]="2024-09-18 00:00:00",
+		["end_time"]="2024-09-26 00:00:00"
+	},
+	[5306]={
+		["act_type"]=6,
+		["start_time"]="2024-09-25 00:00:00",
+		["end_time"]="2024-10-04 00:00:00"
+	},
+	[5406]={
+		["act_type"]=3,
+		["start_time"]="2024-10-03 00:00:00",
+		["end_time"]="2024-10-11 00:00:00"
+	},
+	[5506]={
+		["act_type"]=5,
+		["start_time"]="2024-10-10 00:00:00",
+		["end_time"]="2024-10-19 00:00:00"
+	},
+	[5606]={
+		["act_type"]=2,
+		["start_time"]="2024-10-18 00:00:00",
+		["end_time"]="2024-10-26 00:00:00"
+	},
+	[5706]={
+		["act_type"]=6,
+		["start_time"]="2024-10-25 00:00:00",
+		["end_time"]="2024-11-03 00:00:00"
+	},
+	[5806]={
+		["act_type"]=3,
+		["start_time"]="2024-11-02 00:00:00",
+		["end_time"]="2024-11-10 00:00:00"
+	},
+	[5906]={
+		["act_type"]=5,
+		["start_time"]="2024-11-09 00:00:00",
+		["end_time"]="2024-11-18 00:00:00"
+	},
+	[6006]={
+		["act_type"]=2,
+		["start_time"]="2024-11-17 00:00:00",
+		["end_time"]="2024-11-25 00:00:00"
+	},
+	[6106]={
+		["act_type"]=6,
+		["start_time"]="2024-11-24 00:00:00",
+		["end_time"]="2024-12-03 00:00:00"
+	},
+	[6206]={
+		["act_type"]=3,
+		["start_time"]="2024-12-02 00:00:00",
+		["end_time"]="2024-12-10 00:00:00"
+	},
+	[6306]={
+		["act_type"]=5,
+		["start_time"]="2024-12-09 00:00:00",
+		["end_time"]="2024-12-18 00:00:00"
+	},
+	[6406]={
+		["act_type"]=2,
+		["start_time"]="2024-12-17 00:00:00",
+		["end_time"]="2024-12-25 00:00:00"
+	},
+	[6506]={
+		["act_type"]=6,
+		["start_time"]="2024-12-24 00:00:00",
+		["end_time"]="2025-01-02 00:00:00"
 	}
 }
 local config = {
-data=activity,count=1
+data=activity,count=65
 }
 return config

lua/app/config/attr.lua

@@ -443,6 +443,12 @@ local attr = {
 		["id"]=79,
 		["name"]="dmgdec",
 		["power"]=50
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all",
+		["power"]=50,
+		["is_percent"]=1
 	}
 }
 local keys = {
@@ -525,12 +531,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

lua/app/config/buff.lua

@@ -328,7 +328,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="high",
+		["icon"]="normal_attack_add",
 		["show_name"]=true,
 		["fx_get"]={
 			30
@@ -972,7 +972,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="high",
+		["icon"]="normal_attack_add",
 		["show_name"]=true,
 		["fx_get"]={
 			30
@@ -983,8 +983,7 @@ local buff = {
 		["name"]="forever_uncontrolled",
 		["buff_type"]=7,
 		["decr"]=1,
-		["icon"]="immune",
+		["icon"]="immune"
-		["show_name"]=true
 	}
 }
 local keys = {

lua/app/config/chapter_board_daily_challenge.lua

@@ -2978,16 +2978,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,
@@ -4178,16 +4178,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,
@@ -5378,16 +5378,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,
@@ -6578,16 +6578,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,
@@ -7778,16 +7778,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,
@@ -8978,16 +8978,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,
@@ -10178,16 +10178,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,
@@ -11378,16 +11378,16 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				13,
+				1,
-				5
+				0
 			},
 			{
-				13,
+				1,
-				1
+				0
 			},
 			{
-				13,
+				1,
-				2
+				0
 			},
 			{
 				1,

lua/app/config/daily_challenge_level.lua

@@ -76,10 +76,10 @@ local daily_challenge_level = {
 				{
 					["type"]=1,
  					["type_for_nothing"]="Vw==",
-					["id"]=6,
+					["id"]=2,
- 					["id_for_nothing"]="UA==",
+ 					["id_for_nothing"]="VA==",
-					["num"]=1,
+					["num"]=50,
- 					["num_for_nothing"]="Vw=="
+ 					["num_for_nothing"]="Uwg="
 				},
 				{
 					["type"]=1,
@@ -100,8 +100,8 @@ local daily_challenge_level = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			272222,
+			73333,
-			73333
+			8333
 		}
 	},
 	[2]={
@@ -181,10 +181,10 @@ local daily_challenge_level = {
 				{
 					["type"]=1,
  					["type_for_nothing"]="Vw==",
-					["id"]=6,
+					["id"]=2,
- 					["id_for_nothing"]="UA==",
+ 					["id_for_nothing"]="VA==",
-					["num"]=1,
+					["num"]=50,
- 					["num_for_nothing"]="Vw=="
+ 					["num_for_nothing"]="Uwg="
 				},
 				{
 					["type"]=1,
@@ -205,8 +205,8 @@ local daily_challenge_level = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			335556,
+			146667,
-			146667
+			24556
 		}
 	},
 	[3]={
@@ -286,10 +286,10 @@ local daily_challenge_level = {
 				{
 					["type"]=1,
  					["type_for_nothing"]="Vw==",
-					["id"]=6,
+					["id"]=2,
- 					["id_for_nothing"]="UA==",
+ 					["id_for_nothing"]="VA==",
-					["num"]=1,
+					["num"]=50,
- 					["num_for_nothing"]="Vw=="
+ 					["num_for_nothing"]="Uwg="
 				},
 				{
 					["type"]=1,
@@ -310,8 +310,8 @@ local daily_challenge_level = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			438889,
+			226667,
-			226667
+			34889
 		}
 	},
 	[4]={
@@ -391,10 +391,10 @@ local daily_challenge_level = {
 				{
 					["type"]=1,
  					["type_for_nothing"]="Vw==",
-					["id"]=6,
+					["id"]=2,
- 					["id_for_nothing"]="UA==",
+ 					["id_for_nothing"]="VA==",
-					["num"]=1,
+					["num"]=50,
- 					["num_for_nothing"]="Vw=="
+ 					["num_for_nothing"]="Uwg="
 				},
 				{
 					["type"]=1,
@@ -415,8 +415,8 @@ local daily_challenge_level = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			552222,
+			374444,
-			374444
+			46222
 		}
 	},
 	[5]={
@@ -496,10 +496,10 @@ local daily_challenge_level = {
 				{
 					["type"]=1,
  					["type_for_nothing"]="Vw==",
-					["id"]=6,
+					["id"]=2,
- 					["id_for_nothing"]="UA==",
+ 					["id_for_nothing"]="VA==",
-					["num"]=1,
+					["num"]=50,
- 					["num_for_nothing"]="Vw=="
+ 					["num_for_nothing"]="Uwg="
 				},
 				{
 					["type"]=1,
@@ -520,8 +520,8 @@ local daily_challenge_level = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			642222,
+			633333,
-			633333
+			55222
 		}
 	},
 	[6]={
@@ -601,10 +601,10 @@ local daily_challenge_level = {
 				{
 					["type"]=1,
  					["type_for_nothing"]="Vw==",
-					["id"]=6,
+					["id"]=2,
- 					["id_for_nothing"]="UA==",
+ 					["id_for_nothing"]="VA==",
-					["num"]=1,
+					["num"]=50,
- 					["num_for_nothing"]="Vw=="
+ 					["num_for_nothing"]="Uwg="
 				},
 				{
 					["type"]=1,
@@ -625,8 +625,8 @@ local daily_challenge_level = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			738889,
+			985556,
-			985556
+			64889
 		}
 	},
 	[7]={
@@ -706,10 +706,10 @@ local daily_challenge_level = {
 				{
 					["type"]=1,
  					["type_for_nothing"]="Vw==",
-					["id"]=6,
+					["id"]=2,
- 					["id_for_nothing"]="UA==",
+ 					["id_for_nothing"]="VA==",
-					["num"]=1,
+					["num"]=50,
- 					["num_for_nothing"]="Vw=="
+ 					["num_for_nothing"]="Uwg="
 				},
 				{
 					["type"]=1,
@@ -730,8 +730,8 @@ local daily_challenge_level = {
 			}
 		},
 		["daily_challenge_difficulty"]={
-			1012222,
+			2140000,
-			2140000
+			92222
 		}
 	}
 }

lua/app/config/func_open.lua

@@ -1,20 +1,40 @@
 local func_open = {
+	["act_gold_pig"]={
+		["stage"]=3,
+		["pop_ups"]=1
+	},
+	["bounty_open"]={
+		["stage"]=3,
+		["pop_ups"]=1
+	},
 	["task"]={
 		["stage"]=3,
 		["icon"]="module_unlock_task"
 	},
+	["act_level_gift"]={
+		["level"]=999,
+		["icon"]="module_unlock_fund"
+	},
 	["idle_drop"]={
 		["stage"]=2,
 		["icon"]="module_unlock_idle"
 	},
+	["act_sevenday"]={
+		["stage"]=999,
+		["icon"]="module_unlock_sevenday"
+	},
 	["mall"]={
 		["stage"]=2,
 		["pop_ups"]=1
 	},
 	["mall_daily"]={
-		["stage"]=2,
+		["stage"]=999,
 		["icon"]="module_unlock_dailyshop"
 	},
+	["store_box_open"]={
+		["stage"]=2,
+		["pop_ups"]=1
+	},
 	["store_box_3_open"]={
 		["stage"]=5,
 		["pop_ups"]=1
@@ -23,10 +43,30 @@ local func_open = {
 		["stage"]=11,
 		["icon"]="module_unlock_dailychallenge"
 	},
+	["act_gift_show_open"]={
+		["stage"]=2,
+		["pop_ups"]=1
+	},
+	["first_charge"]={
+		["stage"]=2,
+		["pop_ups"]=1
+	},
+	["new_player_gift"]={
+		["stage"]=2,
+		["pop_ups"]=1
+	},
 	["mail_open"]={
 		["stage"]=2,
 		["pop_ups"]=1
 	},
+	["dungeon_gold_open"]={
+		["stage"]=6,
+		["pop_ups"]=1
+	},
+	["dungeon_shards_open"]={
+		["stage"]=6,
+		["pop_ups"]=1
+	},
 	["arena_open"]={
 		["stage"]=15,
 		["icon"]="module_unlock_arena"
@@ -35,6 +75,42 @@ local func_open = {
 		["stage"]=15,
 		["pop_ups"]=1
 	},
+	["equip_weapon_open"]={
+		["stage"]=999,
+		["icon"]="module_unlock_weapon"
+	},
+	["equip_armor_open"]={
+		["stage"]=999,
+		["icon"]="module_unlock_equip"
+	},
+	["collection_open"]={
+		["stage"]=5,
+		["pop_ups"]=1
+	},
+	["dungeon_weapon_open"]={
+		["stage"]=8,
+		["pop_ups"]=1
+	},
+	["dungeon_armor_open"]={
+		["stage"]=10,
+		["pop_ups"]=1
+	},
+	["skin_open"]={
+		["stage"]=4,
+		["pop_ups"]=1
+	},
+	["activity_open"]={
+		["stage"]=4,
+		["pop_ups"]=1
+	},
+	["runes_open"]={
+		["stage"]=12,
+		["pop_ups"]=1
+	},
+	["hero_equip"]={
+		["stage"]=4,
+		["icon"]="module_unlock_arena"
+	},
 	["company_open"]={
 		["stage"]=2,
 		["pop_ups"]=1
@@ -50,57 +126,9 @@ local func_open = {
 	["summon_open"]={
 		["stage"]=1,
 		["pop_ups"]=1
-	},
-	["first_charge_1"]={
-		["stage"]=1
-	},
-	["first_charge_2"]={
-		["stage"]=1,
-		["time"]=2
-	},
-	["first_charge_3"]={
-		["stage"]=18,
-		["time"]=3
-	},
-	["card_ad"]={
-		["stage"]=2
-	},
-	["card_monthly"]={
-		["level"]=4
-	},
-	["act_sevenday"]={
-		["stage"]=2
-	},
-	["dungeon_gold"]={
-		["stage"]=6,
-		["pop_ups"]=1,
-		["icon"]="module_5"
-	},
-	["dungeon_res"]={
-		["stage"]=6
-	},
-	["signin_bounty"]={
-		["stage"]=8
-	},
-	["signin_30"]={
-		["stage"]=3
-	},
-	["act_gogogo"]={
-		["stage"]=2
-	},
-	["hero_equip"]={
-		["stage"]=13,
-		["pop_ups"]=1,
-		["icon"]="module_9"
-	},
-	["act_level_gift"]={
-		["level"]=3
-	},
-	["fund_chapter"]={
-		["stage"]=2
 	}
 }
 local config = {
-data=func_open,count=27
+data=func_open,count=32
 }
 return config

lua/app/config/fx.lua

@@ -759,6 +759,74 @@ local fx = {
 		["res"]="sfx_c1_p45001_05",
 		["bind"]="root"
 	},
+	[300074]={
+		["res"]="sfx_c1_p44001_01",
+		["bind"]="root"
+	},
+	[300075]={
+		["res"]="sfx_c1_p44001_02",
+		["bind"]="root"
+	},
+	[300076]={
+		["res"]="sfx_c1_p24001_01",
+		["bind"]="root"
+	},
+	[300077]={
+		["res"]="sfx_c1_p24001_02",
+		["bind"]="root"
+	},
+	[300078]={
+		["res"]="sfx_c1_p24001_03",
+		["bind"]="root"
+	},
+	[300079]={
+		["res"]="sfx_c1_p24001_04",
+		["bind"]="root"
+	},
+	[300080]={
+		["res"]="sfx_c1_p24001_05",
+		["bind"]="root"
+	},
+	[300081]={
+		["res"]="sfx_c1_p25001_01",
+		["bind"]="root"
+	},
+	[300082]={
+		["res"]="sfx_c1_p25001_02",
+		["bind"]="root"
+	},
+	[300083]={
+		["res"]="sfx_c1_p25001_03",
+		["bind"]="root"
+	},
+	[300084]={
+		["res"]="sfx_c1_p25001_04",
+		["bind"]="root"
+	},
+	[300085]={
+		["res"]="sfx_c1_p25001_05",
+		["bind"]="root"
+	},
+	[300086]={
+		["res"]="sfx_c1_p35002_01",
+		["bind"]="root"
+	},
+	[300087]={
+		["res"]="sfx_c1_p35002_02",
+		["bind"]="root"
+	},
+	[300088]={
+		["res"]="sfx_c1_p35002_03",
+		["bind"]="root"
+	},
+	[300089]={
+		["res"]="sfx_c1_p35002_04",
+		["bind"]="root"
+	},
+	[300090]={
+		["res"]="sfx_c1_p35002_05",
+		["bind"]="root"
+	},
 	[400001]={
 		["res"]="sfx_c1_p45002_01",
 		["bind"]="root",
@@ -1093,9 +1161,94 @@ local fx = {
 		["res"]="sfx_c1_p45001_05",
 		["bind"]="root",
 		["flip"]=1
+	},
+	[400074]={
+		["res"]="sfx_c1_p44001_01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400075]={
+		["res"]="sfx_c1_p44001_02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400076]={
+		["res"]="sfx_c1_p24001_01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400077]={
+		["res"]="sfx_c1_p24001_02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400078]={
+		["res"]="sfx_c1_p24001_03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400079]={
+		["res"]="sfx_c1_p24001_04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400080]={
+		["res"]="sfx_c1_p24001_05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400081]={
+		["res"]="sfx_c1_p25001_01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400082]={
+		["res"]="sfx_c1_p25001_02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400083]={
+		["res"]="sfx_c1_p25001_03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400084]={
+		["res"]="sfx_c1_p25001_04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400085]={
+		["res"]="sfx_c1_p25001_05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400086]={
+		["res"]="sfx_c1_p35002_01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400087]={
+		["res"]="sfx_c1_p35002_02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400088]={
+		["res"]="sfx_c1_p35002_03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400089]={
+		["res"]="sfx_c1_p35002_04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400090]={
+		["res"]="sfx_c1_p35002_05",
+		["bind"]="root",
+		["flip"]=1
 	}
 }
 local config = {
-data=fx,count=253
+data=fx,count=287
 }
 return config

lua/app/config/hero_star.lua

@@ -1,272 +1,692 @@
 local hero_star = {
 	[1]={
-		["cost_3"]={
+		["cost_3"]=1,
-			30,
+		["cost_4"]=1,
-			5
+		["cost_5"]=1,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			30,
+				["type"]="attr_hpp_all",
-			5
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			30,
+			{
-			5
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			30,
+				["type"]="attr_hpp_all",
-			5
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[2]={
-		["cost_3"]={
+		["cost_3"]=3,
-			40,
+		["cost_4"]=2,
-			14
+		["cost_5"]=1,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			40,
+				["type"]="attr_hpp_all",
-			14
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			40,
+			{
-			10
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			40,
+				["type"]="attr_hpp_all",
-			10
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[3]={
-		["cost_3"]={
+		["cost_3"]=5,
-			55,
+		["cost_4"]=4,
-			23
+		["cost_5"]=2,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			55,
+				["type"]="attr_hpp_all",
-			23
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			55,
+			{
-			15
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			55,
+				["type"]="attr_hpp_all",
-			15
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[4]={
-		["cost_3"]={
+		["cost_3"]=7,
-			70,
+		["cost_4"]=6,
-			32
+		["cost_5"]=3,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			70,
+				["type"]="attr_hpp_all",
-			32
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			70,
+			{
-			20
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			70,
+				["type"]="attr_hpp_all",
-			20
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[5]={
-		["cost_3"]={
+		["cost_3"]=10,
-			85,
+		["cost_4"]=8,
-			40
+		["cost_5"]=4,
+		["cost_6"]=1,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			85,
+				["type"]="attr_hpp_all",
-			40
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			85,
+			{
-			25
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			85,
+				["type"]="attr_hpp_all",
-			25
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[6]={
-		["cost_3"]={
+		["cost_3"]=20,
-			100,
+		["cost_4"]=12,
-			49
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			100,
+				["type"]="attr_hpp_all",
-			49
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			100,
+			{
-			30
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			100,
+				["type"]="attr_hpp_all",
-			30
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[7]={
-		["cost_3"]={
+		["cost_3"]=30,
-			115,
+		["cost_4"]=16,
-			58
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			115,
+				["type"]="attr_hpp_all",
-			58
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			115,
+			{
-			35
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			115,
+				["type"]="attr_hpp_all",
-			35
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[8]={
-		["cost_3"]={
+		["cost_3"]=40,
-			130,
+		["cost_4"]=20,
-			67
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			130,
+				["type"]="attr_hpp_all",
-			67
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			130,
+			{
-			40
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			130,
+				["type"]="attr_hpp_all",
-			40
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[9]={
-		["cost_3"]={
+		["cost_3"]=60,
-			145,
+		["cost_4"]=25,
-			75
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			145,
+				["type"]="attr_hpp_all",
-			75
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			145,
+			{
-			45
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			145,
+				["type"]="attr_hpp_all",
-			45
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[10]={
-		["cost_3"]={
+		["cost_3"]=80,
-			160,
+		["cost_4"]=30,
-			84
+		["cost_5"]=5,
+		["cost_6"]=2,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			160,
+				["type"]="attr_hpp_all",
-			84
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			160,
+			{
-			50
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			160,
+				["type"]="attr_hpp_all",
-			50
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[11]={
-		["cost_3"]={
+		["cost_3"]=120,
-			175,
+		["cost_4"]=40,
-			93
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			175,
+				["type"]="attr_hpp_all",
-			93
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			175,
+			{
-			56
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			175,
+				["type"]="attr_hpp_all",
-			56
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[12]={
-		["cost_3"]={
+		["cost_3"]=140,
-			200,
+		["cost_4"]=60,
-			102
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			200,
+				["type"]="attr_hpp_all",
-			102
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			200,
+			{
-			62
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			200,
+				["type"]="attr_hpp_all",
-			62
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[13]={
-		["cost_3"]={
+		["cost_3"]=160,
-			225,
+		["cost_4"]=90,
-			110
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			225,
+				["type"]="attr_hpp_all",
-			110
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			225,
+			{
-			68
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			225,
+				["type"]="attr_hpp_all",
-			68
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[14]={
-		["cost_3"]={
+		["cost_3"]=180,
-			250,
+		["cost_4"]=120,
-			120
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			250,
+				["type"]="attr_hpp_all",
-			120
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			250,
+			{
-			76
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			250,
+				["type"]="attr_hpp_all",
-			76
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	},
 	[15]={
-		["cost_3"]={
+		["cost_3"]=200,
-			275,
+		["cost_4"]=150,
-			130
+		["cost_5"]=10,
+		["cost_6"]=3,
+		["attr_3"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=10
 			},
-		["cost_4"]={
+			{
-			275,
+				["type"]="attr_hpp_all",
-			130
+				["num"]=10
+			}
 		},
-		["cost_5"]={
+		["attr_4"]={
-			275,
+			{
-			85
+				["type"]="attr_atkp_all",
+				["num"]=20
 			},
-		["cost_6"]={
+			{
-			275,
+				["type"]="attr_hpp_all",
-			85
+				["num"]=20
+			}
+		},
+		["attr_5"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=30
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=30
+			}
+		},
+		["attr_6"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=50
+			},
+			{
+				["type"]="attr_hpp_all",
+				["num"]=50
+			}
 		}
 	}
 }

lua/app/config/item.lua

@@ -1148,6 +1148,11 @@ local item = {
 		["qlt"]=5,
 		["icon"]="45"
 	},
+	[46]={
+		["type"]=1,
+		["qlt"]=5,
+		["icon"]="46"
+	},
 	[13001]={
 		["type"]=5,
 		["inbag"]=1,

lua/app/config/mall_gold.lua

@@ -5,19 +5,19 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=1500,
+			["num"]=5500,
- 			["num_for_nothing"]="Vw1cAw=="
+ 			["num_for_nothing"]="Uw1cAw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=60,
+			["num"]=25,
- 			["num_for_nothing"]="UAg="
+ 			["num_for_nothing"]="VA0="
 		},
-		["daily_ad"]=2,
+		["free_times"]=1,
-		["daily_free"]=1
+		["ad_times"]=1
 	},
 	[2]={
 		["gold"]={
@@ -25,16 +25,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=7500,
+			["num"]=22000,
- 			["num_for_nothing"]="UQ1cAw=="
+ 			["num_for_nothing"]="VApcA2U="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=300,
+			["num"]=100,
- 			["num_for_nothing"]="VQhc"
+ 			["num_for_nothing"]="Vwhc"
 		}
 	},
 	[3]={
@@ -43,16 +43,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=75000,
+			["num"]=110000,
- 			["num_for_nothing"]="UQ1cA2U="
+ 			["num_for_nothing"]="VwlcA2VR"
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=3000,
+			["num"]=450,
- 			["num_for_nothing"]="VQhcAw=="
+ 			["num_for_nothing"]="Ug1c"
 		}
 	}
 }

lua/app/config/mall_treasure.lua

@@ -7,28 +7,28 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=120,
+				["num"]=80,
- 				["num_for_nothing"]="Vwpc"
+ 				["num_for_nothing"]="Xgg="
 			}
 		},
 		["limit"]=1
 	},
 	[2]={
-		["recharge_id"]=5,
+		["recharge_id"]=4,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=600,
+				["num"]=500,
- 				["num_for_nothing"]="UAhc"
+ 				["num_for_nothing"]="Uwhc"
 			}
 		},
 		["limit"]=1
 	},
 	[3]={
-		["recharge_id"]=10,
+		["recharge_id"]=5,
 		["reward"]={
 			{
 				["type"]=1,
@@ -39,49 +39,49 @@ local mall_treasure = {
  				["num_for_nothing"]="VwpcAw=="
 			}
 		},
-		["limit"]=1
+		["limit"]=2
 	},
 	[4]={
-		["recharge_id"]=13,
+		["recharge_id"]=7,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=2400,
+				["num"]=2500,
- 				["num_for_nothing"]="VAxcAw=="
+ 				["num_for_nothing"]="VA1cAw=="
 			}
 		},
-		["limit"]=1
+		["limit"]=2
 	},
 	[5]={
-		["recharge_id"]=16,
+		["recharge_id"]=10,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=6000,
+				["num"]=6500,
- 				["num_for_nothing"]="UAhcAw=="
+ 				["num_for_nothing"]="UA1cAw=="
 			}
 		},
-		["limit"]=1
+		["limit"]=3
 	},
 	[6]={
-		["recharge_id"]=18,
+		["recharge_id"]=12,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=12000,
+				["num"]=14000,
- 				["num_for_nothing"]="VwpcA2U="
+ 				["num_for_nothing"]="VwxcA2U="
 			}
 		},
-		["limit"]=1
+		["limit"]=3
 	}
 }
 local config = {

lua/app/config/strings/cn/attr.lua

@@ -106,27 +106,27 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="攻击力提升{0}%",
+		["desc"]="{0}攻击力提升{1}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="攻击力提升{0}%",
+		["desc"]="{0}攻击力提升{1}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="攻击力提升{0}%",
+		["desc"]="{0}攻击力提升{1}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="攻击力提升{0}%",
+		["desc"]="{0}攻击力提升{1}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="攻击力提升{0}%",
+		["desc"]="{0}攻击力提升{1}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -331,68 +331,73 @@ local attr = {
 	},
 	[67]={
 		["id"]=67,
-		["desc"]="全体攻击",
+		["desc"]="攻击+{0}",
 		["name"]="atk_all"
 	},
 	[68]={
 		["id"]=68,
-		["desc"]="全体生命",
+		["desc"]="生命+{0}",
 		["name"]="attr_hp_all"
 	},
 	[69]={
 		["id"]=69,
-		["desc"]="全体减伤",
+		["desc"]="减伤+{0}",
 		["name"]="attr_dmgdec_all"
 	},
 	[70]={
 		["id"]=70,
-		["desc"]="全体暴击率",
+		["desc"]="暴击率+{0}%",
 		["name"]="attr_crit_all"
 	},
 	[71]={
 		["id"]=71,
-		["desc"]="全体暴击伤害",
+		["desc"]="暴击伤害+{0}%",
 		["name"]="attr_crit_time_all"
 	},
 	[72]={
 		["id"]=72,
-		["desc"]="全体普攻增伤",
+		["desc"]="普攻增伤+{0}%",
 		["name"]="attr_normal_hurtp_all"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="全体技能增伤",
+		["desc"]="技能增伤+{0}%",
 		["name"]="attr_skill_hurtp_all"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="全体攻击",
+		["desc"]="攻击+{0}%",
 		["name"]="attr_atkp_all"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="攻击",
+		["desc"]="攻击+{0}",
 		["name"]="attr_atk"
 	},
 	[76]={
 		["id"]=76,
-		["desc"]="生命",
+		["desc"]="生命+{0}",
 		["name"]="attr_hp"
 	},
 	[77]={
 		["id"]=77,
-		["desc"]="普攻伤害",
+		["desc"]="普攻增伤+{0}",
 		["name"]="attr_normal_hurt"
 	},
 	[78]={
 		["id"]=78,
-		["desc"]="技能伤害",
+		["desc"]="技能增伤+{0}",
 		["name"]="attr_skill_hurt"
 	},
 	[79]={
 		["id"]=79,
-		["desc"]="减伤",
+		["desc"]="减伤提升{0}",
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="全体生命+{0}%",
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -475,12 +480,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,19 +327,6 @@ local buff = {
 		["desc"]="反伤：反弹{0}对方伤害，怪物特性不可被移除。",
 		["tips_desc"]="反伤：反弹{0}对方伤害，怪物特性不可被移除。",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="亢奋",
-		["desc"]="亢奋：普攻次数+{0}。",
-		["tips_desc"]="亢奋：普攻次数增加。",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["show_name"]="概率免控",
-		["desc"]="免控：50%概率免疫所有控制",
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -393,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -1,69 +1,399 @@
 local hero = {
 	[13001]={
-		["name"]="熔芯"
+		["name"]="熔芯",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>"
 	},
 	[14001]={
-		["name"]="过热小莫"
+		["name"]="过热小莫",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>"
 	},
 	[15001]={
-		["name"]="火花姬"
+		["name"]="火花姬",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>"
 	},
 	[15002]={
-		["name"]="废铁老爹"
+		["name"]="废铁老爹",
+		["skill_1"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>"
 	},
 	[16001]={
-		["name"]="血祭修女"
+		["name"]="血祭修女",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>"
 	},
 	[23001]={
-		["name"]="甲虫武士"
+		["name"]="甲虫武士",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>"
 	},
 	[24001]={
-		["name"]="平底锅战神"
+		["name"]="平底锅战神",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>"
 	},
 	[25001]={
-		["name"]="科技狼人"
+		["name"]="科技狼人",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_2"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_4"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_6"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_8"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_10"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_12"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_14"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低"
 	},
 	[25002]={
-		["name"]="电锤狂战"
+		["name"]="电锤狂战",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>"
 	},
 	[26001]={
-		["name"]="闪送雷神"
+		["name"]="闪送雷神",
+		["skill_1"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_3"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_5"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_7"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_9"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_11"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_13"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_15"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>"
 	},
 	[33001]={
-		["name"]="荒野镖客"
+		["name"]="荒野镖客",
+		["skill_1"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_2"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_4"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_6"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_8"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_10"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_12"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_14"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>"
 	},
 	[34001]={
-		["name"]="光合特工"
+		["name"]="光合特工",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_2"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_4"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_6"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_8"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_10"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_12"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_14"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>"
 	},
 	[35001]={
-		["name"]="树懒镖师"
+		["name"]="树懒镖师",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>伤害提升<color=#ffb03f>5%</color>"
 	},
 	[35002]={
-		["name"]="快递仙人"
+		["name"]="快递仙人",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>爆炸伤害<color=#ffb03f>+15%</color>"
 	},
 	[43001]={
-		["name"]="气泡柴犬"
+		["name"]="气泡柴犬",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>范围伤害<color=#ffb03f>+10%</color>"
 	},
 	[44001]={
-		["name"]="海的女儿"
+		["name"]="海的女儿",
+		["skill_1"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能3]</color></u>暴击伤害提升<color=#ffb03f>0.5%</color>"
 	},
 	[45001]={
-		["name"]="外卖天使"
+		["name"]="外卖天使",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>击退概率提升<color=#ffb03f>5%</color>"
 	},
 	[45002]={
-		["name"]="冰鲜队长"
+		["name"]="冰鲜队长",
+		["skill_1"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_3"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_5"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_7"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_9"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_11"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_13"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_15"]="<color=#feee3a><u>[技能1]</color></u>相邻水系角色攻击<color=#ffb03f>+4%</color>"
 	},
 	[53001]={
-		["name"]="圣盾卫士"
+		["name"]="圣盾卫士",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>伤害降低少<color=#ffb03f>15%</color>"
 	},
 	[54001]={
-		["name"]="混沌巫师"
+		["name"]="混沌巫师",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_2"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_4"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_6"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_8"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_10"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_12"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低",
+		["skill_14"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>伤害不再降低"
 	},
 	[55001]={
-		["name"]="死灵法师"
+		["name"]="死灵法师",
+		["skill_1"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_3"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_5"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_7"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_9"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_11"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_13"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能2]</color></u>子弹穿透<color=#ffb03f>+1</color>",
+		["skill_15"]="<color=#feee3a><u>[技能4]</color></u>减速效果<color=#ffb03f>+5%</color>"
 	},
 	[55002]={
-		["name"]="血族快递伯爵"
+		["name"]="血族快递伯爵",
+		["skill_1"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_2"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_3"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_4"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_5"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_6"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_7"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_8"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_9"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_10"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_11"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_12"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_13"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>",
+		["skill_14"]="<color=#feee3a><u>[技能4]</color></u>触发需要攻击次数<color=#ffb03f>-1</color>",
+		["skill_15"]="<color=#feee3a><u>[技能2]</color></u>范围<color=#ffb03f>+5%</color>"
 	}
 }
 local config = {

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

@@ -269,6 +269,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

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

@@ -1,162 +1,218 @@
 local skill = {
 	[1300120]={
+		["name"]="离子聚能",
 		["desc"]="熔心：额外造成一次技能伤害。"
 	},
 	[1400120]={
+		["name"]="热力喷发",
 		["desc"]="过热小莫：额外造成一次技能伤害。"
 	},
 	[1500120]={
+		["name"]="爆裂音符",
 		["desc"]="火花姬：额外造成4次技能伤害。"
 	},
 	[1500220]={
+		["name"]="铁拳改造",
 		["desc"]="废铁老爹：额外造成4次大量技能伤害。"
 	},
 	[1600120]={
+		["name"]="狂热清除",
 		["desc"]="血祭修女：额外造成4次大量技能伤害。"
 	},
 	[2300120]={
+		["name"]="硬角冲撞",
 		["desc"]="甲虫武士：额外造成一次技能伤害。"
 	},
 	[2400120]={
+		["name"]="给你一下",
 		["desc"]="平底锅战神：额外造成一次技能伤害。"
 	},
 	[2500120]={
+		["name"]="撕裂之爪",
 		["desc"]="科技狼人：额外造成4次大量技能伤害。"
 	},
 	[2500220]={
+		["name"]="狂雷之击",
 		["desc"]="电锤狂战：额外造成4次大量技能伤害。"
 	},
 	[2600120]={
+		["name"]="飞去来兮",
 		["desc"]="闪送雷神：额外造成4次巨量技能伤害。"
 	},
 	[3300120]={
+		["name"]="连续射击",
 		["desc"]="荒野镖客：额外造成一次技能伤害。"
 	},
 	[3400120]={
+		["name"]="光合作用",
 		["desc"]="光合特工：为团队回复一次生命。"
 	},
 	[3500120]={
+		["name"]="闪电行动",
 		["desc"]="树懒镖师：额外造成4次技能伤害。"
 	},
 	[3500220]={
+		["name"]="御剑飞仙",
 		["desc"]="快递仙人：额外造成4次大量技能伤害。"
 	},
 	[4300120]={
+		["name"]="鱼雷攻击",
 		["desc"]="气泡柴犬：额外造成一次技能伤害。"
 	},
 	[4400120]={
+		["name"]="海洋呼唤",
 		["desc"]="海的女儿：额外造成一次技能伤害。"
 	},
 	[4500120]={
+		["name"]="惊喜打包",
 		["desc"]="外卖天使：额外造成4次技能伤害，附加<color=#3cff28><u>冰霜</u></color>，<color=#3cff28>1</color>回合。"
 	},
 	[4500220]={
+		["name"]="冰鲜斩杀",
 		["desc"]="冰鲜队长：额外造成一次技能伤害，附加<color=#3cff28><u>腐败</u></color>，<color=#3cff28>1</color>回合。"
 	},
 	[5300120]={
+		["name"]="圣盾守护",
 		["desc"]="圣盾卫士：为团队附加一个<color=#3cff28><u>护盾</u></color>，<color=#3cff28>1</color>回合。"
 	},
 	[5400120]={
+		["name"]="混沌之火",
 		["desc"]="混沌巫师：额外造成一次技能伤害。"
 	},
 	[5500120]={
+		["name"]="死灵射线",
 		["desc"]="死灵法师：额外造成4次大量技能伤害。"
 	},
 	[5500220]={
+		["name"]="燃烧血液",
 		["desc"]="血族快递伯爵：额外造成4次大量技能伤害。"
 	},
 	[20061]={
+		["name"]="吸能铁拳",
 		["desc"]="造成伤害并且回复自身一定生命。"
 	},
 	[20066]={
+		["name"]="长枪猛击",
 		["desc"]="造成一次大量伤害。"
 	},
 	[20070]={
+		["name"]="高热激光",
 		["desc"]="造成多段伤害并随机释放2个破齿轮。"
 	},
 	[20074]={
+		["name"]="冰火践踏",
 		["desc"]="造成一次大量伤害，随机附加冰霜和灼烧2回合。"
 	},
 	[20078]={
+		["name"]="震地一击",
 		["desc"]="造成多段伤害，随机释放2个藤曼。"
 	},
 	[20082]={
+		["name"]="深海寒浪",
 		["desc"]="造成一次大量伤害，随机释放2个冰块"
 	},
 	[20086]={
+		["name"]="像素居合",
 		["desc"]="就造成多段伤害，随机释放2个碎石"
 	},
 	[20090]={
+		["name"]="梦幻泡沫",
 		["desc"]="造成一次大量伤害，随机释放2个果冻"
 	},
 	[20094]={
+		["name"]="藤蔓生长",
 		["desc"]="造成一次大量伤害，随机释放3个藤蔓。"
 	},
 	[20095]={
+		["name"]="吸血花粉",
 		["desc"]="造成一次大量伤害，消灭最多颜色的元素并回复生命。"
 	},
 	[20099]={
+		["name"]="死亡光波",
 		["desc"]="造成一次大量伤害，随机释放3个冰块。"
 	},
 	[20100]={
+		["name"]="灵魂收割",
 		["desc"]="造成一次大量伤害，随机消灭1个生成的技能。"
 	},
+	[20104]={
+		["name"]="狂轰滥炸",
+		["desc"]="造成伤害，随机锁定一种颜色棋子"
+	},
 	[20108]={
+		["name"]="沙尘风暴",
 		["desc"]="造成一次大量伤害，随机释放3个石块。"
 	},
 	[20109]={
+		["name"]="审判净化",
 		["desc"]="造成一次大量伤害，打乱所有元素。"
 	},
 	[20113]={
+		["name"]="龙语魔法",
 		["desc"]="获得反击效果，持续3回合。"
 	},
 	[20114]={
+		["name"]="烈焰之雨",
 		["desc"]="造成一次大量伤害，随机消灭2行或2列元素。"
 	},
 	[20118]={
+		["name"]="吞天噬地",
 		["desc"]="随机释放3个果冻。"
 	},
 	[20119]={
+		["name"]="梦境保护",
 		["desc"]="获得反伤护盾持续2回合。"
 	},
 	[20123]={
+		["name"]="地狱烈焰",
 		["desc"]="随机消灭1个已生成的技能。"
 	},
 	[20124]={
+		["name"]="不坠地狱",
 		["desc"]="获得不死效果，1回合。"
 	},
 	[20128]={
+		["name"]="电磁风暴",
 		["desc"]="造成一次大量伤害。"
 	},
 	[20129]={
+		["name"]="电磁操控",
 		["desc"]="更换棋盘上所有棋子颜色。"
 	},
 	[20133]={
+		["name"]="巨像践踏",
 		["desc"]="随机释放4个碎石。"
 	},
 	[20134]={
+		["name"]="毁灭光束",
 		["desc"]="释放禁锢buff2回合。"
 	},
 	[20138]={
+		["name"]="冰火旋涡",
 		["desc"]="释放冰霜和灼烧3回合。"
 	},
 	[20139]={
+		["name"]="泰坦之力",
 		["desc"]="造成一次大量伤害。"
 	},
 	[30004]={
+		["name"]="虚荣",
 		["desc"]="每回合给自己叠加亢奋效果。"
 	},
 	[40005]={
+		["name"]="连续射击",
 		["desc"]="造成多段伤害，回复自身生命同时有30%概率对敌人附加眩晕，2回合。"
 	},
 	[40011]={
+		["name"]="圣盾守护",
 		["desc"]="获得护盾1回合,且30%几率附加反伤20%"
 	},
 	[40016]={
+		["name"]="离子聚能",
 		["desc"]="造成一次大量伤害，30%概率附加灼烧，2回合。"
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -240,22 +240,22 @@ local skill_rogue = {
 		["rougedesc"]="过热小莫技能100%概率附加<color=#3cff28>灼烧</color>2回合"
 	},
 	[1400131]={
-		["desc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%",
+		["desc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%"
+		["rougedesc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%"
 	},
 	[1400132]={
-		["desc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%",
+		["desc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤20%"
+		["rougedesc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加20%"
 	},
 	[1400133]={
-		["desc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%",
+		["desc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤30%"
+		["rougedesc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加30%"
 	},
 	[1400141]={
 		["desc"]="过热小莫攻击提升5%",
@@ -276,58 +276,58 @@ local skill_rogue = {
 		["rougedesc"]="过热小莫攻击提升15%"
 	},
 	[1500111]={
-		["desc"]="火花姬周围变色元素+2;",
+		["desc"]="火花姬周围变色元素+2",
 		["entry_1"]="变色元素+2",
 		["entry_2"]="变色元素+2",
-		["rougedesc"]="火花姬周围变色元素+2;"
+		["rougedesc"]="火花姬周围变色元素+2"
 	},
 	[1500112]={
-		["desc"]="火花姬周围变色元素+2;",
+		["desc"]="火花姬周围变色元素+2",
 		["entry_1"]="变色元素+2",
 		["entry_2"]="变色元素+2",
-		["rougedesc"]="火花姬周围变色元素+4;"
+		["rougedesc"]="火花姬周围变色元素+4"
 	},
 	[1500113]={
-		["desc"]="火花姬周围变色元素+2;",
+		["desc"]="火花姬周围变色元素+2",
 		["entry_1"]="变色元素+2",
 		["entry_2"]="变色元素+2",
-		["rougedesc"]="火花姬周围变色元素+6;"
+		["rougedesc"]="火花姬周围变色元素+6"
 	},
 	[1500121]={
-		["desc"]="火花姬技能附加1回合自愈效果；",
+		["desc"]="火花姬技能附加1回合自愈效果",
 		["entry_1"]="治愈回合提升至2",
 		["entry_2"]="治愈回合提升至3",
-		["rougedesc"]="火花姬技能附加1回合自愈效果；"
+		["rougedesc"]="火花姬技能附加1回合自愈效果"
 	},
 	[1500122]={
-		["desc"]="火花姬技能附加1回合自愈效果；",
+		["desc"]="火花姬技能附加1回合自愈效果",
 		["entry_1"]="治愈回合提升至2",
 		["entry_2"]="治愈回合提升至3",
-		["rougedesc"]="火花姬技能附加2回合自愈效果；"
+		["rougedesc"]="火花姬技能附加2回合自愈效果"
 	},
 	[1500123]={
-		["desc"]="火花姬技能附加1回合自愈效果；",
+		["desc"]="火花姬技能附加1回合自愈效果",
 		["entry_1"]="治愈回合提升至2",
 		["entry_2"]="治愈回合提升至3",
-		["rougedesc"]="火花姬技能附加3回合自愈效果；"
+		["rougedesc"]="火花姬技能附加3回合自愈效果"
 	},
 	[1500131]={
-		["desc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%",
+		["desc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%"
+		["rougedesc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%"
 	},
 	[1500132]={
-		["desc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%",
+		["desc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤20%"
+		["rougedesc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加20%"
 	},
 	[1500133]={
-		["desc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%",
+		["desc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤30%"
+		["rougedesc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加30%"
 	},
 	[1500141]={
 		["desc"]="火花姬攻击提升5%",
@@ -420,22 +420,22 @@ local skill_rogue = {
 		["rougedesc"]="废铁老爹攻击提升15%"
 	},
 	[1600111]={
-		["desc"]="血祭修女技能可左右消除2格；",
+		["desc"]="血祭修女技能可左右消除2格",
 		["entry_1"]="左右消除增加2格",
 		["entry_2"]="链接超6个元素可额外释放1次技能攻击效果",
-		["rougedesc"]="血祭修女技能可左右消除2格；"
+		["rougedesc"]="血祭修女技能可左右消除2格"
 	},
 	[1600112]={
-		["desc"]="血祭修女技能可左右消除2格；",
+		["desc"]="血祭修女技能可左右消除2格",
 		["entry_1"]="左右消除增加2格",
 		["entry_2"]="链接超6个元素可额外释放1次技能攻击效果",
-		["rougedesc"]="血祭修女技能可左右消除4格；"
+		["rougedesc"]="血祭修女技能可左右消除4格"
 	},
 	[1600113]={
-		["desc"]="血祭修女技能可左右消除2格；",
+		["desc"]="血祭修女技能可左右消除2格",
 		["entry_1"]="左右消除增加2格",
 		["entry_2"]="链接超6个元素可额外释放1次技能攻击效果",
-		["rougedesc"]="血祭修女技能可左右消除4格；技能链接超6个元素可额外释放1次大招"
+		["rougedesc"]="血祭修女技能可左右消除4格，技能链接超6个元素可额外释放1次大招"
 	},
 	[1600121]={
 		["desc"]="血祭修女技能命中附加<color=#3cff28>灼烧</color>效果2回合",
@@ -456,22 +456,22 @@ local skill_rogue = {
 		["rougedesc"]="血祭修女技能命中附加<color=#3cff28>灼烧</color>效果2回合，队伍附加<color=#3cff28>亢奋</color>效果2回合，如果敌人有<color=#3cff28>灼烧</color>效果则技能伤害增加。"
 	},
 	[1600131]={
-		["desc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%",
+		["desc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%"
+		["rougedesc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%"
 	},
 	[1600132]={
-		["desc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%",
+		["desc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤20%"
+		["rougedesc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加20%"
 	},
 	[1600133]={
-		["desc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%",
+		["desc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%",
 		["entry_1"]="增伤提升至20%",
 		["entry_2"]="增伤提升至30%",
-		["rougedesc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤30%"
+		["rougedesc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加30%"
 	},
 	[1600141]={
 		["desc"]="血祭修女普攻有20%概率直接附加<color=#3cff28>灼烧</color>效果1回合",
@@ -599,6 +599,24 @@ local skill_rogue = {
 		["entry_2"]="暴击伤害提升回合数+1",
 		["rougedesc"]="平底锅战神技能链接超过4个元素，暴击提升30%，持续2回合"
 	},
+	[2400131]={
+		["desc"]="平底锅战神攻击提升5%",
+		["entry_1"]="攻击提升至10%",
+		["entry_2"]="攻击提升至15%",
+		["rougedesc"]="平底锅战神攻击提升5%"
+	},
+	[2400132]={
+		["desc"]="平底锅战神攻击提升5%",
+		["entry_1"]="攻击提升至10%",
+		["entry_2"]="攻击提升至15%",
+		["rougedesc"]="平底锅战神攻击提升10%"
+	},
+	[2400133]={
+		["desc"]="平底锅战神攻击提升5%",
+		["entry_1"]="攻击提升至10%",
+		["entry_2"]="攻击提升至15%",
+		["rougedesc"]="平底锅战神攻击提升15%"
+	},
 	[2400141]={
 		["desc"]="平底锅战神技能释放时目标生命低于50%则本回合暴击伤害提高50%",
 		["entry_1"]="暴击伤害提高提升至80%",
@@ -653,6 +671,24 @@ local skill_rogue = {
 		["entry_2"]="禁锢回合数+1",
 		["rougedesc"]="科技狼人技能命中有70%几率附加<color=#3cff28>禁锢</color>2回合"
 	},
+	[2500131]={
+		["desc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%",
+		["entry_1"]="30%概率附加眩晕2回合",
+		["entry_2"]="60%概率附加眩晕2回合",
+		["rougedesc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%"
+	},
+	[2500132]={
+		["desc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%",
+		["entry_1"]="30%概率附加眩晕2回合",
+		["entry_2"]="60%概率附加眩晕2回合",
+		["rougedesc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%。且有30%几率附加<color=#3cff28>眩晕</color>2回合"
+	},
+	[2500133]={
+		["desc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%",
+		["entry_1"]="30%概率附加眩晕2回合",
+		["entry_2"]="60%概率附加眩晕2回合",
+		["rougedesc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%。且有60%几率附加<color=#3cff28>眩晕</color>2回合"
+	},
 	[2500141]={
 		["desc"]="科技狼人攻击提升5%",
 		["entry_1"]="攻击提升至10%",
@@ -831,22 +867,22 @@ local skill_rogue = {
 		["desc"]="荒野镖客技能可上下消除2格",
 		["entry_1"]="上下消除增加2格",
 		["entry_2"]="技能链接时伤害增加15%",
-		["rougedesc"]="荒野镖客技能可上下消除2格；链接增伤15%"
+		["rougedesc"]="荒野镖客技能可上下消除2格，链接增伤15%"
 	},
 	[3300121]={
-		["desc"]="荒野镖客技能攻击后可恢复团队一定量生命。",
+		["desc"]="荒野镖客技能攻击后可恢复团队一定量生命",
 		["entry_1"]="30%概率附加眩晕1回合",
 		["entry_2"]="50%概率附眩晕1回合",
-		["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命。"
+		["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命"
 	},
 	[3300122]={
-		["desc"]="荒野镖客技能攻击后可恢复团队一定量生命。",
+		["desc"]="荒野镖客技能攻击后可恢复团队一定量生命",
 		["entry_1"]="30%概率附加眩晕1回合",
 		["entry_2"]="50%概率附眩晕1回合",
-		["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命。30%几率附加<color=#3cff28>眩晕</color>1回合"
+		["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命，30%几率附加<color=#3cff28>眩晕</color>1回合"
 	},
 	[3300123]={
-		["desc"]="荒野镖客技能攻击后可恢复团队一定量生命。",
+		["desc"]="荒野镖客技能攻击后可恢复团队一定量生命",
 		["entry_1"]="30%概率附加眩晕1回合",
 		["entry_2"]="50%概率附眩晕1回合",
 		["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命。50%几率附加<color=#3cff28>眩晕</color>1回合"
@@ -915,13 +951,13 @@ local skill_rogue = {
 		["desc"]="光合特工技能回血量提升50%",
 		["entry_1"]="释放后附加技能伤害提升1回合",
 		["entry_2"]="释放后附加技能伤害提升2回合",
-		["rougedesc"]="光合特工技能回血量提升50%；技能附加技能伤害提升15%1回合"
+		["rougedesc"]="光合特工技能回血量提升50%，技能附加技能伤害提升15%1回合"
 	},
 	[3400123]={
 		["desc"]="光合特工技能回血量提升50%",
 		["entry_1"]="释放后附加技能伤害提升1回合",
 		["entry_2"]="释放后附加技能伤害提升2回合",
-		["rougedesc"]="光合特工技能回血量提升50%；技能附加技能伤害提升15%2回合"
+		["rougedesc"]="光合特工技能回血量提升50%，技能附加技能伤害提升15%2回合"
 	},
 	[3400131]={
 		["desc"]="光合特工技能链接超过5个元素，回血量提升10%",
@@ -1047,7 +1083,7 @@ local skill_rogue = {
 		["desc"]="快递仙人技能可上下消除2格",
 		["entry_1"]="上下消除增加2格",
 		["entry_2"]="技能链接时伤害增加10%",
-		["rougedesc"]="快递仙人技能可上下消除4格；链接增伤10%"
+		["rougedesc"]="快递仙人技能可上下消除4格，链接增伤10%"
 	},
 	[3500221]={
 		["desc"]="快递仙人技能命中附加<color=#3cff28>易伤</color>1回合",
@@ -1104,22 +1140,22 @@ local skill_rogue = {
 		["rougedesc"]="快递仙人普攻有20%几率附加<color=#3cff28>流血</color>3回合，<color=#3cff28>流血</color>伤害提升"
 	},
 	[4300111]={
-		["desc"]="气泡柴犬技能可随机消除2格.",
+		["desc"]="气泡柴犬技能可随机消除2格",
 		["entry_1"]="消除数+2",
 		["entry_2"]="消除数+2",
-		["rougedesc"]="气泡柴犬技能可随机消除2格."
+		["rougedesc"]="气泡柴犬技能可随机消除2格"
 	},
 	[4300112]={
-		["desc"]="气泡柴犬技能可随机消除2格.",
+		["desc"]="气泡柴犬技能可随机消除2格",
 		["entry_1"]="消除数+2",
 		["entry_2"]="消除数+2",
-		["rougedesc"]="气泡柴犬技能可随机消除4格."
+		["rougedesc"]="气泡柴犬技能可随机消除4格"
 	},
 	[4300113]={
-		["desc"]="气泡柴犬技能可随机消除2格.",
+		["desc"]="气泡柴犬技能可随机消除2格",
 		["entry_1"]="消除数+2",
 		["entry_2"]="消除数+2",
-		["rougedesc"]="气泡柴犬技能可随机消除6格."
+		["rougedesc"]="气泡柴犬技能可随机消除6格"
 	},
 	[4300121]={
 		["desc"]="气泡柴犬技能命中50%几率附加<color=#3cff28>冰霜</color>1回合",
@@ -1681,6 +1717,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

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

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 		["desc"]="招聘{0}次"
-	},
-	[48]={
-		["desc"]="1名传说英雄星级达{0}星"
-	},
-	[49]={
-		["desc"]="登录奖励"
-	},
-	[50]={
-		["desc"]="5名英雄升至{0}级"
-	},
-	[51]={
-		["desc"]="研究所研究{0}次"
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/de/attr.lua

@@ -314,6 +314,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -396,12 +400,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

lua/app/config/strings/de/buff.lua

@@ -198,14 +198,6 @@ local buff = {
 	[97]={
 		["id"]=97,
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -259,14 +251,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -130,9 +130,6 @@ local item = {
 	},
 	[44]={
 
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -202,6 +199,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/de/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

lua/app/config/strings/de/skill_rogue.lua

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/de/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/en/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="Damage Counter: Reflects {0} of the enemy's damage. Monster buff cannot be removed.",
 		["tips_desc"]="Damage Counter: Reflects {0} of the enemy's damage. Monster buff cannot be removed.",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="Rage",
-		["desc"]="Rage: Normal attack +<color=#3cff28>{0}</color>.",
-		["tips_desc"]="Rage: More normal attacks.",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -635,30 +635,6 @@ local localization_global =
     ["MAIN_BTN_1"] = "Shop",
     ["MAIN_BTN_2"] = "Hero",
     ["MAIN_BTN_3"] = "Fight",
-    ["ACT_GOGOGO_DESC_1"] = "Limited-time Sprint",
-    ["ACT_GOGOGO_DESC_2"] = "{0} Sprint",
-    ["ACT_GOGOGO_DESC_3"] = "Sprint Shop",
-    ["ACT_GOGOGO_DESC_4"] = "Sprint Star Exchange",
-    ["ACT_GOGOGO_DESC_5"] = "Daily Limit: {0}/{1}",
-    ["ACT_GOGOGO_DESC_6"] = "Weekly Limit: {0}/{1}",
-    ["ACT_GOGOGO_DESC_7"] = "Permanent Limit: {0}/{1}",
-    ["ACT_GOGOGO_DESC_8"] = "Sold Out",
-    ["ACT_GOGOGO_DESC_9"] = "Current Round",
-    ["ACT_GOGOGO_DESC_10"] = "Sprint Pack",
-    ["ACT_GOGOGO_DESC_11"] = "Sprint Mission",
-    ["ACT_GOGOGO_DESC_12"] = "Complete this round to get",
-    ["ACT_GOGOGO_DESC_13"] = "Completed",
-    ["ACT_GOGOGO_DESC_14"] = "Go",
-    ["ACT_GOGOGO_DESC_15"] = "Event Time Left",
-    ["ACT_GOGOGO_DESC_16"] = "Spend {0} for rewards",
-    ["ACT_GOGOGO_DESC_17"] = "1.Complete missions for rewards.\n2. Finishing all missions completes a round, granting round rewards.\n3. Round rewards have claim limits. Missions stop counting after limit reached.",
-    ["ACT_GOGOGO_DESC_18"] = "Consume Gold Keys to receive rewards",
-    ["ACT_GOGOGO_DESC_19"] = "Summon heroes to receive rewards",
-    ["ACT_GOGOGO_DESC_20"] = "Sprint Sign-in",
-    ["ACT_GOGOGO_DESC_21"] = "Normal Summon Sprint",
-    ["ACT_GOGOGO_DESC_22"] = "Core Chest Sprint",
-    ["ACT_GOGOGO_DESC_23"] = "Diamond Sprint",
-    ["ACT_GOGOGO_DESC_24"] = "Spend diamonds to receive rewards",
 }
 
 return localization_global

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/en/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/en/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/es/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="Ataque aumenta en {0}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="Ataque aumenta en {0}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="Ataque aumenta en {0}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="Ataque aumenta en {0}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="Ataque aumenta en {0}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="Daño Reflexivo: refleja {0} de daño del oponente. Los atributos de monstruos no pueden ser removidos.",
 		["tips_desc"]="Daño Reflexivo: refleja {0} de daño del oponente. Los atributos de monstruos no pueden ser removidos.",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="Excitado",
-		["desc"]="Excitado: número de ataques comunes + <color=#3cff28>{0}</color>.",
-		["tips_desc"]="Excitado: aumenta el número de ATQ común.",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/es/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/es/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/fr/attr.lua

@@ -314,6 +314,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -396,12 +400,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

lua/app/config/strings/fr/buff.lua

@@ -198,14 +198,6 @@ local buff = {
 	[97]={
 		["id"]=97,
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -259,14 +251,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -130,9 +130,6 @@ local item = {
 	},
 	[44]={
 
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -202,6 +199,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/fr/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

lua/app/config/strings/fr/skill_rogue.lua

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/fr/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/id/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="ATK +{0}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="DMG Balik: Memantulkan {0} dari kerusakan musuh. Monster buff tidak dapat dihilangkan.",
 		["tips_desc"]="DMG Balik: Memantulkan {0} dari kerusakan musuh. Monster buff tidak dapat dihilangkan.",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="Excited",
-		["desc"]="Excited: ATK Normal +<color=#3cff28>{0}</color>.",
-		["tips_desc"]="Excited: Jumlah ATK Normal bertambah.",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/id/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/id/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/ja/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="攻撃力が{0}%増加する",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="攻撃力が{0}%増加する",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="攻撃力が{0}%増加する",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="攻撃力が{0}%増加する",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="攻撃力が{0}%増加する",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="反射：{0}のダメージを反射する。モンスターの特性は削除できない。",
 		["tips_desc"]="反射：{0}のダメージを反射する。モンスターの特性は削除できない。",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="興奮",
-		["desc"]="興奮：通常攻撃の回数が<color=#3cff28>+{0}</color>。",
-		["tips_desc"]="興奮：通常攻撃の回数が増加する。",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/ja/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/ja/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/ko/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="공격력 +{0}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="공격력 +{0}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="공격력 +{0}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="공격력 +{0}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="공격력 +{0}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="피해 반사: 상대의 대미지를 반사하며 몬스터 특성은 제거될 수 없습니다.",
 		["tips_desc"]="피해 반사: 상대의 대미지를 반사하며 몬스터 특성은 제거될 수 없습니다.",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="과열 상태",
-		["desc"]="과열 상태: 일반 공격 횟수+<color=#3cff28>{0}</color>",
-		["tips_desc"]="과열 상태: 일반 공격 횟수가 증가합니다.",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/ko/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/ko/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/pt/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="Aumento de Ataque {0}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="Aumento de Ataque {0}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="Aumento de Ataque {0}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="Aumento de Ataque {0}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="Aumento de Ataque {0}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="Reflexão: reflete {0} do dano do oponente. O atributo do monstro não pode ser removido.",
 		["tips_desc"]="Reflexão: reflete {0} do dano do oponente. O atributo do monstro não pode ser removido.",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="Excitado",
-		["desc"]="Excitado: número de golpes comuns + <color=#3cff28>{0}</color>.",
-		["tips_desc"]="Excitação: aumenta o número de ataques básicos.",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/pt/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/pt/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/ru/attr.lua

@@ -314,6 +314,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -396,12 +400,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

lua/app/config/strings/ru/buff.lua

@@ -198,14 +198,6 @@ local buff = {
 	[97]={
 		["id"]=97,
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -259,14 +251,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -130,9 +130,6 @@ local item = {
 	},
 	[44]={
 
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -202,6 +199,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/ru/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

lua/app/config/strings/ru/skill_rogue.lua

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/th/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="สะท้อนดาเมจ: สะท้อนดาเมจ{0}ของฝ่ายตรงข้าม และคุณสมบัติเฉพาะมอนสเตอร์ไม่สามารถถูกลบได้",
 		["tips_desc"]="สะท้อนดาเมจ: สะท้อนดาเมจ{0}ของฝ่ายตรงข้าม และคุณสมบัติเฉพาะมอนสเตอร์ไม่สามารถถูกลบได้",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="ตื่นเต้น",
-		["desc"]="ตื่นเต้น:จำนวนโจมตีทั่วไป+<color=#3cff28>{0}</color>",
-		["tips_desc"]="ตื่นเต้น: จำนวนโจมตีทั่วไปเพิ่มขึ้น",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/th/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/th/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/vi/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="Tăng {0}% Công",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="Tăng {0}% Công",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="Tăng {0}% Công",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="Tăng {0}% Công",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="Tăng {0}% Công",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="Phản ST: Phản đòn {0} sát thương lên đối phương, đặc tính Quái không thể bị xóa đi.",
 		["tips_desc"]="Phản ST: Phản đòn {0} sát thương lên đối phương, đặc tính Quái không thể bị xóa đi.",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="Phấn Khởi",
-		["desc"]="Phấn Khởi: Lượt đánh thường +<color=#3cff28>{0}</color>.",
-		["tips_desc"]="Phấn Khởi: Tăng lượt đánh thường.",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/vi/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config

lua/app/config/strings/vi/task_type.lua

@@ -139,21 +139,9 @@ local task_type = {
 	},
 	[47]={
 
-	},
-	[48]={
-
-	},
-	[49]={
-
-	},
-	[50]={
-
-	},
-	[51]={
-
 	}
 }
 local config = {
-data=task_type,count=51
+data=task_type,count=47
 }
 return config

lua/app/config/strings/zh/attr.lua

@@ -106,27 +106,22 @@ local attr = {
 	},
 	[22]={
 		["id"]=22,
-		["desc"]="攻擊力提高{0}%",
 		["name"]="attr_atkp_red"
 	},
 	[23]={
 		["id"]=23,
-		["desc"]="攻擊力提高{0}%",
 		["name"]="attr_atkp_yellow"
 	},
 	[24]={
 		["id"]=24,
-		["desc"]="攻擊力提高{0}%",
 		["name"]="attr_atkp_green"
 	},
 	[25]={
 		["id"]=25,
-		["desc"]="攻擊力提高{0}%",
 		["name"]="attr_atkp_blue"
 	},
 	[26]={
 		["id"]=26,
-		["desc"]="攻擊力提高{0}%",
 		["name"]="attr_atkp_purple"
 	},
 	[27]={
@@ -375,6 +370,10 @@ local attr = {
 	[79]={
 		["id"]=79,
 		["name"]="dmgdec"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="attr_hpp_all"
 	}
 }
 local keys = {
@@ -457,12 +456,13 @@ local keys = {
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
 		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79]
+		["dmgdec"]=attr[79],
+		["attr_hpp_all"]=attr[80]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=79
+count=80
 }
 return config

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

@@ -327,17 +327,6 @@ local buff = {
 		["desc"]="反傷：反彈{0}對方傷害，怪物特性不可被移除。",
 		["tips_desc"]="反傷：反彈{0}對方傷害，怪物特性不可被移除。",
 		["name"]="forever_thorns"
-	},
-	[98]={
-		["id"]=98,
-		["show_name"]="亢奮",
-		["desc"]="亢奮：普攻次數+<color=#3cff28>{0}</color>。",
-		["tips_desc"]="亢奮：普攻次數增加。",
-		["name"]="forever_normal_attack_add"
-	},
-	[99]={
-		["id"]=99,
-		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -391,14 +380,12 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97],
+		["forever_thorns"]=buff[97]
-		["forever_normal_attack_add"]=buff[98],
-		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=52
+count=50
 }
 return config

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

@@ -135,9 +135,6 @@ local item = {
 	},
 	[44]={
 		["name"]="自选传说英雄宝箱"
-	},
-	[45]={
-
 	},
 	[13001]={
 
@@ -207,6 +204,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=67
+data=item,count=66
 }
 return config

lua/app/config/strings/zh/skill.lua

@@ -100,6 +100,9 @@ local skill = {
 	},
 	[20100]={
 
+	},
+	[20104]={
+
 	},
 	[20108]={
 
@@ -157,6 +160,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=52
+data=skill,count=53
 }
 return config

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

@@ -364,6 +364,15 @@ local skill_rogue = {
 	},
 	[2400123]={
 
+	},
+	[2400131]={
+
+	},
+	[2400132]={
+
+	},
+	[2400133]={
+
 	},
 	[2400141]={
 
@@ -391,6 +400,15 @@ local skill_rogue = {
 	},
 	[2500123]={
 
+	},
+	[2500131]={
+
+	},
+	[2500132]={
+
+	},
+	[2500133]={
+
 	},
 	[2500141]={
 
@@ -907,6 +925,6 @@ local skill_rogue = {
 	}
 }
 local config = {
-data=skill_rogue,count=302
+data=skill_rogue,count=308
 }
 return config