diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua
index 81beccdb..2b39d40e 100644
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@@ -42,10 +42,10 @@ local buff = {
 		["icon"]="dec_dmg_red_add"
 	},
 	[8]={
-		["name"]="dec_dmg_ryellow_add",
+		["name"]="dec_dmg_yellow_add",
 		["buff_type"]=1,
 		["decr"]=1,
-		["icon"]="dec_dmg_ryellow_add"
+		["icon"]="dec_dmg_yellow_add"
 	},
 	[9]={
 		["name"]="dec_dmg_green_add",
@@ -136,12 +136,42 @@ local buff = {
 		["name"]="dmg_addition_all_add"
 	},
 	[25]={
+		["name"]="atkp_color_add",
+		["buff_type"]=1,
+		["decr"]=1
+	},
+	[26]={
+		["name"]="atkp_red_add",
+		["buff_type"]=1,
+		["decr"]=1
+	},
+	[27]={
+		["name"]="atkp_yellow_add",
+		["buff_type"]=1,
+		["decr"]=1
+	},
+	[28]={
+		["name"]="atkp_green_add",
+		["buff_type"]=1,
+		["decr"]=1
+	},
+	[29]={
+		["name"]="atkp_blue_add",
+		["buff_type"]=1,
+		["decr"]=1
+	},
+	[30]={
+		["name"]="atkp_purple_add",
+		["buff_type"]=1,
+		["decr"]=1
+	},
+	[31]={
 		["name"]="wavehealp",
 		["buff_type"]=5,
 		["decr"]=3,
 		["formula"]=2
 	},
-	[26]={
+	[32]={
 		["name"]="heal",
 		["buff_type"]=5,
 		["decr"]=3,
@@ -150,7 +180,7 @@ local buff = {
 			4001
 		}
 	},
-	[27]={
+	[33]={
 		["name"]="hit_heal",
 		["buff_type"]=5,
 		["decr"]=3,
@@ -159,7 +189,7 @@ local buff = {
 			4001
 		}
 	},
-	[28]={
+	[34]={
 		["name"]="stun",
 		["buff_type"]=8,
 		["decr"]=2,
@@ -168,12 +198,12 @@ local buff = {
 			4001
 		}
 	},
-	[29]={
+	[35]={
 		["name"]="hit_stun",
 		["buff_type"]=8,
 		["decr"]=2
 	},
-	[30]={
+	[36]={
 		["name"]="shield",
 		["buff_type"]=2,
 		["decr"]=1,
@@ -181,22 +211,22 @@ local buff = {
 			4001
 		}
 	},
-	[31]={
+	[37]={
 		["name"]="atkp_add",
 		["buff_type"]=1,
 		["decr"]=1
 	},
-	[32]={
+	[38]={
 		["name"]="atkp_add_defenderhp",
 		["buff_type"]=1,
 		["decr"]=1
 	},
-	[33]={
+	[39]={
 		["name"]="atkp_add_connect",
 		["buff_type"]=1,
 		["decr"]=3
 	},
-	[34]={
+	[40]={
 		["name"]="spd_dec",
 		["buff_type"]=8,
 		["decr"]=2,
@@ -204,51 +234,21 @@ local buff = {
 			4001
 		}
 	},
-	[35]={
+	[41]={
 		["name"]="block",
 		["buff_type"]=1,
 		["decr"]=1
 	},
-	[36]={
+	[42]={
 		["name"]="hit_block",
 		["buff_type"]=1,
 		["decr"]=1
 	},
-	[37]={
+	[43]={
 		["name"]="atk_times_add",
 		["buff_type"]=7,
 		["decr"]=1
 	},
-	[38]={
-		["name"]="atkp_color_add",
-		["buff_type"]=1,
-		["decr"]=1
-	},
-	[39]={
-		["name"]="atkp_red_add",
-		["buff_type"]=1,
-		["decr"]=1
-	},
-	[40]={
-		["name"]="atkp_yellow_add",
-		["buff_type"]=1,
-		["decr"]=1
-	},
-	[41]={
-		["name"]="atkp_green_add",
-		["buff_type"]=1,
-		["decr"]=1
-	},
-	[42]={
-		["name"]="atkp_blue_add",
-		["buff_type"]=1,
-		["decr"]=1
-	},
-	[43]={
-		["name"]="atkp_purple_add",
-		["buff_type"]=1,
-		["decr"]=1
-	},
 	[44]={
 		["name"]="hpp_add",
 		["buff_type"]=1,
@@ -299,7 +299,7 @@ local keys = {
 		["hurt_blue"]=buff[5],
 		["hurt_purple"]=buff[6],
 		["dec_dmg_red_add"]=buff[7],
-		["dec_dmg_ryellow_add"]=buff[8],
+		["dec_dmg_yellow_add"]=buff[8],
 		["dec_dmg_green_add"]=buff[9],
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
@@ -316,25 +316,25 @@ local keys = {
 		["dmg_addition_blue_add"]=buff[22],
 		["dmg_addition_purple_add"]=buff[23],
 		["dmg_addition_all_add"]=buff[24],
-		["wavehealp"]=buff[25],
-		["heal"]=buff[26],
-		["hit_heal"]=buff[27],
-		["stun"]=buff[28],
-		["hit_stun"]=buff[29],
-		["shield"]=buff[30],
-		["atkp_add"]=buff[31],
-		["atkp_add_defenderhp"]=buff[32],
-		["atkp_add_connect"]=buff[33],
-		["spd_dec"]=buff[34],
-		["block"]=buff[35],
-		["hit_block"]=buff[36],
-		["atk_times_add"]=buff[37],
-		["atkp_color_add"]=buff[38],
-		["atkp_red_add"]=buff[39],
-		["atkp_yellow_add"]=buff[40],
-		["atkp_green_add"]=buff[41],
-		["atkp_blue_add"]=buff[42],
-		["atkp_purple_add"]=buff[43],
+		["atkp_color_add"]=buff[25],
+		["atkp_red_add"]=buff[26],
+		["atkp_yellow_add"]=buff[27],
+		["atkp_green_add"]=buff[28],
+		["atkp_blue_add"]=buff[29],
+		["atkp_purple_add"]=buff[30],
+		["wavehealp"]=buff[31],
+		["heal"]=buff[32],
+		["hit_heal"]=buff[33],
+		["stun"]=buff[34],
+		["hit_stun"]=buff[35],
+		["shield"]=buff[36],
+		["atkp_add"]=buff[37],
+		["atkp_add_defenderhp"]=buff[38],
+		["atkp_add_connect"]=buff[39],
+		["spd_dec"]=buff[40],
+		["block"]=buff[41],
+		["hit_block"]=buff[42],
+		["atk_times_add"]=buff[43],
 		["hpp_add"]=buff[44],
 		["crit_add"]=buff[45],
 		["crit_time_add"]=buff[46],
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index fe0b082a..00cb0396 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -1,7 +1,6 @@
 local skill = {
 	[1]={
-		["method"]=2,
-		["skill_type"]=0,
+		["position"]=1,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -15,6 +14,7 @@ local skill = {
 		["skill_position"]=1
 	},
 	[2]={
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -28,6 +28,7 @@ local skill = {
 		["skill_position"]=1
 	},
 	[3]={
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -41,6 +42,7 @@ local skill = {
 		["skill_position"]=1
 	},
 	[4]={
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -54,6 +56,7 @@ local skill = {
 		["skill_position"]=1
 	},
 	[5]={
+		["position"]=5,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -67,8 +70,7 @@ local skill = {
 		["skill_position"]=1
 	},
 	[6]={
-		["method"]=2,
-		["skill_type"]=0,
+		["position"]=1,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -82,6 +84,7 @@ local skill = {
 		["skill_position"]=2
 	},
 	[7]={
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -95,6 +98,7 @@ local skill = {
 		["skill_position"]=2
 	},
 	[8]={
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -108,6 +112,7 @@ local skill = {
 		["skill_position"]=2
 	},
 	[9]={
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -121,6 +126,7 @@ local skill = {
 		["skill_position"]=2
 	},
 	[10]={
+		["position"]=5,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -163,7 +169,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt",
+				["type"]="hurt_yellow",
 				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
@@ -202,7 +208,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt",
+				["type"]="hurt_yellow",
 				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
@@ -398,7 +404,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt",
+				["type"]="hurt_blue",
 				["num"]=15000,
 				["ratio"]=10000,
 				["round"]=0
@@ -441,7 +447,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt",
+				["type"]="hurt_blue",
 				["num"]=15000,
 				["ratio"]=10000,
 				["round"]=0
diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua
index e5663aab..e385d166 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -445,7 +445,7 @@ local skill_rogue = {
 		["type"]=5,
 		["effect"]={
 			{
-				["type"]="dec_dmg_add",
+				["type"]="weakness_all_add",
 				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=999