diff --git a/lua/app/config/act_chapter_store.lua b/lua/app/config/act_chapter_store.lua
index 1a74b351..05f2fbd7 100644
--- a/lua/app/config/act_chapter_store.lua
+++ b/lua/app/config/act_chapter_store.lua
@@ -309,7 +309,7 @@ local act_chapter_store = {
 		},
 		["original"]=14,
 		["recharge_id"]=10,
-		["value"]=1000
+		["value"]=10
 	},
 	[903]={
 		["chapter"]=9,
@@ -349,7 +349,7 @@ local act_chapter_store = {
 		},
 		["original"]=14,
 		["recharge_id"]=10,
-		["value"]=1000
+		["value"]=10
 	},
 	[1003]={
 		["chapter"]=10,
@@ -389,7 +389,7 @@ local act_chapter_store = {
 		},
 		["original"]=15,
 		["recharge_id"]=12,
-		["value"]=1000
+		["value"]=10
 	},
 	[1103]={
 		["chapter"]=11,
@@ -429,7 +429,7 @@ local act_chapter_store = {
 		},
 		["original"]=15,
 		["recharge_id"]=12,
-		["value"]=1000
+		["value"]=10
 	},
 	[1203]={
 		["chapter"]=12,
@@ -469,7 +469,7 @@ local act_chapter_store = {
 		},
 		["original"]=15,
 		["recharge_id"]=12,
-		["value"]=1000
+		["value"]=10
 	},
 	[1303]={
 		["chapter"]=13,
@@ -509,7 +509,7 @@ local act_chapter_store = {
 		},
 		["original"]=16,
 		["recharge_id"]=13,
-		["value"]=1000
+		["value"]=10
 	},
 	[1403]={
 		["chapter"]=14,
@@ -549,7 +549,7 @@ local act_chapter_store = {
 		},
 		["original"]=16,
 		["recharge_id"]=13,
-		["value"]=1000
+		["value"]=10
 	},
 	[1503]={
 		["chapter"]=15,
@@ -589,7 +589,7 @@ local act_chapter_store = {
 		},
 		["original"]=16,
 		["recharge_id"]=13,
-		["value"]=1000
+		["value"]=10
 	},
 	[1603]={
 		["chapter"]=16,
@@ -629,7 +629,7 @@ local act_chapter_store = {
 		},
 		["original"]=16,
 		["recharge_id"]=13,
-		["value"]=1000
+		["value"]=10
 	},
 	[1703]={
 		["chapter"]=17,
@@ -669,7 +669,7 @@ local act_chapter_store = {
 		},
 		["original"]=17,
 		["recharge_id"]=14,
-		["value"]=1000
+		["value"]=10
 	},
 	[1803]={
 		["chapter"]=18,
@@ -709,7 +709,7 @@ local act_chapter_store = {
 		},
 		["original"]=17,
 		["recharge_id"]=14,
-		["value"]=1000
+		["value"]=10
 	},
 	[1903]={
 		["chapter"]=19,
@@ -749,7 +749,7 @@ local act_chapter_store = {
 		},
 		["original"]=17,
 		["recharge_id"]=14,
-		["value"]=1000
+		["value"]=10
 	},
 	[2003]={
 		["chapter"]=20,
@@ -789,7 +789,7 @@ local act_chapter_store = {
 		},
 		["original"]=17,
 		["recharge_id"]=14,
-		["value"]=1000
+		["value"]=10
 	},
 	[2103]={
 		["chapter"]=21,
@@ -829,7 +829,7 @@ local act_chapter_store = {
 		},
 		["original"]=18,
 		["recharge_id"]=15,
-		["value"]=1000
+		["value"]=10
 	},
 	[2203]={
 		["chapter"]=22,
@@ -869,7 +869,7 @@ local act_chapter_store = {
 		},
 		["original"]=18,
 		["recharge_id"]=15,
-		["value"]=1000
+		["value"]=10
 	},
 	[2303]={
 		["chapter"]=23,
@@ -909,7 +909,7 @@ local act_chapter_store = {
 		},
 		["original"]=18,
 		["recharge_id"]=15,
-		["value"]=1000
+		["value"]=10
 	},
 	[2403]={
 		["chapter"]=24,
@@ -949,7 +949,7 @@ local act_chapter_store = {
 		},
 		["original"]=18,
 		["recharge_id"]=15,
-		["value"]=1000
+		["value"]=10
 	},
 	[2503]={
 		["chapter"]=25,
@@ -989,7 +989,7 @@ local act_chapter_store = {
 		},
 		["original"]=18,
 		["recharge_id"]=15,
-		["value"]=1000
+		["value"]=10
 	},
 	[2603]={
 		["chapter"]=26,
@@ -1029,7 +1029,7 @@ local act_chapter_store = {
 		},
 		["original"]=19,
 		["recharge_id"]=16,
-		["value"]=1000
+		["value"]=10
 	},
 	[2703]={
 		["chapter"]=27,
@@ -1069,7 +1069,7 @@ local act_chapter_store = {
 		},
 		["original"]=19,
 		["recharge_id"]=16,
-		["value"]=1000
+		["value"]=10
 	},
 	[2803]={
 		["chapter"]=28,
@@ -1109,7 +1109,7 @@ local act_chapter_store = {
 		},
 		["original"]=19,
 		["recharge_id"]=16,
-		["value"]=1000
+		["value"]=10
 	},
 	[2903]={
 		["chapter"]=29,
@@ -1149,7 +1149,7 @@ local act_chapter_store = {
 		},
 		["original"]=19,
 		["recharge_id"]=16,
-		["value"]=1000
+		["value"]=10
 	},
 	[3003]={
 		["chapter"]=30,
@@ -1189,7 +1189,7 @@ local act_chapter_store = {
 		},
 		["original"]=19,
 		["recharge_id"]=16,
-		["value"]=1000
+		["value"]=10
 	}
 }
 local config = {
diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua
index 2170e501..19e801dd 100644
--- a/lua/app/config/act_gift.lua
+++ b/lua/app/config/act_gift.lua
@@ -1,13 +1,13 @@
 local act_gift = {
 	[70102]={
 		["type"]=7,
-		["recharge_id"]=11,
+		["recharge_id"]=13,
 		["time_type"]=3,
 		["value"]=3000
 	},
 	[70202]={
 		["type"]=7,
-		["recharge_id"]=12,
+		["recharge_id"]=14,
 		["time_type"]=3,
 		["value"]=2000
 	},
diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua
index 676fc7ac..2567b60b 100644
--- a/lua/app/config/chapter_board.lua
+++ b/lua/app/config/chapter_board.lua
@@ -3650,7 +3650,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				0
+				3
 			},
 			{
 				0,
@@ -3848,7 +3848,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				0
+				3
 			},
 			{
 				0,
@@ -7442,7 +7442,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				0
+				4
 			},
 			{
 				0,
@@ -7640,7 +7640,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				0
+				4
 			},
 			{
 				0,
@@ -33114,21 +33114,13 @@ local chapter_board = {
 	},
 	[114]={
 		["board"]={
-			{
-				34,
-				3
-			},
 			{
 				0,
 				1
 			},
 			{
 				0,
-				4
-			},
-			{
-				0,
-				4
+				2
 			},
 			{
 				0,
@@ -33139,7 +33131,15 @@ local chapter_board = {
 				3
 			},
 			{
-				34,
+				0,
+				4
+			},
+			{
+				0,
+				3
+			},
+			{
+				0,
 				4
 			},
 			{
@@ -33147,12 +33147,16 @@ local chapter_board = {
 				0
 			},
 			{
-				34,
+				0,
 				1
 			},
 			{
 				0,
-				3
+				2
+			},
+			{
+				0,
+				2
 			},
 			{
 				0,
@@ -33160,11 +33164,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				5
-			},
-			{
-				34,
-				3
+				4
 			},
 			{
 				32,
@@ -33180,15 +33180,15 @@ local chapter_board = {
 			},
 			{
 				34,
-				5
+				1
+			},
+			{
+				32,
+				0
 			},
 			{
 				34,
-				5
-			},
-			{
-				34,
-				5
+				4
 			},
 			{
 				32,
@@ -33203,7 +33203,15 @@ local chapter_board = {
 				0
 			},
 			{
-				0,
+				32,
+				0
+			},
+			{
+				32,
+				0
+			},
+			{
+				32,
 				0
 			},
 			{
@@ -33222,57 +33230,17 @@ local chapter_board = {
 				0,
 				0
 			},
-			{
-				32,
-				0
-			},
-			{
-				0,
-				0
-			},
 			{
 				0,
 				0
 			},
 			{
 				34,
-				4
+				1
 			},
 			{
 				34,
-				4
-			},
-			{
-				34,
-				4
-			},
-			{
-				0,
-				0
-			},
-			{
-				0,
-				0
-			},
-			{
-				0,
-				0
-			},
-			{
-				34,
-				4
-			},
-			{
-				0,
-				5
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				4
+				2
 			},
 			{
 				34,
@@ -33283,13 +33251,45 @@ local chapter_board = {
 				0
 			},
 			{
-				34,
-				5
+				0,
+				0
 			},
 			{
 				0,
+				0
+			},
+			{
+				34,
+				2
+			},
+			{
+				0,
+				5
+			},
+			{
+				1,
+				0
+			},
+			{
+				0,
+				1
+			},
+			{
+				34,
+				4
+			},
+			{
+				0,
+				0
+			},
+			{
+				34,
 				3
 			},
+			{
+				0,
+				4
+			},
 			{
 				1,
 				0
@@ -33304,7 +33304,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				5
+				2
 			},
 			{
 				34,
@@ -33312,21 +33312,13 @@ local chapter_board = {
 			}
 		},
 		["mystery_box_board"]={
-			{
-				34,
-				3
-			},
 			{
 				0,
 				1
 			},
 			{
 				0,
-				4
-			},
-			{
-				0,
-				4
+				2
 			},
 			{
 				0,
@@ -33337,7 +33329,15 @@ local chapter_board = {
 				3
 			},
 			{
-				34,
+				0,
+				4
+			},
+			{
+				0,
+				3
+			},
+			{
+				0,
 				4
 			},
 			{
@@ -33345,12 +33345,16 @@ local chapter_board = {
 				0
 			},
 			{
-				34,
+				0,
 				1
 			},
 			{
 				0,
-				3
+				2
+			},
+			{
+				0,
+				2
 			},
 			{
 				0,
@@ -33358,11 +33362,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				5
-			},
-			{
-				34,
-				3
+				4
 			},
 			{
 				32,
@@ -33378,15 +33378,15 @@ local chapter_board = {
 			},
 			{
 				34,
-				5
+				1
+			},
+			{
+				32,
+				0
 			},
 			{
 				34,
-				5
-			},
-			{
-				34,
-				5
+				4
 			},
 			{
 				32,
@@ -33401,7 +33401,7 @@ local chapter_board = {
 				0
 			},
 			{
-				0,
+				32,
 				0
 			},
 			{
@@ -33417,7 +33417,7 @@ local chapter_board = {
 				0
 			},
 			{
-				0,
+				32,
 				0
 			},
 			{
@@ -33434,43 +33434,11 @@ local chapter_board = {
 			},
 			{
 				34,
-				4
+				1
 			},
 			{
 				34,
-				4
-			},
-			{
-				34,
-				4
-			},
-			{
-				0,
-				0
-			},
-			{
-				0,
-				0
-			},
-			{
-				0,
-				0
-			},
-			{
-				34,
-				4
-			},
-			{
-				0,
-				5
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				4
+				2
 			},
 			{
 				34,
@@ -33481,13 +33449,45 @@ local chapter_board = {
 				0
 			},
 			{
-				34,
-				5
+				0,
+				0
 			},
 			{
 				0,
+				0
+			},
+			{
+				34,
+				2
+			},
+			{
+				0,
+				5
+			},
+			{
+				1,
+				0
+			},
+			{
+				0,
+				1
+			},
+			{
+				34,
+				4
+			},
+			{
+				0,
+				0
+			},
+			{
+				34,
 				3
 			},
+			{
+				0,
+				4
+			},
 			{
 				1,
 				0
@@ -33502,7 +33502,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				5
+				2
 			},
 			{
 				34,
diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua
index 905bbbb4..1521af1a 100644
--- a/lua/app/config/fx.lua
+++ b/lua/app/config/fx.lua
@@ -1426,6 +1426,14 @@ local fx = {
 		["res"]="sfx_p0016_b05",
 		["bind"]="root"
 	},
+	[300093]={
+		["res"]="sfx_p0008_b02",
+		["bind"]="root"
+	},
+	[300094]={
+		["res"]="sfx_p0008_b03",
+		["bind"]="root"
+	},
 	[400000]={
 		["res"]="sfx_p0012_b01",
 		["bind"]="root",
@@ -1653,6 +1661,6 @@ local fx = {
 	}
 }
 local config = {
-data=fx,count=399
+data=fx,count=401
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/grid_type.lua b/lua/app/config/grid_type.lua
index f628b27e..9dbacbdf 100644
--- a/lua/app/config/grid_type.lua
+++ b/lua/app/config/grid_type.lua
@@ -170,7 +170,7 @@ local grid_type = {
 		["element_invalid"]=1,
 		["break_sfx"]="sfx_piece_guodong_b01",
 		["effect"]=5,
-		["effect_sfx"]="sfx_piece_shuipao_b02",
+		["effect_sfx"]="sfx_piece_guodong_b02",
 		["effect_trigger"]=1
 	},
 	[14]={
@@ -308,7 +308,7 @@ local grid_type = {
 		["element_invalid"]=1,
 		["break_sfx"]="sfx_piece_yuni_b01",
 		["effect"]=5,
-		["effect_sfx"]="sfx_piece_shuipao_b02",
+		["effect_sfx"]="sfx_piece_yuni_b02",
 		["effect_trigger"]=1
 	},
 	[23]={
@@ -325,7 +325,7 @@ local grid_type = {
 		["element_invalid"]=1,
 		["break_sfx"]="sfx_piece_duwu_b01",
 		["effect"]=5,
-		["effect_sfx"]="sfx_piece_shuipao_b02",
+		["effect_sfx"]="sfx_piece_duwu_b02",
 		["effect_trigger"]=1
 	},
 	[24]={
@@ -460,7 +460,7 @@ local grid_type = {
 		["element_invalid"]=1,
 		["break_sfx"]="sfx_piece_rongyan_b01",
 		["effect"]=5,
-		["effect_sfx"]="sfx_piece_shuipao_b02",
+		["effect_sfx"]="sfx_piece_rongyan_b02",
 		["effect_trigger"]=1
 	},
 	[35]={
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index 1526614f..09674cf6 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -1967,7 +1967,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=33400,
+				["num"]=8000000,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -2076,7 +2076,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=63400,
+				["num"]=11000000,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -2117,7 +2117,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=63400,
+				["num"]=11000000,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -3614,7 +3614,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -3636,7 +3636,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -3658,7 +3658,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -3680,7 +3680,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -3733,7 +3733,7 @@ local skill = {
 			2,
 			4
 		},
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]={
@@ -3857,7 +3857,7 @@ local skill = {
 			1000001
 		},
 		["name_act"]="attack01",
-		["fx_target"]=300033
+		["fx_self"]=300033
 	},
 	[4400111]={
 		["position"]=4,
@@ -3879,7 +3879,7 @@ local skill = {
 			1000002
 		},
 		["name_act"]="attack02",
-		["fx_target"]=300033
+		["fx_self"]=300033
 	},
 	[4400112]={
 		["position"]=4,
@@ -3901,7 +3901,7 @@ local skill = {
 			1000003
 		},
 		["name_act"]="attack03",
-		["fx_target"]=300033
+		["fx_self"]=300093
 	},
 	[4400113]={
 		["position"]=4,
@@ -3923,7 +3923,7 @@ local skill = {
 			1000004
 		},
 		["name_act"]="attack04",
-		["fx_target"]=300033
+		["fx_self"]=300094
 	},
 	[4400120]={
 		["energy"]=10,
@@ -3962,7 +3962,7 @@ local skill = {
 			4300120
 		},
 		["name_act"]="skill01",
-		["fx_target"]=300034,
+		["fx_self"]=300034,
 		["bullet_time"]={
 			633,
 			3000,
@@ -7824,7 +7824,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -7845,7 +7845,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -7866,14 +7866,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
 			1000003
 		},
 		["name_act"]="attack03",
-		["fx_self"]=100021
+		["fx_self"]=100020
 	},
 	[20034]={
 		["effect_type"]=1,
@@ -7887,7 +7887,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -7908,7 +7908,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -7929,14 +7929,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
 			1000003
 		},
 		["name_act"]="attack03",
-		["fx_self"]=100023
+		["fx_self"]=100022
 	},
 	[20037]={
 		["effect_type"]=1,
@@ -7950,7 +7950,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -7971,7 +7971,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -7992,14 +7992,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
 			1000003
 		},
 		["name_act"]="attack03",
-		["fx_self"]=100025
+		["fx_self"]=100024
 	},
 	[20040]={
 		["effect_type"]=1,
@@ -8013,7 +8013,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8034,7 +8034,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8055,14 +8055,14 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
 			1000003
 		},
 		["name_act"]="attack03",
-		["fx_self"]=100027
+		["fx_self"]=100026
 	},
 	[20043]={
 		["effect_type"]=1,
@@ -8076,7 +8076,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8097,7 +8097,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8118,7 +8118,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8139,7 +8139,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8160,7 +8160,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8181,7 +8181,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8202,7 +8202,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8223,7 +8223,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8244,7 +8244,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8265,7 +8265,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8286,7 +8286,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -8307,7 +8307,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -10659,7 +10659,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -10680,7 +10680,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -10701,7 +10701,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -10722,7 +10722,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -10743,7 +10743,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
@@ -10764,7 +10764,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]={
diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua
index f8bba564..d3543112 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -827,7 +827,7 @@ local skill_rogue = {
 	[1300101]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=12,
 		["skill_position"]=1,
 		["effect"]={
@@ -1083,7 +1083,7 @@ local skill_rogue = {
 	[1400101]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=12,
 		["skill_position"]=1,
 		["effect"]={
@@ -1100,7 +1100,7 @@ local skill_rogue = {
 	[1400102]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=3,
+		["qlt"]=4,
 		["type"]=12,
 		["skill_position"]=1,
 		["effect"]={
@@ -1360,7 +1360,7 @@ local skill_rogue = {
 	[2300102]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=1,
 		["parameter"]={
 			2300122
@@ -1511,7 +1511,7 @@ local skill_rogue = {
 	[2300203]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=2,
+		["qlt"]=3,
 		["type"]=3,
 		["skill_position"]=2,
 		["effect"]={
@@ -1842,7 +1842,7 @@ local skill_rogue = {
 		["cover_unlock"]=3200105,
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=3,
+		["qlt"]=4,
 		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
@@ -1859,7 +1859,7 @@ local skill_rogue = {
 	[3200107]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=3,
+		["qlt"]=4,
 		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
@@ -1896,7 +1896,7 @@ local skill_rogue = {
 	[3300102]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=2,
+		["qlt"]=3,
 		["type"]=3,
 		["skill_position"]=3,
 		["effect"]={
@@ -1960,7 +1960,7 @@ local skill_rogue = {
 		["cover_unlock"]=3300104,
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=2,
+		["qlt"]=3,
 		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
@@ -2039,7 +2039,7 @@ local skill_rogue = {
 	[3300203]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=7,
 		["parameter"]={
 			1,
@@ -2289,7 +2289,7 @@ local skill_rogue = {
 	[4200104]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=2,
 		["skill_position"]=4,
 		["boardrange"]={
@@ -2392,7 +2392,7 @@ local skill_rogue = {
 	[4300103]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=3,
+		["qlt"]=4,
 		["type"]=8,
 		["parameter"]={
 			2,
@@ -2404,7 +2404,7 @@ local skill_rogue = {
 	[4300104]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=7,
 		["parameter"]={
 			1,
@@ -2489,7 +2489,7 @@ local skill_rogue = {
 	[4300202]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=12,
 		["skill_position"]=4,
 		["effect"]={
@@ -2633,7 +2633,7 @@ local skill_rogue = {
 	[4400103]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=2,
 		["skill_position"]=4,
 		["boardrange"]={
@@ -2749,7 +2749,7 @@ local skill_rogue = {
 	[5200103]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=3,
+		["qlt"]=4,
 		["type"]=8,
 		["parameter"]={
 			1,
@@ -2994,7 +2994,7 @@ local skill_rogue = {
 	[5300203]={
 		["limit_times"]=1,
 		["weight"]=3000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=7,
 		["parameter"]={
 			1,
diff --git a/lua/app/config/summon.lua b/lua/app/config/summon.lua
index d72619d8..f3328c99 100644
--- a/lua/app/config/summon.lua
+++ b/lua/app/config/summon.lua
@@ -33,8 +33,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["box_lv_3"]={
@@ -51,8 +51,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=8,
+ 				["num_for_nothing"]="Xg=="
 			}
 		},
 		["box_lv_4"]={
@@ -69,8 +69,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=12,
+ 				["num_for_nothing"]="Vwo="
 			}
 		},
 		["box_lv_5"]={
@@ -87,29 +87,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
+				["num"]=16,
+ 				["num_for_nothing"]="Vw4="
 			}
 		},
 		["box_lv_6"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		},
-		["box_lv_7"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -123,11 +105,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=12,
- 				["num_for_nothing"]="Vwo="
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
 			}
 		},
-		["box_lv_8"]={
+		["box_lv_7"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -141,11 +123,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=14,
- 				["num_for_nothing"]="Vww="
+				["num"]=24,
+ 				["num_for_nothing"]="VAw="
 			}
 		},
-		["box_lv_9"]={
+		["box_lv_8"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -159,11 +141,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=16,
- 				["num_for_nothing"]="Vw4="
+				["num"]=28,
+ 				["num_for_nothing"]="VAA="
 			}
 		},
-		["box_lv_10"]={
+		["box_lv_9"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -177,8 +159,26 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
  				["id_for_nothing"]="Ug==",
-				["num"]=18,
- 				["num_for_nothing"]="VwA="
+				["num"]=32,
+ 				["num_for_nothing"]="VQo="
+			}
+		},
+		["box_lv_10"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=36,
+ 				["num_for_nothing"]="VQ4="
 			}
 		}
 	},
@@ -214,8 +214,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
 			},
 			{
 				["type"]=1,
@@ -232,8 +232,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
 			}
 		},
 		["box_lv_3"]={
@@ -242,8 +242,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=24,
- 				["num_for_nothing"]="VAw="
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
 			}
 		},
 		["box_lv_4"]={
@@ -252,11 +252,21 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=39,
- 				["num_for_nothing"]="VQE="
+				["num"]=35,
+ 				["num_for_nothing"]="VQ0="
 			}
 		},
 		["box_lv_5"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			}
+		},
+		["box_lv_6"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -270,11 +280,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=54,
- 				["num_for_nothing"]="Uww="
+				["num"]=65,
+ 				["num_for_nothing"]="UA0="
 			}
 		},
-		["box_lv_6"]={
+		["box_lv_7"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -288,11 +298,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=69,
- 				["num_for_nothing"]="UAE="
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
 			}
 		},
-		["box_lv_7"]={
+		["box_lv_8"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -306,11 +316,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=84,
- 				["num_for_nothing"]="Xgw="
+				["num"]=95,
+ 				["num_for_nothing"]="Xw0="
 			}
 		},
-		["box_lv_8"]={
+		["box_lv_9"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -324,11 +334,11 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=99,
- 				["num_for_nothing"]="XwE="
+				["num"]=110,
+ 				["num_for_nothing"]="Vwlc"
 			}
 		},
-		["box_lv_9"]={
+		["box_lv_10"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -342,26 +352,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=114,
- 				["num_for_nothing"]="VwlY"
-			}
-		},
-		["box_lv_10"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=6,
- 				["id_for_nothing"]="UA==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=129,
- 				["num_for_nothing"]="VwpV"
+				["num"]=125,
+ 				["num_for_nothing"]="VwpZ"
 			}
 		}
 	},
@@ -397,8 +389,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
@@ -423,8 +415,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
@@ -441,8 +433,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
 			},
 			{
 				["type"]=1,
@@ -459,8 +451,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
 			},
 			{
 				["type"]=1,
@@ -477,8 +469,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
 			},
 			{
 				["type"]=1,
@@ -495,16 +487,16 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=115,
- 				["num_for_nothing"]="VwlZ"
+				["num"]=155,
+ 				["num_for_nothing"]="Vw1Z"
 			}
 		},
 		["box_lv_7"]={
@@ -513,8 +505,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=12,
- 				["num_for_nothing"]="Vwo="
+				["num"]=7,
+ 				["num_for_nothing"]="UQ=="
 			},
 			{
 				["type"]=1,
@@ -531,8 +523,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=14,
- 				["num_for_nothing"]="Vww="
+				["num"]=9,
+ 				["num_for_nothing"]="Xw=="
 			},
 			{
 				["type"]=1,
@@ -549,8 +541,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=16,
- 				["num_for_nothing"]="Vw4="
+				["num"]=11,
+ 				["num_for_nothing"]="Vwk="
 			},
 			{
 				["type"]=1,
@@ -567,8 +559,8 @@ local summon = {
  				["type_for_nothing"]="Vw==",
 				["id"]=6,
  				["id_for_nothing"]="UA==",
-				["num"]=18,
- 				["num_for_nothing"]="VwA="
+				["num"]=13,
+ 				["num_for_nothing"]="Vws="
 			},
 			{
 				["type"]=1,
diff --git a/lua/app/config/summon_exp.lua b/lua/app/config/summon_exp.lua
index b41b411c..adebe7e1 100644
--- a/lua/app/config/summon_exp.lua
+++ b/lua/app/config/summon_exp.lua
@@ -6,13 +6,13 @@ local summon_exp = {
 		["exp"]=320
 	},
 	[3]={
-		["exp"]=640
+		["exp"]=800
 	},
 	[4]={
-		["exp"]=1400
+		["exp"]=1780
 	},
 	[5]={
-		["exp"]=5080
+		["exp"]=5280
 	},
 	[6]={
 		["exp"]=17800