diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua
index 554c98c7..190107ab 100644
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@@ -257,7 +257,7 @@ local buff = {
 		["decr"]=1,
 		["formula"]=3,
 		["fx_get"]={
-			300025
+			300027
 		}
 	},
 	[33]={
diff --git a/lua/app/config/buff_daily_challenge.lua b/lua/app/config/buff_daily_challenge.lua
index 96fffde6..211e5049 100644
--- a/lua/app/config/buff_daily_challenge.lua
+++ b/lua/app/config/buff_daily_challenge.lua
@@ -5,7 +5,7 @@ local buff_daily_challenge = {
 			{
 				["type"]="exp_time_add",
 				["num"]=1000,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -17,7 +17,7 @@ local buff_daily_challenge = {
 			{
 				["type"]="dmg_addition_all_add",
 				["num"]=500,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -29,7 +29,7 @@ local buff_daily_challenge = {
 			{
 				["type"]="dec_dmg_all_add",
 				["num"]=1000,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -40,14 +40,14 @@ local buff_daily_challenge = {
 		["effect"]={
 			{
 				["type"]="crit_add",
-				["num"]=2000,
-				["ratio"]=1000,
+				["num"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			},
 			{
 				["type"]="crit_time_add",
-				["num"]=3000,
-				["ratio"]=1000,
+				["num"]=1500,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -59,7 +59,7 @@ local buff_daily_challenge = {
 			{
 				["type"]="skill_hurt_add",
 				["num"]=1500,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -69,13 +69,13 @@ local buff_daily_challenge = {
 		["buff_type"]=1,
 		["effect"]={
 			{
-				["type"]="wavehealp",
-				["num"]=100,
+				["type"]="add_skill",
+				["num"]=8,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
-		["obj"]=1
+		["obj"]=8
 	},
 	[7]={
 		["buff_type"]=1,
@@ -83,37 +83,25 @@ local buff_daily_challenge = {
 			{
 				["type"]="cured_add",
 				["num"]=500,
-				["ratio"]=500,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
 		["obj"]=1
 	},
 	[8]={
-		["buff_type"]=1,
-		["effect"]={
-			{
-				["type"]="wavehealp",
-				["num"]=100,
-				["ratio"]=10000,
-				["round"]=0
-			}
-		},
-		["obj"]=1
-	},
-	[9]={
 		["buff_type"]=2,
 		["effect"]={
 			{
 				["type"]="atkp_add",
 				["num"]=500,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
 		["obj"]=2
 	},
-	[10]={
+	[9]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -125,7 +113,7 @@ local buff_daily_challenge = {
 		},
 		["obj"]=2
 	},
-	[11]={
+	[10]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -137,37 +125,37 @@ local buff_daily_challenge = {
 		},
 		["obj"]=2
 	},
-	[12]={
+	[11]={
 		["buff_type"]=2,
 		["effect"]={
 			{
 				["type"]="cured_dec",
 				["num"]=1000,
-				["ratio"]=1000,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=1
+	},
+	[12]={
+		["buff_type"]=2,
+		["effect"]={
+			{
+				["type"]="block",
+				["num"]=500,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
 		["obj"]=2
 	},
 	[13]={
-		["buff_type"]=2,
-		["effect"]={
-			{
-				["type"]="block",
-				["num"]=500,
-				["ratio"]=1000,
-				["round"]=999
-			}
-		},
-		["obj"]=2
-	},
-	[14]={
 		["buff_type"]=2,
 		["effect"]={
 			{
 				["type"]="dec_dmg_all_add",
 				["num"]=500,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -175,6 +163,6 @@ local buff_daily_challenge = {
 	}
 }
 local config = {
-data=buff_daily_challenge,count=14
+data=buff_daily_challenge,count=13
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua
index acdd665b..cc77ffb7 100644
--- a/lua/app/config/chapter.lua
+++ b/lua/app/config/chapter.lua
@@ -123,12 +123,12 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=28
+				["weight"]=100
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			11000,
+			11000
 		}
 	},
 	[2]={
@@ -274,12 +274,12 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=28
+				["weight"]=100
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			11000,
+			11000
 		}
 	},
 	[3]={
@@ -420,12 +420,12 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=28
+				["weight"]=100
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			11000,
+			11000
 		}
 	},
 	[4]={
@@ -617,12 +617,12 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=28
+				["weight"]=100
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			11000,
+			11000
 		}
 	},
 	[5]={
@@ -814,18 +814,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=28
+				["weight"]=90
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=2
+				["weight"]=10
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			12672,
+			15334
 		}
 	},
 	[6]={
@@ -1017,18 +1017,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=25
+				["weight"]=85
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=5
+				["weight"]=15
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			13453,
+			16814
 		}
 	},
 	[7]={
@@ -1236,18 +1236,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=25
+				["weight"]=85
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=5
+				["weight"]=15
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			15389,
+			19894
 		}
 	},
 	[8]={
@@ -1455,18 +1455,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=25
+				["weight"]=85
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=5
+				["weight"]=15
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			17688,
+			23408
 		}
 	},
 	[9]={
@@ -1674,18 +1674,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=25
+				["weight"]=85
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=5
+				["weight"]=15
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			19289,
+			26153
 		}
 	},
 	[10]={
@@ -1893,18 +1893,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=25
+				["weight"]=85
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=5
+				["weight"]=15
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			22561,
+			31119
 		}
 	},
 	[11]={
@@ -2112,18 +2112,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=23
+				["weight"]=80
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=7
+				["weight"]=20
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			26466,
+			35657
 		}
 	},
 	[12]={
@@ -2331,18 +2331,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=23
+				["weight"]=80
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=7
+				["weight"]=20
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			27220,
+			38682
 		}
 	},
 	[13]={
@@ -2550,18 +2550,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=23
+				["weight"]=80
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=7
+				["weight"]=20
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			28479,
+			41052
 		}
 	},
 	[14]={
@@ -2769,18 +2769,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=23
+				["weight"]=80
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=7
+				["weight"]=20
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			30899,
+			45133
 		}
 	},
 	[15]={
@@ -2988,18 +2988,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=23
+				["weight"]=80
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=7
+				["weight"]=20
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			31774,
+			46992
 		}
 	},
 	[16]={
@@ -3207,18 +3207,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=75
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=10
+				["weight"]=25
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			33633,
+			50331
 		}
 	},
 	[17]={
@@ -3426,18 +3426,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=75
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=10
+				["weight"]=25
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			35024,
+			53042
 		}
 	},
 	[18]={
@@ -3645,18 +3645,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=75
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=10
+				["weight"]=25
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			37136,
+			56738
 		}
 	},
 	[19]={
@@ -3864,18 +3864,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=75
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=10
+				["weight"]=25
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			38143,
+			59004
 		}
 	},
 	[20]={
@@ -4083,18 +4083,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=20
+				["weight"]=75
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=10
+				["weight"]=25
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			40535,
+			63234
 		}
 	},
 	[21]={
@@ -4302,18 +4302,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=18
+				["weight"]=70
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=12
+				["weight"]=30
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			42114,
+			66275
 		}
 	},
 	[22]={
@@ -4521,18 +4521,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=18
+				["weight"]=70
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=12
+				["weight"]=30
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			44759,
+			70994
 		}
 	},
 	[23]={
@@ -4740,18 +4740,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=18
+				["weight"]=70
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=12
+				["weight"]=30
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			46690,
+			74635
 		}
 	},
 	[24]={
@@ -4959,18 +4959,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=18
+				["weight"]=70
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=12
+				["weight"]=30
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			47564,
+			76615
 		}
 	},
 	[25]={
@@ -5178,18 +5178,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=18
+				["weight"]=70
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=12
+				["weight"]=30
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			51332,
+			83375
 		}
 	},
 	[26]={
@@ -5397,18 +5397,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=65
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=35
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			52333,
+			85564
 		}
 	},
 	[27]={
@@ -5616,18 +5616,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=65
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=35
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			56568,
+			93055
 		}
 	},
 	[28]={
@@ -5835,18 +5835,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=65
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=35
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			61303,
+			101426
 		}
 	},
 	[29]={
@@ -6054,18 +6054,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=65
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=35
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			56931,
+			94804
 		}
 	},
 	[30]={
@@ -6272,18 +6272,18 @@ local chapter = {
 				["type"]=1,
 				["id"]=4,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=65
 			},
 			{
 				["type"]=1,
 				["id"]=5,
 				["num"]=1,
-				["weight"]=15
+				["weight"]=35
 			}
 		},
 		["daily_challenge_difficulty"]={
-			30000,
-			30000
+			62926,
+			105386
 		}
 	}
 }
diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua
index 749add15..ae737747 100644
--- a/lua/app/config/chapter_board.lua
+++ b/lua/app/config/chapter_board.lua
@@ -3673,7 +3673,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3681,7 +3681,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3689,7 +3689,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3697,7 +3697,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3705,7 +3705,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3713,7 +3713,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3721,35 +3721,35 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3871,7 +3871,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3879,7 +3879,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3887,7 +3887,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3895,7 +3895,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3903,7 +3903,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3911,7 +3911,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
@@ -3919,35 +3919,35 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
-				3,
+				2,
 				0
 			},
 			{
diff --git a/lua/app/config/chapter_daily_challenge.lua b/lua/app/config/chapter_daily_challenge.lua
index ee55f055..4a1923b5 100644
--- a/lua/app/config/chapter_daily_challenge.lua
+++ b/lua/app/config/chapter_daily_challenge.lua
@@ -9,233 +9,221 @@ local chapter_daily_challenge = {
 			10
 		},
 		["monster"]={
-			3101,
-			3201,
-			3301,
-			3401,
-			3501,
-			3601,
-			3701,
-			3801,
-			3901,
-			4001,
-			4101,
-			4201,
-			4301,
-			4401,
-			4501,
-			4601,
-			4701,
-			4801,
-			4901,
-			5001
+			102,
+			202,
+			302,
+			402,
+			502,
+			602,
+			702,
+			802,
+			902,
+			1002,
+			1102,
+			1202,
+			1302,
+			1402,
+			1502,
+			1602,
+			1702,
+			1802,
+			1902,
+			2002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -249,233 +237,221 @@ local chapter_daily_challenge = {
 			4
 		},
 		["monster"]={
-			11101,
-			11201,
-			11301,
-			11401,
-			11501,
-			11601,
-			11701,
-			11801,
-			11901,
-			12001,
-			12101,
-			12201,
-			12301,
-			12401,
-			12501,
-			12601,
-			12701,
-			12801,
-			12901,
-			13001
+			2102,
+			2202,
+			2302,
+			2402,
+			2502,
+			2602,
+			2702,
+			2802,
+			2902,
+			3002,
+			3102,
+			3202,
+			3302,
+			3402,
+			3502,
+			3602,
+			3702,
+			3802,
+			3902,
+			4002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -489,233 +465,221 @@ local chapter_daily_challenge = {
 			8
 		},
 		["monster"]={
-			19101,
-			19201,
-			19301,
-			19401,
-			19501,
-			19601,
-			19701,
-			19801,
-			19901,
-			20001,
-			20101,
-			20201,
-			20301,
-			20401,
-			20501,
-			20601,
-			20701,
-			20801,
-			20901,
-			21001
+			4102,
+			4202,
+			4302,
+			4402,
+			4502,
+			4602,
+			4702,
+			4802,
+			4902,
+			5002,
+			5102,
+			5202,
+			5302,
+			5402,
+			5502,
+			5602,
+			5702,
+			5802,
+			5902,
+			6002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -729,233 +693,221 @@ local chapter_daily_challenge = {
 			2
 		},
 		["monster"]={
-			27101,
-			27201,
-			27301,
-			27401,
-			27501,
-			27601,
-			27701,
-			27801,
-			27901,
-			28001,
-			28101,
-			28201,
-			28301,
-			28401,
-			28501,
-			28601,
-			28701,
-			28801,
-			28901,
-			29001
+			6102,
+			6202,
+			6302,
+			6402,
+			6502,
+			6602,
+			6702,
+			6802,
+			6902,
+			7002,
+			7102,
+			7202,
+			7302,
+			7402,
+			7502,
+			7602,
+			7702,
+			7802,
+			7902,
+			8002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -969,233 +921,221 @@ local chapter_daily_challenge = {
 			6
 		},
 		["monster"]={
-			35101,
-			35201,
-			35301,
-			35401,
-			35501,
-			35601,
-			35701,
-			35801,
-			35901,
-			36001,
-			36101,
-			36201,
-			36301,
-			36401,
-			36501,
-			36601,
-			36701,
-			36801,
-			36901,
-			37001
+			8102,
+			8202,
+			8302,
+			8402,
+			8502,
+			8602,
+			8702,
+			8802,
+			8902,
+			9002,
+			9102,
+			9202,
+			9302,
+			9402,
+			9502,
+			9602,
+			9702,
+			9802,
+			9902,
+			10002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -1209,233 +1149,221 @@ local chapter_daily_challenge = {
 			10
 		},
 		["monster"]={
-			43101,
-			43201,
-			43301,
-			43401,
-			43501,
-			43601,
-			43701,
-			43801,
-			43901,
-			44001,
-			44101,
-			44201,
-			44301,
-			44401,
-			44501,
-			44601,
-			44701,
-			44801,
-			44901,
-			45001
+			10102,
+			10202,
+			10302,
+			10402,
+			10502,
+			10602,
+			10702,
+			10802,
+			10902,
+			11002,
+			11102,
+			11202,
+			11302,
+			11402,
+			11502,
+			11602,
+			11702,
+			11802,
+			11902,
+			12002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -1449,233 +1377,221 @@ local chapter_daily_challenge = {
 			4
 		},
 		["monster"]={
-			51101,
-			51201,
-			51301,
-			51401,
-			51501,
-			51601,
-			51701,
-			51801,
-			51901,
-			52001,
-			52101,
-			52201,
-			52301,
-			52401,
-			52501,
-			52601,
-			52701,
-			52801,
-			52901,
-			53001
+			12102,
+			12202,
+			12302,
+			12402,
+			12502,
+			12602,
+			12702,
+			12802,
+			12902,
+			13002,
+			13102,
+			13202,
+			13302,
+			13402,
+			13502,
+			13602,
+			13702,
+			13802,
+			13902,
+			14002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -1689,233 +1605,221 @@ local chapter_daily_challenge = {
 			8
 		},
 		["monster"]={
-			19101,
-			19201,
-			19301,
-			19401,
-			19501,
-			19601,
-			19701,
-			19801,
-			19901,
-			20001,
-			20101,
-			20201,
-			20301,
-			20401,
-			20501,
-			20601,
-			20701,
-			20801,
-			20901,
-			21001
+			14102,
+			14202,
+			14302,
+			14402,
+			14502,
+			14602,
+			14702,
+			14802,
+			14902,
+			15002,
+			15102,
+			15202,
+			15302,
+			15402,
+			15502,
+			15602,
+			15702,
+			15802,
+			15902,
+			16002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -1929,233 +1833,221 @@ local chapter_daily_challenge = {
 			2
 		},
 		["monster"]={
-			27101,
-			27201,
-			27301,
-			27401,
-			27501,
-			27601,
-			27701,
-			27801,
-			27901,
-			28001,
-			28101,
-			28201,
-			28301,
-			28401,
-			28501,
-			28601,
-			28701,
-			28801,
-			28901,
-			29001
+			16102,
+			16202,
+			16302,
+			16402,
+			16502,
+			16602,
+			16702,
+			16802,
+			16902,
+			17002,
+			17102,
+			17202,
+			17302,
+			17402,
+			17502,
+			17602,
+			17702,
+			17802,
+			17902,
+			18002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	},
@@ -2169,233 +2061,221 @@ local chapter_daily_challenge = {
 			6
 		},
 		["monster"]={
-			35101,
-			35201,
-			35301,
-			35401,
-			35501,
-			35601,
-			35701,
-			35801,
-			35901,
-			36001,
-			36101,
-			36201,
-			36301,
-			36401,
-			36501,
-			36601,
-			36701,
-			36801,
-			36901,
-			37001
+			18102,
+			18202,
+			18302,
+			18402,
+			18502,
+			18602,
+			18702,
+			18802,
+			18902,
+			19002,
+			19102,
+			19202,
+			19302,
+			19402,
+			19502,
+			19602,
+			19702,
+			19802,
+			19902,
+			20002
 		},
 		["wave_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=12,
- 				["id_for_nothing"]="Vwo=",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["begin_buff_id"]={
 			{
 				1,
-				9
-			},
-			{
-				2,
-				9
-			},
-			{
-				4,
-				9
-			},
-			{
-				5,
-				9
-			},
-			{
-				6,
-				9
-			},
-			{
-				7,
-				9
-			},
-			{
-				8,
-				10
+				8
 			},
 			{
 				1,
-				10
+				9
 			},
 			{
-				2,
-				10
-			},
-			{
-				3,
-				10
-			},
-			{
-				4,
-				10
-			},
-			{
-				5,
-				10
-			},
-			{
-				6,
-				10
-			},
-			{
-				7,
-				10
-			},
-			{
-				8,
+				1,
 				10
 			},
 			{
 				1,
 				11
 			},
-			{
-				2,
-				11
-			},
-			{
-				3,
-				11
-			},
-			{
-				4,
-				11
-			},
-			{
-				5,
-				11
-			},
-			{
-				6,
-				11
-			},
-			{
-				7,
-				11
-			},
-			{
-				8,
-				11
-			},
 			{
 				1,
 				12
 			},
-			{
-				2,
-				12
-			},
-			{
-				3,
-				12
-			},
-			{
-				4,
-				12
-			},
-			{
-				5,
-				12
-			},
-			{
-				6,
-				12
-			},
 			{
 				1,
 				13
 			},
+			{
+				2,
+				8
+			},
+			{
+				2,
+				9
+			},
+			{
+				2,
+				10
+			},
+			{
+				2,
+				11
+			},
+			{
+				2,
+				12
+			},
 			{
 				2,
 				13
 			},
 			{
 				3,
-				13
-			},
-			{
-				5,
-				13
-			},
-			{
-				6,
-				13
-			},
-			{
-				7,
-				13
-			},
-			{
-				8,
-				13
-			},
-			{
-				1,
-				14
+				8
 			},
 			{
 				3,
-				14
+				9
+			},
+			{
+				3,
+				10
+			},
+			{
+				3,
+				11
+			},
+			{
+				3,
+				12
+			},
+			{
+				3,
+				13
 			},
 			{
 				4,
-				14
+				8
+			},
+			{
+				4,
+				9
+			},
+			{
+				4,
+				10
+			},
+			{
+				4,
+				11
+			},
+			{
+				4,
+				12
+			},
+			{
+				4,
+				13
 			},
 			{
 				5,
-				14
+				8
+			},
+			{
+				5,
+				9
+			},
+			{
+				5,
+				10
+			},
+			{
+				5,
+				11
+			},
+			{
+				5,
+				12
+			},
+			{
+				5,
+				13
 			},
 			{
 				6,
-				14
+				8
+			},
+			{
+				6,
+				9
+			},
+			{
+				6,
+				10
+			},
+			{
+				6,
+				11
+			},
+			{
+				6,
+				12
+			},
+			{
+				6,
+				13
 			},
 			{
 				7,
-				14
+				8
 			},
 			{
-				8,
-				14
+				7,
+				9
+			},
+			{
+				7,
+				10
+			},
+			{
+				7,
+				11
+			},
+			{
+				7,
+				12
+			},
+			{
+				7,
+				13
 			}
 		}
 	}
diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua
index 5c33ec3e..39ba3573 100644
--- a/lua/app/config/const.lua
+++ b/lua/app/config/const.lua
@@ -111,7 +111,7 @@ local const = {
 		["value"]=600
 	},
 	["idle_item_drop_time"]={
-		["value"]=600
+		["value"]=1800
 	},
 	["idle_drop_fast_times_1"]={
 		["value"]=2
diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua
index 9e37b11f..3d837611 100644
--- a/lua/app/config/fx.lua
+++ b/lua/app/config/fx.lua
@@ -183,115 +183,422 @@ local fx = {
 		["bind"]="root"
 	},
 	[200012]={
-		["res"]="sfx_m20005_b01",
+		["res"]="sfx_m20004_b03",
 		["bind"]="root"
 	},
 	[200013]={
-		["res"]="sfx_m20005_b02",
+		["res"]="sfx_m20005_b01",
 		["bind"]="root"
 	},
 	[200014]={
-		["res"]="sfx_m20005_b03",
+		["res"]="sfx_m20005_b02",
 		["bind"]="root"
 	},
 	[200015]={
-		["res"]="sfx_m20005_b04",
+		["res"]="sfx_m20005_b03",
 		["bind"]="root"
 	},
 	[200016]={
-		["res"]="sfx_m20006_b01",
+		["res"]="sfx_m20005_b04",
 		["bind"]="root"
 	},
 	[200017]={
-		["res"]="sfx_m20006_b02",
+		["res"]="sfx_m20006_b01",
 		["bind"]="root"
 	},
 	[200018]={
-		["res"]="sfx_m20006_b03",
+		["res"]="sfx_m20006_b02",
 		["bind"]="root"
 	},
 	[200019]={
-		["res"]="sfx_m20006_b04",
+		["res"]="sfx_m20006_b03",
 		["bind"]="root"
 	},
 	[200020]={
-		["res"]="sfx_m20007_b01",
+		["res"]="sfx_m20006_b04",
 		["bind"]="root"
 	},
 	[200021]={
-		["res"]="sfx_m20007_b02",
-		["bind"]="root"
-	},
-	[200022]={
-		["res"]="sfx_m20007_b03",
-		["bind"]="root"
-	},
-	[200023]={
-		["res"]="sfx_m20007_b04",
-		["bind"]="root"
-	},
-	[200024]={
 		["res"]="sfx_m20008_b01",
 		["bind"]="root"
 	},
-	[200025]={
+	[200022]={
 		["res"]="sfx_m20008_b02",
 		["bind"]="root"
 	},
-	[200026]={
+	[200023]={
 		["res"]="sfx_m20008_b03",
 		["bind"]="root"
 	},
-	[200027]={
+	[200024]={
 		["res"]="sfx_m20008_b04",
 		["bind"]="root"
 	},
-	[200028]={
+	[200025]={
 		["res"]="sfx_m20009_b01",
 		["bind"]="root"
 	},
-	[200029]={
+	[200026]={
 		["res"]="sfx_m20009_b02",
 		["bind"]="root"
 	},
-	[200030]={
+	[200027]={
 		["res"]="sfx_m20009_b03",
 		["bind"]="root"
 	},
-	[200031]={
+	[200028]={
+		["res"]="sfx_m20009_b04"
+	},
+	[200029]={
 		["res"]="sfx_m20010_b01",
 		["bind"]="root"
 	},
-	[200032]={
+	[200030]={
 		["res"]="sfx_m20010_b03",
 		["bind"]="root"
 	},
-	[200033]={
+	[200031]={
 		["res"]="sfx_m20011_b01",
 		["bind"]="root"
 	},
-	[200034]={
+	[200032]={
 		["res"]="sfx_m20011_b02",
 		["bind"]="root"
 	},
-	[200035]={
+	[200033]={
 		["res"]="sfx_m20011_b03",
 		["bind"]="root"
 	},
-	[200036]={
+	[200034]={
 		["res"]="sfx_m20012_b01",
 		["bind"]="root"
 	},
-	[200037]={
+	[200035]={
 		["res"]="sfx_m20012_b02",
 		["bind"]="root"
 	},
-	[200038]={
+	[200036]={
+		["res"]="sfx_m20012_b02",
+		["bind"]="root"
+	},
+	[200037]={
 		["res"]="sfx_m20012_b03",
 		["bind"]="root"
 	},
+	[200038]={
+		["res"]="sfx_m20013_b01",
+		["bind"]="root"
+	},
 	[200039]={
-		["res"]="sfx_m20012_b04",
+		["res"]="sfx_m20013_b02",
+		["bind"]="root"
+	},
+	[200040]={
+		["res"]="sfx_m20013_b03",
+		["bind"]="root"
+	},
+	[200041]={
+		["res"]="sfx_m20013_b04",
+		["bind"]="root"
+	},
+	[200042]={
+		["res"]="sfx_m20014_b01",
+		["bind"]="root"
+	},
+	[200043]={
+		["res"]="sfx_m20014_b02",
+		["bind"]="root"
+	},
+	[200044]={
+		["res"]="sfx_m20014_b03",
+		["bind"]="root"
+	},
+	[200045]={
+		["res"]="sfx_m20014_b04",
+		["bind"]="root"
+	},
+	[200046]={
+		["res"]="sfx_m20015_b01",
+		["bind"]="root"
+	},
+	[200047]={
+		["res"]="sfx_m20015_b02",
+		["bind"]="root"
+	},
+	[200048]={
+		["res"]="sfx_m20015_b03",
+		["bind"]="root"
+	},
+	[200049]={
+		["res"]="sfx_m20015_b04",
+		["bind"]="root"
+	},
+	[200050]={
+		["res"]="sfx_m20016_b01",
+		["bind"]="root"
+	},
+	[200051]={
+		["res"]="sfx_m20016_b02",
+		["bind"]="root"
+	},
+	[200052]={
+		["res"]="sfx_m20016_b03",
+		["bind"]="root"
+	},
+	[200053]={
+		["res"]="sfx_m20016_b04",
+		["bind"]="root"
+	},
+	[200054]={
+		["res"]="sfx_m20017_b01",
+		["bind"]="root"
+	},
+	[200055]={
+		["res"]="sfx_m20017_b02",
+		["bind"]="root"
+	},
+	[200056]={
+		["res"]="sfx_m20017_b03",
+		["bind"]="root"
+	},
+	[200057]={
+		["res"]="sfx_m20017_b04",
+		["bind"]="root"
+	},
+	[200058]={
+		["res"]="sfx_m20018_b01",
+		["bind"]="root"
+	},
+	[200059]={
+		["res"]="sfx_m20018_b02",
+		["bind"]="root"
+	},
+	[200060]={
+		["res"]="sfx_m20018_b03",
+		["bind"]="root"
+	},
+	[200061]={
+		["res"]="sfx_m20018_b04",
+		["bind"]="root"
+	},
+	[200062]={
+		["res"]="sfx_m20019_b01",
+		["bind"]="root"
+	},
+	[200063]={
+		["res"]="sfx_m20019_b02",
+		["bind"]="root"
+	},
+	[200064]={
+		["res"]="sfx_m20019_b03",
+		["bind"]="root"
+	},
+	[200065]={
+		["res"]="sfx_m20019_b04",
+		["bind"]="root"
+	},
+	[200066]={
+		["res"]="sfx_m20020_b01",
+		["bind"]="root"
+	},
+	[200067]={
+		["res"]="sfx_m20020_b02",
+		["bind"]="root"
+	},
+	[200068]={
+		["res"]="sfx_m20020_b03",
+		["bind"]="root"
+	},
+	[200069]={
+		["res"]="sfx_m20020_b04",
+		["bind"]="root"
+	},
+	[200070]={
+		["res"]="sfx_m20021_b01",
+		["bind"]="root"
+	},
+	[200071]={
+		["res"]="sfx_m20021_b02",
+		["bind"]="root"
+	},
+	[200072]={
+		["res"]="sfx_m20021_b02",
+		["bind"]="root"
+	},
+	[200073]={
+		["res"]="sfx_m20021_b04",
+		["bind"]="root"
+	},
+	[200074]={
+		["res"]="sfx_m20022_b01",
+		["bind"]="root"
+	},
+	[200075]={
+		["res"]="sfx_m20022_b02",
+		["bind"]="root"
+	},
+	[200076]={
+		["res"]="sfx_m20022_b04",
+		["bind"]="root"
+	},
+	[200077]={
+		["res"]="sfx_m20023_b01",
+		["bind"]="root"
+	},
+	[200078]={
+		["res"]="sfx_m20023_b02",
+		["bind"]="root"
+	},
+	[200079]={
+		["res"]="sfx_m20023_b03",
+		["bind"]="root"
+	},
+	[200080]={
+		["res"]="sfx_m20023_b04",
+		["bind"]="root"
+	},
+	[200081]={
+		["res"]="sfx_m20024_b01",
+		["bind"]="root"
+	},
+	[200082]={
+		["res"]="sfx_m20024_b02",
+		["bind"]="root"
+	},
+	[200083]={
+		["res"]="sfx_m20024_b03",
+		["bind"]="root"
+	},
+	[200084]={
+		["res"]="sfx_m20024_b04",
+		["bind"]="root"
+	},
+	[200085]={
+		["res"]="sfx_m20024_b05",
+		["bind"]="root"
+	},
+	[200086]={
+		["res"]="sfx_m20025_b01",
+		["bind"]="root"
+	},
+	[200087]={
+		["res"]="sfx_m20025_b02",
+		["bind"]="root"
+	},
+	[200088]={
+		["res"]="sfx_m20025_b04",
+		["bind"]="root"
+	},
+	[200089]={
+		["res"]="sfx_m20026_b01",
+		["bind"]="root"
+	},
+	[200090]={
+		["res"]="sfx_m20026_b02",
+		["bind"]="root"
+	},
+	[200091]={
+		["res"]="sfx_m20026_b03",
+		["bind"]="root"
+	},
+	[200092]={
+		["res"]="sfx_m20026_b04",
+		["bind"]="root"
+	},
+	[200093]={
+		["res"]="sfx_m20027_b01",
+		["bind"]="root"
+	},
+	[200094]={
+		["res"]="sfx_m20027_b02",
+		["bind"]="root"
+	},
+	[200095]={
+		["res"]="sfx_m20027_b03",
+		["bind"]="root"
+	},
+	[200096]={
+		["res"]="sfx_m20028_b01",
+		["bind"]="root"
+	},
+	[200097]={
+		["res"]="sfx_m20028_b02",
+		["bind"]="root"
+	},
+	[200098]={
+		["res"]="sfx_m20028_b03",
+		["bind"]="root"
+	},
+	[200099]={
+		["res"]="sfx_m20028_b04",
+		["bind"]="root"
+	},
+	[200100]={
+		["res"]="sfx_m20029_b01",
+		["bind"]="root"
+	},
+	[200101]={
+		["res"]="sfx_m20029_b02",
+		["bind"]="root"
+	},
+	[200102]={
+		["res"]="sfx_m20029_b03",
+		["bind"]="root"
+	},
+	[200103]={
+		["res"]="sfx_m20029_b04",
+		["bind"]="root"
+	},
+	[200104]={
+		["res"]="sfx_m20030_b01",
+		["bind"]="root"
+	},
+	[200105]={
+		["res"]="sfx_m20030_b02",
+		["bind"]="root"
+	},
+	[200106]={
+		["res"]="sfx_m20030_b03",
+		["bind"]="root"
+	},
+	[200107]={
+		["res"]="sfx_m20030_b04",
+		["bind"]="root"
+	},
+	[200108]={
+		["res"]="sfx_m20030_b05",
+		["bind"]="root"
+	},
+	[200109]={
+		["res"]="sfx_m20031_b01",
+		["bind"]="root"
+	},
+	[200110]={
+		["res"]="sfx_m20031_b02",
+		["bind"]="root"
+	},
+	[200111]={
+		["res"]="sfx_m20031_b03",
+		["bind"]="root"
+	},
+	[200112]={
+		["res"]="sfx_m20031_b04",
+		["bind"]="root"
+	},
+	[200113]={
+		["res"]="sfx_m20031_b05",
+		["bind"]="root"
+	},
+	[200114]={
+		["res"]="sfx_m20032_b01",
+		["bind"]="root"
+	},
+	[200115]={
+		["res"]="sfx_m20032_b02",
+		["bind"]="root"
+	},
+	[200116]={
+		["res"]="sfx_m20032_b03",
 		["bind"]="root"
 	},
 	[300000]={
@@ -311,146 +618,588 @@ local fx = {
 		["bind"]="root"
 	},
 	[300004]={
-		["res"]="sfx_p0002_b01",
-		["bind"]="root"
-	},
-	[300005]={
-		["res"]="sfx_p0002_b02",
-		["bind"]="root"
-	},
-	[300006]={
-		["res"]="sfx_p0002_b03",
-		["bind"]="root"
-	},
-	[300007]={
-		["res"]="sfx_p0002_b04",
-		["bind"]="root"
-	},
-	[300008]={
-		["res"]="sfx_p0002_b06",
-		["bind"]="root"
-	},
-	[300009]={
-		["res"]="sfx_p0003_b01",
-		["bind"]="root"
-	},
-	[300010]={
-		["res"]="sfx_p0003_b02",
-		["bind"]="root"
-	},
-	[300011]={
-		["res"]="sfx_p0003_b03",
-		["bind"]="root"
-	},
-	[300012]={
-		["res"]="sfx_p0003_b04",
-		["bind"]="root"
-	},
-	[300013]={
-		["res"]="sfx_p0004_b01",
-		["bind"]="root"
-	},
-	[300014]={
-		["res"]="sfx_p0004_b03",
-		["bind"]="root"
-	},
-	[300015]={
-		["res"]="sfx_p0004_b04",
-		["bind"]="root"
-	},
-	[300016]={
-		["res"]="sfx_p0004_b05",
-		["bind"]="root"
-	},
-	[300017]={
-		["res"]="sfx_p0005_b01",
-		["bind"]="root"
-	},
-	[300018]={
-		["res"]="sfx_p0005_b02",
-		["bind"]="root"
-	},
-	[300019]={
-		["res"]="sfx_p0005_b03",
-		["bind"]="root"
-	},
-	[300020]={
-		["res"]="sfx_p0005_b04",
-		["bind"]="root"
-	},
-	[300021]={
-		["res"]="sfx_p0006_b01",
-		["bind"]="root"
-	},
-	[300022]={
-		["res"]="sfx_p0006_b02",
-		["bind"]="root"
-	},
-	[300023]={
-		["res"]="sfx_p0006_b03",
-		["bind"]="root"
-	},
-	[300024]={
-		["res"]="sfx_p0006_b04",
-		["bind"]="root"
-	},
-	[300025]={
-		["res"]="sfx_p0006_b05",
-		["bind"]="root"
-	},
-	[300026]={
-		["res"]="sfx_p0007_b01",
-		["bind"]="root"
-	},
-	[300027]={
-		["res"]="sfx_p0007_b02",
-		["bind"]="root"
-	},
-	[300028]={
-		["res"]="sfx_p0007_b03",
-		["bind"]="root"
-	},
-	[300029]={
-		["res"]="sfx_p0007_b04",
-		["bind"]="root"
-	},
-	[300030]={
-		["res"]="sfx_p0008_b01",
-		["bind"]="root"
-	},
-	[300031]={
-		["res"]="sfx_p0008_b05",
-		["bind"]="root"
-	},
-	[300032]={
-		["res"]="sfx_p0008_b06",
-		["bind"]="root"
-	},
-	[300033]={
 		["res"]="sfx_p0001_b05",
 		["bind"]="root"
 	},
-	[300034]={
+	[300005]={
+		["res"]="sfx_p0002_b01",
+		["bind"]="root"
+	},
+	[300006]={
+		["res"]="sfx_p0002_b02",
+		["bind"]="root"
+	},
+	[300007]={
+		["res"]="sfx_p0002_b03",
+		["bind"]="root"
+	},
+	[300008]={
+		["res"]="sfx_p0002_b04",
+		["bind"]="root"
+	},
+	[300009]={
+		["res"]="sfx_p0002_b06",
+		["bind"]="root"
+	},
+	[300010]={
+		["res"]="sfx_p0003_b01",
+		["bind"]="root"
+	},
+	[300011]={
+		["res"]="sfx_p0003_b02",
+		["bind"]="root"
+	},
+	[300012]={
+		["res"]="sfx_p0003_b03",
+		["bind"]="root"
+	},
+	[300013]={
+		["res"]="sfx_p0003_b04",
+		["bind"]="root"
+	},
+	[300014]={
+		["res"]="sfx_p0003_b04",
+		["bind"]="root"
+	},
+	[300015]={
+		["res"]="sfx_p0004_b01",
+		["bind"]="root"
+	},
+	[300016]={
+		["res"]="sfx_p0004_b03",
+		["bind"]="root"
+	},
+	[300017]={
+		["res"]="sfx_p0004_b05",
+		["bind"]="root"
+	},
+	[300018]={
+		["res"]="sfx_p0005_b01",
+		["bind"]="root"
+	},
+	[300019]={
+		["res"]="sfx_p0005_b02",
+		["bind"]="root"
+	},
+	[300020]={
+		["res"]="sfx_p0005_b03",
+		["bind"]="root"
+	},
+	[300021]={
+		["res"]="sfx_p0005_b04",
+		["bind"]="root"
+	},
+	[300022]={
+		["res"]="sfx_p0005_b04",
+		["bind"]="root"
+	},
+	[300023]={
+		["res"]="sfx_p0006_b01",
+		["bind"]="root"
+	},
+	[300024]={
+		["res"]="sfx_p0006_b02",
+		["bind"]="root"
+	},
+	[300025]={
+		["res"]="sfx_p0006_b03",
+		["bind"]="root"
+	},
+	[300026]={
+		["res"]="sfx_p0006_b04",
+		["bind"]="root"
+	},
+	[300027]={
+		["res"]="sfx_p0006_b05",
+		["bind"]="root"
+	},
+	[300028]={
+		["res"]="sfx_p0007_b01",
+		["bind"]="root"
+	},
+	[300029]={
+		["res"]="sfx_p0007_b02",
+		["bind"]="root"
+	},
+	[300030]={
+		["res"]="sfx_p0007_b03",
+		["bind"]="root"
+	},
+	[300031]={
+		["res"]="sfx_p0007_b04",
+		["bind"]="root"
+	},
+	[300032]={
 		["res"]="sfx_p0007_b05",
 		["bind"]="root"
 	},
+	[300033]={
+		["res"]="sfx_p0008_b01",
+		["bind"]="root"
+	},
+	[300034]={
+		["res"]="sfx_p0008_b05",
+		["bind"]="root"
+	},
 	[300035]={
-		["res"]="sfx_p0004_b01",
-		["bind"]="root",
-		["flip"]=1
+		["res"]="sfx_p0009_b01",
+		["bind"]="root"
 	},
 	[300036]={
-		["res"]="sfx_p0004_b03",
+		["res"]="sfx_p0009_b02",
+		["bind"]="root"
+	},
+	[300037]={
+		["res"]="sfx_p0009_b03",
+		["bind"]="root"
+	},
+	[300038]={
+		["res"]="sfx_p0009_b04",
+		["bind"]="root"
+	},
+	[300039]={
+		["res"]="sfx_p0009_b05",
+		["bind"]="root"
+	},
+	[300040]={
+		["res"]="sfx_p0010_b01",
+		["bind"]="root"
+	},
+	[300041]={
+		["res"]="sfx_p0010_b02",
+		["bind"]="root"
+	},
+	[300042]={
+		["res"]="sfx_p0010_b03",
+		["bind"]="root"
+	},
+	[300043]={
+		["res"]="sfx_p0010_b04",
+		["bind"]="root"
+	},
+	[300044]={
+		["res"]="sfx_p0010_b05",
+		["bind"]="root"
+	},
+	[300045]={
+		["res"]="sfx_p0011_b01",
+		["bind"]="root"
+	},
+	[300046]={
+		["res"]="sfx_p0011_b02",
+		["bind"]="root"
+	},
+	[300047]={
+		["res"]="sfx_p0011_b03",
+		["bind"]="root"
+	},
+	[300048]={
+		["res"]="sfx_p0011_b04",
+		["bind"]="root"
+	},
+	[300049]={
+		["res"]="sfx_p0011_b05",
+		["bind"]="root"
+	},
+	[300050]={
+		["res"]="sfx_p0012_b01",
+		["bind"]="root"
+	},
+	[300051]={
+		["res"]="sfx_p0012_b02",
+		["bind"]="root"
+	},
+	[300052]={
+		["res"]="sfx_p0012_b03",
+		["bind"]="root"
+	},
+	[300053]={
+		["res"]="sfx_p0012_b04",
+		["bind"]="root"
+	},
+	[300054]={
+		["res"]="sfx_p0012_b05",
+		["bind"]="root"
+	},
+	[300055]={
+		["res"]="sfx_p0014_b01",
+		["bind"]="root"
+	},
+	[300056]={
+		["res"]="sfx_p0014_b02",
+		["bind"]="root"
+	},
+	[300057]={
+		["res"]="sfx_p0014_b03",
+		["bind"]="root"
+	},
+	[300058]={
+		["res"]="sfx_p0014_b04",
+		["bind"]="root"
+	},
+	[300059]={
+		["res"]="sfx_p0014_b05",
+		["bind"]="root"
+	},
+	[300060]={
+		["res"]="sfx_p0015_b01",
+		["bind"]="root"
+	},
+	[300061]={
+		["res"]="sfx_p0015_b02",
+		["bind"]="root"
+	},
+	[300062]={
+		["res"]="sfx_p0015_b03",
+		["bind"]="root"
+	},
+	[300063]={
+		["res"]="sfx_p0015_b04",
+		["bind"]="root"
+	},
+	[300064]={
+		["res"]="sfx_p0015_b05",
+		["bind"]="root"
+	},
+	[300065]={
+		["res"]="sfx_p0019_b01",
+		["bind"]="root"
+	},
+	[300066]={
+		["res"]="sfx_p0019_b02",
+		["bind"]="root"
+	},
+	[300067]={
+		["res"]="sfx_p0019_b03",
+		["bind"]="root"
+	},
+	[300068]={
+		["res"]="sfx_p0019_b04",
+		["bind"]="root"
+	},
+	[300069]={
+		["res"]="sfx_p0019_b05",
+		["bind"]="root"
+	},
+	[300070]={
+		["res"]="sfx_p0020_b01",
+		["bind"]="root"
+	},
+	[300071]={
+		["res"]="sfx_p0020_b02",
+		["bind"]="root"
+	},
+	[300072]={
+		["res"]="sfx_p0020_b03",
+		["bind"]="root"
+	},
+	[300073]={
+		["res"]="sfx_p0020_b04",
+		["bind"]="root"
+	},
+	[300074]={
+		["res"]="sfx_p0020_b05",
+		["bind"]="root"
+	},
+	[300075]={
+		["res"]="sfx_p0021_b01",
+		["bind"]="root"
+	},
+	[300076]={
+		["res"]="sfx_p0021_b02",
+		["bind"]="root"
+	},
+	[300077]={
+		["res"]="sfx_p0021_b03",
+		["bind"]="root"
+	},
+	[300078]={
+		["res"]="sfx_p0021_b04",
+		["bind"]="root"
+	},
+	[300079]={
+		["res"]="sfx_p0021_b05",
+		["bind"]="root"
+	},
+	[300080]={
+		["res"]="sfx_p0022_b01",
+		["bind"]="root"
+	},
+	[300081]={
+		["res"]="sfx_p0022_b02",
+		["bind"]="root"
+	},
+	[300082]={
+		["res"]="sfx_p0022_b02",
+		["bind"]="root"
+	},
+	[300083]={
+		["res"]="sfx_p0022_b02",
+		["bind"]="root"
+	},
+	[300084]={
+		["res"]="sfx_p0022_b05",
+		["bind"]="root"
+	},
+	[300085]={
+		["res"]="sfx_p0023_b01",
+		["bind"]="root"
+	},
+	[300086]={
+		["res"]="sfx_p0023_b02",
+		["bind"]="root"
+	},
+	[300087]={
+		["res"]="sfx_p0023_b03",
+		["bind"]="root"
+	},
+	[300088]={
+		["res"]="sfx_p0023_b04",
+		["bind"]="root"
+	},
+	[300089]={
+		["res"]="sfx_p0023_b05",
+		["bind"]="root"
+	},
+	[300090]={
+		["res"]="sfx_p0004_b04",
+		["bind"]="root"
+	},
+	[300091]={
+		["res"]="sfx_p0016_b01",
+		["bind"]="root"
+	},
+	[300092]={
+		["res"]="sfx_p0016_b05",
+		["bind"]="root"
+	},
+	[400000]={
+		["res"]="sfx_p0012_b01",
 		["bind"]="root",
 		["flip"]=1
 	},
-	[300037]={
-		["res"]="sfx_p0004_b04",
+	[400001]={
+		["res"]="sfx_p0012_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400002]={
+		["res"]="sfx_p0012_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400003]={
+		["res"]="sfx_p0012_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400004]={
+		["res"]="sfx_p0012_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400005]={
+		["res"]="sfx_p0014_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400006]={
+		["res"]="sfx_p0014_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400007]={
+		["res"]="sfx_p0014_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400008]={
+		["res"]="sfx_p0014_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400009]={
+		["res"]="sfx_p0014_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400010]={
+		["res"]="sfx_p0010_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400011]={
+		["res"]="sfx_p0010_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400012]={
+		["res"]="sfx_p0010_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400013]={
+		["res"]="sfx_p0010_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400014]={
+		["res"]="sfx_p0010_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400015]={
+		["res"]="sfx_p0006_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400016]={
+		["res"]="sfx_p0006_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400017]={
+		["res"]="sfx_p0006_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400018]={
+		["res"]="sfx_p0006_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400019]={
+		["res"]="sfx_p0006_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400020]={
+		["res"]="sfx_p0009_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400021]={
+		["res"]="sfx_p0009_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400022]={
+		["res"]="sfx_p0009_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400023]={
+		["res"]="sfx_p0009_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400024]={
+		["res"]="sfx_p0009_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400025]={
+		["res"]="sfx_p0015_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400026]={
+		["res"]="sfx_p0015_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400027]={
+		["res"]="sfx_p0015_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400028]={
+		["res"]="sfx_p0015_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400029]={
+		["res"]="sfx_p0015_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400030]={
+		["res"]="sfx_p0019_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400031]={
+		["res"]="sfx_p0019_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400032]={
+		["res"]="sfx_p0019_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400033]={
+		["res"]="sfx_p0019_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400034]={
+		["res"]="sfx_p0019_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400035]={
+		["res"]="sfx_p0020_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400036]={
+		["res"]="sfx_p0020_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400037]={
+		["res"]="sfx_p0020_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400038]={
+		["res"]="sfx_p0020_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400039]={
+		["res"]="sfx_p0020_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400040]={
+		["res"]="sfx_p0022_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400041]={
+		["res"]="sfx_p0022_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400042]={
+		["res"]="sfx_p0022_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400043]={
+		["res"]="sfx_p0022_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400044]={
+		["res"]="sfx_p0022_b05",
 		["bind"]="root",
 		["flip"]=1
 	}
 }
 local config = {
-data=fx,count=111
+data=fx,count=288
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua
index 30968d88..9efc9f12 100644
--- a/lua/app/config/monster_chapter.lua
+++ b/lua/app/config/monster_chapter.lua
@@ -972,6 +972,9 @@ local monster_chapter = {
 			30065,
 			30066
 		},
+		["skill"]={
+			10023
+		},
 		["monster_exp"]=18000
 	},
 	[7601]={
@@ -1097,6 +1100,9 @@ local monster_chapter = {
 			30065,
 			30066
 		},
+		["skill"]={
+			10023
+		},
 		["monster_exp"]=24000
 	},
 	[8601]={
@@ -1163,6 +1169,9 @@ local monster_chapter = {
 			10067,
 			10068
 		},
+		["passive_skill"]={
+			10013
+		},
 		["monster_exp"]=22000
 	},
 	[9101]={
@@ -1288,6 +1297,9 @@ local monster_chapter = {
 			30065,
 			30066
 		},
+		["skill"]={
+			10023
+		},
 		["monster_exp"]=12000
 	},
 	[10101]={
diff --git a/lua/app/config/monster_daily_challenge.lua b/lua/app/config/monster_daily_challenge.lua
index 8a17b7e6..20b8c511 100644
--- a/lua/app/config/monster_daily_challenge.lua
+++ b/lua/app/config/monster_daily_challenge.lua
@@ -1,9 +1,9 @@
 local monster_daily_challenge = {
 	[102]={
 		["monster_base"]=10001,
-		["hp"]=3000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=8000000,
+		["atk"]=250000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -13,46 +13,46 @@ local monster_daily_challenge = {
 	},
 	[202]={
 		["monster_base"]=10004,
-		["hp"]=5000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=11000000,
+		["atk"]=270000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=4000
+		["monster_exp"]=11000
 	},
 	[302]={
 		["monster_base"]=10002,
 		["hp"]=12000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["atk"]=290000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=8000
+		["monster_exp"]=17000
 	},
 	[402]={
 		["monster_base"]=10006,
-		["hp"]=13000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=15000000,
+		["atk"]=310000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=12000
+		["monster_exp"]=19000
 	},
 	[502]={
 		["monster_base"]=20004,
-		["is_boss"]=2,
-		["hp"]=18000000,
-		["atk"]=250000,
-		["atk_times"]=3,
+		["is_boss"]=1,
+		["hp"]=23000000,
+		["atk"]=370000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -65,9 +65,33 @@ local monster_daily_challenge = {
 	},
 	[602]={
 		["monster_base"]=10001,
-		["hp"]=3000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=15000000,
+		["atk"]=310000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			10001,
+			10002,
+			10003
+		},
+		["monster_exp"]=9000
+	},
+	[702]={
+		["monster_base"]=10004,
+		["hp"]=17000000,
+		["atk"]=330000,
+		["atk_times"]=3,
+		["hurt_skill"]={
+			10001,
+			10002,
+			10003
+		},
+		["monster_exp"]=10000
+	},
+	[802]={
+		["monster_base"]=10002,
+		["hp"]=20000000,
+		["atk"]=330000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -75,35 +99,11 @@ local monster_daily_challenge = {
 		},
 		["monster_exp"]=11000
 	},
-	[702]={
-		["monster_base"]=10004,
-		["hp"]=5000000,
-		["atk"]=200000,
-		["atk_times"]=2,
-		["hurt_skill"]={
-			10001,
-			10002,
-			10003
-		},
-		["monster_exp"]=4000
-	},
-	[802]={
-		["monster_base"]=10002,
-		["hp"]=12000000,
-		["atk"]=200000,
-		["atk_times"]=2,
-		["hurt_skill"]={
-			10001,
-			10002,
-			10003
-		},
-		["monster_exp"]=8000
-	},
 	[902]={
 		["monster_base"]=10006,
-		["hp"]=13000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=22000000,
+		["atk"]=350000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -113,10 +113,10 @@ local monster_daily_challenge = {
 	},
 	[1002]={
 		["monster_base"]=20004,
-		["is_boss"]=2,
-		["hp"]=18000000,
-		["atk"]=250000,
-		["atk_times"]=3,
+		["is_boss"]=1,
+		["hp"]=42000000,
+		["atk"]=400000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -125,62 +125,62 @@ local monster_daily_challenge = {
 		["skill"]={
 			10015
 		},
-		["monster_exp"]=18000
+		["monster_exp"]=12000
 	},
 	[1102]={
 		["monster_base"]=10001,
-		["hp"]=3000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=23000000,
+		["atk"]=350000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=11000
+		["monster_exp"]=16000
 	},
 	[1202]={
 		["monster_base"]=10004,
-		["hp"]=5000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=28000000,
+		["atk"]=370000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=4000
+		["monster_exp"]=18000
 	},
 	[1302]={
 		["monster_base"]=10002,
-		["hp"]=12000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=31000000,
+		["atk"]=390000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=8000
+		["monster_exp"]=21000
 	},
 	[1402]={
 		["monster_base"]=10006,
-		["hp"]=13000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=35000000,
+		["atk"]=410000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=12000
+		["monster_exp"]=22000
 	},
 	[1502]={
 		["monster_base"]=20004,
-		["is_boss"]=2,
-		["hp"]=18000000,
-		["atk"]=250000,
-		["atk_times"]=3,
+		["is_boss"]=1,
+		["hp"]=52000000,
+		["atk"]=640000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -189,62 +189,62 @@ local monster_daily_challenge = {
 		["skill"]={
 			10015
 		},
-		["monster_exp"]=18000
+		["monster_exp"]=24000
 	},
 	[1602]={
 		["monster_base"]=10001,
-		["hp"]=3000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=40000000,
+		["atk"]=430000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=11000
+		["monster_exp"]=15000
 	},
 	[1702]={
 		["monster_base"]=10004,
-		["hp"]=5000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=44000000,
+		["atk"]=450000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=4000
+		["monster_exp"]=16000
 	},
 	[1802]={
 		["monster_base"]=10002,
-		["hp"]=12000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=50000000,
+		["atk"]=470000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=8000
+		["monster_exp"]=17000
 	},
 	[1902]={
 		["monster_base"]=10006,
-		["hp"]=13000000,
-		["atk"]=200000,
-		["atk_times"]=2,
+		["hp"]=54000000,
+		["atk"]=490000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=12000
+		["monster_exp"]=17000
 	},
 	[2002]={
 		["monster_base"]=20004,
 		["is_boss"]=2,
-		["hp"]=18000000,
-		["atk"]=250000,
-		["atk_times"]=3,
+		["hp"]=90000000,
+		["atk"]=650000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -253,13 +253,13 @@ local monster_daily_challenge = {
 		["skill"]={
 			10015
 		},
-		["monster_exp"]=18000
+		["monster_exp"]=22000
 	},
 	[2102]={
 		["monster_base"]=10010,
 		["hp"]=8000000,
 		["atk"]=250000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -269,9 +269,9 @@ local monster_daily_challenge = {
 	},
 	[2202]={
 		["monster_base"]=10003,
-		["hp"]=8000000,
-		["atk"]=250000,
-		["atk_times"]=2,
+		["hp"]=11000000,
+		["atk"]=270000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -281,9 +281,9 @@ local monster_daily_challenge = {
 	},
 	[2302]={
 		["monster_base"]=10004,
-		["hp"]=10000000,
-		["atk"]=250000,
-		["atk_times"]=2,
+		["hp"]=12000000,
+		["atk"]=290000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -293,9 +293,9 @@ local monster_daily_challenge = {
 	},
 	[2402]={
 		["monster_base"]=10001,
-		["hp"]=12000000,
-		["atk"]=280000,
-		["atk_times"]=2,
+		["hp"]=15000000,
+		["atk"]=310000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -306,9 +306,9 @@ local monster_daily_challenge = {
 	[2502]={
 		["monster_base"]=20004,
 		["is_boss"]=1,
-		["hp"]=20000000,
-		["atk"]=340000,
-		["atk_times"]=3,
+		["hp"]=23000000,
+		["atk"]=370000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -325,8 +325,8 @@ local monster_daily_challenge = {
 	[2602]={
 		["monster_base"]=10002,
 		["hp"]=15000000,
-		["atk"]=300000,
-		["atk_times"]=2,
+		["atk"]=310000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -337,8 +337,8 @@ local monster_daily_challenge = {
 	[2702]={
 		["monster_base"]=10010,
 		["hp"]=17000000,
-		["atk"]=310000,
-		["atk_times"]=2,
+		["atk"]=330000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -349,8 +349,8 @@ local monster_daily_challenge = {
 	[2802]={
 		["monster_base"]=10008,
 		["hp"]=20000000,
-		["atk"]=320000,
-		["atk_times"]=2,
+		["atk"]=330000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -361,8 +361,8 @@ local monster_daily_challenge = {
 	[2902]={
 		["monster_base"]=10004,
 		["hp"]=22000000,
-		["atk"]=330000,
-		["atk_times"]=2,
+		["atk"]=350000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -372,10 +372,10 @@ local monster_daily_challenge = {
 	},
 	[3002]={
 		["monster_base"]=20012,
-		["is_boss"]=2,
-		["hp"]=36000000,
-		["atk"]=380000,
-		["atk_times"]=3,
+		["is_boss"]=1,
+		["hp"]=42000000,
+		["atk"]=400000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -391,58 +391,58 @@ local monster_daily_challenge = {
 	},
 	[3102]={
 		["monster_base"]=10010,
-		["hp"]=8000000,
-		["atk"]=250000,
-		["atk_times"]=2,
+		["hp"]=23000000,
+		["atk"]=350000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=11000
+		["monster_exp"]=16000
 	},
 	[3202]={
 		["monster_base"]=10003,
-		["hp"]=8000000,
-		["atk"]=250000,
-		["atk_times"]=2,
+		["hp"]=28000000,
+		["atk"]=370000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=11000
+		["monster_exp"]=18000
 	},
 	[3302]={
 		["monster_base"]=10004,
-		["hp"]=10000000,
-		["atk"]=250000,
-		["atk_times"]=2,
+		["hp"]=31000000,
+		["atk"]=390000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=17000
+		["monster_exp"]=21000
 	},
 	[3402]={
 		["monster_base"]=10001,
-		["hp"]=12000000,
-		["atk"]=280000,
-		["atk_times"]=2,
+		["hp"]=35000000,
+		["atk"]=410000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=19000
+		["monster_exp"]=22000
 	},
 	[3502]={
 		["monster_base"]=20004,
 		["is_boss"]=1,
-		["hp"]=20000000,
-		["atk"]=340000,
-		["atk_times"]=3,
+		["hp"]=52000000,
+		["atk"]=640000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -454,62 +454,62 @@ local monster_daily_challenge = {
 		["passive_skill"]={
 			10010
 		},
-		["monster_exp"]=18000
+		["monster_exp"]=24000
 	},
 	[3602]={
 		["monster_base"]=10002,
-		["hp"]=15000000,
-		["atk"]=300000,
-		["atk_times"]=2,
+		["hp"]=40000000,
+		["atk"]=430000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=9000
+		["monster_exp"]=15000
 	},
 	[3702]={
 		["monster_base"]=10010,
-		["hp"]=17000000,
-		["atk"]=310000,
-		["atk_times"]=2,
+		["hp"]=44000000,
+		["atk"]=450000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=10000
+		["monster_exp"]=16000
 	},
 	[3802]={
 		["monster_base"]=10008,
-		["hp"]=20000000,
-		["atk"]=320000,
-		["atk_times"]=2,
+		["hp"]=50000000,
+		["atk"]=470000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=11000
+		["monster_exp"]=17000
 	},
 	[3902]={
 		["monster_base"]=10004,
-		["hp"]=22000000,
-		["atk"]=330000,
-		["atk_times"]=2,
+		["hp"]=54000000,
+		["atk"]=490000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=12000
+		["monster_exp"]=17000
 	},
 	[4002]={
 		["monster_base"]=20012,
 		["is_boss"]=2,
-		["hp"]=36000000,
-		["atk"]=380000,
-		["atk_times"]=3,
+		["hp"]=90000000,
+		["atk"]=650000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -521,11 +521,11 @@ local monster_daily_challenge = {
 		["passive_skill"]={
 			10008
 		},
-		["monster_exp"]=12000
+		["monster_exp"]=22000
 	},
 	[4102]={
 		["monster_base"]=10009,
-		["hp"]=6000000,
+		["hp"]=8000000,
 		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
@@ -537,8 +537,8 @@ local monster_daily_challenge = {
 	},
 	[4202]={
 		["monster_base"]=10007,
-		["hp"]=8000000,
-		["atk"]=250000,
+		["hp"]=11000000,
+		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -549,8 +549,8 @@ local monster_daily_challenge = {
 	},
 	[4302]={
 		["monster_base"]=10008,
-		["hp"]=11000000,
-		["atk"]=250000,
+		["hp"]=12000000,
+		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -561,8 +561,8 @@ local monster_daily_challenge = {
 	},
 	[4402]={
 		["monster_base"]=10010,
-		["hp"]=14000000,
-		["atk"]=280000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -574,8 +574,8 @@ local monster_daily_challenge = {
 	[4502]={
 		["monster_base"]=20012,
 		["is_boss"]=1,
-		["hp"]=20000000,
-		["atk"]=340000,
+		["hp"]=23000000,
+		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -587,7 +587,7 @@ local monster_daily_challenge = {
 	[4602]={
 		["monster_base"]=10012,
 		["hp"]=15000000,
-		["atk"]=300000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -598,8 +598,8 @@ local monster_daily_challenge = {
 	},
 	[4702]={
 		["monster_base"]=10010,
-		["hp"]=18000000,
-		["atk"]=310000,
+		["hp"]=17000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -611,7 +611,7 @@ local monster_daily_challenge = {
 	[4802]={
 		["monster_base"]=10007,
 		["hp"]=20000000,
-		["atk"]=320000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -623,7 +623,7 @@ local monster_daily_challenge = {
 	[4902]={
 		["monster_base"]=10012,
 		["hp"]=22000000,
-		["atk"]=340000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -635,8 +635,8 @@ local monster_daily_challenge = {
 	[5002]={
 		["monster_base"]=20010,
 		["is_boss"]=1,
-		["hp"]=39000000,
-		["atk"]=390000,
+		["hp"]=42000000,
+		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -647,8 +647,8 @@ local monster_daily_challenge = {
 	},
 	[5102]={
 		["monster_base"]=10010,
-		["hp"]=20000000,
-		["atk"]=330000,
+		["hp"]=23000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -659,8 +659,8 @@ local monster_daily_challenge = {
 	},
 	[5202]={
 		["monster_base"]=10009,
-		["hp"]=24000000,
-		["atk"]=340000,
+		["hp"]=28000000,
+		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -671,8 +671,8 @@ local monster_daily_challenge = {
 	},
 	[5302]={
 		["monster_base"]=10012,
-		["hp"]=27000000,
-		["atk"]=350000,
+		["hp"]=31000000,
+		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -683,8 +683,8 @@ local monster_daily_challenge = {
 	},
 	[5402]={
 		["monster_base"]=10003,
-		["hp"]=30000000,
-		["atk"]=360000,
+		["hp"]=35000000,
+		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -695,9 +695,9 @@ local monster_daily_challenge = {
 	},
 	[5502]={
 		["monster_base"]=20011,
-		["is_boss"]=2,
-		["hp"]=46000000,
-		["atk"]=420000,
+		["is_boss"]=1,
+		["hp"]=52000000,
+		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -711,58 +711,58 @@ local monster_daily_challenge = {
 	},
 	[5602]={
 		["monster_base"]=10002,
-		["hp"]=15000000,
-		["atk"]=300000,
-		["atk_times"]=2,
+		["hp"]=40000000,
+		["atk"]=430000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=9000
+		["monster_exp"]=15000
 	},
 	[5702]={
 		["monster_base"]=10010,
-		["hp"]=17000000,
-		["atk"]=310000,
-		["atk_times"]=2,
+		["hp"]=44000000,
+		["atk"]=450000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=10000
+		["monster_exp"]=16000
 	},
 	[5802]={
 		["monster_base"]=10008,
-		["hp"]=20000000,
-		["atk"]=320000,
-		["atk_times"]=2,
+		["hp"]=50000000,
+		["atk"]=470000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=11000
+		["monster_exp"]=17000
 	},
 	[5902]={
 		["monster_base"]=10004,
-		["hp"]=22000000,
-		["atk"]=330000,
-		["atk_times"]=2,
+		["hp"]=54000000,
+		["atk"]=490000,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
 			10002,
 			10003
 		},
-		["monster_exp"]=12000
+		["monster_exp"]=17000
 	},
 	[6002]={
 		["monster_base"]=20012,
 		["is_boss"]=2,
-		["hp"]=36000000,
-		["atk"]=380000,
-		["atk_times"]=3,
+		["hp"]=90000000,
+		["atk"]=650000,
+		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
 			10002,
@@ -774,7 +774,7 @@ local monster_daily_challenge = {
 		["passive_skill"]={
 			10008
 		},
-		["monster_exp"]=12000
+		["monster_exp"]=22000
 	},
 	[6102]={
 		["monster_base"]=10012,
@@ -1011,7 +1011,7 @@ local monster_daily_challenge = {
 		["monster_base"]=20009,
 		["is_boss"]=2,
 		["hp"]=90000000,
-		["atk"]=550000,
+		["atk"]=650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1025,8 +1025,8 @@ local monster_daily_challenge = {
 	},
 	[8102]={
 		["monster_base"]=10013,
-		["hp"]=8500000,
-		["atk"]=350000,
+		["hp"]=8000000,
+		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1037,8 +1037,8 @@ local monster_daily_challenge = {
 	},
 	[8202]={
 		["monster_base"]=10001,
-		["hp"]=12000000,
-		["atk"]=370000,
+		["hp"]=11000000,
+		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1049,8 +1049,8 @@ local monster_daily_challenge = {
 	},
 	[8302]={
 		["monster_base"]=10004,
-		["hp"]=13500000,
-		["atk"]=390000,
+		["hp"]=12000000,
+		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1061,8 +1061,8 @@ local monster_daily_challenge = {
 	},
 	[8402]={
 		["monster_base"]=10013,
-		["hp"]=18000000,
-		["atk"]=410000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1074,8 +1074,8 @@ local monster_daily_challenge = {
 	[8502]={
 		["monster_base"]=20006,
 		["is_boss"]=1,
-		["hp"]=25000000,
-		["atk"]=470000,
+		["hp"]=23000000,
+		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1086,8 +1086,8 @@ local monster_daily_challenge = {
 	},
 	[8602]={
 		["monster_base"]=10007,
-		["hp"]=17000000,
-		["atk"]=430000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1098,8 +1098,8 @@ local monster_daily_challenge = {
 	},
 	[8702]={
 		["monster_base"]=10010,
-		["hp"]=19000000,
-		["atk"]=490000,
+		["hp"]=17000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1110,8 +1110,8 @@ local monster_daily_challenge = {
 	},
 	[8802]={
 		["monster_base"]=10004,
-		["hp"]=22000000,
-		["atk"]=450000,
+		["hp"]=20000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1122,8 +1122,8 @@ local monster_daily_challenge = {
 	},
 	[8902]={
 		["monster_base"]=10013,
-		["hp"]=25000000,
-		["atk"]=510000,
+		["hp"]=22000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1135,8 +1135,8 @@ local monster_daily_challenge = {
 	[9002]={
 		["monster_base"]=20007,
 		["is_boss"]=1,
-		["hp"]=52000000,
-		["atk"]=570000,
+		["hp"]=42000000,
+		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1150,8 +1150,8 @@ local monster_daily_challenge = {
 	},
 	[9102]={
 		["monster_base"]=10004,
-		["hp"]=30000000,
-		["atk"]=530000,
+		["hp"]=23000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1162,8 +1162,8 @@ local monster_daily_challenge = {
 	},
 	[9202]={
 		["monster_base"]=10013,
-		["hp"]=34000000,
-		["atk"]=550000,
+		["hp"]=28000000,
+		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1174,8 +1174,8 @@ local monster_daily_challenge = {
 	},
 	[9302]={
 		["monster_base"]=10010,
-		["hp"]=36000000,
-		["atk"]=570000,
+		["hp"]=31000000,
+		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1186,8 +1186,8 @@ local monster_daily_challenge = {
 	},
 	[9402]={
 		["monster_base"]=10007,
-		["hp"]=39000000,
-		["atk"]=590000,
+		["hp"]=35000000,
+		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1199,8 +1199,8 @@ local monster_daily_challenge = {
 	[9502]={
 		["monster_base"]=20011,
 		["is_boss"]=1,
-		["hp"]=71000000,
-		["atk"]=590000,
+		["hp"]=52000000,
+		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1211,8 +1211,8 @@ local monster_daily_challenge = {
 	},
 	[9602]={
 		["monster_base"]=10013,
-		["hp"]=47000000,
-		["atk"]=610000,
+		["hp"]=40000000,
+		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1223,8 +1223,8 @@ local monster_daily_challenge = {
 	},
 	[9702]={
 		["monster_base"]=10007,
-		["hp"]=50000000,
-		["atk"]=630000,
+		["hp"]=44000000,
+		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1235,8 +1235,8 @@ local monster_daily_challenge = {
 	},
 	[9802]={
 		["monster_base"]=10004,
-		["hp"]=55000000,
-		["atk"]=650000,
+		["hp"]=50000000,
+		["atk"]=470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1247,8 +1247,8 @@ local monster_daily_challenge = {
 	},
 	[9902]={
 		["monster_base"]=10010,
-		["hp"]=60000000,
-		["atk"]=670000,
+		["hp"]=54000000,
+		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1260,8 +1260,8 @@ local monster_daily_challenge = {
 	[10002]={
 		["monster_base"]=20007,
 		["is_boss"]=2,
-		["hp"]=95000000,
-		["atk"]=920000,
+		["hp"]=90000000,
+		["atk"]=650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1275,8 +1275,8 @@ local monster_daily_challenge = {
 	},
 	[10102]={
 		["monster_base"]=10012,
-		["hp"]=8700000,
-		["atk"]=380000,
+		["hp"]=8000000,
+		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1287,8 +1287,8 @@ local monster_daily_challenge = {
 	},
 	[10202]={
 		["monster_base"]=10010,
-		["hp"]=12300000,
-		["atk"]=400000,
+		["hp"]=11000000,
+		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1299,8 +1299,8 @@ local monster_daily_challenge = {
 	},
 	[10302]={
 		["monster_base"]=10007,
-		["hp"]=13800000,
-		["atk"]=420000,
+		["hp"]=12000000,
+		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1311,8 +1311,8 @@ local monster_daily_challenge = {
 	},
 	[10402]={
 		["monster_base"]=10004,
-		["hp"]=18400000,
-		["atk"]=440000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1324,8 +1324,8 @@ local monster_daily_challenge = {
 	[10502]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=25600000,
-		["atk"]=490000,
+		["hp"]=23000000,
+		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1336,8 +1336,8 @@ local monster_daily_challenge = {
 	},
 	[10602]={
 		["monster_base"]=10006,
-		["hp"]=19100000,
-		["atk"]=500000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1348,8 +1348,8 @@ local monster_daily_challenge = {
 	},
 	[10702]={
 		["monster_base"]=10010,
-		["hp"]=21300000,
-		["atk"]=570000,
+		["hp"]=17000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1360,8 +1360,8 @@ local monster_daily_challenge = {
 	},
 	[10802]={
 		["monster_base"]=10012,
-		["hp"]=24700000,
-		["atk"]=520000,
+		["hp"]=20000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1372,8 +1372,8 @@ local monster_daily_challenge = {
 	},
 	[10902]={
 		["monster_base"]=10004,
-		["hp"]=28100000,
-		["atk"]=590000,
+		["hp"]=22000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1385,8 +1385,8 @@ local monster_daily_challenge = {
 	[11002]={
 		["monster_base"]=20006,
 		["is_boss"]=1,
-		["hp"]=53300000,
-		["atk"]=600000,
+		["hp"]=42000000,
+		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1397,8 +1397,8 @@ local monster_daily_challenge = {
 	},
 	[11102]={
 		["monster_base"]=10006,
-		["hp"]=30800000,
-		["atk"]=560000,
+		["hp"]=23000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1409,8 +1409,8 @@ local monster_daily_challenge = {
 	},
 	[11202]={
 		["monster_base"]=10010,
-		["hp"]=34900000,
-		["atk"]=580000,
+		["hp"]=28000000,
+		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1421,8 +1421,8 @@ local monster_daily_challenge = {
 	},
 	[11302]={
 		["monster_base"]=10012,
-		["hp"]=36900000,
-		["atk"]=600000,
+		["hp"]=31000000,
+		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1433,8 +1433,8 @@ local monster_daily_challenge = {
 	},
 	[11402]={
 		["monster_base"]=10002,
-		["hp"]=40000000,
-		["atk"]=620000,
+		["hp"]=35000000,
+		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1446,8 +1446,8 @@ local monster_daily_challenge = {
 	[11502]={
 		["monster_base"]=20007,
 		["is_boss"]=1,
-		["hp"]=72800000,
-		["atk"]=620000,
+		["hp"]=52000000,
+		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1458,8 +1458,8 @@ local monster_daily_challenge = {
 	},
 	[11602]={
 		["monster_base"]=10004,
-		["hp"]=52800000,
-		["atk"]=700000,
+		["hp"]=40000000,
+		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1470,8 +1470,8 @@ local monster_daily_challenge = {
 	},
 	[11702]={
 		["monster_base"]=10002,
-		["hp"]=56100000,
-		["atk"]=720000,
+		["hp"]=44000000,
+		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1482,8 +1482,8 @@ local monster_daily_challenge = {
 	},
 	[11802]={
 		["monster_base"]=10012,
-		["hp"]=61700000,
-		["atk"]=750000,
+		["hp"]=50000000,
+		["atk"]=470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1494,8 +1494,8 @@ local monster_daily_challenge = {
 	},
 	[11902]={
 		["monster_base"]=10013,
-		["hp"]=67300000,
-		["atk"]=770000,
+		["hp"]=54000000,
+		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1507,8 +1507,8 @@ local monster_daily_challenge = {
 	[12002]={
 		["monster_base"]=20008,
 		["is_boss"]=2,
-		["hp"]=108900000,
-		["atk"]=1070000,
+		["hp"]=90000000,
+		["atk"]=650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10004,
@@ -1524,8 +1524,8 @@ local monster_daily_challenge = {
 	},
 	[12102]={
 		["monster_base"]=10017,
-		["hp"]=11000000,
-		["atk"]=500000,
+		["hp"]=8000000,
+		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1536,8 +1536,8 @@ local monster_daily_challenge = {
 	},
 	[12202]={
 		["monster_base"]=10004,
-		["hp"]=15600000,
-		["atk"]=520000,
+		["hp"]=11000000,
+		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1548,8 +1548,8 @@ local monster_daily_challenge = {
 	},
 	[12302]={
 		["monster_base"]=10002,
-		["hp"]=17500000,
-		["atk"]=550000,
+		["hp"]=12000000,
+		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1560,8 +1560,8 @@ local monster_daily_challenge = {
 	},
 	[12402]={
 		["monster_base"]=10014,
-		["hp"]=23300000,
-		["atk"]=580000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1573,8 +1573,8 @@ local monster_daily_challenge = {
 	[12502]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=32400000,
-		["atk"]=640000,
+		["hp"]=23000000,
+		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1585,8 +1585,8 @@ local monster_daily_challenge = {
 	},
 	[12602]={
 		["monster_base"]=10017,
-		["hp"]=22000000,
-		["atk"]=600000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1597,8 +1597,8 @@ local monster_daily_challenge = {
 	},
 	[12702]={
 		["monster_base"]=10014,
-		["hp"]=24600000,
-		["atk"]=670000,
+		["hp"]=17000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1609,8 +1609,8 @@ local monster_daily_challenge = {
 	},
 	[12802]={
 		["monster_base"]=10004,
-		["hp"]=28500000,
-		["atk"]=630000,
+		["hp"]=20000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1621,8 +1621,8 @@ local monster_daily_challenge = {
 	},
 	[12902]={
 		["monster_base"]=10002,
-		["hp"]=32400000,
-		["atk"]=700000,
+		["hp"]=22000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1634,8 +1634,8 @@ local monster_daily_challenge = {
 	[13002]={
 		["monster_base"]=20010,
 		["is_boss"]=1,
-		["hp"]=59700000,
-		["atk"]=690000,
+		["hp"]=42000000,
+		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1646,8 +1646,8 @@ local monster_daily_challenge = {
 	},
 	[13102]={
 		["monster_base"]=10002,
-		["hp"]=34500000,
-		["atk"]=650000,
+		["hp"]=23000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1658,8 +1658,8 @@ local monster_daily_challenge = {
 	},
 	[13202]={
 		["monster_base"]=10010,
-		["hp"]=39100000,
-		["atk"]=670000,
+		["hp"]=28000000,
+		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1670,8 +1670,8 @@ local monster_daily_challenge = {
 	},
 	[13302]={
 		["monster_base"]=10003,
-		["hp"]=41300000,
-		["atk"]=700000,
+		["hp"]=31000000,
+		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1682,8 +1682,8 @@ local monster_daily_challenge = {
 	},
 	[13402]={
 		["monster_base"]=10008,
-		["hp"]=44800000,
-		["atk"]=720000,
+		["hp"]=35000000,
+		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1695,8 +1695,8 @@ local monster_daily_challenge = {
 	[13502]={
 		["monster_base"]=20011,
 		["is_boss"]=1,
-		["hp"]=81500000,
-		["atk"]=710000,
+		["hp"]=52000000,
+		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1707,8 +1707,8 @@ local monster_daily_challenge = {
 	},
 	[13602]={
 		["monster_base"]=10007,
-		["hp"]=55400000,
-		["atk"]=760000,
+		["hp"]=40000000,
+		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1719,8 +1719,8 @@ local monster_daily_challenge = {
 	},
 	[13702]={
 		["monster_base"]=10012,
-		["hp"]=58800000,
-		["atk"]=780000,
+		["hp"]=44000000,
+		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1731,8 +1731,8 @@ local monster_daily_challenge = {
 	},
 	[13802]={
 		["monster_base"]=10012,
-		["hp"]=64700000,
-		["atk"]=810000,
+		["hp"]=50000000,
+		["atk"]=470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1743,8 +1743,8 @@ local monster_daily_challenge = {
 	},
 	[13902]={
 		["monster_base"]=10016,
-		["hp"]=70600000,
-		["atk"]=830000,
+		["hp"]=54000000,
+		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1756,8 +1756,8 @@ local monster_daily_challenge = {
 	[14002]={
 		["monster_base"]=20005,
 		["is_boss"]=2,
-		["hp"]=121900000,
-		["atk"]=1210000,
+		["hp"]=90000000,
+		["atk"]=650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1771,8 +1771,8 @@ local monster_daily_challenge = {
 	},
 	[14102]={
 		["monster_base"]=10010,
-		["hp"]=12600000,
-		["atk"]=590000,
+		["hp"]=8000000,
+		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1783,8 +1783,8 @@ local monster_daily_challenge = {
 	},
 	[14202]={
 		["monster_base"]=10003,
-		["hp"]=17900000,
-		["atk"]=620000,
+		["hp"]=11000000,
+		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1795,8 +1795,8 @@ local monster_daily_challenge = {
 	},
 	[14302]={
 		["monster_base"]=10009,
-		["hp"]=20100000,
-		["atk"]=650000,
+		["hp"]=12000000,
+		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1807,8 +1807,8 @@ local monster_daily_challenge = {
 	},
 	[14402]={
 		["monster_base"]=10012,
-		["hp"]=26700000,
-		["atk"]=680000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1820,8 +1820,8 @@ local monster_daily_challenge = {
 	[14502]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=37100000,
-		["atk"]=750000,
+		["hp"]=23000000,
+		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1832,8 +1832,8 @@ local monster_daily_challenge = {
 	},
 	[14602]={
 		["monster_base"]=10007,
-		["hp"]=25200000,
-		["atk"]=700000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1844,8 +1844,8 @@ local monster_daily_challenge = {
 	},
 	[14702]={
 		["monster_base"]=10012,
-		["hp"]=28200000,
-		["atk"]=790000,
+		["hp"]=17000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1856,8 +1856,8 @@ local monster_daily_challenge = {
 	},
 	[14802]={
 		["monster_base"]=10012,
-		["hp"]=32700000,
-		["atk"]=740000,
+		["hp"]=20000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1868,8 +1868,8 @@ local monster_daily_challenge = {
 	},
 	[14902]={
 		["monster_base"]=10016,
-		["hp"]=37100000,
-		["atk"]=830000,
+		["hp"]=22000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1881,8 +1881,8 @@ local monster_daily_challenge = {
 	[15002]={
 		["monster_base"]=20001,
 		["is_boss"]=1,
-		["hp"]=68400000,
-		["atk"]=800000,
+		["hp"]=42000000,
+		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1893,8 +1893,8 @@ local monster_daily_challenge = {
 	},
 	[15102]={
 		["monster_base"]=10017,
-		["hp"]=39500000,
-		["atk"]=760000,
+		["hp"]=23000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1905,8 +1905,8 @@ local monster_daily_challenge = {
 	},
 	[15202]={
 		["monster_base"]=10014,
-		["hp"]=44800000,
-		["atk"]=790000,
+		["hp"]=28000000,
+		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1917,8 +1917,8 @@ local monster_daily_challenge = {
 	},
 	[15302]={
 		["monster_base"]=10004,
-		["hp"]=47300000,
-		["atk"]=820000,
+		["hp"]=31000000,
+		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1929,8 +1929,8 @@ local monster_daily_challenge = {
 	},
 	[15402]={
 		["monster_base"]=10002,
-		["hp"]=51300000,
-		["atk"]=840000,
+		["hp"]=35000000,
+		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1942,8 +1942,8 @@ local monster_daily_challenge = {
 	[15502]={
 		["monster_base"]=20004,
 		["is_boss"]=1,
-		["hp"]=97800000,
-		["atk"]=870000,
+		["hp"]=52000000,
+		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -1954,8 +1954,8 @@ local monster_daily_challenge = {
 	},
 	[15602]={
 		["monster_base"]=10010,
-		["hp"]=64800000,
-		["atk"]=910000,
+		["hp"]=40000000,
+		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1966,8 +1966,8 @@ local monster_daily_challenge = {
 	},
 	[15702]={
 		["monster_base"]=10003,
-		["hp"]=68800000,
-		["atk"]=940000,
+		["hp"]=44000000,
+		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1978,8 +1978,8 @@ local monster_daily_challenge = {
 	},
 	[15802]={
 		["monster_base"]=10009,
-		["hp"]=75700000,
-		["atk"]=960000,
+		["hp"]=50000000,
+		["atk"]=470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -1990,8 +1990,8 @@ local monster_daily_challenge = {
 	},
 	[15902]={
 		["monster_base"]=10012,
-		["hp"]=82600000,
-		["atk"]=990000,
+		["hp"]=54000000,
+		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2003,8 +2003,8 @@ local monster_daily_challenge = {
 	[16002]={
 		["monster_base"]=20005,
 		["is_boss"]=2,
-		["hp"]=130700000,
-		["atk"]=1320000,
+		["hp"]=90000000,
+		["atk"]=650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -2018,8 +2018,8 @@ local monster_daily_challenge = {
 	},
 	[16102]={
 		["monster_base"]=10015,
-		["hp"]=13300000,
-		["atk"]=640000,
+		["hp"]=8000000,
+		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2030,8 +2030,8 @@ local monster_daily_challenge = {
 	},
 	[16202]={
 		["monster_base"]=10017,
-		["hp"]=18800000,
-		["atk"]=670000,
+		["hp"]=11000000,
+		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2042,8 +2042,8 @@ local monster_daily_challenge = {
 	},
 	[16302]={
 		["monster_base"]=10014,
-		["hp"]=21100000,
-		["atk"]=700000,
+		["hp"]=12000000,
+		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2054,8 +2054,8 @@ local monster_daily_challenge = {
 	},
 	[16402]={
 		["monster_base"]=10018,
-		["hp"]=28000000,
-		["atk"]=740000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2067,8 +2067,8 @@ local monster_daily_challenge = {
 	[16502]={
 		["monster_base"]=20001,
 		["is_boss"]=1,
-		["hp"]=41400000,
-		["atk"]=850000,
+		["hp"]=23000000,
+		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -2079,8 +2079,8 @@ local monster_daily_challenge = {
 	},
 	[16602]={
 		["monster_base"]=10012,
-		["hp"]=28100000,
-		["atk"]=810000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2091,8 +2091,8 @@ local monster_daily_challenge = {
 	},
 	[16702]={
 		["monster_base"]=10017,
-		["hp"]=31500000,
-		["atk"]=900000,
+		["hp"]=17000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2103,8 +2103,8 @@ local monster_daily_challenge = {
 	},
 	[16802]={
 		["monster_base"]=10014,
-		["hp"]=36500000,
-		["atk"]=840000,
+		["hp"]=20000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2115,8 +2115,8 @@ local monster_daily_challenge = {
 	},
 	[16902]={
 		["monster_base"]=10016,
-		["hp"]=41400000,
-		["atk"]=940000,
+		["hp"]=22000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2128,8 +2128,8 @@ local monster_daily_challenge = {
 	[17002]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=76300000,
-		["atk"]=910000,
+		["hp"]=42000000,
+		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -2140,8 +2140,8 @@ local monster_daily_challenge = {
 	},
 	[17102]={
 		["monster_base"]=10010,
-		["hp"]=44100000,
-		["atk"]=870000,
+		["hp"]=23000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2152,8 +2152,8 @@ local monster_daily_challenge = {
 	},
 	[17202]={
 		["monster_base"]=10003,
-		["hp"]=50000000,
-		["atk"]=900000,
+		["hp"]=28000000,
+		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2164,8 +2164,8 @@ local monster_daily_challenge = {
 	},
 	[17302]={
 		["monster_base"]=10009,
-		["hp"]=52800000,
-		["atk"]=930000,
+		["hp"]=31000000,
+		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2176,8 +2176,8 @@ local monster_daily_challenge = {
 	},
 	[17402]={
 		["monster_base"]=10012,
-		["hp"]=57200000,
-		["atk"]=960000,
+		["hp"]=35000000,
+		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2189,8 +2189,8 @@ local monster_daily_challenge = {
 	[17502]={
 		["monster_base"]=20004,
 		["is_boss"]=1,
-		["hp"]=104100000,
-		["atk"]=940000,
+		["hp"]=52000000,
+		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -2201,8 +2201,8 @@ local monster_daily_challenge = {
 	},
 	[17602]={
 		["monster_base"]=10015,
-		["hp"]=69000000,
-		["atk"]=990000,
+		["hp"]=40000000,
+		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2213,8 +2213,8 @@ local monster_daily_challenge = {
 	},
 	[17702]={
 		["monster_base"]=10017,
-		["hp"]=73200000,
-		["atk"]=1020000,
+		["hp"]=44000000,
+		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2225,8 +2225,8 @@ local monster_daily_challenge = {
 	},
 	[17802]={
 		["monster_base"]=10014,
-		["hp"]=80600000,
-		["atk"]=1050000,
+		["hp"]=50000000,
+		["atk"]=470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2237,8 +2237,8 @@ local monster_daily_challenge = {
 	},
 	[17902]={
 		["monster_base"]=10018,
-		["hp"]=87900000,
-		["atk"]=1080000,
+		["hp"]=54000000,
+		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2250,8 +2250,8 @@ local monster_daily_challenge = {
 	[18002]={
 		["monster_base"]=20003,
 		["is_boss"]=2,
-		["hp"]=145500000,
-		["atk"]=1480000,
+		["hp"]=90000000,
+		["atk"]=650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10004,
@@ -2267,8 +2267,8 @@ local monster_daily_challenge = {
 	},
 	[18102]={
 		["monster_base"]=10012,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=8000000,
+		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2279,8 +2279,8 @@ local monster_daily_challenge = {
 	},
 	[18202]={
 		["monster_base"]=10017,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=11000000,
+		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2291,8 +2291,8 @@ local monster_daily_challenge = {
 	},
 	[18302]={
 		["monster_base"]=10014,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=12000000,
+		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2303,8 +2303,8 @@ local monster_daily_challenge = {
 	},
 	[18402]={
 		["monster_base"]=10016,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2316,8 +2316,8 @@ local monster_daily_challenge = {
 	[18502]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=23000000,
+		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -2328,8 +2328,8 @@ local monster_daily_challenge = {
 	},
 	[18602]={
 		["monster_base"]=10007,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=15000000,
+		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2340,8 +2340,8 @@ local monster_daily_challenge = {
 	},
 	[18702]={
 		["monster_base"]=10012,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=17000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2352,8 +2352,8 @@ local monster_daily_challenge = {
 	},
 	[18802]={
 		["monster_base"]=10012,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=20000000,
+		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2364,8 +2364,8 @@ local monster_daily_challenge = {
 	},
 	[18902]={
 		["monster_base"]=10016,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=22000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2377,8 +2377,8 @@ local monster_daily_challenge = {
 	[19002]={
 		["monster_base"]=20007,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=42000000,
+		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -2389,8 +2389,8 @@ local monster_daily_challenge = {
 	},
 	[19102]={
 		["monster_base"]=10015,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=23000000,
+		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2401,8 +2401,8 @@ local monster_daily_challenge = {
 	},
 	[19202]={
 		["monster_base"]=10017,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=28000000,
+		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2413,8 +2413,8 @@ local monster_daily_challenge = {
 	},
 	[19302]={
 		["monster_base"]=10014,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=31000000,
+		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2425,8 +2425,8 @@ local monster_daily_challenge = {
 	},
 	[19402]={
 		["monster_base"]=10018,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=35000000,
+		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2438,8 +2438,8 @@ local monster_daily_challenge = {
 	[19502]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=52000000,
+		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
@@ -2450,8 +2450,8 @@ local monster_daily_challenge = {
 	},
 	[19602]={
 		["monster_base"]=10004,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=40000000,
+		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2462,8 +2462,8 @@ local monster_daily_challenge = {
 	},
 	[19702]={
 		["monster_base"]=10002,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=44000000,
+		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2474,8 +2474,8 @@ local monster_daily_challenge = {
 	},
 	[19802]={
 		["monster_base"]=10012,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=50000000,
+		["atk"]=470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2486,8 +2486,8 @@ local monster_daily_challenge = {
 	},
 	[19902]={
 		["monster_base"]=10013,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=54000000,
+		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			10001,
@@ -2499,8 +2499,8 @@ local monster_daily_challenge = {
 	[20002]={
 		["monster_base"]=20003,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=90000000,
+		["atk"]=650000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			10001,
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index a6562440..8edee411 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -1,4 +1,18 @@
 local skill = {
+	[8]={
+		["effect_type"]=2,
+		["trigger"]=3,
+		["effect"]={
+			{
+				["type"]="wavehealp",
+				["num"]=100,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=1,
+		["skill_position"]=2
+	},
 	[9]={
 		["effect_type"]=2,
 		["trigger"]=6,
@@ -98,9 +112,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=1200111,
 		["name_act"]="attack01",
-		["fx_self"]=300017,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300018
 	},
 	[1200111]={
 		["position"]=1,
@@ -120,9 +132,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=1200112,
 		["name_act"]="attack02",
-		["fx_self"]=300018,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300019
 	},
 	[1200112]={
 		["position"]=1,
@@ -142,9 +152,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=1200113,
 		["name_act"]="attack03",
-		["fx_self"]=300019,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300020
 	},
 	[1200113]={
 		["position"]=1,
@@ -164,9 +172,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=1200114,
 		["name_act"]="attack04",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300021
 	},
 	[1200120]={
 		["energy"]=10,
@@ -201,9 +207,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900
+		["fx_self"]=300022
 	},
 	[1200121]={
 		["position"]=1,
@@ -271,7 +275,7 @@ local skill = {
 			}
 		},
 		["obj"]=1,
-		["skill_position"]=2
+		["skill_position"]=1
 	},
 	[1200124]={
 		["effect_type"]=2,
@@ -299,14 +303,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200111,
 		["name_act"]="attack01",
-		["fx_self"]=300017,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300055
 	},
 	[1300111]={
 		["position"]=1,
@@ -321,14 +323,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200112,
 		["name_act"]="attack02",
-		["fx_self"]=300018,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300056
 	},
 	[1300112]={
 		["position"]=1,
@@ -343,14 +343,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200113,
 		["name_act"]="attack03",
-		["fx_self"]=300019,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300057
 	},
 	[1300113]={
 		["position"]=1,
@@ -365,14 +363,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200114,
 		["name_act"]="attack04",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300058
 	},
 	[1300120]={
 		["energy"]=10,
@@ -408,14 +404,12 @@ local skill = {
 			2,
 			3
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900
+		["fx_self"]=300059
 	},
 	[1300121]={
 		["position"]=1,
@@ -496,14 +490,12 @@ local skill = {
 			2,
 			3
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900
+		["fx_self"]=300059
 	},
 	[1300124]={
 		["position"]=1,
@@ -574,14 +566,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200111,
 		["name_act"]="attack01",
-		["fx_self"]=300017,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300035
 	},
 	[1300211]={
 		["position"]=1,
@@ -596,14 +586,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200112,
 		["name_act"]="attack02",
-		["fx_self"]=300018,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300036
 	},
 	[1300212]={
 		["position"]=1,
@@ -618,14 +606,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200113,
 		["name_act"]="attack03",
-		["fx_self"]=300019,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300037
 	},
 	[1300213]={
 		["position"]=1,
@@ -640,14 +626,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200114,
 		["name_act"]="attack04",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300038
 	},
 	[1300220]={
 		["energy"]=10,
@@ -714,14 +698,12 @@ local skill = {
 			4,
 			6
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=1200114,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300039
 	},
 	[1300221]={
 		["position"]=1,
@@ -819,14 +801,12 @@ local skill = {
 			4,
 			6
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=1200114,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300039
 	},
 	[1400110]={
 		["position"]=1,
@@ -841,14 +821,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200111,
 		["name_act"]="attack01",
-		["fx_self"]=300017,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300045
 	},
 	[1400111]={
 		["position"]=1,
@@ -863,14 +841,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200112,
 		["name_act"]="attack02",
-		["fx_self"]=300018,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300046
 	},
 	[1400112]={
 		["position"]=1,
@@ -885,14 +861,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200113,
 		["name_act"]="attack03",
-		["fx_self"]=300019,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=300047
 	},
 	[1400113]={
 		["position"]=1,
@@ -907,14 +881,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200114,
 		["name_act"]="attack04",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=300048
 	},
 	[1400120]={
 		["energy"]=10,
@@ -952,14 +924,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900
+		["fx_target"]=300049
 	},
 	[1400121]={
 		["position"]=1,
@@ -1070,14 +1040,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200111,
 		["name_act"]="attack01",
-		["fx_self"]=300004,
-		["fx_target"]=4,
-		["fx_target_delay"]=366
+		["fx_self"]=300005
 	},
 	[2200111]={
 		["position"]=2,
@@ -1092,14 +1060,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200112,
 		["name_act"]="attack02",
-		["fx_self"]=300005,
-		["fx_target"]=4,
-		["fx_target_delay"]=400
+		["fx_self"]=300006
 	},
 	[2200112]={
 		["position"]=2,
@@ -1114,14 +1080,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200113,
 		["name_act"]="attack03",
-		["fx_self"]=300006,
-		["fx_target"]=4,
-		["fx_target_delay"]=333
+		["fx_self"]=300007
 	},
 	[2200113]={
 		["position"]=2,
@@ -1136,14 +1100,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200114,
 		["name_act"]="attack04",
-		["fx_self"]=300007,
-		["fx_target"]=4,
-		["fx_target_delay"]=433
+		["fx_self"]=300008
 	},
 	[2200120]={
 		["energy"]=10,
@@ -1167,9 +1129,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300009,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -1256,9 +1216,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300009,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -1278,14 +1236,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200111,
 		["name_act"]="attack01",
-		["fx_self"]=300004,
-		["fx_target"]=4,
-		["fx_target_delay"]=366
+		["fx_self"]=300040
 	},
 	[2300111]={
 		["position"]=2,
@@ -1300,14 +1256,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200112,
 		["name_act"]="attack02",
-		["fx_self"]=300005,
-		["fx_target"]=4,
-		["fx_target_delay"]=400
+		["fx_self"]=300041
 	},
 	[2300112]={
 		["position"]=2,
@@ -1322,14 +1276,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200113,
 		["name_act"]="attack03",
-		["fx_self"]=300006,
-		["fx_target"]=4,
-		["fx_target_delay"]=333
+		["fx_self"]=300042
 	},
 	[2300113]={
 		["position"]=2,
@@ -1344,14 +1296,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200114,
 		["name_act"]="attack04",
-		["fx_self"]=300007,
-		["fx_target"]=4,
-		["fx_target_delay"]=433
+		["fx_self"]=300043
 	},
 	[2300120]={
 		["energy"]=10,
@@ -1400,9 +1350,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300044,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -1470,9 +1418,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300044,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -1582,14 +1528,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200111,
 		["name_act"]="attack01",
-		["fx_self"]=300004,
-		["fx_target"]=4,
-		["fx_target_delay"]=366
+		["fx_self"]=300050
 	},
 	[2300211]={
 		["position"]=2,
@@ -1604,14 +1548,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200112,
 		["name_act"]="attack02",
-		["fx_self"]=300005,
-		["fx_target"]=4,
-		["fx_target_delay"]=400
+		["fx_self"]=300051
 	},
 	[2300212]={
 		["position"]=2,
@@ -1626,14 +1568,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200113,
 		["name_act"]="attack03",
-		["fx_self"]=300006,
-		["fx_target"]=4,
-		["fx_target_delay"]=333
+		["fx_self"]=300052
 	},
 	[2300213]={
 		["position"]=2,
@@ -1648,14 +1588,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200114,
 		["name_act"]="attack04",
-		["fx_self"]=300007,
-		["fx_target"]=4,
-		["fx_target_delay"]=433
+		["fx_self"]=300053
 	},
 	[2300220]={
 		["energy"]=10,
@@ -1704,14 +1642,12 @@ local skill = {
 			2,
 			3
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300054,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -1795,7 +1731,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=2300111,
 		["name_act"]="attack01",
-		["fx_target"]=300026
+		["fx_self"]=300028
 	},
 	[2400111]={
 		["position"]=2,
@@ -1815,7 +1751,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=2300112,
 		["name_act"]="attack02",
-		["fx_target"]=300027
+		["fx_self"]=300029
 	},
 	[2400112]={
 		["position"]=2,
@@ -1835,7 +1771,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=2300113,
 		["name_act"]="attack03",
-		["fx_target"]=300028
+		["fx_self"]=300030
 	},
 	[2400113]={
 		["position"]=2,
@@ -1855,7 +1791,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=2300114,
 		["name_act"]="attack04",
-		["fx_target"]=300029
+		["fx_self"]=300031
 	},
 	[2400120]={
 		["energy"]=10,
@@ -1883,7 +1819,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=2300120,
 		["name_act"]="skill01",
-		["fx_self"]=300034,
+		["fx_self"]=300032,
 		["bullet_time"]={
 			2033,
 			3000,
@@ -1996,7 +1932,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=2300120,
 		["name_act"]="skill01",
-		["fx_self"]=300034,
+		["fx_self"]=300032,
 		["bullet_time"]={
 			2033,
 			3000,
@@ -2035,7 +1971,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=2300120,
 		["name_act"]="skill01",
-		["fx_self"]=300034,
+		["fx_self"]=300032,
 		["bullet_time"]={
 			2033,
 			3000,
@@ -2074,9 +2010,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3200111,
 		["name_act"]="attack01",
-		["fx_self"]=300000,
-		["fx_target"]=6,
-		["fx_target_delay"]=230
+		["fx_self"]=300000
 	},
 	[3200111]={
 		["position"]=3,
@@ -2096,9 +2030,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3200112,
 		["name_act"]="attack02",
-		["fx_self"]=300001,
-		["fx_target"]=5,
-		["fx_target_delay"]=200
+		["fx_self"]=300001
 	},
 	[3200112]={
 		["position"]=3,
@@ -2118,9 +2050,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3200113,
 		["name_act"]="attack03",
-		["fx_self"]=300002,
-		["fx_target"]=6,
-		["fx_target_delay"]=230
+		["fx_self"]=300002
 	},
 	[3200113]={
 		["position"]=3,
@@ -2140,9 +2070,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3200114,
 		["name_act"]="attack04",
-		["fx_self"]=300003,
-		["fx_target"]=6,
-		["fx_target_delay"]=266
+		["fx_self"]=300003
 	},
 	[3200120]={
 		["energy"]=10,
@@ -2170,9 +2098,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=3200120,
 		["name_act"]="skill01",
-		["fx_self"]=300033,
-		["fx_target"]=6,
-		["fx_target_delay"]=833,
+		["fx_self"]=300004,
 		["bullet_time"]={
 			1566,
 			5000,
@@ -2270,7 +2196,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300111,
 		["name_act"]="attack01",
-		["fx_target"]=300021
+		["fx_target"]=300023
 	},
 	[3300111]={
 		["position"]=3,
@@ -2290,7 +2216,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300112,
 		["name_act"]="attack02",
-		["fx_target"]=300022
+		["fx_target"]=300024
 	},
 	[3300112]={
 		["position"]=3,
@@ -2310,7 +2236,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300113,
 		["name_act"]="attack03",
-		["fx_target"]=300023
+		["fx_target"]=300025
 	},
 	[3300113]={
 		["position"]=3,
@@ -2330,17 +2256,13 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300114,
 		["name_act"]="attack04",
-		["fx_target"]=300024
+		["fx_target"]=300026
 	},
 	[3300120]={
 		["energy"]=10,
 		["link"]=1,
 		["position"]=3,
 		["method"]=1,
-		["skill_type"]=4,
-		["boardrange"]={
-
-		},
 		["battle_icon"]="8",
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -2356,7 +2278,7 @@ local skill = {
 		["skill_position"]=2,
 		["sound_hit"]=3300120,
 		["name_act"]="skill01",
-		["fx_self"]=300025
+		["fx_self"]=300027
 	},
 	[3300121]={
 		["position"]=3,
@@ -2414,6 +2336,39 @@ local skill = {
 		},
 		["obj"]=1
 	},
+	[3300125]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=3,
+		["method"]=2,
+		["skill_type"]=4,
+		["boardrange"]={
+			{
+				["type"]=1,
+				["range"]=2
+			},
+			{
+				["type"]=2,
+				["range"]=2
+			}
+		},
+		["battle_icon"]="8",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["skill_position"]=2,
+		["sound_hit"]=3300120,
+		["name_act"]="skill01",
+		["fx_self"]=300027
+	},
 	[3300210]={
 		["position"]=3,
 		["effect_type"]=1,
@@ -2432,7 +2387,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300111,
 		["name_act"]="attack01",
-		["fx_target"]=300021
+		["fx_self"]=300070
 	},
 	[3300211]={
 		["position"]=3,
@@ -2452,7 +2407,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300112,
 		["name_act"]="attack02",
-		["fx_target"]=300022
+		["fx_self"]=300071
 	},
 	[3300212]={
 		["position"]=3,
@@ -2472,7 +2427,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300113,
 		["name_act"]="attack03",
-		["fx_target"]=300023
+		["fx_self"]=300072
 	},
 	[3300213]={
 		["position"]=3,
@@ -2492,7 +2447,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300114,
 		["name_act"]="attack04",
-		["fx_target"]=300024
+		["fx_self"]=300073
 	},
 	[3300220]={
 		["energy"]=10,
@@ -2544,14 +2499,12 @@ local skill = {
 			3,
 			4
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300074,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -2644,14 +2597,12 @@ local skill = {
 			3,
 			5
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300074,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -2731,14 +2682,12 @@ local skill = {
 			3,
 			5
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300074,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -2763,7 +2712,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300111,
 		["name_act"]="attack01",
-		["fx_target"]=300021
+		["fx_self"]=300091
 	},
 	[3400111]={
 		["position"]=3,
@@ -2783,7 +2732,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300112,
 		["name_act"]="attack02",
-		["fx_target"]=300022
+		["fx_self"]=300091
 	},
 	[3400112]={
 		["position"]=3,
@@ -2803,7 +2752,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300113,
 		["name_act"]="attack03",
-		["fx_target"]=300023
+		["fx_self"]=300091
 	},
 	[3400113]={
 		["position"]=3,
@@ -2823,7 +2772,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300114,
 		["name_act"]="attack04",
-		["fx_target"]=300024
+		["fx_self"]=300091
 	},
 	[3400120]={
 		["energy"]=10,
@@ -2852,14 +2801,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300092,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -2959,14 +2906,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=300092,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -2991,7 +2936,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200111,
 		["name_act"]="attack01",
-		["fx_target"]=300009
+		["fx_target"]=300010
 	},
 	[4200111]={
 		["position"]=4,
@@ -3011,7 +2956,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200112,
 		["name_act"]="attack02",
-		["fx_target"]=300010
+		["fx_target"]=300011
 	},
 	[4200112]={
 		["position"]=4,
@@ -3031,7 +2976,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200113,
 		["name_act"]="attack03",
-		["fx_target"]=300011
+		["fx_target"]=300012
 	},
 	[4200113]={
 		["position"]=4,
@@ -3051,7 +2996,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200114,
 		["name_act"]="attack04",
-		["fx_target"]=300012
+		["fx_target"]=300013
 	},
 	[4200120]={
 		["energy"]=10,
@@ -3082,7 +3027,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_target"]=300014
 	},
 	[4200121]={
 		["position"]=4,
@@ -3178,7 +3123,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200111,
 		["name_act"]="attack01",
-		["fx_target"]=300009
+		["fx_self"]=300080
 	},
 	[4300111]={
 		["position"]=4,
@@ -3198,7 +3143,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200112,
 		["name_act"]="attack02",
-		["fx_target"]=300010
+		["fx_self"]=300081
 	},
 	[4300112]={
 		["position"]=4,
@@ -3218,7 +3163,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200113,
 		["name_act"]="attack03",
-		["fx_target"]=300011
+		["fx_self"]=300082
 	},
 	[4300113]={
 		["position"]=4,
@@ -3238,7 +3183,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200114,
 		["name_act"]="attack04",
-		["fx_target"]=300012
+		["fx_self"]=300083
 	},
 	[4300120]={
 		["energy"]=10,
@@ -3269,7 +3214,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=300084
 	},
 	[4300121]={
 		["position"]=4,
@@ -3387,7 +3332,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=300084
 	},
 	[4300210]={
 		["position"]=4,
@@ -3407,7 +3352,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200111,
 		["name_act"]="attack01",
-		["fx_target"]=300009
+		["fx_self"]=300075
 	},
 	[4300211]={
 		["position"]=4,
@@ -3427,7 +3372,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200112,
 		["name_act"]="attack02",
-		["fx_target"]=300010
+		["fx_self"]=300076
 	},
 	[4300212]={
 		["position"]=4,
@@ -3447,7 +3392,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200113,
 		["name_act"]="attack03",
-		["fx_target"]=300011
+		["fx_self"]=300077
 	},
 	[4300213]={
 		["position"]=4,
@@ -3467,7 +3412,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200114,
 		["name_act"]="attack04",
-		["fx_target"]=300012
+		["fx_self"]=300078
 	},
 	[4300220]={
 		["energy"]=10,
@@ -3518,7 +3463,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=300079
 	},
 	[4300221]={
 		["position"]=4,
@@ -3628,7 +3573,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4300111,
 		["name_act"]="attack01",
-		["fx_target"]=300030
+		["fx_target"]=300033
 	},
 	[4400111]={
 		["position"]=4,
@@ -3648,7 +3593,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4300112,
 		["name_act"]="attack02",
-		["fx_target"]=300030
+		["fx_target"]=300033
 	},
 	[4400112]={
 		["position"]=4,
@@ -3668,7 +3613,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4300113,
 		["name_act"]="attack03",
-		["fx_target"]=300030
+		["fx_target"]=300033
 	},
 	[4400113]={
 		["position"]=4,
@@ -3688,7 +3633,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4300114,
 		["name_act"]="attack04",
-		["fx_target"]=300030
+		["fx_target"]=300033
 	},
 	[4400120]={
 		["energy"]=10,
@@ -3725,10 +3670,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=4300120,
 		["name_act"]="skill01",
-		["fx_self"]=300031,
-		["fx_self_delay"]=100,
-		["fx_target"]=300032,
-		["fx_target_delay"]=300,
+		["fx_target"]=300034,
 		["bullet_time"]={
 			733,
 			3000,
@@ -3812,7 +3754,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300013
+		["fx_self"]=300015
 	},
 	[5200111]={
 		["position"]=5,
@@ -3832,7 +3774,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300013
+		["fx_self"]=300015
 	},
 	[5200112]={
 		["position"]=5,
@@ -3852,7 +3794,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300014
+		["fx_self"]=300016
 	},
 	[5200113]={
 		["position"]=5,
@@ -3872,7 +3814,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300015
+		["fx_self"]=300090
 	},
 	[5200120]={
 		["energy"]=10,
@@ -3898,7 +3840,7 @@ local skill = {
 		["skill_position"]=2,
 		["sound_hit"]=5200120,
 		["name_act"]="skill01",
-		["fx_self"]=300016
+		["fx_self"]=300017
 	},
 	[5200121]={
 		["energy"]=10,
@@ -3924,7 +3866,7 @@ local skill = {
 		["skill_position"]=2,
 		["sound_hit"]=5200120,
 		["name_act"]="skill01",
-		["fx_self"]=300016
+		["fx_self"]=300017
 	},
 	[5200122]={
 		["energy"]=10,
@@ -3950,7 +3892,7 @@ local skill = {
 		["skill_position"]=2,
 		["sound_hit"]=5200120,
 		["name_act"]="skill01",
-		["fx_self"]=300016
+		["fx_self"]=300017
 	},
 	[5200123]={
 		["effect_type"]=2,
@@ -3983,7 +3925,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300013
+		["fx_self"]=300060
 	},
 	[5300111]={
 		["position"]=5,
@@ -4003,7 +3945,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300013
+		["fx_self"]=300061
 	},
 	[5300112]={
 		["position"]=5,
@@ -4023,7 +3965,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300014
+		["fx_self"]=300062
 	},
 	[5300113]={
 		["position"]=5,
@@ -4043,7 +3985,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300015
+		["fx_self"]=300063
 	},
 	[5300120]={
 		["energy"]=10,
@@ -4092,7 +4034,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=300064
 	},
 	[5300121]={
 		["position"]=5,
@@ -4190,7 +4132,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300013
+		["fx_self"]=300065
 	},
 	[5300211]={
 		["position"]=5,
@@ -4210,7 +4152,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300013
+		["fx_self"]=300066
 	},
 	[5300212]={
 		["position"]=5,
@@ -4230,7 +4172,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300014
+		["fx_self"]=300067
 	},
 	[5300213]={
 		["position"]=5,
@@ -4250,15 +4192,14 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300015
+		["fx_self"]=300068
 	},
 	[5300220]={
 		["energy"]=10,
 		["link"]=1,
 		["position"]=5,
 		["method"]=1,
-		["skill_type"]=0,
-		["battle_icon"]="13",
+		["battle_icon"]="15",
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -4292,7 +4233,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=300069
 	},
 	[5300221]={
 		["position"]=5,
@@ -4384,6 +4325,58 @@ local skill = {
 		},
 		["obj"]=1
 	},
+	[5300225]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=5,
+		["method"]=2,
+		["skill_type"]=4,
+		["boardrange"]={
+			{
+				["type"]=3,
+				["range"]=2
+			},
+			{
+				["type"]=4,
+				["range"]=2
+			}
+		},
+		["battle_icon"]="15",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_purple",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["effect_block"]={
+			1,
+			2,
+			3
+		},
+		["skill_position"]=2,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]=4200120,
+		["name_act"]="skill01",
+		["fx_self"]=300069
+	},
 	[5400110]={
 		["position"]=5,
 		["effect_type"]=1,
@@ -4402,7 +4395,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300013
+		["fx_self"]=300085
 	},
 	[5400111]={
 		["position"]=5,
@@ -4422,7 +4415,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300013
+		["fx_self"]=300086
 	},
 	[5400112]={
 		["position"]=5,
@@ -4442,7 +4435,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300014
+		["fx_self"]=300087
 	},
 	[5400113]={
 		["position"]=5,
@@ -4462,7 +4455,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300015
+		["fx_self"]=300088
 	},
 	[5400120]={
 		["energy"]=10,
@@ -4504,7 +4497,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=300089
 	},
 	[5400121]={
 		["skill_type"]=11,
@@ -4566,7 +4559,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=300089
 	},
 	[5400124]={
 		["effect_type"]=2,
@@ -4793,7 +4786,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="first_hand",
-				["num"]=0,
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=999
 			}
@@ -4829,9 +4822,7 @@ local skill = {
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
-		["sound_hit"]=3300120,
-		["name_act"]="skill01",
-		["fx_self"]=200011
+		["name_act"]="skill01"
 	},
 	[10016]={
 		["effect_type"]=1,
@@ -4852,7 +4843,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
+		["fx_self"]=200045,
 		["bullet_time"]={
 			333,
 			3000,
@@ -4884,7 +4875,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
+		["fx_self"]=200037,
 		["bullet_time"]={
 			333,
 			3000,
@@ -4921,7 +4912,6 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
 		["bullet_time"]={
 			333,
 			3000,
@@ -4953,7 +4943,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
+		["fx_self"]=200002,
 		["bullet_time"]={
 			333,
 			3000,
@@ -4985,7 +4975,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
+		["fx_self"]=200005,
 		["bullet_time"]={
 			333,
 			3000,
@@ -5017,7 +5007,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011,
+		["fx_self"]=400044,
 		["bullet_time"]={
 			333,
 			3000,
@@ -5057,14 +5047,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
+		["fx_self"]=200076,
 		["bullet_time"]={
 			333,
 			3000,
@@ -5104,14 +5094,14 @@ local skill = {
 			2,
 			3
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
+		["fx_self"]=200016,
 		["bullet_time"]={
 			333,
 			3000,
@@ -5161,16 +5151,14 @@ local skill = {
 			4,
 			5
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=400004,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5195,7 +5183,7 @@ local skill = {
 			}
 		},
 		["obj"]=1,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0
 	},
@@ -5222,9 +5210,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=200057,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5251,7 +5237,7 @@ local skill = {
 				["type"]="lock",
 				["num"]=0,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=3
 			}
 		},
 		["obj"]=2,
@@ -5262,9 +5248,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_target"]=200009,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5304,18 +5288,16 @@ local skill = {
 		["effect_block"]={
 			1,
 			2,
-			3
+			4
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900,
+		["fx_self"]=400009,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5342,9 +5324,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900,
+		["fx_self"]=200024,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5359,7 +5339,7 @@ local skill = {
 				["type"]="shield_rebound_200",
 				["num"]=1000,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=2
 			}
 		},
 		["obj"]=1,
@@ -5368,7 +5348,7 @@ local skill = {
 		["cd_start"]=0,
 		["sound_hit"]=5200120,
 		["name_act"]="skill01",
-		["fx_self"]=300016
+		["fx_self"]=200020
 	},
 	[10034]={
 		["skill_type"]=3,
@@ -5394,9 +5374,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900,
+		["fx_self"]=200073,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5452,9 +5430,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_target"]=400014,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5502,9 +5478,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=1200120,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=900,
+		["fx_self"]=200053,
 		["bullet_time"]={
 			1100,
 			3000,
@@ -5542,7 +5516,7 @@ local skill = {
 		["cd_start"]=0,
 		["sound_hit"]=3300120,
 		["name_act"]="skill01",
-		["fx_self"]=300025
+		["fx_self"]=400019
 	},
 	[10039]={
 		["skill_type"]=3,
@@ -5630,16 +5604,14 @@ local skill = {
 			4,
 			6
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=1200114,
 		["name_act"]="skill01",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=400024
 	},
 	[10041]={
 		["effect_type"]=1,
@@ -5707,7 +5679,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_target"]=400029
 	},
 	[10043]={
 		["effect_type"]=1,
@@ -5729,7 +5701,8 @@ local skill = {
 		["obj"]=2,
 		["cd"]=3,
 		["cd_start"]=2,
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200084
 	},
 	[10044]={
 		["skill_type"]=6,
@@ -5777,7 +5750,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill02",
-		["fx_target"]=300011
+		["fx_self"]=200085
 	},
 	[10045]={
 		["skill_type"]=10,
@@ -5802,7 +5775,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=200065
 	},
 	[10046]={
 		["effect_type"]=2,
@@ -5842,7 +5815,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=200069
 	},
 	[10048]={
 		["effect_type"]=2,
@@ -5895,6 +5868,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
+		["fx_self"]=200041,
 		["fx_target"]=300011
 	},
 	[10050]={
@@ -5932,7 +5906,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=200041
 	},
 	[10051]={
 		["effect_type"]=1,
@@ -5954,7 +5928,8 @@ local skill = {
 		["obj"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200061
 	},
 	[10052]={
 		["skill_type"]=7,
@@ -5974,8 +5949,7 @@ local skill = {
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
-		["name_act"]="skill01",
-		["fx_target"]=300011
+		["name_act"]="skill01"
 	},
 	[10053]={
 		["skill_type"]=6,
@@ -6022,8 +5996,7 @@ local skill = {
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
-		["name_act"]="skill02",
-		["fx_target"]=300011
+		["name_act"]="skill02"
 	},
 	[10054]={
 		["effect_type"]=1,
@@ -6077,7 +6050,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=200107
 	},
 	[10057]={
 		["skill_type"]=3,
@@ -6139,7 +6112,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill02",
-		["fx_target"]=300011
+		["fx_self"]=200108
 	},
 	[10058]={
 		["effect_type"]=1,
@@ -6182,7 +6155,7 @@ local skill = {
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
 		["name_act"]="skill01",
-		["fx_target"]=300011
+		["fx_self"]=200113
 	},
 	[10059]={
 		["skill_type"]=3,
@@ -6212,7 +6185,8 @@ local skill = {
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
-		["name_act"]="skill02"
+		["name_act"]="skill02",
+		["fx_self"]=200113
 	},
 	[10060]={
 		["effect_type"]=1,
@@ -6230,8 +6204,7 @@ local skill = {
 		["cd"]=2,
 		["cd_start"]=0,
 		["sound_hit"]=3300120,
-		["name_act"]="skill01",
-		["fx_self"]=200011
+		["name_act"]="skill01"
 	},
 	[10061]={
 		["effect_type"]=2,
@@ -6271,19 +6244,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
-		["bullet_time"]={
-			333,
-			3000,
-			666
-		}
+		["fx_self"]=200092
 	},
 	[10063]={
 		["effect_type"]=1,
@@ -6303,19 +6271,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
-		["bullet_time"]={
-			333,
-			3000,
-			666
-		}
+		["fx_self"]=200080
 	},
 	[10064]={
 		["effect_type"]=1,
@@ -6341,19 +6304,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
-		["bullet_time"]={
-			333,
-			3000,
-			666
-		}
+		["fx_self"]=200092
 	},
 	[10065]={
 		["skill_type"]=3,
@@ -6385,12 +6343,7 @@ local skill = {
 		["shake_type"]=5,
 		["sound_hit"]=10082,
 		["name_act"]="skill01",
-		["fx_self"]=200039,
-		["bullet_time"]={
-			333,
-			3000,
-			666
-		}
+		["fx_self"]=200103
 	},
 	[10066]={
 		["effect_type"]=1,
@@ -6443,7 +6396,8 @@ local skill = {
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=400034
 	},
 	[10068]={
 		["effect_type"]=1,
@@ -6502,27 +6456,52 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["eliminate_obj"]=1,
 		["effect_block"]={
 			1,
 			2,
 			3,
 			6
 		},
-		["skill_position"]=1,
+		["skill_position"]=2,
+		["cd"]=3,
+		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
 		["sound_hit"]=2200120,
 		["name_act"]="skill01",
-		["fx_self"]=300008,
-		["fx_target"]=4,
-		["fx_target_delay"]=1100,
+		["fx_self"]=400039,
 		["bullet_time"]={
 			1100,
 			3000,
 			400
 		}
 	},
+	[10070]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["cd"]=2,
+		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]=10082,
+		["name_act"]="skill01",
+		["fx_self"]=200049,
+		["bullet_time"]={
+			333,
+			3000,
+			666
+		}
+	},
 	[20001]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -9671,7 +9650,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200000
 	},
 	[30002]={
 		["effect_type"]=1,
@@ -9689,7 +9669,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200001
 	},
 	[30003]={
 		["effect_type"]=1,
@@ -9707,7 +9688,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200000
 	},
 	[30004]={
 		["effect_type"]=1,
@@ -9725,7 +9707,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200003
 	},
 	[30005]={
 		["effect_type"]=1,
@@ -9743,7 +9726,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200004
 	},
 	[30006]={
 		["effect_type"]=1,
@@ -9761,7 +9745,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200003
 	},
 	[30007]={
 		["effect_type"]=1,
@@ -9779,7 +9764,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200006
 	},
 	[30008]={
 		["effect_type"]=1,
@@ -9797,7 +9783,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200007
 	},
 	[30009]={
 		["effect_type"]=1,
@@ -9815,7 +9802,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200008
 	},
 	[30010]={
 		["effect_type"]=1,
@@ -9833,7 +9821,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200010
 	},
 	[30011]={
 		["effect_type"]=1,
@@ -9851,7 +9840,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200011
 	},
 	[30012]={
 		["effect_type"]=1,
@@ -9869,7 +9859,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200012
 	},
 	[30013]={
 		["effect_type"]=1,
@@ -9883,11 +9874,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200013
 	},
 	[30014]={
 		["effect_type"]=1,
@@ -9901,11 +9893,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200014
 	},
 	[30015]={
 		["effect_type"]=1,
@@ -9919,11 +9912,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200015
 	},
 	[30016]={
 		["effect_type"]=1,
@@ -9941,7 +9935,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200017
 	},
 	[30017]={
 		["effect_type"]=1,
@@ -9959,7 +9954,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200018
 	},
 	[30018]={
 		["effect_type"]=1,
@@ -9977,7 +9973,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200019
 	},
 	[30019]={
 		["effect_type"]=1,
@@ -9995,7 +9992,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200010
 	},
 	[30020]={
 		["effect_type"]=1,
@@ -10013,7 +10011,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200011
 	},
 	[30021]={
 		["effect_type"]=1,
@@ -10031,7 +10030,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200012
 	},
 	[30022]={
 		["effect_type"]=1,
@@ -10049,7 +10049,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200021
 	},
 	[30023]={
 		["effect_type"]=1,
@@ -10067,7 +10068,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200022
 	},
 	[30024]={
 		["effect_type"]=1,
@@ -10085,7 +10087,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200023
 	},
 	[30025]={
 		["effect_type"]=1,
@@ -10103,7 +10106,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200025
 	},
 	[30026]={
 		["effect_type"]=1,
@@ -10121,7 +10125,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200026
 	},
 	[30027]={
 		["effect_type"]=1,
@@ -10139,7 +10144,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200027
 	},
 	[30028]={
 		["effect_type"]=1,
@@ -10157,7 +10163,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200029
 	},
 	[30029]={
 		["effect_type"]=1,
@@ -10175,7 +10182,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200029
 	},
 	[30030]={
 		["effect_type"]=1,
@@ -10193,7 +10201,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200030
 	},
 	[30031]={
 		["effect_type"]=1,
@@ -10211,7 +10220,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200031
 	},
 	[30032]={
 		["effect_type"]=1,
@@ -10229,7 +10239,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200032
 	},
 	[30033]={
 		["effect_type"]=1,
@@ -10247,7 +10258,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200033
 	},
 	[30034]={
 		["effect_type"]=1,
@@ -10265,7 +10277,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200034
 	},
 	[30035]={
 		["effect_type"]=1,
@@ -10283,7 +10296,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200035
 	},
 	[30036]={
 		["effect_type"]=1,
@@ -10301,7 +10315,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200036
 	},
 	[30037]={
 		["effect_type"]=1,
@@ -10319,7 +10334,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200038
 	},
 	[30038]={
 		["effect_type"]=1,
@@ -10337,7 +10353,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200039
 	},
 	[30039]={
 		["effect_type"]=1,
@@ -10355,7 +10372,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200040
 	},
 	[30040]={
 		["effect_type"]=1,
@@ -10373,7 +10391,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200042
 	},
 	[30041]={
 		["effect_type"]=1,
@@ -10391,7 +10410,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200043
 	},
 	[30042]={
 		["effect_type"]=1,
@@ -10409,7 +10429,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200044
 	},
 	[30043]={
 		["effect_type"]=1,
@@ -10427,7 +10448,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200046
 	},
 	[30044]={
 		["effect_type"]=1,
@@ -10445,7 +10467,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200047
 	},
 	[30045]={
 		["effect_type"]=1,
@@ -10463,7 +10486,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200048
 	},
 	[30046]={
 		["effect_type"]=1,
@@ -10481,7 +10505,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200050
 	},
 	[30047]={
 		["effect_type"]=1,
@@ -10499,7 +10524,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200051
 	},
 	[30048]={
 		["effect_type"]=1,
@@ -10517,7 +10543,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200052
 	},
 	[30049]={
 		["effect_type"]=1,
@@ -10535,7 +10562,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200054
 	},
 	[30050]={
 		["effect_type"]=1,
@@ -10553,7 +10581,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200055
 	},
 	[30051]={
 		["effect_type"]=1,
@@ -10571,7 +10600,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200056
 	},
 	[30052]={
 		["effect_type"]=1,
@@ -10589,7 +10619,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200058
 	},
 	[30053]={
 		["effect_type"]=1,
@@ -10607,7 +10638,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200059
 	},
 	[30054]={
 		["effect_type"]=1,
@@ -10625,7 +10657,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200060
 	},
 	[30055]={
 		["effect_type"]=1,
@@ -10643,7 +10676,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200062
 	},
 	[30056]={
 		["effect_type"]=1,
@@ -10661,7 +10695,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200063
 	},
 	[30057]={
 		["effect_type"]=1,
@@ -10679,7 +10714,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200064
 	},
 	[30058]={
 		["effect_type"]=1,
@@ -10697,7 +10733,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200066
 	},
 	[30059]={
 		["effect_type"]=1,
@@ -10715,7 +10752,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200067
 	},
 	[30060]={
 		["effect_type"]=1,
@@ -10733,7 +10771,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200068
 	},
 	[30061]={
 		["effect_type"]=1,
@@ -10751,7 +10790,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200070
 	},
 	[30062]={
 		["effect_type"]=1,
@@ -10769,7 +10809,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200071
 	},
 	[30063]={
 		["effect_type"]=1,
@@ -10787,7 +10828,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200072
 	},
 	[30064]={
 		["effect_type"]=1,
@@ -10801,11 +10843,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200074
 	},
 	[30065]={
 		["effect_type"]=1,
@@ -10819,11 +10862,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200075
 	},
 	[30066]={
 		["effect_type"]=1,
@@ -10837,11 +10881,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200074
 	},
 	[30067]={
 		["effect_type"]=1,
@@ -10855,11 +10900,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200077
 	},
 	[30068]={
 		["effect_type"]=1,
@@ -10873,11 +10919,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200078
 	},
 	[30069]={
 		["effect_type"]=1,
@@ -10891,11 +10938,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200079
 	},
 	[30070]={
 		["effect_type"]=1,
@@ -10913,7 +10961,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200081
 	},
 	[30071]={
 		["effect_type"]=1,
@@ -10931,7 +10980,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200082
 	},
 	[30072]={
 		["effect_type"]=1,
@@ -10949,7 +10999,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200083
 	},
 	[30073]={
 		["effect_type"]=1,
@@ -10963,11 +11014,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200086
 	},
 	[30074]={
 		["effect_type"]=1,
@@ -10981,11 +11033,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200086
 	},
 	[30075]={
 		["effect_type"]=1,
@@ -10999,11 +11052,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200087
 	},
 	[30076]={
 		["effect_type"]=1,
@@ -11017,11 +11071,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200089
 	},
 	[30077]={
 		["effect_type"]=1,
@@ -11035,11 +11090,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200090
 	},
 	[30078]={
 		["effect_type"]=1,
@@ -11053,11 +11109,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200091
 	},
 	[30079]={
 		["effect_type"]=1,
@@ -11075,7 +11132,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200093
 	},
 	[30080]={
 		["effect_type"]=1,
@@ -11093,7 +11151,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200094
 	},
 	[30081]={
 		["effect_type"]=1,
@@ -11111,7 +11170,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200095
 	},
 	[30082]={
 		["effect_type"]=1,
@@ -11129,7 +11189,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200096
 	},
 	[30083]={
 		["effect_type"]=1,
@@ -11147,7 +11208,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200097
 	},
 	[30084]={
 		["effect_type"]=1,
@@ -11165,7 +11227,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200098
 	},
 	[30085]={
 		["effect_type"]=1,
@@ -11183,7 +11246,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200100
 	},
 	[30086]={
 		["effect_type"]=1,
@@ -11201,7 +11265,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200101
 	},
 	[30087]={
 		["effect_type"]=1,
@@ -11219,7 +11284,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200102
 	},
 	[30088]={
 		["effect_type"]=1,
@@ -11237,7 +11303,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200104
 	},
 	[30089]={
 		["effect_type"]=1,
@@ -11255,7 +11322,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200105
 	},
 	[30090]={
 		["effect_type"]=1,
@@ -11273,7 +11341,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200106
 	},
 	[30091]={
 		["effect_type"]=1,
@@ -11291,7 +11360,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200109
 	},
 	[30092]={
 		["effect_type"]=1,
@@ -11309,7 +11379,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200110
 	},
 	[30093]={
 		["effect_type"]=1,
@@ -11327,7 +11398,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200111
 	},
 	[30094]={
 		["effect_type"]=1,
@@ -11345,7 +11417,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200114
 	},
 	[30095]={
 		["effect_type"]=1,
@@ -11363,7 +11436,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200115
 	},
 	[30096]={
 		["effect_type"]=1,
@@ -11381,7 +11455,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200116
 	},
 	[40001]={
 		["effect_type"]=1,
@@ -11400,7 +11475,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200111,
 		["name_act"]="attack01",
-		["fx_target"]=300009
+		["fx_self"]=400040
 	},
 	[40002]={
 		["effect_type"]=1,
@@ -11419,7 +11494,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200112,
 		["name_act"]="attack02",
-		["fx_target"]=300010
+		["fx_self"]=400041
 	},
 	[40003]={
 		["effect_type"]=1,
@@ -11438,7 +11513,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200113,
 		["name_act"]="attack03",
-		["fx_target"]=300011
+		["fx_self"]=400042
 	},
 	[40004]={
 		["effect_type"]=1,
@@ -11457,7 +11532,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=4200114,
 		["name_act"]="attack04",
-		["fx_target"]=300012
+		["fx_self"]=400043
 	},
 	[40005]={
 		["effect_type"]=1,
@@ -11471,14 +11546,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200111,
 		["name_act"]="attack01",
-		["fx_self"]=300004,
-		["fx_target"]=4,
-		["fx_target_delay"]=366
+		["fx_self"]=400000
 	},
 	[40006]={
 		["effect_type"]=1,
@@ -11492,14 +11565,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200112,
 		["name_act"]="attack02",
-		["fx_self"]=300005,
-		["fx_target"]=4,
-		["fx_target_delay"]=400
+		["fx_self"]=400001
 	},
 	[40007]={
 		["effect_type"]=1,
@@ -11513,14 +11584,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200113,
 		["name_act"]="attack03",
-		["fx_self"]=300006,
-		["fx_target"]=4,
-		["fx_target_delay"]=333
+		["fx_self"]=400002
 	},
 	[40008]={
 		["effect_type"]=1,
@@ -11534,14 +11603,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200114,
 		["name_act"]="attack04",
-		["fx_self"]=300007,
-		["fx_target"]=4,
-		["fx_target_delay"]=433
+		["fx_self"]=400003
 	},
 	[40009]={
 		["effect_type"]=1,
@@ -11555,14 +11622,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200111,
 		["name_act"]="attack01",
-		["fx_self"]=300017,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=400005
 	},
 	[40010]={
 		["effect_type"]=1,
@@ -11576,14 +11641,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200112,
 		["name_act"]="attack02",
-		["fx_self"]=300018,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=400006
 	},
 	[40011]={
 		["effect_type"]=1,
@@ -11597,14 +11660,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200113,
 		["name_act"]="attack03",
-		["fx_self"]=300019,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=400007
 	},
 	[40012]={
 		["effect_type"]=1,
@@ -11618,14 +11679,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200114,
 		["name_act"]="attack04",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=400008
 	},
 	[40013]={
 		["effect_type"]=1,
@@ -11639,14 +11698,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200111,
 		["name_act"]="attack01",
-		["fx_self"]=300004,
-		["fx_target"]=4,
-		["fx_target_delay"]=366
+		["fx_self"]=400010
 	},
 	[40014]={
 		["effect_type"]=1,
@@ -11660,14 +11717,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200112,
 		["name_act"]="attack02",
-		["fx_self"]=300005,
-		["fx_target"]=4,
-		["fx_target_delay"]=400
+		["fx_self"]=400011
 	},
 	[40015]={
 		["effect_type"]=1,
@@ -11681,14 +11736,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200113,
 		["name_act"]="attack03",
-		["fx_self"]=300006,
-		["fx_target"]=4,
-		["fx_target_delay"]=333
+		["fx_self"]=400012
 	},
 	[40016]={
 		["effect_type"]=1,
@@ -11702,14 +11755,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=2200114,
 		["name_act"]="attack04",
-		["fx_self"]=300007,
-		["fx_target"]=4,
-		["fx_target_delay"]=433
+		["fx_self"]=400013
 	},
 	[40017]={
 		["effect_type"]=1,
@@ -11728,7 +11779,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300111,
 		["name_act"]="attack01",
-		["fx_target"]=300021
+		["fx_target"]=400015
 	},
 	[40018]={
 		["effect_type"]=1,
@@ -11747,7 +11798,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300112,
 		["name_act"]="attack02",
-		["fx_target"]=300022
+		["fx_target"]=400016
 	},
 	[40019]={
 		["effect_type"]=1,
@@ -11766,7 +11817,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300113,
 		["name_act"]="attack03",
-		["fx_target"]=300023
+		["fx_target"]=400017
 	},
 	[40020]={
 		["effect_type"]=1,
@@ -11785,7 +11836,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=3300114,
 		["name_act"]="attack04",
-		["fx_target"]=300024
+		["fx_target"]=400018
 	},
 	[40021]={
 		["effect_type"]=1,
@@ -11799,14 +11850,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200111,
 		["name_act"]="attack01",
-		["fx_self"]=300017,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=400020
 	},
 	[40022]={
 		["effect_type"]=1,
@@ -11820,14 +11869,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200112,
 		["name_act"]="attack02",
-		["fx_self"]=300018,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=400021
 	},
 	[40023]={
 		["effect_type"]=1,
@@ -11841,14 +11888,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200113,
 		["name_act"]="attack03",
-		["fx_self"]=300019,
-		["fx_target"]=2,
-		["fx_target_delay"]=300
+		["fx_self"]=400022
 	},
 	[40024]={
 		["effect_type"]=1,
@@ -11862,14 +11907,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=1200114,
 		["name_act"]="attack04",
-		["fx_self"]=300020,
-		["fx_target"]=2,
-		["fx_target_delay"]=333
+		["fx_self"]=400023
 	},
 	[40025]={
 		["effect_type"]=1,
@@ -11888,7 +11931,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300013
+		["fx_target"]=400025
 	},
 	[40026]={
 		["effect_type"]=1,
@@ -11907,7 +11950,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300013
+		["fx_target"]=400026
 	},
 	[40027]={
 		["effect_type"]=1,
@@ -11926,7 +11969,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300014
+		["fx_target"]=400027
 	},
 	[40028]={
 		["effect_type"]=1,
@@ -11945,7 +11988,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300015
+		["fx_target"]=400028
 	},
 	[40029]={
 		["effect_type"]=1,
@@ -11959,12 +12002,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300035
+		["fx_self"]=400030
 	},
 	[40030]={
 		["effect_type"]=1,
@@ -11978,12 +12021,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300035
+		["fx_self"]=400031
 	},
 	[40031]={
 		["effect_type"]=1,
@@ -11997,12 +12040,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300036
+		["fx_self"]=400032
 	},
 	[40032]={
 		["effect_type"]=1,
@@ -12016,12 +12059,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300037
+		["fx_self"]=400033
 	},
 	[40033]={
 		["effect_type"]=1,
@@ -12035,12 +12078,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300013
+		["fx_self"]=400035
 	},
 	[40034]={
 		["effect_type"]=1,
@@ -12054,12 +12097,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300013
+		["fx_self"]=400036
 	},
 	[40035]={
 		["effect_type"]=1,
@@ -12073,12 +12116,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300014
+		["fx_self"]=400037
 	},
 	[40036]={
 		["effect_type"]=1,
@@ -12092,12 +12135,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300015
+		["fx_self"]=400038
 	},
 	[110001]={
 		["skill_type"]=5,
@@ -12177,6 +12220,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=572
+data=skill,count=576
 }
 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 8cbc25ca..f8bba564 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -1914,18 +1914,11 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=2,
-		["skill_position"]=3,
-		["boardrange"]={
-			{
-				["type"]=1,
-				["range"]=2
-			},
-			{
-				["type"]=2,
-				["range"]=2
-			}
+		["type"]=1,
+		["parameter"]={
+			3300125
 		},
+		["skill_position"]=3,
 		["icon"]="82"
 	},
 	[3300104]={
@@ -2974,18 +2967,11 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=2,
-		["skill_position"]=5,
-		["boardrange"]={
-			{
-				["type"]=3,
-				["range"]=2
-			},
-			{
-				["type"]=4,
-				["range"]=2
-			}
+		["type"]=1,
+		["parameter"]={
+			5300225
 		},
+		["skill_position"]=5,
 		["icon"]="129"
 	},
 	[5300202]={
diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua
index a5e18c10..bdba8fe8 100644
--- a/lua/app/module/battle/controller/battle_controller.lua
+++ b/lua/app/module/battle/controller/battle_controller.lua
@@ -3,6 +3,7 @@ local BattleScheduler = require "app/module/battle/helper/battle_scheduler"
 local BattleTeam = require "app/module/battle/team/battle_team"
 local BattlePassive = require "app/module/battle/helper/battle_passive"
 local BattlePool = require "app/module/battle/helper/battle_pool"
+local BattleBuffEntity = require "app/userdata/battle/skill/battle_buff_entity"
 
 local BattleController = class("BattleController")
 
@@ -43,22 +44,40 @@ function BattleController:getBuffs()
 end
 
 function BattleController:handleBuffs(side)
-    for _, buffEntity in ipairs(self:getBuffs()) do
+    for _, buffInfo in ipairs(self:getBuffs()) do
+        local buffEntity = buffInfo.buffEntity
         local buffTargetSide = buffEntity:getTargetSide()
         local target
-        if buffTargetSide == BattleConst.SIDE_ATK then
-            target = self.atkTeam:getMainUnit()
-        else
+        if buffTargetSide == BattleConst.SIDE_DEF then
             target = self.defTeam:getMainUnit()
+        elseif buffTargetSide == BattleConst.SIDE_ATK then
+            target = self.atkTeam:getMainUnit()
+        elseif buffTargetSide == BattleConst.SIDE_ATK_ALL then
+            if not side or side == buffTargetSide then
+                for matchtype, comp in pairs(self.atkTeam:getUnitComp()) do
+                    local buffEntity = BattleBuffEntity:create()
+                    buffEntity:init(buffInfo.effect, comp.unitEntity)
+                    buffEntity:setTargetSide(buffTargetSide)
+                    comp:takeEffect(buffEntity, comp)
+                end
+            end
+        else
+            local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[buffTargetSide]
+            if matchType then
+                target = self.atkTeam:getUnitComp()[matchType]
+            end
         end
-        if side then
-            if buffTargetSide == side then
+
+        if target then
+            if side then
+                if buffTargetSide == side then
+                    buffEntity:setOwner(target)
+                    target:takeEffect(buffEntity, target)
+                end
+            else
                 buffEntity:setOwner(target)
                 target:takeEffect(buffEntity, target)
             end
-        else
-            buffEntity:setOwner(target)
-            target:takeEffect(buffEntity, target)
         end
     end
 end
diff --git a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua
index 53b1bb4a..0924632f 100644
--- a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua
+++ b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua
@@ -36,7 +36,7 @@ function BattleControllerDailyChallenge:getBuffs()
                 buffEntity:setTargetSide(cfg[buffId].obj)
                 buffEntity:setIsCantRemove(true)
 
-                table.insert(self.initBuffs, buffEntity)
+                table.insert(self.initBuffs, {buffEntity = buffEntity, effect = effect[1]})
             end
         end
     end
diff --git a/lua/app/module/battle/skill/battle_grid_effect_handle.lua b/lua/app/module/battle/skill/battle_grid_effect_handle.lua
index 7495b3e0..e148bbc6 100644
--- a/lua/app/module/battle/skill/battle_grid_effect_handle.lua
+++ b/lua/app/module/battle/skill/battle_grid_effect_handle.lua
@@ -30,7 +30,7 @@ local function _crossSpread(entity, gridEntities, battleController, onlyCheck)
     for _, posId in ipairs(tempList) do
         local gridEntity = gridEntities[posId]
         if gridEntity:isEmptyIdle() then
-            battleController.battleData:setGridType(posId, BattleConst.GRID_TYPE.JELLY)
+            battleController.battleData:setGridType(posId, entity:getGridType() or BattleConst.GRID_TYPE.JELLY)
             succ = true
             break
         end