From 2a39d43518a15d0f5be26c75631c5c2f5af141d7 Mon Sep 17 00:00:00 2001
From: puxuan <413323644@qq.com>
Date: Sat, 18 Oct 2025 10:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=89=E9=B8=BD=E6=8A=80=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/config/battle_exp.lua                 |  16 +-
 lua/app/config/buff.lua                       | 148 +++++++++++-------
 lua/app/config/chapter.lua                    |  36 ++---
 lua/app/config/fx.lua                         |  42 ++++-
 lua/app/config/skill.lua                      |  42 +++--
 lua/app/config/skill_rogue.lua                |  17 +-
 lua/app/module/gm/gm_const.lua                |   6 +
 lua/app/module/hero/hero_manager.lua          |   2 +-
 lua/app/ui/battle/battle_pause_ui.lua         |   4 +-
 .../battle/cell/battle_select_skill_cell.lua  |  21 +--
 lua/app/ui/gm/gm_tool_ui.lua                  |   9 ++
 11 files changed, 224 insertions(+), 119 deletions(-)

diff --git a/lua/app/config/battle_exp.lua b/lua/app/config/battle_exp.lua
index aa700348..c66353c6 100644
--- a/lua/app/config/battle_exp.lua
+++ b/lua/app/config/battle_exp.lua
@@ -1,27 +1,27 @@
 local battle_exp = {
 	[1]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[2]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[3]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[4]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[5]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[6]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[7]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[8]={
-		["exp"]=10000
+		["exp"]=1
 	},
 	[9]={
 		["exp"]=10000
diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua
index 7df9fb0e..4d24e503 100644
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@@ -55,7 +55,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_red_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[8]={
 		["id"]=8,
@@ -66,7 +66,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_yellow_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[9]={
 		["id"]=9,
@@ -77,7 +77,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_green_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[10]={
 		["id"]=10,
@@ -88,7 +88,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_blue_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[11]={
 		["id"]=11,
@@ -99,7 +99,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_purple_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[12]={
 		["id"]=12,
@@ -109,7 +109,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="dec_dmg_all_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[13]={
 		["id"]=13,
@@ -117,7 +117,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[14]={
 		["id"]=14,
@@ -125,7 +126,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[15]={
 		["id"]=15,
@@ -133,7 +135,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[16]={
 		["id"]=16,
@@ -141,7 +144,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[17]={
 		["id"]=17,
@@ -149,14 +153,16 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[18]={
 		["id"]=18,
 		["name"]="weakness_all_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[19]={
 		["id"]=19,
@@ -164,7 +170,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[20]={
 		["id"]=20,
@@ -172,7 +179,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[21]={
 		["id"]=21,
@@ -180,7 +188,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[22]={
 		["id"]=22,
@@ -188,7 +197,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[23]={
 		["id"]=23,
@@ -196,7 +206,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[24]={
 		["id"]=24,
@@ -205,7 +216,7 @@ local buff = {
 		["stack"]=2,
 		["decr"]=1,
 		["icon"]="weakness_all_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[25]={
 		["id"]=25,
@@ -213,7 +224,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[26]={
 		["id"]=26,
@@ -222,7 +234,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=1,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[27]={
 		["id"]=27,
@@ -231,7 +244,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=2,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[28]={
 		["id"]=28,
@@ -240,7 +254,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=3,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[29]={
 		["id"]=29,
@@ -249,7 +264,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=4,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[30]={
 		["id"]=30,
@@ -258,7 +274,8 @@ local buff = {
 		["stack"]=2,
 		["position"]=5,
 		["decr"]=1,
-		["limit_parameter"]=10000
+		["limit_parameter"]=10000,
+		["is_percent"]=1
 	},
 	[31]={
 		["id"]=31,
@@ -339,14 +356,16 @@ local buff = {
 		["name"]="block",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[39]={
 		["id"]=39,
 		["name"]="hpp_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[40]={
 		["id"]=40,
@@ -356,7 +375,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="crit_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[41]={
 		["id"]=41,
@@ -366,14 +385,15 @@ local buff = {
 		["decr"]=1,
 		["icon"]="crit_time_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[42]={
 		["id"]=42,
 		["name"]="exp_time_add",
 		["buff_type"]=7,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[43]={
 		["id"]=43,
@@ -425,7 +445,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="burn",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_take"]={
 			36
 		}
@@ -437,7 +457,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="vulnerable",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_get"]={
 			34
 		}
@@ -466,7 +486,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="poison",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_take"]={
 			35
 		}
@@ -490,7 +510,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="corrupt",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_get"]={
 			19
 		}
@@ -503,7 +523,7 @@ local buff = {
 		["formula"]=4,
 		["icon"]="bleed",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_take"]={
 			31
 		}
@@ -515,7 +535,7 @@ local buff = {
 		["decr"]=2,
 		["icon"]="weaken",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_continued"]={
 			33
 		}
@@ -586,7 +606,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="counterattack",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[63]={
 		["id"]=63,
@@ -595,7 +615,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="thorns",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_continued"]={
 			18
 		}
@@ -606,7 +626,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[65]={
 		["id"]=65,
@@ -614,7 +635,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[66]={
 		["id"]=66,
@@ -622,7 +644,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[67]={
 		["id"]=67,
@@ -630,7 +653,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[68]={
 		["id"]=68,
@@ -638,14 +662,16 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[69]={
 		["id"]=69,
 		["name"]="dmg_dec_all_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=2
+		["decr"]=2,
+		["is_percent"]=1
 	},
 	[70]={
 		["id"]=70,
@@ -859,7 +885,7 @@ local buff = {
 		["stack"]=1,
 		["decr"]=3,
 		["icon"]="counterattack",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[91]={
 		["id"]=91,
@@ -869,7 +895,7 @@ local buff = {
 		["position"]=1,
 		["decr"]=3,
 		["icon"]="dec_dmg_red_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[92]={
 		["id"]=92,
@@ -879,7 +905,7 @@ local buff = {
 		["position"]=2,
 		["decr"]=3,
 		["icon"]="dec_dmg_yellow_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[93]={
 		["id"]=93,
@@ -889,7 +915,7 @@ local buff = {
 		["position"]=3,
 		["decr"]=3,
 		["icon"]="dec_dmg_green_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[94]={
 		["id"]=94,
@@ -899,7 +925,7 @@ local buff = {
 		["position"]=4,
 		["decr"]=3,
 		["icon"]="dec_dmg_blue_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[95]={
 		["id"]=95,
@@ -909,7 +935,7 @@ local buff = {
 		["position"]=5,
 		["decr"]=3,
 		["icon"]="dec_dmg_purple_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[96]={
 		["id"]=96,
@@ -918,7 +944,7 @@ local buff = {
 		["stack"]=2,
 		["decr"]=3,
 		["icon"]="dec_dmg_all_add",
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[97]={
 		["id"]=97,
@@ -927,7 +953,7 @@ local buff = {
 		["decr"]=3,
 		["icon"]="thorns",
 		["show_name"]=true,
-		["ispercent"]=1,
+		["is_percent"]=1,
 		["fx_continued"]={
 			18
 		}
@@ -938,7 +964,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=1,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[99]={
 		["id"]=99,
@@ -946,7 +973,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[100]={
 		["id"]=100,
@@ -954,7 +982,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=3,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[101]={
 		["id"]=101,
@@ -962,7 +991,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=4,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[102]={
 		["id"]=102,
@@ -970,7 +1000,8 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["position"]=5,
-		["decr"]=1
+		["decr"]=1,
+		["is_percent"]=1
 	},
 	[103]={
 		["id"]=103,
@@ -989,7 +1020,8 @@ local buff = {
 		["name"]="forever_uncontrolled",
 		["buff_type"]=7,
 		["decr"]=1,
-		["icon"]="immune"
+		["icon"]="immune",
+		["is_percent"]=1
 	},
 	[105]={
 		["id"]=105,
@@ -999,7 +1031,7 @@ local buff = {
 		["decr"]=1,
 		["icon"]="attr_normal_hurtp_all_add",
 		["show_name"]=true,
-		["ispercent"]=1
+		["is_percent"]=1
 	},
 	[106]={
 		["id"]=106,
diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua
index e5ba3fc1..750be735 100644
--- a/lua/app/config/chapter.lua
+++ b/lua/app/config/chapter.lua
@@ -16,33 +16,23 @@ local chapter = {
 		},
 		["involved_skill"]={
 			{
-				12,
-				7,
-				13
+				3300111,
+				2300111,
+				4300111
 			}
 		},
 		["not_involved_skill"]={
+			1,
+			2,
+			3,
 			4,
-			5,
-			6,
-			16,
-			17,
-			18,
-			30,
-			31,
-			32,
-			33,
-			34,
-			35,
-			36,
-			37,
-			38,
-			39,
-			40,
-			41,
-			42,
-			43,
-			44
+			20,
+			21,
+			22,
+			23,
+			27,
+			28,
+			32
 		},
 		["monster"]={
 			1010101,
diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua
index 0377cbde..4726353f 100644
--- a/lua/app/config/fx.lua
+++ b/lua/app/config/fx.lua
@@ -523,6 +523,38 @@ local fx = {
 		["res"]="sfx_c1_m20007_05",
 		["bind"]="root"
 	},
+	[200025]={
+		["res"]="sfx_c1_m20008_01",
+		["bind"]="root"
+	},
+	[200026]={
+		["res"]="sfx_c1_m20008_02",
+		["bind"]="root"
+	},
+	[200027]={
+		["res"]="sfx_c1_m20008_03",
+		["bind"]="root"
+	},
+	[200028]={
+		["res"]="sfx_c1_m20008_04",
+		["bind"]="root"
+	},
+	[200029]={
+		["res"]="sfx_c1_m20006_01",
+		["bind"]="root"
+	},
+	[200030]={
+		["res"]="sfx_c1_m20006_02",
+		["bind"]="root"
+	},
+	[200031]={
+		["res"]="sfx_c1_m20006_03",
+		["bind"]="root"
+	},
+	[200032]={
+		["res"]="sfx_c1_m20006_04",
+		["bind"]="root"
+	},
 	[500001]={
 		["res"]="sfx_c1_m30001_01",
 		["bind"]="root"
@@ -563,6 +595,14 @@ local fx = {
 		["res"]="sfx_c1_m30002_05",
 		["bind"]="root"
 	},
+	[500011]={
+		["res"]="sfx_c1_m30003_01",
+		["bind"]="root"
+	},
+	[500012]={
+		["res"]="sfx_c1_m30003_05",
+		["bind"]="root"
+	},
 	[300001]={
 		["res"]="sfx_c1_p45002_01",
 		["bind"]="root"
@@ -1456,6 +1496,6 @@ local fx = {
 	}
 }
 local config = {
-data=fx,count=335
+data=fx,count=345
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index 7f8cff7e..b34d3ad0 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -8592,6 +8592,9 @@ local skill = {
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
 		["name_hit"]={
+			"suffer02",
+			"suffer01",
+			"suffer02",
 			"suffer03"
 		},
 		["fx_self"]=300100,
@@ -8669,6 +8672,9 @@ local skill = {
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
 		["name_hit"]={
+			"suffer02",
+			"suffer01",
+			"suffer02",
 			"suffer03"
 		},
 		["fx_self"]=300100,
@@ -8746,6 +8752,9 @@ local skill = {
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
 		["name_hit"]={
+			"suffer02",
+			"suffer01",
+			"suffer02",
 			"suffer03"
 		},
 		["fx_self"]=300100,
@@ -8823,6 +8832,9 @@ local skill = {
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
 		["name_hit"]={
+			"suffer02",
+			"suffer01",
+			"suffer02",
 			"suffer03"
 		},
 		["fx_self"]=300100,
@@ -11301,7 +11313,8 @@ local skill = {
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=200029
 	},
 	[20080]={
 		["effect_type"]=1,
@@ -11324,7 +11337,8 @@ local skill = {
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
-		}
+		},
+		["fx_self"]=200030
 	},
 	[20081]={
 		["effect_type"]=1,
@@ -11347,7 +11361,8 @@ local skill = {
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=200031
 	},
 	[20082]={
 		["skill_type"]=3,
@@ -11379,6 +11394,7 @@ local skill = {
 		["name_hit"]={
 			"suffer03"
 		},
+		["fx_self"]=200032,
 		["bullet_time"]={
 			966,
 			5000,
@@ -11558,7 +11574,8 @@ local skill = {
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=200025
 	},
 	[20088]={
 		["effect_type"]=1,
@@ -11581,7 +11598,8 @@ local skill = {
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
-		}
+		},
+		["fx_self"]=200026
 	},
 	[20089]={
 		["effect_type"]=1,
@@ -11604,7 +11622,8 @@ local skill = {
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=200027
 	},
 	[20090]={
 		["skill_type"]=3,
@@ -11655,6 +11674,7 @@ local skill = {
 			"suffer01",
 			"suffer03"
 		},
+		["fx_self"]=200028,
 		["bullet_time"]={
 			966,
 			5000,
@@ -11997,7 +12017,8 @@ local skill = {
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=500011
 	},
 	[20102]={
 		["effect_type"]=1,
@@ -12020,7 +12041,8 @@ local skill = {
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
-		}
+		},
+		["fx_self"]=500011
 	},
 	[20103]={
 		["effect_type"]=1,
@@ -12043,7 +12065,8 @@ local skill = {
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
-		}
+		},
+		["fx_self"]=500011
 	},
 	[20104]={
 		["battle_icon"]="m30003_1",
@@ -12079,6 +12102,7 @@ local skill = {
 		["name_hit"]={
 			"suffer03"
 		},
+		["fx_self"]=500012,
 		["bullet_time"]={
 			366,
 			3000,
diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua
index eac43d9a..3b2f00f1 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -213,7 +213,7 @@ local skill_rogue = {
 		["universal"]=1,
 		["toast_mark"]=13,
 		["limit_times"]=3,
-		["weight"]=2000,
+		["weight"]=100000000000,
 		["qlt"]=4,
 		["type"]=5,
 		["attr"]={
@@ -324,7 +324,10 @@ local skill_rogue = {
 		["universal"]=1,
 		["weight"]=1000,
 		["qlt"]=4,
-		["type"]=22,
+		["type"]=20,
+		["parameter"]={
+			10
+		},
 		["icon"]="27"
 	},
 	[23]={
@@ -336,7 +339,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="red_refresh_weight",
-				["num"]=500,
+				["num"]=714,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -353,7 +356,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="yellow_refresh_weight",
-				["num"]=500,
+				["num"]=714,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -370,7 +373,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="green_refresh_weight",
-				["num"]=500,
+				["num"]=714,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -387,7 +390,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="blue_refresh_weight",
-				["num"]=500,
+				["num"]=714,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -404,7 +407,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="purple_refresh_weight",
-				["num"]=500,
+				["num"]=714,
 				["ratio"]=10000,
 				["round"]=0
 			}
diff --git a/lua/app/module/gm/gm_const.lua b/lua/app/module/gm/gm_const.lua
index 67b91beb..43be1cc3 100644
--- a/lua/app/module/gm/gm_const.lua
+++ b/lua/app/module/gm/gm_const.lua
@@ -142,5 +142,11 @@ Example: set_cur_chapter 9]],
 	Example: day_end]],
 		type = "day_end"
 	},
+	{
+		title = "添加肉鸽技能",
+		desc = [[添加肉鸽技能e:add_rouge
+	Example: add_rouge]],
+		type = "add_rouge"
+	},
 }
 return GMConst
\ No newline at end of file
diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua
index b033dc36..be1ca050 100644
--- a/lua/app/module/hero/hero_manager.lua
+++ b/lua/app/module/hero/hero_manager.lua
@@ -171,7 +171,7 @@ function HeroManager:getSkillRogueDesc(skillId, value)
 	end
 	local str
 	if cfg.attr then
-		str = GFunc.getFinalAttrValue(cfg.attr.type, value)
+		str = GFunc.getFinalBuffValue(cfg.attr.type, value)
 	end
 	return I18N:getText("skill_rogue", skillId, "desc", str)
 end
diff --git a/lua/app/ui/battle/battle_pause_ui.lua b/lua/app/ui/battle/battle_pause_ui.lua
index c60082f5..3ddc8bfe 100644
--- a/lua/app/ui/battle/battle_pause_ui.lua
+++ b/lua/app/ui/battle/battle_pause_ui.lua
@@ -102,7 +102,7 @@ function BattlePauseUI:_refreshScrollRect()
         local cfg = ConfigManager:getConfig("skill_rogue")[skillId]
         local str
         if cfg and cfg.attr and ModuleManager.HeroManager:showValueRogue(skillId) then
-            str = GFunc.getFinalAttrValue(cfg.attr.type, value)
+            str = GFunc.getFinalBuffValue(cfg.attr.type, value)
         end
 
 		cell:refresh(skillId, count, str)
@@ -117,7 +117,7 @@ function BattlePauseUI:_refreshScrollRect()
 			-- 	valueStr = ModuleManager.HeroManager:getSkillRogueDesc(skillId, value)
 			-- end
             if EDITOR_MODE then
-                valueStr = valueStr .. "\n" .. skillId
+                valueStr = valueStr .. "\n技能ID：" .. skillId
             end
             ModuleManager.TipsManager:showDescTips(valueStr, cell:getBaseObject())
         end)
diff --git a/lua/app/ui/battle/cell/battle_select_skill_cell.lua b/lua/app/ui/battle/cell/battle_select_skill_cell.lua
index 3d38f663..765efa59 100644
--- a/lua/app/ui/battle/cell/battle_select_skill_cell.lua
+++ b/lua/app/ui/battle/cell/battle_select_skill_cell.lua
@@ -13,18 +13,19 @@ function BattleSelectSkillCell:refresh(skillId, func)
     if cfg.type == 5 then
         self.value = math.random(cfg.attr.minnum, cfg.attr.maxnum)
         self.value = self.value // 100 * 100
-        valueStr = GFunc.getFinalAttrValue(cfg.attr.type, self.value)
+        valueStr = GFunc.getFinalBuffValue(cfg.attr.type, self.value)
         value = ModuleManager.HeroManager:getSkillRogueDesc(skillId, self.value)
     else
-        self.value = nil
-        if skillId == 24 then -- 特殊处理
-            if ModuleManager.BattleManager.battleController then
-                value = ModuleManager.BattleManager.battleController.battleData:getSkillCount(skillId)+1
-                value = I18N:getText("skill_rogue", skillId, "desc", value)
-            end
-        else
-            value = ModuleManager.HeroManager:getSkillRogueDesc(skillId, self.value)
-        end
+		-- self.value = nil
+		-- if skillId == 24 then -- 特殊处理
+		-- 	if ModuleManager.BattleManager.battleController then
+		-- 		value = ModuleManager.BattleManager.battleController.battleData:getSkillCount(skillId)+1
+		-- 		value = I18N:getText("skill_rogue", skillId, "desc", value)
+		-- 	end
+		-- else
+		-- 	value = ModuleManager.HeroManager:getSkillRogueDesc(skillId, self.value)
+		-- end
+        value = ModuleManager.HeroManager:getSkillRogueDesc(skillId, self.value or 0)
     end
 
     local uiMap = self:getUIMap()
diff --git a/lua/app/ui/gm/gm_tool_ui.lua b/lua/app/ui/gm/gm_tool_ui.lua
index dbbbf6df..bb4a2051 100644
--- a/lua/app/ui/gm/gm_tool_ui.lua
+++ b/lua/app/ui/gm/gm_tool_ui.lua
@@ -172,6 +172,15 @@ function GMToolUI:sendMsg(gmCommand)
 				DataManager.ChapterData:setChapterId(tonumber(args.args[2]))
 				DataManager.ChapterData:setDirty()
 				self:closeUI()
+			elseif args.args[1] == "add_rouge" then
+				local skillId = tonumber(args.args[2])
+				local cfg = ConfigManager:getConfig("skill_rogue")[skillId]
+				local value
+				if cfg.attr then
+					value = math.random(cfg.attr.minnum, cfg.attr.maxnum)
+				end
+				ModuleManager.BattleManager:onSelectSkill(skillId, value)
+				self:closeUI()
 			else
 				args.args = {gmCommand}
 				ModuleManager.DevToolManager:dealGM(args)