From e3b8eaa04c48faa7eb84cc6441d662051b83b347 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Wed, 14 Jun 2023 15:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAbuff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/config/buff.lua                       |  20 +-
 lua/app/config/chapter_dungeon_shards.lua     |  60 +--
 lua/app/config/skill.lua                      | 459 +++++++++---------
 lua/app/config/skill_rogue.lua                | 260 +++++-----
 lua/app/config/strings/cn/buff.lua            |  20 +-
 lua/app/config/strings/cn/hero.lua            |   4 +-
 lua/app/config/strings/cn/item.lua            |   8 +-
 lua/app/config/strings/zh/buff.lua            |   2 +-
 .../battle/component/battle_unit_comp.lua     |  12 +
 .../battle/skill/battle_buff_entity.lua       |  19 +
 10 files changed, 462 insertions(+), 402 deletions(-)

diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua
index 09017a36..ea2f02e1 100644
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@@ -266,6 +266,7 @@ local buff = {
 		["buff_type"]=8,
 		["decr"]=2,
 		["icon"]="stun",
+		["show_name"]=true,
 		["control_priority"]=2,
 		["fx_continued"]={
 			13
@@ -297,6 +298,7 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="normal_attack_dec",
+		["show_name"]=true,
 		["fx_get"]={
 			32
 		}
@@ -308,6 +310,7 @@ local buff = {
 		["stack"]=2,
 		["decr"]=1,
 		["icon"]="high",
+		["show_name"]=true,
 		["fx_get"]={
 			30
 		}
@@ -396,6 +399,7 @@ local buff = {
 		["decr"]=2,
 		["formula"]=4,
 		["icon"]="burn",
+		["show_name"]=true,
 		["fx_take"]={
 			36
 		}
@@ -416,6 +420,7 @@ local buff = {
 		["buff_type"]=7,
 		["decr"]=2,
 		["icon"]="frozen",
+		["show_name"]=true,
 		["control_priority"]=1,
 		["fx_continued"]={
 			16
@@ -432,6 +437,7 @@ local buff = {
 		["decr"]=2,
 		["formula"]=4,
 		["icon"]="poison",
+		["show_name"]=true,
 		["fx_take"]={
 			35
 		}
@@ -442,6 +448,7 @@ local buff = {
 		["buff_type"]=7,
 		["decr"]=2,
 		["icon"]="imprison",
+		["show_name"]=true,
 		["control_priority"]=4,
 		["fx_get"]={
 			29
@@ -453,6 +460,7 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="corrupt",
+		["show_name"]=true,
 		["fx_get"]={
 			19
 		}
@@ -464,6 +472,7 @@ local buff = {
 		["decr"]=2,
 		["formula"]=4,
 		["icon"]="bleed",
+		["show_name"]=true,
 		["fx_take"]={
 			31
 		}
@@ -474,6 +483,7 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="weaken",
+		["show_name"]=true,
 		["fx_continued"]={
 			33
 		}
@@ -485,6 +495,7 @@ local buff = {
 		["stack"]=1,
 		["decr"]=2,
 		["icon"]="lethargy",
+		["show_name"]=true,
 		["control_priority"]=3,
 		["fx_continued"]={
 			28
@@ -496,6 +507,7 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=2,
 		["icon"]="curse",
+		["show_name"]=true,
 		["fx_get"]={
 			37
 		}
@@ -505,7 +517,8 @@ local buff = {
 		["name"]="lock",
 		["buff_type"]=7,
 		["decr"]=2,
-		["icon"]="lock"
+		["icon"]="lock",
+		["show_name"]=true
 	},
 	[59]={
 		["id"]=59,
@@ -527,6 +540,7 @@ local buff = {
 		["buff_type"]=7,
 		["decr"]=1,
 		["icon"]="undead",
+		["show_name"]=true,
 		["fx_continued"]={
 			15
 		}
@@ -537,7 +551,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=1,
 		["decr"]=1,
-		["icon"]="counterattack"
+		["icon"]="counterattack",
+		["show_name"]=true
 	},
 	[63]={
 		["id"]=63,
@@ -545,6 +560,7 @@ local buff = {
 		["buff_type"]=1,
 		["decr"]=1,
 		["icon"]="thorns",
+		["show_name"]=true,
 		["fx_continued"]={
 			18
 		}
diff --git a/lua/app/config/chapter_dungeon_shards.lua b/lua/app/config/chapter_dungeon_shards.lua
index 0a59a4c6..4975bad9 100644
--- a/lua/app/config/chapter_dungeon_shards.lua
+++ b/lua/app/config/chapter_dungeon_shards.lua
@@ -10,7 +10,7 @@ local chapter_dungeon_shards = {
 			4,
 			5
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			104,
 			204,
 			304,
@@ -99,7 +99,7 @@ local chapter_dungeon_shards = {
 			9,
 			10
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			604,
 			704,
 			804,
@@ -188,7 +188,7 @@ local chapter_dungeon_shards = {
 			14,
 			15
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			1104,
 			1204,
 			1304,
@@ -277,7 +277,7 @@ local chapter_dungeon_shards = {
 			19,
 			20
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			1604,
 			1704,
 			1804,
@@ -366,7 +366,7 @@ local chapter_dungeon_shards = {
 			24,
 			25
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			2104,
 			2204,
 			2304,
@@ -455,7 +455,7 @@ local chapter_dungeon_shards = {
 			29,
 			30
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			2604,
 			2704,
 			2804,
@@ -544,7 +544,7 @@ local chapter_dungeon_shards = {
 			34,
 			35
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			3104,
 			3204,
 			3304,
@@ -633,7 +633,7 @@ local chapter_dungeon_shards = {
 			39,
 			40
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			3604,
 			3704,
 			3804,
@@ -722,7 +722,7 @@ local chapter_dungeon_shards = {
 			44,
 			45
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			4104,
 			4204,
 			4304,
@@ -811,7 +811,7 @@ local chapter_dungeon_shards = {
 			49,
 			50
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			4604,
 			4704,
 			4804,
@@ -900,7 +900,7 @@ local chapter_dungeon_shards = {
 			54,
 			55
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			5104,
 			5204,
 			5304,
@@ -989,7 +989,7 @@ local chapter_dungeon_shards = {
 			59,
 			60
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			5604,
 			5704,
 			5804,
@@ -1078,7 +1078,7 @@ local chapter_dungeon_shards = {
 			64,
 			65
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			6104,
 			6204,
 			6304,
@@ -1167,7 +1167,7 @@ local chapter_dungeon_shards = {
 			69,
 			70
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			6604,
 			6704,
 			6804,
@@ -1256,7 +1256,7 @@ local chapter_dungeon_shards = {
 			74,
 			75
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			7104,
 			7204,
 			7304,
@@ -1345,7 +1345,7 @@ local chapter_dungeon_shards = {
 			79,
 			80
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			7604,
 			7704,
 			7804,
@@ -1434,7 +1434,7 @@ local chapter_dungeon_shards = {
 			84,
 			85
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			8104,
 			8204,
 			8304,
@@ -1523,7 +1523,7 @@ local chapter_dungeon_shards = {
 			89,
 			90
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			8604,
 			8704,
 			8804,
@@ -1612,7 +1612,7 @@ local chapter_dungeon_shards = {
 			94,
 			95
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			9104,
 			9204,
 			9304,
@@ -1701,7 +1701,7 @@ local chapter_dungeon_shards = {
 			99,
 			100
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			9604,
 			9704,
 			9804,
@@ -1790,7 +1790,7 @@ local chapter_dungeon_shards = {
 			104,
 			105
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			10104,
 			10204,
 			10304,
@@ -1879,7 +1879,7 @@ local chapter_dungeon_shards = {
 			109,
 			110
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			10604,
 			10704,
 			10804,
@@ -1968,7 +1968,7 @@ local chapter_dungeon_shards = {
 			114,
 			115
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			11104,
 			11204,
 			11304,
@@ -2057,7 +2057,7 @@ local chapter_dungeon_shards = {
 			119,
 			120
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			11604,
 			11704,
 			11804,
@@ -2146,7 +2146,7 @@ local chapter_dungeon_shards = {
 			124,
 			125
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			12104,
 			12204,
 			12304,
@@ -2235,7 +2235,7 @@ local chapter_dungeon_shards = {
 			129,
 			130
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			12604,
 			12704,
 			12804,
@@ -2324,7 +2324,7 @@ local chapter_dungeon_shards = {
 			134,
 			135
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			13104,
 			13204,
 			13304,
@@ -2413,7 +2413,7 @@ local chapter_dungeon_shards = {
 			139,
 			140
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			13604,
 			13704,
 			13804,
@@ -2502,7 +2502,7 @@ local chapter_dungeon_shards = {
 			144,
 			145
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			14104,
 			14204,
 			14304,
@@ -2591,7 +2591,7 @@ local chapter_dungeon_shards = {
 			149,
 			150
 		},
-		["monster_dungeon_shards"]={
+		["monster"]={
 			14604,
 			14704,
 			14804,
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index 103a0c56..08de7182 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -1120,9 +1120,8 @@ local skill = {
 		},
 		["shake_time"]=200,
 		["shake_type"]=6,
-		["sound_hit"]={
-			1400120
-		},
+		["sound"]=14001200,
+		["sound_delay"]=0,
 		["name_act"]="skill01",
 		["fx_self"]=300049,
 		["bullet_time"]={
@@ -1337,9 +1336,8 @@ local skill = {
 		},
 		["shake_time"]=200,
 		["shake_type"]=6,
-		["sound_hit"]={
-			54001201
-		},
+		["sound"]=14002200,
+		["sound_delay"]=0,
 		["name_act"]="skill01",
 		["fx_self"]=300089,
 		["bullet_time"]={
@@ -1389,7 +1387,7 @@ local skill = {
 		["trigger"]=7,
 		["effect"]={
 			{
-				["type"]="dmg_addition_yellow_add",
+				["type"]="dmg_addition_red_add",
 				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=1
@@ -1435,9 +1433,8 @@ local skill = {
 		},
 		["shake_time"]=200,
 		["shake_type"]=6,
-		["sound_hit"]={
-			54001201
-		},
+		["sound"]=14002200,
+		["sound_delay"]=0,
 		["name_act"]="skill01",
 		["fx_self"]=300089,
 		["bullet_time"]={
@@ -2738,9 +2735,8 @@ local skill = {
 		},
 		["shake_time"]=200,
 		["shake_type"]=6,
-		["sound_hit"]={
-			2400120
-		},
+		["sound"]=24002200,
+		["sound_delay"]=0,
 		["name_act"]="skill01",
 		["fx_self"]=300032,
 		["bullet_time"]={
@@ -3869,12 +3865,12 @@ local skill = {
 		}
 	},
 	[3400210]={
-		["position"]=3,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_green",
+				["type"]="hurt_blue",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -3882,8 +3878,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			1,
-			140
+			2,
+			0
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -3891,15 +3887,15 @@ local skill = {
 			1000001
 		},
 		["name_act"]="attack01",
-		["fx_self"]=300091
+		["fx_self"]=300033
 	},
 	[3400211]={
-		["position"]=3,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_green",
+				["type"]="hurt_blue",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -3907,8 +3903,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			1,
-			140
+			2,
+			0
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -3916,15 +3912,15 @@ local skill = {
 			1000002
 		},
 		["name_act"]="attack02",
-		["fx_self"]=300091
+		["fx_self"]=300033
 	},
 	[3400212]={
-		["position"]=3,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_green",
+				["type"]="hurt_blue",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -3932,8 +3928,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			1,
-			140
+			2,
+			0
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -3941,15 +3937,15 @@ local skill = {
 			1000003
 		},
 		["name_act"]="attack03",
-		["fx_self"]=300091
+		["fx_self"]=300093
 	},
 	[3400213]={
-		["position"]=3,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_green",
+				["type"]="hurt_blue",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -3957,8 +3953,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			1,
-			140
+			2,
+			0
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -3966,127 +3962,145 @@ local skill = {
 			1000004
 		},
 		["name_act"]="attack04",
-		["fx_self"]=300091
+		["fx_self"]=300094
 	},
 	[3400220]={
 		["energy"]=10,
 		["link"]=1,
-		["position"]=3,
-		["method"]=1,
-		["skill_type"]=0,
-		["battle_icon"]="18",
-		["effect_type"]=1,
-		["trigger"]=1,
-		["effect"]={
-			{
-				["type"]="hurt_green",
-				["num"]=40000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="curse",
-				["num"]=2500,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=2,
-		["skill_position"]={
-			1,
-			140
-		},
-		["shake_time"]=200,
-		["shake_type"]=6,
-		["sound_hit"]={
-			3400120
-		},
-		["name_act"]="skill01",
-		["fx_self"]=300092,
-		["bullet_time"]={
-			1600,
-			3000,
-			200
-		}
-	},
-	[3400221]={
-		["energy"]=10,
-		["link"]=1,
-		["position"]=3,
+		["position"]=4,
 		["method"]=2,
 		["skill_type"]=4,
 		["boardrange"]={
-			{
-				["type"]=1,
-				["range"]=2
-			},
-			{
-				["type"]=2,
-				["range"]=2
-			}
+
 		},
-		["battle_icon"]="18",
+		["battle_icon"]="19",
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_green",
+				["type"]="hurt_blue",
 				["num"]=40000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="curse",
-				["num"]=2500,
-				["ratio"]=10000,
-				["round"]=1
+				["type"]="lethargy",
+				["num"]=0,
+				["ratio"]=5000,
+				["round"]=2
 			}
 		},
 		["obj"]=2,
 		["skill_position"]={
-			1,
-			140
+			2,
+			0
 		},
 		["shake_time"]=200,
-		["shake_type"]=6,
+		["shake_type"]=5,
 		["sound_hit"]={
-			3400120
+			4300120
 		},
 		["name_act"]="skill01",
-		["fx_self"]=300092,
+		["fx_target"]=300034,
 		["bullet_time"]={
-			1600,
+			633,
 			3000,
-			200
+			400
 		}
 	},
+	[3400221]={
+		["position"]=4,
+		["buff_condition"]={
+			{
+				{
+					["type"]="state",
+					["attr"]="weaken",
+					["op"]=">",
+					["v"]=0,
+					["side"]=2
+				}
+			}
+		},
+		["effect_type"]=2,
+		["trigger"]=7,
+		["effect"]={
+			{
+				["type"]="dmg_addition_blue_add",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1
+	},
 	[3400222]={
-		["position"]=3,
+		["position"]=4,
+		["buff_condition"]={
+			{
+				{
+					["type"]="state",
+					["attr"]="lethargy",
+					["op"]=">",
+					["v"]=0,
+					["side"]=2
+				}
+			}
+		},
 		["effect_type"]=2,
 		["trigger"]=5,
 		["effect"]={
 			{
-				["type"]="corrupt",
-				["num"]=5000,
-				["ratio"]=1000,
+				["type"]="imprison",
+				["num"]=0,
+				["ratio"]=10000,
 				["round"]=2
 			}
 		},
 		["obj"]=2
 	},
 	[3400223]={
-		["position"]=3,
-		["effect_type"]=2,
-		["trigger"]=5,
+		["energy"]=8,
+		["link"]=1,
+		["position"]=4,
+		["method"]=2,
+		["skill_type"]=4,
+		["boardrange"]={
+
+		},
+		["battle_icon"]="19",
+		["effect_type"]=1,
+		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="corrupt",
-				["num"]=5000,
-				["ratio"]=1000,
+				["type"]="hurt_blue",
+				["num"]=40000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="lethargy",
+				["num"]=0,
+				["ratio"]=5000,
 				["round"]=2
 			}
 		},
-		["obj"]=2
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]={
+			4300120
+		},
+		["name_act"]="skill01",
+		["fx_target"]=300034,
+		["bullet_time"]={
+			633,
+			3000,
+			400
+		}
 	},
 	[4200110]={
 		["position"]=4,
@@ -4976,9 +4990,8 @@ local skill = {
 		},
 		["shake_time"]=200,
 		["shake_type"]=5,
-		["sound_hit"]={
-			4300120
-		},
+		["sound"]=44001200,
+		["sound_delay"]=0,
 		["name_act"]="skill01",
 		["fx_target"]=300034,
 		["bullet_time"]={
@@ -5047,12 +5060,12 @@ local skill = {
 		["obj"]=2
 	},
 	[4400210]={
-		["position"]=4,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_blue",
+				["type"]="hurt_green",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -5060,8 +5073,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			2,
-			0
+			1,
+			140
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -5069,15 +5082,15 @@ local skill = {
 			1000001
 		},
 		["name_act"]="attack01",
-		["fx_self"]=300033
+		["fx_self"]=300091
 	},
 	[4400211]={
-		["position"]=4,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_blue",
+				["type"]="hurt_green",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -5085,8 +5098,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			2,
-			0
+			1,
+			140
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -5094,15 +5107,15 @@ local skill = {
 			1000002
 		},
 		["name_act"]="attack02",
-		["fx_self"]=300033
+		["fx_self"]=300091
 	},
 	[4400212]={
-		["position"]=4,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_blue",
+				["type"]="hurt_green",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -5110,8 +5123,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			2,
-			0
+			1,
+			140
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -5119,15 +5132,15 @@ local skill = {
 			1000003
 		},
 		["name_act"]="attack03",
-		["fx_self"]=300093
+		["fx_self"]=300091
 	},
 	[4400213]={
-		["position"]=4,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_blue",
+				["type"]="hurt_green",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -5135,8 +5148,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			2,
-			0
+			1,
+			140
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -5144,145 +5157,127 @@ local skill = {
 			1000004
 		},
 		["name_act"]="attack04",
-		["fx_self"]=300094
+		["fx_self"]=300091
 	},
 	[4400220]={
 		["energy"]=10,
 		["link"]=1,
-		["position"]=4,
-		["method"]=2,
-		["skill_type"]=4,
-		["boardrange"]={
-
-		},
-		["battle_icon"]="19",
+		["position"]=3,
+		["method"]=1,
+		["skill_type"]=0,
+		["battle_icon"]="18",
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_blue",
+				["type"]="hurt_green",
 				["num"]=40000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="lethargy",
-				["num"]=0,
-				["ratio"]=5000,
-				["round"]=2
-			}
-		},
-		["obj"]=2,
-		["skill_position"]={
-			2,
-			0
-		},
-		["shake_time"]=200,
-		["shake_type"]=5,
-		["sound_hit"]={
-			4300120
-		},
-		["name_act"]="skill01",
-		["fx_target"]=300034,
-		["bullet_time"]={
-			633,
-			3000,
-			400
-		}
-	},
-	[4400221]={
-		["position"]=4,
-		["buff_condition"]={
-			{
-				{
-					["type"]="state",
-					["attr"]="weaken",
-					["op"]=">",
-					["v"]=0,
-					["side"]=2
-				}
-			}
-		},
-		["effect_type"]=2,
-		["trigger"]=7,
-		["effect"]={
-			{
-				["type"]="dmg_addition_blue_add",
-				["num"]=5000,
+				["type"]="curse",
+				["num"]=2500,
 				["ratio"]=10000,
 				["round"]=1
 			}
 		},
-		["obj"]=1
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			140
+		},
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]={
+			3400120
+		},
+		["name_act"]="skill01",
+		["fx_self"]=300092,
+		["bullet_time"]={
+			1600,
+			3000,
+			200
+		}
 	},
-	[4400222]={
-		["position"]=4,
-		["buff_condition"]={
+	[4400221]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=3,
+		["method"]=2,
+		["skill_type"]=4,
+		["boardrange"]={
 			{
-				{
-					["type"]="state",
-					["attr"]="lethargy",
-					["op"]=">",
-					["v"]=0,
-					["side"]=2
-				}
+				["type"]=1,
+				["range"]=2
+			},
+			{
+				["type"]=2,
+				["range"]=2
 			}
 		},
+		["battle_icon"]="18",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_green",
+				["num"]=40000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="curse",
+				["num"]=2500,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			1,
+			140
+		},
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]={
+			3400120
+		},
+		["name_act"]="skill01",
+		["fx_self"]=300092,
+		["bullet_time"]={
+			1600,
+			3000,
+			200
+		}
+	},
+	[4400222]={
+		["position"]=3,
 		["effect_type"]=2,
 		["trigger"]=5,
 		["effect"]={
 			{
-				["type"]="imprison",
-				["num"]=0,
-				["ratio"]=10000,
+				["type"]="corrupt",
+				["num"]=5000,
+				["ratio"]=1000,
 				["round"]=2
 			}
 		},
 		["obj"]=2
 	},
 	[4400223]={
-		["energy"]=8,
-		["link"]=1,
-		["position"]=4,
-		["method"]=2,
-		["skill_type"]=4,
-		["boardrange"]={
-
-		},
-		["battle_icon"]="19",
-		["effect_type"]=1,
-		["trigger"]=1,
+		["position"]=3,
+		["effect_type"]=2,
+		["trigger"]=5,
 		["effect"]={
 			{
-				["type"]="hurt_blue",
-				["num"]=40000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="lethargy",
-				["num"]=0,
-				["ratio"]=5000,
+				["type"]="corrupt",
+				["num"]=5000,
+				["ratio"]=1000,
 				["round"]=2
 			}
 		},
-		["obj"]=2,
-		["skill_position"]={
-			2,
-			0
-		},
-		["shake_time"]=200,
-		["shake_type"]=5,
-		["sound_hit"]={
-			4300120
-		},
-		["name_act"]="skill01",
-		["fx_target"]=300034,
-		["bullet_time"]={
-			633,
-			3000,
-			400
-		}
+		["obj"]=2
 	},
 	[5200110]={
 		["position"]=5,
diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua
index e4e1e462..34ed7b2e 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -1306,7 +1306,7 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=15,
+		["type"]=14,
 		["parameter"]={
 			6
 		},
@@ -1917,14 +1917,14 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=12,
+		["type"]=9,
 		["skill_position"]=2,
 		["effect"]={
 			{
 				["type"]="add_skill",
 				["num"]=2400222,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=999
 			}
 		},
 		["obj"]=4,
@@ -1953,14 +1953,14 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=12,
+		["type"]=9,
 		["skill_position"]=2,
 		["effect"]={
 			{
 				["type"]="add_skill",
 				["num"]=2400224,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=999
 			}
 		},
 		["obj"]=4,
@@ -2482,67 +2482,96 @@ local skill_rogue = {
 		["weight"]=100000,
 		["qlt"]=4,
 		["type"]=6,
-		["skill_position"]=3,
-		["icon"]="188"
+		["skill_position"]=4,
+		["icon"]="189"
 	},
 	[3400201]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=1,
-		["parameter"]={
-			3400221
+		["type"]=2,
+		["skill_position"]=4,
+		["boardrange"]={
+			{
+				["type"]=5,
+				["range"]=1
+			},
+			{
+				["type"]=6,
+				["range"]=1
+			},
+			{
+				["type"]=7,
+				["range"]=1
+			},
+			{
+				["type"]=8,
+				["range"]=1
+			}
 		},
-		["skill_position"]=3,
-		["icon"]="150"
+		["icon"]="157"
 	},
 	[3400202]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=3,
-		["skill_position"]=3,
+		["type"]=12,
+		["skill_position"]=4,
 		["effect"]={
 			{
-				["type"]="atkp",
-				["num"]=5000,
+				["type"]="add_skill",
+				["num"]=3400221,
 				["ratio"]=10000,
 				["round"]=1
 			}
 		},
-		["obj"]=1,
-		["icon"]="151"
+		["obj"]=6,
+		["icon"]="158"
 	},
 	[3400203]={
+		["unlock"]=4400201,
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
-		["type"]=8,
-		["parameter"]={
-			2,
-			1
+		["qlt"]=3,
+		["type"]=2,
+		["skill_position"]=4,
+		["boardrange"]={
+			{
+				["type"]=5,
+				["range"]=1
+			},
+			{
+				["type"]=6,
+				["range"]=1
+			},
+			{
+				["type"]=7,
+				["range"]=1
+			},
+			{
+				["type"]=8,
+				["range"]=1
+			}
 		},
-		["skill_position"]=3,
-		["icon"]="152"
+		["icon"]="159"
 	},
 	[3400204]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=7,
+		["type"]=16,
 		["parameter"]={
 			2,
-			2500
+			5000
 		},
-		["skill_position"]=3,
-		["icon"]="153"
+		["skill_position"]=4,
+		["icon"]="160"
 	},
 	[3400205]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
 		["type"]=9,
-		["skill_position"]=3,
 		["effect"]={
 			{
 				["type"]="add_skill",
@@ -2551,46 +2580,36 @@ local skill_rogue = {
 				["round"]=999
 			}
 		},
-		["obj"]=5,
-		["icon"]="154"
+		["obj"]=6,
+		["icon"]="161"
 	},
 	[3400206]={
-		["unlock"]=3400201,
-		["limit_times"]=1,
-		["weight"]=3000,
-		["qlt"]=3,
-		["type"]=2,
-		["skill_position"]=3,
-		["boardrange"]={
-			{
-				["type"]=3,
-				["range"]=2
-			},
-			{
-				["type"]=4,
-				["range"]=2
-			}
-		},
-		["icon"]="155"
-	},
-	[3400207]={
-		["unlock"]=3400205,
-		["cover_unlock"]=3400205,
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
 		["type"]=9,
-		["skill_position"]=3,
+		["skill_position"]=4,
 		["effect"]={
 			{
-				["type"]="add_skill",
-				["num"]=3400223,
+				["type"]="atkp_blue_add",
+				["num"]=1500,
 				["ratio"]=10000,
 				["round"]=999
 			}
 		},
-		["obj"]=5,
-		["icon"]="156"
+		["obj"]=6,
+		["icon"]="162"
+	},
+	[3400207]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=4,
+		["type"]=1,
+		["parameter"]={
+			3400223
+		},
+		["skill_position"]=4,
+		["icon"]="163"
 	},
 	[4200100]={
 		["limit_times"]=1,
@@ -3076,96 +3095,67 @@ local skill_rogue = {
 		["weight"]=100000,
 		["qlt"]=4,
 		["type"]=6,
-		["skill_position"]=4,
-		["icon"]="189"
+		["skill_position"]=3,
+		["icon"]="188"
 	},
 	[4400201]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=2,
-		["skill_position"]=4,
-		["boardrange"]={
-			{
-				["type"]=5,
-				["range"]=1
-			},
-			{
-				["type"]=6,
-				["range"]=1
-			},
-			{
-				["type"]=7,
-				["range"]=1
-			},
-			{
-				["type"]=8,
-				["range"]=1
-			}
+		["type"]=1,
+		["parameter"]={
+			4400221
 		},
-		["icon"]="157"
+		["skill_position"]=3,
+		["icon"]="150"
 	},
 	[4400202]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=12,
-		["skill_position"]=4,
+		["type"]=3,
+		["skill_position"]=3,
 		["effect"]={
 			{
-				["type"]="add_skill",
-				["num"]=4400221,
+				["type"]="atkp",
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=1
 			}
 		},
-		["obj"]=6,
-		["icon"]="158"
+		["obj"]=1,
+		["icon"]="151"
 	},
 	[4400203]={
-		["unlock"]=4400201,
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=3,
-		["type"]=2,
-		["skill_position"]=4,
-		["boardrange"]={
-			{
-				["type"]=5,
-				["range"]=1
-			},
-			{
-				["type"]=6,
-				["range"]=1
-			},
-			{
-				["type"]=7,
-				["range"]=1
-			},
-			{
-				["type"]=8,
-				["range"]=1
-			}
+		["qlt"]=4,
+		["type"]=8,
+		["parameter"]={
+			2,
+			1
 		},
-		["icon"]="159"
+		["skill_position"]=3,
+		["icon"]="152"
 	},
 	[4400204]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=16,
+		["type"]=7,
 		["parameter"]={
 			2,
-			5000
+			2500
 		},
-		["skill_position"]=4,
-		["icon"]="160"
+		["skill_position"]=3,
+		["icon"]="153"
 	},
 	[4400205]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
 		["type"]=9,
+		["skill_position"]=3,
 		["effect"]={
 			{
 				["type"]="add_skill",
@@ -3174,36 +3164,46 @@ local skill_rogue = {
 				["round"]=999
 			}
 		},
-		["obj"]=6,
-		["icon"]="161"
+		["obj"]=5,
+		["icon"]="154"
 	},
 	[4400206]={
+		["unlock"]=3400201,
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=2,
+		["skill_position"]=3,
+		["boardrange"]={
+			{
+				["type"]=3,
+				["range"]=2
+			},
+			{
+				["type"]=4,
+				["range"]=2
+			}
+		},
+		["icon"]="155"
+	},
+	[4400207]={
+		["unlock"]=3400205,
+		["cover_unlock"]=3400205,
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
 		["type"]=9,
-		["skill_position"]=4,
+		["skill_position"]=3,
 		["effect"]={
 			{
-				["type"]="atkp_blue_add",
-				["num"]=1500,
+				["type"]="add_skill",
+				["num"]=4400223,
 				["ratio"]=10000,
 				["round"]=999
 			}
 		},
-		["obj"]=6,
-		["icon"]="162"
-	},
-	[4400207]={
-		["limit_times"]=1,
-		["weight"]=3000,
-		["qlt"]=4,
-		["type"]=1,
-		["parameter"]={
-			4400223
-		},
-		["skill_position"]=4,
-		["icon"]="163"
+		["obj"]=5,
+		["icon"]="156"
 	},
 	[5200100]={
 		["limit_times"]=1,
diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua
index 1f3eafe9..f9af8c02 100644
--- a/lua/app/config/strings/cn/buff.lua
+++ b/lua/app/config/strings/cn/buff.lua
@@ -6,7 +6,7 @@ local buff = {
 	},
 	[8]={
 		["id"]=8,
-		["desc"]="黄色抗性：受到黄色元素英雄的伤害降低{0}。",
+		["desc"]="金色抗性：受到金色元素英雄的伤害降低{0}。",
 		["name"]="dec_dmg_yellow_add"
 	},
 	[9]={
@@ -36,6 +36,7 @@ local buff = {
 	},
 	[33]={
 		["id"]=33,
+		["show_name"]="眩晕",
 		["desc"]="眩晕：本回合无法行动。",
 		["name"]="stun"
 	},
@@ -46,11 +47,13 @@ local buff = {
 	},
 	[36]={
 		["id"]=36,
+		["show_name"]="冰霜",
 		["desc"]="冰霜：普攻次数-{0}。",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
+		["show_name"]="亢奋",
 		["desc"]="亢奋：普攻次数+{0}。",
 		["name"]="normal_attack_add"
 	},
@@ -61,76 +64,91 @@ local buff = {
 	},
 	[48]={
 		["id"]=48,
+		["show_name"]="灼烧",
 		["desc"]="灼烧：回合结束时造成释放者攻击力{0}的伤害。",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
+		["show_name"]="易伤",
 		["desc"]="易伤：受到所有伤害提升{0}。",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
+		["show_name"]="冻结",
 		["desc"]="冻结：本回合无法行动，且增益效果不生效。",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
+		["show_name"]="中毒",
 		["desc"]="中毒：回合结束时造成释放者攻击力{0}的伤害。",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
+		["show_name"]="禁锢",
 		["desc"]="禁锢：本回合只可使用普攻，且技能进度不会增长。",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
+		["show_name"]="腐败",
 		["desc"]="腐败：生命恢复效果降低{0}。",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
+		["show_name"]="流血",
 		["desc"]="流血：受击时恢复攻击者生命，回合结束时造成释放者攻击力{0}的伤害。",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
+		["show_name"]="虚弱",
 		["desc"]="虚弱：造成的伤害降低{0}。",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
+		["show_name"]="昏睡",
 		["desc"]="昏睡：本回合无法行动，受击会移除效果。",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
+		["show_name"]="诅咒",
 		["desc"]="诅咒：攻击不会造成伤害，而是治疗对方。",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
+		["show_name"]="锁定",
 		["desc"]="锁定：随机锁定棋盘上的一种颜色，无法选中。",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
+		["show_name"]="先手",
 		["desc"]="先手：每回合都率先出手。",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
+		["show_name"]="不死",
 		["desc"]="不死：受到致命伤害不会死亡。",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
+		["show_name"]="反击",
 		["desc"]="反击：受到直接伤害时有{0}的概率进行反击。",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
+		["show_name"]="反伤",
 		["desc"]="反伤：反弹{0}对方伤害。",
 		["name"]="thorns"
 	},
diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua
index cebd7b0a..33b707b4 100644
--- a/lua/app/config/strings/cn/hero.lua
+++ b/lua/app/config/strings/cn/hero.lua
@@ -54,7 +54,7 @@ local hero = {
 		["desc"]="这一箭下去你可能会死。"
 	},
 	[34002]={
-		["name"]="艳后"
+		["name"]="梦魔"
 	},
 	[42001]={
 		["name"]="冰心",
@@ -73,7 +73,7 @@ local hero = {
 		["desc"]="有人持剑起舞，寒冰妖姬用剑让敌人起舞。"
 	},
 	[44002]={
-		["name"]="梦魔"
+		["name"]="艳后"
 	},
 	[52001]={
 		["name"]="忍者伦",
diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua
index b32f73a1..844b75dd 100644
--- a/lua/app/config/strings/cn/item.lua
+++ b/lua/app/config/strings/cn/item.lua
@@ -136,8 +136,8 @@ local item = {
 		["desc"]="木兰碎片，凑齐可激活或升级。"
 	},
 	[34002]={
-		["name"]="艳后碎片",
-		["desc"]="艳后碎片，凑齐可激活或升级。"
+		["name"]="梦魔碎片",
+		["desc"]="梦魔碎片，凑齐可激活或升级。"
 	},
 	[42001]={
 		["name"]="冰心碎片",
@@ -156,8 +156,8 @@ local item = {
 		["desc"]="寒冰妖姬碎片，凑齐可激活或升级。"
 	},
 	[44002]={
-		["name"]="梦魔碎片",
-		["desc"]="梦魔碎片，凑齐可激活或升级。"
+		["name"]="艳后碎片",
+		["desc"]="艳后碎片，凑齐可激活或升级。"
 	},
 	[52001]={
 		["name"]="忍者伦碎片",
diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua
index 1657df6a..fd89f16c 100644
--- a/lua/app/config/strings/zh/buff.lua
+++ b/lua/app/config/strings/zh/buff.lua
@@ -6,7 +6,7 @@ local buff = {
 	},
 	[8]={
 		["id"]=8,
-		["desc"]="黃色抗性：受到黃色元素英雄的傷害降低<color=#3cff28>{0}</color>。",
+		["desc"]="金色抗性：受到金色元素英雄的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="dec_dmg_yellow_add"
 	},
 	[9]={
diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua
index ff3c50ed..83e8b2d8 100644
--- a/lua/app/module/battle/component/battle_unit_comp.lua
+++ b/lua/app/module/battle/component/battle_unit_comp.lua
@@ -1302,6 +1302,18 @@ function BattleUnitComp:addMaxHp(percent)
 end
 
 function BattleUnitComp:addBuff(buffEffect)
+	if buffEffect.buff:needShowName() and buffEffect.buff:getShowName(true) then
+		local direction = BattleConst.EFFECT_TYPE_MOVE_R
+		local x, y = self.team:getMainUnitLocalPosition(self)
+		x = x + 80
+		if self.side == BattleConst.SIDE_ATK then
+			direction = BattleConst.EFFECT_TYPE_MOVE_L
+			x = x - 80
+		end
+		y = y - 120
+		self:showEffectNumber(BattleConst.EFFECT_COLOR_SPECIAL, direction, buffEffect.buff:getShowName(true), x - 20, y - 20, 0)
+	end
+
 	return self.team:addBuff(buffEffect)
 end
 
diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua
index 10f8ed09..d64456e3 100644
--- a/lua/app/userdata/battle/skill/battle_buff_entity.lua
+++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua
@@ -18,6 +18,8 @@ function BattleBuffEntity:init(effectParams, owner, hostSkill)
 	self.buffType = self.buffInfo.buff_type
 	self.cantRemove = false
 	self.notShowIcon = false
+	self.showNameStr = nil
+	self.showNameRedColor = nil
 end
 
 function BattleBuffEntity:setOwner(owner)
@@ -108,6 +110,23 @@ function BattleBuffEntity:getFxDisappear()
 	return self.buffInfo.fx_disappear
 end
 
+function BattleBuffEntity:getShowName(needRedColor)
+	if not self.showNameStr then
+		self.showNameStr = I18N:getTextWithOtherKey("buff", "name", self:getName(), "show_name")
+	end
+	if not self.showNameRedColor and self.showNameStr then
+		self.showNameRedColor = "<color=#E35F6A>" .. self.showNameStr .. "</color>"
+	end
+	if needRedColor then
+		return self.showNameRedColor
+	end
+	return self.showNameStr
+end
+
+function BattleBuffEntity:needShowName()
+	return self.buffInfo.show_name
+end
+
 function BattleBuffEntity:isCantRemove()
 	return self.cantRemove
 end