diff --git a/lua/app/config/act_sevenday_quest.lua b/lua/app/config/act_sevenday_quest.lua
index 82af4b28..cad78e22 100644
--- a/lua/app/config/act_sevenday_quest.lua
+++ b/lua/app/config/act_sevenday_quest.lua
@@ -94,7 +94,7 @@ local act_sevenday_quest = {
 	[205]={
 		["day"]=1,
 		["type"]=51,
-		["number"]=5,
+		["number"]=20,
 		["reward"]={
 			{
 				["type"]=1,
@@ -163,7 +163,7 @@ local act_sevenday_quest = {
 	[208]={
 		["day"]=2,
 		["type"]=45,
-		["number"]=2,
+		["number"]=4,
 		["reward"]={
 			{
 				["type"]=1,
@@ -186,7 +186,7 @@ local act_sevenday_quest = {
 	[209]={
 		["day"]=2,
 		["type"]=12,
-		["number"]=30,
+		["number"]=50,
 		["reward"]={
 			{
 				["type"]=1,
@@ -255,7 +255,7 @@ local act_sevenday_quest = {
 	[212]={
 		["day"]=3,
 		["type"]=25,
-		["number"]=10,
+		["number"]=20,
 		["reward"]={
 			{
 				["type"]=1,
@@ -301,7 +301,7 @@ local act_sevenday_quest = {
 	[214]={
 		["day"]=3,
 		["type"]=12,
-		["number"]=60,
+		["number"]=100,
 		["reward"]={
 			{
 				["type"]=1,
@@ -324,7 +324,7 @@ local act_sevenday_quest = {
 	[215]={
 		["day"]=3,
 		["type"]=31,
-		["number"]=1000,
+		["number"]=1100,
 		["reward"]={
 			{
 				["type"]=1,
@@ -370,7 +370,7 @@ local act_sevenday_quest = {
 	[217]={
 		["day"]=4,
 		["type"]=51,
-		["number"]=20,
+		["number"]=55,
 		["reward"]={
 			{
 				["type"]=1,
@@ -439,7 +439,7 @@ local act_sevenday_quest = {
 	[220]={
 		["day"]=4,
 		["type"]=13,
-		["number"]=300,
+		["number"]=400,
 		["reward"]={
 			{
 				["type"]=1,
@@ -485,7 +485,7 @@ local act_sevenday_quest = {
 	[222]={
 		["day"]=5,
 		["type"]=25,
-		["number"]=20,
+		["number"]=30,
 		["reward"]={
 			{
 				["type"]=1,
@@ -508,7 +508,7 @@ local act_sevenday_quest = {
 	[223]={
 		["day"]=5,
 		["type"]=44,
-		["number"]=44,
+		["number"]=5,
 		["reward"]={
 			{
 				["type"]=1,
@@ -554,7 +554,7 @@ local act_sevenday_quest = {
 	[225]={
 		["day"]=5,
 		["type"]=12,
-		["number"]=90,
+		["number"]=160,
 		["reward"]={
 			{
 				["type"]=1,
@@ -600,7 +600,7 @@ local act_sevenday_quest = {
 	[227]={
 		["day"]=6,
 		["type"]=51,
-		["number"]=30,
+		["number"]=70,
 		["reward"]={
 			{
 				["type"]=1,
@@ -669,7 +669,7 @@ local act_sevenday_quest = {
 	[230]={
 		["day"]=6,
 		["type"]=13,
-		["number"]=420,
+		["number"]=800,
 		["reward"]={
 			{
 				["type"]=1,
@@ -715,7 +715,7 @@ local act_sevenday_quest = {
 	[232]={
 		["day"]=7,
 		["type"]=44,
-		["number"]=2,
+		["number"]=8,
 		["reward"]={
 			{
 				["type"]=1,
@@ -761,7 +761,7 @@ local act_sevenday_quest = {
 	[234]={
 		["day"]=7,
 		["type"]=12,
-		["number"]=120,
+		["number"]=240,
 		["reward"]={
 			{
 				["type"]=1,
@@ -784,7 +784,7 @@ local act_sevenday_quest = {
 	[235]={
 		["day"]=7,
 		["type"]=31,
-		["number"]=1800,
+		["number"]=1600,
 		["reward"]={
 			{
 				["type"]=1,
diff --git a/lua/app/config/act_week_signin.lua b/lua/app/config/act_week_signin.lua
index 324a9d6b..8a7a48e2 100755
--- a/lua/app/config/act_week_signin.lua
+++ b/lua/app/config/act_week_signin.lua
@@ -7,16 +7,16 @@ local act_week_signin = {
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
+			["num"]=600,
+ 			["num_for_nothing"]="UAhc"
 		}
 	},
 	[102]={
@@ -25,18 +25,18 @@ local act_week_signin = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=100,
- 			["num_for_nothing"]="Vwhc"
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=1000,
- 			["num_for_nothing"]="VwhcAw=="
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=60,
+ 			["num_for_nothing"]="UAg="
 		}
 	},
 	[103]={
@@ -45,18 +45,18 @@ local act_week_signin = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=8,
+ 			["num_for_nothing"]="Xg=="
 		}
 	},
 	[104]={
@@ -65,43 +65,23 @@ local act_week_signin = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
+			["id"]=18,
+ 			["id_for_nothing"]="VwA=",
 			["num"]=100,
  			["num_for_nothing"]="Vwhc"
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=1000,
- 			["num_for_nothing"]="VwhcAw=="
+			["id"]=18,
+ 			["id_for_nothing"]="VwA=",
+			["num"]=300,
+ 			["num_for_nothing"]="VQhc"
 		}
 	},
 	[105]={
 		["season"]=2,
 		["day"]=5,
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=200,
- 			["num_for_nothing"]="VAhc"
-		},
-		["reward_pro"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=2000,
- 			["num_for_nothing"]="VAhcAw=="
-		}
-	},
-	[106]={
-		["season"]=2,
-		["day"]=6,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
@@ -115,8 +95,28 @@ local act_week_signin = {
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=1000,
- 			["num_for_nothing"]="VwhcAw=="
+			["num"]=600,
+ 			["num_for_nothing"]="UAhc"
+		}
+	},
+	[106]={
+		["season"]=2,
+		["day"]=6,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=5000,
+ 			["num_for_nothing"]="UwhcAw=="
+		},
+		["reward_pro"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=20000,
+ 			["num_for_nothing"]="VAhcA2U="
 		}
 	},
 	[107]={
@@ -125,18 +125,18 @@ local act_week_signin = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=300,
- 			["num_for_nothing"]="VQhc"
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
 		},
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
- 			["id_for_nothing"]="VA==",
-			["num"]=3000,
- 			["num_for_nothing"]="VQhcAw=="
+			["id"]=5,
+ 			["id_for_nothing"]="Uw==",
+			["num"]=8,
+ 			["num_for_nothing"]="Xg=="
 		}
 	}
 }
diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua
index 432c27ce..317829a1 100644
--- a/lua/app/config/chapter_board.lua
+++ b/lua/app/config/chapter_board.lua
@@ -232,6 +232,54 @@ local chapter_board = {
 				0,
 				1
 			},
+			{
+				0,
+				1
+			},
+			{
+				0,
+				1
+			},
+			{
+				0,
+				4
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
+			{
+				0,
+				1
+			},
+			{
+				0,
+				2
+			},
+			{
+				0,
+				1
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
 			{
 				0,
 				2
@@ -242,59 +290,35 @@ local chapter_board = {
 			},
 			{
 				0,
-				4
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				3
+				2
 			},
 			{
 				0,
 				1
 			},
-			{
-				0,
-				3
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				1
-			},
-			{
-				0,
-				3
-			},
 			{
 				0,
 				2
 			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
 			{
 				0,
-				3
+				1
+			},
+			{
+				0,
+				1
 			},
 			{
 				0,
@@ -312,18 +336,6 @@ local chapter_board = {
 				1,
 				0
 			},
-			{
-				0,
-				4
-			},
-			{
-				0,
-				2
-			},
-			{
-				0,
-				4
-			},
 			{
 				1,
 				0
@@ -340,18 +352,6 @@ local chapter_board = {
 				1,
 				0
 			},
-			{
-				0,
-				4
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				4
-			},
 			{
 				1,
 				0
@@ -434,7 +434,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				2
+				3
 			},
 			{
 				0,
@@ -454,56 +454,24 @@ local chapter_board = {
 			},
 			{
 				0,
-				2
+				3
 			},
 			{
 				0,
 				4
 			},
-			{
-				0,
-				2
-			},
 			{
 				0,
 				4
 			},
 			{
 				0,
-				2
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				2
+				4
 			},
 			{
 				0,
 				3
 			},
-			{
-				0,
-				2
-			},
-			{
-				0,
-				3
-			},
-			{
-				0,
-				2
-			},
-			{
-				1,
-				0
-			},
 			{
 				1,
 				0
@@ -520,6 +488,38 @@ local chapter_board = {
 				0,
 				4
 			},
+			{
+				0,
+				4
+			},
+			{
+				0,
+				4
+			},
+			{
+				0,
+				2
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
+			{
+				1,
+				0
+			},
+			{
+				0,
+				2
+			},
+			{
+				0,
+				2
+			},
 			{
 				0,
 				2
@@ -546,7 +546,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				2
+				1
 			},
 			{
 				0,
@@ -634,7 +634,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				1
+				5
 			},
 			{
 				0,
@@ -662,7 +662,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				2
+				5
 			},
 			{
 				0,
@@ -834,7 +834,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				2
+				3
 			},
 			{
 				0,
@@ -1062,7 +1062,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				3
+				2
 			},
 			{
 				0,
@@ -1090,7 +1090,7 @@ local chapter_board = {
 			},
 			{
 				2,
-				3
+				0
 			},
 			{
 				0,
@@ -1234,7 +1234,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				2
+				3
 			},
 			{
 				0,
@@ -1432,7 +1432,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				2
+				3
 			},
 			{
 				0,
diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua
index b59b7120..7ea35c4b 100644
--- a/lua/app/config/const.lua
+++ b/lua/app/config/const.lua
@@ -445,9 +445,60 @@ local const = {
 	},
 	["daily_challenge_ads_double_rewards_limit"]={
 		["value"]=2
+	},
+	["act_gogogo_round_reward_1"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=44,
+ 				["id_for_nothing"]="Ugw=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		}
+	},
+	["act_gogogo_round_limit_1"]={
+		["value"]=5
+	},
+	["dungeon_show_reward"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=18,
+ 				["id_for_nothing"]="VwA=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
 	}
 }
 local config = {
-data=const,count=78
+data=const,count=81
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua
index 7dd8eaa0..2aeab2be 100644
--- a/lua/app/config/func_open.lua
+++ b/lua/app/config/func_open.lua
@@ -48,7 +48,7 @@ local func_open = {
 		["pop_ups"]=1
 	},
 	["summon_open"]={
-		["stage"]=1,
+		["stage"]=3,
 		["pop_ups"]=1
 	},
 	["first_charge_1"]={
@@ -63,13 +63,13 @@ local func_open = {
 		["time"]=3
 	},
 	["card_ad"]={
-		["stage"]=2
+		["stage"]=5
 	},
 	["card_monthly"]={
-		["level"]=4
+		["stage"]=2
 	},
 	["act_sevenday"]={
-		["stage"]=2
+		["stage"]=3
 	},
 	["dungeon_gold"]={
 		["stage"]=6,
diff --git a/lua/app/config/mall_daily_store.lua b/lua/app/config/mall_daily_store.lua
index 1eb1ce0a..d43c8a20 100644
--- a/lua/app/config/mall_daily_store.lua
+++ b/lua/app/config/mall_daily_store.lua
@@ -20,197 +20,165 @@ local mall_daily_store = {
 	},
 	[2]={
 		["gold"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=9,
  				["id_for_nothing"]="Xw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=10,
  				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=11,
  				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=12,
  				["id_for_nothing"]="Vwo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=13,
  				["id_for_nothing"]="Vws=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=16,
- 				["id_for_nothing"]="Vw4=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=17,
- 				["id_for_nothing"]="Vw8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=19,
- 				["id_for_nothing"]="VwE=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=20,
- 				["id_for_nothing"]="VAg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=9,
  				["id_for_nothing"]="Xw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=10,
  				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=11,
  				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=12,
  				["id_for_nothing"]="Vwo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=13,
  				["id_for_nothing"]="Vws=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["id"]=9,
+ 				["id_for_nothing"]="Xw==",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=10,
+ 				["id_for_nothing"]="Vwg=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=11,
+ 				["id_for_nothing"]="Vwk=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=12,
+ 				["id_for_nothing"]="Vwo=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=9,
+ 				["id_for_nothing"]="Xw==",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=10,
+ 				["id_for_nothing"]="Vwg=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=11,
+ 				["id_for_nothing"]="Vwk=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=12,
+ 				["id_for_nothing"]="Vwo=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			}
 		},
 		["weight"]={
@@ -224,10 +192,6 @@ local mall_daily_store = {
 			2000,
 			2000,
 			2000,
-			2000,
-			2000,
-			1000,
-			1000,
 			1000,
 			1000,
 			1000,
@@ -280,22 +244,6 @@ local mall_daily_store = {
 				["num"]=150,
  				["num_for_nothing"]="Vw1c"
 			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=150,
- 				["num_for_nothing"]="Vw1c"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=120,
- 				["num_for_nothing"]="Vwpc"
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -376,22 +324,6 @@ local mall_daily_store = {
 				["num"]=3750,
  				["num_for_nothing"]="VQ9ZAw=="
 			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=3750,
- 				["num_for_nothing"]="VQ9ZAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=3000,
- 				["num_for_nothing"]="VQhcAw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -441,8 +373,6 @@ local mall_daily_store = {
 			0,
 			0,
 			0,
-			0,
-			-20,
 			-20,
 			-20,
 			-20,
@@ -453,8 +383,6 @@ local mall_daily_store = {
 			0,
 			0,
 			0,
-			0,
-			-20,
 			-20,
 			-20,
 			-20,
@@ -467,130 +395,130 @@ local mall_daily_store = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=16,
- 				["id_for_nothing"]="Vw4=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=17,
- 				["id_for_nothing"]="Vw8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=19,
- 				["id_for_nothing"]="VwE=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=20,
- 				["id_for_nothing"]="VAg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=9,
- 				["id_for_nothing"]="Xw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=11,
- 				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=14,
  				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=15,
  				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=14,
+ 				["id_for_nothing"]="Vww=",
+				["num"]=25,
+ 				["num_for_nothing"]="VA0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
 			}
 		},
 		["weight"]={
@@ -602,14 +530,14 @@ local mall_daily_store = {
 			2000,
 			2000,
 			2000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000
+			500,
+			500,
+			500,
+			500,
+			500,
+			500,
+			500,
+			500
 		},
 		["cost"]={
 			{
@@ -744,10 +672,6 @@ local mall_daily_store = {
 		["limit"]=1,
 		["unlock"]=0,
 		["value"]={
-			0,
-			0,
-			0,
-			0,
 			0,
 			0,
 			0,
@@ -756,6 +680,10 @@ local mall_daily_store = {
 			-20,
 			-20,
 			-20,
+			0,
+			0,
+			0,
+			0,
 			-20,
 			-20,
 			-20,
@@ -764,426 +692,82 @@ local mall_daily_store = {
 	},
 	[4]={
 		["gold"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=16,
- 				["id_for_nothing"]="Vw4=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=17,
- 				["id_for_nothing"]="Vw8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=19,
  				["id_for_nothing"]="VwE=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=20,
- 				["id_for_nothing"]="VAg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=9,
- 				["id_for_nothing"]="Xw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=11,
- 				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=16,
- 				["id_for_nothing"]="Vw4=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["weight"]={
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000
-		},
-		["cost"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=250,
- 				["num_for_nothing"]="VA1c"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=250,
- 				["num_for_nothing"]="VA1c"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=250,
- 				["num_for_nothing"]="VA1c"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=250,
- 				["num_for_nothing"]="VA1c"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=6250,
- 				["num_for_nothing"]="UApZAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=6250,
- 				["num_for_nothing"]="UApZAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=6250,
- 				["num_for_nothing"]="UApZAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=6250,
- 				["num_for_nothing"]="UApZAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			}
-		},
-		["limit"]=1,
-		["unlock"]=0,
-		["value"]={
-			0,
-			0,
-			0,
-			0,
-			-20,
-			-20,
-			-20,
-			-20,
-			0,
-			0,
-			0,
-			0,
-			-20,
-			-20,
-			-20,
-			-20
-		}
-	},
-	[5]={
-		["gold"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=17,
- 				["id_for_nothing"]="Vw8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=19,
- 				["id_for_nothing"]="VwE=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=20,
- 				["id_for_nothing"]="VAg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=9,
- 				["id_for_nothing"]="Xw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=11,
- 				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["weight"]={
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000
-		},
-		["cost"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
 				["num"]=50,
  				["num_for_nothing"]="Uwg="
 			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=19,
+ 				["id_for_nothing"]="VwE=",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["weight"]={
+			2000,
+			2000,
+			2000,
+			2000,
+			500,
+			500,
+			500,
+			500
+		},
+		["cost"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -1200,14 +784,6 @@ local mall_daily_store = {
 				["num"]=200,
  				["num_for_nothing"]="VAhc"
 			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=40,
- 				["num_for_nothing"]="Ugg="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -1224,14 +800,6 @@ local mall_daily_store = {
 				["num"]=160,
  				["num_for_nothing"]="Vw5c"
 			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=1250,
- 				["num_for_nothing"]="VwpZAw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -1248,14 +816,6 @@ local mall_daily_store = {
 				["num"]=5000,
  				["num_for_nothing"]="UwhcAw=="
 			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=1000,
- 				["num_for_nothing"]="VwhcAw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -1274,6 +834,230 @@ local mall_daily_store = {
 			}
 		},
 		["limit"]=1,
+		["unlock"]=0,
+		["value"]={
+			0,
+			0,
+			-20,
+			-20,
+			0,
+			0,
+			-20,
+			-20
+		}
+	},
+	[5]={
+		["gold"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=15,
+ 				["num_for_nothing"]="Vw0="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=20,
+ 				["id_for_nothing"]="VAg=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		},
+		["weight"]={
+			2000,
+			2000,
+			2000,
+			2000,
+			2000,
+			2000,
+			400,
+			400,
+			400,
+			400,
+			400,
+			400
+		},
+		["cost"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=120,
+ 				["num_for_nothing"]="Vwpc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=180,
+ 				["num_for_nothing"]="VwBc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=240,
+ 				["num_for_nothing"]="VAxc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=96,
+ 				["num_for_nothing"]="Xw4="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=144,
+ 				["num_for_nothing"]="VwxY"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=192,
+ 				["num_for_nothing"]="VwFe"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=3000,
+ 				["num_for_nothing"]="VQhcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=4500,
+ 				["num_for_nothing"]="Ug1cAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=6000,
+ 				["num_for_nothing"]="UAhcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=2400,
+ 				["num_for_nothing"]="VAxcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=3600,
+ 				["num_for_nothing"]="VQ5cAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=4800,
+ 				["num_for_nothing"]="UgBcAw=="
+			}
+		},
+		["limit"]=1,
 		["unlock"]=23,
 		["value"]={
 			0,
@@ -1295,64 +1079,8 @@ local mall_daily_store = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=16,
- 				["id_for_nothing"]="Vw4=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=17,
- 				["id_for_nothing"]="Vw8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=18,
- 				["id_for_nothing"]="VwA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=19,
- 				["id_for_nothing"]="VwE=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=20,
- 				["id_for_nothing"]="VAg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -1367,77 +1095,25 @@ local mall_daily_store = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=9,
- 				["id_for_nothing"]="Xw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=11,
- 				["id_for_nothing"]="Vwk=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		},
 		["weight"]={
 			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			2000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000,
-			1000
+			1500,
+			200,
+			150
 		},
 		["cost"]={
 			{
@@ -1445,148 +1121,40 @@ local mall_daily_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=120,
- 				["num_for_nothing"]="Vwpc"
+				["num"]=180,
+ 				["num_for_nothing"]="VwBc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=240,
- 				["num_for_nothing"]="VAxc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=120,
- 				["num_for_nothing"]="Vwpc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=240,
- 				["num_for_nothing"]="VAxc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=96,
- 				["num_for_nothing"]="Xw4="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=192,
- 				["num_for_nothing"]="VwFe"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=96,
- 				["num_for_nothing"]="Xw4="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=192,
- 				["num_for_nothing"]="VwFe"
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=3000,
- 				["num_for_nothing"]="VQhcAw=="
+				["num"]=18000,
+ 				["num_for_nothing"]="VwBcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=6000,
- 				["num_for_nothing"]="UAhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=3000,
- 				["num_for_nothing"]="VQhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=6000,
- 				["num_for_nothing"]="UAhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=2400,
- 				["num_for_nothing"]="VAxcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=4800,
- 				["num_for_nothing"]="UgBcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=2400,
- 				["num_for_nothing"]="VAxcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=4800,
- 				["num_for_nothing"]="UgBcAw=="
+				["num"]=16000,
+ 				["num_for_nothing"]="Vw5cA2U="
 			}
 		},
 		["limit"]=1,
 		["unlock"]=23,
 		["value"]={
-			0,
-			0,
-			0,
-			0,
-			-20,
-			-20,
-			-20,
-			-20,
-			0,
-			0,
-			0,
-			0,
-			-20,
-			-20,
+			-10,
 			-20,
+			-10,
 			-20
 		}
 	}
diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua
index 943f3cce..45c2bc71 100644
--- a/lua/app/config/monster_base.lua
+++ b/lua/app/config/monster_base.lua
@@ -293,9 +293,19 @@ local monster_base = {
 		["model_id"]="p55002",
 		["body"]=2,
 		["model_ui"]=1.0
+	},
+	[501001]={
+		["model_id"]="m30001",
+		["body"]=2,
+		["model_ui"]=1.0
+	},
+	[501002]={
+		["model_id"]="m30003",
+		["body"]=2,
+		["model_ui"]=1.0
 	}
 }
 local config = {
-data=monster_base,count=59
+data=monster_base,count=61
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/monster_dungeon.lua b/lua/app/config/monster_dungeon.lua
index 18461ec2..6bb659cd 100644
--- a/lua/app/config/monster_dungeon.lua
+++ b/lua/app/config/monster_dungeon.lua
@@ -1,10 +1,10 @@
 local monster_dungeon = {
 	[103]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=86580000,
-		["atk"]=1850000,
-		["atk_times"]=1,
+		["atk"]=1800000,
+		["hp"]=240000000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -16,11 +16,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[203]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=129540000,
-		["atk"]=2060000,
-		["atk_times"]=1,
+		["atk"]=5600000,
+		["hp"]=680000000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -32,11 +32,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[303]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=162560000,
-		["atk"]=2150000,
-		["atk_times"]=1,
+		["atk"]=7200000,
+		["hp"]=920000000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -48,11 +48,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[403]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=171200000,
-		["atk"]=2590000,
-		["atk_times"]=1,
+		["atk"]=8460000,
+		["hp"]=1129820000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -64,11 +64,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[503]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=351000000,
-		["atk"]=2770000,
-		["atk_times"]=1,
+		["atk"]=11130000,
+		["hp"]=1662460000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -80,11 +80,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[603]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=210900000,
-		["atk"]=2680000,
-		["atk_times"]=1,
+		["atk"]=14100000,
+		["hp"]=2211230000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -96,11 +96,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[703]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=244760000,
-		["atk"]=2770000,
-		["atk_times"]=1,
+		["atk"]=18330000,
+		["hp"]=3002110000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -112,11 +112,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[803]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=286950000,
-		["atk"]=2740000,
-		["atk_times"]=1,
+		["atk"]=22640000,
+		["hp"]=3873680000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -128,11 +128,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[903]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=329100000,
-		["atk"]=2880000,
-		["atk_times"]=1,
+		["atk"]=29540000,
+		["hp"]=5326320000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -144,11 +144,11 @@ local monster_dungeon = {
 		["monster_exp"]=0
 	},
 	[1003]={
-		["monster_base"]=10001,
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=558600000,
-		["atk"]=2880000,
-		["atk_times"]=1,
+		["atk"]=32810000,
+		["hp"]=6197890000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30001,
 			30002,
@@ -159,12 +159,172 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10103]={
-		["monster_base"]=10002,
+	[1103]={
+		["monster_base"]=501001,
 		["is_boss"]=2,
-		["hp"]=86580000,
-		["atk"]=1850000,
-		["atk_times"]=0,
+		["atk"]=37930000,
+		["hp"]=8167020000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1203]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=44910000,
+		["hp"]=11120700000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1303]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=51810000,
+		["hp"]=13719300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1403]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=57900000,
+		["hp"]=16011230000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1503]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=63910000,
+		["hp"]=18577540000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1603]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=72890000,
+		["hp"]=22919300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1703]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=82020000,
+		["hp"]=27712980000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1803]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=91520000,
+		["hp"]=33087720000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[1903]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=101320000,
+		["hp"]=38898250000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[2003]={
+		["monster_base"]=501001,
+		["is_boss"]=2,
+		["atk"]=113200000,
+		["hp"]=44418250000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			30004
+		},
+		["monster_exp"]=0
+	},
+	[100103]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=1800000,
+		["hp"]=240000000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -175,12 +335,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10203]={
-		["monster_base"]=10002,
+	[100203]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=129540000,
-		["atk"]=2060000,
-		["atk_times"]=0,
+		["atk"]=5600000,
+		["hp"]=680000000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -191,12 +351,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10303]={
-		["monster_base"]=10002,
+	[100303]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=162560000,
-		["atk"]=2150000,
-		["atk_times"]=0,
+		["atk"]=7200000,
+		["hp"]=920000000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -207,12 +367,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10403]={
-		["monster_base"]=10002,
+	[100403]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=171200000,
-		["atk"]=2590000,
-		["atk_times"]=0,
+		["atk"]=8460000,
+		["hp"]=1129820000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -223,12 +383,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10503]={
-		["monster_base"]=10002,
+	[100503]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=351000000,
-		["atk"]=2770000,
-		["atk_times"]=0,
+		["atk"]=11130000,
+		["hp"]=1662460000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -239,12 +399,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10603]={
-		["monster_base"]=10002,
+	[100603]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=210900000,
-		["atk"]=2680000,
-		["atk_times"]=0,
+		["atk"]=14100000,
+		["hp"]=2211230000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -255,12 +415,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10703]={
-		["monster_base"]=10002,
+	[100703]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=244760000,
-		["atk"]=2770000,
-		["atk_times"]=0,
+		["atk"]=18330000,
+		["hp"]=3002110000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -271,12 +431,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10803]={
-		["monster_base"]=10002,
+	[100803]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=286950000,
-		["atk"]=2740000,
-		["atk_times"]=0,
+		["atk"]=22640000,
+		["hp"]=3873680000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -287,12 +447,12 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[10903]={
-		["monster_base"]=10002,
+	[100903]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=329100000,
-		["atk"]=2880000,
-		["atk_times"]=0,
+		["atk"]=29540000,
+		["hp"]=5326320000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -303,12 +463,172 @@ local monster_dungeon = {
 		},
 		["monster_exp"]=0
 	},
-	[11003]={
-		["monster_base"]=10002,
+	[101003]={
+		["monster_base"]=501002,
 		["is_boss"]=2,
-		["hp"]=558600000,
-		["atk"]=2880000,
-		["atk_times"]=0,
+		["atk"]=32810000,
+		["hp"]=6197890000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101103]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=37930000,
+		["hp"]=8167020000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101203]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=44910000,
+		["hp"]=11120700000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101303]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=51810000,
+		["hp"]=13719300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101403]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=57900000,
+		["hp"]=16011230000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101503]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=63910000,
+		["hp"]=18577540000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101603]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=72890000,
+		["hp"]=22919300000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101703]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=82020000,
+		["hp"]=27712980000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101803]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=91520000,
+		["hp"]=33087720000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[101903]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=101320000,
+		["hp"]=38898250000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			30005,
+			30006,
+			30007
+		},
+		["passive_skill"]={
+			30008
+		},
+		["monster_exp"]=0
+	},
+	[102003]={
+		["monster_base"]=501002,
+		["is_boss"]=2,
+		["atk"]=113200000,
+		["hp"]=44418250000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			30005,
 			30006,
@@ -321,6 +641,6 @@ local monster_dungeon = {
 	}
 }
 local config = {
-data=monster_dungeon,count=20
+data=monster_dungeon,count=40
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index aa1d352e..9de9edc1 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -12524,7 +12524,8 @@ local skill = {
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=500001
 	},
 	[30002]={
 		["effect_type"]=1,
@@ -12547,7 +12548,8 @@ local skill = {
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
-		}
+		},
+		["fx_self"]=500002
 	},
 	[30003]={
 		["effect_type"]=1,
@@ -12570,7 +12572,8 @@ local skill = {
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=500003
 	},
 	[30004]={
 		["battle_icon"]="45002",
@@ -12590,7 +12593,19 @@ local skill = {
 			0
 		},
 		["cd"]=1,
-		["cd_start"]=1
+		["cd_start"]=1,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["name_act"]="skill01",
+		["name_hit"]={
+			"suffer03"
+		},
+		["fx_self"]=500004,
+		["bullet_time"]={
+			500,
+			3000,
+			400
+		}
 	},
 	[30005]={
 		["effect_type"]=1,
@@ -12613,7 +12628,8 @@ local skill = {
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=500011
 	},
 	[30006]={
 		["effect_type"]=1,
@@ -12636,7 +12652,8 @@ local skill = {
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
-		}
+		},
+		["fx_self"]=500011
 	},
 	[30007]={
 		["effect_type"]=1,
@@ -12659,7 +12676,8 @@ local skill = {
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=500011
 	},
 	[30008]={
 		["effect_type"]=2,
diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua
index 0be4465e..0ff6fcc0 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -2,7 +2,7 @@ local skill_rogue = {
 	[1]={
 		["universal"]=1,
 		["limit_times"]=1,
-		["weight"]=1000,
+		["weight"]=500,
 		["qlt"]=5,
 		["type"]=9,
 		["effect"]={
@@ -20,7 +20,7 @@ local skill_rogue = {
 	[2]={
 		["universal"]=1,
 		["limit_times"]=1,
-		["weight"]=1000,
+		["weight"]=500,
 		["qlt"]=5,
 		["type"]=9,
 		["effect"]={
@@ -38,7 +38,7 @@ local skill_rogue = {
 	[3]={
 		["universal"]=1,
 		["limit_times"]=1,
-		["weight"]=1000,
+		["weight"]=500,
 		["qlt"]=5,
 		["type"]=9,
 		["effect"]={
@@ -56,7 +56,7 @@ local skill_rogue = {
 	[4]={
 		["universal"]=1,
 		["limit_times"]=1,
-		["weight"]=1500,
+		["weight"]=600,
 		["qlt"]=5,
 		["type"]=9,
 		["effect"]={
@@ -75,7 +75,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=1,
 		["limit_times"]=1,
-		["weight"]=1000,
+		["weight"]=800,
 		["qlt"]=5,
 		["type"]=5,
 		["attr"]={
@@ -91,7 +91,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=1,
 		["limit_times"]=2,
-		["weight"]=2000,
+		["weight"]=1500,
 		["qlt"]=4,
 		["type"]=5,
 		["attr"]={
@@ -121,7 +121,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=2,
 		["limit_times"]=1,
-		["weight"]=1000,
+		["weight"]=800,
 		["qlt"]=5,
 		["type"]=5,
 		["attr"]={
@@ -137,7 +137,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=2,
 		["limit_times"]=2,
-		["weight"]=2000,
+		["weight"]=1500,
 		["qlt"]=4,
 		["type"]=5,
 		["attr"]={
@@ -167,7 +167,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=3,
 		["limit_times"]=1,
-		["weight"]=1000,
+		["weight"]=800,
 		["qlt"]=5,
 		["type"]=5,
 		["attr"]={
@@ -183,7 +183,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=3,
 		["limit_times"]=2,
-		["weight"]=2000,
+		["weight"]=1500,
 		["qlt"]=4,
 		["type"]=5,
 		["attr"]={
@@ -213,7 +213,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=13,
 		["limit_times"]=3,
-		["weight"]=2000,
+		["weight"]=1200,
 		["qlt"]=4,
 		["type"]=5,
 		["attr"]={
@@ -228,7 +228,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=8,
 		["limit_times"]=1,
-		["weight"]=1000,
+		["weight"]=800,
 		["qlt"]=5,
 		["type"]=5,
 		["attr"]={
@@ -244,7 +244,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=8,
 		["limit_times"]=2,
-		["weight"]=2000,
+		["weight"]=1500,
 		["qlt"]=4,
 		["type"]=5,
 		["attr"]={
@@ -259,7 +259,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=8,
 		["limit_times"]=3,
-		["weight"]=3000,
+		["weight"]=2000,
 		["qlt"]=3,
 		["type"]=5,
 		["attr"]={
@@ -274,7 +274,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=7,
 		["limit_times"]=1,
-		["weight"]=3000,
+		["weight"]=1500,
 		["qlt"]=4,
 		["type"]=5,
 		["attr"]={
@@ -289,7 +289,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=7,
 		["limit_times"]=2,
-		["weight"]=3000,
+		["weight"]=2000,
 		["qlt"]=3,
 		["type"]=5,
 		["attr"]={
@@ -302,7 +302,7 @@ local skill_rogue = {
 	},
 	[20]={
 		["universal"]=1,
-		["weight"]=1000,
+		["weight"]=1200,
 		["qlt"]=4,
 		["type"]=20,
 		["parameter"]={
@@ -312,7 +312,7 @@ local skill_rogue = {
 	},
 	[21]={
 		["universal"]=1,
-		["weight"]=1000,
+		["weight"]=1200,
 		["qlt"]=4,
 		["type"]=21,
 		["parameter"]={
@@ -322,7 +322,7 @@ local skill_rogue = {
 	},
 	[22]={
 		["universal"]=1,
-		["weight"]=1000,
+		["weight"]=1200,
 		["qlt"]=4,
 		["type"]=20,
 		["parameter"]={
@@ -333,7 +333,7 @@ local skill_rogue = {
 	[23]={
 		["universal"]=1,
 		["limit_times"]=2,
-		["weight"]=1000,
+		["weight"]=2000,
 		["qlt"]=3,
 		["type"]=9,
 		["effect"]={
@@ -350,7 +350,7 @@ local skill_rogue = {
 	[24]={
 		["universal"]=1,
 		["limit_times"]=2,
-		["weight"]=1000,
+		["weight"]=2000,
 		["qlt"]=3,
 		["type"]=9,
 		["effect"]={
@@ -367,7 +367,7 @@ local skill_rogue = {
 	[25]={
 		["universal"]=1,
 		["limit_times"]=2,
-		["weight"]=1000,
+		["weight"]=2000,
 		["qlt"]=3,
 		["type"]=9,
 		["effect"]={
@@ -384,7 +384,7 @@ local skill_rogue = {
 	[26]={
 		["universal"]=1,
 		["limit_times"]=2,
-		["weight"]=1000,
+		["weight"]=2000,
 		["qlt"]=3,
 		["type"]=9,
 		["effect"]={
@@ -401,7 +401,7 @@ local skill_rogue = {
 	[27]={
 		["universal"]=1,
 		["limit_times"]=2,
-		["weight"]=1000,
+		["weight"]=2000,
 		["qlt"]=3,
 		["type"]=9,
 		["effect"]={
@@ -4291,11 +4291,11 @@ local skill_rogue = {
 		["skill_position"]=3,
 		["boardrange"]={
 			{
-				["type"]=1,
+				["type"]=3,
 				["range"]=1
 			},
 			{
-				["type"]=2,
+				["type"]=4,
 				["range"]=1
 			}
 		},
@@ -4313,11 +4313,11 @@ local skill_rogue = {
 		["skill_position"]=3,
 		["boardrange"]={
 			{
-				["type"]=1,
+				["type"]=3,
 				["range"]=1
 			},
 			{
-				["type"]=2,
+				["type"]=4,
 				["range"]=1
 			}
 		},
@@ -4335,11 +4335,11 @@ local skill_rogue = {
 		["skill_position"]=3,
 		["boardrange"]={
 			{
-				["type"]=1,
+				["type"]=3,
 				["range"]=2
 			},
 			{
-				["type"]=2,
+				["type"]=4,
 				["range"]=2
 			}
 		},
@@ -4370,11 +4370,11 @@ local skill_rogue = {
 		["skill_position"]=3,
 		["boardrange"]={
 			{
-				["type"]=1,
+				["type"]=3,
 				["range"]=2
 			},
 			{
-				["type"]=2,
+				["type"]=4,
 				["range"]=2
 			}
 		}
diff --git a/lua/app/config/strings/cn/attr.lua b/lua/app/config/strings/cn/attr.lua
index aab408a6..3a9480d4 100644
--- a/lua/app/config/strings/cn/attr.lua
+++ b/lua/app/config/strings/cn/attr.lua
@@ -1,546 +1,279 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="生命提升{0}",
-		["name"]="hp"
+		["desc"]="生命提升{0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="攻击力提升{0}",
-		["name"]="atk_red"
+		["desc"]="攻击力提升{0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="攻击力提升{0}",
-		["name"]="atk_yellow"
+		["desc"]="攻击力提升{0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="攻击力提升{0}",
-		["name"]="atk_green"
+		["desc"]="攻击力提升{0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="攻击力提升{0}",
-		["name"]="atk_blue"
+		["desc"]="攻击力提升{0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="攻击力提升{0}",
-		["name"]="atk_purple"
+		["desc"]="攻击力提升{0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="暴击率提升{0}",
-		["name"]="attr_crit_red"
+		["desc"]="暴击率提升{0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="暴击率提升{0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="暴击率提升{0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="暴击率提升{0}",
-		["name"]="attr_crit_green"
+		["desc"]="暴击率提升{0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="暴击率提升{0}",
-		["name"]="attr_crit_blue"
+		["desc"]="暴击率提升{0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="暴击率提升{0}",
-		["name"]="attr_crit_purple"
+		["desc"]="暴击率提升{0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="暴击伤害提升{0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="暴击伤害提升{0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="暴击伤害提升{0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="暴击伤害提升{0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="暴击伤害提升{0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="暴击伤害提升{0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="暴击伤害提升{0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="暴击伤害提升{0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="暴击伤害提升{0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="暴击伤害提升{0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="治疗效果提升{0}",
-		["name"]="attr_cured_red"
+		["desc"]="治疗效果提升{0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="治疗效果提升{0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="治疗效果提升{0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="治疗效果提升{0}",
-		["name"]="attr_cured_green"
+		["desc"]="治疗效果提升{0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="治疗效果提升{0}",
-		["name"]="attr_cured_blue"
+		["desc"]="治疗效果提升{0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="治疗效果提升{0}",
-		["name"]="attr_cured_purple"
+		["desc"]="治疗效果提升{0}"
 	},
 	[22]={
-		["id"]=22,
-		["desc"]="{0}攻击+{1}",
-		["name"]="attr_atkp_red"
+		["desc"]="{0}攻击+{1}"
 	},
 	[23]={
-		["id"]=23,
-		["desc"]="{0}攻击+{1}",
-		["name"]="attr_atkp_yellow"
+		["desc"]="{0}攻击+{1}"
 	},
 	[24]={
-		["id"]=24,
-		["desc"]="{0}攻击+{1}",
-		["name"]="attr_atkp_green"
+		["desc"]="{0}攻击+{1}"
 	},
 	[25]={
-		["id"]=25,
-		["desc"]="{0}攻击+{1}",
-		["name"]="attr_atkp_blue"
+		["desc"]="{0}攻击+{1}"
 	},
 	[26]={
-		["id"]=26,
-		["desc"]="{0}攻击+{1}",
-		["name"]="attr_atkp_purple"
+		["desc"]="{0}攻击+{1}"
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="{0}生命+{1}",
-		["name"]="attr_hpp_red"
+		["desc"]="{0}生命+{1}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="{0}生命+{1}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="{0}生命+{1}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="{0}生命+{1}",
-		["name"]="attr_hpp_green"
+		["desc"]="{0}生命+{1}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="{0}生命+{1}",
-		["name"]="attr_hpp_blue"
+		["desc"]="{0}生命+{1}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="{0}生命+{1}",
-		["name"]="attr_hpp_purple"
+		["desc"]="{0}生命+{1}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="普攻伤害增加{0}点",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="普攻伤害增加{0}点"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="普攻伤害增加{0}点",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="普攻伤害增加{0}点"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="普攻伤害增加{0}点",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="普攻伤害增加{0}点"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="普攻伤害增加{0}点",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="普攻伤害增加{0}点"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="普攻伤害增加{0}点",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="普攻伤害增加{0}点"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="技能伤害增加{0}点",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="技能伤害增加{0}点"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="技能伤害增加{0}点",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="技能伤害增加{0}点"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="技能伤害增加{0}点",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="技能伤害增加{0}点"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="技能伤害增加{0}点",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="技能伤害增加{0}点"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="技能伤害增加{0}点",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="技能伤害增加{0}点"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="普攻伤害增加{0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="普攻伤害增加{0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="普攻伤害增加{0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="普攻伤害增加{0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="普攻伤害增加{0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="普攻伤害增加{0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="普攻伤害增加{0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="普攻伤害增加{0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="普攻伤害增加{0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="普攻伤害增加{0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="技能伤害增加{0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="技能伤害增加{0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="技能伤害增加{0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="技能伤害增加{0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="技能伤害增加{0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="技能伤害增加{0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="技能伤害增加{0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="技能伤害增加{0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="技能伤害增加{0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="技能伤害增加{0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="生命提升{0}",
-		["name"]="attr_hp_red"
+		["desc"]="生命提升{0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="生命提升{0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="生命提升{0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="生命提升{0}",
-		["name"]="attr_hp_green"
+		["desc"]="生命提升{0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="生命提升{0}",
-		["name"]="attr_hp_blue"
+		["desc"]="生命提升{0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="生命提升{0}",
-		["name"]="attr_hp_purple"
+		["desc"]="生命提升{0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="所有伤害提升{0}",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="所有伤害提升{0}"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="所有伤害提升{0}",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="所有伤害提升{0}"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="所有伤害提升{0}",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="所有伤害提升{0}"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="所有伤害提升{0}",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="所有伤害提升{0}"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="所有伤害提升{0}",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="所有伤害提升{0}"
 	},
 	[62]={
-		["id"]=62,
-		["desc"]="全体红色快递员攻击+{0}",
-		["name"]="attr_atkp_red_all"
+		["desc"]="全体红色快递员攻击+{0}"
 	},
 	[63]={
-		["id"]=63,
-		["desc"]="全体黄色快递员攻击+{0}",
-		["name"]="attr_atkp_yellow_all"
+		["desc"]="全体黄色快递员攻击+{0}"
 	},
 	[64]={
-		["id"]=64,
-		["desc"]="全体绿色快递员攻击+{0}",
-		["name"]="attr_atkp_green_all"
+		["desc"]="全体绿色快递员攻击+{0}"
 	},
 	[65]={
-		["id"]=65,
-		["desc"]="全体蓝色快递员攻击+{0}",
-		["name"]="attr_atkp_blue_all"
+		["desc"]="全体蓝色快递员攻击+{0}"
 	},
 	[66]={
-		["id"]=66,
-		["desc"]="全体紫色快递员攻击+{0}",
-		["name"]="attr_atkp_purple_all"
+		["desc"]="全体紫色快递员攻击+{0}"
 	},
 	[67]={
-		["id"]=67,
-		["desc"]="攻击+{0}",
-		["name"]="atk_all"
+		["desc"]="攻击+{0}"
 	},
 	[68]={
-		["id"]=68,
-		["desc"]="生命+{0}",
-		["name"]="attr_hp_all"
+		["desc"]="生命+{0}"
 	},
 	[69]={
-		["id"]=69,
-		["desc"]="减伤+{0}",
-		["name"]="attr_dmgdec_all"
+		["desc"]="减伤+{0}"
 	},
 	[70]={
-		["id"]=70,
-		["desc"]="暴击率+{0}",
-		["name"]="attr_crit_all"
+		["desc"]="暴击率+{0}"
 	},
 	[71]={
-		["id"]=71,
-		["desc"]="暴击伤害+{0}",
-		["name"]="attr_crit_time_all"
+		["desc"]="暴击伤害+{0}"
 	},
 	[72]={
-		["id"]=72,
-		["desc"]="普攻增伤+{0}",
-		["name"]="attr_normal_hurtp_all"
+		["desc"]="普攻增伤+{0}"
 	},
 	[73]={
-		["id"]=73,
-		["desc"]="技能增伤+{0}",
-		["name"]="attr_skill_hurtp_all"
+		["desc"]="技能增伤+{0}"
 	},
 	[74]={
-		["id"]=74,
-		["desc"]="攻击+{0}",
-		["name"]="attr_atkp_all"
+		["desc"]="攻击+{0}"
 	},
 	[75]={
-		["id"]=75,
-		["desc"]="攻击+{0}",
-		["name"]="attr_atk"
+		["name"]="攻击",
+		["desc"]="攻击+{0}"
 	},
 	[76]={
-		["id"]=76,
-		["desc"]="生命+{0}",
-		["name"]="attr_hp"
+		["name"]="生命",
+		["desc"]="生命+{0}"
 	},
 	[77]={
-		["id"]=77,
-		["desc"]="普攻增伤+{0}",
-		["name"]="attr_normal_hurt"
+		["name"]="普攻增伤",
+		["desc"]="普攻增伤+{0}"
 	},
 	[78]={
-		["id"]=78,
-		["desc"]="技能增伤+{0}",
-		["name"]="attr_skill_hurt"
+		["name"]="技能增伤",
+		["desc"]="技能增伤+{0}"
 	},
 	[79]={
-		["id"]=79,
-		["desc"]="减伤提升{0}",
-		["name"]="dmgdec"
+		["desc"]="减伤提升{0}"
 	},
 	[80]={
-		["id"]=80,
-		["desc"]="全体生命+{0}",
-		["name"]="attr_hpp_all"
+		["desc"]="全体生命+{0}"
 	},
 	[81]={
-		["id"]=81,
-		["desc"]="对普通怪物伤害+{0}",
-		["name"]="attr_monster_dmg"
+		["desc"]="对普通怪物伤害+{0}"
 	},
 	[82]={
-		["id"]=82,
-		["desc"]="对首领怪物伤害+{0}",
-		["name"]="attr_boss_dmg"
+		["desc"]="对首领怪物伤害+{0}"
 	},
 	[83]={
-		["id"]=83,
-		["desc"]="普攻伤害+{0}",
-		["name"]="attr_normal_hurtp"
+		["name"]="普攻增伤%",
+		["desc"]="普攻伤害+{0}"
 	},
 	[84]={
-		["id"]=84,
-		["desc"]="技能伤害+{0}",
-		["name"]="attr_skill_hurtp"
+		["name"]="技能增伤%",
+		["desc"]="技能伤害+{0}"
 	},
 	[85]={
-		["id"]=85,
-		["desc"]="全体红色快递员生命+{0}",
-		["name"]="attr_hpp_red_all"
+		["desc"]="全体红色快递员生命+{0}"
 	},
 	[86]={
-		["id"]=86,
-		["desc"]="全体黄色快递员生命+{0}",
-		["name"]="attr_hpp_yellow_all"
+		["desc"]="全体黄色快递员生命+{0}"
 	},
 	[87]={
-		["id"]=87,
-		["desc"]="全体绿色快递员生命+{0}",
-		["name"]="attr_hpp_green_all"
+		["desc"]="全体绿色快递员生命+{0}"
 	},
 	[88]={
-		["id"]=88,
-		["desc"]="全体蓝色快递员生命+{0}",
-		["name"]="attr_hpp_blue_all"
+		["desc"]="全体蓝色快递员生命+{0}"
 	},
 	[89]={
-		["id"]=89,
-		["desc"]="全体紫色快递员生命+{0}",
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+		["desc"]="全体紫色快递员生命+{0}"
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua
index c07a3d5c..0c2eafd7 100644
--- a/lua/app/config/strings/cn/item.lua
+++ b/lua/app/config/strings/cn/item.lua
@@ -1,195 +1,195 @@
 local item = {
 	[1]={
 		["name"]="金币",
-		["desc"]="通用货币，很多地方都会使用"
+		["desc"]="金币\n通用货币，很多地方都会使用"
 	},
 	[2]={
 		["name"]="钻石",
-		["desc"]="稀有货币，可以购买大部分道具"
+		["desc"]="钻石\n稀有货币，可以购买大部分道具"
 	},
 	[3]={
 		["name"]="体力",
-		["desc"]="闯关需要的当然是体力。"
+		["desc"]="体力\n闯关需要的当然是体力。"
 	},
 	[4]={
 		["name"]="经验",
-		["desc"]="累计达到一定数量可升级。"
+		["desc"]="经验\n累计达到一定数量可升级。"
 	},
 	[5]={
 		["name"]="宇宙魔方",
-		["desc"]="可以在普通招募中进行招募。"
+		["desc"]="宇宙魔方\n可以在普通招募中进行招募。"
 	},
 	[6]={
 		["name"]="高级信件",
-		["desc"]="可以在高级招募中进行招募。"
+		["desc"]="高级信件\n可以在高级招募中进行招募。"
 	},
 	[7]={
 		["name"]="神秘信件",
-		["desc"]="可以在限时招募中进行招募。"
+		["desc"]="神秘信件\n可以在限时招募中进行招募。"
 	},
 	[8]={
 		["name"]="竞技券",
-		["desc"]="每次挑战需要给竞技场记录员一张券。每天都有免费的券发放。"
+		["desc"]="竞技券\n每次挑战需要给竞技场记录员一张券。每天都有免费的券发放。"
 	},
 	[9]={
 		["name"]="红色能量饮料",
-		["desc"]="红元素英雄升级材料"
+		["desc"]="红色能量饮料\n红元素英雄升级材料"
 	},
 	[10]={
 		["name"]="黄色能量饮料",
-		["desc"]="黄元素英雄升级材料"
+		["desc"]="黄色能量饮料\n黄元素英雄升级材料"
 	},
 	[11]={
 		["name"]="绿色能量饮料",
-		["desc"]="绿元素英雄升级材料"
+		["desc"]="绿色能量饮料\n绿元素英雄升级材料"
 	},
 	[12]={
 		["name"]="蓝色能量饮料",
-		["desc"]="蓝元素英雄升级材料"
+		["desc"]="蓝色能量饮料\n蓝元素英雄升级材料"
 	},
 	[13]={
 		["name"]="紫色能量饮料",
-		["desc"]="紫元素英雄升级材料"
+		["desc"]="紫色能量饮料\n紫元素英雄升级材料"
 	},
 	[14]={
 		["name"]="稀有契约",
-		["desc"]="稀有英雄升星材料"
+		["desc"]="稀有契约\n稀有英雄升星材料"
 	},
 	[15]={
 		["name"]="史诗契约",
-		["desc"]="史诗英雄升星材料"
+		["desc"]="史诗契约\n史诗英雄升星材料"
 	},
 	[16]={
 		["name"]="传说契约",
-		["desc"]="传说英雄升星材料"
+		["desc"]="传说契约\n传说英雄升星材料"
 	},
 	[17]={
 		["name"]="神话契约",
-		["desc"]="神话英雄升星材料"
+		["desc"]="神话契约\n神话英雄升星材料"
 	},
 	[18]={
 		["name"]="随机能量饮料",
-		["desc"]="随机元素升级材料"
+		["desc"]="随机能量饮料\n随机元素升级材料"
 	},
 	[19]={
 		["name"]="强化石",
-		["desc"]="用于强化装备，提升强化等级。"
+		["desc"]="强化石\n用于强化装备，提升强化等级。"
 	},
 	[20]={
 		["name"]="精炼石",
-		["desc"]="用于提升装备精炼等级。"
+		["desc"]="精炼石\n用于提升装备精炼等级。"
 	},
 	[21]={
 		["name"]="绿色1星装备随机宝箱",
-		["desc"]="使用后获得1件随机绿色1星装备"
+		["desc"]="绿色1星装备随机宝箱\n使用后获得1件随机绿色1星装备"
 	},
 	[22]={
 		["name"]="绿色2星装备随机宝箱",
-		["desc"]="使用后获得1件随机绿色2星装备"
+		["desc"]="绿色2星装备随机宝箱\n使用后获得1件随机绿色2星装备"
 	},
 	[23]={
 		["name"]="蓝色1星装备随机宝箱",
-		["desc"]="使用后获得1件随机蓝色1星装备"
+		["desc"]="蓝色1星装备随机宝箱\n使用后获得1件随机蓝色1星装备"
 	},
 	[24]={
 		["name"]="蓝色2星装备随机宝箱",
-		["desc"]="使用后获得1件随机蓝色2星装备"
+		["desc"]="蓝色2星装备随机宝箱\n使用后获得1件随机蓝色2星装备"
 	},
 	[25]={
 		["name"]="蓝色3星装备随机宝箱",
-		["desc"]="使用后获得1件随机蓝色3星装备"
+		["desc"]="蓝色3星装备随机宝箱\n使用后获得1件随机蓝色3星装备"
 	},
 	[26]={
 		["name"]="紫色1星装备随机宝箱",
-		["desc"]="使用后获得1件随机紫色1星装备"
+		["desc"]="紫色1星装备随机宝箱\n使用后获得1件随机紫色1星装备"
 	},
 	[27]={
 		["name"]="紫色2星装备随机宝箱",
-		["desc"]="使用后获得1件随机紫色2星装备"
+		["desc"]="紫色2星装备随机宝箱\n使用后获得1件随机紫色2星装备"
 	},
 	[28]={
 		["name"]="紫色3星装备随机宝箱",
-		["desc"]="使用后获得1件随机紫色3星装备"
+		["desc"]="紫色3星装备随机宝箱\n使用后获得1件随机紫色3星装备"
 	},
 	[29]={
 		["name"]="紫色4星装备随机宝箱",
-		["desc"]="使用后获得1件随机紫色4星装备"
+		["desc"]="紫色4星装备随机宝箱\n使用后获得1件随机紫色4星装备"
 	},
 	[30]={
 		["name"]="橙色1星装备随机宝箱",
-		["desc"]="使用后获得1件随机橙色1星装备"
+		["desc"]="橙色1星装备随机宝箱\n使用后获得1件随机橙色1星装备"
 	},
 	[31]={
 		["name"]="橙色2星装备随机宝箱",
-		["desc"]="使用后获得1件随机橙色2星装备"
+		["desc"]="橙色2星装备随机宝箱\n使用后获得1件随机橙色2星装备"
 	},
 	[32]={
 		["name"]="橙色3星装备随机宝箱",
-		["desc"]="使用后获得1件随机橙色3星装备"
+		["desc"]="橙色3星装备随机宝箱\n使用后获得1件随机橙色3星装备"
 	},
 	[33]={
 		["name"]="橙色4星装备随机宝箱",
-		["desc"]="使用后获得1件随机橙色4星装备"
+		["desc"]="橙色4星装备随机宝箱\n使用后获得1件随机橙色4星装备"
 	},
 	[34]={
 		["name"]="橙色5星装备随机宝箱",
-		["desc"]="使用后获得1件随机橙色5星装备"
+		["desc"]="橙色5星装备随机宝箱\n使用后获得1件随机橙色5星装备"
 	},
 	[35]={
 		["name"]="红色1星装备随机宝箱",
-		["desc"]="使用后获得1件随机红色1星装备"
+		["desc"]="红色1星装备随机宝箱\n使用后获得1件随机红色1星装备"
 	},
 	[36]={
 		["name"]="红色2星装备随机宝箱",
-		["desc"]="使用后获得1件随机红色2星装备"
+		["desc"]="红色2星装备随机宝箱\n使用后获得1件随机红色2星装备"
 	},
 	[37]={
 		["name"]="红色3星装备随机宝箱",
-		["desc"]="使用后获得1件随机红色3星装备"
+		["desc"]="红色3星装备随机宝箱\n使用后获得1件随机红色3星装备"
 	},
 	[38]={
 		["name"]="红色4星装备随机宝箱",
-		["desc"]="使用后获得1件随机红色4星装备"
+		["desc"]="红色4星装备随机宝箱\n使用后获得1件随机红色4星装备"
 	},
 	[39]={
 		["name"]="红色5星装备随机宝箱",
-		["desc"]="使用后获得1件随机红色5星装备"
+		["desc"]="红色5星装备随机宝箱\n使用后获得1件随机红色5星装备"
 	},
 	[40]={
 		["name"]="稀有英雄随机宝箱",
-		["desc"]="使用后获得1个随机史诗英雄碎片"
+		["desc"]="稀有英雄随机宝箱\n使用后获得1个随机史诗英雄碎片"
 	},
 	[41]={
 		["name"]="史诗英雄随机宝箱",
-		["desc"]="使用后获得1个随机传说英雄碎片"
+		["desc"]="史诗英雄随机宝箱\n使用后获得1个随机传说英雄碎片"
 	},
 	[42]={
 		["name"]="史诗英雄自选宝箱",
-		["desc"]="使用后获得5个随机传说英雄碎片"
+		["desc"]="史诗英雄自选宝箱\n使用后获得5个随机传说英雄碎片"
 	},
 	[43]={
 		["name"]="传说英雄随机宝箱",
-		["desc"]="使用后获得20个随机传说英雄碎片"
+		["desc"]="传说英雄随机宝箱\n使用后获得20个随机传说英雄碎片"
 	},
 	[44]={
 		["name"]="传说英雄自选宝箱",
-		["desc"]="使用后可以自选1个传说英雄碎片"
+		["desc"]="传说英雄自选宝箱\n使用后可以自选1个传说英雄碎片"
 	},
 	[45]={
 		["name"]="七天乐积分",
-		["desc"]="完成七天乐任务可领取奖励"
+		["desc"]="七天乐积分\n完成七天乐任务可领取奖励"
 	},
 	[46]={
 		["name"]="心愿币",
-		["desc"]="普通卡池的心愿币，用于普通卡池兑换。"
+		["desc"]="心愿币\n普通卡池的心愿币，用于普通卡池兑换。"
 	},
 	[47]={
 		["name"]="金币副本门票",
-		["desc"]="参加金币副本挑战的凭证"
+		["desc"]="金币副本门票\n参加金币副本挑战的凭证"
 	},
 	[48]={
 		["name"]="材料副本门票",
-		["desc"]="参加材料副本挑战的凭证"
+		["desc"]="材料副本门票\n参加材料副本挑战的凭证"
 	},
 	[49]={
 		["name"]="随机契约"
diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua
index 8dc0dc0c..e611b2a6 100644
--- a/lua/app/config/strings/cn/skill_rogue.lua
+++ b/lua/app/config/strings/cn/skill_rogue.lua
@@ -1248,32 +1248,32 @@ local skill_rogue = {
 		["rougedesc"]="闪送雷神普攻20%几率附加<color=#5bff5f>虚弱</color>2回合"
 	},
 	[3300111]={
-		["desc"]="荒野镖客技能可上下消除2格",
+		["desc"]="荒野镖客技能可左右消除2格",
 		["entry_1"]="战斗中直接生效！",
-		["entry_2"]="上下消除增加2格",
+		["entry_2"]="左右消除增加2格",
 		["entry_3"]="技能链接时伤害增加15%",
-		["rougedesc"]="荒野镖客技能可上下消除2格"
+		["rougedesc"]="荒野镖客技能可左右消除2格"
 	},
 	[3300112]={
-		["desc"]="荒野镖客技能可上下消除2格",
+		["desc"]="荒野镖客技能可左右消除2格",
 		["entry_1"]="战斗中直接生效！",
-		["entry_2"]="上下消除增加2格",
+		["entry_2"]="左右消除增加2格",
 		["entry_3"]="技能链接时伤害增加15%",
-		["rougedesc"]="荒野镖客技能可上下消除2格"
+		["rougedesc"]="荒野镖客技能可左右消除2格"
 	},
 	[3300113]={
-		["desc"]="荒野镖客技能可上下消除2格",
+		["desc"]="荒野镖客技能可左右消除2格",
 		["entry_1"]="战斗中直接生效！",
-		["entry_2"]="上下消除增加2格",
+		["entry_2"]="左右消除增加2格",
 		["entry_3"]="技能链接时伤害增加15%",
-		["rougedesc"]="荒野镖客技能可上下消除4格"
+		["rougedesc"]="荒野镖客技能可左右消除4格"
 	},
 	[3300114]={
-		["desc"]="荒野镖客技能可上下消除2格",
+		["desc"]="荒野镖客技能可左右消除2格",
 		["entry_1"]="战斗中直接生效！",
-		["entry_2"]="上下消除增加2格",
+		["entry_2"]="左右消除增加2格",
 		["entry_3"]="技能链接时伤害增加15%",
-		["rougedesc"]="荒野镖客技能可上下消除2格，链接增伤15%"
+		["rougedesc"]="荒野镖客技能可左右消除2格，链接增伤15%"
 	},
 	[3300121]={
 		["desc"]="荒野镖客技能有30%几率附加<color=#049500>眩晕</color>，1回合",
diff --git a/lua/app/config/strings/cn/tutorial.lua b/lua/app/config/strings/cn/tutorial.lua
index 87dff3fe..034f79ba 100644
--- a/lua/app/config/strings/cn/tutorial.lua
+++ b/lua/app/config/strings/cn/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="领取宝箱，解锁新英雄"
 	},
 	["tutorial_txt_3"]={
-		["value"]="领取宝箱，获取英雄碎片"
+		["value"]="消耗饮料提升英雄等级"
 	},
 	["tutorial_txt_4"]={
-		["value"]="领取宝箱，获取第五位英雄"
+		["value"]="回到主线继续吧！"
 	},
 	["tutorial_txt_5"]={
 		["value"]="前往商城，获得更多英雄！"
diff --git a/lua/app/config/strings/de/attr.lua b/lua/app/config/strings/de/attr.lua
index eaef45e2..e8fad7b3 100644
--- a/lua/app/config/strings/de/attr.lua
+++ b/lua/app/config/strings/de/attr.lua
@@ -1,457 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["name"]="hp"
+
 	},
 	[2]={
-		["id"]=2,
-		["name"]="atk_red"
+
 	},
 	[3]={
-		["id"]=3,
-		["name"]="atk_yellow"
+
 	},
 	[4]={
-		["id"]=4,
-		["name"]="atk_green"
+
 	},
 	[5]={
-		["id"]=5,
-		["name"]="atk_blue"
+
 	},
 	[6]={
-		["id"]=6,
-		["name"]="atk_purple"
+
 	},
 	[7]={
-		["id"]=7,
-		["name"]="attr_crit_red"
+
 	},
 	[8]={
-		["id"]=8,
-		["name"]="attr_crit_yellow"
+
 	},
 	[9]={
-		["id"]=9,
-		["name"]="attr_crit_green"
+
 	},
 	[10]={
-		["id"]=10,
-		["name"]="attr_crit_blue"
+
 	},
 	[11]={
-		["id"]=11,
-		["name"]="attr_crit_purple"
+
 	},
 	[12]={
-		["id"]=12,
-		["name"]="attr_crit_time_red"
+
 	},
 	[13]={
-		["id"]=13,
-		["name"]="attr_crit_time_yellow"
+
 	},
 	[14]={
-		["id"]=14,
-		["name"]="attr_crit_time_green"
+
 	},
 	[15]={
-		["id"]=15,
-		["name"]="attr_crit_time_blue"
+
 	},
 	[16]={
-		["id"]=16,
-		["name"]="attr_crit_time_purple"
+
 	},
 	[17]={
-		["id"]=17,
-		["name"]="attr_cured_red"
+
 	},
 	[18]={
-		["id"]=18,
-		["name"]="attr_cured_yellow"
+
 	},
 	[19]={
-		["id"]=19,
-		["name"]="attr_cured_green"
+
 	},
 	[20]={
-		["id"]=20,
-		["name"]="attr_cured_blue"
+
 	},
 	[21]={
-		["id"]=21,
-		["name"]="attr_cured_purple"
+
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["name"]="attr_hpp_red"
+
 	},
 	[28]={
-		["id"]=28,
-		["name"]="attr_hpp_yellow"
+
 	},
 	[29]={
-		["id"]=29,
-		["name"]="attr_hpp_green"
+
 	},
 	[30]={
-		["id"]=30,
-		["name"]="attr_hpp_blue"
+
 	},
 	[31]={
-		["id"]=31,
-		["name"]="attr_hpp_purple"
+
 	},
 	[32]={
-		["id"]=32,
-		["name"]="attr_normal_hurt_red"
+
 	},
 	[33]={
-		["id"]=33,
-		["name"]="attr_normal_hurt_yellow"
+
 	},
 	[34]={
-		["id"]=34,
-		["name"]="attr_normal_hurt_green"
+
 	},
 	[35]={
-		["id"]=35,
-		["name"]="attr_normal_hurt_blue"
+
 	},
 	[36]={
-		["id"]=36,
-		["name"]="attr_normal_hurt_purple"
+
 	},
 	[37]={
-		["id"]=37,
-		["name"]="attr_skill_hurt_red"
+
 	},
 	[38]={
-		["id"]=38,
-		["name"]="attr_skill_hurt_yellow"
+
 	},
 	[39]={
-		["id"]=39,
-		["name"]="attr_skill_hurt_green"
+
 	},
 	[40]={
-		["id"]=40,
-		["name"]="attr_skill_hurt_blue"
+
 	},
 	[41]={
-		["id"]=41,
-		["name"]="attr_skill_hurt_purple"
+
 	},
 	[42]={
-		["id"]=42,
-		["name"]="attr_normal_hurtp_red"
+
 	},
 	[43]={
-		["id"]=43,
-		["name"]="attr_normal_hurtp_yellow"
+
 	},
 	[44]={
-		["id"]=44,
-		["name"]="attr_normal_hurtp_green"
+
 	},
 	[45]={
-		["id"]=45,
-		["name"]="attr_normal_hurtp_blue"
+
 	},
 	[46]={
-		["id"]=46,
-		["name"]="attr_normal_hurtp_purple"
+
 	},
 	[47]={
-		["id"]=47,
-		["name"]="attr_skill_hurtp_red"
+
 	},
 	[48]={
-		["id"]=48,
-		["name"]="attr_skill_hurtp_yellow"
+
 	},
 	[49]={
-		["id"]=49,
-		["name"]="attr_skill_hurtp_green"
+
 	},
 	[50]={
-		["id"]=50,
-		["name"]="attr_skill_hurtp_blue"
+
 	},
 	[51]={
-		["id"]=51,
-		["name"]="attr_skill_hurtp_purple"
+
 	},
 	[52]={
-		["id"]=52,
-		["name"]="attr_hp_red"
+
 	},
 	[53]={
-		["id"]=53,
-		["name"]="attr_hp_yellow"
+
 	},
 	[54]={
-		["id"]=54,
-		["name"]="attr_hp_green"
+
 	},
 	[55]={
-		["id"]=55,
-		["name"]="attr_hp_blue"
+
 	},
 	[56]={
-		["id"]=56,
-		["name"]="attr_hp_purple"
+
 	},
 	[57]={
-		["id"]=57,
-		["name"]="attr_all_hurtp_red"
+
 	},
 	[58]={
-		["id"]=58,
-		["name"]="attr_all_hurtp_yellow"
+
 	},
 	[59]={
-		["id"]=59,
-		["name"]="attr_all_hurtp_green"
+
 	},
 	[60]={
-		["id"]=60,
-		["name"]="attr_all_hurtp_blue"
+
 	},
 	[61]={
-		["id"]=61,
-		["name"]="attr_all_hurtp_purple"
+
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/en/attr.lua b/lua/app/config/strings/en/attr.lua
index a1c30ba5..e67213a0 100644
--- a/lua/app/config/strings/en/attr.lua
+++ b/lua/app/config/strings/en/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="HP +{0}",
-		["name"]="hp"
+		["desc"]="HP +{0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="ATK +{0}",
-		["name"]="atk_red"
+		["desc"]="ATK +{0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="ATK +{0}",
-		["name"]="atk_yellow"
+		["desc"]="ATK +{0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="ATK +{0}",
-		["name"]="atk_green"
+		["desc"]="ATK +{0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="ATK +{0}",
-		["name"]="atk_blue"
+		["desc"]="ATK +{0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="ATK +{0}",
-		["name"]="atk_purple"
+		["desc"]="ATK +{0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="CRIT Rate +{0}",
-		["name"]="attr_crit_red"
+		["desc"]="CRIT Rate +{0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="CRIT Rate +{0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="CRIT Rate +{0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="CRIT Rate +{0}",
-		["name"]="attr_crit_green"
+		["desc"]="CRIT Rate +{0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="CRIT Rate +{0}",
-		["name"]="attr_crit_blue"
+		["desc"]="CRIT Rate +{0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="CRIT Rate +{0}",
-		["name"]="attr_crit_purple"
+		["desc"]="CRIT Rate +{0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="CRIT DMG +{0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="CRIT DMG +{0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="CRIT DMG +{0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="CRIT DMG +{0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="CRIT DMG +{0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="CRIT DMG +{0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="CRIT DMG +{0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="CRIT DMG +{0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="CRIT DMG +{0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="CRIT DMG +{0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="Healing Effect +{0}",
-		["name"]="attr_cured_red"
+		["desc"]="Healing Effect +{0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="Healing Effect +{0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="Healing Effect +{0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="Healing Effect +{0}",
-		["name"]="attr_cured_green"
+		["desc"]="Healing Effect +{0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="Healing Effect +{0}",
-		["name"]="attr_cured_blue"
+		["desc"]="Healing Effect +{0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="Healing Effect +{0}",
-		["name"]="attr_cured_purple"
+		["desc"]="Healing Effect +{0}"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_red"
+		["desc"]="HP +{0}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="HP +{0}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_green"
+		["desc"]="HP +{0}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_blue"
+		["desc"]="HP +{0}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_purple"
+		["desc"]="HP +{0}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="Skill DMG +{0}"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="Skill DMG +{0}"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="Skill DMG +{0}"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="Skill DMG +{0}"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="Skill DMG +{0}"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="Normal Attack DMG +{0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="Normal Attack DMG +{0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="Skill DMG +{0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="Skill DMG +{0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="Skill DMG +{0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="Skill DMG +{0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="Skill DMG +{0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_red"
+		["desc"]="HP +{0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="HP +{0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_green"
+		["desc"]="HP +{0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_blue"
+		["desc"]="HP +{0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_purple"
+		["desc"]="HP +{0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="All damage increases by {0}",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="All damage increases by {0}"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="All damage increases by {0}",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="All damage increases by {0}"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="All damage increases by {0}",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="All damage increases by {0}"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="All damage increases by {0}",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="All damage increases by {0}"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="All damage increases by {0}",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="All damage increases by {0}"
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua
index 03474653..2177649e 100644
--- a/lua/app/config/strings/en/tutorial.lua
+++ b/lua/app/config/strings/en/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="Claim chest to unlock new hero"
 	},
 	["tutorial_txt_3"]={
-		["value"]="Claim chest to obtain Hero Shard"
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="Claim chest to obtain your 5th Hero"
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="Get more heroes in the shop!"
diff --git a/lua/app/config/strings/es/attr.lua b/lua/app/config/strings/es/attr.lua
index 5b6643b9..c8633974 100644
--- a/lua/app/config/strings/es/attr.lua
+++ b/lua/app/config/strings/es/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="HP +{0}",
-		["name"]="hp"
+		["desc"]="HP +{0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="ATQ +{0}",
-		["name"]="atk_red"
+		["desc"]="ATQ +{0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="ATQ +{0}",
-		["name"]="atk_yellow"
+		["desc"]="ATQ +{0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="ATQ +{0}",
-		["name"]="atk_green"
+		["desc"]="ATQ +{0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="ATQ +{0}",
-		["name"]="atk_blue"
+		["desc"]="ATQ +{0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="ATQ +{0}",
-		["name"]="atk_purple"
+		["desc"]="ATQ +{0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="Tasa de golpe crítico +{0}",
-		["name"]="attr_crit_red"
+		["desc"]="Tasa de golpe crítico +{0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="Tasa de golpe crítico +{0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="Tasa de golpe crítico +{0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="Tasa de golpe crítico +{0}",
-		["name"]="attr_crit_green"
+		["desc"]="Tasa de golpe crítico +{0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="Tasa de golpe crítico +{0}",
-		["name"]="attr_crit_blue"
+		["desc"]="Tasa de golpe crítico +{0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="Tasa de golpe crítico +{0}",
-		["name"]="attr_crit_purple"
+		["desc"]="Tasa de golpe crítico +{0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="Daño de golpe crítico aumenta en {0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="Daño de golpe crítico aumenta en {0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="Daño de golpe crítico aumenta en {0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="Daño de golpe crítico aumenta en {0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="Daño de golpe crítico aumenta en {0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="Daño de golpe crítico aumenta en {0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="Daño de golpe crítico aumenta en {0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="Daño de golpe crítico aumenta en {0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="Daño de golpe crítico aumenta en {0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="Daño de golpe crítico aumenta en {0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="Efecto curativo aumenta en {0}",
-		["name"]="attr_cured_red"
+		["desc"]="Efecto curativo aumenta en {0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="Efecto curativo aumenta en {0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="Efecto curativo aumenta en {0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="Efecto curativo aumenta en {0}",
-		["name"]="attr_cured_green"
+		["desc"]="Efecto curativo aumenta en {0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="Efecto curativo aumenta en {0}",
-		["name"]="attr_cured_blue"
+		["desc"]="Efecto curativo aumenta en {0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="Efecto curativo aumenta en {0}",
-		["name"]="attr_cured_purple"
+		["desc"]="Efecto curativo aumenta en {0}"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="Vida aumenta en {0}",
-		["name"]="attr_hpp_red"
+		["desc"]="Vida aumenta en {0}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="Vida aumenta en {0}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="Vida aumenta en {0}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="Vida aumenta en {0}",
-		["name"]="attr_hpp_green"
+		["desc"]="Vida aumenta en {0}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="Vida aumenta en {0}",
-		["name"]="attr_hpp_blue"
+		["desc"]="Vida aumenta en {0}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="Vida aumenta en {0}",
-		["name"]="attr_hpp_purple"
+		["desc"]="Vida aumenta en {0}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="Daño de ataque común aumenta en {0} puntos",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="Daño de ataque común aumenta en {0} puntos"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="Daño de ataque común aumenta en {0} puntos",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="Daño de ataque común aumenta en {0} puntos"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="Daño de ataque común aumenta en {0} puntos",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="Daño de ataque común aumenta en {0} puntos"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="Daño de ataque común aumenta en {0} puntos",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="Daño de ataque común aumenta en {0} puntos"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="Daño de ataque común aumenta en {0} puntos",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="Daño de ataque común aumenta en {0} puntos"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="Daño de habilidad aumenta en {0} puntos",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="Daño de habilidad aumenta en {0} puntos"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="Daño de habilidad aumenta en {0} puntos",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="Daño de habilidad aumenta en {0} puntos"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="Daño de habilidad aumenta en {0} puntos",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="Daño de habilidad aumenta en {0} puntos"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="Daño de habilidad aumenta en {0} puntos",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="Daño de habilidad aumenta en {0} puntos"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="Daño de habilidad aumenta en {0} puntos",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="Daño de habilidad aumenta en {0} puntos"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="Daño de ataque común aumenta en {0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="Daño de ataque común aumenta en {0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="Daño de ataque común aumenta en {0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="Daño de ataque común aumenta en {0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="Daño de ataque común aumenta en {0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="Daño de ataque común aumenta en {0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="Daño de ataque común aumenta en {0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="Daño de ataque común aumenta en {0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="Daño de ataque común aumenta en {0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="Daño de ataque común aumenta en {0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="Daño de habilidad aumenta en {0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="Daño de habilidad aumenta en {0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="Daño de habilidad aumenta en {0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="Daño de habilidad aumenta en {0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="Daño de habilidad aumenta en {0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="Daño de habilidad aumenta en {0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="Daño de habilidad aumenta en {0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="Daño de habilidad aumenta en {0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="Daño de habilidad aumenta en {0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="Daño de habilidad aumenta en {0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_red"
+		["desc"]="HP +{0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="HP +{0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_green"
+		["desc"]="HP +{0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_blue"
+		["desc"]="HP +{0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_purple"
+		["desc"]="HP +{0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="Todo el daño aumenta en {0}",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="Todo el daño aumenta en {0}"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="Todo el daño aumenta en {0}",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="Todo el daño aumenta en {0}"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="Todo el daño aumenta en {0}",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="Todo el daño aumenta en {0}"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="Todo el daño aumenta en {0}",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="Todo el daño aumenta en {0}"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="Todo el daño aumenta en {0}",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="Todo el daño aumenta en {0}"
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/es/tutorial.lua b/lua/app/config/strings/es/tutorial.lua
index 8f52bb35..17646410 100644
--- a/lua/app/config/strings/es/tutorial.lua
+++ b/lua/app/config/strings/es/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="Colecta el cofre y desbloquea nuevos héroes"
 	},
 	["tutorial_txt_3"]={
-		["value"]="Colecta el cofre para obtener fragmentos de héroes"
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="Colecta el cofre para obtener el quinto héroe"
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="¡Consigue más héroes en la Tienda!"
diff --git a/lua/app/config/strings/fr/attr.lua b/lua/app/config/strings/fr/attr.lua
index eaef45e2..e8fad7b3 100644
--- a/lua/app/config/strings/fr/attr.lua
+++ b/lua/app/config/strings/fr/attr.lua
@@ -1,457 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["name"]="hp"
+
 	},
 	[2]={
-		["id"]=2,
-		["name"]="atk_red"
+
 	},
 	[3]={
-		["id"]=3,
-		["name"]="atk_yellow"
+
 	},
 	[4]={
-		["id"]=4,
-		["name"]="atk_green"
+
 	},
 	[5]={
-		["id"]=5,
-		["name"]="atk_blue"
+
 	},
 	[6]={
-		["id"]=6,
-		["name"]="atk_purple"
+
 	},
 	[7]={
-		["id"]=7,
-		["name"]="attr_crit_red"
+
 	},
 	[8]={
-		["id"]=8,
-		["name"]="attr_crit_yellow"
+
 	},
 	[9]={
-		["id"]=9,
-		["name"]="attr_crit_green"
+
 	},
 	[10]={
-		["id"]=10,
-		["name"]="attr_crit_blue"
+
 	},
 	[11]={
-		["id"]=11,
-		["name"]="attr_crit_purple"
+
 	},
 	[12]={
-		["id"]=12,
-		["name"]="attr_crit_time_red"
+
 	},
 	[13]={
-		["id"]=13,
-		["name"]="attr_crit_time_yellow"
+
 	},
 	[14]={
-		["id"]=14,
-		["name"]="attr_crit_time_green"
+
 	},
 	[15]={
-		["id"]=15,
-		["name"]="attr_crit_time_blue"
+
 	},
 	[16]={
-		["id"]=16,
-		["name"]="attr_crit_time_purple"
+
 	},
 	[17]={
-		["id"]=17,
-		["name"]="attr_cured_red"
+
 	},
 	[18]={
-		["id"]=18,
-		["name"]="attr_cured_yellow"
+
 	},
 	[19]={
-		["id"]=19,
-		["name"]="attr_cured_green"
+
 	},
 	[20]={
-		["id"]=20,
-		["name"]="attr_cured_blue"
+
 	},
 	[21]={
-		["id"]=21,
-		["name"]="attr_cured_purple"
+
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["name"]="attr_hpp_red"
+
 	},
 	[28]={
-		["id"]=28,
-		["name"]="attr_hpp_yellow"
+
 	},
 	[29]={
-		["id"]=29,
-		["name"]="attr_hpp_green"
+
 	},
 	[30]={
-		["id"]=30,
-		["name"]="attr_hpp_blue"
+
 	},
 	[31]={
-		["id"]=31,
-		["name"]="attr_hpp_purple"
+
 	},
 	[32]={
-		["id"]=32,
-		["name"]="attr_normal_hurt_red"
+
 	},
 	[33]={
-		["id"]=33,
-		["name"]="attr_normal_hurt_yellow"
+
 	},
 	[34]={
-		["id"]=34,
-		["name"]="attr_normal_hurt_green"
+
 	},
 	[35]={
-		["id"]=35,
-		["name"]="attr_normal_hurt_blue"
+
 	},
 	[36]={
-		["id"]=36,
-		["name"]="attr_normal_hurt_purple"
+
 	},
 	[37]={
-		["id"]=37,
-		["name"]="attr_skill_hurt_red"
+
 	},
 	[38]={
-		["id"]=38,
-		["name"]="attr_skill_hurt_yellow"
+
 	},
 	[39]={
-		["id"]=39,
-		["name"]="attr_skill_hurt_green"
+
 	},
 	[40]={
-		["id"]=40,
-		["name"]="attr_skill_hurt_blue"
+
 	},
 	[41]={
-		["id"]=41,
-		["name"]="attr_skill_hurt_purple"
+
 	},
 	[42]={
-		["id"]=42,
-		["name"]="attr_normal_hurtp_red"
+
 	},
 	[43]={
-		["id"]=43,
-		["name"]="attr_normal_hurtp_yellow"
+
 	},
 	[44]={
-		["id"]=44,
-		["name"]="attr_normal_hurtp_green"
+
 	},
 	[45]={
-		["id"]=45,
-		["name"]="attr_normal_hurtp_blue"
+
 	},
 	[46]={
-		["id"]=46,
-		["name"]="attr_normal_hurtp_purple"
+
 	},
 	[47]={
-		["id"]=47,
-		["name"]="attr_skill_hurtp_red"
+
 	},
 	[48]={
-		["id"]=48,
-		["name"]="attr_skill_hurtp_yellow"
+
 	},
 	[49]={
-		["id"]=49,
-		["name"]="attr_skill_hurtp_green"
+
 	},
 	[50]={
-		["id"]=50,
-		["name"]="attr_skill_hurtp_blue"
+
 	},
 	[51]={
-		["id"]=51,
-		["name"]="attr_skill_hurtp_purple"
+
 	},
 	[52]={
-		["id"]=52,
-		["name"]="attr_hp_red"
+
 	},
 	[53]={
-		["id"]=53,
-		["name"]="attr_hp_yellow"
+
 	},
 	[54]={
-		["id"]=54,
-		["name"]="attr_hp_green"
+
 	},
 	[55]={
-		["id"]=55,
-		["name"]="attr_hp_blue"
+
 	},
 	[56]={
-		["id"]=56,
-		["name"]="attr_hp_purple"
+
 	},
 	[57]={
-		["id"]=57,
-		["name"]="attr_all_hurtp_red"
+
 	},
 	[58]={
-		["id"]=58,
-		["name"]="attr_all_hurtp_yellow"
+
 	},
 	[59]={
-		["id"]=59,
-		["name"]="attr_all_hurtp_green"
+
 	},
 	[60]={
-		["id"]=60,
-		["name"]="attr_all_hurtp_blue"
+
 	},
 	[61]={
-		["id"]=61,
-		["name"]="attr_all_hurtp_purple"
+
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/id/attr.lua b/lua/app/config/strings/id/attr.lua
index 3e1353fc..f1f1f1a2 100644
--- a/lua/app/config/strings/id/attr.lua
+++ b/lua/app/config/strings/id/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="HP +{0}",
-		["name"]="hp"
+		["desc"]="HP +{0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="ATK +{0}",
-		["name"]="atk_red"
+		["desc"]="ATK +{0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="ATK +{0}",
-		["name"]="atk_yellow"
+		["desc"]="ATK +{0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="ATK +{0}",
-		["name"]="atk_green"
+		["desc"]="ATK +{0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="ATK +{0}",
-		["name"]="atk_blue"
+		["desc"]="ATK +{0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="ATK +{0}",
-		["name"]="atk_purple"
+		["desc"]="ATK +{0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="Crit Rate +{0}",
-		["name"]="attr_crit_red"
+		["desc"]="Crit Rate +{0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="Crit Rate +{0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="Crit Rate +{0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="Crit Rate +{0}",
-		["name"]="attr_crit_green"
+		["desc"]="Crit Rate +{0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="Crit Rate +{0}",
-		["name"]="attr_crit_blue"
+		["desc"]="Crit Rate +{0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="Crit Rate +{0}",
-		["name"]="attr_crit_purple"
+		["desc"]="Crit Rate +{0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="Crit DMG +{0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="Crit DMG +{0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="Crit DMG +{0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="Crit DMG +{0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="Crit DMG +{0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="Crit DMG +{0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="Crit DMG +{0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="Crit DMG +{0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="Crit DMG +{0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="Crit DMG +{0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="Efek Heal +{0}",
-		["name"]="attr_cured_red"
+		["desc"]="Efek Heal +{0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="Efek Heal +{0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="Efek Heal +{0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="Efek Heal +{0}",
-		["name"]="attr_cured_green"
+		["desc"]="Efek Heal +{0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="Efek Heal +{0}",
-		["name"]="attr_cured_blue"
+		["desc"]="Efek Heal +{0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="Efek Heal +{0}",
-		["name"]="attr_cured_purple"
+		["desc"]="Efek Heal +{0}"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_red"
+		["desc"]="HP +{0}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="HP +{0}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_green"
+		["desc"]="HP +{0}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_blue"
+		["desc"]="HP +{0}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_purple"
+		["desc"]="HP +{0}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="Skill DMG +{0}"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="Skill DMG +{0}"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="Skill DMG +{0}"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="Skill DMG +{0}"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="Skill DMG +{0}"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="DMG ATK Normal +{0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="DMG ATK Normal +{0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="Skill DMG +{0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="Skill DMG +{0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="Skill DMG +{0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="Skill DMG +{0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="Skill DMG +{0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="Skill DMG +{0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_red"
+		["desc"]="HP +{0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="HP +{0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_green"
+		["desc"]="HP +{0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_blue"
+		["desc"]="HP +{0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_purple"
+		["desc"]="HP +{0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="Semua DMG meningkat {0}",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="Semua DMG meningkat {0}"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="Semua DMG meningkat {0}",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="Semua DMG meningkat {0}"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="Semua DMG meningkat {0}",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="Semua DMG meningkat {0}"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="Semua DMG meningkat {0}",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="Semua DMG meningkat {0}"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="Semua DMG meningkat {0}",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="Semua DMG meningkat {0}"
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/id/tutorial.lua b/lua/app/config/strings/id/tutorial.lua
index 856b7377..46fd284a 100644
--- a/lua/app/config/strings/id/tutorial.lua
+++ b/lua/app/config/strings/id/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="Klaim peti untuk membuka hero baru"
 	},
 	["tutorial_txt_3"]={
-		["value"]="Klaim peti untuk mendapatkan Shard Hero"
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="Klaim peti untuk mendapatkan Hero kelima"
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="Dapatkan lebih banyak Hero di Mall!"
diff --git a/lua/app/config/strings/ja/attr.lua b/lua/app/config/strings/ja/attr.lua
index e56e0ee7..c7e32268 100644
--- a/lua/app/config/strings/ja/attr.lua
+++ b/lua/app/config/strings/ja/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="HPが{0}増加する",
-		["name"]="hp"
+		["desc"]="HPが{0}増加する"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="攻撃力が{0}増加する",
-		["name"]="atk_red"
+		["desc"]="攻撃力が{0}増加する"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="攻撃力が{0}増加する",
-		["name"]="atk_yellow"
+		["desc"]="攻撃力が{0}増加する"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="攻撃力が{0}増加する",
-		["name"]="atk_green"
+		["desc"]="攻撃力が{0}増加する"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="攻撃力が{0}増加する",
-		["name"]="atk_blue"
+		["desc"]="攻撃力が{0}増加する"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="攻撃力が{0}増加する",
-		["name"]="atk_purple"
+		["desc"]="攻撃力が{0}増加する"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="クリティカル率が{0}増加する",
-		["name"]="attr_crit_red"
+		["desc"]="クリティカル率が{0}増加する"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="クリティカル率が{0}増加する",
-		["name"]="attr_crit_yellow"
+		["desc"]="クリティカル率が{0}増加する"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="クリティカル率が{0}増加する",
-		["name"]="attr_crit_green"
+		["desc"]="クリティカル率が{0}増加する"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="クリティカル率が{0}増加する",
-		["name"]="attr_crit_blue"
+		["desc"]="クリティカル率が{0}増加する"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="クリティカル率が{0}増加する",
-		["name"]="attr_crit_purple"
+		["desc"]="クリティカル率が{0}増加する"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="クリティカルダメージが{0}増加する",
-		["name"]="attr_crit_time_red"
+		["desc"]="クリティカルダメージが{0}増加する"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="クリティカルダメージが{0}増加する",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="クリティカルダメージが{0}増加する"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="クリティカルダメージが{0}増加する",
-		["name"]="attr_crit_time_green"
+		["desc"]="クリティカルダメージが{0}増加する"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="クリティカルダメージが{0}増加する",
-		["name"]="attr_crit_time_blue"
+		["desc"]="クリティカルダメージが{0}増加する"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="クリティカルダメージが{0}増加する",
-		["name"]="attr_crit_time_purple"
+		["desc"]="クリティカルダメージが{0}増加する"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="回復効果が{0}増加する",
-		["name"]="attr_cured_red"
+		["desc"]="回復効果が{0}増加する"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="回復効果が{0}増加する",
-		["name"]="attr_cured_yellow"
+		["desc"]="回復効果が{0}増加する"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="回復効果が{0}増加する",
-		["name"]="attr_cured_green"
+		["desc"]="回復効果が{0}増加する"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="回復効果が{0}増加する",
-		["name"]="attr_cured_blue"
+		["desc"]="回復効果が{0}増加する"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="回復効果が{0}増加する",
-		["name"]="attr_cured_purple"
+		["desc"]="回復効果が{0}増加する"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hpp_red"
+		["desc"]="HPが{0}増加する"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hpp_yellow"
+		["desc"]="HPが{0}増加する"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hpp_green"
+		["desc"]="HPが{0}増加する"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hpp_blue"
+		["desc"]="HPが{0}増加する"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hpp_purple"
+		["desc"]="HPが{0}増加する"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="通常攻撃ダメージが{0}カウント増加する",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="通常攻撃ダメージが{0}カウント増加する"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="通常攻撃ダメージが{0}カウント増加する",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="通常攻撃ダメージが{0}カウント増加する"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="通常攻撃ダメージが{0}カウント増加する",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="通常攻撃ダメージが{0}カウント増加する"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="通常攻撃ダメージが{0}カウント増加する",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="通常攻撃ダメージが{0}カウント増加する"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="通常攻撃ダメージが{0}カウント増加する",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="通常攻撃ダメージが{0}カウント増加する"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="スキルダメージが{0}カウント増加する",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="スキルダメージが{0}カウント増加する"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="スキルダメージが{0}カウント増加する",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="スキルダメージが{0}カウント増加する"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="スキルダメージが{0}カウント増加する",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="スキルダメージが{0}カウント増加する"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="スキルダメージが{0}カウント増加する",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="スキルダメージが{0}カウント増加する"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="スキルダメージが{0}カウント増加する",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="スキルダメージが{0}カウント増加する"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="通常攻撃ダメージが{0}増加する",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="通常攻撃ダメージが{0}増加する"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="通常攻撃ダメージが{0}増加する",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="通常攻撃ダメージが{0}増加する"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="通常攻撃ダメージが{0}増加する",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="通常攻撃ダメージが{0}増加する"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="通常攻撃ダメージが{0}増加する",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="通常攻撃ダメージが{0}増加する"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="通常攻撃ダメージが{0}増加する",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="通常攻撃ダメージが{0}増加する"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="スキルダメージが{0}増加する",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="スキルダメージが{0}増加する"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="スキルダメージが{0}増加する",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="スキルダメージが{0}増加する"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="スキルダメージが{0}増加する",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="スキルダメージが{0}増加する"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="スキルダメージが{0}増加する",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="スキルダメージが{0}増加する"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="スキルダメージが{0}増加する",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="スキルダメージが{0}増加する"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hp_red"
+		["desc"]="HPが{0}増加する"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hp_yellow"
+		["desc"]="HPが{0}増加する"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hp_green"
+		["desc"]="HPが{0}増加する"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hp_blue"
+		["desc"]="HPが{0}増加する"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="HPが{0}増加する",
-		["name"]="attr_hp_purple"
+		["desc"]="HPが{0}増加する"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="すべてのダメージが{0}増加する",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="すべてのダメージが{0}増加する"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="すべてのダメージが{0}増加する",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="すべてのダメージが{0}増加する"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="すべてのダメージが{0}増加する",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="すべてのダメージが{0}増加する"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="すべてのダメージが{0}増加する",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="すべてのダメージが{0}増加する"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="すべてのダメージが{0}増加する",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="すべてのダメージが{0}増加する"
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ja/tutorial.lua b/lua/app/config/strings/ja/tutorial.lua
index 66403bd7..dea3983e 100644
--- a/lua/app/config/strings/ja/tutorial.lua
+++ b/lua/app/config/strings/ja/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="宝箱を受取って、新ヒーローを解放しよう"
 	},
 	["tutorial_txt_3"]={
-		["value"]="宝箱を受取って、ヒーローピースを入手しよう"
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="宝箱を受取って、5人目のヒーローを入手しよう"
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="ショップへ移動し、多くのヒーローを入手しよう！"
diff --git a/lua/app/config/strings/ko/attr.lua b/lua/app/config/strings/ko/attr.lua
index 645df39f..aff98094 100644
--- a/lua/app/config/strings/ko/attr.lua
+++ b/lua/app/config/strings/ko/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="HP +{0}",
-		["name"]="hp"
+		["desc"]="HP +{0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="공격력 +{0}",
-		["name"]="atk_red"
+		["desc"]="공격력 +{0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="공격력 +{0}",
-		["name"]="atk_yellow"
+		["desc"]="공격력 +{0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="공격력 +{0}",
-		["name"]="atk_green"
+		["desc"]="공격력 +{0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="공격력 +{0}",
-		["name"]="atk_blue"
+		["desc"]="공격력 +{0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="공격력 +{0}",
-		["name"]="atk_purple"
+		["desc"]="공격력 +{0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="치명타율 +{0}",
-		["name"]="attr_crit_red"
+		["desc"]="치명타율 +{0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="치명타율 +{0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="치명타율 +{0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="치명타율 +{0}",
-		["name"]="attr_crit_green"
+		["desc"]="치명타율 +{0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="치명타율 +{0}",
-		["name"]="attr_crit_blue"
+		["desc"]="치명타율 +{0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="치명타율 +{0}",
-		["name"]="attr_crit_purple"
+		["desc"]="치명타율 +{0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="치명타 대미지 +{0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="치명타 대미지 +{0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="치명타 대미지 +{0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="치명타 대미지 +{0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="치명타 대미지 +{0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="치명타 대미지 +{0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="치명타 대미지 +{0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="치명타 대미지 +{0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="치명타 대미지 +{0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="치명타 대미지 +{0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="치유 효과 +{0}",
-		["name"]="attr_cured_red"
+		["desc"]="치유 효과 +{0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="치유 효과 +{0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="치유 효과 +{0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="치유 효과 +{0}",
-		["name"]="attr_cured_green"
+		["desc"]="치유 효과 +{0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="치유 효과 +{0}",
-		["name"]="attr_cured_blue"
+		["desc"]="치유 효과 +{0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="치유 효과 +{0}",
-		["name"]="attr_cured_purple"
+		["desc"]="치유 효과 +{0}"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_red"
+		["desc"]="HP +{0}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="HP +{0}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_green"
+		["desc"]="HP +{0}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_blue"
+		["desc"]="HP +{0}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="HP +{0}",
-		["name"]="attr_hpp_purple"
+		["desc"]="HP +{0}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="일반 공격 대미지 +{0} 포인트",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="일반 공격 대미지 +{0} 포인트"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="일반 공격 대미지 +{0} 포인트",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="일반 공격 대미지 +{0} 포인트"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="일반 공격 대미지 +{0} 포인트",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="일반 공격 대미지 +{0} 포인트"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="일반 공격 대미지 +{0} 포인트",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="일반 공격 대미지 +{0} 포인트"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="일반 공격 대미지 +{0} 포인트",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="일반 공격 대미지 +{0} 포인트"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="스킬 대미지 +{0} 포인트",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="스킬 대미지 +{0} 포인트"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="스킬 대미지 +{0} 포인트",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="스킬 대미지 +{0} 포인트"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="스킬 대미지 +{0} 포인트",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="스킬 대미지 +{0} 포인트"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="스킬 대미지 +{0} 포인트",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="스킬 대미지 +{0} 포인트"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="스킬 대미지 +{0} 포인트",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="스킬 대미지 +{0} 포인트"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="일반 공격 대미지 +{0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="일반 공격 대미지 +{0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="일반 공격 대미지 +{0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="일반 공격 대미지 +{0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="일반 공격 대미지 +{0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="일반 공격 대미지 +{0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="일반 공격 대미지 +{0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="일반 공격 대미지 +{0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="일반 공격 대미지 +{0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="일반 공격 대미지 +{0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="스킬 대미지 +{0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="스킬 대미지 +{0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="스킬 대미지 +{0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="스킬 대미지 +{0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="스킬 대미지 +{0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="스킬 대미지 +{0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="스킬 대미지 +{0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="스킬 대미지 +{0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="스킬 대미지 +{0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="스킬 대미지 +{0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_red"
+		["desc"]="HP +{0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="HP +{0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_green"
+		["desc"]="HP +{0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_blue"
+		["desc"]="HP +{0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="HP +{0}",
-		["name"]="attr_hp_purple"
+		["desc"]="HP +{0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="모든 대미지가 {0} 증가합니다.",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="모든 대미지가 {0} 증가합니다."
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="모든 대미지가 {0} 증가합니다.",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="모든 대미지가 {0} 증가합니다."
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="모든 대미지가 {0} 증가합니다.",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="모든 대미지가 {0} 증가합니다."
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="모든 대미지가 {0} 증가합니다.",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="모든 대미지가 {0} 증가합니다."
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="모든 대미지가 {0} 증가합니다.",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="모든 대미지가 {0} 증가합니다."
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ko/tutorial.lua b/lua/app/config/strings/ko/tutorial.lua
index 9870fd33..f7e4ad23 100644
--- a/lua/app/config/strings/ko/tutorial.lua
+++ b/lua/app/config/strings/ko/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="보물 상자를 획득하고 새로운 영웅을 잠금 해제하세요."
 	},
 	["tutorial_txt_3"]={
-		["value"]="보물 상자를 획득하여 영웅 파편을 얻으세요."
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="보물 상자를 받고 다섯 번째 영웅을 획득하세요."
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="상점에서 더 많은 영웅을 획득할 수 있습니다!"
diff --git a/lua/app/config/strings/pt/attr.lua b/lua/app/config/strings/pt/attr.lua
index 19972108..9ad19c1a 100644
--- a/lua/app/config/strings/pt/attr.lua
+++ b/lua/app/config/strings/pt/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="hp"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="Aumento de Ataque {0}",
-		["name"]="atk_red"
+		["desc"]="Aumento de Ataque {0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="Aumento de Ataque {0}",
-		["name"]="atk_yellow"
+		["desc"]="Aumento de Ataque {0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="Aumento de Ataque {0}",
-		["name"]="atk_green"
+		["desc"]="Aumento de Ataque {0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="Aumento de Ataque {0}",
-		["name"]="atk_blue"
+		["desc"]="Aumento de Ataque {0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="Aumento de Ataque {0}",
-		["name"]="atk_purple"
+		["desc"]="Aumento de Ataque {0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="Aumento da chance de acrt. crít. {0}",
-		["name"]="attr_crit_red"
+		["desc"]="Aumento da chance de acrt. crít. {0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="Aumento da chance de acrt. crít. {0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="Aumento da chance de acrt. crít. {0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="Aumento da chance de acrt. crít. {0}",
-		["name"]="attr_crit_green"
+		["desc"]="Aumento da chance de acrt. crít. {0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="Aumento da chance de acrt. crít. {0}",
-		["name"]="attr_crit_blue"
+		["desc"]="Aumento da chance de acrt. crít. {0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="Aumento da chance de acrt. crít. {0}",
-		["name"]="attr_crit_purple"
+		["desc"]="Aumento da chance de acrt. crít. {0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="Aumento do dano de acrt. crít. {0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="Aumento do dano de acrt. crít. {0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="Aumento do dano de acrt. crít. {0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="Aumento do dano de acrt. crít. {0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="Aumento do dano de acrt. crít. {0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="Aumento do dano de acrt. crít. {0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="Aumento do dano de acrt. crít. {0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="Aumento do dano de acrt. crít. {0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="Aumento do dano de acrt. crít. {0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="Aumento do dano de acrt. crít. {0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="Aumento do efeito de cura {0}",
-		["name"]="attr_cured_red"
+		["desc"]="Aumento do efeito de cura {0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="Aumento do efeito de cura {0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="Aumento do efeito de cura {0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="Aumento do efeito de cura {0}",
-		["name"]="attr_cured_green"
+		["desc"]="Aumento do efeito de cura {0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="Aumento do efeito de cura {0}",
-		["name"]="attr_cured_blue"
+		["desc"]="Aumento do efeito de cura {0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="Aumento do efeito de cura {0}",
-		["name"]="attr_cured_purple"
+		["desc"]="Aumento do efeito de cura {0}"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hpp_red"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hpp_green"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hpp_blue"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hpp_purple"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="Aumenta o dano de ataque básico em {0} pontos",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="Aumenta o dano de ataque básico em {0} pontos"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="Aumenta o dano de ataque básico em {0} pontos",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="Aumenta o dano de ataque básico em {0} pontos"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="Aumenta o dano de ataque básico em {0} pontos",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="Aumenta o dano de ataque básico em {0} pontos"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="Aumenta o dano de ataque básico em {0} pontos",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="Aumenta o dano de ataque básico em {0} pontos"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="Aumenta o dano de ataque básico em {0} pontos",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="Aumenta o dano de ataque básico em {0} pontos"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="Aumenta o dano de habilidade em {0} pontos",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="Aumenta o dano de habilidade em {0} pontos"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="Aumenta o dano de habilidade em {0} pontos",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="Aumenta o dano de habilidade em {0} pontos"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="Aumenta o dano de habilidade em {0} pontos",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="Aumenta o dano de habilidade em {0} pontos"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="Aumenta o dano de habilidade em {0} pontos",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="Aumenta o dano de habilidade em {0} pontos"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="Aumenta o dano de habilidade em {0} pontos",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="Aumenta o dano de habilidade em {0} pontos"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="Aumenta o dano de ataque básico em {0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="Aumenta o dano de ataque básico em {0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="Aumenta o dano de ataque básico em {0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="Aumenta o dano de ataque básico em {0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="Aumenta o dano de ataque básico em {0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="Aumenta o dano de ataque básico em {0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="Aumenta o dano de ataque básico em {0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="Aumenta o dano de ataque básico em {0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="Aumenta o dano de ataque básico em {0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="Aumenta o dano de ataque básico em {0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="Aumenta o dano de habilidade em {0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="Aumenta o dano de habilidade em {0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="Aumenta o dano de habilidade em {0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="Aumenta o dano de habilidade em {0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="Aumenta o dano de habilidade em {0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="Aumenta o dano de habilidade em {0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="Aumenta o dano de habilidade em {0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="Aumenta o dano de habilidade em {0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="Aumenta o dano de habilidade em {0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="Aumenta o dano de habilidade em {0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hp_red"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hp_green"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hp_blue"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="Aumento de Vida {0}",
-		["name"]="attr_hp_purple"
+		["desc"]="Aumento de Vida {0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="Aumenta o dano causado em {0}.",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="Aumenta o dano causado em {0}."
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="Aumenta o dano causado em {0}.",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="Aumenta o dano causado em {0}."
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="Aumenta o dano causado em {0}.",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="Aumenta o dano causado em {0}."
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="Aumenta o dano causado em {0}.",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="Aumenta o dano causado em {0}."
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="Aumenta o dano causado em {0}.",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="Aumenta o dano causado em {0}."
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/pt/tutorial.lua b/lua/app/config/strings/pt/tutorial.lua
index 5457b77b..1cd97d4f 100644
--- a/lua/app/config/strings/pt/tutorial.lua
+++ b/lua/app/config/strings/pt/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="Colete o baú para desbloquear novos heróis."
 	},
 	["tutorial_txt_3"]={
-		["value"]="Colete o baú para obter fragmentos de heróis."
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="Colete o baú para obter o quinto herói."
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="Vá até a loja e obtenha mais heróis!"
diff --git a/lua/app/config/strings/ru/attr.lua b/lua/app/config/strings/ru/attr.lua
index eaef45e2..e8fad7b3 100644
--- a/lua/app/config/strings/ru/attr.lua
+++ b/lua/app/config/strings/ru/attr.lua
@@ -1,457 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["name"]="hp"
+
 	},
 	[2]={
-		["id"]=2,
-		["name"]="atk_red"
+
 	},
 	[3]={
-		["id"]=3,
-		["name"]="atk_yellow"
+
 	},
 	[4]={
-		["id"]=4,
-		["name"]="atk_green"
+
 	},
 	[5]={
-		["id"]=5,
-		["name"]="atk_blue"
+
 	},
 	[6]={
-		["id"]=6,
-		["name"]="atk_purple"
+
 	},
 	[7]={
-		["id"]=7,
-		["name"]="attr_crit_red"
+
 	},
 	[8]={
-		["id"]=8,
-		["name"]="attr_crit_yellow"
+
 	},
 	[9]={
-		["id"]=9,
-		["name"]="attr_crit_green"
+
 	},
 	[10]={
-		["id"]=10,
-		["name"]="attr_crit_blue"
+
 	},
 	[11]={
-		["id"]=11,
-		["name"]="attr_crit_purple"
+
 	},
 	[12]={
-		["id"]=12,
-		["name"]="attr_crit_time_red"
+
 	},
 	[13]={
-		["id"]=13,
-		["name"]="attr_crit_time_yellow"
+
 	},
 	[14]={
-		["id"]=14,
-		["name"]="attr_crit_time_green"
+
 	},
 	[15]={
-		["id"]=15,
-		["name"]="attr_crit_time_blue"
+
 	},
 	[16]={
-		["id"]=16,
-		["name"]="attr_crit_time_purple"
+
 	},
 	[17]={
-		["id"]=17,
-		["name"]="attr_cured_red"
+
 	},
 	[18]={
-		["id"]=18,
-		["name"]="attr_cured_yellow"
+
 	},
 	[19]={
-		["id"]=19,
-		["name"]="attr_cured_green"
+
 	},
 	[20]={
-		["id"]=20,
-		["name"]="attr_cured_blue"
+
 	},
 	[21]={
-		["id"]=21,
-		["name"]="attr_cured_purple"
+
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["name"]="attr_hpp_red"
+
 	},
 	[28]={
-		["id"]=28,
-		["name"]="attr_hpp_yellow"
+
 	},
 	[29]={
-		["id"]=29,
-		["name"]="attr_hpp_green"
+
 	},
 	[30]={
-		["id"]=30,
-		["name"]="attr_hpp_blue"
+
 	},
 	[31]={
-		["id"]=31,
-		["name"]="attr_hpp_purple"
+
 	},
 	[32]={
-		["id"]=32,
-		["name"]="attr_normal_hurt_red"
+
 	},
 	[33]={
-		["id"]=33,
-		["name"]="attr_normal_hurt_yellow"
+
 	},
 	[34]={
-		["id"]=34,
-		["name"]="attr_normal_hurt_green"
+
 	},
 	[35]={
-		["id"]=35,
-		["name"]="attr_normal_hurt_blue"
+
 	},
 	[36]={
-		["id"]=36,
-		["name"]="attr_normal_hurt_purple"
+
 	},
 	[37]={
-		["id"]=37,
-		["name"]="attr_skill_hurt_red"
+
 	},
 	[38]={
-		["id"]=38,
-		["name"]="attr_skill_hurt_yellow"
+
 	},
 	[39]={
-		["id"]=39,
-		["name"]="attr_skill_hurt_green"
+
 	},
 	[40]={
-		["id"]=40,
-		["name"]="attr_skill_hurt_blue"
+
 	},
 	[41]={
-		["id"]=41,
-		["name"]="attr_skill_hurt_purple"
+
 	},
 	[42]={
-		["id"]=42,
-		["name"]="attr_normal_hurtp_red"
+
 	},
 	[43]={
-		["id"]=43,
-		["name"]="attr_normal_hurtp_yellow"
+
 	},
 	[44]={
-		["id"]=44,
-		["name"]="attr_normal_hurtp_green"
+
 	},
 	[45]={
-		["id"]=45,
-		["name"]="attr_normal_hurtp_blue"
+
 	},
 	[46]={
-		["id"]=46,
-		["name"]="attr_normal_hurtp_purple"
+
 	},
 	[47]={
-		["id"]=47,
-		["name"]="attr_skill_hurtp_red"
+
 	},
 	[48]={
-		["id"]=48,
-		["name"]="attr_skill_hurtp_yellow"
+
 	},
 	[49]={
-		["id"]=49,
-		["name"]="attr_skill_hurtp_green"
+
 	},
 	[50]={
-		["id"]=50,
-		["name"]="attr_skill_hurtp_blue"
+
 	},
 	[51]={
-		["id"]=51,
-		["name"]="attr_skill_hurtp_purple"
+
 	},
 	[52]={
-		["id"]=52,
-		["name"]="attr_hp_red"
+
 	},
 	[53]={
-		["id"]=53,
-		["name"]="attr_hp_yellow"
+
 	},
 	[54]={
-		["id"]=54,
-		["name"]="attr_hp_green"
+
 	},
 	[55]={
-		["id"]=55,
-		["name"]="attr_hp_blue"
+
 	},
 	[56]={
-		["id"]=56,
-		["name"]="attr_hp_purple"
+
 	},
 	[57]={
-		["id"]=57,
-		["name"]="attr_all_hurtp_red"
+
 	},
 	[58]={
-		["id"]=58,
-		["name"]="attr_all_hurtp_yellow"
+
 	},
 	[59]={
-		["id"]=59,
-		["name"]="attr_all_hurtp_green"
+
 	},
 	[60]={
-		["id"]=60,
-		["name"]="attr_all_hurtp_blue"
+
 	},
 	[61]={
-		["id"]=61,
-		["name"]="attr_all_hurtp_purple"
+
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/th/attr.lua b/lua/app/config/strings/th/attr.lua
index 5837ae49..289f6cbd 100644
--- a/lua/app/config/strings/th/attr.lua
+++ b/lua/app/config/strings/th/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="hp"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}",
-		["name"]="atk_red"
+		["desc"]="พลังโจมตีเพิ่มขึ้น {0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}",
-		["name"]="atk_yellow"
+		["desc"]="พลังโจมตีเพิ่มขึ้น {0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}",
-		["name"]="atk_green"
+		["desc"]="พลังโจมตีเพิ่มขึ้น {0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}",
-		["name"]="atk_blue"
+		["desc"]="พลังโจมตีเพิ่มขึ้น {0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="พลังโจมตีเพิ่มขึ้น {0}",
-		["name"]="atk_purple"
+		["desc"]="พลังโจมตีเพิ่มขึ้น {0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="อัตรา Crit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_red"
+		["desc"]="อัตรา Crit เพิ่มขึ้น {0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="อัตรา Crit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="อัตรา Crit เพิ่มขึ้น {0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="อัตรา Crit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_green"
+		["desc"]="อัตรา Crit เพิ่มขึ้น {0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="อัตรา Crit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_blue"
+		["desc"]="อัตรา Crit เพิ่มขึ้น {0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="อัตรา Crit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_purple"
+		["desc"]="อัตรา Crit เพิ่มขึ้น {0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="DmgCrit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="DmgCrit เพิ่มขึ้น {0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="DmgCrit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="DmgCrit เพิ่มขึ้น {0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="DmgCrit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="DmgCrit เพิ่มขึ้น {0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="DmgCrit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="DmgCrit เพิ่มขึ้น {0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="DmgCrit เพิ่มขึ้น {0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="DmgCrit เพิ่มขึ้น {0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}",
-		["name"]="attr_cured_red"
+		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}",
-		["name"]="attr_cured_green"
+		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}",
-		["name"]="attr_cured_blue"
+		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}",
-		["name"]="attr_cured_purple"
+		["desc"]="เอฟเฟกต์รักษาเพิ่มขึ้น {0}"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hpp_red"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hpp_green"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hpp_blue"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hpp_purple"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0} แต้ม"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0} แต้ม"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="ดาเมจโจมตีทั่วไปเพิ่มขึ้น {0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hp_red"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hp_green"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hp_blue"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="HP เพิ่มขึ้น {0}",
-		["name"]="attr_hp_purple"
+		["desc"]="HP เพิ่มขึ้น {0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="ดาเมจทั้งหมดเพิ่มขึ้น{0}"
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/th/tutorial.lua b/lua/app/config/strings/th/tutorial.lua
index fa224bbd..85237fce 100644
--- a/lua/app/config/strings/th/tutorial.lua
+++ b/lua/app/config/strings/th/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="รับหีบและปลดล็อกฮีโร่ใหม่"
 	},
 	["tutorial_txt_3"]={
-		["value"]="รับหีบและรับเศษฮีโร่"
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="รับหีบและรับฮีโร่คนที่ 5"
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="ไปที่ห้างเพื่อรับฮีโร่เพิ่มเติม!"
diff --git a/lua/app/config/strings/vi/attr.lua b/lua/app/config/strings/vi/attr.lua
index c9bf912e..7d56beee 100644
--- a/lua/app/config/strings/vi/attr.lua
+++ b/lua/app/config/strings/vi/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="Tăng {0} HP",
-		["name"]="hp"
+		["desc"]="Tăng {0} HP"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="Tăng {0} Công",
-		["name"]="atk_red"
+		["desc"]="Tăng {0} Công"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="Tăng {0} Công",
-		["name"]="atk_yellow"
+		["desc"]="Tăng {0} Công"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="Tăng {0} Công",
-		["name"]="atk_green"
+		["desc"]="Tăng {0} Công"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="Tăng {0} Công",
-		["name"]="atk_blue"
+		["desc"]="Tăng {0} Công"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="Tăng {0} Công",
-		["name"]="atk_purple"
+		["desc"]="Tăng {0} Công"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="Tăng {0} TL Chí Mạng",
-		["name"]="attr_crit_red"
+		["desc"]="Tăng {0} TL Chí Mạng"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="Tăng {0} TL Chí Mạng",
-		["name"]="attr_crit_yellow"
+		["desc"]="Tăng {0} TL Chí Mạng"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="Tăng {0} TL Chí Mạng",
-		["name"]="attr_crit_green"
+		["desc"]="Tăng {0} TL Chí Mạng"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="Tăng {0} TL Chí Mạng",
-		["name"]="attr_crit_blue"
+		["desc"]="Tăng {0} TL Chí Mạng"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="Tăng {0} TL Chí Mạng",
-		["name"]="attr_crit_purple"
+		["desc"]="Tăng {0} TL Chí Mạng"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="Tăng {0} sát thương Chí Mạng",
-		["name"]="attr_crit_time_red"
+		["desc"]="Tăng {0} sát thương Chí Mạng"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="Tăng {0} sát thương Chí Mạng",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="Tăng {0} sát thương Chí Mạng"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="Tăng {0} sát thương Chí Mạng",
-		["name"]="attr_crit_time_green"
+		["desc"]="Tăng {0} sát thương Chí Mạng"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="Tăng {0} sát thương Chí Mạng",
-		["name"]="attr_crit_time_blue"
+		["desc"]="Tăng {0} sát thương Chí Mạng"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="Tăng {0} sát thương Chí Mạng",
-		["name"]="attr_crit_time_purple"
+		["desc"]="Tăng {0} sát thương Chí Mạng"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="Tăng {0} hiệu quả Trị Liệu",
-		["name"]="attr_cured_red"
+		["desc"]="Tăng {0} hiệu quả Trị Liệu"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="Tăng {0} hiệu quả Trị Liệu",
-		["name"]="attr_cured_yellow"
+		["desc"]="Tăng {0} hiệu quả Trị Liệu"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="Tăng {0} hiệu quả Trị Liệu",
-		["name"]="attr_cured_green"
+		["desc"]="Tăng {0} hiệu quả Trị Liệu"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="Tăng {0} hiệu quả Trị Liệu",
-		["name"]="attr_cured_blue"
+		["desc"]="Tăng {0} hiệu quả Trị Liệu"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="Tăng {0} hiệu quả Trị Liệu",
-		["name"]="attr_cured_purple"
+		["desc"]="Tăng {0} hiệu quả Trị Liệu"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hpp_red"
+		["desc"]="Tăng {0} HP"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hpp_yellow"
+		["desc"]="Tăng {0} HP"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hpp_green"
+		["desc"]="Tăng {0} HP"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hpp_blue"
+		["desc"]="Tăng {0} HP"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hpp_purple"
+		["desc"]="Tăng {0} HP"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="Tăng {0} sát thương đánh thường",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="Tăng {0} sát thương đánh thường"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="Tăng {0} sát thương kỹ năng",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="Tăng {0} sát thương kỹ năng"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hp_red"
+		["desc"]="Tăng {0} HP"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hp_yellow"
+		["desc"]="Tăng {0} HP"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hp_green"
+		["desc"]="Tăng {0} HP"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hp_blue"
+		["desc"]="Tăng {0} HP"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="Tăng {0} HP",
-		["name"]="attr_hp_purple"
+		["desc"]="Tăng {0} HP"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="Tất cả ST tăng {0}",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="Tất cả ST tăng {0}"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="Tất cả ST tăng {0}",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="Tất cả ST tăng {0}"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="Tất cả ST tăng {0}",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="Tất cả ST tăng {0}"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="Tất cả ST tăng {0}",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="Tất cả ST tăng {0}"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="Tất cả ST tăng {0}",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="Tất cả ST tăng {0}"
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/vi/tutorial.lua b/lua/app/config/strings/vi/tutorial.lua
index 8e9f4fd8..67f64cd1 100644
--- a/lua/app/config/strings/vi/tutorial.lua
+++ b/lua/app/config/strings/vi/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="Nhận rương, mở khóa Anh Hùng mới"
 	},
 	["tutorial_txt_3"]={
-		["value"]="Nhận rương, nhận Mảnh Anh Hùng"
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="Nhận rương, nhận Anh Hùng thứ 5"
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="Đến SHOP, nhận thêm nhiều Anh Hùng!"
diff --git a/lua/app/config/strings/zh/attr.lua b/lua/app/config/strings/zh/attr.lua
index 6843de2f..242b2a14 100644
--- a/lua/app/config/strings/zh/attr.lua
+++ b/lua/app/config/strings/zh/attr.lua
@@ -1,513 +1,273 @@
 local attr = {
 	[1]={
-		["id"]=1,
-		["desc"]="生命提高{0}",
-		["name"]="hp"
+		["desc"]="生命提高{0}"
 	},
 	[2]={
-		["id"]=2,
-		["desc"]="攻擊力提高{0}",
-		["name"]="atk_red"
+		["desc"]="攻擊力提高{0}"
 	},
 	[3]={
-		["id"]=3,
-		["desc"]="攻擊力提高{0}",
-		["name"]="atk_yellow"
+		["desc"]="攻擊力提高{0}"
 	},
 	[4]={
-		["id"]=4,
-		["desc"]="攻擊力提高{0}",
-		["name"]="atk_green"
+		["desc"]="攻擊力提高{0}"
 	},
 	[5]={
-		["id"]=5,
-		["desc"]="攻擊力提高{0}",
-		["name"]="atk_blue"
+		["desc"]="攻擊力提高{0}"
 	},
 	[6]={
-		["id"]=6,
-		["desc"]="攻擊力提高{0}",
-		["name"]="atk_purple"
+		["desc"]="攻擊力提高{0}"
 	},
 	[7]={
-		["id"]=7,
-		["desc"]="暴擊率提高{0}",
-		["name"]="attr_crit_red"
+		["desc"]="暴擊率提高{0}"
 	},
 	[8]={
-		["id"]=8,
-		["desc"]="暴擊率提高{0}",
-		["name"]="attr_crit_yellow"
+		["desc"]="暴擊率提高{0}"
 	},
 	[9]={
-		["id"]=9,
-		["desc"]="暴擊率提高{0}",
-		["name"]="attr_crit_green"
+		["desc"]="暴擊率提高{0}"
 	},
 	[10]={
-		["id"]=10,
-		["desc"]="暴擊率提高{0}",
-		["name"]="attr_crit_blue"
+		["desc"]="暴擊率提高{0}"
 	},
 	[11]={
-		["id"]=11,
-		["desc"]="暴擊率提高{0}",
-		["name"]="attr_crit_purple"
+		["desc"]="暴擊率提高{0}"
 	},
 	[12]={
-		["id"]=12,
-		["desc"]="暴擊傷害提高{0}",
-		["name"]="attr_crit_time_red"
+		["desc"]="暴擊傷害提高{0}"
 	},
 	[13]={
-		["id"]=13,
-		["desc"]="暴擊傷害提高{0}",
-		["name"]="attr_crit_time_yellow"
+		["desc"]="暴擊傷害提高{0}"
 	},
 	[14]={
-		["id"]=14,
-		["desc"]="暴擊傷害提高{0}",
-		["name"]="attr_crit_time_green"
+		["desc"]="暴擊傷害提高{0}"
 	},
 	[15]={
-		["id"]=15,
-		["desc"]="暴擊傷害提高{0}",
-		["name"]="attr_crit_time_blue"
+		["desc"]="暴擊傷害提高{0}"
 	},
 	[16]={
-		["id"]=16,
-		["desc"]="暴擊傷害提高{0}",
-		["name"]="attr_crit_time_purple"
+		["desc"]="暴擊傷害提高{0}"
 	},
 	[17]={
-		["id"]=17,
-		["desc"]="治療效果提高{0}",
-		["name"]="attr_cured_red"
+		["desc"]="治療效果提高{0}"
 	},
 	[18]={
-		["id"]=18,
-		["desc"]="治療效果提高{0}",
-		["name"]="attr_cured_yellow"
+		["desc"]="治療效果提高{0}"
 	},
 	[19]={
-		["id"]=19,
-		["desc"]="治療效果提高{0}",
-		["name"]="attr_cured_green"
+		["desc"]="治療效果提高{0}"
 	},
 	[20]={
-		["id"]=20,
-		["desc"]="治療效果提高{0}",
-		["name"]="attr_cured_blue"
+		["desc"]="治療效果提高{0}"
 	},
 	[21]={
-		["id"]=21,
-		["desc"]="治療效果提高{0}",
-		["name"]="attr_cured_purple"
+		["desc"]="治療效果提高{0}"
 	},
 	[22]={
-		["id"]=22,
-		["name"]="attr_atkp_red"
+
 	},
 	[23]={
-		["id"]=23,
-		["name"]="attr_atkp_yellow"
+
 	},
 	[24]={
-		["id"]=24,
-		["name"]="attr_atkp_green"
+
 	},
 	[25]={
-		["id"]=25,
-		["name"]="attr_atkp_blue"
+
 	},
 	[26]={
-		["id"]=26,
-		["name"]="attr_atkp_purple"
+
 	},
 	[27]={
-		["id"]=27,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hpp_red"
+		["desc"]="生命提高{0}"
 	},
 	[28]={
-		["id"]=28,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hpp_yellow"
+		["desc"]="生命提高{0}"
 	},
 	[29]={
-		["id"]=29,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hpp_green"
+		["desc"]="生命提高{0}"
 	},
 	[30]={
-		["id"]=30,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hpp_blue"
+		["desc"]="生命提高{0}"
 	},
 	[31]={
-		["id"]=31,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hpp_purple"
+		["desc"]="生命提高{0}"
 	},
 	[32]={
-		["id"]=32,
-		["desc"]="普攻傷害增加{0}點",
-		["name"]="attr_normal_hurt_red"
+		["desc"]="普攻傷害增加{0}點"
 	},
 	[33]={
-		["id"]=33,
-		["desc"]="普攻傷害增加{0}點",
-		["name"]="attr_normal_hurt_yellow"
+		["desc"]="普攻傷害增加{0}點"
 	},
 	[34]={
-		["id"]=34,
-		["desc"]="普攻傷害增加{0}點",
-		["name"]="attr_normal_hurt_green"
+		["desc"]="普攻傷害增加{0}點"
 	},
 	[35]={
-		["id"]=35,
-		["desc"]="普攻傷害增加{0}點",
-		["name"]="attr_normal_hurt_blue"
+		["desc"]="普攻傷害增加{0}點"
 	},
 	[36]={
-		["id"]=36,
-		["desc"]="普攻傷害增加{0}點",
-		["name"]="attr_normal_hurt_purple"
+		["desc"]="普攻傷害增加{0}點"
 	},
 	[37]={
-		["id"]=37,
-		["desc"]="技能傷害增加{0}點",
-		["name"]="attr_skill_hurt_red"
+		["desc"]="技能傷害增加{0}點"
 	},
 	[38]={
-		["id"]=38,
-		["desc"]="技能傷害增加{0}點",
-		["name"]="attr_skill_hurt_yellow"
+		["desc"]="技能傷害增加{0}點"
 	},
 	[39]={
-		["id"]=39,
-		["desc"]="技能傷害增加{0}點",
-		["name"]="attr_skill_hurt_green"
+		["desc"]="技能傷害增加{0}點"
 	},
 	[40]={
-		["id"]=40,
-		["desc"]="技能傷害增加{0}點",
-		["name"]="attr_skill_hurt_blue"
+		["desc"]="技能傷害增加{0}點"
 	},
 	[41]={
-		["id"]=41,
-		["desc"]="技能傷害增加{0}點",
-		["name"]="attr_skill_hurt_purple"
+		["desc"]="技能傷害增加{0}點"
 	},
 	[42]={
-		["id"]=42,
-		["desc"]="普攻傷害增加{0}",
-		["name"]="attr_normal_hurtp_red"
+		["desc"]="普攻傷害增加{0}"
 	},
 	[43]={
-		["id"]=43,
-		["desc"]="普攻傷害增加{0}",
-		["name"]="attr_normal_hurtp_yellow"
+		["desc"]="普攻傷害增加{0}"
 	},
 	[44]={
-		["id"]=44,
-		["desc"]="普攻傷害增加{0}",
-		["name"]="attr_normal_hurtp_green"
+		["desc"]="普攻傷害增加{0}"
 	},
 	[45]={
-		["id"]=45,
-		["desc"]="普攻傷害增加{0}",
-		["name"]="attr_normal_hurtp_blue"
+		["desc"]="普攻傷害增加{0}"
 	},
 	[46]={
-		["id"]=46,
-		["desc"]="普攻傷害增加{0}",
-		["name"]="attr_normal_hurtp_purple"
+		["desc"]="普攻傷害增加{0}"
 	},
 	[47]={
-		["id"]=47,
-		["desc"]="技能傷害增加{0}",
-		["name"]="attr_skill_hurtp_red"
+		["desc"]="技能傷害增加{0}"
 	},
 	[48]={
-		["id"]=48,
-		["desc"]="技能傷害增加{0}",
-		["name"]="attr_skill_hurtp_yellow"
+		["desc"]="技能傷害增加{0}"
 	},
 	[49]={
-		["id"]=49,
-		["desc"]="技能傷害增加{0}",
-		["name"]="attr_skill_hurtp_green"
+		["desc"]="技能傷害增加{0}"
 	},
 	[50]={
-		["id"]=50,
-		["desc"]="技能傷害增加{0}",
-		["name"]="attr_skill_hurtp_blue"
+		["desc"]="技能傷害增加{0}"
 	},
 	[51]={
-		["id"]=51,
-		["desc"]="技能傷害增加{0}",
-		["name"]="attr_skill_hurtp_purple"
+		["desc"]="技能傷害增加{0}"
 	},
 	[52]={
-		["id"]=52,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hp_red"
+		["desc"]="生命提高{0}"
 	},
 	[53]={
-		["id"]=53,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hp_yellow"
+		["desc"]="生命提高{0}"
 	},
 	[54]={
-		["id"]=54,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hp_green"
+		["desc"]="生命提高{0}"
 	},
 	[55]={
-		["id"]=55,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hp_blue"
+		["desc"]="生命提高{0}"
 	},
 	[56]={
-		["id"]=56,
-		["desc"]="生命提高{0}",
-		["name"]="attr_hp_purple"
+		["desc"]="生命提高{0}"
 	},
 	[57]={
-		["id"]=57,
-		["desc"]="所有傷害提高{0}",
-		["name"]="attr_all_hurtp_red"
+		["desc"]="所有傷害提高{0}"
 	},
 	[58]={
-		["id"]=58,
-		["desc"]="所有傷害提高{0}",
-		["name"]="attr_all_hurtp_yellow"
+		["desc"]="所有傷害提高{0}"
 	},
 	[59]={
-		["id"]=59,
-		["desc"]="所有傷害提高{0}",
-		["name"]="attr_all_hurtp_green"
+		["desc"]="所有傷害提高{0}"
 	},
 	[60]={
-		["id"]=60,
-		["desc"]="所有傷害提高{0}",
-		["name"]="attr_all_hurtp_blue"
+		["desc"]="所有傷害提高{0}"
 	},
 	[61]={
-		["id"]=61,
-		["desc"]="所有傷害提高{0}",
-		["name"]="attr_all_hurtp_purple"
+		["desc"]="所有傷害提高{0}"
 	},
 	[62]={
-		["id"]=62,
-		["name"]="attr_atkp_red_all"
+
 	},
 	[63]={
-		["id"]=63,
-		["name"]="attr_atkp_yellow_all"
+
 	},
 	[64]={
-		["id"]=64,
-		["name"]="attr_atkp_green_all"
+
 	},
 	[65]={
-		["id"]=65,
-		["name"]="attr_atkp_blue_all"
+
 	},
 	[66]={
-		["id"]=66,
-		["name"]="attr_atkp_purple_all"
+
 	},
 	[67]={
-		["id"]=67,
-		["name"]="atk_all"
+
 	},
 	[68]={
-		["id"]=68,
-		["name"]="attr_hp_all"
+
 	},
 	[69]={
-		["id"]=69,
-		["name"]="attr_dmgdec_all"
+
 	},
 	[70]={
-		["id"]=70,
-		["name"]="attr_crit_all"
+
 	},
 	[71]={
-		["id"]=71,
-		["name"]="attr_crit_time_all"
+
 	},
 	[72]={
-		["id"]=72,
-		["name"]="attr_normal_hurtp_all"
+
 	},
 	[73]={
-		["id"]=73,
-		["name"]="attr_skill_hurtp_all"
+
 	},
 	[74]={
-		["id"]=74,
-		["name"]="attr_atkp_all"
+
 	},
 	[75]={
-		["id"]=75,
-		["name"]="attr_atk"
+
 	},
 	[76]={
-		["id"]=76,
-		["name"]="attr_hp"
+
 	},
 	[77]={
-		["id"]=77,
-		["name"]="attr_normal_hurt"
+
 	},
 	[78]={
-		["id"]=78,
-		["name"]="attr_skill_hurt"
+
 	},
 	[79]={
-		["id"]=79,
-		["name"]="dmgdec"
+
 	},
 	[80]={
-		["id"]=80,
-		["name"]="attr_hpp_all"
+
 	},
 	[81]={
-		["id"]=81,
-		["name"]="attr_monster_dmg"
+
 	},
 	[82]={
-		["id"]=82,
-		["name"]="attr_boss_dmg"
+
 	},
 	[83]={
-		["id"]=83,
-		["name"]="attr_normal_hurtp"
+
 	},
 	[84]={
-		["id"]=84,
-		["name"]="attr_skill_hurtp"
+
 	},
 	[85]={
-		["id"]=85,
-		["name"]="attr_hpp_red_all"
+
 	},
 	[86]={
-		["id"]=86,
-		["name"]="attr_hpp_yellow_all"
+
 	},
 	[87]={
-		["id"]=87,
-		["name"]="attr_hpp_green_all"
+
 	},
 	[88]={
-		["id"]=88,
-		["name"]="attr_hpp_blue_all"
+
 	},
 	[89]={
-		["id"]=89,
-		["name"]="attr_hpp_purple_all"
-	}
-}
-local keys = {
-	name = {
-		["hp"]=attr[1],
-		["atk_red"]=attr[2],
-		["atk_yellow"]=attr[3],
-		["atk_green"]=attr[4],
-		["atk_blue"]=attr[5],
-		["atk_purple"]=attr[6],
-		["attr_crit_red"]=attr[7],
-		["attr_crit_yellow"]=attr[8],
-		["attr_crit_green"]=attr[9],
-		["attr_crit_blue"]=attr[10],
-		["attr_crit_purple"]=attr[11],
-		["attr_crit_time_red"]=attr[12],
-		["attr_crit_time_yellow"]=attr[13],
-		["attr_crit_time_green"]=attr[14],
-		["attr_crit_time_blue"]=attr[15],
-		["attr_crit_time_purple"]=attr[16],
-		["attr_cured_red"]=attr[17],
-		["attr_cured_yellow"]=attr[18],
-		["attr_cured_green"]=attr[19],
-		["attr_cured_blue"]=attr[20],
-		["attr_cured_purple"]=attr[21],
-		["attr_atkp_red"]=attr[22],
-		["attr_atkp_yellow"]=attr[23],
-		["attr_atkp_green"]=attr[24],
-		["attr_atkp_blue"]=attr[25],
-		["attr_atkp_purple"]=attr[26],
-		["attr_hpp_red"]=attr[27],
-		["attr_hpp_yellow"]=attr[28],
-		["attr_hpp_green"]=attr[29],
-		["attr_hpp_blue"]=attr[30],
-		["attr_hpp_purple"]=attr[31],
-		["attr_normal_hurt_red"]=attr[32],
-		["attr_normal_hurt_yellow"]=attr[33],
-		["attr_normal_hurt_green"]=attr[34],
-		["attr_normal_hurt_blue"]=attr[35],
-		["attr_normal_hurt_purple"]=attr[36],
-		["attr_skill_hurt_red"]=attr[37],
-		["attr_skill_hurt_yellow"]=attr[38],
-		["attr_skill_hurt_green"]=attr[39],
-		["attr_skill_hurt_blue"]=attr[40],
-		["attr_skill_hurt_purple"]=attr[41],
-		["attr_normal_hurtp_red"]=attr[42],
-		["attr_normal_hurtp_yellow"]=attr[43],
-		["attr_normal_hurtp_green"]=attr[44],
-		["attr_normal_hurtp_blue"]=attr[45],
-		["attr_normal_hurtp_purple"]=attr[46],
-		["attr_skill_hurtp_red"]=attr[47],
-		["attr_skill_hurtp_yellow"]=attr[48],
-		["attr_skill_hurtp_green"]=attr[49],
-		["attr_skill_hurtp_blue"]=attr[50],
-		["attr_skill_hurtp_purple"]=attr[51],
-		["attr_hp_red"]=attr[52],
-		["attr_hp_yellow"]=attr[53],
-		["attr_hp_green"]=attr[54],
-		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56],
-		["attr_all_hurtp_red"]=attr[57],
-		["attr_all_hurtp_yellow"]=attr[58],
-		["attr_all_hurtp_green"]=attr[59],
-		["attr_all_hurtp_blue"]=attr[60],
-		["attr_all_hurtp_purple"]=attr[61],
-		["attr_atkp_red_all"]=attr[62],
-		["attr_atkp_yellow_all"]=attr[63],
-		["attr_atkp_green_all"]=attr[64],
-		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66],
-		["atk_all"]=attr[67],
-		["attr_hp_all"]=attr[68],
-		["attr_dmgdec_all"]=attr[69],
-		["attr_crit_all"]=attr[70],
-		["attr_crit_time_all"]=attr[71],
-		["attr_normal_hurtp_all"]=attr[72],
-		["attr_skill_hurtp_all"]=attr[73],
-		["attr_atkp_all"]=attr[74],
-		["attr_atk"]=attr[75],
-		["attr_hp"]=attr[76],
-		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78],
-		["dmgdec"]=attr[79],
-		["attr_hpp_all"]=attr[80],
-		["attr_monster_dmg"]=attr[81],
-		["attr_boss_dmg"]=attr[82],
-		["attr_normal_hurtp"]=attr[83],
-		["attr_skill_hurtp"]=attr[84],
-		["attr_hpp_red_all"]=attr[85],
-		["attr_hpp_yellow_all"]=attr[86],
-		["attr_hpp_green_all"]=attr[87],
-		["attr_hpp_blue_all"]=attr[88],
-		["attr_hpp_purple_all"]=attr[89]
+
 	}
 }
 local config = {
-data=attr,
-keys=keys,
-count=89
+data=attr,count=89
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/zh/tutorial.lua b/lua/app/config/strings/zh/tutorial.lua
index 0670ced0..dbb0baed 100644
--- a/lua/app/config/strings/zh/tutorial.lua
+++ b/lua/app/config/strings/zh/tutorial.lua
@@ -6,10 +6,10 @@ local tutorial = {
 		["value"]="領取寶箱，解鎖新英雄"
 	},
 	["tutorial_txt_3"]={
-		["value"]="領取寶箱，獲取英雄碎片"
+
 	},
 	["tutorial_txt_4"]={
-		["value"]="領取寶箱，獲取第五位英雄"
+
 	},
 	["tutorial_txt_5"]={
 		["value"]="前往商城，獲得更多英雄！"
diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua
index c9e67ab8..926efbe6 100644
--- a/lua/app/config/tutorial.lua
+++ b/lua/app/config/tutorial.lua
@@ -80,9 +80,158 @@ local tutorial = {
 			24,
 			34
 		}
+	},
+	[20000]={
+		["next_id"]=20010,
+		["type"]=3,
+		["txt"]="tutorial_txt_2",
+		["txt_offset"]={
+			0,
+			180
+		},
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/middle_bg/box_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		},
+		["show_mask"]=2,
+		["circle_r"]=100,
+		["circle_offset"]={
+			0,
+			0
+		}
+	},
+	[20010]={
+		["next_id"]=20020,
+		["type"]=4,
+		["finish"]=1,
+		["finish_parameter"]=2
+	},
+	[20020]={
+		["next_id"]=20030,
+		["type"]=5,
+		["finish"]=2,
+		["finish_parameter"]=2
+	},
+	[20030]={
+		["next_id"]=20040,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[20040]={
+		["next_id"]=20050,
+		["type"]=2,
+		["heroid"]=13001,
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-100
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			25,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[20050]={
+		["next_id"]=20040,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/bottom_bg/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[20040]={
+		["next_id"]=20050,
+		["type"]=2,
+		["heroid"]=13001,
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-100
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			25,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[20050]={
+		["next_id"]=20060,
+		["type"]=3,
+		["txt"]="tutorial_txt_3",
+		["txt_offset"]={
+			0,
+			180
+		},
+		["target_name"]="hero_detail_ui(Clone)/middle/hero_info/up/up_5_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[20060]={
+		["next_id"]=20070,
+		["delay"]=1.0,
+		["type"]=2,
+		["target_name"]="hero_detail_ui(Clone)/bottom/close_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[20070]={
+		["type"]=3,
+		["txt"]="tutorial_txt_4",
+		["txt_offset"]={
+			0,
+			40
+		},
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
 	}
 }
 local config = {
-data=tutorial,count=8
+data=tutorial,count=18
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/tutorial_start.lua b/lua/app/config/tutorial_start.lua
index 9e02ca63..e1baef2e 100644
--- a/lua/app/config/tutorial_start.lua
+++ b/lua/app/config/tutorial_start.lua
@@ -2,9 +2,13 @@ local tutorial_start = {
 	[1]={
 		["start_id"]=10000,
 		["uires_path"]="assets/prefabs/ui/battle/battle_ui.prefab"
+	},
+	[2]={
+		["start_id"]=20000,
+		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
 	}
 }
 local config = {
-data=tutorial_start,count=1
+data=tutorial_start,count=2
 }
 return config
\ No newline at end of file
diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua
index 215eca61..84447266 100644
--- a/lua/app/global/global_const.lua
+++ b/lua/app/global/global_const.lua
@@ -693,7 +693,16 @@ GConst.MATCH_ALL_HPP_NAME = {
 	[5] = "attr_hpp_purple_all",
 }
 
-GConst.ALL_ATTR = {
+GConst.ATTR_PERSIONAL = {
+	ATTR_ATK = "attr_atk",						-- 通用个人攻击（固定值）
+	ATTR_HP = "attr_hp",						-- 通用个人生命（固定值）	生命
+	ATTR_NORMAL_HURT = "attr_normal_hurt",		-- 通用个人普攻伤害增加（固定值）	普攻增伤
+	ATTR_SKILL_HURT = "attr_skill_hurt",		-- 通用个人普攻伤害增加（固定值）	普攻增伤
+	ATTR_NORMAL_HURTP = "attr_normal_hurtp",	-- 通用个人普攻伤害增加（百分比）
+	ATTR_SKILL_HURTP = "attr_skill_hurtp",		-- 通用个人技能伤害增加（百分比）
+}
+
+GConst.ATTR_ALL = {
 	ATTR_ATK_ALL = "atk_all",						-- 全体英雄攻击（固定值）
 	ATTR_HP_ALL = "attr_hp_all",					-- 全体英雄生命（固定值）
 	ATTR_DMGDEC_ALL = "attr_dmgdec_all",			-- 全体减伤（固定值）
diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua
index a6ceef7e..4ffed16e 100644
--- a/lua/app/global/global_func.lua
+++ b/lua/app/global/global_func.lua
@@ -1828,14 +1828,14 @@ function GFunc.formatPlayerFormationInfo(info)
 
 		-- 处理全局属性
 		local attr = {}
-		attr[GConst.ALL_ATTR.ATTR_ATK_ALL] = allAttr[GConst.ALL_ATTR.ATTR_ATK_ALL]
-		attr[GConst.ALL_ATTR.ATTR_HP_ALL] = allAttr[GConst.ALL_ATTR.ATTR_HP_ALL]
-		attr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = allAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL]
-		attr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = allAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL]
-		attr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = allAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL]
-		attr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = allAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL]
-		attr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = allAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL]
-		attr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = allAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL]
+		attr[GConst.ATTR_ALL.ATTR_ATK_ALL] = allAttr[GConst.ATTR_ALL.ATTR_ATK_ALL]
+		attr[GConst.ATTR_ALL.ATTR_HP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_HP_ALL]
+		attr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = allAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL]
+		attr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = allAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL]
+		attr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = allAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL]
+		attr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL]
+		attr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL]
+		attr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL]
 
 		DataManager.HeroDataOther:setTalentAttr(attr)
 	end
diff --git a/lua/app/module/equip/equip_manager.lua b/lua/app/module/equip/equip_manager.lua
index 389c16e0..adfe4e6b 100644
--- a/lua/app/module/equip/equip_manager.lua
+++ b/lua/app/module/equip/equip_manager.lua
@@ -29,12 +29,12 @@ function EquipManager:showEquipResolveUI()
 end
 
 -- 套装效果弹窗
-function EquipManager:showEquipGetResonateUI(type, lvNew, attrNum, attrNextNum)
+function EquipManager:showEquipGetResonateUI(type, lvNew, attrs, attrNexts)
 	local params = {
 		type = type,
 		lvNew = lvNew,
-		attrNum = attrNum,
-		attrNextNum = attrNextNum,
+		attrs = attrs,
+		attrNexts = attrNexts,
 	}
 	UIManager:showUI("app/ui/equip/equip_get_resonate_ui", params)
 end
@@ -53,13 +53,14 @@ end
 
 function EquipManager:onEquipWearRsp(result)
 	if result.err_code == GConst.ERROR_STR.SUCCESS then
-		local lvOld, nextLv, attrNum, attrNextNum = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.QLT, result.reqData.slot)
+		local lvOld, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.QLT, result.reqData.slot)
 		DataManager.EquipData:onWearSuccess(result.reqData.slot, result.reqData.ids)
+		DataManager.HeroData:setAllHeroesDitry()
 		DataManager.HeroData:setDirty()
 		DataManager.HeroData:calcPower()
 		local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.QLT, result.reqData.slot)
 		if lvOld < lvNew then
-			self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.QLT, lvNew, attrNum, attrNextNum)
+			self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.QLT, lvNew, attrs, attrNexts)
 			-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.QLT, lvNew)
 		end
 	end
@@ -80,13 +81,14 @@ end
 
 function EquipManager:onEquipUpgradeRsp(result)
 	if result.err_code == GConst.ERROR_STR.SUCCESS then
-		local lvOld, nextLv, attrNum, attrNextNum = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
+		local lvOld, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
 		DataManager.EquipData:onUpgradeSuccess(result.reqData.slot, result.upgraded)
+		DataManager.HeroData:setAllHeroesDitry()
 		DataManager.HeroData:setDirty()
 		DataManager.HeroData:calcPower()
 		local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
 		if lvOld < lvNew then
-			self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew, attrNum, attrNextNum)
+			self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew, attrs, attrNexts)
 			-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew)
 		end
 	end
@@ -107,13 +109,14 @@ end
 
 function EquipManager:onEquipRefineRsp(result)
 	if result.err_code == GConst.ERROR_STR.SUCCESS then
-		local lvOld, nextLv, attrNum, attrNextNum = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
+		local lvOld, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
 		DataManager.EquipData:onRefineSuccess(result.reqData.slot, result.reqData.part, result.part)
+		DataManager.HeroData:setAllHeroesDitry()
 		DataManager.HeroData:setDirty()
 		DataManager.HeroData:calcPower()
 		local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
 		if lvOld < lvNew then
-			self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew, attrNum, attrNextNum)
+			self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew, attrs, attrNexts)
 			-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew)
 		end
 	end
diff --git a/lua/app/ui/common/cell/equip_cell.lua b/lua/app/ui/common/cell/equip_cell.lua
index 466b72b5..89d1eb80 100644
--- a/lua/app/ui/common/cell/equip_cell.lua
+++ b/lua/app/ui/common/cell/equip_cell.lua
@@ -75,6 +75,7 @@ function EquipCell:_refresh(entity, showMask, showCheck, showLock)
 
 	self.qltImg:setSprite(GConst.ATLAS_PATH.ICON_EQUIP, "frame_" .. qlt)
 	self.iconImg:setSprite(GConst.ATLAS_PATH.ICON_EQUIP, icon)
+	self.iconImg:setActive(true)
 	for i, v in ipairs(self.starImgs) do
 		if i <= star then
 			v:setActive(true)
diff --git a/lua/app/ui/equip/equip_get_resonate_ui.lua b/lua/app/ui/equip/equip_get_resonate_ui.lua
index 05866712..6f515553 100755
--- a/lua/app/ui/equip/equip_get_resonate_ui.lua
+++ b/lua/app/ui/equip/equip_get_resonate_ui.lua
@@ -4,8 +4,8 @@ local EquipGetEesonateUI = class("EquipGetEesonateUI", BaseTips)
 function EquipGetEesonateUI:ctor(params)
 	self.type = params.type
 	self.lvNew = params.lvNew
-	self.attrNum = params.attrNum
-	self.attrNextNum = params.attrNextNum
+	self.attrs = params.attrs
+	self.attrNexts = params.attrNexts
 end
 
 function EquipGetEesonateUI:getPrefabPath()
@@ -22,20 +22,76 @@ function EquipGetEesonateUI:onLoadRootComplete()
 		self:closeUI()
 	end)
 
-	self.layout = uiMap["equip_get_resonate_ui.bg.attr_bg.layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
-	self.attrNextValueTx = uiMap["equip_get_resonate_ui.bg.attr_bg.layout.attr_next_value_tx"]
-	-- self.effect = uiMap["equip_get_resonate_ui.bg.vfx_b13_ui_equip_gongmin_b01"]
+	self.bg = uiMap["equip_get_resonate_ui.bg"]
 	uiMap["equip_get_resonate_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_33))
-	-- self.spineTitle:playAnimComplete("born", false, true, function()
-	--     self.spineTitle:playAnim("idle", true, true)
-	-- end)
 	uiMap["equip_get_resonate_ui.bg.name_tx"]:setText(I18N:getGlobalText("EQUIP_HERO_LV_" .. self.type, self.lvNew))
-	-- self.effect:play()
-	uiMap["equip_get_resonate_ui.bg.attr_bg.attr_name_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_ATK))
-	uiMap["equip_get_resonate_ui.bg.attr_bg.layout.attr_curr_value_tx"]:setText(self.attrNum)
-	self.attrNextValueTx:setText(self.attrNextNum)
-	GFunc.setTextLength(self.attrNextValueTx)
-	self.layout:RefreshLayout()
+
+	self.attrBgs = {}
+	self.attrNameTxs = {}
+	self.attrLayouts = {}
+	self.attrCurrValueTxs = {}
+	self.attrArrowImgs = {}
+	self.attrNextValueTxs = {}
+	for i = 1, 2 do
+		self.attrBgs[i] = uiMap["equip_get_resonate_ui.bg.attr_bg_" .. i]
+		self.attrNameTxs[i] = uiMap["equip_get_resonate_ui.bg.attr_bg_" .. i .. ".attr_name_tx"]
+		self.attrLayouts[i] = uiMap["equip_get_resonate_ui.bg.attr_bg_" .. i .. ".layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
+		self.attrCurrValueTxs[i] = uiMap["equip_get_resonate_ui.bg.attr_bg_" .. i .. ".layout.attr_curr_value_tx"]
+		self.attrArrowImgs[i] = uiMap["equip_get_resonate_ui.bg.attr_bg_" .. i .. ".layout.arrow_img"]
+		self.attrNextValueTxs[i] = uiMap["equip_get_resonate_ui.bg.attr_bg_" .. i .. ".layout.attr_next_value_tx"]
+	end
+end
+
+function EquipGetEesonateUI:onRefresh()
+	local typeList = {}
+	for k, v in pairs(self.attrNexts or {}) do
+		table.insert(typeList, {typeName = k, id = GFunc.getAttrIdByName(k)})
+	end
+	if #typeList <= 0 then
+		for k, v in pairs(self.attrs or {}) do
+			table.insert(typeList, {typeName = k, id = GFunc.getAttrIdByName(k)})
+		end
+	end
+	table.sort(typeList, function (a, b)
+		return a.id < b.id
+	end)
+	for i = 1, 2 do
+		if typeList[i] and typeList[i].typeName then
+			local typeName = typeList[i].typeName
+			self.attrBgs[i]:setActive(true)
+			self.attrNameTxs[i]:setText(GFunc.getAttrNameByType(typeName))
+			self.attrCurrValueTxs[i]:setText(GFunc.getFinalAttrValue(typeName, self.attrs[typeName] or 0))
+			local meshProCompNow = self.attrCurrValueTxs[i]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
+			local nowTipsNowX = meshProCompNow.preferredWidth
+			self.attrCurrValueTxs[i]:setSizeDeltaX(nowTipsNowX)
+
+			self.attrNextValueTxs[i]:setText(GFunc.getFinalAttrValue(typeName, self.attrNexts[typeName] or 0))
+			self.attrArrowImgs[i]:setActive(true)
+			self.attrNextValueTxs[i]:setActive(true)
+
+			local meshProCompNext = self.attrNextValueTxs[i]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
+			local nowTipsNextX = meshProCompNext.preferredWidth
+			self.attrNextValueTxs[i]:setSizeDeltaX(nowTipsNextX)
+			self.attrLayouts[i]:RefreshLayout()
+		else
+			self.attrBgs[i]:setActive(false)
+		end
+	end
+	if #typeList < 2 then
+		self.bg:setSizeDeltaY(200)
+	else
+		self.bg:setSizeDeltaY(260)
+	end
+
+	-- self.layout = uiMap["equip_get_resonate_ui.bg.attr_bg.layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
+	-- self.attrNextValueTx = uiMap["equip_get_resonate_ui.bg.attr_bg.layout.attr_next_value_tx"]
+	-- -- self.effect = uiMap["equip_get_resonate_ui.bg.vfx_b13_ui_equip_gongmin_b01"]
+	-- -- self.effect:play()
+	-- uiMap["equip_get_resonate_ui.bg.attr_bg.attr_name_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_ATK))
+	-- uiMap["equip_get_resonate_ui.bg.attr_bg.layout.attr_curr_value_tx"]:setText(self.attrNum)
+	-- self.attrNextValueTx:setText(self.attrNextNum)
+	-- GFunc.setTextLength(self.attrNextValueTx)
+	-- self.layout:RefreshLayout()
 end
 
 return EquipGetEesonateUI
\ No newline at end of file
diff --git a/lua/app/ui/equip/equip_growth_ui.lua b/lua/app/ui/equip/equip_growth_ui.lua
index d97e118f..c086a3d8 100644
--- a/lua/app/ui/equip/equip_growth_ui.lua
+++ b/lua/app/ui/equip/equip_growth_ui.lua
@@ -213,19 +213,18 @@ function EquipGrowthUI:refreshPageUp()
 
 	self.upCurrLvTx:setText(lv)
 	self.upDescTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_14))
-	local lv1 = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, self.equipPart)
+	local lv1 = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, self.slotId)
 	self.upDescTx1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_ACTIVATION_1, lv1))
 	self.upMaxDescTx:setActive(isLvMax)
 
-	local _, _, resonateAttrNum = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, self.equipPart)
 	local currAttr = equipEntity:getBaseAttrWithLv(lv)
 	self.upAttrNameTx:setText(GFunc.getAttrNameByType(currAttr.type))
-	local currAttrNum = GFunc.getFinalAttrValue(currAttr.type, currAttr.num + resonateAttrNum, 2)
+	local currAttrNum = GFunc.getFinalAttrValue(currAttr.type, currAttr.num, 2)
 	self.upAttrCurrTx:setText(currAttrNum)
 	if not isLvMax then
 		self.upNextLvTx:setText(lv + 1)
 		local nextAttr = equipEntity:getBaseAttrWithLv(lv + 1)
-		local nextAttrNum = GFunc.getFinalAttrValue(nextAttr.type, nextAttr.num + resonateAttrNum, 2)
+		local nextAttrNum = GFunc.getFinalAttrValue(nextAttr.type, nextAttr.num, 2)
 		self.upAttrNextTx:setText(nextAttrNum)
 		local itemCost = DataManager.EquipData:getLevelCost(lv + 1)
 		local costId = GFunc.getRewardId(itemCost)
@@ -233,7 +232,7 @@ function EquipGrowthUI:refreshPageUp()
 		local count = DataManager.BagData.ItemData:getItemNumById(costId)
 		self.upCostIcon:setSprite(ModuleManager.ItemManager:getItemIcon(costId))
 		if costNum > count then
-			self.upCostTx:setText("<color=#FF0000>" .. count .. "</color>/"..costNum)
+			self.upCostTx:setText("<color=#049500>" .. count .. "</color>/"..costNum)
 		else
 			self.upCostTx:setText(count .. "/" .. costNum)
 		end
@@ -269,7 +268,7 @@ function EquipGrowthUI:refreshPageRefine()
 	self.refineCurrLvTx:setText(refine)
 	self.refineNextLvTx:setText(refine + 1)
 	self.refineDescTx:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_12))
-	local lv1 = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, self.equipPart)
+	local lv1 = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, self.slotId)
 	self.refineDescTx1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_ACTIVATION_2, lv1))
 	if isMaxRefine then
 		self.refineRateTx:setActive(false)
@@ -278,7 +277,7 @@ function EquipGrowthUI:refreshPageRefine()
 		self.refineDescTx2:setActive(true)
 		self.refineDescTx2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_26))
 	else
-			local lv = DataManager.EquipData:getPartLv(self.slotId, self.equipPart)
+		local lv = DataManager.EquipData:getPartLv(self.slotId, self.equipPart)
 		local needLevel = DataManager.EquipData:getRefineNeedLevel(refine + 1)
 		self.refineDescTx2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_34, needLevel))
 		local showLimit = lv < needLevel
@@ -296,7 +295,7 @@ function EquipGrowthUI:refreshPageRefine()
 		local count = DataManager.BagData.ItemData:getItemNumById(costId)
 		self.refineCostIcon:setSprite(ModuleManager.ItemManager:getItemIcon(costId))
 		if costNum > count then
-			self.refineCostTx:setText("<color=#FF0000>" .. count .. "</color>/".. costNum)
+			self.refineCostTx:setText("<color=#049500>" .. count .. "</color>/".. costNum)
 		else
 			self.refineCostTx:setText(count .. "/" .. costNum)
 		end
diff --git a/lua/app/ui/equip/equip_info_ui.lua b/lua/app/ui/equip/equip_info_ui.lua
index c4c039d1..e0a1d2f9 100644
--- a/lua/app/ui/equip/equip_info_ui.lua
+++ b/lua/app/ui/equip/equip_info_ui.lua
@@ -94,12 +94,12 @@ function EquipInfoUI:refreshInfo()
 	self.powerTx:setText(self.entity:getPower())
 	local attr = self.entity:getBaseAttr()
 	self.attrNameTx:setText(GFunc.getAttrNameByType(attr.type))
-	self.attrValueTx:setText(attr.num // GConst.DEFAULT_FACTOR)
+	self.attrValueTx:setText(GFunc.getAttrDesc(attr.type, attr.num))
 
 	local meshProCompNext = self.attrValueAddTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
 	local nowTipsNextX = meshProCompNext.preferredWidth
 	self.attrValueAddTx:setSizeDeltaX(nowTipsNextX)
-	local anchorX = nowTipsNextX - 40
+	local anchorX = - nowTipsNextX - 40
 	self.attrValueTx:setAnchoredPositionX(anchorX)
 end
 
@@ -158,12 +158,13 @@ function EquipInfoUI:refreshAllAttr()
 	self.equipCell:refresh(self.entity, self.slotId)
 	self.level = DataManager.EquipData:getPartLv(self.slotId, self.part)
 	self.refine = DataManager.EquipData:getPartRefine(self.slotId, self.part)
-	local resonateLv, resonateNextLv, resonateAttrNum, resonateAttrNextNum = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, self.slotId)
-	local baseValueAdd = DataManager.EquipData:getBaseAttrLvAdd(self.entity:getBaseAttr().type, self.level) + resonateAttrNum
+	local typeName = self.entity:getBaseAttr().type
+	local resonateLv, resonateNextLv, resonateAttrs, resonateAttrNexts = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, self.slotId)
+	local baseValueAdd = DataManager.EquipData:getBaseAttrLvAdd(typeName, self.level)-- + (resonateAttrs[typeName] or 0)
 	if baseValueAdd <= 0 then
 		self.attrValueAddTx:setText(GConst.EMPTY_STRING)
 	else
-		self.attrValueAddTx:setText("<color=#049500>(+".. math.floor(baseValueAdd) ..")</color>")
+		self.attrValueAddTx:setText("<color=#049500>(+".. GFunc.getFinalAttrValue(typeName, baseValueAdd) ..")</color>")
 	end
 
 	local attrs = self.entity:getExtraList()
@@ -172,16 +173,16 @@ function EquipInfoUI:refreshAllAttr()
 		if count >= i then
 			cell.attrExtraCell:setActive(true)
 			local extraAttr = attrs[i]
-			local extraAttrId = GFunc.getAttrIdByName(extraAttr.type)
+			-- local extraAttrId = GFunc.getAttrIdByName(extraAttr.type)
 			cell.attrNameTx:setText(GFunc.getAttrNameByType(extraAttr.type))
 			cell.attrValueTx:setText(GFunc.getFinalAttrValue(extraAttr.type, extraAttr.num, 2))
-			local attrAdd = DataManager.EquipData:getRefineAttrAdd(self.refine, extraAttrId)
+			local attrAdd = DataManager.EquipData:getRefineAttrAdd(self.refine, extraAttr.type)
 			local anchorX = -40
 			if attrAdd.num <= 0 then
 				cell.attrValueAddTx:setActive(false)
 			else
 				cell.attrValueAddTx:setActive(true)
-				cell.attrValueAddTx:setText("<color=#09FF00>(+".. GFunc.getFinalAttrValue(attrAdd.type, attrAdd.num, 2) ..")</color>")
+				cell.attrValueAddTx:setText("<color=#049500>(+".. GFunc.getFinalAttrValue(attrAdd.type, attrAdd.num, 2) ..")</color>")
 				local meshProCompNext = cell.attrValueAddTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
 				local nowTipsNextX = meshProCompNext.preferredWidth
 				cell.attrValueAddTx:setSizeDeltaX(nowTipsNextX)
diff --git a/lua/app/ui/equip/equip_resonate_ui.lua b/lua/app/ui/equip/equip_resonate_ui.lua
index 9d964bf4..6d0aa003 100755
--- a/lua/app/ui/equip/equip_resonate_ui.lua
+++ b/lua/app/ui/equip/equip_resonate_ui.lua
@@ -42,11 +42,11 @@ function EquipResonateUI:onLoadRootComplete()
 
 	self.lvTx = uiMap["equip_resonate_ui.bg.page_info.lv_tx"]
 	self.tipsTx = uiMap["equip_resonate_ui.bg.page_info.tips_tx"]
-	self.attrNameTxe = uiMap["equip_resonate_ui.bg.page_info.attr_bg.attr_name_tx"]
-	self.attrCurrValueTx = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout.attr_curr_value_tx"]
-	self.arrowImg = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout.arrow_img"]
-	self.attrNextValueTx = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout.attr_next_value_tx"]
-	self.layout = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
+	-- self.attrNameTx = uiMap["equip_resonate_ui.bg.page_info.attr_bg.attr_name_tx"]
+	-- self.attrCurrValueTx = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout.attr_curr_value_tx"]
+	-- self.arrowImg = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout.arrow_img"]
+	-- self.attrNextValueTx = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout.attr_next_value_tx"]
+	-- self.layout = uiMap["equip_resonate_ui.bg.page_info.attr_bg.layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
 
 	uiMap["equip_resonate_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_4))
 	uiMap["equip_resonate_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_6))
@@ -66,6 +66,21 @@ function EquipResonateUI:onLoadRootComplete()
 		end)
 	end
 
+	self.attrBgs = {}
+	self.attrNameTxs = {}
+	self.attrLayouts = {}
+	self.attrCurrValueTxs = {}
+	self.attrArrowImgs = {}
+	self.attrNextValueTxs = {}
+	for i = 1, 2 do
+		self.attrBgs[i] = uiMap["equip_resonate_ui.bg.page_info.attr_bg_" .. i]
+		self.attrNameTxs[i] = uiMap["equip_resonate_ui.bg.page_info.attr_bg_" .. i .. ".attr_name_tx"]
+		self.attrLayouts[i] = uiMap["equip_resonate_ui.bg.page_info.attr_bg_" .. i .. ".layout"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
+		self.attrCurrValueTxs[i] = uiMap["equip_resonate_ui.bg.page_info.attr_bg_" .. i .. ".layout.attr_curr_value_tx"]
+		self.attrArrowImgs[i] = uiMap["equip_resonate_ui.bg.page_info.attr_bg_" .. i .. ".layout.arrow_img"]
+		self.attrNextValueTxs[i] = uiMap["equip_resonate_ui.bg.page_info.attr_bg_" .. i .. ".layout.attr_next_value_tx"]
+	end
+
 	self:bind(DataManager.EquipData, "isDirty", function()
 		self:onRefresh()
 	end)
@@ -112,52 +127,77 @@ function EquipResonateUI:refreshPage()
 end
 
 function EquipResonateUI:refreshPageLv()
-	local lv, nextLv, attrNum, attrNextNum = DataManager.EquipData:getResonateLevel(self.page, self.slotId)
-	self:refreshUI(lv, nextLv, attrNum, attrNextNum, DataManager.EquipData:getResonateMaxLevel(1))
+	local lv, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(self.page, self.slotId)
+	self:refreshUI(lv, nextLv, attrs, attrNexts, DataManager.EquipData:getResonateMaxLevel(1))
 end
 
 function EquipResonateUI:refreshPageQlt()
-	local lv, nextLv, attrNum, attrNextNum = DataManager.EquipData:getResonateLevel(self.page, self.slotId, self.part)
-	self:refreshUI(lv, nextLv, attrNum, attrNextNum, DataManager.EquipData:getResonateMaxLevel(2))
+	local lv, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(self.page, self.slotId, self.part)
+	self:refreshUI(lv, nextLv, attrs, attrNexts, DataManager.EquipData:getResonateMaxLevel(2))
 end
 
 function EquipResonateUI:refreshPageRefine()
-	local lv, nextLv, attrNum, attrNextNum = DataManager.EquipData:getResonateLevel(self.page, self.slotId)
-	self:refreshUI(lv, nextLv, attrNum, attrNextNum, DataManager.EquipData:getResonateMaxLevel(3))
+	local lv, nextLv, attrs, attrNexts = DataManager.EquipData:getResonateLevel(self.page, self.slotId)
+	self:refreshUI(lv, nextLv, attrs, attrNexts, DataManager.EquipData:getResonateMaxLevel(3))
 end
 
-function EquipResonateUI:refreshUI(lv, nextLv, attrNum, attrNextNum, maxLevel)
+function EquipResonateUI:refreshUI(lv, nextLv, attrs, attrNexts, maxLevel)
 	self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.LV_POINT) .. lv)
-	self.attrNameTxe:setText(GFunc.getAttrNameByType("attr_atk"))
-	self.attrCurrValueTx:setText(attrNum)
-	local meshProCompNow = self.attrCurrValueTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
-	local nowTipsNowX = meshProCompNow.preferredWidth
-	self.attrCurrValueTx:setSizeDeltaX(nowTipsNowX)
-
-	if maxLevel ~= nil and lv >= maxLevel then
-		self.arrowImg:setActive(false)
-		self.attrNextValueTx:setActive(false)
-		self.tipsTx:setText(I18N:getGlobalText(I18N.GlobalConst.PET_DESC_15))
-	else
-		if nextLv == nil then
-			self.tipsTx:setText(I18N:getGlobalText(I18N.GlobalConst.PET_DESC_15))
-		else
-			if self.page == GConst.EquipConst.RESONATE_PAGE.QLT then
-				self.tipsTx:setText(I18N:getGlobalText("EQUIP_HERO_M_" .. self.page, I18N:getGlobalText("EQUIP_QLT_DESC_" .. nextLv[1], nextLv[2])))
-			else
-				self.tipsTx:setText(I18N:getGlobalText("EQUIP_HERO_M_" .. self.page, nextLv[1]))
-			end
-		end
-
-		self.attrNextValueTx:setText(attrNextNum)
-		self.arrowImg:setActive(true)
-		self.attrNextValueTx:setActive(true)
-
-		local meshProCompNext = self.attrNextValueTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
-		local nowTipsNextX = meshProCompNext.preferredWidth
-		self.attrNextValueTx:setSizeDeltaX(nowTipsNextX)
+	local typeList = {}
+	for k, v in pairs(attrNexts or {}) do
+		table.insert(typeList, {typeName = k, id = GFunc.getAttrIdByName(k)})
+	end
+	if #typeList <= 0 then
+		for k, v in pairs(attrs or {}) do
+			table.insert(typeList, {typeName = k, id = GFunc.getAttrIdByName(k)})
+		end
+	end
+	table.sort(typeList, function (a, b)
+		return a.id < b.id
+	end)
+	for i = 1, 2 do
+		if typeList[i] and typeList[i].typeName then
+			local typeName = typeList[i].typeName
+			self.attrBgs[i]:setActive(true)
+			self.attrNameTxs[i]:setText(GFunc.getAttrNameByType(typeName))
+			self.attrCurrValueTxs[i]:setText(GFunc.getFinalAttrValue(typeName, attrs[typeName] or 0))
+			local meshProCompNow = self.attrCurrValueTxs[i]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
+			local nowTipsNowX = meshProCompNow.preferredWidth
+			self.attrCurrValueTxs[i]:setSizeDeltaX(nowTipsNowX)
+
+			if maxLevel ~= nil and lv >= maxLevel then
+				self.attrArrowImgs[i]:setActive(false)
+				self.attrNextValueTxs[i]:setActive(false)
+				self.tipsTx:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_2))
+			else
+				if nextLv == nil then
+					self.tipsTx:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_2))
+				else
+					if self.page == GConst.EquipConst.RESONATE_PAGE.QLT then
+						self.tipsTx:setText(I18N:getGlobalText("EQUIP_HERO_M_" .. self.page, I18N:getGlobalText("EQUIP_QLT_DESC_" .. nextLv[1], nextLv[2])))
+					else
+						self.tipsTx:setText(I18N:getGlobalText("EQUIP_HERO_M_" .. self.page, nextLv[1]))
+					end
+				end
+
+				self.attrNextValueTxs[i]:setText(GFunc.getFinalAttrValue(typeName, attrNexts[typeName] or 0))
+				self.attrArrowImgs[i]:setActive(true)
+				self.attrNextValueTxs[i]:setActive(true)
+
+				local meshProCompNext = self.attrNextValueTxs[i]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
+				local nowTipsNextX = meshProCompNext.preferredWidth
+				self.attrNextValueTxs[i]:setSizeDeltaX(nowTipsNextX)
+			end
+			self.attrLayouts[i]:RefreshLayout()
+		else
+			self.attrBgs[i]:setActive(false)
+		end
+	end
+	if #typeList < 2 then
+		self.attrBgs[1]:setAnchoredPositionY(-4)
+	else
+		self.attrBgs[1]:setAnchoredPositionY(26)
 	end
-	self.layout:RefreshLayout()
 end
 
 
diff --git a/lua/app/ui/hero/equip_info_comp.lua b/lua/app/ui/hero/equip_info_comp.lua
index ad5d90d8..adfd6c86 100644
--- a/lua/app/ui/hero/equip_info_comp.lua
+++ b/lua/app/ui/hero/equip_info_comp.lua
@@ -47,31 +47,31 @@ function EquipInfoComp:init()
 	self.descTx1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_HERO_DESC_5))
 
 	self.autoWearBtn:addClickListener(function()
-		local soltId = self.heroEntity:getMatchType()
+		local slotId = self.heroEntity:getMatchType()
 		local listUids = {}
 		for i = 1, 6 do
-			local equip = DataManager.EquipData:getEquipMaxScore(soltId, i)
+			local equip = DataManager.EquipData:getEquipMaxScore(slotId, i)
 			if equip ~= nil then
 				table.insert(listUids, equip:getUid())
 			end
 		end
-		ModuleManager.EquipManager:onEquipWearReq(soltId, listUids)
+		ModuleManager.EquipManager:onEquipWearReq(slotId, listUids)
 	end)
 	self.upBtn:addClickListener(function()
-		local soltId = self.heroEntity:getMatchType()
+		local slotId = self.heroEntity:getMatchType()
 		local part
 		for i = 1, 6 do
-			local eid = DataManager.EquipData:getPartEquipUid(soltId, i)
+			local eid = DataManager.EquipData:getPartEquipUid(slotId, i)
 			if eid and eid > 0 then
 				part = part or i
-				if DataManager.EquipData:hasEquipGrowthRedPointBySlotIdAndPartId(soltId, part) then
-					ModuleManager.EquipManager:showEquipGrowthUI(soltId, i)
+				if DataManager.EquipData:hasEquipGrowthRedPointBySlotIdAndPartId(slotId, part) then
+					ModuleManager.EquipManager:showEquipGrowthUI(slotId, i)
 					return
 				end
 			end
 		end
 		if part then
-			ModuleManager.EquipManager:showEquipGrowthUI(soltId, part)
+			ModuleManager.EquipManager:showEquipGrowthUI(slotId, part)
 		end
 	end)
 	self.infoBtn:addClickListener(function()
diff --git a/lua/app/ui/hero/hero_attr_all_ui.lua b/lua/app/ui/hero/hero_attr_all_ui.lua
index c4ed551c..d27ef73d 100644
--- a/lua/app/ui/hero/hero_attr_all_ui.lua
+++ b/lua/app/ui/hero/hero_attr_all_ui.lua
@@ -38,8 +38,8 @@ end
 
 function HeroAttrUI:onRefresh()
 	local attr = DataManager.HeroData:getAllStarAttr()
-	self.hpAttrTx:setText(GFunc.getFinalAttrValue(GConst.ALL_ATTR.ATTR_HPP_ALL, attr.attr_hpp_all or 0, 2))
-	self.atkAttrTx:setText(GFunc.getFinalAttrValue(GConst.ALL_ATTR.ATTR_ATKP_ALL, attr.attr_atkp_all or 0, 2))
+	self.hpAttrTx:setText(GFunc.getFinalAttrValue(GConst.ATTR_ALL.ATTR_HPP_ALL, attr.attr_hpp_all or 0, 2))
+	self.atkAttrTx:setText(GFunc.getFinalAttrValue(GConst.ATTR_ALL.ATTR_ATKP_ALL, attr.attr_atkp_all or 0, 2))
 end
 
 return HeroAttrUI
\ No newline at end of file
diff --git a/lua/app/ui/hero/star_info_comp.lua b/lua/app/ui/hero/star_info_comp.lua
index 25f18ff8..2c92bce2 100644
--- a/lua/app/ui/hero/star_info_comp.lua
+++ b/lua/app/ui/hero/star_info_comp.lua
@@ -109,7 +109,7 @@ end
 function StarInfoComp:refreshAttrInfo()
 	-- self.attrTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_26))
 	local attr = self.heroEntity:getStarAttr()
-	self.attrTx:setText(GFunc.getFinalAttrValue(GConst.ALL_ATTR.ATTR_HPP_ALL, attr.attr_hpp_all or 0))
+	self.attrTx:setText(GFunc.getFinalAttrValue(GConst.ATTR_ALL.ATTR_HPP_ALL, attr.attr_hpp_all or 0))
 	local meshProComp = self.attrTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
 	local contentWidth = meshProComp.preferredWidth
 	self.attrTx:setSizeDeltaX(contentWidth)
diff --git a/lua/app/userdata/equip/equip_data.lua b/lua/app/userdata/equip/equip_data.lua
index 69ceae19..9bb625cd 100644
--- a/lua/app/userdata/equip/equip_data.lua
+++ b/lua/app/userdata/equip/equip_data.lua
@@ -42,7 +42,7 @@ function EquipData:init(data)
 		return
 	end
 
-	self.soltIdRedPoint = {}
+	self.slotIdRedPoint = {}
 	self.allEquips = {}
 	self.allEquipsCount = 0
 	if data.equips then
@@ -156,9 +156,9 @@ function EquipData:getRefineAttr(refine, attrName)
 		return cfg.extra_attr_add_1
 	elseif attrName == "attr_hp" then
 		return cfg.extra_attr_add_2
-	elseif attrName == "attr_normal_hurt" then
+	elseif attrName == "attr_normal_hurtp" then
 		return cfg.extra_attr_add_3
-	elseif attrName == "attr_skill_hurt" then
+	elseif attrName == "attr_skill_hurtp" then
 		return cfg.extra_attr_add_4
 	end
 end
@@ -259,29 +259,29 @@ end
 
 --@region 穿戴
 --装备穿戴
-function EquipData:onWearSuccess(soltId, uids)
+function EquipData:onWearSuccess(slotId, uids)
 	for _, uid in ipairs(uids) do
 		local equip = self:getEquipByUid(uid)
 		local part = equip:getPart()
 		if part then
-			local oldUid = self.slots[soltId].parts[part].equip_uid
+			local oldUid = self.slots[slotId].parts[part].equip_uid
 			for i,info in ipairs(self.slots) do
-				if i ~= soltId then
+				if i ~= slotId then
 					if info.parts[part].equip_uid == uid then
 						info.parts[part].equip_uid = oldUid
 					end
 				end
 			end
-			self.slots[soltId].parts[part].equip_uid = uid
+			self.slots[slotId].parts[part].equip_uid = uid
 		end
 	end
 	self:setDirty()
 end
 
-function EquipData:getEquipMaxScore(soltId, part)
+function EquipData:getEquipMaxScore(slotId, part)
 	local equip = nil
 	local maxScore = 0
-	local useUid = self:getPartEquipUid(soltId, part)
+	local useUid = self:getPartEquipUid(slotId, part)
 	if useUid ~= 0 then
 		local useEquip = self:getEquipByUid(useUid)
 		maxScore = useEquip:getPower()
@@ -362,11 +362,11 @@ function EquipData:getBaseAttrLvAdd(attrType, lv)
 	return baseAttrAdd
 end
 
-function EquipData:onUpgradeSuccess(soltId, upgraded)
+function EquipData:onUpgradeSuccess(slotId, upgraded)
 	upgraded = upgraded or {}
 	for part, lv in pairs(upgraded) do
-		if self.slots[soltId].parts[part] then
-			self.slots[soltId].parts[part].level = lv
+		if self.slots[slotId].parts[part] then
+			self.slots[slotId].parts[part].level = lv
 		end
 	end
 	self:setDirty()
@@ -420,19 +420,19 @@ function EquipData:getPartRefineFailPro(slotId, part)
 	return 0
 end
 
-function EquipData:onRefineSuccess(soltId, part, info)
+function EquipData:onRefineSuccess(slotId, part, info)
 	local offset = 0
-	local refine = self:getPartRefine(soltId, part)
+	local refine = self:getPartRefine(slotId, part)
 	if refine < info.refine then
-		local refine = self.slots[soltId].parts[part].refine
-		self.slots[soltId].parts[part].refine = refine + 1
-		self.slots[soltId].parts[part].refine_fail = 0
+		local refine = self.slots[slotId].parts[part].refine
+		self.slots[slotId].parts[part].refine = refine + 1
+		self.slots[slotId].parts[part].refine_fail = 0
 		offset = offset + 1
 		-- self:addPlayEffectParts(part)
 		self:setDirtyRefineSuccess()
 	else
-		local fail = self.slots[soltId].parts[part].refine_fail
-		self.slots[soltId].parts[part].refine_fail = fail + 1
+		local fail = self.slots[slotId].parts[part].refine_fail
+		self.slots[slotId].parts[part].refine_fail = fail + 1
 		self:setDirtyRefineFail()
 	end
 end
@@ -566,16 +566,20 @@ function EquipData:getResonateLevelValue(type, value, value2)
 	local list = self:getResonateList(type)
 	local lv = 0
 	local nextLv = 0
-	local attrNum = 0
-	local attrNextNum = 0
+	local attrs = {}
+	local attrNexts = {}
 	for i,v in ipairs(list) do
 		if type == 1 or type == 3 then
 			if v.parameter[1] <= value then
 				lv = i
-				attrNum = attrNum + v.attr[1].num
+				for _, vv in ipairs(v.attr) do
+					attrs[vv.type] = (attrs[vv.type] or 0) + vv.num
+				end
 			else
 				nextLv = v.parameter
-				attrNextNum = attrNum + v.attr[1].num
+				for _, vv in ipairs(v.attr) do
+					attrNexts[vv.type] = (attrNexts[vv.type] or 0) + vv.num
+				end
 				break
 			end
 		elseif type == 2 then
@@ -587,15 +591,19 @@ function EquipData:getResonateLevelValue(type, value, value2)
 			end
 			if isTrue then
 				lv = i
-				attrNum = attrNum + v.attr[1].num
+				for _, vv in ipairs(v.attr) do
+					attrs[vv.type] = (attrs[vv.type] or 0) + vv.num
+				end
 			else
 				nextLv = v.parameter
-				attrNextNum = attrNum + v.attr[1].num
+				for _, vv in ipairs(v.attr) do
+					attrNexts[vv.type] = (attrNexts[vv.type] or 0) + vv.num
+				end
 				break
 			end
 		end
 	end
-	return lv, nextLv, attrNum / GConst.DEFAULT_FACTOR, attrNextNum / GConst.DEFAULT_FACTOR, table.nums(list)
+	return lv, nextLv, attrs, attrNexts, table.nums(list)
 end
 
 function EquipData:getResonateLevel(type, slotId)
@@ -763,7 +771,7 @@ function EquipData:hasEquipRedPointBySlotId(slotId)
 	if slotId == nil then
 		return false
 	end
-	local redPoint = self.soltIdRedPoint[slotId]
+	local redPoint = self.slotIdRedPoint[slotId]
 	if redPoint ~= nil then
 		return redPoint
 	end
@@ -774,8 +782,8 @@ function EquipData:hasEquipRedPointBySlotId(slotId)
 	else
 		redPoint = false
 	end
-	self.soltIdRedPoint[slotId] = redPoint
-	self.soltIdRedPointDirty = true
+	self.slotIdRedPoint[slotId] = redPoint
+	self.slotIdRedPointDirty = true
 	return redPoint
 end
 
@@ -832,27 +840,27 @@ function EquipData:hasEquipGrowthRedPoint(slotId)
 	return self:hasEquipGrowthRedPointBySlotId(slotId)
 end
 
-function EquipData:hasEquipGrowthRedPointBySlotId(soltId)
-	if soltId == nil then
+function EquipData:hasEquipGrowthRedPointBySlotId(slotId)
+	if slotId == nil then
 		return false
 	end
 	for part = 1, 6 do
-		if self:hasEquipEnhanceRedPoint(soltId, part) then
+		if self:hasEquipEnhanceRedPoint(slotId, part) then
 			return true
-		elseif self:hasEquipRefineRedPoint(soltId, part) then
+		elseif self:hasEquipRefineRedPoint(slotId, part) then
 			return true
 		end
 	end
 	return false
 end
 
-function EquipData:hasEquipGrowthRedPointBySlotIdAndPartId(soltId, part)
-	if soltId == nil then
+function EquipData:hasEquipGrowthRedPointBySlotIdAndPartId(slotId, part)
+	if slotId == nil then
 		return false
 	end
-	if self:hasEquipEnhanceRedPoint(soltId, part) then
+	if self:hasEquipEnhanceRedPoint(slotId, part) then
 		return true
-	elseif self:hasEquipRefineRedPoint(soltId, part) then
+	elseif self:hasEquipRefineRedPoint(slotId, part) then
 		return true
 	end
 	return false
@@ -861,10 +869,10 @@ end
 -- --强化红点
 -- function EquipData:hasEquipGrowthEnhanceRedPoint(heroId)
 -- 	local heroEntity = DataManager.HeroData:getHeroById(heroId)
--- 	local soltId = heroEntity:getMatchType()
--- 	if soltId then
+-- 	local slotId = heroEntity:getMatchType()
+-- 	if slotId then
 -- 		for part = 1, 6 do
--- 			if self:hasEquipEnhanceRedPoint(soltId, part) then
+-- 			if self:hasEquipEnhanceRedPoint(slotId, part) then
 -- 				return true
 -- 			end
 -- 		end
@@ -875,10 +883,10 @@ end
 -- --精炼红点
 -- function EquipData:hasEquipGrowthRefineRedPoint(heroId)
 -- 	local heroEntity = DataManager.HeroData:getHeroById(heroId)
--- 	local soltId = heroEntity:getMatchType()
--- 	if soltId then
+-- 	local slotId = heroEntity:getMatchType()
+-- 	if slotId then
 -- 		for part = 1, 6 do
--- 			if self:hasEquipRefineRedPoint(soltId, part) then
+-- 			if self:hasEquipRefineRedPoint(slotId, part) then
 -- 				return true
 -- 			end
 -- 		end
@@ -887,11 +895,11 @@ end
 -- end
 
 --装备升级红点
-function EquipData:hasEquipEnhanceRedPoint(soltId, part)
+function EquipData:hasEquipEnhanceRedPoint(slotId, part)
 	if self.allEquipsCount <= 0 then
 		return false
 	end
-	local level = self:getPartLv(soltId, part)
+	local level = self:getPartLv(slotId, part)
 	local itemCost = self:getLevelCost(level + 1)
 	if itemCost ~= nil then
 		local costId = GFunc.getRewardId(itemCost)
@@ -904,13 +912,13 @@ function EquipData:hasEquipEnhanceRedPoint(soltId, part)
 	return false
 end
 
-function EquipData:hasEquipRefineRedPoint(soltId, part)
+function EquipData:hasEquipRefineRedPoint(slotId, part)
 	if self.allEquipsCount <= 0 then
 		return false
 	end
-	local refine = self:getPartRefine(soltId, part)
+	local refine = self:getPartRefine(slotId, part)
 	local needLevel = self:getRefineNeedLevel(refine + 1)
-	if needLevel == nil or needLevel > self:getPartLevel(soltId, part) then
+	if needLevel == nil or needLevel > self:getPartLevel(slotId, part) then
 		return false
 	end
 	local itemCost = self:getRefineCost(refine + 1)
@@ -928,9 +936,9 @@ end
 -- --未穿戴装备有五十件以上的红点
 -- function EquipData:hasEquipUnWearRedPoint()
 -- 	local wearList = {}
--- 	for soltId = 1, 6 do
+-- 	for slotId = 1, 6 do
 -- 		for part = 1, 6 do
--- 			local uid = self:getPartEquipUid(soltId, part)
+-- 			local uid = self:getPartEquipUid(slotId, part)
 -- 			if uid ~= 0 then
 -- 				wearList[uid] = true
 -- 			end
@@ -948,4 +956,68 @@ end
 -- 	return false
 -- end
 --endregion
+
+--@region 属性
+function EquipData:getEquipAttrBySlotId(heroId, slotId)
+	if not self.slots[slotId] or not self.slots[slotId].parts then
+		return {}
+	end
+	local curFormation = DataManager.FormationData:getStageFormation()
+	if curFormation[slotId] ~= heroId then
+		return {}
+	end
+
+	local allAttr = {}
+	for part, info in ipairs(self.slots[slotId].parts) do
+		if info.equip_uid > 0 then
+			local equip = self:getEquipByUid(info.equip_uid)
+			if equip then
+				local attr = equip:getAllAttr()
+				for k, v in pairs(attr) do
+					allAttr[k] = (allAttr[k] or 0) + v
+				end
+
+				-- 升级属性
+				local level = self:getPartLv(slotId, part)
+				local baseType = equip:getBaseAttr().type
+				allAttr[baseType] = (attr[baseType] or 0) + self:getBaseAttrLvAdd(baseType, level)
+				-- for i = 1, level do
+				-- 	local cfg = self:getLevelConfig(i)
+				-- 	allAttr[cfg.base_attr_add.type] = (attr[cfg.base_attr_add.type] or 0) + self:getBaseAttrLvAdd(cfg.base_attr_add.type, level)
+				-- 	self:getBaseAttrLvAdd(attrType, lv)
+				-- end
+
+				-- 精炼属性
+				local equipAttrs = equip:getExtraMap()
+				local refine = self:getPartRefine(slotId, part)
+				if refine > 0 then
+					for _, extraAttr in pairs(equipAttrs) do
+						local attrName = GFunc.getAttrNameById(extraAttr.id)
+						-- allAttr[attrName] = (allAttr[attrName] or 0) + extraAttr.value
+						local nowAttr = self:getRefineAttrAdd(refine, attrName)
+						allAttr[attrName] = (allAttr[attrName] or 0) + nowAttr.num
+					end
+				end
+			end
+		end
+	end
+
+	-- 共鸣
+	for i = 1, 3 do
+		local lv = self:getResonateLevel(i, slotId)
+		local list = self:getResonateList(i)
+		for ii, vv in ipairs(list) do
+			if ii <= lv then
+				for _, vvv in ipairs(vv.attr or {}) do
+					allAttr[vvv.type] = (allAttr[vvv.type] or 0) + vvv.num
+				end
+			else
+				break
+			end
+		end
+	end
+
+	return allAttr
+end
+--@endregion
 return EquipData
\ No newline at end of file
diff --git a/lua/app/userdata/equip/equip_entity.lua b/lua/app/userdata/equip/equip_entity.lua
index d7f4d2b4..f25f86fe 100644
--- a/lua/app/userdata/equip/equip_entity.lua
+++ b/lua/app/userdata/equip/equip_entity.lua
@@ -8,6 +8,7 @@ function EquipEntity:setDirty()
 end
 
 function EquipEntity:ctor(equip)
+	self.baseAttrs = {}
 	self:init(equip)
 end
 
@@ -72,7 +73,9 @@ end
 
 --@region 属性
 function EquipEntity:initBaseAttr()
-	self.baseAttrs = self.config.base_attr
+	for k,v in pairs(self.config.base_attr) do
+		self.baseAttrs[k] = v
+	end
 end
 
 function EquipEntity:setExtraAttr(attr)
@@ -107,8 +110,11 @@ end
 function EquipEntity:getExtraList()
 	local list = {}
 	for k,v in pairs(self.extraAttrs) do
-		table.insert(list, {type = k, num = v})
+		table.insert(list, {type = k, num = v, id = GFunc.getAttrIdByName(k)})
 	end
+	table.sort(list, function (a, b)
+		return a.id < b.id
+	end)
 	return list
 end
 
diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua
index cc2b866b..fd7c8ac6 100644
--- a/lua/app/userdata/hero/hero_entity.lua
+++ b/lua/app/userdata/hero/hero_entity.lua
@@ -10,7 +10,6 @@ function HeroEntity:ctor(cfgId, lv, skin, star)
 	self.config = ConfigManager:getConfig("hero")[self.cfgId]
 	self.beginLv = 1 -- 激活等级
 	self.isNew = false
-	-- self.data.star = 2
 
 	self.baseAttrOriginal = {}
 	self.starAttr = {}
@@ -81,6 +80,11 @@ function HeroEntity:_updateAllAttr()
 		self.allAttr[k] = v
 	end
 
+	-- 装备
+	local equipAttr = DataManager.EquipData:getEquipAttrBySlotId(self.cfgId, self:getMatchType())
+	for k, v in pairs(equipAttr) do
+		self.allAttr[k] = (self.allAttr[k] or 0) + v
+	end
 -- GConst.ALL_ATTR = {
 -- 	ATTR_ATK_ALL = "atk_all",						-- 全体英雄攻击（固定值）
 -- 	ATTR_HP_ALL = "attr_hp_all",					-- 全体英雄生命（固定值）
@@ -94,52 +98,54 @@ function HeroEntity:_updateAllAttr()
 
 	-- 同属性通用加成
 	self.allAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_ATK_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_HP_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = nil
-	-- self.allAttr[GConst.ALL_ATTR.ATTR_HPP_ALL] = nil
-	for _, v in pairs(GConst.ALL_ATTR) do
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_ATK_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_HP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_HPP_ALL] = nil
+	for _, v in pairs(GConst.ATTR_ALL) do
 		self.allAttr[v] = nil
 	end
 
 	-- 攻击力（百分比）
 	local atkType = GConst.MATCH_ATTACK_NAME[self:getMatchType()]
 	-- 全局增加攻击力
-	local allAtk = self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_ATK_ALL)
-	local atk = self.allAttr[atkType] + allAtk
+	local allAtk = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_ATK_ALL)
+	local persionalAtk = self.allAttr[GConst.ATTR_PERSIONAL.ATTR_ATK] or 0
+	local atk = self.allAttr[atkType] + allAtk + persionalAtk
 	-- 全局元素攻击力百分比加成
 	local allFactorValue = self:getGlobalAttrByType(GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()])
 	-- 个人攻击力百分比加成
 	local factorValue = self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] or 0
 	-- 全局攻击力百分比加成
-	local allAtkP = self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_ATKP_ALL)
+	local allAtkP = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_ATKP_ALL)
 	self.allAttr[atkType] = math.floor(atk * (1 + (factorValue + allFactorValue + allAtkP) / GConst.DEFAULT_FACTOR) + 0.0000001)
 	self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] = nil
 
 	-- 生命（百分比）
 	local hpType = GConst.MATCH_HP_NAME[self:getMatchType()]
 	-- 全局增加生命
-	local allHp = self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_HP_ALL)
-	local hp = self.allAttr[hpType] + allHp
+	local allHp = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_HP_ALL)
+	local persionalHp = self.allAttr[GConst.ATTR_PERSIONAL.ATTR_HP] or 0
+	local hp = self.allAttr[hpType] + allHp + persionalHp
 	-- 全局元素生命百分比加成
 	local allFactorValue = self:getGlobalAttrByType(GConst.MATCH_ALL_HPP_NAME[self:getMatchType()])
 	-- 个人生命百分比加成
 	local factorValue = self.allAttr[GConst.MATCH_HP_ADD_NAME[self:getMatchType()]] or 0
 	-- 全局生命百分比加成
-	local allHpP = self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_HPP_ALL)
+	local allHpP = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_HPP_ALL)
 	self.allAttr[hpType] = math.floor(hp * (1 + (factorValue + allFactorValue + allHpP) / GConst.DEFAULT_FACTOR) + 0.0000001)
 	self.allAttr[GConst.MATCH_HP_ADD_NAME[self:getMatchType()]] = nil
 
-	self.allAttr[ATTR_NAME.DMGDEC] = (self.allAttr[ATTR_NAME.DMGDEC] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_DMGDEC_ALL)
-	self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_CRIT_ALL)
-	self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL)
-	self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL)
-	self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL)
+	self.allAttr[ATTR_NAME.DMGDEC] = (self.allAttr[ATTR_NAME.DMGDEC] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_DMGDEC_ALL)
+	self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_CRIT_ALL)
+	self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL)
+	self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL)
+	self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL)
 
 	self:calcPower()
 end
@@ -170,16 +176,16 @@ function HeroEntity:_updateAllBaseAttr()
 		attr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = self.allBaseAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]]
 	end
 
-	-- attr[GConst.ALL_ATTR.ATTR_ATK_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_ATK_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_HP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_HP_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL]
-	-- attr[GConst.ALL_ATTR.ATTR_HPP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_HPP_ALL]
-	for _, v in pairs(GConst.ALL_ATTR) do
+	-- attr[GConst.ATTR_ALL.ATTR_ATK_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_ATK_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_HP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_HP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_HPP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_HPP_ALL]
+	for _, v in pairs(GConst.ATTR_ALL) do
 		attr[v] = self.allBaseAttr[v]
 	end
 
diff --git a/lua/app/userdata/hero/hero_entity_other.lua b/lua/app/userdata/hero/hero_entity_other.lua
index 22eb0ef3..c30e6a0e 100644
--- a/lua/app/userdata/hero/hero_entity_other.lua
+++ b/lua/app/userdata/hero/hero_entity_other.lua
@@ -93,45 +93,58 @@ function HeroEntity:_updateAllAttr()
 
 	-- 同属性通用加成
 	self.allAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_ATK_ALL] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_HP_ALL] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = nil
-	self.allAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_ATK_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_HP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = nil
+	-- self.allAttr[GConst.ATTR_ALL.ATTR_HPP_ALL] = nil
+	for _, v in pairs(GConst.ATTR_ALL) do
+		self.allAttr[v] = nil
+	end
 
 	-- 攻击力（百分比）
 	local atkType = GConst.MATCH_ATTACK_NAME[self:getMatchType()]
-	local allAtk = DataManager.HeroDataOther:getAttrByMatchType(self:getMatchType(), GConst.ALL_ATTR.ATTR_ATK_ALL)
-	local atkpType = GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]
-	local allFactorValue = DataManager.HeroDataOther:getAttrByMatchType(self:getMatchType(), atkpType)
-	local factorValue = self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] or 0
-	local allAtkP = self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_ATKP_ALL)
+	-- 全局增加攻击力
+	local allAtk = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_ATK_ALL)
 	local atk = self.allAttr[atkType] + allAtk
+	-- 全局元素攻击力百分比加成
+	local allFactorValue = self:getGlobalAttrByType(GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()])
+	-- 个人攻击力百分比加成
+	local factorValue = self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] or 0
+	-- 全局攻击力百分比加成
+	local allAtkP = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_ATKP_ALL)
 	self.allAttr[atkType] = math.floor(atk * (1 + (factorValue + allFactorValue + allAtkP) / GConst.DEFAULT_FACTOR) + 0.0000001)
 	self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] = nil
 
 	-- 生命（百分比）
 	local hpType = GConst.MATCH_HP_NAME[self:getMatchType()]
-	local allHp = DataManager.HeroDataOther:getAttrByMatchType(self:getMatchType(), GConst.ALL_ATTR.ATTR_HP_ALL)
-	local factorValue = self.allAttr[GConst.MATCH_HP_ADD_NAME[self:getMatchType()]] or 0
+	-- 全局增加生命
+	local allHp = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_HP_ALL)
 	local hp = self.allAttr[hpType] + allHp
-	self.allAttr[hpType] = math.floor(hp * (1 + factorValue / GConst.DEFAULT_FACTOR) + 0.0000001)
+	-- 全局元素生命百分比加成
+	local allFactorValue = self:getGlobalAttrByType(GConst.MATCH_ALL_HPP_NAME[self:getMatchType()])
+	-- 个人生命百分比加成
+	local factorValue = self.allAttr[GConst.MATCH_HP_ADD_NAME[self:getMatchType()]] or 0
+	-- 全局生命百分比加成
+	local allHpP = self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_HPP_ALL)
+	self.allAttr[hpType] = math.floor(hp * (1 + (factorValue + allFactorValue + allHpP) / GConst.DEFAULT_FACTOR) + 0.0000001)
 	self.allAttr[GConst.MATCH_HP_ADD_NAME[self:getMatchType()]] = nil
 
-	self.allAttr[ATTR_NAME.DMGDEC] = (self.allAttr[ATTR_NAME.DMGDEC] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_DMGDEC_ALL)
-	self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_CRIT_ALL)
-	self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL)
-	self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL)
-	self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL)
+	self.allAttr[ATTR_NAME.DMGDEC] = (self.allAttr[ATTR_NAME.DMGDEC] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_DMGDEC_ALL)
+	self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_CRIT_ALL)
+	self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL)
+	self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL)
+	self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL)
 
 	self:calcPower()
 end
 
 function HeroEntity:getGlobalAttrByType(attrType)
-	return DataManager.HeroDataOther:getAttrByMatchType(self:getMatchType(), attrType) or 0
+	return DataManager.HeroData:getAttrByMatchType(self:getMatchType(), attrType) or 0
 end
 
 function HeroEntity:_getAllBaseAttr()
@@ -145,8 +158,9 @@ end
 -- 更新所有属性(自己)
 function HeroEntity:_updateAllBaseAttr()
 	self:_updateBaseAttr()
+	self:_updateLvAttr()
 	self:_updateStarAttr()
-	self:_updateSkinAttr()
+	-- self:_updateSkinAttr()
 	self:_updateTotalAttr()
 
 	-- 处理全局属性
@@ -155,16 +169,20 @@ function HeroEntity:_updateAllBaseAttr()
 		attr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = self.allBaseAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]]
 	end
 
-	attr[GConst.ALL_ATTR.ATTR_ATK_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_ATK_ALL]
-	attr[GConst.ALL_ATTR.ATTR_HP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_HP_ALL]
-	attr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL]
-	attr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL]
-	attr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL]
-	attr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL]
-	attr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL]
-	attr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_ATK_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_ATK_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_HP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_HP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL]
+	-- attr[GConst.ATTR_ALL.ATTR_HPP_ALL] = self.allBaseAttr[GConst.ATTR_ALL.ATTR_HPP_ALL]
+	for _, v in pairs(GConst.ATTR_ALL) do
+		attr[v] = self.allBaseAttr[v]
+	end
 
-	DataManager.HeroDataOther:setHeroAttr(self:getCfgId(), attr)
+	DataManager.HeroData:setHeroAttr(self:getCfgId(), attr)
 end
 
 -- 更新英雄基础属性
@@ -178,16 +196,31 @@ function HeroEntity:_updateBaseAttr()
 	self.baseAttrOriginal[GConst.MATCH_ATTACK_NAME[self.config.position]] = self:getCfgAtk()
 end
 
--- 更新皮肤属性
+-- 更新升级属性
+function HeroEntity:_updateLvAttr()
+	self.lvAttr = {}
+	local lvPoint = self:getLvAttrPointList()
+	for i = 1, #lvPoint do
+		if self.data.lv >= lvPoint[i] then
+			local attr = self:getLvAttrCfg(i)
+			self.lvAttr[attr.type] = (self.lvAttr[attr.type] or 0) + attr.num
+		end
+	end
+end
+
+-- 更新升星属性
 function HeroEntity:_updateStarAttr()
 	self.starAttr = {}
 	for i = 1, self.data.star do
-		local attr = self:getStarAttrCfg()[i]
-		self.starAttr[attr.type] = attr.num
+		local attrs = self:getStarAttrCfg(i)
+		for _, attr in ipairs(attrs) do
+			self.starAttr[attr.type] = (self.starAttr[attr.type] or 0) + attr.num
+		end
 	end
 end
 
 function HeroEntity:getStarAttr()
+	self:getAllAttr()
 	return self.starAttr
 end
 
@@ -237,12 +270,15 @@ function HeroEntity:_updateTotalAttr()
 	for k, v in pairs(self.baseAttrOriginal) do
 		self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
 	end
+	for k, v in pairs(self.lvAttr) do
+		self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
+	end
 	for k, v in pairs(self.starAttr) do
 		self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
 	end
-	for k, v in pairs(self.skinAttr) do
-		self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
-	end
+	-- for k, v in pairs(self.skinAttr) do
+	-- 	self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
+	-- end
 end
 
 function HeroEntity:getTotalAttrValue(name)
@@ -393,19 +429,14 @@ function HeroEntity:canLvUp(showToast)
 	-- 	return false, GConst.HeroConst.CHECK_LV_UP_STATE.NEED_STAR
 	-- end
 
-	local cost = self:getLvUpMaterialNum()
-	if not cost then
+	local costNum = self:getLvUpMaterialNum()
+	if not costNum then
 		return false, GConst.HeroConst.CHECK_LV_UP_STATE.NO_COST
 	end
 
-	local fragmentCost = cost[1] or 0
-	if not GFunc.checkCost(self:getFragmentId(), fragmentCost, showToast) then
+	if not GFunc.checkCost(self:getLvUpCostId(), costNum, showToast) then
 		return false, GConst.HeroConst.CHECK_LV_UP_STATE.FRAGMENT_NOT_ENOUGH
 	end
-	local goldCost = cost[2] or 0
-	if not GFunc.checkCost(self:getLvUpCostId(), goldCost, showToast) then
-		return false, GConst.HeroConst.CHECK_LV_UP_STATE.COIN_NOT_ENOUGH
-	end
 
 	return true, GConst.HeroConst.CHECK_LV_UP_STATE.SUCCESS
 end
@@ -425,21 +456,9 @@ function HeroEntity:isActived()
 	return self.data.lv >= self:getBeginLv()
 end
 
-function HeroEntity:getLvUpMaterialNum()
-	local lv = self.data.lv + 1
-	if lv < self:getBeginLv() then
-		lv = self:getBeginLv()
-	end
-	local nextLvInfo = ConfigManager:getConfig("hero_level")[lv]
-	if not nextLvInfo then
-		return
-	end
-	-- local fieldName = "cost_" .. self:getQlt()
-	return nextLvInfo.cost
-end
-
 function HeroEntity:getLvUpLv()
 	local count = 0
+	local costId1 = self.config.level_id[1]
 	local totalCost1 = 0
 	local totalCost2 = 0
 	-- local nextLv = self:getNextLv()
@@ -452,15 +471,17 @@ function HeroEntity:getLvUpLv()
 		if not nextLvInfo then
 			break
 		end
-		local fragmentCost = nextLvInfo.cost[1] or 0
-		local itemCost = nextLvInfo.cost[2] or 0
-		totalCost1 = totalCost1 + fragmentCost
-		totalCost2 = totalCost2 + itemCost
-		if not GFunc.checkCost(self:getFragmentId(), totalCost1, false) then
-			break
-		end
-		if not GFunc.checkCost(self:getLvUpCostId(), totalCost2, false) then
-			break
+		local needCostId = self:getLvUpCostId()
+		if needCostId == costId1 then
+			totalCost1 = totalCost1 + self:getLvUpMaterialNum()
+			if not GFunc.checkCost(needCostId, totalCost1, false) then
+				break
+			end
+		else
+			totalCost2 = totalCost2 + self:getLvUpMaterialNum()
+			if not GFunc.checkCost(needCostId, totalCost2, false) then
+				break
+			end
 		end
 		count = count + 1
 	end
@@ -500,9 +521,31 @@ function HeroEntity:getHurtNum()
 end
 
 function HeroEntity:getLvUpCostId()
-	return self.config.level_id
+	local list = self:getLvAttrPointList()
+	if table.containValue(list, self.data.lv + 1) then
+		return self.config.level_id[2]
+	else
+		return self.config.level_id[1]
+	end
 end
 
+function HeroEntity:getLvUpMaterialNum()
+	if self.data.lv <= 0 then
+		return
+	end
+	local lv = self.data.lv + 1
+	if lv < self:getBeginLv() then
+		lv = self:getBeginLv()
+	end
+	local nextLvInfo = ConfigManager:getConfig("hero_level")[lv]
+	if not nextLvInfo then
+		return
+	end
+	local fieldName = "cost_" .. self:getQlt()
+	return nextLvInfo[fieldName][2]
+end
+
+
 function HeroEntity:getCfgId()
 	return self.cfgId
 end
@@ -528,15 +571,24 @@ function HeroEntity:getStarUpCostId()
 end
 
 function HeroEntity:getStarAttrCfg(star)
-	if star then
-		return self.config.star_attr[star]
-	end
-	return self.config.star_attr
+	local cfg = ConfigManager:getConfig("hero_star")
+	return cfg[star]["attr_" .. self:getQlt()]
 end
 
 function HeroEntity:getStarAttrTxt()
 	return self.config.star_txt
 end
+
+function HeroEntity:getLvAttrCfg(lvPoint)
+	if lvPoint then
+		return self.config.level_attr[lvPoint]
+	end
+	return self.config.level_attr
+end
+
+function HeroEntity:getLvAttrPointList()
+	return self.config.level_point
+end
 -- endregion
 
 -- function HeroEntity:getActiveRogueCount()
@@ -591,7 +643,7 @@ function HeroEntity:getRogueSkillList()
 			local ids = self.config["rouge_skill_" .. count]
 			if ids then
 				for i = #ids, 1, -1 do
-					if self.data.lv >= ids[i][1] or i == 1 then
+					if self.data.star >= ids[i][1] or i == 1 then
 						table.insert(self.rogueSkillList, ids[i])
 						break
 					end
@@ -606,12 +658,35 @@ function HeroEntity:getRogueSkillList()
 	return self.rogueSkillList
 end
 
+function HeroEntity:getRogueSkillListBattle()
+	if not self.rogueSkillListBattle then
+		self.rogueSkillListBattle = {}
+		local count = 1
+		while true do
+			local ids = self.config["rouge_skill_" .. count]
+			if ids then
+				for i = #ids, 1, -1 do
+					if self.data.star >= ids[i][1] then
+						table.insert(self.rogueSkillListBattle, ids[i][2])
+						break
+					end
+				end
+			else
+				break
+			end
+			count = count + 1
+		end
+	end
+
+	return self.rogueSkillListBattle
+end
+
 function HeroEntity:getRogueSkillListByIdx(idx)
 	local ids = self.config["rouge_skill_" .. idx]
 	local lv = 0
 	if ids then
 		for i = #ids, 1, -1 do
-			if self.data.lv >= ids[i][1]then
+			if self.data.star >= ids[i][1]then
 				lv = i
 				break
 			end
@@ -624,7 +699,7 @@ function HeroEntity:getNextRougeLvUp(idx)
 	local ids = self.config["rouge_skill_" .. idx]
 	if ids then
 		for i,v in ipairs(ids) do
-			if self.data.lv < ids[i][1] then
+			if self.data.star < ids[i][1] then
 				return ids[i][1]
 			end
 		end
@@ -638,7 +713,7 @@ function HeroEntity:getActiveRogueSkills()
 		local ids = self.config["rouge_skill_" .. count]
 		if ids then
 			for i = #ids, 1, -1 do
-				if self.data.lv >= ids[i][1] then
+				if self.data.star >= ids[i][1] then
 					table.insert(list, ids[i][2])
 					break
 				end
@@ -707,7 +782,28 @@ function HeroEntity:onHeroStarUp()
 end
 
 function HeroEntity:getMaxStar()
-	return #self:getStarAttrCfg()
+	return #self:getStarCfg()
+end
+
+function HeroEntity:getStarCfg()
+	return ConfigManager:getConfig("hero_star")
+end
+
+function HeroEntity:getStarUnlockSkillId(star)
+	local count = 1
+	while true do
+		local ids = self.config["rouge_skill_" .. count]
+		if ids then
+			for i = #ids, 1, -1 do
+				if star == ids[i][1] then
+					return ids[i][2]
+				end
+			end
+		else
+			break
+		end
+		count = count + 1
+	end
 end
 -- endregion
 
@@ -794,6 +890,8 @@ function HeroEntity:showRedPoint(page)
 		return self:canLvUp()
 	elseif page == GConst.HeroConst.PANEL_TYPE.STAR then
 		return self:canStarUp()
+	elseif page == GConst.HeroConst.PANEL_TYPE.EQUIP then
+		return DataManager.EquipData:hasEquipRedPoint(self:getMatchType())
 	end
 end
 --@endregion
diff --git a/lua/app/userdata/talent/talent_data.lua b/lua/app/userdata/talent/talent_data.lua
index 1dcf505c..d1f84faa 100644
--- a/lua/app/userdata/talent/talent_data.lua
+++ b/lua/app/userdata/talent/talent_data.lua
@@ -140,14 +140,14 @@ function TalentData:_updateAllAttr()
 
 	-- 处理全局属性
 	local attr = {}
-	attr[GConst.ALL_ATTR.ATTR_ATK_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_ATK_ALL]
-	attr[GConst.ALL_ATTR.ATTR_HP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_HP_ALL]
-	attr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL]
-	attr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL]
-	attr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL]
-	attr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL]
-	attr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL]
-	attr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL]
+	attr[GConst.ATTR_ALL.ATTR_ATK_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_ATK_ALL]
+	attr[GConst.ATTR_ALL.ATTR_HP_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_HP_ALL]
+	attr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL]
+	attr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL]
+	attr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL]
+	attr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL]
+	attr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL]
+	attr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = self.allAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL]
 
 	DataManager.HeroData:setTalentAttr(attr)