diff --git a/lua/app/config/act_gold_pig.lua b/lua/app/config/act_gold_pig.lua
index 75fc5021..ad374f56 100644
--- a/lua/app/config/act_gold_pig.lua
+++ b/lua/app/config/act_gold_pig.lua
@@ -5,8 +5,11 @@ local act_gold_pig = {
 		["battle_diamond"]=100,
 		["min_diamond"]=300,
 		["max_diamond"]=600,
+		["battle_gold"]=1000,
+		["min_gold"]=3000,
+		["max_gold"]=6000,
 		["recharge_id"]=5,
-		["value"]=400
+		["value"]=600
 	},
 	[201]={
 		["before_id"]=101,
@@ -14,8 +17,11 @@ local act_gold_pig = {
 		["battle_diamond"]=250,
 		["min_diamond"]=1000,
 		["max_diamond"]=2000,
+		["battle_gold"]=2500,
+		["min_gold"]=10000,
+		["max_gold"]=20000,
 		["recharge_id"]=10,
-		["value"]=700
+		["value"]=999
 	},
 	[301]={
 		["before_id"]=201,
@@ -23,8 +29,11 @@ local act_gold_pig = {
 		["battle_diamond"]=300,
 		["min_diamond"]=1500,
 		["max_diamond"]=3000,
+		["battle_gold"]=3000,
+		["min_gold"]=15000,
+		["max_gold"]=30000,
 		["recharge_id"]=12,
-		["value"]=700
+		["value"]=999
 	},
 	[401]={
 		["before_id"]=301,
@@ -32,8 +41,11 @@ local act_gold_pig = {
 		["battle_diamond"]=400,
 		["min_diamond"]=2000,
 		["max_diamond"]=4000,
+		["battle_gold"]=4000,
+		["min_gold"]=20000,
+		["max_gold"]=40000,
 		["recharge_id"]=13,
-		["value"]=700
+		["value"]=999
 	},
 	[501]={
 		["before_id"]=401,
@@ -41,8 +53,11 @@ local act_gold_pig = {
 		["battle_diamond"]=500,
 		["min_diamond"]=2500,
 		["max_diamond"]=5000,
+		["battle_gold"]=5000,
+		["min_gold"]=25000,
+		["max_gold"]=50000,
 		["recharge_id"]=14,
-		["value"]=700
+		["value"]=999
 	},
 	[601]={
 		["before_id"]=501,
@@ -50,8 +65,11 @@ local act_gold_pig = {
 		["battle_diamond"]=600,
 		["min_diamond"]=3000,
 		["max_diamond"]=6000,
+		["battle_gold"]=6000,
+		["min_gold"]=30000,
+		["max_gold"]=60000,
 		["recharge_id"]=15,
-		["value"]=700
+		["value"]=999
 	},
 	[701]={
 		["before_id"]=601,
@@ -59,8 +77,11 @@ local act_gold_pig = {
 		["battle_diamond"]=1000,
 		["min_diamond"]=5000,
 		["max_diamond"]=10000,
+		["battle_gold"]=10000,
+		["min_gold"]=50000,
+		["max_gold"]=100000,
 		["recharge_id"]=16,
-		["value"]=700
+		["value"]=999
 	}
 }
 local config = {
diff --git a/lua/app/config/activity_bounty_task.lua b/lua/app/config/activity_bounty_task.lua
index 1070d8e7..50b12812 100644
--- a/lua/app/config/activity_bounty_task.lua
+++ b/lua/app/config/activity_bounty_task.lua
@@ -18,7 +18,8 @@ local activity_bounty_task = {
 			100,
 			100,
 			100
-		}
+		},
+		["icon"]="11"
 	},
 	[2]={
 		["type"]=1,
@@ -39,7 +40,8 @@ local activity_bounty_task = {
 			100,
 			100,
 			100
-		}
+		},
+		["icon"]="10"
 	},
 	[3]={
 		["type"]=11,
@@ -60,7 +62,8 @@ local activity_bounty_task = {
 			100,
 			100,
 			100
-		}
+		},
+		["icon"]="7"
 	},
 	[4]={
 		["type"]=12,
@@ -81,7 +84,8 @@ local activity_bounty_task = {
 			100,
 			100,
 			100
-		}
+		},
+		["icon"]="9"
 	},
 	[5]={
 		["type"]=10,
@@ -102,7 +106,8 @@ local activity_bounty_task = {
 			100,
 			100,
 			100
-		}
+		},
+		["icon"]="7"
 	},
 	[6]={
 		["type"]=19,
@@ -123,7 +128,8 @@ local activity_bounty_task = {
 			100,
 			100,
 			100
-		}
+		},
+		["icon"]="9"
 	}
 }
 local config = {
diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua
index 29f09da7..c95f76d2 100644
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@@ -726,26 +726,53 @@ local buff = {
 	},
 	[82]={
 		["id"]=82,
-		["name"]="rebirth"
-	},
-	[83]={
-		["id"]=83,
-		["name"]="ocean_shield",
+		["name"]="shield_ice_rebound_200",
 		["buff_type"]=2,
 		["decr"]=3,
 		["icon"]="shield_ice",
 		["fx_continued"]={
-			24
+			26
+		},
+		["fx_disappear"]={
+			27
+		}
+	},
+	[83]={
+		["id"]=83,
+		["name"]="shield_rebound_100",
+		["buff_type"]=2,
+		["decr"]=3,
+		["icon"]="shield",
+		["fx_continued"]={
+			22
+		},
+		["fx_disappear"]={
+			23
 		}
 	},
 	[84]={
 		["id"]=84,
+		["name"]="rebirth",
+		["buff_type"]=7,
+		["decr"]=1,
+		["formula"]=3,
+		["icon"]="weakness_all_add"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield",
+		["buff_type"]=2,
+		["decr"]=1,
+		["icon"]="shield_ice"
+	},
+	[86]={
+		["id"]=86,
 		["name"]="self_heal",
 		["buff_type"]=6,
 		["stack"]=2,
 		["decr"]=1,
 		["formula"]=3,
-		["icon"]="shield_ice"
+		["icon"]="lock"
 	}
 }
 local keys = {
@@ -831,14 +858,16 @@ local keys = {
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
 		["skill_hurt_add_show"]=buff[81],
-		["rebirth"]=buff[82],
-		["ocean_shield"]=buff[83],
-		["self_heal"]=buff[84]
+		["shield_ice_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=84
+count=86
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/grid_type.lua b/lua/app/config/grid_type.lua
index 5a6895df..f085926f 100644
--- a/lua/app/config/grid_type.lua
+++ b/lua/app/config/grid_type.lua
@@ -5,8 +5,7 @@ local grid_type = {
 	[1]={
 		["icon"]="battle_hinder_1",
 		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1
+		["element_invalid"]=1
 	},
 	[2]={
 		["icon"]="battle_obstacle_stone_2",
@@ -18,7 +17,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[3]={
@@ -31,7 +29,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[4]={
@@ -42,7 +39,6 @@ local grid_type = {
 			3
 		},
 		["break_count"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_za_b03"
 	},
 	[5]={
@@ -55,7 +51,6 @@ local grid_type = {
 		["break_count"]=1,
 		["break_stay_element"]=1,
 		["cant_link"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_za_b02"
 	},
 	[6]={
@@ -74,7 +69,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_zhuqiantk_b01"
 	},
 	[8]={
@@ -87,7 +81,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["effect"]=1,
 		["effect_sfx"]="sfx_piece_huojian_b01",
 		["sfx_flow"]=1,
@@ -106,7 +99,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["effect"]=1,
 		["effect_sfx"]="sfx_piece_huojian_b01",
 		["sfx_flow"]=1,
@@ -125,7 +117,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["effect"]=1,
 		["effect_sfx"]="sfx_piece_huojian_b01",
 		["sfx_flow"]=1,
@@ -144,7 +135,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["effect"]=1,
 		["effect_sfx"]="sfx_piece_huojian_b01",
 		["sfx_flow"]=1,
@@ -164,7 +154,6 @@ local grid_type = {
 		["break_stay_element"]=1,
 		["can_fall"]=1,
 		["cant_link"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_kucao_b01"
 	},
 	[13]={
@@ -179,7 +168,6 @@ local grid_type = {
 		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_guodong_b01",
 		["effect"]=5,
 		["effect_sfx"]="sfx_piece_guodong_b02",
@@ -198,7 +186,6 @@ local grid_type = {
 		["bftc_time"]=0.4,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_shendeng_b01",
 		["effect"]=3,
 		["effect_trigger"]=2
@@ -220,7 +207,6 @@ local grid_type = {
 		["bftc_time"]=0.3,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_baoxiang_b01",
 		["effect"]=4,
 		["effect_trigger"]=2
@@ -238,8 +224,7 @@ local grid_type = {
 		["spine_change"]="idle1_1",
 		["break_count"]=1,
 		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1
+		["element_invalid"]=1
 	},
 	[17]={
 		["icon"]="battle_obstacle_chest_1",
@@ -254,8 +239,7 @@ local grid_type = {
 		["spine_change"]="idle1",
 		["break_count"]=1,
 		["cant_link"]=1,
-		["element_invalid"]=1,
-		["cant_upset"]=1
+		["element_invalid"]=1
 	},
 	[18]={
 		["icon"]="battle_obstacle_stump_1",
@@ -267,7 +251,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_muzhuang_b01"
 	},
 	[19]={
@@ -280,7 +263,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_muzhuang_b01"
 	},
 	[20]={
@@ -293,7 +275,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_muzhuang_b01"
 	},
 	[21]={
@@ -308,7 +289,6 @@ local grid_type = {
 		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_shuipao_b01",
 		["effect"]=5,
 		["effect_sfx"]="sfx_piece_shuipao_b02",
@@ -326,7 +306,6 @@ local grid_type = {
 		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_yuni_b01",
 		["effect"]=5,
 		["effect_sfx"]="sfx_piece_yuni_b02",
@@ -344,7 +323,6 @@ local grid_type = {
 		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_duwu_b01",
 		["effect"]=5,
 		["effect_sfx"]="sfx_piece_duwu_b02",
@@ -360,7 +338,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_jitang_b01"
 	},
 	[25]={
@@ -373,7 +350,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_jitang_b01"
 	},
 	[26]={
@@ -386,7 +362,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_jitang_b01"
 	},
 	[27]={
@@ -397,7 +372,6 @@ local grid_type = {
 			3
 		},
 		["break_count"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_fazhen_b01"
 	},
 	[28]={
@@ -410,7 +384,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_zhongrushi_b01"
 	},
 	[29]={
@@ -423,7 +396,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_zhongrushi_b01"
 	},
 	[30]={
@@ -436,7 +408,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_zhongrushi_b01"
 	},
 	[31]={
@@ -449,7 +420,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_tiexie_b01"
 	},
 	[32]={
@@ -462,7 +432,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_tiexie_b01"
 	},
 	[33]={
@@ -475,7 +444,6 @@ local grid_type = {
 		["break_count"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_tiexie_b01"
 	},
 	[34]={
@@ -490,7 +458,6 @@ local grid_type = {
 		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_rongyan_b01",
 		["effect"]=5,
 		["effect_sfx"]="sfx_piece_rongyan_b02",
@@ -507,7 +474,6 @@ local grid_type = {
 		["break_stay_element"]=1,
 		["can_fall"]=1,
 		["cant_link"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_caocong_b01"
 	},
 	[36]={
@@ -519,7 +485,6 @@ local grid_type = {
 		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_rongyan_b01",
 		["effect"]=6,
 		["effect_trigger"]=1
@@ -533,7 +498,6 @@ local grid_type = {
 		["can_fall"]=1,
 		["cant_link"]=1,
 		["element_invalid"]=1,
-		["cant_upset"]=1,
 		["break_sfx"]="sfx_piece_duwu_b01",
 		["effect"]=6,
 		["effect_trigger"]=1
diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua
index 4e098105..98b97283 100644
--- a/lua/app/config/hero.lua
+++ b/lua/app/config/hero.lua
@@ -312,6 +312,66 @@ local hero = {
 			1400201
 		}
 	},
+	[14003]={
+		["position"]=1,
+		["qlt"]=4,
+		["hurt_skill"]={
+			1400310,
+			1400311,
+			1400312,
+			1400313
+		},
+		["base_skill"]=1400320,
+		["rouge_skill"]=1400300,
+		["rouge_skill_1"]=1400301,
+		["rouge_skill_2"]=1400302,
+		["rouge_skill_3"]=1400303,
+		["rouge_skill_4"]=1400304,
+		["rouge_skill_5"]=1400305,
+		["rouge_skill_6"]=1400306,
+		["rouge_skill_7"]=1400307,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0018",
+		["item_id"]=14003,
+		["collection_point"]=5,
+		["skin"]={
+			14003
+		}
+	},
 	[22001]={
 		["position"]=2,
 		["qlt"]=2,
@@ -624,6 +684,66 @@ local hero = {
 			24002
 		}
 	},
+	[24003]={
+		["position"]=2,
+		["qlt"]=4,
+		["hurt_skill"]={
+			2400310,
+			2400311,
+			2400312,
+			2400313
+		},
+		["base_skill"]=2400320,
+		["rouge_skill"]=2400300,
+		["rouge_skill_1"]=2400301,
+		["rouge_skill_2"]=2400302,
+		["rouge_skill_3"]=2400303,
+		["rouge_skill_4"]=2400304,
+		["rouge_skill_5"]=2400305,
+		["rouge_skill_6"]=2400306,
+		["rouge_skill_7"]=2400307,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0018",
+		["item_id"]=24003,
+		["collection_point"]=5,
+		["skin"]={
+			24003
+		}
+	},
 	[32001]={
 		["position"]=3,
 		["qlt"]=2,
@@ -994,6 +1114,7 @@ local hero = {
 		["icon"]="24",
 		["item_id"]=34002,
 		["unlock_arena"]=6,
+		["is_show"]=1,
 		["collection_point"]=5,
 		["skin"]={
 			34003
@@ -1314,7 +1435,7 @@ local hero = {
 		}
 	},
 	[44003]={
-		["position"]=3,
+		["position"]=4,
 		["qlt"]=4,
 		["hurt_skill"]={
 			4400310,
@@ -1688,9 +1809,70 @@ local hero = {
 		["skin"]={
 			54002
 		}
+	},
+	[54003]={
+		["position"]=5,
+		["qlt"]=4,
+		["hurt_skill"]={
+			5400310,
+			5400311,
+			5400312,
+			5400313
+		},
+		["base_skill"]=5400320,
+		["rouge_skill"]=5400300,
+		["rouge_skill_1"]=5400301,
+		["rouge_skill_2"]=5400302,
+		["rouge_skill_3"]=5400303,
+		["rouge_skill_4"]=5400304,
+		["rouge_skill_5"]=5400305,
+		["rouge_skill_6"]=5400306,
+		["rouge_skill_7"]=5400307,
+		["begin_lv"]=5,
+		["hp"]={
+			12000000,
+			13680000,
+			15360000,
+			17120000,
+			18960000,
+			20960000,
+			24560000,
+			28440000,
+			32940000,
+			37900000,
+			43300000,
+			49300000,
+			56060000,
+			63560000,
+			72120000
+		},
+		["atk"]={
+			6000000,
+			6840000,
+			7680000,
+			8560000,
+			9480000,
+			10480000,
+			12280000,
+			14220000,
+			16470000,
+			18950000,
+			21650000,
+			24650000,
+			28030000,
+			31780000,
+			36060000
+		},
+		["model_id"]="p0030",
+		["icon"]="24",
+		["item_id"]=54003,
+		["collection_point"]=5,
+		["skin"]={
+			44003
+		}
 	}
 }
 local config = {
-data=hero,count=27
+data=hero,count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index eafe90a2..f5dca686 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -1533,6 +1533,247 @@ local skill = {
 		},
 		["obj"]=1
 	},
+	[1400310]={
+		["position"]=1,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_red",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			1000023
+		},
+		["name_act"]="attack01",
+		["fx_self"]=300100,
+		["fx_self_mirror"]=400100
+	},
+	[1400311]={
+		["position"]=1,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_red",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			1000024
+		},
+		["name_act"]="attack02",
+		["fx_self"]=300101,
+		["fx_self_mirror"]=400101
+	},
+	[1400312]={
+		["position"]=1,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_red",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=4,
+		["sound_hit"]={
+			1000021
+		},
+		["name_act"]="attack03",
+		["fx_self"]=300102,
+		["fx_self_mirror"]=400102
+	},
+	[1400313]={
+		["position"]=1,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_red",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000022
+		},
+		["name_act"]="attack04",
+		["fx_self"]=300103,
+		["fx_self_mirror"]=400103
+	},
+	[1400320]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=1,
+		["method"]=1,
+		["skill_type"]=0,
+		["battle_icon"]="21",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_red",
+				["num"]=40000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="vulnerable",
+				["num"]=2500,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["name_act"]="skill01"
+	},
+	[1400321]={
+		["position"]=1,
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1
+	},
+	[1400322]={
+		["position"]=1,
+		["buff_condition"]={
+			{
+				{
+					["type"]="state",
+					["attr"]="weaken",
+					["op"]=">",
+					["v"]=0,
+					["side"]=2
+				}
+			}
+		},
+		["condition_rel"]={
+			{
+				1,
+				1
+			}
+		},
+		["combo_position"]=1,
+		["effect_type"]=2,
+		["trigger"]=5,
+		["effect"]={
+			{
+				["type"]="hurt_red",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2
+	},
+	[1400323]={
+		["position"]=1,
+		["buff_condition"]={
+			{
+				{
+					["type"]="state",
+					["attr"]="vulnerable",
+					["op"]=">",
+					["v"]=0,
+					["side"]=2
+				}
+			}
+		},
+		["condition_rel"]={
+			{
+				1,
+				1
+			}
+		},
+		["effect_type"]=1,
+		["trigger"]=5,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1
+	},
+	[1400324]={
+		["position"]=1,
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="rebirth",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1
+	},
+	[1400325]={
+		["position"]=1,
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="rebirth",
+				["num"]=10000,
+				["ratio"]=15000,
+				["round"]=2
+			}
+		},
+		["obj"]=1
+	},
 	[2200110]={
 		["position"]=2,
 		["effect_type"]=1,
@@ -2899,6 +3140,244 @@ local skill = {
 		},
 		["obj"]=1
 	},
+	[2400310]={
+		["position"]=2,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_yellow",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			2300114
+		},
+		["name_act"]="attack01",
+		["fx_self"]=300095,
+		["fx_self_mirror"]=400095
+	},
+	[2400311]={
+		["position"]=2,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_yellow",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			4200111
+		},
+		["name_act"]="attack02",
+		["fx_self"]=300096,
+		["fx_self_mirror"]=400096
+	},
+	[2400312]={
+		["position"]=2,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_yellow",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			4200112
+		},
+		["name_act"]="attack03",
+		["fx_self"]=300097,
+		["fx_self_mirror"]=400097
+	},
+	[2400313]={
+		["position"]=2,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_yellow",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			4200113
+		},
+		["name_act"]="attack04",
+		["fx_self"]=300098,
+		["fx_self_mirror"]=400098
+	},
+	[2400320]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=2,
+		["method"]=1,
+		["skill_type"]=1,
+		["boardrange"]={
+
+		},
+		["battle_icon"]="22",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_yellow",
+				["num"]=40000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="stun",
+				["num"]=0,
+				["ratio"]=5000,
+				["round"]=1
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			100
+		},
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound"]=24002200,
+		["sound_delay"]=0.0,
+		["name_act"]="skill01",
+		["fx_self"]=300099,
+		["bullet_time"]={
+			633,
+			3000,
+			400
+		},
+		["fx_self_mirror"]=400099
+	},
+	[2400321]={
+		["position"]=2,
+		["buff_condition"]={
+			{
+				{
+					["type"]="state",
+					["attr"]="vulnerable",
+					["op"]=">",
+					["v"]=0,
+					["side"]=2
+				}
+			}
+		},
+		["condition_rel"]={
+			{
+				1,
+				1
+			}
+		},
+		["effect_type"]=2,
+		["trigger"]=5,
+		["effect"]={
+			{
+				["type"]="bleed",
+				["num"]=3500,
+				["ratio"]=1000,
+				["round"]=2
+			}
+		},
+		["obj"]=2
+	},
+	[2400322]={
+		["position"]=2,
+		["effect_type"]=2,
+		["trigger"]=9,
+		["effect"]={
+			{
+				["type"]="atkp_color_add",
+				["num"]=1000,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=1
+	},
+	[2400323]={
+		["position"]=2,
+		["buff_condition"]={
+			{
+				{
+					["type"]="state",
+					["attr"]="vulnerable",
+					["op"]=">",
+					["v"]=0,
+					["side"]=2
+				}
+			}
+		},
+		["condition_rel"]={
+			{
+				1,
+				1
+			}
+		},
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="bleed",
+				["num"]=3500,
+				["ratio"]=2000,
+				["round"]=2
+			}
+		},
+		["obj"]=2
+	},
+	[2400324]={
+		["position"]=2,
+		["effect_type"]=2,
+		["trigger"]=9,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=20000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1
+	},
 	[3200110]={
 		["position"]=3,
 		["effect_type"]=1,
@@ -7302,6 +7781,210 @@ local skill = {
 		},
 		["obj"]=2
 	},
+	[5400310]={
+		["position"]=5,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_purple",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			140
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			1000001
+		},
+		["name_act"]="attack01",
+		["fx_self"]=300112,
+		["fx_self_mirror"]=400112
+	},
+	[5400311]={
+		["position"]=5,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_purple",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			140
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			1000002
+		},
+		["name_act"]="attack02",
+		["fx_self"]=300113,
+		["fx_self_mirror"]=400113
+	},
+	[5400312]={
+		["position"]=5,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_purple",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			140
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000003
+		},
+		["name_act"]="attack03",
+		["fx_self"]=300114,
+		["fx_self_mirror"]=400114
+	},
+	[5400313]={
+		["position"]=5,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_purple",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			140
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			1000004
+		},
+		["name_act"]="attack04",
+		["fx_self"]=300115,
+		["fx_self_mirror"]=400115
+	},
+	[5400320]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=5,
+		["method"]=1,
+		["skill_type"]=1,
+		["skill_type_parameter"]={
+
+		},
+		["battle_icon"]="25",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_purple",
+				["num"]=50000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="corrupt",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			140
+		},
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound"]=54002200,
+		["sound_delay"]=0.0,
+		["name_act"]="skill01",
+		["fx_self"]=300116,
+		["bullet_time"]={
+			3166,
+			3000,
+			400
+		},
+		["fx_self_mirror"]=400116
+	},
+	[5400321]={
+		["position"]=5,
+		["effect_type"]=2,
+		["trigger"]=5,
+		["effect"]={
+			{
+				["type"]="poison",
+				["num"]=2500,
+				["ratio"]=1000,
+				["round"]=2
+			}
+		},
+		["obj"]=2
+	},
+	[5400322]={
+		["position"]=5,
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="lethargy",
+				["num"]=0,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=2
+	},
+	[5400323]={
+		["position"]=5,
+		["effect_type"]=2,
+		["trigger"]=3,
+		["effect"]={
+			{
+				["type"]="skill_hurt_add",
+				["num"]=1000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=2
+	},
+	[5400324]={
+		["position"]=5,
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="lethargy",
+				["num"]=0,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=1
+	},
 	[10001]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -25022,6 +25705,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=903
+data=skill,count=931
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua
index 32e5a1a6..9b749f15 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -1335,6 +1335,130 @@ local skill_rogue = {
 		["obj"]=3,
 		["icon"]="202"
 	},
+	[1400300]={
+		["limit_times"]=1,
+		["weight"]=100000,
+		["qlt"]=4,
+		["type"]=6,
+		["skill_position"]=1,
+		["icon"]="191"
+	},
+	[1400301]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=12,
+		["skill_position"]=1,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=1400321,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=3,
+		["icon"]="196"
+	},
+	[1400302]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=9,
+		["skill_position"]=1,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=1400322,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=3,
+		["icon"]="197"
+	},
+	[1400303]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=7,
+		["parameter"]={
+			2,
+			1000
+		},
+		["skill_position"]=1,
+		["icon"]="198"
+	},
+	[1400304]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=9,
+		["skill_position"]=1,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=1400323,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=3,
+		["icon"]="199"
+	},
+	[1400305]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=12,
+		["skill_position"]=1,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=1400324,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=3,
+		["icon"]="200"
+	},
+	[1400306]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=9,
+		["skill_position"]=1,
+		["effect"]={
+			{
+				["type"]="atkp_red_add",
+				["num"]=1500,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=3,
+		["icon"]="201"
+	},
+	[1400307]={
+		["unlock"]=1400305,
+		["cover_unlock"]=1400305,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=12,
+		["skill_position"]=1,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=1400325,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=3,
+		["icon"]="202"
+	},
 	[2200100]={
 		["limit_times"]=1,
 		["weight"]=100000,
@@ -1996,6 +2120,134 @@ local skill_rogue = {
 		["obj"]=4,
 		["icon"]="209"
 	},
+	[2400300]={
+		["limit_times"]=1,
+		["weight"]=100000,
+		["qlt"]=4,
+		["type"]=6,
+		["skill_position"]=2,
+		["icon"]="192"
+	},
+	[2400301]={
+		["method"]=2,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=2,
+		["skill_position"]=2,
+		["boardrange"]={
+			{
+				["type"]=1,
+				["range"]=2
+			},
+			{
+				["type"]=2,
+				["range"]=2
+			}
+		},
+		["icon"]="203"
+	},
+	[2400302]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=8,
+		["parameter"]={
+			2,
+			1
+		},
+		["skill_position"]=2,
+		["icon"]="204"
+	},
+	[2400303]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=9,
+		["skill_position"]=2,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=2400321,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=4,
+		["icon"]="205"
+	},
+	[2400304]={
+		["method"]=2,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=2,
+		["skill_position"]=2,
+		["boardrange"]={
+			{
+				["type"]=3,
+				["range"]=2
+			},
+			{
+				["type"]=4,
+				["range"]=2
+			}
+		},
+		["icon"]="206"
+	},
+	[2400305]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=12,
+		["skill_position"]=2,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=2400322,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=4,
+		["icon"]="207"
+	},
+	[2400306]={
+		["unlock"]=2400203,
+		["cover_unlock"]=2400203,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=9,
+		["skill_position"]=2,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=2400323,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=4,
+		["icon"]="208"
+	},
+	[2400307]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=12,
+		["skill_position"]=2,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=2400324,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=4,
+		["icon"]="209"
+	},
 	[3200100]={
 		["limit_times"]=1,
 		["weight"]=100000,
@@ -2646,6 +2898,7 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
+		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
 			{
@@ -2661,6 +2914,7 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
+		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
 			{
@@ -2676,6 +2930,7 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
+		["type"]=9,
 		["skill_position"]=3,
 		["effect"]={
 			{
@@ -2707,6 +2962,7 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
+		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
 			{
@@ -2738,6 +2994,7 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
+		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
 			{
@@ -3081,7 +3338,7 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=3,
+		["type"]=2,
 		["skill_position"]=4,
 		["boardrange"]={
 			{
@@ -4078,9 +4335,162 @@ local skill_rogue = {
 		},
 		["obj"]=7,
 		["icon"]="230"
+	},
+	[5400300]={
+		["limit_times"]=1,
+		["weight"]=100000,
+		["qlt"]=4,
+		["type"]=6,
+		["skill_position"]=5,
+		["icon"]="195"
+	},
+	[5400301]={
+		["method"]=2,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=2,
+		["skill_position"]=5,
+		["boardrange"]={
+			{
+				["type"]=5,
+				["range"]=1
+			},
+			{
+				["type"]=6,
+				["range"]=1
+			},
+			{
+				["type"]=7,
+				["range"]=1
+			},
+			{
+				["type"]=8,
+				["range"]=1
+			}
+		},
+		["icon"]="224"
+	},
+	[5400302]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=9,
+		["skill_position"]=5,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=5400321,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=7,
+		["icon"]="225"
+	},
+	[5400303]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=8,
+		["parameter"]={
+			2,
+			1
+		},
+		["skill_position"]=5,
+		["icon"]="226"
+	},
+	[5400304]={
+		["method"]=2,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=2,
+		["skill_position"]=5,
+		["boardrange"]={
+			{
+				["type"]=5,
+				["range"]=1
+			},
+			{
+				["type"]=6,
+				["range"]=1
+			},
+			{
+				["type"]=7,
+				["range"]=1
+			},
+			{
+				["type"]=8,
+				["range"]=1
+			}
+		},
+		["icon"]="227"
+	},
+	[5400305]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=14,
+		["parameter"]={
+			6
+		},
+		["skill_position"]=5,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=5400322,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=7,
+		["icon"]="228"
+	},
+	[5400306]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=15,
+		["parameter"]={
+			4
+		},
+		["skill_position"]=5,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=5400323,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=7,
+		["icon"]="229"
+	},
+	[5400307]={
+		["unlock"]=5400305,
+		["cover_unlock"]=5400305,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=14,
+		["parameter"]={
+			6
+		},
+		["skill_position"]=5,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=5400324,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=7,
+		["icon"]="230"
 	}
 }
 local config = {
-data=skill_rogue,count=260
+data=skill_rogue,count=284
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua
index 551e5085..433a76e5 100644
--- a/lua/app/config/strings/cn/buff.lua
+++ b/lua/app/config/strings/cn/buff.lua
@@ -32,157 +32,212 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="伤害提升：造成的伤害提升{0}。",
+		["tips_desc"]="伤害提升：造成的所有伤害提升。",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="眩晕",
 		["desc"]="眩晕：本回合无法行动。",
+		["tips_desc"]="眩晕：本回合无法行动。",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="护盾：可承受最大生命值{0}的伤害。",
+		["desc"]="护盾：可承受一定伤害。",
+		["tips_desc"]="护盾：可承受一定伤害。",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="冰霜",
 		["desc"]="冰霜：普攻次数-{0}。",
+		["tips_desc"]="冰霜：普攻次数减少。",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="亢奋",
 		["desc"]="亢奋：普攻次数+{0}。",
+		["tips_desc"]="亢奋：普攻次数增加。",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="反伤护盾：可承受最大生命值{0}的伤害，反弹200%对方伤害。",
+		["desc"]="反伤护盾：可承受一定伤害，反弹对方伤害。",
+		["tips_desc"]="反伤护盾：可承受一定伤害，反弹对方伤害。",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="灼烧",
 		["desc"]="灼烧：回合结束时造成释放者攻击力{0}的伤害。",
+		["tips_desc"]="灼烧：回合结束时造成一定的伤害。",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="易伤",
 		["desc"]="易伤：受到所有伤害提升{0}。",
+		["tips_desc"]="易伤：受到所有伤害提升。",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="冻结",
 		["desc"]="冻结：本回合无法行动，且增益效果不生效。",
+		["tips_desc"]="冻结：本回合无法行动，且增益效果不生效。",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="中毒",
 		["desc"]="中毒：回合结束时造成释放者攻击力{0}的伤害。",
+		["tips_desc"]="中毒：回合结束时造成一定伤害。",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="禁锢",
 		["desc"]="禁锢：本回合只可使用普攻，且技能进度不会增长。",
+		["tips_desc"]="禁锢：本回合只可使用普攻，且技能进度不会增长。",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="腐败",
 		["desc"]="腐败：生命恢复效果降低{0}。",
+		["tips_desc"]="腐败：生命恢复效果降低。",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="流血",
 		["desc"]="流血：受击时恢复攻击者生命，回合结束时造成释放者攻击力{0}的伤害。",
+		["tips_desc"]="流血：受击时恢复攻击者生命，回合结束时造成伤害。",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="虚弱",
 		["desc"]="虚弱：造成的伤害降低{0}。",
+		["tips_desc"]="虚弱：造成的伤害降低。",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="昏睡",
 		["desc"]="昏睡：本回合无法行动，受击会移除效果。",
+		["tips_desc"]="昏睡：本回合无法行动，受击会移除效果。",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="诅咒",
 		["desc"]="诅咒：攻击不会造成伤害，而是治疗对方。",
+		["tips_desc"]="诅咒：攻击不会造成伤害，而是治疗对方。",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="锁定",
 		["desc"]="锁定：随机锁定棋盘上的一种颜色，无法选中。",
+		["tips_desc"]="锁定：随机锁定棋盘上的一种颜色，无法选中。",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="先手",
 		["desc"]="先手：每回合都率先出手。",
+		["tips_desc"]="先手：每回合都率先出手。",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="不死",
 		["desc"]="不死：受到致命伤害不会死亡。",
+		["tips_desc"]="不死：本回合受到致命伤害不会死亡。",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="反击",
 		["desc"]="反击：受到直接伤害时有{0}的概率进行反击。",
+		["tips_desc"]="反击：受到直接伤害时有概率进行反击。",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="反伤",
 		["desc"]="反伤：反弹{0}对方伤害。",
+		["tips_desc"]="反伤：反弹对方伤害。",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="反伤护盾：可承受最大生命值{0}的伤害，反弹400%对方伤害。",
+		["desc"]="反伤护盾：可承受一定伤害，反弹对方大量伤害。",
+		["tips_desc"]="反伤护盾2：可承受一定伤害，反弹对方大量伤害。",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="冰霜护盾：可承受最大生命值{0}的伤害。",
+		["desc"]="冰霜护盾：可承受一定伤害。",
+		["tips_desc"]="冰霜护盾：可承受一定伤害。",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="冰霜护盾：可承受最大生命值{0}的伤害，反弹400%对方伤害。",
+		["desc"]="冰霜护盾2：可承受一定伤害，反弹对方大量伤害。",
+		["tips_desc"]="冰霜护盾2：可承受一定伤害，反弹对方大量伤害。",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="意念护盾",
 		["desc"]="意念护盾：护盾存在时不会受到任何伤害，每被攻击命中1次将扣除1层护盾。",
+		["tips_desc"]="意念护盾：护盾存在时不会受到任何伤害，每被攻击命中1次将扣除1层护盾。",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="冰霜护盾：可承受最大生命值{0}的伤害。",
+		["desc"]="冰霜护盾：可承受一定伤害。",
+		["tips_desc"]="冰霜护盾：可承受一定伤害。",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="技能增伤",
 		["desc"]="技能增伤：所有技能伤害增加",
+		["tips_desc"]="技能增伤：所有技能伤害增加",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="反伤护盾：可承受一定伤害，反弹对方大量伤害。",
+		["tips_desc"]="反伤护盾2：可承受一定伤害，反弹对方大量伤害。",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="反伤护盾：可承受一定伤害，反弹对方伤害。",
+		["tips_desc"]="反伤护盾：可承受一定伤害，反弹对方伤害。",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["desc"]="重生：持续期间被击败则会触发重生并恢复生命，回合结束时未触发重生也会恢复生命。",
+		["tips_desc"]="重生：持续期间被击败则会触发重生并恢复生命，回合结束时未触发重生也会恢复生命。",
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["desc"]="海洋护盾：承受一定伤害，免疫所有负面效果。",
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["desc"]="自愈：回合结束时恢复生命。",
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +274,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/de/buff.lua b/lua/app/config/strings/de/buff.lua
index 9a1585bf..09c5b74c 100644
--- a/lua/app/config/strings/de/buff.lua
+++ b/lua/app/config/strings/de/buff.lua
@@ -130,6 +130,26 @@ local buff = {
 	[81]={
 		["id"]=81,
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -166,12 +186,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua
index 9dfe6efe..a5adf638 100644
--- a/lua/app/config/strings/en/buff.lua
+++ b/lua/app/config/strings/en/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="Damage Boost: Increases damage dealt by {0}.",
+		["tips_desc"]="Damage Boost: Increases all damage dealt.",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="Stun",
 		["desc"]="Stun: Unable to take any action this turn.",
+		["tips_desc"]="Stun: Unable to take any action this turn.",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.",
+		["desc"]="Shield: Can take a certain amount of damage.",
+		["tips_desc"]="Shield: Can take a certain amount of damage.",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="Cold",
 		["desc"]="Cold: Normal attack -<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Cold: Less normal attacks.",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="Rage",
 		["desc"]="Rage: Normal attack +<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Rage: More normal attacks.",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="Counter Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>200%</color> of the damage back to the enemy.",
+		["desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
+		["tips_desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="Burn",
 		["desc"]="Burn: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.",
+		["tips_desc"]="Burn: Inflicts a certain amount of damage at the end of the turn.",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="Vulnerable",
 		["desc"]="Vulnerable: Increases all damage taken by <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Vulnerable: Increases all damage taken.",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="Frozen",
 		["desc"]="Frozen: Unable to take any action and buffs won't take effect this turn.",
+		["tips_desc"]="Frozen: Unable to take any action and buffs won't take effect this turn.",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="Poisoned",
 		["desc"]="Poisoned: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.",
+		["tips_desc"]="Poisoned: Inflicts a certain amount of damage at the end of the turn.",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="Imprison",
 		["desc"]="Imprison: Can only use normal attacks this turn.",
+		["tips_desc"]="Imprison: Can only use normal attacks this turn and skill gauge will not increase.",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="Corruption",
 		["desc"]="Corruption: Reduces HP recovery effect by <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Corruption: HP recovery effect reduces.",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="Bleed",
 		["desc"]="Bleed: Restores the attacker's HP upon hit and deals damage equal to <color=#3cff28>{0}</color> of the attacker's attack at the end of the turn.",
+		["tips_desc"]="Bleed: Restores the attacker's HP upon hit and deals damage at the end of the turn.",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="Weak",
 		["desc"]="Weak: Reduces damage dealt by <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Weak: Reduces damage dealt.",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="Drowsy",
 		["desc"]="Drowsy: Unable to take any action this turn. Cured when hit.",
+		["tips_desc"]="Drowsy: Unable to take any action this turn. Cured when hit.",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="Curse",
 		["desc"]="Curse: Attacks will not deal damage but instead heal the opponent.",
+		["tips_desc"]="Curse: Attacks will not deal damage but instead heal the opponent.",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="Lock",
 		["desc"]="Lock: Locks a random color on the board and prevents it from being selected.",
+		["tips_desc"]="Lock: Locks a random color on the board and prevents it from being selected.",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="Head-start",
 		["desc"]="Head-start: Act first every turn.",
+		["tips_desc"]="Head-start: Act first every turn.",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="Undead",
 		["desc"]="Undead: Does not die from fatal damage.",
+		["tips_desc"]="Undead: Does not die from fatal damage this turn.",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="Counterattack",
 		["desc"]="Counterattack: Has a <color=#3cff28>{0}</color> chance to counterattack after taking direct damage.",
+		["tips_desc"]="Counterattack: Has a chance to counterattack when directly hit.",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="Damage Counter",
 		["desc"]="Damage Counter: Reflects <color=#3cff28>{0}</color> of the enemy's damage.",
+		["tips_desc"]="Damage Counter: Reflects enemy's damage.",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="Counter Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>400%</color> of the enemy's damage.",
+		["desc"]="Counter Shield : Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
+		["tips_desc"]="Counter Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.",
+		["desc"]="Frost Shield: Absorbs a certain amount of damage.",
+		["tips_desc"]="Frost Shield: Absorbs a certain amount of damage.",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>400%</color> of the enemy's damage.",
+		["desc"]="Frost Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
+		["tips_desc"]="Frost Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="Psychic Shield",
 		["desc"]="Psychic Shield: While the shield is active, the bearer is invulnerable and takes no damage. Each hit taken consumes one stack of the shield.",
+		["tips_desc"]="Psychic Shield: While the shield is active, the bearer is invulnerable and takes no damage. Each hit taken consumes one stack of the shield.",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.",
+		["desc"]="Frost Shield: Absorbs a certain amount of damage.",
+		["tips_desc"]="Frost Shield: Absorbs a certain amount of damage.",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="Skill DMG Bonus",
 		["desc"]="Skill DMG Bonus: Increases all skill damage",
+		["tips_desc"]="Skill DMG Bonus: Increases all skill damage",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="Counter Shield : Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
+		["tips_desc"]="Counter Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
+		["tips_desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/es/buff.lua b/lua/app/config/strings/es/buff.lua
index 00f2998b..c7008d72 100644
--- a/lua/app/config/strings/es/buff.lua
+++ b/lua/app/config/strings/es/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="Aumento de daño: daño causado aumenta en {0}.",
+		["tips_desc"]="Aumento de daño: aumento de todos daños causados.",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="Vértigo",
 		["desc"]="Vértigo: incapaz de actuar en esta ronda.",
+		["tips_desc"]="Vértigo: incapaz de actuar en esta ronda.",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="Escudo: soporta daño de <color=#3cff28>{0}</color> del HP máximo.",
+		["desc"]="Escudo: puede soportar una cierta cantidad de daño.",
+		["tips_desc"]="Escudo: puede soportar una cierta cantidad de daño.",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="Escarcha",
 		["desc"]="Escarcha: número de ataque comunes - <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Escarcha: reduce el número de ATQ común.",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="Excitado",
 		["desc"]="Excitado: número de ataques comunes + <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Excitado: aumenta el número de ATQ común.",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="Escudo Reflexivo: soporta daño de <color=#3cff28>{0}</color> del HP máximo, y rebota <color=#3cff28>200%</color> del daño del rival.",
+		["desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
+		["tips_desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="Quemadura",
 		["desc"]="Quemadura: al final de la ronda, causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador.",
+		["tips_desc"]="Quemadura: causa una cierta cantidad de daño al final de la ronda.",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="Vulnerabilidad",
 		["desc"]="Vulnerabilidad: todo el daño recibido aumenta en <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Vulnerabilidad: aumento de todos daños recibidos.",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="Congelado",
 		["desc"]="Congelado: incapaz de actuar y aplicar el efecto de bonus en esta ronda.",
+		["tips_desc"]="Congelado: incapaz de actuar y aplicar el efecto de bonus en esta ronda.",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="Envenenado",
 		["desc"]="Envenenado: al final de la ronda, causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador.",
+		["tips_desc"]="Envenenado: causa una cierta cantidad de daño al final de la ronda.",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="Encarcelado",
 		["desc"]="Encarcelado: solo se usan ataques comunes en esta ronda.",
+		["tips_desc"]="Encarcelado: solo se usa ATQ común en esta ronda, y el progreso de la habilidad no aumenta.",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="Corrupto",
 		["desc"]="Corrupto: efecto de recuperación de HP se reduce en <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Corrupto: reduce el efecto de recuperación de HP.",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="Sangrado",
 		["desc"]="Sangrado: restaura HP del atacante cuando es golpeado e causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador al final de la ronda.",
+		["tips_desc"]="Sangrado: restaura HP del atacante cuando es golpeado, y causa daño al final de la ronda.",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="Débil",
 		["desc"]="Débil: daño causado se reduce en <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Debilidad: reduce el daño causado.",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="Dormido",
 		["desc"]="Dormido: incapaz de actuar en esta ronda, y el efecto se eliminará al ser golpeado.",
+		["tips_desc"]="Dormido: incapaz de actuar en esta ronda, y el efecto se eliminará al ser golpeado.",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="Maldecido",
 		["desc"]="Maldecido: el ataque cura al rival en vez de causar daño.",
+		["tips_desc"]="Maldecido: el ataque cura al rival en vez de causar daño.",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="Bloqueo",
 		["desc"]="Bloqueo: bloquea un color aleatorio en el tablero para que no pueda ser elegido.",
+		["tips_desc"]="Bloqueo: bloquea un color aleatorio en el tablero para que no pueda ser elegido.",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="Iniciado",
 		["desc"]="Iniciado: toma la iniciativa en cada ronda.",
+		["tips_desc"]="Iniciado: toma la iniciativa en cada ronda.",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="Inmortal",
 		["desc"]="Inmortal: no muere por daño letal.",
+		["tips_desc"]="Inmortal: no muere por daño letal en esta ronda.",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="Contraataque",
 		["desc"]="Contraataque: al recibir daño directo, hay un <color=#3cff28>{0}</color> de chance de contraatacar.",
+		["tips_desc"]="Contraataque: hay un chance de contra-atacar al recibir daño directo.",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="Daño Reflexivo",
 		["desc"]="Daño Reflexivo: rebota <color=#3cff28>{0}</color> el daño del rival.",
+		["tips_desc"]="Daño Reflexivo: refleja el daño del oponente.",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="Escudo Reflexivo: soporta daño de <color=#3cff28>{0}</color> del HP máximo, y rebota <color=#3cff28>400%</color> del daño del rival.",
+		["desc"]="Escudo Reflexivo : puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
+		["tips_desc"]="Escudo Reflexivo 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo.",
+		["desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
+		["tips_desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo, y rebota <color=#3cff28>400%</color> del daño del rival.",
+		["desc"]="Escudo de Escarcha 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
+		["tips_desc"]="Escudo de Escarcha 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="Escudo Mental",
 		["desc"]="Escudo Mental: cuando el escudo está ativo, estarás inmune a todos los daños. Cada ataque acertado remueve 1 capa de escudo.",
+		["tips_desc"]="Escudo Mental: cuando el escudo está ativo, estarás inmune a todos los daños. Cada ataque acertado remueve 1 capa de escudo.",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo.",
+		["desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
+		["tips_desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="Bonus de daño de habilidad",
 		["desc"]="Bonus de daño de habilidad: aumenta el daño de todas las habilidades",
+		["tips_desc"]="Bonus de daño de habilidad: aumenta el daño de todas las habilidades",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="Escudo Reflexivo : puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
+		["tips_desc"]="Escudo Reflexivo 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
+		["tips_desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/fr/buff.lua b/lua/app/config/strings/fr/buff.lua
index 9a1585bf..09c5b74c 100644
--- a/lua/app/config/strings/fr/buff.lua
+++ b/lua/app/config/strings/fr/buff.lua
@@ -130,6 +130,26 @@ local buff = {
 	[81]={
 		["id"]=81,
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -166,12 +186,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua
index f1e9adf7..2ccf97f2 100644
--- a/lua/app/config/strings/id/buff.lua
+++ b/lua/app/config/strings/id/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="Damage Boost: DMG yang diberikan meningkat {0}.",
+		["tips_desc"]="Damage Boost: Semua DMG yang diberikan meningkat.",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="Stun",
 		["desc"]="Stun: Tidak dapat bergerak pada giliran ini.",
+		["tips_desc"]="Stun: Tidak dapat bergerak pada giliran ini.",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="Perisai: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum.",
+		["desc"]="Perisai: Bisa menahan sejumlah DMG.",
+		["tips_desc"]="Perisai: Bisa menahan sejumlah DMG.",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="Frost",
 		["desc"]="Frost: ATK Normal -<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Frost: Jumlah ATK Normal berkurang.",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="Excited",
 		["desc"]="Excited: ATK Normal +<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Excited: Jumlah ATK Normal bertambah.",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="Perisai Anti-DMG: Menerima <color=#3cff28>{0}</color> DMG dari HP maksimum dan memantulkan <color=#3cff28>200%</color> DMG musuh.",
+		["desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
+		["tips_desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="Scorch",
 		["desc"]="Scorch: Memberikan <color=#3cff28>{0}</color> DMG pada kekuatan penyerang di akhir giliran.",
+		["tips_desc"]="Scorch: Memberikan sejumlah DMG di akhir giliran.",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="Rentan",
 		["desc"]="Rentan: Semua DMG yang diterima meningkat <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Rentan: Semua DMG yang diterima meningkat.",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="Freeze",
 		["desc"]="Freeze: Tidak dapat bergerak pada giliran ini dan efek buff tidak berlaku.",
+		["tips_desc"]="Freeze: Tidak dapat bertindak pada giliran ini dan efek buff tidak berlaku.",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="Keracunan",
 		["desc"]="Keracunan: Memberikan <color=#3cff28>{0}</color> DMG pada penyerang di akhir giliran.",
+		["tips_desc"]="Keracunan: Memberikan sejumlah DMG di akhir giliran.",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="Larangan",
 		["desc"]="Larangan: Hanya dapat menggunakan Normal ATK pada giliran ini.",
+		["tips_desc"]="Larangan: Hanya bisa menggunakan ATK Normal di giliran ini, dan progres skill tidak akan meningkat.",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="Korupsi",
 		["desc"]="Korupsi: Efek pemulihan HP berkurang <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Korosi: Efek pemulihan HP berkurang.",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="Bleed",
 		["desc"]="Bleed: Memulihkan HP penyerang saat diserang dan memberikan <color=#3cff28>{0}</color> DMG pada penyerang di akhir giliran.",
+		["tips_desc"]="Bleed: Memulihkan HP penyerang saat diserang dan memberikan DMG di akhir giliran.",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="Lemah",
 		["desc"]="Lemah: DMG yang diberikan berkurang <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Lemah: Mengurangi DMG.",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="Kantuk",
 		["desc"]="Kantuk: Tidak dapat begerak pada giliran ini, memukul akan menghapus efek.",
+		["tips_desc"]="Kantuk: Tidak dapat beraksi pada giliran ini, dan menerima ATK akan menghilangkan efek.",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="Kutuk",
 		["desc"]="Kutuk: ATK tidak menyebabkan DMG, tetapi menyembuhkan musuh.",
+		["tips_desc"]="Kutuk: ATK tidak menimbulkan DMG, tetapi menyembuhkan lawan.",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="Kunci",
 		["desc"]="Kunci: Mengunci warna di papan tulis secara acak dan tidak dapat dipilih.",
+		["tips_desc"]="Kunci: Mengunci warna di papan secara acak dam tidak dapat dipilih.",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="Strike",
 		["desc"]="Strike: Memimpin di setiap giliran.",
+		["tips_desc"]="Strike: Memimpin di setiap giliran.",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="Imortal",
 		["desc"]="Imortal: Tidak mati saat menerima DMG fatal.",
+		["tips_desc"]="Imortal: Menerima DMG fatal pada giliran ini tidak akan membunuhmu.",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="Serangan Balik",
 		["desc"]="Serangan Balik: <color=#3cff28>{0}</color> peluang melakukan serangan balik saat menerima DMG langsung.",
+		["tips_desc"]="Serangan Balik: Berpeluang melakukan serangan balik saat menerima DMG langsung.",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="DMG Balik",
 		["desc"]="DMG Balik: Memantulkan <color=#3cff28>{0}</color> DMG musuh.",
+		["tips_desc"]="DMG Balik: Memantulkan DMG lawan.",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="Perisai Anti-DMG: Menerima <color=#3cff28>{0}</color> DMG dari HP maksimum dan memantulkan <color=#3cff28>400%</color> DMG musuh.",
+		["desc"]="Perisai Anti-DMG : Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
+		["tips_desc"]="Perisai Anti-DMG 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum.",
+		["desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
+		["tips_desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum, dan memantulkan <color=#3cff28>400%</color> DMG musuh.",
+		["desc"]="Perisai Frost 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
+		["tips_desc"]="Perisai Frost 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="Perisai Psikis",
 		["desc"]="Perisai Psikis: Saat perisai aktif, pembawa perisai menjadi kebal dan tidak menerima DMG. Setiap ATK yang diterima menghabiskan 1 tumpukan perisai.",
+		["tips_desc"]="Perisai Psikis: Tidak akan menerima DMG apa pun selama ada perisai, dan 1 layer perisai akan dikurangi untuk setiap ATK.",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum.",
+		["desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
+		["tips_desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="Peningkatan DMG Skill",
 		["desc"]="Peningkatan DMG Skill: Semua DMG skill meningkat",
+		["tips_desc"]="Peningkatan DMG Skill: Semua DMG skill meningkat",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="Perisai Anti-DMG : Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
+		["tips_desc"]="Perisai Anti-DMG 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
+		["tips_desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua
index 5a5e2438..8dd6a504 100644
--- a/lua/app/config/strings/ja/buff.lua
+++ b/lua/app/config/strings/ja/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="ダメージ増加：敵に与えるダメージが{0}増加する。",
+		["tips_desc"]="ダメージ増加：敵に与えるすべてのダメージが増加する。",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="スタン",
 		["desc"]="スタン：このターンは行動できない。",
+		["tips_desc"]="スタン：このターンは行動できない。",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="シールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化する。",
+		["desc"]="シールド：一定量のダメージには耐えられる。",
+		["tips_desc"]="シールド：一定量のダメージには耐えられる。",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="凍傷",
 		["desc"]="凍傷：通常攻撃の回数が-<color=#3cff28>{0}</color>。",
+		["tips_desc"]="凍傷：通常攻撃の回数が減少する。",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="興奮",
 		["desc"]="興奮：通常攻撃の回数が<color=#3cff28>+{0}</color>。",
+		["tips_desc"]="興奮：通常攻撃の回数が増加する。",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="ミラーシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化し、<color=#3cff28>200%</color>のダメージを反射する。",
+		["desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
+		["tips_desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="⽕傷",
 		["desc"]="⽕傷：ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。",
+		["tips_desc"]="⽕傷：ターンが終了した時、敵に一定量のダメージを与える。",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="被ダメージアップ",
 		["desc"]="被ダメージアップ：受けた全てのダメージが<color=#3cff28>{0}</color>増加する。",
+		["tips_desc"]="被ダメージアップ：敵が受けるダメージが増加する。",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="凍結",
 		["desc"]="凍結：このターンは行動できず、バフ効果も無効。",
+		["tips_desc"]="凍結：このターンは行動できず、バフ効果も無効。",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="中毒",
 		["desc"]="中毒：ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。",
+		["tips_desc"]="中毒：ターンが終了した時、敵に一定量のダメージを与える。",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="拘束",
 		["desc"]="拘束：このターンでは通常攻撃しか使用できない。",
+		["tips_desc"]="拘束：このターンでは通常攻撃しか使用できず、且つスキルの進捗は増加しない。",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="腐敗",
 		["desc"]="腐敗：HP回復効果は<color=#3cff28>{0}</color>減少する。",
+		["tips_desc"]="腐敗：HP回復効果は減少する。",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="出血",
 		["desc"]="出血：ダメージを受けた時は敵のHPが回復し、ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。",
+		["tips_desc"]="出血：ダメージを受けた時は敵のHPが回復し、ターンが終了した時、敵にダメージを与える。",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="弱体",
 		["desc"]="弱体：与えるダメージが<color=#3cff28>{0}</color>減少する。",
+		["tips_desc"]="弱体：与えるダメージが減少する。",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="昏睡",
 		["desc"]="昏睡：このターンは行動できず、ダメージを受けると解除される。",
+		["tips_desc"]="昏睡：このターンは行動できず、ダメージを受けると解除される。",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="呪い",
 		["desc"]="呪い：攻撃はダメージを与えることなく、敵を回復する。",
+		["tips_desc"]="呪い：攻撃はダメージを与えることなく、敵を回復する。",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="ロック",
 		["desc"]="ロック：いずれの元素がロックされ、選択できなくなる。",
+		["tips_desc"]="ロック：いずれの元素がロックされ、選択できなくなる。",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="先手",
 		["desc"]="先手：毎ターン先手を取る。",
+		["tips_desc"]="先手：毎ターン先手を取る。",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="不死",
 		["desc"]="不死：致命ダメージを受けても死亡しない。",
+		["tips_desc"]="不死：このターンで致命ダメージを受けても死亡しない。",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="反撃",
 		["desc"]="反撃：直接ダメージを受けた時、<color=#3cff28>{0}</color>の確率で反撃する。",
+		["tips_desc"]="反撃：直接ダメージを受けた時、一定の確率で反撃する。",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="反射",
 		["desc"]="反射：<color=#3cff28>{0}</color>のダメージを反射する。",
+		["tips_desc"]="反射：ダメージを反射する。",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="ミラーシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化し、<color=#3cff28>400%</color>のダメージを反射する。",
+		["desc"]="ミラーシールド：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
+		["tips_desc"]="ミラーシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化する。",
+		["desc"]="アイスシールド：一定量のダメージには耐えられる。",
+		["tips_desc"]="アイスシールド：一定量のダメージには耐えられる。",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化し、<color=#3cff28>400%</color>のダメージを反射する。",
+		["desc"]="アイスシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
+		["tips_desc"]="アイスシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="マインドシールド",
 		["desc"]="マインドシールド：シールドがある間はダメージを受けず、攻撃が命中するごとにシールドが1つ減少する。",
+		["tips_desc"]="マインドシールド：シールドがある間はダメージを受けず、攻撃が命中するごとにシールドが1つ減少する。",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化する。",
+		["desc"]="アイスシールド：一定量のダメージには耐えられる。",
+		["tips_desc"]="アイスシールド：一定量のダメージには耐えられる。",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="スキルダメージ増加",
 		["desc"]="スキルダメージ増加：全てのスキルのダメージが増加する",
+		["tips_desc"]="スキルダメージ増加：全てのスキルのダメージが増加する",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="ミラーシールド：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
+		["tips_desc"]="ミラーシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
+		["tips_desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua
index 219625f9..18f0344a 100644
--- a/lua/app/config/strings/ko/buff.lua
+++ b/lua/app/config/strings/ko/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="대미지 상승: 가하는 대미지가 {0} 증가합니다.",
+		["tips_desc"]="대미지 상승: 가하는 모든 대미지가 증가합니다.",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="기절",
 		["desc"]="기절: 이번 턴에 움직일 수 없습니다.",
+		["tips_desc"]="기절: 이번 턴에 움직일 수 없습니다.",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수할 수 있습니다.",
+		["desc"]="보호막: 일정한 피해를 흡수할 수 있습니다.",
+		["tips_desc"]="보호막: 일정한 피해를 흡수할 수 있습니다.",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="서리 상태",
 		["desc"]="서리 상태: 일반 공격 횟수 -<color=#3cff28>{0}</color>",
+		["tips_desc"]="서리 상태: 일반 공격의 횟수가 감소합니다.",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="과열 상태",
 		["desc"]="과열 상태: 일반 공격 횟수+<color=#3cff28>{0}</color>",
+		["tips_desc"]="과열 상태: 일반 공격 횟수가 증가합니다.",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="가시 돋친 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수하고 상대가 입힌 대미지의 <color=#3cff28>200%</color>를 되돌려줍니다.",
+		["desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
+		["tips_desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="버닝 효과",
 		["desc"]="버닝 효과: 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.",
+		["tips_desc"]="버닝 효과: 턴 종료 시 일정량의 피해를 입힙니다.",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="부상 효과",
 		["desc"]="부상 효과: 받는 모든 대미지가 <color=#3cff28>{0}</color> 상승합니다.",
+		["tips_desc"]="부상: 받는 모든 피해가 증가합니다.",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="동결 효과",
 		["desc"]="동결 효과: 이번 턴에 움직일 수 없으며 버프 효과가 적용되지 않습니다.",
+		["tips_desc"]="동결: 이번 턴에 움직일 수 없으며 버프 효과가 적용되지 않습니다.",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="중독 효과",
 		["desc"]="중독 효과: 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.",
+		["tips_desc"]="중독: 턴 종료 시 일정한 피해를 입힙니다.",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="속박 효과",
 		["desc"]="속박 효과: 이번 턴에는 일반 공격만 사용할 수 있습니다.",
+		["tips_desc"]="속박: 이번 턴은 일반 공격만 할 수 있으며 스킬 진행도가 증가하지 않습니다.",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="부패 효과",
 		["desc"]="부패 효과: HP 회복 효과가 <color=#3cff28>{0}</color> 감소합니다.",
+		["tips_desc"]="부패: HP 회복 효과가 감소합니다.",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="출혈 효과",
 		["desc"]="출혈 효과: 공격 받을 때 공격자의 HP가 회복되며 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.",
+		["tips_desc"]="출혈: 피격 시 공격자가 HP를 회복하며 턴 종료 시 피해를 입힙니다.",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="탈진 효과",
 		["desc"]="탈진 효과: 입히는 대미지가 <color=#3cff28>{0}</color> 감소합니다.",
+		["tips_desc"]="탈진 효과: 입히는 대미지가 감소합니다.",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="수면 효과",
 		["desc"]="수면 효과: 이번 턴에 움직일 수 없으며 공격 받으면 수면 효과가 풀립니다.",
+		["tips_desc"]="수면: 이번 턴에 움직일 수 없으며 공격 받으면 수면 효과가 풀립니다.",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="저주",
 		["desc"]="저주: 공격 시 상대에게 피해를 입히지 않고 오히려 상대를 치유합니다.",
+		["tips_desc"]="저주: 공격 시 상대에게 피해를 입히지 않고 오히려 상대를 치유합니다.",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="잠금",
 		["desc"]="잠금: 보드에서 임의의 색상 한 가지를 선택할 수 없도록 잠급니다.",
+		["tips_desc"]="잠금: 보드에서 임의의 색상 한 가지를 선택할 수 없도록 잠급니다.",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="선제공격",
 		["desc"]="선제공격: 매 턴마다 먼저 공격할 수 있습니다.",
+		["tips_desc"]="선제공격: 매 턴마다 먼저 공격할 수 있습니다.",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="불멸",
 		["desc"]="불멸: 치명적인 대미지를 입어도 사망하지 않습니다.",
+		["tips_desc"]="불멸: 이번 턴에 치명적인 대미지를 입어도 사망하지 않습니다.",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="반격",
 		["desc"]="반격: 직접 피해를 입으면  <color=#3cff28>{0}</color> 확률로 반격합니다.",
+		["tips_desc"]="반격: 직접 피해를 입을 때 확률적으로 반격합니다.",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="피해 반사",
 		["desc"]="피해 반사: 상대의 <color=#3cff28>{0}</color> 대미지를 반사합니다.",
+		["tips_desc"]="피해 반사: 상대의 대미지를 반사합니다.",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="피해 반사 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수하고 상대 대미지의 <color=#3cff28>400%</color>를 반사합니다.",
+		["desc"]="피해 반사 보호막: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
+		["tips_desc"]="피해 반사 보호막2: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수할 수 있습니다.",
+		["desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
+		["tips_desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수하며 상대가 준 대미지의 <color=#3cff28>400%</color>를 되돌려줍니다.",
+		["desc"]="서리 보호막2: 일정한 피해를 흡수하며 상대의 대미지를 대량 반사합니다.",
+		["tips_desc"]="서리 보호막2: 일정한 피해를 흡수하며 상대의 대미지를 대량 반사합니다.",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="염력 보호막",
 		["desc"]="염력 보호막: 보호막이 존재하는 동안 대미지를 받지 않으며 공격받을 때마다 보호막이 한 층 벗겨집니다.",
+		["tips_desc"]="염력 보호막: 보호막이 존재하는 동안 대미지를 받지 않으며 공격받을 때마다 보호막이 한 층 벗겨집니다.",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수할 수 있습니다.",
+		["desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
+		["tips_desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="스킬 대미지 보너스",
 		["desc"]="스킬 대미지 보너스: 모든 스킬의 대미지가 증가합니다.",
+		["tips_desc"]="스킬 대미지 보너스: 모든 스킬 대미지가 증가합니다.",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="피해 반사 보호막: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
+		["tips_desc"]="피해 반사 보호막2: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
+		["tips_desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua
index a57132fb..8bde60c1 100644
--- a/lua/app/config/strings/pt/buff.lua
+++ b/lua/app/config/strings/pt/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="Aumento de dano: dano causado aumenta em {0}.",
+		["tips_desc"]="Aumento de dano: aumento de todo dano causado.",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="Estonteado",
 		["desc"]="Estonteado: não consegue agir neste turno.",
+		["tips_desc"]="Estonteado: não consegue agir neste turno.",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="Amparo: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima.",
+		["desc"]="Escudo: pode aguentar uma certa quantidade de dano.",
+		["tips_desc"]="Escudo: pode aguentar uma certa quantidade de dano.",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="Gélido",
 		["desc"]="Gélido: número de golpes comuns - <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Gelidez: redução do número de ataques básicos.",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="Excitado",
 		["desc"]="Excitado: número de golpes comuns + <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Excitação: aumenta o número de ataques básicos.",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="Escudo de Reflexão: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima e reflete <color=#3cff28>200%</color> do dano do oponente.",
+		["desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
+		["tips_desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="Conflagrado",
 		["desc"]="Conflagrado: no final do turno, sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador.",
+		["tips_desc"]="Conflagração: causa uma certa quantidade de dano ao fim do turno.",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="Vulnerável",
 		["desc"]="Vulnerável: sofre <color=#3cff28>{0}</color> a mais de todo o dano recebido.",
+		["tips_desc"]="Vulnerável: aumento de todo o dano recebido.",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="Congelado",
 		["desc"]="Congelado: não consegue agir, nem se aplicam os bônus neste turno.",
+		["tips_desc"]="Congelado: não consegue agir, nem se aplicam os bônus neste turno.",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="Envenenado",
 		["desc"]="Envenenado: no final do turno, sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador.",
+		["tips_desc"]="Envenenamento: causa uma certa quantidade de dano ao fim do turno.",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="Encarcerado",
 		["desc"]="Encarcerado: só consegue utilizar golpes comuns neste turno.",
+		["tips_desc"]="Encarcerado: só consegue utilizar golpes comuns neste turno e o progresso da habilidade não aumenta.",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="Corrupto",
 		["desc"]="Corrupto: reduz o efeito de recuperação de vida em <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Corrupto: redução do efeito de recuperação de vida.",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="Sangrado",
 		["desc"]="Sangrado: recupera a vida do atacante ao ser atingido e sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador no final do turno.",
+		["tips_desc"]="Sangramento: restaura a vida do atacante ao sofrer um ataque e causa dano ao fim do turno.",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="Enfraquecido",
 		["desc"]="Enfraquecido: reduz o dano causado em <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Enfraquecido: reduz o dano causado.",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="Sonolento",
 		["desc"]="Sonolento: não consegue agir neste turno. O efeito é removido ao ser atingido.",
+		["tips_desc"]="Sonolento: não consegue agir neste turno. O efeito é removido ao ser atingido.",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="Maldito",
 		["desc"]="Maldito: em vez de causar dano, seus golpes curam o oponente.",
+		["tips_desc"]="Maldito: em vez de causar dano, seus golpes curam o oponente.",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="Bloqueio",
 		["desc"]="Bloqueio: uma cor aleatória fica bloqueada no tabuleiro e não pode ser selecionada.",
+		["tips_desc"]="Bloqueio: uma cor aleatória fica bloqueada no tabuleiro e não pode ser selecionada.",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="Iniciativo",
 		["desc"]="Iniciativo: sempre age primeiro em cada turno.",
+		["tips_desc"]="Pioneiro: sempre age primeiro em cada turno.",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="Imortal",
 		["desc"]="Imortal: não morre ao receber dano fatal.",
+		["tips_desc"]="Imortal: não morre ao receber dano fatal neste turno.",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="Contra-ataque",
 		["desc"]="Contra-ataque: há <color=#3cff28>{0}</color> de chance de contra-atacar ao receber dano direto.",
+		["tips_desc"]="Contra-ataque: há uma chance de contra-atacar ao sofrer dano direto.",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="Reflexão",
 		["desc"]="Reflexão: reflete <color=#3cff28>{0}</color> do dano do oponente.",
+		["tips_desc"]="Reflexão: reflete o dano do oponente.",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="Escudo de Reflexão: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima e reflete <color=#3cff28>400%</color> do dano do oponente.",
+		["desc"]="Escudo de Reflexão : pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
+		["tips_desc"]="Escudo de Reflexão 2: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima.",
+		["desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
+		["tips_desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima e reflete <color=#3cff28>400%</color> do dano do oponente.",
+		["desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
+		["tips_desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="Escudo Mental",
 		["desc"]="Escudo Mental: quando o escudo está ativo, fica imune a todo o dano. Cada ataque atingido remove 1 vez do escudo.",
+		["tips_desc"]="Escudo Mental: quando o escudo está ativo, fica imune a todo o dano. Cada ataque atingido remove 1 vez do escudo.",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima.",
+		["desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
+		["tips_desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="Dano de Habilidade Aumentado",
 		["desc"]="Dano de Habilidade Aumentado: aumenta o dano de todas as habilidades.",
+		["tips_desc"]="Dano de Habilidade Aumentado: aumenta o dano de todas as habilidades.",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="Escudo de Reflexão : pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
+		["tips_desc"]="Escudo de Reflexão 2: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
+		["tips_desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ru/buff.lua b/lua/app/config/strings/ru/buff.lua
index 9a1585bf..09c5b74c 100644
--- a/lua/app/config/strings/ru/buff.lua
+++ b/lua/app/config/strings/ru/buff.lua
@@ -130,6 +130,26 @@ local buff = {
 	[81]={
 		["id"]=81,
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -166,12 +186,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua
index 813ee67a..54ae94d5 100644
--- a/lua/app/config/strings/th/buff.lua
+++ b/lua/app/config/strings/th/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="ดาเมจเพิ่มขึ้น: ดาเมจที่สร้างเพิ่มขึ้น{0}",
+		["tips_desc"]="ดาเมจเพิ่มขึ้น: ดาเมจที่สร้างทั้งหมดจะเพิ่มขึ้น",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="มึงงง",
 		["desc"]="มึงงง: รอบนี้ไม่สามารถลงมือได้",
+		["tips_desc"]="มึงงง: รอบนี้ไม่สามารถลงมือได้",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="โล่: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color>",
+		["desc"]="โล่: สามารถรับดาเมจที่กำหนดได้",
+		["tips_desc"]="โล่: สามารถรับดาเมจที่กำหนดได้",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="ฟรอสต์",
 		["desc"]="ฟรอสต์: จำนวนโจมตีทั่วไป-<color=#3cff28>{0}</color>",
+		["tips_desc"]="ฟรอสต์: จำนวนโจมตีทั่วไปลดลง",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="ตื่นเต้น",
 		["desc"]="ตื่นเต้น:จำนวนโจมตีทั่วไป+<color=#3cff28>{0}</color>",
+		["tips_desc"]="ตื่นเต้น: จำนวนโจมตีทั่วไปเพิ่มขึ้น",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="โล่สะท้อนดาเมจ: สามารถทนทานดาเมจของ HP สูงสุด<color=#3cff28>{0}</color> และสะท้อนดาเมจของคู่ต่อสู้<color=#3cff28>200%</color>",
+		["desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
+		["tips_desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="เผาไหม้",
 		["desc"]="เผาไหม้: เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>",
+		["tips_desc"]="เผาไหม้: สร้างดาเมจที่กำหนดเมื่อสิ้นสุดรอบ",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="เปราะบาง",
 		["desc"]="เปราะบาง: ดาเมจทั้งหมดที่ได้รับเพิ่มขึ้น<color=#3cff28>{0}</color>",
+		["tips_desc"]="อ่อนแอ: ดาเมจที่ได้รับทั้งหมดเพิ่มขึ้น",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="แช่แข็ง",
 		["desc"]="แช่แข็ง: ไม่สามารถลงมือในรอบนี้ได้ และเอฟเฟกต์บัฟจะไม่มีผล",
+		["tips_desc"]="แช่แข็ง: ไม่สามารถลงมือในรอบนี้ได้ และเอฟเฟกต์บัฟจะไม่มีผล",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="ถูกพิษ",
 		["desc"]="ถูกพิษ: เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>",
+		["tips_desc"]="ถูกพิษ: สร้างดาเมจที่กำหนดเมื่อสิ้นสุดรอบ",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="กักขัง",
 		["desc"]="กักขัง: รอบนี้ใช้ได้เฉพาะการโจมตีทั่วไปเท่านั้น",
+		["tips_desc"]="กักขัง: สามารถใช้การโจมตีทั่วไปได้ในรอบนี้เท่านั้น และความคืบหน้าของสกิลจะไม่เพิ่มขึ้น",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="การทุจริต",
 		["desc"]="การทุจริต: เอฟเฟกต์ฟื้นฟู HP ลดลง<color=#3cff28>{0}</color>",
+		["tips_desc"]="การทุจริต: เอฟเฟกต์ฟื้นฟู HP ลดลง",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="เลือดไหล",
 		["desc"]="เลือดไหล: เมื่อได้รับโจมตีจะฟื้นฟู HP ของผู้โจมตี เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>",
+		["tips_desc"]="เลือดไหล: ฟื้นฟู HP ของผู้โจมตีเมื่อถูกโจมตี และสร้างดาเมจเมื่อสิ้นสุดรอบ",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="อ่อนแอ",
 		["desc"]="อ่อนแอ: ดาเมจที่สร้างขึ้นจะลดลง<color=#3cff28>{0}</color>",
+		["tips_desc"]="อ่อนแอ: ดาเมจที่สร้างนั้นลดลง",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="หลับ",
 		["desc"]="หลับ: ไม่สามารถลงมือได้ในรอบนี้ เมื่อถูกโจมตีจะลบเอฟเฟกต์",
+		["tips_desc"]="หลับ: ไม่สามารถลงมือได้ในรอบนี้ และเอฟเฟกต์จะถูกลบออกหากถูกโจมตี",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="คำสาป",
 		["desc"]="คำสาป: โจมตีจะไม่สร้างดาเมจ แต่จะรักษาฝ่ายตรงข้าม",
+		["tips_desc"]="คำสาป: การโจมตีไม่สร้างดาเมจ แต่จะรักษาฝ่ายตรงข้าม",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="ล็อค",
 		["desc"]="ล็อค: สุ่มล็อคสีบนกระดานหมากรุกและไม่สามารถเลือกได้",
+		["tips_desc"]="ล็อค: สุ่มล็อคสีบนกระดาน ไม่สามารถเลือกได้",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="ลงมือก่อน",
 		["desc"]="ลงมือก่อน: ลงมือก่อนในแต่ละรอบ",
+		["tips_desc"]="ผู้ลงมือก่อน: ลงมือก่อนในแต่ละรอบ",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="อมตะ",
 		["desc"]="อมตะ: เมื่อได้รับร้ายแรงจะไม่ตาย",
+		["tips_desc"]="อมตะ: หากได้รับดาเมจร้ายแรงในรอบนี้จะไม่ตาย",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="โต้กลับ",
 		["desc"]="โต้กลับ: เมื่อได้รับดาเมจโดยตรงจะมีโอกาส<color=#3cff28>{0}</color>ที่จะโต้กลับ",
+		["tips_desc"]="โต้กลับ: มีโอกาสโต้กลับเมื่อได้รับดาเมจโดยตรง",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="สะท้อนดาเมจ",
 		["desc"]="สะท้อนดาเมจ: สะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>{0}</color>",
+		["tips_desc"]="สะท้อนดาเมจ: สะท้อนดาเมจของฝ่ายตรงข้าม",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color> และสะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>400%</color>",
+		["desc"]="โล่สะท้อนดาเมจ : สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
+		["tips_desc"]="โล่สะท้อนดาเมจ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color>",
+		["desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
+		["tips_desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color> และสะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>400%</color>",
+		["desc"]="โล่ฟรอสต์ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
+		["tips_desc"]="โล่ฟรอสต์ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="โล่จิตใจ",
 		["desc"]="โล่จิตใจ: เมื่อมีโล่อยู่จะไม่ได้รับดาเมจใดๆ ทุกครั้งที่ถูกโจมตีโล่จะถูกหัก 1 ชั้น",
+		["tips_desc"]="โล่จิตใจ: เมื่อมีโล่อยู่จะไม่ได้รับดาเมจใด ๆ ทุกครั้งที่ถูกโจมตีโล่จะถูกหัก 1 ชั้น",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color>",
+		["desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
+		["tips_desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="สกิลเพิ่มดาเมจ",
 		["desc"]="สกิลเพิ่มดาเมจ: ดาเมจของสกิลทั้งหมดเพิ่มขึ้น",
+		["tips_desc"]="เพิ่มดาเมจสกิล: ดาเมจของสกิลทั้งหมดเพิ่มขึ้น",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="โล่สะท้อนดาเมจ : สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
+		["tips_desc"]="โล่สะท้อนดาเมจ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
+		["tips_desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua
index ebc94009..e227e9c0 100644
--- a/lua/app/config/strings/vi/buff.lua
+++ b/lua/app/config/strings/vi/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="Nâng Sát Thương: Sát thương gây ra tăng {0}.",
+		["tips_desc"]="Nâng Sát Thương: Tăng sát thương gây ra.",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="Choáng",
 		["desc"]="Choáng: Hiệp này không thể hành động.",
+		["tips_desc"]="Choáng: Hiệp này không thể hành động.",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="Khiên: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa.",
+		["desc"]="Khiên: Chịu một lượng ST nhất định.",
+		["tips_desc"]="Khiên: Chịu một lượng ST nhất định.",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="Băng Sương",
 		["desc"]="Băng Sương: Lượt đánh thường -<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Băng Sương: Giảm lượt đánh thường.",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="Phấn Khởi",
 		["desc"]="Phấn Khởi: Lượt đánh thường +<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Phấn Khởi: Tăng lượt đánh thường.",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="Khiên Phản Sát Thương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa, phản đòn <color=#3cff28>200%</color> sát thương lên đối phương.",
+		["desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
+		["tips_desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="Thiêu Đốt",
 		["desc"]="Thiêu Đốt: Khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.",
+		["tips_desc"]="Thiêu Đốt: Khi kết thúc hiệp, gây sát thương.",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="Trọng Thương",
 		["desc"]="Trọng Thương: Tất cả sát thương phải nhận tăng <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Trọng Thương: Tăng tất cả sát thương phải nhận.",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="Đóng Băng",
 		["desc"]="Đóng Băng: Hiệp này không thể hành động, hiệu ứng buff không có hiệu lực.",
+		["tips_desc"]="Đóng Băng: Hiệp này không thể hành động, hiệu ứng buff vô hiệu.",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="Trúng Độc",
 		["desc"]="Trúng Độc: Khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.",
+		["tips_desc"]="Trúng Độc: Khi kết thúc hiệp, gây sát thương.",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="Giam Cầm",
 		["desc"]="Giam Cầm: Hiệp này chỉ được dùng đánh thường.",
+		["tips_desc"]="Giam Cầm: Hiệp này chỉ được dùng đánh thường, không tăng tiến độ kỹ năng.",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="Sa Đọa",
 		["desc"]="Sa Đọa: Hiệu quả hồi HP giảm <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Sa Đọa: Giảm hiệu quả hồi HP.",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="Mất Máu",
 		["desc"]="Mất Máu: Khi bị tấn công hồi HP người tấn công, khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.",
+		["tips_desc"]="Mất Máu: Khi bị tấn công hồi HP người tấn công, khi kết thúc hiệp, gây sát thương.",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="Suy Yếu",
 		["desc"]="Suy Yếu: Sát thương gây ra giảm <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Suy Yếu: Giảm sát thương gây ra.",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="Ngủ Say",
 		["desc"]="Ngủ Say: Hiệp này không thể hành động, bị tấn công sẽ xóa hiệu ứng.",
+		["tips_desc"]="Ngủ Say: Hiệp này không thể hành động, bị tấn công sẽ xóa hiệu ứng.",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="Lời Nguyền",
 		["desc"]="Lời Nguyền: Tấn công không gây ra sát thương, mà trị liệu cho đối phương.",
+		["tips_desc"]="Lời Nguyền: Tấn công không gây ST mà trị liệu cho đối phương.",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="Khóa",
 		["desc"]="Khóa: Ngẫu nhiên khóa 1 loại màu trên ván cờ, không thể chọn.",
+		["tips_desc"]="Khóa: Ngẫu nhiên khóa 1 loại màu trên ván cờ, không thể chọn.",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="Tiên Phong",
 		["desc"]="Tiên Phong: Mỗi hiệp đều ra tay trước tiên.",
+		["tips_desc"]="Tiên Phong: Mỗi hiệp đều ra tay trước tiên.",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="Bất Tử",
 		["desc"]="Bất Tử: Khi nhận sát thương chí mạng sẽ không tử vong.",
+		["tips_desc"]="Bất Tử: Hiệp này khi nhận ST chí mạng sẽ không tử vong.",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="Phản Đòn",
 		["desc"]="Phản Đòn: Khi nhận sát thương trực tiếp có <color=#3cff28>{0}</color> tỷ lệ tiến hành Phản Đòn.",
+		["tips_desc"]="Phản Đòn: Khi nhận ST trực tiếp có tỷ lệ phản đòn.",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="Phản Sát Thương",
 		["desc"]="Phản Sát Thương: Phản đòn <color=#3cff28>{0}</color> sát thương lên đối phương.",
+		["tips_desc"]="Phản ST: Phản đòn sát thương lên đối phương.",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="Khiên Phản Sát Thương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa, phản đòn <color=#3cff28>400%</color> sát thương lên đối phương.",
+		["desc"]="Khiên Phản ST : Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
+		["tips_desc"]="Khiên Phản ST 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa.",
+		["desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
+		["tips_desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa, phản đòn <color=#3cff28>400%</color> sát thương lên đối phương.",
+		["desc"]="Khiên Băng Sương 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
+		["tips_desc"]="Khiên Băng Sương 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="Khiên Ý Niệm",
 		["desc"]="Khiên Ý Niệm: Khi Khiên tồn tại sẽ không chịu bất kỳ sát thương nào, cứ bị đòn tấn công đánh trúng 1 lần sẽ trừ 1 tầng Khiên.",
+		["tips_desc"]="Khiên Ý Niệm: Khi khiên tồn tại sẽ không chịu bất kỳ ST nào, cứ bị đánh trúng 1 lần sẽ trừ 1 tầng Khiên.",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa.",
+		["desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
+		["tips_desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="Tăng ST Kỹ Năng",
 		["desc"]="Tăng ST Kỹ Năng: Tăng tất cả sát thương kỹ năng",
+		["tips_desc"]="Tăng ST Kỹ Năng: Tăng tất cả sát thương kỹ năng",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="Khiên Phản ST : Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
+		["tips_desc"]="Khiên Phản ST 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
+		["tips_desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua
index cc918536..1ea833d4 100644
--- a/lua/app/config/strings/zh/buff.lua
+++ b/lua/app/config/strings/zh/buff.lua
@@ -32,157 +32,208 @@ local buff = {
 	[24]={
 		["id"]=24,
 		["desc"]="傷害提升：造成的傷害提高{0}。",
+		["tips_desc"]="傷害提升：造成的所有傷害提高。",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
 		["show_name"]="暈眩",
 		["desc"]="暈眩：本回合無法行動。",
+		["tips_desc"]="暈眩：本回合無法行動。",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
-		["desc"]="護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。",
+		["desc"]="護盾：可承受一定傷害。",
+		["tips_desc"]="護盾：可承受一定傷害。",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
 		["show_name"]="冰霜",
 		["desc"]="冰霜：普攻次數-<color=#3cff28>{0}</color>。",
+		["tips_desc"]="冰霜：普攻次數減少。",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
 		["show_name"]="亢奮",
 		["desc"]="亢奮：普攻次數+<color=#3cff28>{0}</color>。",
+		["tips_desc"]="亢奮：普攻次數增加。",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
-		["desc"]="反傷護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>200%</color>敵方傷害。",
+		["desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
+		["tips_desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
 		["show_name"]="灼燒",
 		["desc"]="灼燒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
+		["tips_desc"]="灼燒：回合結束時造成一定的傷害。",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
 		["show_name"]="易傷",
 		["desc"]="易傷：受到所有傷害提高<color=#3cff28>{0}</color>。",
+		["tips_desc"]="易傷：受到所有傷害提高。",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
 		["show_name"]="凍結",
 		["desc"]="凍結：本回合無法行動，且增益效果無效。",
+		["tips_desc"]="凍結：本回合無法行動，且增益效果無效。",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
 		["show_name"]="中毒",
 		["desc"]="中毒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
+		["tips_desc"]="中毒：回合結束時造成一定傷害。",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
 		["show_name"]="禁錮",
 		["desc"]="禁錮：本回合只可使用普攻。",
+		["tips_desc"]="禁錮：本回合只可使用普攻，且技能進度不會增長。",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
 		["show_name"]="腐敗",
 		["desc"]="腐敗：生命回復效果降低<color=#3cff28>{0}</color>。",
+		["tips_desc"]="腐敗：生命回復效果降低。",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
 		["show_name"]="流血",
 		["desc"]="流血：受擊時回復攻擊者生命，回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
+		["tips_desc"]="流血：受擊時回復攻擊者生命，回合結束時造成傷害。",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
 		["show_name"]="虛弱",
 		["desc"]="虛弱：造成的傷害降低<color=#3cff28>{0}</color>。",
+		["tips_desc"]="虛弱：造成的傷害降低。",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
 		["show_name"]="昏睡",
 		["desc"]="昏睡：本回合無法行動，受擊會移去效果。",
+		["tips_desc"]="昏睡：本回合無法行動，受擊會移去效果。",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
 		["show_name"]="詛咒",
 		["desc"]="詛咒：攻擊不會造成傷害，而會治療對方。",
+		["tips_desc"]="詛咒：攻擊不會造成傷害，而是治療對方。",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
 		["show_name"]="鎖定",
 		["desc"]="鎖定：隨機鎖定棋盤上的一種顏色，無法選中。",
+		["tips_desc"]="鎖定：隨機鎖定棋盤上的一種顏色，無法選中。",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
 		["show_name"]="先手",
 		["desc"]="先手：每回合都率先出手。",
+		["tips_desc"]="先手：每回合都率先出手。",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
 		["show_name"]="不死",
 		["desc"]="不死：受到致命傷害不會死亡。",
+		["tips_desc"]="不死：本回合受到致命傷害不會死亡。",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
 		["show_name"]="反擊",
 		["desc"]="反擊：受到直接傷害時有<color=#3cff28>{0}</color>的機率進行反擊。",
+		["tips_desc"]="反擊：受到直接傷害時有機率進行反擊。",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
 		["show_name"]="反傷",
 		["desc"]="反傷：反彈<color=#3cff28>{0}</color>敵方傷害。",
+		["tips_desc"]="反傷：反彈對方傷害。",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
-		["desc"]="反傷護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>400%</color>敵方傷害。",
+		["desc"]="反傷護盾：可承受一定傷害，反彈對方大量傷害。",
+		["tips_desc"]="反傷護盾2：可承受一定傷害，反彈對方大量傷害。",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
-		["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。",
+		["desc"]="冰霜護盾：可承受一定傷害。",
+		["tips_desc"]="冰霜護盾：可承受一定傷害。",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>400%</color>敵方傷害。",
+		["desc"]="冰霜護盾2：可承受一定傷害，反彈對方大量傷害。",
+		["tips_desc"]="冰霜護盾2：可承受一定傷害，反彈對方大量傷害。",
 		["name"]="shield_ice_rebound_400"
 	},
 	[79]={
 		["id"]=79,
 		["show_name"]="意念護盾",
 		["desc"]="意念護盾：護盾存在時不會受到任何傷害，每被攻擊命中1次將扣除1層護盾。",
+		["tips_desc"]="意念護盾：護盾存在時不會受到任何傷害，每被攻擊命中1次將扣除1層護盾。",
 		["name"]="invincible_shield"
 	},
 	[80]={
 		["id"]=80,
-		["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。",
+		["desc"]="冰霜護盾：可承受一定傷害。",
+		["tips_desc"]="冰霜護盾：可承受一定傷害。",
 		["name"]="shield_ice_02"
 	},
 	[81]={
 		["id"]=81,
 		["show_name"]="技能增傷",
 		["desc"]="技能增傷：所有技能傷害增加",
+		["tips_desc"]="技能增傷：所有技能傷害增加",
 		["name"]="skill_hurt_add_show"
+	},
+	[82]={
+		["id"]=82,
+		["desc"]="反傷護盾：可承受一定傷害，反彈對方大量傷害。",
+		["tips_desc"]="反傷護盾2：可承受一定傷害，反彈對方大量傷害。",
+		["name"]="shield_rebound_200"
+	},
+	[83]={
+		["id"]=83,
+		["desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
+		["tips_desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
+		["name"]="shield_rebound_100"
+	},
+	[84]={
+		["id"]=84,
+		["name"]="rebirth"
+	},
+	[85]={
+		["id"]=85,
+		["name"]="ocean_shield"
+	},
+	[86]={
+		["id"]=86,
+		["name"]="self_heal"
 	}
 }
 local keys = {
@@ -219,12 +270,17 @@ local keys = {
 		["shield_ice_rebound_400"]=buff[75],
 		["invincible_shield"]=buff[79],
 		["shield_ice_02"]=buff[80],
-		["skill_hurt_add_show"]=buff[81]
+		["skill_hurt_add_show"]=buff[81],
+		["shield_rebound_200"]=buff[82],
+		["shield_rebound_100"]=buff[83],
+		["rebirth"]=buff[84],
+		["ocean_shield"]=buff[85],
+		["self_heal"]=buff[86]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=33
+count=38
 }
 return config
\ No newline at end of file
diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua
index 5562b34a..a2aaa97d 100644
--- a/lua/app/module/battle/component/battle_unit_comp.lua
+++ b/lua/app/module/battle/component/battle_unit_comp.lua
@@ -1356,6 +1356,9 @@ function BattleUnitComp:updateBuffState(buff, num)
 end
 
 function BattleUnitComp:removeAllBuff()
+	if self.unitEntity:getCanRebirth() then
+		return
+	end
 	self.team:removeAllBuff()
 end
 
@@ -1734,6 +1737,34 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d
 		end
 	else
 		if self.unitEntity:getIsDead() then
+			if self.unitEntity:getCanRebirth() then -- 复活
+				self.battleController:resetTimeSpeed(true)
+				local mainUnit = self.team:getMainUnit()
+				if mainUnit then
+					local callback = self.actionOverCallback
+					if not callback then
+						callback = atker.actionOverCallback
+					end
+					self.actionOverCallback = nil
+					atker.actionOverCallback = nil
+					mainUnit:playDead(function()
+						mainUnit:removeBuffByName(BattleConst.ATTR_NAME.REBIRTH)
+						local hpPercent = self.unitEntity:getHpPercent()
+						Logger.logHighlight(self.unitEntity:getHp())
+						Logger.logHighlight(hpPercent)
+						self.battleController:refreshHp(self.side, self.unitEntity:getHp(), hpPercent)
+						self.team:checkPassiveEvent(PASSIVE_EVENT.HP_LOWER_THAN, atker, hpPercent)
+
+						mainUnit:changeState(UNIT_STATE.IDLE)
+						mainUnit:initPosition()
+						if callback then
+							callback()
+						end
+					end)
+				end
+				return
+			end
+
 			if damageOrCureType == BattleConst.BUFF_NAME.BURN then
 				local team = self.battleController:getOtherSideTeam(self.side)
 				team:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_BY_BURN)
@@ -2137,11 +2168,20 @@ function BattleUnitComp:cancelPassiveSkillEffect(skill)
 	end
 end
 
+function BattleUnitComp:rebirth()
+	self.currState = UNIT_STATE.INIT
+	self.unitEntity:rebirth()
+end
+
 function BattleUnitComp:getIsClear()
 	return self.isClear
 end
 
 function BattleUnitComp:clear()
+	if self.unitEntity:getCanRebirth() then
+		return
+	end
+
 	if self.isClear then
 		return
 	end
diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua
index a6ee0a7f..1e72f564 100644
--- a/lua/app/module/battle/helper/battle_buff_special.lua
+++ b/lua/app/module/battle/helper/battle_buff_special.lua
@@ -135,14 +135,15 @@ local function _rebirthOn(buffSender, buff, target, buffEffect)
 	return 1
 end
 
-local function _rebirthOff(buffSender, buff, target, buffEffect)
+local function _rebirthOff(buffSender, target, buff, buffEffect)
 	-- 回血
+	target.unitEntity:setAttr(ATTR_NAME.REBIRTH, 0)
+	target:rebirth()
 	local damage, hurtStatus = BattleFormula:getDamageOrCureResult(target, buff, target)
 	if damage <= 0 then
 		damage = 1
 	end
 	target:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.HEAL, hurtStatus, buff:getName())
-	target.unitEntity:setAttr(ATTR_NAME.REBIRTH, 0)
 	return 1
 end
 
diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua
index cded5c2c..145c14ff 100644
--- a/lua/app/userdata/battle/team/battle_team_entity.lua
+++ b/lua/app/userdata/battle/team/battle_team_entity.lua
@@ -356,6 +356,10 @@ function BattleTeamEntity:getNormalSkillHurtFixed(matchType)
 	return self:getAttrValue(skillHurtName)
 end
 
+function BattleTeamEntity:getCanRebirth()
+	return self:getAttrValue(ATTR_NAME.REBIRTH) > 0
+end
+
 function BattleTeamEntity:takeDamageOrCure(num)
 	if self.isDead then
 		return 0
@@ -435,6 +439,10 @@ function BattleTeamEntity:setRecordData(name, value)
 end
 
 function BattleTeamEntity:clearRecordData()
+	if self:getCanRebirth() then --有复活不清除
+		return
+	end
+
 	if self.recordData then
 		for k, v in pairs(self.recordData) do
 			self.recordData[k] = nil
@@ -450,6 +458,9 @@ function BattleTeamEntity:die()
 	self:clearRecordData()
 end
 
+function BattleTeamEntity:rebirth()
+	self.isDead = false
+end
 function BattleTeamEntity:getIsDead()
 	return self.isDead
 end
diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua
index f0f14b24..4bd9b619 100644
--- a/lua/app/userdata/battle/team/battle_unit_entity.lua
+++ b/lua/app/userdata/battle/team/battle_unit_entity.lua
@@ -519,6 +519,10 @@ function BattleUnitEntity:getSkillExtraUseTimes(skillId)
 	return self.skillExtraUseTimes[skillId] or 0
 end
 
+function BattleUnitEntity:getCanRebirth()
+	return self.team:getCanRebirth()
+end
+
 function BattleUnitEntity:addCounterAttackCount(count)
 	self.team:addCounterAttackCount(count)
 end
@@ -539,6 +543,10 @@ function BattleUnitEntity:setTeamRecordData(name, value)
 	self.team:setRecordData(name, value)
 end
 
+function BattleUnitEntity:rebirth()
+	self.team:rebirth()
+end
+
 function BattleUnitEntity:onRoundEnd()
 	for k, v in ipairs(self.activeSkills) do
 		if not self:getActiveSkillLimit() then