diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua
index d03ded0a..921aa902 100644
--- a/lua/app/common/event_manager.lua
+++ b/lua/app/common/event_manager.lua
@@ -27,6 +27,8 @@ EventManager.CUSTOM_EVENT = {
 	BOSS_ENTER_ANI_OVER = "BOSS_ENTER_ANI_OVER",
 	TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", 		-- 邮件到时间请求是否有新邮件
 	SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC",
+	GO_SHOP = "GO_SHOP", -- 跳转商店
+	UPDATE_MAIN_MALL_HEIGHT = "UPDATE_MAIN_MALL_HEIGHT", -- 更新主要商品的高度
 	-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
 	-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
 }
diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua
index ff78d38d..436f9b98 100644
--- a/lua/app/common/pay_manager.lua
+++ b/lua/app/common/pay_manager.lua
@@ -103,7 +103,6 @@ function PayManager:getGiftConfigInfo(purchaseType, id)
         return
     end
     local cfg = ConfigManager:getConfig(cfgName)
-    local cfg = ConfigManager:getConfig(cfgName)
     if not cfg or not cfg[id] then
         return
     end
diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua
index 2f349a01..a22225d6 100644
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@@ -167,7 +167,8 @@ local buff = {
 		["name"]="dmg_addition_all_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["icon"]="weakness_all_add"
 	},
 	[25]={
 		["name"]="atkp_color_add",
diff --git a/lua/app/config/buff_daily_challenge.lua b/lua/app/config/buff_daily_challenge.lua
index acb758e7..96fffde6 100644
--- a/lua/app/config/buff_daily_challenge.lua
+++ b/lua/app/config/buff_daily_challenge.lua
@@ -57,7 +57,7 @@ local buff_daily_challenge = {
 		["buff_type"]=1,
 		["effect"]={
 			{
-				["type"]="add_skill_all",
+				["type"]="skill_hurt_add",
 				["num"]=1500,
 				["ratio"]=1000,
 				["round"]=999
@@ -117,9 +117,9 @@ local buff_daily_challenge = {
 		["buff_type"]=2,
 		["effect"]={
 			{
-				["type"]="atkp_color_add",
+				["type"]="dmg_addition_all_add",
 				["num"]=500,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -129,9 +129,9 @@ local buff_daily_challenge = {
 		["buff_type"]=2,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="normal_attack_add",
 				["num"]=1,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua
index 0a9bb764..35153cad 100644
--- a/lua/app/config/chapter.lua
+++ b/lua/app/config/chapter.lua
@@ -252,10 +252,10 @@ local chapter = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=15,
- 				["num_for_nothing"]="Vw0="
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["idle_exp"]=6,
@@ -398,10 +398,10 @@ local chapter = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["id"]=13,
+ 				["id_for_nothing"]="Vws=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["idle_exp"]=6,
diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua
index c9f67b0a..749add15 100644
--- a/lua/app/config/chapter_board.lua
+++ b/lua/app/config/chapter_board.lua
@@ -211,7 +211,11 @@ local chapter_board = {
 			3,
 			3,
 			3,
-			3
+			3,
+			2,
+			2,
+			2,
+			2
 		}
 	},
 	[2]={
@@ -3100,23 +3104,23 @@ local chapter_board = {
 			},
 			{
 				4,
-				0
+				1
 			},
 			{
 				4,
-				0
+				2
 			},
 			{
 				4,
-				0
+				3
 			},
 			{
 				4,
-				0
+				4
 			},
 			{
 				4,
-				0
+				5
 			},
 			{
 				1,
@@ -3298,23 +3302,23 @@ local chapter_board = {
 			},
 			{
 				4,
-				0
+				1
 			},
 			{
 				4,
-				0
+				2
 			},
 			{
 				4,
-				0
+				3
 			},
 			{
 				4,
-				0
+				4
 			},
 			{
 				4,
-				0
+				5
 			},
 			{
 				1,
@@ -13189,7 +13193,7 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -13217,7 +13221,7 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -13233,31 +13237,31 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13265,23 +13269,23 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -13293,7 +13297,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13301,7 +13305,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13309,7 +13313,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13409,7 +13413,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13417,7 +13421,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13425,7 +13429,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13437,7 +13441,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13445,7 +13449,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13453,7 +13457,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13465,7 +13469,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13473,7 +13477,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13481,7 +13485,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13493,7 +13497,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13501,7 +13505,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13509,7 +13513,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13529,7 +13533,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13607,7 +13611,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13615,7 +13619,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13623,7 +13627,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13635,7 +13639,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13643,7 +13647,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13651,7 +13655,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13663,7 +13667,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13671,7 +13675,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13679,7 +13683,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13691,7 +13695,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13699,7 +13703,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13707,7 +13711,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13835,7 +13839,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13851,7 +13855,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -13867,7 +13871,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -13875,7 +13879,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13923,15 +13927,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -13955,7 +13959,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -14033,7 +14037,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14049,7 +14053,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -14065,7 +14069,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -14073,7 +14077,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14121,15 +14125,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14233,7 +14237,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -14241,7 +14245,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14249,7 +14253,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14257,7 +14261,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -14265,7 +14269,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14273,7 +14277,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14281,7 +14285,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -14401,31 +14405,31 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -14599,31 +14603,31 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -14827,7 +14831,7 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14851,7 +14855,7 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -14859,11 +14863,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14875,11 +14879,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14895,7 +14899,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -14907,7 +14911,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14923,7 +14927,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -14935,7 +14939,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -14943,23 +14947,23 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -14979,11 +14983,11 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -15007,11 +15011,11 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -15023,7 +15027,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15035,11 +15039,11 @@ local chapter_board = {
 				3
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -15047,11 +15051,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15063,7 +15067,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -15071,15 +15075,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15099,15 +15103,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15127,11 +15131,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -15155,7 +15159,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -15175,11 +15179,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15195,7 +15199,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -15203,11 +15207,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15223,7 +15227,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -15287,11 +15291,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15315,11 +15319,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15355,11 +15359,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -15373,11 +15377,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15393,7 +15397,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -15401,11 +15405,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15421,7 +15425,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -15485,11 +15489,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15513,11 +15517,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -15553,11 +15557,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -15569,7 +15573,7 @@ local chapter_board = {
 	[55]={
 		["board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -15597,15 +15601,15 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -15621,31 +15625,31 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -15653,27 +15657,27 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -15709,23 +15713,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
@@ -15737,7 +15741,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
@@ -15745,7 +15749,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -15753,7 +15757,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -15913,23 +15917,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -15945,15 +15949,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -15969,11 +15973,11 @@ local chapter_board = {
 	[57]={
 		["board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -15989,19 +15993,19 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16017,19 +16021,19 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16045,11 +16049,11 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16085,23 +16089,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
@@ -16113,23 +16117,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -16145,15 +16149,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
@@ -16167,11 +16171,11 @@ local chapter_board = {
 		},
 		["mystery_box_board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16187,19 +16191,19 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16215,19 +16219,19 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16243,11 +16247,11 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16283,23 +16287,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
@@ -16311,23 +16315,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -16343,7 +16347,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -16351,7 +16355,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
@@ -16399,7 +16403,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16419,23 +16423,23 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16443,19 +16447,19 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -16471,11 +16475,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16483,7 +16487,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -16499,35 +16503,35 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16539,23 +16543,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16597,7 +16601,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16617,23 +16621,23 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16641,19 +16645,19 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -16669,11 +16673,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16681,7 +16685,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -16697,7 +16701,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16705,27 +16709,27 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16737,23 +16741,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16765,7 +16769,7 @@ local chapter_board = {
 	[59]={
 		["board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16789,15 +16793,15 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16813,11 +16817,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16941,15 +16945,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
@@ -16989,7 +16993,7 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -16997,11 +17001,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				5
 			},
 			{
@@ -17017,27 +17021,27 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17097,7 +17101,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -17125,11 +17129,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -17153,11 +17157,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
-				13,
+				22,
 				4
 			}
 		},
@@ -17187,7 +17191,7 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17195,11 +17199,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				5
 			},
 			{
@@ -17215,27 +17219,27 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17295,7 +17299,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -17323,11 +17327,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -17351,7 +17355,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				4
 			},
 			{
@@ -17363,7 +17367,7 @@ local chapter_board = {
 	[61]={
 		["board"]={
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17379,7 +17383,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -17391,11 +17395,11 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17419,35 +17423,35 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
@@ -17455,23 +17459,23 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17483,7 +17487,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17511,7 +17515,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17543,25 +17547,25 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				3
 			}
 		},
 		["mystery_box_board"]={
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17577,7 +17581,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
@@ -17589,11 +17593,11 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17617,35 +17621,35 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
@@ -17653,23 +17657,23 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17681,7 +17685,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17709,7 +17713,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17741,7 +17745,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
@@ -17749,11 +17753,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				13,
+				22,
 				3
 			}
 		}
@@ -17761,19 +17765,19 @@ local chapter_board = {
 	[62]={
 		["board"]={
 			{
-				13,
+				22,
 				5
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17785,19 +17789,19 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				22,
 				3
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17821,15 +17825,15 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17845,15 +17849,15 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17877,15 +17881,15 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17897,19 +17901,19 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -17929,23 +17933,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				22,
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				13,
+				22,
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				13,
+				22,
 				5
 			},
 			{
@@ -17965,7 +17969,7 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17981,11 +17985,11 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -17993,7 +17997,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -18009,7 +18013,7 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -18021,7 +18025,7 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18037,7 +18041,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18049,23 +18053,23 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18077,23 +18081,23 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18105,11 +18109,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -18117,11 +18121,11 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18133,7 +18137,7 @@ local chapter_board = {
 				2
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -18149,7 +18153,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -18189,11 +18193,11 @@ local chapter_board = {
 				5
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -18201,7 +18205,7 @@ local chapter_board = {
 				5
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -18209,39 +18213,39 @@ local chapter_board = {
 				5
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18257,59 +18261,59 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18361,11 +18365,11 @@ local chapter_board = {
 	[65]={
 		["board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18389,19 +18393,19 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18417,19 +18421,19 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18445,15 +18449,15 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18461,7 +18465,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18473,23 +18477,23 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18501,23 +18505,23 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18529,7 +18533,7 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18537,7 +18541,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18545,7 +18549,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18559,11 +18563,11 @@ local chapter_board = {
 		},
 		["mystery_box_board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18587,19 +18591,19 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18615,19 +18619,19 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18647,11 +18651,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18659,7 +18663,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18671,23 +18675,23 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18699,23 +18703,23 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18727,7 +18731,7 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18735,7 +18739,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18743,7 +18747,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18815,15 +18819,15 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -18831,19 +18835,19 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18851,23 +18855,23 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18875,11 +18879,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18887,11 +18891,11 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18903,19 +18907,19 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -18939,11 +18943,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19013,15 +19017,15 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19029,19 +19033,19 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19049,23 +19053,23 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19073,11 +19077,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19085,11 +19089,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19101,19 +19105,19 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19137,11 +19141,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19169,7 +19173,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19177,7 +19181,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19193,23 +19197,23 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19221,23 +19225,23 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19249,19 +19253,19 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19273,27 +19277,27 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19301,23 +19305,23 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19329,11 +19333,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19367,7 +19371,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19375,7 +19379,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19391,23 +19395,23 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19419,23 +19423,23 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19447,19 +19451,19 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19471,27 +19475,27 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
-				2,
+				18,
 				0
 			},
 			{
@@ -19499,23 +19503,23 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19527,11 +19531,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19579,11 +19583,11 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19603,19 +19607,19 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19631,11 +19635,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19643,7 +19647,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19651,7 +19655,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19659,7 +19663,7 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19667,15 +19671,15 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19683,19 +19687,19 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19703,7 +19707,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19711,7 +19715,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19719,7 +19723,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19755,7 +19759,7 @@ local chapter_board = {
 	[69]={
 		["board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19779,15 +19783,15 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19803,43 +19807,43 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -19863,7 +19867,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -19895,7 +19899,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -19903,7 +19907,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -19911,7 +19915,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -19919,7 +19923,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -19953,7 +19957,7 @@ local chapter_board = {
 		},
 		["mystery_box_board"]={
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -19977,15 +19981,15 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -20001,43 +20005,43 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20061,7 +20065,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20093,7 +20097,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20101,7 +20105,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20109,7 +20113,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20117,7 +20121,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20185,12 +20189,12 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
 				4,
-				0
+				2
 			},
 			{
 				4,
@@ -20213,15 +20217,15 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -20245,19 +20249,19 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -20265,11 +20269,11 @@ local chapter_board = {
 				2
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
@@ -20281,11 +20285,11 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20297,23 +20301,23 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				3,
+				19,
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20325,7 +20329,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -20333,7 +20337,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				20,
 				0
 			},
 			{
@@ -22745,11 +22749,11 @@ local chapter_board = {
 	[79]={
 		["board"]={
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22761,7 +22765,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -22773,11 +22777,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22789,7 +22793,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -22801,11 +22805,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22817,11 +22821,11 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22829,11 +22833,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22845,15 +22849,15 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22861,7 +22865,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -22869,19 +22873,19 @@ local chapter_board = {
 				4
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -22893,23 +22897,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -22921,33 +22925,33 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				5
 			}
 		},
 		["mystery_box_board"]={
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22959,7 +22963,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -22971,11 +22975,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -22987,7 +22991,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -22999,11 +23003,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23015,11 +23019,11 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23027,11 +23031,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23043,15 +23047,15 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23059,7 +23063,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -23067,19 +23071,19 @@ local chapter_board = {
 				4
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -23091,23 +23095,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -23119,19 +23123,19 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
@@ -23199,115 +23203,115 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
@@ -23323,7 +23327,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
@@ -23347,7 +23351,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -23379,11 +23383,11 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
@@ -23407,7 +23411,7 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23415,11 +23419,11 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23435,7 +23439,7 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23443,7 +23447,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23459,11 +23463,11 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23471,7 +23475,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23495,11 +23499,11 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -23571,7 +23575,7 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23579,7 +23583,7 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
@@ -23587,7 +23591,7 @@ local chapter_board = {
 				2
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
@@ -23595,7 +23599,7 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23603,7 +23607,7 @@ local chapter_board = {
 				1
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23611,7 +23615,7 @@ local chapter_board = {
 				5
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
@@ -23619,7 +23623,7 @@ local chapter_board = {
 				5
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23627,7 +23631,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23639,7 +23643,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23651,11 +23655,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -23663,15 +23667,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23679,7 +23683,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -23691,15 +23695,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23719,15 +23723,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23769,7 +23773,7 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23777,7 +23781,7 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
@@ -23785,7 +23789,7 @@ local chapter_board = {
 				2
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
@@ -23793,7 +23797,7 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23801,7 +23805,7 @@ local chapter_board = {
 				1
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23809,7 +23813,7 @@ local chapter_board = {
 				5
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
@@ -23817,7 +23821,7 @@ local chapter_board = {
 				5
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -23825,7 +23829,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23837,7 +23841,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23849,11 +23853,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -23861,15 +23865,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23877,7 +23881,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -23889,15 +23893,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23917,7 +23921,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23925,7 +23929,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -23969,11 +23973,11 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -23993,15 +23997,15 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -24009,47 +24013,47 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				7,
+				26,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -24057,27 +24061,27 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -24085,27 +24089,27 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				26,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
@@ -24117,15 +24121,15 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				26,
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
@@ -24169,7 +24173,7 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -24193,71 +24197,71 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -24273,11 +24277,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -24285,11 +24289,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
@@ -24297,11 +24301,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -24367,7 +24371,7 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -24391,71 +24395,71 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -24471,11 +24475,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
-				3,
+				25,
 				0
 			},
 			{
@@ -24483,11 +24487,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
@@ -24495,11 +24499,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
@@ -24595,35 +24599,35 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				4,
+				27,
 				2
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -24631,15 +24635,15 @@ local chapter_board = {
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
@@ -24647,35 +24651,35 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -24687,7 +24691,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -24695,7 +24699,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -24715,15 +24719,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
-				13,
+				23,
 				5
 			},
 			{
@@ -24767,11 +24771,11 @@ local chapter_board = {
 				0
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -24787,15 +24791,15 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -24803,15 +24807,15 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
@@ -24819,35 +24823,35 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -24855,23 +24859,23 @@ local chapter_board = {
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
@@ -24887,15 +24891,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -24965,11 +24969,11 @@ local chapter_board = {
 				0
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -24985,15 +24989,15 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
@@ -25001,15 +25005,15 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				4,
+				27,
 				5
 			},
 			{
@@ -25017,35 +25021,35 @@ local chapter_board = {
 				4
 			},
 			{
-				4,
+				27,
 				1
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
-				13,
+				23,
 				1
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
-				2,
+				24,
 				0
 			},
 			{
@@ -25053,11 +25057,11 @@ local chapter_board = {
 				0
 			},
 			{
-				4,
+				27,
 				3
 			},
 			{
-				13,
+				23,
 				3
 			},
 			{
@@ -25065,11 +25069,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				4
 			},
 			{
-				4,
+				27,
 				4
 			},
 			{
@@ -25085,15 +25089,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
-				13,
+				23,
 				2
 			},
 			{
@@ -25177,7 +25181,7 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -25201,15 +25205,15 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -25225,23 +25229,23 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -25249,31 +25253,31 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -25285,15 +25289,15 @@ local chapter_board = {
 				5
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -25313,15 +25317,15 @@ local chapter_board = {
 				3
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -25369,7 +25373,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -25385,7 +25389,7 @@ local chapter_board = {
 				3
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -25393,11 +25397,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -25413,11 +25417,11 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -25453,7 +25457,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -25469,7 +25473,7 @@ local chapter_board = {
 				5
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -25477,15 +25481,15 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
@@ -25493,27 +25497,27 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
@@ -25521,15 +25525,15 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			}
 		}
@@ -25605,7 +25609,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -25621,59 +25625,59 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -25685,15 +25689,15 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -25803,7 +25807,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -25819,59 +25823,59 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -25883,7 +25887,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -25891,7 +25895,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -25995,7 +25999,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26023,19 +26027,19 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -26051,7 +26055,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26067,7 +26071,7 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26079,23 +26083,23 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26107,7 +26111,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26115,7 +26119,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -26123,7 +26127,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26193,7 +26197,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26221,19 +26225,19 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -26249,7 +26253,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26265,7 +26269,7 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26277,23 +26281,23 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26305,7 +26309,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26321,7 +26325,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26365,23 +26369,23 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -26401,7 +26405,7 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26425,15 +26429,15 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26453,15 +26457,15 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -26563,23 +26567,23 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -26599,7 +26603,7 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26623,15 +26627,15 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26651,15 +26655,15 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -26731,11 +26735,11 @@ local chapter_board = {
 	[92]={
 		["board"]={
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26751,19 +26755,19 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -26779,11 +26783,11 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
@@ -26795,7 +26799,7 @@ local chapter_board = {
 				5
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -26803,7 +26807,7 @@ local chapter_board = {
 				3
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -26823,7 +26827,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -26831,7 +26835,7 @@ local chapter_board = {
 				3
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
@@ -26959,15 +26963,15 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -26975,15 +26979,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -26991,7 +26995,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27007,7 +27011,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27019,7 +27023,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27035,7 +27039,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27083,7 +27087,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				30,
 				0
 			},
 			{
@@ -27157,15 +27161,15 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
@@ -27173,15 +27177,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27189,7 +27193,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27205,7 +27209,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27217,7 +27221,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27233,7 +27237,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
@@ -27329,11 +27333,11 @@ local chapter_board = {
 	[94]={
 		["board"]={
 			{
-				3,
+				29,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
@@ -27349,19 +27353,19 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
@@ -27377,19 +27381,19 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				3,
+				29,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -27405,11 +27409,11 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
-				2,
+				28,
 				0
 			},
 			{
@@ -27441,15 +27445,15 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				3
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -27457,19 +27461,19 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				4
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -27477,7 +27481,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -27485,7 +27489,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -27493,11 +27497,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				2
 			},
 			{
-				12,
+				21,
 				1
 			},
 			{
@@ -27505,7 +27509,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -27513,7 +27517,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				5
 			},
 			{
@@ -27521,7 +27525,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				21,
 				2
 			}
 		}
@@ -27529,7 +27533,7 @@ local chapter_board = {
 	[95]={
 		["board"]={
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -27541,7 +27545,7 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
@@ -27553,7 +27557,7 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -27585,15 +27589,15 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -27601,55 +27605,55 @@ local chapter_board = {
 				5
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
@@ -27657,27 +27661,27 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -27685,23 +27689,23 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
@@ -27717,11 +27721,11 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
-				2,
+				31,
 				0
 			}
 		}
@@ -27729,35 +27733,35 @@ local chapter_board = {
 	[96]={
 		["board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -27781,11 +27785,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -27809,11 +27813,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -27837,7 +27841,7 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -27845,7 +27849,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -27861,7 +27865,7 @@ local chapter_board = {
 				2
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -27869,11 +27873,11 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -27889,39 +27893,39 @@ local chapter_board = {
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			}
 		}
@@ -27997,7 +28001,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28013,7 +28017,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -28021,15 +28025,15 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28037,11 +28041,11 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -28053,7 +28057,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -28065,35 +28069,35 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -28101,23 +28105,23 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -28195,7 +28199,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28211,7 +28215,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -28219,7 +28223,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28227,7 +28231,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28235,11 +28239,11 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -28251,7 +28255,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -28263,35 +28267,35 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -28299,23 +28303,23 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -28415,7 +28419,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28431,7 +28435,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28447,15 +28451,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
@@ -28479,7 +28483,7 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
@@ -28507,7 +28511,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
@@ -28613,7 +28617,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28629,7 +28633,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -28645,15 +28649,15 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
-				12,
+				35,
 				4
 			},
 			{
@@ -28677,7 +28681,7 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
@@ -28725,7 +28729,7 @@ local chapter_board = {
 	[99]={
 		["board"]={
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -28749,11 +28753,11 @@ local chapter_board = {
 				1
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -28777,39 +28781,39 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
-				12,
+				35,
 				5
 			},
 			{
@@ -28833,11 +28837,11 @@ local chapter_board = {
 				5
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
@@ -28861,11 +28865,11 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
@@ -28889,7 +28893,7 @@ local chapter_board = {
 				1
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -28949,7 +28953,7 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
@@ -29065,7 +29069,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				5
 			},
 			{
@@ -29147,7 +29151,7 @@ local chapter_board = {
 				2
 			},
 			{
-				12,
+				35,
 				2
 			},
 			{
@@ -29323,7 +29327,7 @@ local chapter_board = {
 	[101]={
 		["board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29347,11 +29351,11 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29375,11 +29379,11 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29403,35 +29407,35 @@ local chapter_board = {
 				5
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29439,7 +29443,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
@@ -29455,7 +29459,7 @@ local chapter_board = {
 				4
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -29463,31 +29467,31 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -29495,7 +29499,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				1
 			},
 			{
@@ -29511,7 +29515,7 @@ local chapter_board = {
 				0
 			},
 			{
-				12,
+				35,
 				3
 			},
 			{
@@ -29523,7 +29527,7 @@ local chapter_board = {
 	[102]={
 		["board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29547,11 +29551,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29563,7 +29567,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29575,11 +29579,11 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29587,7 +29591,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29595,7 +29599,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29603,11 +29607,11 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29619,7 +29623,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29631,11 +29635,11 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29659,7 +29663,7 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29721,7 +29725,7 @@ local chapter_board = {
 		},
 		["mystery_box_board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29745,11 +29749,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29761,7 +29765,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29773,11 +29777,11 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29785,7 +29789,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29793,7 +29797,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29801,11 +29805,11 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29817,7 +29821,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -29829,11 +29833,11 @@ local chapter_board = {
 				3
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29857,7 +29861,7 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29933,7 +29937,7 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29961,7 +29965,7 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -29989,7 +29993,7 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30005,67 +30009,67 @@ local chapter_board = {
 				3
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30073,7 +30077,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30081,39 +30085,39 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			}
 		}
@@ -30121,7 +30125,7 @@ local chapter_board = {
 	[104]={
 		["board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30145,11 +30149,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30173,35 +30177,35 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -30289,7 +30293,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30297,7 +30301,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30305,7 +30309,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30313,13 +30317,13 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			}
 		},
 		["mystery_box_board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30343,11 +30347,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30371,35 +30375,35 @@ local chapter_board = {
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -30487,7 +30491,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30495,7 +30499,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30503,7 +30507,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30519,7 +30523,7 @@ local chapter_board = {
 	[105]={
 		["board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30543,11 +30547,11 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30571,11 +30575,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30599,11 +30603,11 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30611,15 +30615,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -30627,11 +30631,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30639,15 +30643,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -30655,11 +30659,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30667,15 +30671,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30683,7 +30687,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30699,7 +30703,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -30717,7 +30721,7 @@ local chapter_board = {
 		},
 		["mystery_box_board"]={
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30741,11 +30745,11 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30769,11 +30773,11 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30797,11 +30801,11 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30809,15 +30813,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -30825,11 +30829,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30837,15 +30841,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -30853,11 +30857,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30865,7 +30869,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30873,7 +30877,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -30881,7 +30885,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -30897,7 +30901,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -31061,7 +31065,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				0
 			},
 			{
@@ -31077,7 +31081,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				0
 			},
 			{
@@ -31085,7 +31089,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				0
 			},
 			{
@@ -31097,7 +31101,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				0
 			},
 			{
@@ -31109,7 +31113,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				0
 			}
 		}
@@ -31145,7 +31149,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -31153,7 +31157,7 @@ local chapter_board = {
 				2
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -31161,7 +31165,7 @@ local chapter_board = {
 				4
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -31169,11 +31173,11 @@ local chapter_board = {
 				5
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -31197,19 +31201,19 @@ local chapter_board = {
 				5
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -31217,23 +31221,23 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31249,15 +31253,15 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -31281,7 +31285,7 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -31317,15 +31321,15 @@ local chapter_board = {
 	[108]={
 		["board"]={
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31333,23 +31337,23 @@ local chapter_board = {
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31357,7 +31361,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31365,15 +31369,15 @@ local chapter_board = {
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31381,7 +31385,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31389,7 +31393,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31397,7 +31401,7 @@ local chapter_board = {
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31405,7 +31409,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31413,7 +31417,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31421,7 +31425,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31429,7 +31433,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31437,7 +31441,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31445,7 +31449,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31453,7 +31457,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31461,7 +31465,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31469,7 +31473,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31477,7 +31481,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31485,7 +31489,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31493,7 +31497,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31501,7 +31505,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31509,21 +31513,21 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			}
 		},
 		["mystery_box_board"]={
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31531,23 +31535,23 @@ local chapter_board = {
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31555,7 +31559,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31563,15 +31567,15 @@ local chapter_board = {
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31579,7 +31583,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31587,7 +31591,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31595,7 +31599,7 @@ local chapter_board = {
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31603,7 +31607,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31611,7 +31615,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31619,7 +31623,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31627,7 +31631,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31635,7 +31639,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31643,7 +31647,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31651,7 +31655,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31659,7 +31663,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31667,7 +31671,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31675,7 +31679,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31683,7 +31687,7 @@ local chapter_board = {
 				1
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31691,7 +31695,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31699,7 +31703,7 @@ local chapter_board = {
 				4
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -31707,7 +31711,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			}
 		}
@@ -31743,7 +31747,7 @@ local chapter_board = {
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -31767,15 +31771,15 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -31791,39 +31795,39 @@ local chapter_board = {
 				2
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -31831,23 +31835,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -31867,7 +31871,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -31895,7 +31899,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -31971,67 +31975,67 @@ local chapter_board = {
 				3
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32039,7 +32043,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -32047,11 +32051,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32169,31 +32173,31 @@ local chapter_board = {
 				3
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32201,35 +32205,35 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32237,7 +32241,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -32245,11 +32249,11 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32349,15 +32353,15 @@ local chapter_board = {
 				4
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
@@ -32373,7 +32377,7 @@ local chapter_board = {
 				5
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -32381,7 +32385,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -32389,7 +32393,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32401,11 +32405,11 @@ local chapter_board = {
 				5
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -32413,11 +32417,11 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -32429,7 +32433,7 @@ local chapter_board = {
 				5
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -32437,7 +32441,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -32445,7 +32449,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
@@ -32461,15 +32465,15 @@ local chapter_board = {
 				4
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
@@ -32529,7 +32533,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -32557,7 +32561,7 @@ local chapter_board = {
 				3
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -32585,7 +32589,7 @@ local chapter_board = {
 				5
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -32597,23 +32601,23 @@ local chapter_board = {
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
-				2,
+				31,
 				0
 			},
 			{
@@ -32625,23 +32629,23 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -32661,7 +32665,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -32689,7 +32693,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -32717,23 +32721,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32745,7 +32749,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32757,7 +32761,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -32773,23 +32777,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -32805,7 +32809,7 @@ local chapter_board = {
 				2
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -32817,7 +32821,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32829,23 +32833,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -32857,7 +32861,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32869,7 +32873,7 @@ local chapter_board = {
 				5
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -32885,23 +32889,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
@@ -32915,23 +32919,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32943,7 +32947,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -32955,7 +32959,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -32971,23 +32975,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -33003,7 +33007,7 @@ local chapter_board = {
 				2
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -33015,7 +33019,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -33027,23 +33031,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -33055,7 +33059,7 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
@@ -33067,7 +33071,7 @@ local chapter_board = {
 				0
 			},
 			{
-				7,
+				33,
 				0
 			},
 			{
@@ -33083,23 +33087,23 @@ local chapter_board = {
 				1
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				2
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
@@ -33111,7 +33115,7 @@ local chapter_board = {
 	[114]={
 		["board"]={
 			{
-				13,
+				34,
 				3
 			},
 			{
@@ -33135,15 +33139,15 @@ local chapter_board = {
 				3
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -33159,11 +33163,11 @@ local chapter_board = {
 				5
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33171,23 +33175,23 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33195,7 +33199,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33203,15 +33207,15 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33219,7 +33223,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33231,15 +33235,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -33255,7 +33259,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -33271,7 +33275,7 @@ local chapter_board = {
 				4
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
@@ -33279,7 +33283,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
@@ -33303,13 +33307,13 @@ local chapter_board = {
 				5
 			},
 			{
-				13,
+				34,
 				5
 			}
 		},
 		["mystery_box_board"]={
 			{
-				13,
+				34,
 				3
 			},
 			{
@@ -33333,15 +33337,15 @@ local chapter_board = {
 				3
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				1
 			},
 			{
@@ -33357,11 +33361,11 @@ local chapter_board = {
 				5
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33369,23 +33373,23 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33393,7 +33397,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33401,7 +33405,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33409,7 +33413,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33417,7 +33421,7 @@ local chapter_board = {
 				0
 			},
 			{
-				3,
+				32,
 				0
 			},
 			{
@@ -33429,15 +33433,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -33453,7 +33457,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				4
 			},
 			{
@@ -33469,7 +33473,7 @@ local chapter_board = {
 				4
 			},
 			{
-				13,
+				34,
 				3
 			},
 			{
@@ -33477,7 +33481,7 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				34,
 				5
 			},
 			{
@@ -33501,7 +33505,7 @@ local chapter_board = {
 				5
 			},
 			{
-				13,
+				34,
 				5
 			}
 		}
diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua
index e3e83f67..22a2a4f7 100644
--- a/lua/app/config/func_open.lua
+++ b/lua/app/config/func_open.lua
@@ -17,7 +17,7 @@ local func_open = {
 		["icon"]="main_act_level_gift"
 	},
 	["idle_drop"]={
-		["stage"]=3,
+		["stage"]=2,
 		["icon"]="main_idle_drop"
 	},
 	["act_sevenday"]={
@@ -26,6 +26,7 @@ local func_open = {
 	},
 	["mall"]={
 		["stage"]=2,
+		["pop_ups"]=1,
 		["icon"]="main_mall"
 	},
 	["mall_daily"]={
@@ -43,15 +44,19 @@ local func_open = {
 		["icon"]="main_store_box_3"
 	},
 	["daily_challenge"]={
-		["stage"]=2,
+		["stage"]=8,
 		["icon"]="main_daily_challenge"
 	},
 	["act_gift_show_open"]={
 		["stage"]=3,
 		["pop_ups"]=1
+	},
+	["first_charge"]={
+		["stage"]=2,
+		["pop_ups"]=1
 	}
 }
 local config = {
-data=func_open,count=12
+data=func_open,count=13
 }
 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 1c930691..1497029b 100644
--- a/lua/app/config/grid_type.lua
+++ b/lua/app/config/grid_type.lua
@@ -3,12 +3,12 @@ local grid_type = {
 		["can_fall"]=1
 	},
 	[1]={
-		["icon"]="battle_hinder_4",
+		["icon"]="battle_hinder_1",
 		["cant_link"]=1,
 		["element_invalid"]=1
 	},
 	[2]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_stone_2",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -20,7 +20,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[3]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_stone_1",
 		["next_type"]=2,
 		["break_condition"]={
 			1,
@@ -32,7 +32,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[4]={
-		["icon"]="vine",
+		["icon"]="battle_obstacle_vine",
 		["next_type"]=0,
 		["break_condition"]={
 			2,
@@ -42,7 +42,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b03"
 	},
 	[5]={
-		["icon"]="ice",
+		["icon"]="battle_obstacle_ice",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -54,12 +54,12 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b02"
 	},
 	[6]={
-		["icon"]="lock",
+		["icon"]="battle_obstacle_lock",
 		["can_fall"]=1,
 		["cant_link"]=1
 	},
 	[7]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_stone_3",
 		["next_type"]=3,
 		["break_condition"]={
 			1,
@@ -71,7 +71,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[8]={
-		["icon"]="rocket_up",
+		["icon"]="battle_obstacle_rocket_up",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -87,7 +87,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[9]={
-		["icon"]="rocket_down",
+		["icon"]="battle_obstacle_rocket_down",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -103,7 +103,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[10]={
-		["icon"]="rocket_left",
+		["icon"]="battle_obstacle_rocket_left",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -119,7 +119,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[11]={
-		["icon"]="rocket_right",
+		["icon"]="battle_obstacle_rocket_right",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -135,7 +135,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[12]={
-		["icon"]="leaf",
+		["icon"]="battle_obstacle_leaf",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -147,7 +147,7 @@ local grid_type = {
 		["cant_link"]=1
 	},
 	[13]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_jelly",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -162,7 +162,7 @@ local grid_type = {
 		["effect_trigger"]=1
 	},
 	[14]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_lamp",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -176,7 +176,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[15]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_chest_3",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -191,7 +191,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[16]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_chest_2",
 		["next_type"]=15,
 		["break_condition"]={
 			1,
@@ -203,7 +203,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[17]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_chest_1",
 		["next_type"]=16,
 		["break_condition"]={
 			1,
@@ -215,7 +215,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[18]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_stump_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -227,7 +227,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[19]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_stump_2",
 		["next_type"]=18,
 		["break_condition"]={
 			1,
@@ -239,7 +239,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[20]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_stump_3",
 		["next_type"]=19,
 		["break_condition"]={
 			1,
@@ -251,7 +251,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[21]={
-		["icon"]="leaf",
+		["icon"]="battle_obstacle_blister",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -260,10 +260,13 @@ local grid_type = {
 		["break_count"]=1,
 		["break_stay_element"]=1,
 		["can_fall"]=1,
-		["cant_link"]=1
+		["cant_link"]=1,
+		["element_invalid"]=1,
+		["effect"]=2,
+		["effect_trigger"]=1
 	},
 	[22]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_silt",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -278,7 +281,7 @@ local grid_type = {
 		["effect_trigger"]=1
 	},
 	[23]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_poisonous mist",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -293,7 +296,7 @@ local grid_type = {
 		["effect_trigger"]=1
 	},
 	[24]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_altar_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -305,7 +308,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[25]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_altar_2",
 		["next_type"]=24,
 		["break_condition"]={
 			1,
@@ -317,7 +320,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[26]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_altar_3",
 		["next_type"]=25,
 		["break_condition"]={
 			1,
@@ -329,7 +332,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[27]={
-		["icon"]="vine",
+		["icon"]="battle_obstacle_circle",
 		["next_type"]=0,
 		["break_condition"]={
 			2,
@@ -339,7 +342,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b03"
 	},
 	[28]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_stalactite_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -351,7 +354,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[29]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_stalactite_2",
 		["next_type"]=28,
 		["break_condition"]={
 			1,
@@ -363,7 +366,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[30]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_stalactite_3",
 		["next_type"]=29,
 		["break_condition"]={
 			1,
@@ -375,7 +378,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[31]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_Iron_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -387,7 +390,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[32]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_Iron_2",
 		["next_type"]=31,
 		["break_condition"]={
 			1,
@@ -399,7 +402,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[33]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_Iron_3",
 		["next_type"]=32,
 		["break_condition"]={
 			1,
@@ -411,7 +414,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[34]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_lava",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -424,9 +427,21 @@ local grid_type = {
 		["element_invalid"]=1,
 		["effect"]=2,
 		["effect_trigger"]=1
+	},
+	[35]={
+		["icon"]="battle_obstacle_tussock",
+		["next_type"]=0,
+		["break_condition"]={
+			1,
+			3
+		},
+		["break_count"]=1,
+		["break_stay_element"]=1,
+		["can_fall"]=1,
+		["cant_link"]=1
 	}
 }
 local config = {
-data=grid_type,count=35
+data=grid_type,count=36
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua
index 0d41d19f..dc7bc6ac 100644
--- a/lua/app/config/hero.lua
+++ b/lua/app/config/hero.lua
@@ -817,7 +817,7 @@ local hero = {
 		["model_id"]="p0022",
 		["icon"]="9",
 		["item_id"]=43001,
-		["unlock_chapter"]=6,
+		["unlock_chapter"]=2,
 		["is_show"]=1
 	},
 	[43002]={
@@ -1112,7 +1112,7 @@ local hero = {
 		["model_id"]="p0019",
 		["icon"]="15",
 		["item_id"]=53002,
-		["unlock_chapter"]=8,
+		["unlock_chapter"]=6,
 		["is_show"]=1
 	},
 	[54001]={
diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua
index 9b9b0621..df7ed788 100644
--- a/lua/app/config/localization/localization_global_const.lua
+++ b/lua/app/config/localization/localization_global_const.lua
@@ -175,6 +175,15 @@ local LocalizationGlobalConst =
 	SHOP_DESC_28 = "SHOP_DESC_28",
 	SHOP_DESC_29 = "SHOP_DESC_29",
 	HERO_DESC_11 = "HERO_DESC_11",
+	SHOP_DESC_30 = "SHOP_DESC_30",
+	SHOP_DESC_31 = "SHOP_DESC_31",
+	SHOP_DESC_32 = "SHOP_DESC_32",
+	SHOP_DESC_33 = "SHOP_DESC_33",
+	SHOP_DESC_34 = "SHOP_DESC_34",
+	SHOP_DESC_35 = "SHOP_DESC_35",
+	SHOP_DESC_36 = "SHOP_DESC_36",
+	FUNC_OPEN_LEVEL = "FUNC_OPEN_LEVEL",
+	FUNC_OPEN_STAGE = "FUNC_OPEN_STAGE",
 }
 
 return LocalizationGlobalConst
\ No newline at end of file
diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua
index e2019c6c..c7111eaf 100644
--- a/lua/app/config/monster_chapter.lua
+++ b/lua/app/config/monster_chapter.lua
@@ -451,6 +451,9 @@ local monster_chapter = {
 			30032,
 			30033
 		},
+		["skill"]={
+			10018
+		},
 		["monster_exp"]=18000
 	},
 	[3601]={
@@ -644,7 +647,7 @@ local monster_chapter = {
 			30087
 		},
 		["skill"]={
-			10018
+			10065
 		},
 		["monster_exp"]=22000
 	},
@@ -1030,6 +1033,9 @@ local monster_chapter = {
 			30068,
 			30069
 		},
+		["skill"]={
+			10063
+		},
 		["monster_exp"]=12000
 	},
 	[8101]={
@@ -1218,6 +1224,9 @@ local monster_chapter = {
 			30077,
 			30078
 		},
+		["skill"]={
+			10064
+		},
 		["monster_exp"]=18000
 	},
 	[9601]={
@@ -1340,6 +1349,9 @@ local monster_chapter = {
 			30068,
 			30069
 		},
+		["skill"]={
+			10063
+		},
 		["monster_exp"]=24000
 	},
 	[10601]={
@@ -1402,7 +1414,7 @@ local monster_chapter = {
 			30075
 		},
 		["skill"]={
-			10023
+			10062
 		},
 		["monster_exp"]=22000
 	},
@@ -1986,7 +1998,10 @@ local monster_chapter = {
 			30021
 		},
 		["skill"]={
-			10015
+			10060
+		},
+		["passive_skill"]={
+			10061
 		},
 		["monster_exp"]=18000
 	},
@@ -2181,15 +2196,14 @@ local monster_chapter = {
 			30051
 		},
 		["skill"]={
-			10027,
-			10028
+			10027
 		},
 		["monster_exp"]=22000
 	},
 	[17101]={
 		["monster_base"]=10010,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=18900000,
+		["atk"]=1140000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -2200,8 +2214,8 @@ local monster_chapter = {
 	},
 	[17201]={
 		["monster_base"]=10038,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=26500000,
+		["atk"]=1200000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -2212,8 +2226,8 @@ local monster_chapter = {
 	},
 	[17301]={
 		["monster_base"]=10033,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=29800000,
+		["atk"]=1250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -2224,8 +2238,8 @@ local monster_chapter = {
 	},
 	[17401]={
 		["monster_base"]=10031,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=39600000,
+		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20088,
@@ -2237,8 +2251,8 @@ local monster_chapter = {
 	[17501]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=54900000,
+		["atk"]=1390000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30013,
@@ -2252,8 +2266,8 @@ local monster_chapter = {
 	},
 	[17601]={
 		["monster_base"]=10030,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=37600000,
+		["atk"]=1350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -2264,8 +2278,8 @@ local monster_chapter = {
 	},
 	[17701]={
 		["monster_base"]=10035,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=41800000,
+		["atk"]=1510000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20100,
@@ -2276,8 +2290,8 @@ local monster_chapter = {
 	},
 	[17801]={
 		["monster_base"]=10039,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=48500000,
+		["atk"]=1400000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -2288,8 +2302,8 @@ local monster_chapter = {
 	},
 	[17901]={
 		["monster_base"]=10010,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=55000000,
+		["atk"]=1560000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -2301,8 +2315,8 @@ local monster_chapter = {
 	[18001]={
 		["monster_base"]=20017,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=104000000,
+		["atk"]=1520000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30049,
@@ -2310,15 +2324,14 @@ local monster_chapter = {
 			30051
 		},
 		["skill"]={
-			10027,
-			10028
+			10027
 		},
 		["monster_exp"]=12000
 	},
 	[18101]={
 		["monster_base"]=10038,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=60100000,
+		["atk"]=1480000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -2329,8 +2342,8 @@ local monster_chapter = {
 	},
 	[18201]={
 		["monster_base"]=10040,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=68000000,
+		["atk"]=1520000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -2341,8 +2354,8 @@ local monster_chapter = {
 	},
 	[18301]={
 		["monster_base"]=10010,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=72000000,
+		["atk"]=1580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -2353,8 +2366,8 @@ local monster_chapter = {
 	},
 	[18401]={
 		["monster_base"]=10039,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=78100000,
+		["atk"]=1620000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -2366,8 +2379,8 @@ local monster_chapter = {
 	[18501]={
 		["monster_base"]=20012,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=141600000,
+		["atk"]=1570000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30034,
@@ -2381,8 +2394,8 @@ local monster_chapter = {
 	},
 	[18601]={
 		["monster_base"]=10032,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=94000000,
+		["atk"]=1660000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -2393,8 +2406,8 @@ local monster_chapter = {
 	},
 	[18701]={
 		["monster_base"]=10034,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=100000000,
+		["atk"]=1710000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20097,
@@ -2405,8 +2418,8 @@ local monster_chapter = {
 	},
 	[18801]={
 		["monster_base"]=10035,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=109900000,
+		["atk"]=1760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20100,
@@ -2417,8 +2430,8 @@ local monster_chapter = {
 	},
 	[18901]={
 		["monster_base"]=10033,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=120000000,
+		["atk"]=1800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -2430,8 +2443,8 @@ local monster_chapter = {
 	[19001]={
 		["monster_base"]=20003,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=189500000,
+		["atk"]=2340000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30007,
@@ -2439,8 +2452,7 @@ local monster_chapter = {
 			30009
 		},
 		["skill"]={
-			10029,
-			10030
+			10029
 		},
 		["passive_skill"]={
 			10013
@@ -2449,8 +2461,8 @@ local monster_chapter = {
 	},
 	[19101]={
 		["monster_base"]=10020,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=19500000,
+		["atk"]=1000000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -2461,8 +2473,8 @@ local monster_chapter = {
 	},
 	[19201]={
 		["monster_base"]=10038,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=27300000,
+		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -2473,8 +2485,8 @@ local monster_chapter = {
 	},
 	[19301]={
 		["monster_base"]=10021,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=30700000,
+		["atk"]=1090000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -2485,8 +2497,8 @@ local monster_chapter = {
 	},
 	[19401]={
 		["monster_base"]=10040,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=40700000,
+		["atk"]=1130000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -2498,8 +2510,8 @@ local monster_chapter = {
 	[19501]={
 		["monster_base"]=20017,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=56400000,
+		["atk"]=1210000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30049,
@@ -2507,15 +2519,14 @@ local monster_chapter = {
 			30051
 		},
 		["skill"]={
-			10027,
-			10028
+			10027
 		},
 		["monster_exp"]=18000
 	},
 	[19601]={
 		["monster_base"]=10022,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=38700000,
+		["atk"]=1170000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -2526,8 +2537,8 @@ local monster_chapter = {
 	},
 	[19701]={
 		["monster_base"]=10004,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=43000000,
+		["atk"]=1310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -2538,8 +2549,8 @@ local monster_chapter = {
 	},
 	[19801]={
 		["monster_base"]=10023,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=49900000,
+		["atk"]=1220000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -2550,8 +2561,8 @@ local monster_chapter = {
 	},
 	[19901]={
 		["monster_base"]=10007,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=56500000,
+		["atk"]=1360000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20019,
@@ -2563,8 +2574,8 @@ local monster_chapter = {
 	[20001]={
 		["monster_base"]=20007,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=106900000,
+		["atk"]=1320000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30019,
@@ -2572,14 +2583,17 @@ local monster_chapter = {
 			30021
 		},
 		["skill"]={
-			10015
+			10060
+		},
+		["passive_skill"]={
+			10061
 		},
 		["monster_exp"]=12000
 	},
 	[20101]={
 		["monster_base"]=10048,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=61800000,
+		["atk"]=1290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -2590,8 +2604,8 @@ local monster_chapter = {
 	},
 	[20201]={
 		["monster_base"]=10023,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=69900000,
+		["atk"]=1330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -2602,8 +2616,8 @@ local monster_chapter = {
 	},
 	[20301]={
 		["monster_base"]=10006,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=74000000,
+		["atk"]=1370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -2614,8 +2628,8 @@ local monster_chapter = {
 	},
 	[20401]={
 		["monster_base"]=10047,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=80300000,
+		["atk"]=1410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20136,
@@ -2627,8 +2641,8 @@ local monster_chapter = {
 	[20501]={
 		["monster_base"]=20015,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=145500000,
+		["atk"]=1360000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30043,
@@ -2645,8 +2659,8 @@ local monster_chapter = {
 	},
 	[20601]={
 		["monster_base"]=10021,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=96600000,
+		["atk"]=1440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -2657,8 +2671,8 @@ local monster_chapter = {
 	},
 	[20701]={
 		["monster_base"]=10006,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=102700000,
+		["atk"]=1490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -2669,8 +2683,8 @@ local monster_chapter = {
 	},
 	[20801]={
 		["monster_base"]=10048,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=112900000,
+		["atk"]=1530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -2681,8 +2695,8 @@ local monster_chapter = {
 	},
 	[20901]={
 		["monster_base"]=10023,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=123300000,
+		["atk"]=1560000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -2694,8 +2708,8 @@ local monster_chapter = {
 	[21001]={
 		["monster_base"]=30014,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=194700000,
+		["atk"]=2020000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			40009,
@@ -2710,8 +2724,8 @@ local monster_chapter = {
 	},
 	[21101]={
 		["monster_base"]=10024,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=20400000,
+		["atk"]=1060000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -2722,8 +2736,8 @@ local monster_chapter = {
 	},
 	[21201]={
 		["monster_base"]=10006,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=28600000,
+		["atk"]=1120000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -2734,8 +2748,8 @@ local monster_chapter = {
 	},
 	[21301]={
 		["monster_base"]=10007,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=32100000,
+		["atk"]=1160000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20019,
@@ -2746,8 +2760,8 @@ local monster_chapter = {
 	},
 	[21401]={
 		["monster_base"]=10023,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=42600000,
+		["atk"]=1200000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -2759,8 +2773,8 @@ local monster_chapter = {
 	[21501]={
 		["monster_base"]=20015,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=59000000,
+		["atk"]=1280000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30043,
@@ -2777,8 +2791,8 @@ local monster_chapter = {
 	},
 	[21601]={
 		["monster_base"]=10048,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=40500000,
+		["atk"]=1250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -2789,8 +2803,8 @@ local monster_chapter = {
 	},
 	[21701]={
 		["monster_base"]=10025,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=45000000,
+		["atk"]=1390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20070,
@@ -2801,8 +2815,8 @@ local monster_chapter = {
 	},
 	[21801]={
 		["monster_base"]=10004,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=52200000,
+		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -2813,8 +2827,8 @@ local monster_chapter = {
 	},
 	[21901]={
 		["monster_base"]=10022,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=59100000,
+		["atk"]=1440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -2826,8 +2840,8 @@ local monster_chapter = {
 	[22001]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=111800000,
+		["atk"]=1400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30013,
@@ -2841,8 +2855,8 @@ local monster_chapter = {
 	},
 	[22101]={
 		["monster_base"]=10047,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=64700000,
+		["atk"]=1370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20136,
@@ -2853,8 +2867,8 @@ local monster_chapter = {
 	},
 	[22201]={
 		["monster_base"]=10026,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=73100000,
+		["atk"]=1410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -2865,8 +2879,8 @@ local monster_chapter = {
 	},
 	[22301]={
 		["monster_base"]=10006,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=77400000,
+		["atk"]=1450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -2877,8 +2891,8 @@ local monster_chapter = {
 	},
 	[22401]={
 		["monster_base"]=10040,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=84000000,
+		["atk"]=1500000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -2890,8 +2904,8 @@ local monster_chapter = {
 	[22501]={
 		["monster_base"]=20017,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=152100000,
+		["atk"]=1440000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30049,
@@ -2899,15 +2913,14 @@ local monster_chapter = {
 			30051
 		},
 		["skill"]={
-			10027,
-			10028
+			10027
 		},
 		["monster_exp"]=24000
 	},
 	[22601]={
 		["monster_base"]=10020,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=101000000,
+		["atk"]=1530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -2918,8 +2931,8 @@ local monster_chapter = {
 	},
 	[22701]={
 		["monster_base"]=10010,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=107400000,
+		["atk"]=1580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -2930,8 +2943,8 @@ local monster_chapter = {
 	},
 	[22801]={
 		["monster_base"]=10038,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=118100000,
+		["atk"]=1620000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -2942,8 +2955,8 @@ local monster_chapter = {
 	},
 	[22901]={
 		["monster_base"]=10027,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=128900000,
+		["atk"]=1660000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20076,
@@ -2955,8 +2968,8 @@ local monster_chapter = {
 	[23001]={
 		["monster_base"]=20008,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=203600000,
+		["atk"]=2130000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30022,
@@ -2970,8 +2983,8 @@ local monster_chapter = {
 	},
 	[23101]={
 		["monster_base"]=10005,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=22200000,
+		["atk"]=1180000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -2982,8 +2995,8 @@ local monster_chapter = {
 	},
 	[23201]={
 		["monster_base"]=10022,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=31100000,
+		["atk"]=1230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -2994,8 +3007,8 @@ local monster_chapter = {
 	},
 	[23301]={
 		["monster_base"]=10005,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=34900000,
+		["atk"]=1280000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3006,8 +3019,8 @@ local monster_chapter = {
 	},
 	[23401]={
 		["monster_base"]=10026,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=46200000,
+		["atk"]=1330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3019,8 +3032,8 @@ local monster_chapter = {
 	[23501]={
 		["monster_base"]=20014,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=64000000,
+		["atk"]=1400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30040,
@@ -3037,8 +3050,8 @@ local monster_chapter = {
 	},
 	[23601]={
 		["monster_base"]=10022,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=44000000,
+		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3049,8 +3062,8 @@ local monster_chapter = {
 	},
 	[23701]={
 		["monster_base"]=10026,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=48900000,
+		["atk"]=1530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3061,8 +3074,8 @@ local monster_chapter = {
 	},
 	[23801]={
 		["monster_base"]=10032,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=56700000,
+		["atk"]=1430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3073,8 +3086,8 @@ local monster_chapter = {
 	},
 	[23901]={
 		["monster_base"]=10044,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=64100000,
+		["atk"]=1580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -3086,8 +3099,8 @@ local monster_chapter = {
 	[24001]={
 		["monster_base"]=20015,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=121300000,
+		["atk"]=1530000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30043,
@@ -3104,8 +3117,8 @@ local monster_chapter = {
 	},
 	[24101]={
 		["monster_base"]=10001,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=70200000,
+		["atk"]=1500000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -3116,8 +3129,8 @@ local monster_chapter = {
 	},
 	[24201]={
 		["monster_base"]=10022,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=79300000,
+		["atk"]=1550000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3128,8 +3141,8 @@ local monster_chapter = {
 	},
 	[24301]={
 		["monster_base"]=10044,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=84000000,
+		["atk"]=1600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -3140,8 +3153,8 @@ local monster_chapter = {
 	},
 	[24401]={
 		["monster_base"]=10019,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=91100000,
+		["atk"]=1650000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -3153,8 +3166,8 @@ local monster_chapter = {
 	[24501]={
 		["monster_base"]=20001,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=165000000,
+		["atk"]=1570000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30001,
@@ -3168,8 +3181,8 @@ local monster_chapter = {
 	},
 	[24601]={
 		["monster_base"]=10013,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=109600000,
+		["atk"]=1680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -3180,8 +3193,8 @@ local monster_chapter = {
 	},
 	[24701]={
 		["monster_base"]=10005,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=116500000,
+		["atk"]=1730000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3192,8 +3205,8 @@ local monster_chapter = {
 	},
 	[24801]={
 		["monster_base"]=10026,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=128100000,
+		["atk"]=1780000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3204,8 +3217,8 @@ local monster_chapter = {
 	},
 	[24901]={
 		["monster_base"]=10032,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=139800000,
+		["atk"]=1820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3217,8 +3230,8 @@ local monster_chapter = {
 	[25001]={
 		["monster_base"]=20006,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=220800000,
+		["atk"]=2330000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30016,
@@ -3235,8 +3248,8 @@ local monster_chapter = {
 	},
 	[25101]={
 		["monster_base"]=10044,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=22900000,
+		["atk"]=1230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -3247,8 +3260,8 @@ local monster_chapter = {
 	},
 	[25201]={
 		["monster_base"]=10013,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=32000000,
+		["atk"]=1290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -3259,8 +3272,8 @@ local monster_chapter = {
 	},
 	[25301]={
 		["monster_base"]=10001,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=35900000,
+		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -3271,8 +3284,8 @@ local monster_chapter = {
 	},
 	[25401]={
 		["monster_base"]=10026,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=47500000,
+		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3284,8 +3297,8 @@ local monster_chapter = {
 	[25501]={
 		["monster_base"]=20015,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=65800000,
+		["atk"]=1460000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30043,
@@ -3302,8 +3315,8 @@ local monster_chapter = {
 	},
 	[25601]={
 		["monster_base"]=10022,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=45300000,
+		["atk"]=1430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3314,8 +3327,8 @@ local monster_chapter = {
 	},
 	[25701]={
 		["monster_base"]=10044,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=50300000,
+		["atk"]=1600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -3326,8 +3339,8 @@ local monster_chapter = {
 	},
 	[25801]={
 		["monster_base"]=10032,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=58300000,
+		["atk"]=1490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3338,8 +3351,8 @@ local monster_chapter = {
 	},
 	[25901]={
 		["monster_base"]=10019,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=65900000,
+		["atk"]=1650000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -3351,8 +3364,8 @@ local monster_chapter = {
 	[26001]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=124700000,
+		["atk"]=1590000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30022,
@@ -3366,8 +3379,8 @@ local monster_chapter = {
 	},
 	[26101]={
 		["monster_base"]=10026,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=72200000,
+		["atk"]=1560000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3378,8 +3391,8 @@ local monster_chapter = {
 	},
 	[26201]={
 		["monster_base"]=10001,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=81500000,
+		["atk"]=1620000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -3390,8 +3403,8 @@ local monster_chapter = {
 	},
 	[26301]={
 		["monster_base"]=10044,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=86300000,
+		["atk"]=1660000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -3402,8 +3415,8 @@ local monster_chapter = {
 	},
 	[26401]={
 		["monster_base"]=10013,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=93600000,
+		["atk"]=1710000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -3415,8 +3428,8 @@ local monster_chapter = {
 	[26501]={
 		["monster_base"]=20002,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=169600000,
+		["atk"]=1630000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30004,
@@ -3430,8 +3443,8 @@ local monster_chapter = {
 	},
 	[26601]={
 		["monster_base"]=10001,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=112600000,
+		["atk"]=1750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -3442,8 +3455,8 @@ local monster_chapter = {
 	},
 	[26701]={
 		["monster_base"]=10032,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=119700000,
+		["atk"]=1800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3454,8 +3467,8 @@ local monster_chapter = {
 	},
 	[26801]={
 		["monster_base"]=10022,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=131700000,
+		["atk"]=1850000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3466,8 +3479,8 @@ local monster_chapter = {
 	},
 	[26901]={
 		["monster_base"]=10005,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=143700000,
+		["atk"]=1890000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3479,8 +3492,8 @@ local monster_chapter = {
 	[27001]={
 		["monster_base"]=20021,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=226900000,
+		["atk"]=2400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30061,
@@ -3498,8 +3511,8 @@ local monster_chapter = {
 	},
 	[27101]={
 		["monster_base"]=10022,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=24300000,
+		["atk"]=1320000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3510,8 +3523,8 @@ local monster_chapter = {
 	},
 	[27201]={
 		["monster_base"]=10044,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=33900000,
+		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -3522,8 +3535,8 @@ local monster_chapter = {
 	},
 	[27301]={
 		["monster_base"]=10032,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=38000000,
+		["atk"]=1440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3534,8 +3547,8 @@ local monster_chapter = {
 	},
 	[27401]={
 		["monster_base"]=10019,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=50300000,
+		["atk"]=1490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -3547,8 +3560,8 @@ local monster_chapter = {
 	[27501]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=69600000,
+		["atk"]=1560000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30022,
@@ -3562,8 +3575,8 @@ local monster_chapter = {
 	},
 	[27601]={
 		["monster_base"]=10005,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=47900000,
+		["atk"]=1540000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3574,8 +3587,8 @@ local monster_chapter = {
 	},
 	[27701]={
 		["monster_base"]=10022,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=53200000,
+		["atk"]=1710000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3586,8 +3599,8 @@ local monster_chapter = {
 	},
 	[27801]={
 		["monster_base"]=10005,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=61700000,
+		["atk"]=1600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3598,8 +3611,8 @@ local monster_chapter = {
 	},
 	[27901]={
 		["monster_base"]=10026,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=69700000,
+		["atk"]=1760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3611,8 +3624,8 @@ local monster_chapter = {
 	[28001]={
 		["monster_base"]=20014,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=131900000,
+		["atk"]=1700000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30040,
@@ -3629,8 +3642,8 @@ local monster_chapter = {
 	},
 	[28101]={
 		["monster_base"]=10013,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=76400000,
+		["atk"]=1680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -3641,8 +3654,8 @@ local monster_chapter = {
 	},
 	[28201]={
 		["monster_base"]=10005,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=86200000,
+		["atk"]=1730000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3653,8 +3666,8 @@ local monster_chapter = {
 	},
 	[28301]={
 		["monster_base"]=10026,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=91300000,
+		["atk"]=1780000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3665,8 +3678,8 @@ local monster_chapter = {
 	},
 	[28401]={
 		["monster_base"]=10032,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=99000000,
+		["atk"]=1830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3678,8 +3691,8 @@ local monster_chapter = {
 	[28501]={
 		["monster_base"]=20006,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=179400000,
+		["atk"]=1740000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30016,
@@ -3696,8 +3709,8 @@ local monster_chapter = {
 	},
 	[28601]={
 		["monster_base"]=10013,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=119100000,
+		["atk"]=1870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -3708,8 +3721,8 @@ local monster_chapter = {
 	},
 	[28701]={
 		["monster_base"]=10005,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=126600000,
+		["atk"]=1930000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3720,8 +3733,8 @@ local monster_chapter = {
 	},
 	[28801]={
 		["monster_base"]=10026,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=139300000,
+		["atk"]=1980000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3732,8 +3745,8 @@ local monster_chapter = {
 	},
 	[28901]={
 		["monster_base"]=10001,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=152000000,
+		["atk"]=2020000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -3745,8 +3758,8 @@ local monster_chapter = {
 	[29001]={
 		["monster_base"]=30010,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=240000000,
+		["atk"]=2560000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			40013,
@@ -3761,8 +3774,8 @@ local monster_chapter = {
 	},
 	[29101]={
 		["monster_base"]=10013,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=25300000,
+		["atk"]=1400000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -3773,8 +3786,8 @@ local monster_chapter = {
 	},
 	[29201]={
 		["monster_base"]=10005,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=35300000,
+		["atk"]=1460000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3785,8 +3798,8 @@ local monster_chapter = {
 	},
 	[29301]={
 		["monster_base"]=10026,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=39600000,
+		["atk"]=1520000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -3797,8 +3810,8 @@ local monster_chapter = {
 	},
 	[29401]={
 		["monster_base"]=10032,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=52400000,
+		["atk"]=1570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3810,8 +3823,8 @@ local monster_chapter = {
 	[29501]={
 		["monster_base"]=20006,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=72500000,
+		["atk"]=1640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30016,
@@ -3828,8 +3841,8 @@ local monster_chapter = {
 	},
 	[29601]={
 		["monster_base"]=10001,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=49900000,
+		["atk"]=1620000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -3840,8 +3853,8 @@ local monster_chapter = {
 	},
 	[29701]={
 		["monster_base"]=10032,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=55400000,
+		["atk"]=1800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -3852,8 +3865,8 @@ local monster_chapter = {
 	},
 	[29801]={
 		["monster_base"]=10022,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=64300000,
+		["atk"]=1690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3864,8 +3877,8 @@ local monster_chapter = {
 	},
 	[29901]={
 		["monster_base"]=10005,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=72600000,
+		["atk"]=1860000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3877,8 +3890,8 @@ local monster_chapter = {
 	[30001]={
 		["monster_base"]=20021,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=137300000,
+		["atk"]=1780000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30061,
@@ -3896,8 +3909,8 @@ local monster_chapter = {
 	},
 	[30101]={
 		["monster_base"]=10022,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=79600000,
+		["atk"]=1770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20061,
@@ -3908,8 +3921,8 @@ local monster_chapter = {
 	},
 	[30201]={
 		["monster_base"]=10004,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=89800000,
+		["atk"]=1830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -3920,8 +3933,8 @@ local monster_chapter = {
 	},
 	[30301]={
 		["monster_base"]=10023,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=95100000,
+		["atk"]=1880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -3932,8 +3945,8 @@ local monster_chapter = {
 	},
 	[30401]={
 		["monster_base"]=10007,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=103100000,
+		["atk"]=1930000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20019,
@@ -3945,8 +3958,8 @@ local monster_chapter = {
 	[30501]={
 		["monster_base"]=20007,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=186800000,
+		["atk"]=1830000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30019,
@@ -3954,14 +3967,17 @@ local monster_chapter = {
 			30021
 		},
 		["skill"]={
-			10015
+			10060
+		},
+		["passive_skill"]={
+			10061
 		},
 		["monster_exp"]=24000
 	},
 	[30601]={
 		["monster_base"]=10019,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=124000000,
+		["atk"]=1970000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -3972,8 +3988,8 @@ local monster_chapter = {
 	},
 	[30701]={
 		["monster_base"]=10023,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=131800000,
+		["atk"]=2030000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -3984,8 +4000,8 @@ local monster_chapter = {
 	},
 	[30801]={
 		["monster_base"]=10005,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=145000000,
+		["atk"]=2080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -3996,8 +4012,8 @@ local monster_chapter = {
 	},
 	[30901]={
 		["monster_base"]=10033,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=158200000,
+		["atk"]=2130000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -4009,8 +4025,8 @@ local monster_chapter = {
 	[31001]={
 		["monster_base"]=20016,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=249800000,
+		["atk"]=2680000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30046,
@@ -4028,8 +4044,8 @@ local monster_chapter = {
 	},
 	[31101]={
 		["monster_base"]=10026,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=26900000,
+		["atk"]=1500000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20073,
@@ -4040,8 +4056,8 @@ local monster_chapter = {
 	},
 	[31201]={
 		["monster_base"]=10001,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=37500000,
+		["atk"]=1570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
@@ -4052,8 +4068,8 @@ local monster_chapter = {
 	},
 	[31301]={
 		["monster_base"]=10044,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=42000000,
+		["atk"]=1630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -4064,8 +4080,8 @@ local monster_chapter = {
 	},
 	[31401]={
 		["monster_base"]=10013,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=55600000,
+		["atk"]=1680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20034,
@@ -4077,8 +4093,8 @@ local monster_chapter = {
 	[31501]={
 		["monster_base"]=20002,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=76900000,
+		["atk"]=1750000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30004,
@@ -4092,8 +4108,8 @@ local monster_chapter = {
 	},
 	[31601]={
 		["monster_base"]=10048,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=52900000,
+		["atk"]=1740000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4104,8 +4120,8 @@ local monster_chapter = {
 	},
 	[31701]={
 		["monster_base"]=10006,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=58800000,
+		["atk"]=1930000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -4116,8 +4132,8 @@ local monster_chapter = {
 	},
 	[31801]={
 		["monster_base"]=10012,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=68200000,
+		["atk"]=1810000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4128,8 +4144,8 @@ local monster_chapter = {
 	},
 	[31901]={
 		["monster_base"]=10004,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=77000000,
+		["atk"]=1990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -4141,8 +4157,8 @@ local monster_chapter = {
 	[32001]={
 		["monster_base"]=20004,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=145500000,
+		["atk"]=1900000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30010,
@@ -4156,8 +4172,8 @@ local monster_chapter = {
 	},
 	[32101]={
 		["monster_base"]=10024,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=84400000,
+		["atk"]=1890000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -4168,8 +4184,8 @@ local monster_chapter = {
 	},
 	[32201]={
 		["monster_base"]=10044,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=95200000,
+		["atk"]=1950000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -4180,8 +4196,8 @@ local monster_chapter = {
 	},
 	[32301]={
 		["monster_base"]=10016,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=100800000,
+		["atk"]=2010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20043,
@@ -4192,8 +4208,8 @@ local monster_chapter = {
 	},
 	[32401]={
 		["monster_base"]=10019,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=109300000,
+		["atk"]=2070000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20052,
@@ -4205,8 +4221,8 @@ local monster_chapter = {
 	[32501]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=198000000,
+		["atk"]=1950000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30022,
@@ -4220,8 +4236,8 @@ local monster_chapter = {
 	},
 	[32601]={
 		["monster_base"]=10004,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=131400000,
+		["atk"]=2110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -4232,8 +4248,8 @@ local monster_chapter = {
 	},
 	[32701]={
 		["monster_base"]=10006,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=139700000,
+		["atk"]=2170000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -4244,8 +4260,8 @@ local monster_chapter = {
 	},
 	[32801]={
 		["monster_base"]=10048,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=153700000,
+		["atk"]=2230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4256,8 +4272,8 @@ local monster_chapter = {
 	},
 	[32901]={
 		["monster_base"]=10037,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=167700000,
+		["atk"]=2270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20106,
@@ -4269,8 +4285,8 @@ local monster_chapter = {
 	[33001]={
 		["monster_base"]=30006,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=264700000,
+		["atk"]=2850000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			40017,
@@ -4288,8 +4304,8 @@ local monster_chapter = {
 	},
 	[33101]={
 		["monster_base"]=10049,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=27700000,
+		["atk"]=1570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -4300,8 +4316,8 @@ local monster_chapter = {
 	},
 	[33201]={
 		["monster_base"]=10005,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=38500000,
+		["atk"]=1640000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
@@ -4312,8 +4328,8 @@ local monster_chapter = {
 	},
 	[33301]={
 		["monster_base"]=10024,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=43200000,
+		["atk"]=1700000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -4324,8 +4340,8 @@ local monster_chapter = {
 	},
 	[33401]={
 		["monster_base"]=10012,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=57100000,
+		["atk"]=1750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4337,8 +4353,8 @@ local monster_chapter = {
 	[33501]={
 		["monster_base"]=20006,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=79000000,
+		["atk"]=1820000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30016,
@@ -4355,8 +4371,8 @@ local monster_chapter = {
 	},
 	[33601]={
 		["monster_base"]=10048,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=54300000,
+		["atk"]=1810000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4367,8 +4383,8 @@ local monster_chapter = {
 	},
 	[33701]={
 		["monster_base"]=10049,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=60400000,
+		["atk"]=2010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -4379,8 +4395,8 @@ local monster_chapter = {
 	},
 	[33801]={
 		["monster_base"]=10004,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=70000000,
+		["atk"]=1880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -4391,8 +4407,8 @@ local monster_chapter = {
 	},
 	[33901]={
 		["monster_base"]=10006,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=79100000,
+		["atk"]=2070000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -4404,8 +4420,8 @@ local monster_chapter = {
 	[34001]={
 		["monster_base"]=20007,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=149400000,
+		["atk"]=1970000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30019,
@@ -4413,14 +4429,17 @@ local monster_chapter = {
 			30021
 		},
 		["skill"]={
-			10015
+			10060
+		},
+		["passive_skill"]={
+			10061
 		},
 		["monster_exp"]=12000
 	},
 	[34101]={
 		["monster_base"]=10020,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=86700000,
+		["atk"]=1970000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -4431,8 +4450,8 @@ local monster_chapter = {
 	},
 	[34201]={
 		["monster_base"]=10024,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=97800000,
+		["atk"]=2030000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -4443,8 +4462,8 @@ local monster_chapter = {
 	},
 	[34301]={
 		["monster_base"]=10012,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=103500000,
+		["atk"]=2080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4455,8 +4474,8 @@ local monster_chapter = {
 	},
 	[34401]={
 		["monster_base"]=10016,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=112200000,
+		["atk"]=2150000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20043,
@@ -4468,8 +4487,8 @@ local monster_chapter = {
 	[34501]={
 		["monster_base"]=20002,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=203300000,
+		["atk"]=2020000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30004,
@@ -4483,8 +4502,8 @@ local monster_chapter = {
 	},
 	[34601]={
 		["monster_base"]=10004,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=134900000,
+		["atk"]=2190000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -4495,8 +4514,8 @@ local monster_chapter = {
 	},
 	[34701]={
 		["monster_base"]=10012,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=143400000,
+		["atk"]=2250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4507,8 +4526,8 @@ local monster_chapter = {
 	},
 	[34801]={
 		["monster_base"]=10049,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=157800000,
+		["atk"]=2310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -4519,8 +4538,8 @@ local monster_chapter = {
 	},
 	[34901]={
 		["monster_base"]=10048,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=172200000,
+		["atk"]=2360000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4532,8 +4551,8 @@ local monster_chapter = {
 	[35001]={
 		["monster_base"]=20009,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=271700000,
+		["atk"]=2950000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30025,
@@ -4551,8 +4570,8 @@ local monster_chapter = {
 	},
 	[35101]={
 		["monster_base"]=10004,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=29500000,
+		["atk"]=1690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -4563,8 +4582,8 @@ local monster_chapter = {
 	},
 	[35201]={
 		["monster_base"]=10020,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=40900000,
+		["atk"]=1760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -4575,8 +4594,8 @@ local monster_chapter = {
 	},
 	[35301]={
 		["monster_base"]=10048,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=45900000,
+		["atk"]=1830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4587,8 +4606,8 @@ local monster_chapter = {
 	},
 	[35401]={
 		["monster_base"]=10012,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=60700000,
+		["atk"]=1880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4600,8 +4619,8 @@ local monster_chapter = {
 	[35501]={
 		["monster_base"]=20014,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=83900000,
+		["atk"]=1940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30040,
@@ -4618,8 +4637,8 @@ local monster_chapter = {
 	},
 	[35601]={
 		["monster_base"]=10004,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=57700000,
+		["atk"]=1940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -4630,8 +4649,8 @@ local monster_chapter = {
 	},
 	[35701]={
 		["monster_base"]=10012,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=64200000,
+		["atk"]=2150000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4642,8 +4661,8 @@ local monster_chapter = {
 	},
 	[35801]={
 		["monster_base"]=10037,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=74400000,
+		["atk"]=2020000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20106,
@@ -4654,8 +4673,8 @@ local monster_chapter = {
 	},
 	[35901]={
 		["monster_base"]=10048,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=84000000,
+		["atk"]=2220000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4667,8 +4686,8 @@ local monster_chapter = {
 	[36001]={
 		["monster_base"]=20009,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=158700000,
+		["atk"]=2110000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30025,
@@ -4686,8 +4705,8 @@ local monster_chapter = {
 	},
 	[36101]={
 		["monster_base"]=10014,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=92100000,
+		["atk"]=2110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20037,
@@ -4698,8 +4717,8 @@ local monster_chapter = {
 	},
 	[36201]={
 		["monster_base"]=10027,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=103900000,
+		["atk"]=2180000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20076,
@@ -4710,8 +4729,8 @@ local monster_chapter = {
 	},
 	[36301]={
 		["monster_base"]=10017,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=109900000,
+		["atk"]=2230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20046,
@@ -4722,8 +4741,8 @@ local monster_chapter = {
 	},
 	[36401]={
 		["monster_base"]=10023,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=119200000,
+		["atk"]=2300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20064,
@@ -4735,8 +4754,8 @@ local monster_chapter = {
 	[36501]={
 		["monster_base"]=20015,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=215900000,
+		["atk"]=2160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30043,
@@ -4753,8 +4772,8 @@ local monster_chapter = {
 	},
 	[36601]={
 		["monster_base"]=10014,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=143300000,
+		["atk"]=2340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20037,
@@ -4765,8 +4784,8 @@ local monster_chapter = {
 	},
 	[36701]={
 		["monster_base"]=10002,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=152300000,
+		["atk"]=2410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20004,
@@ -4777,8 +4796,8 @@ local monster_chapter = {
 	},
 	[36801]={
 		["monster_base"]=10029,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=167600000,
+		["atk"]=2470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -4789,8 +4808,8 @@ local monster_chapter = {
 	},
 	[36901]={
 		["monster_base"]=10036,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=182900000,
+		["atk"]=2520000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20103,
@@ -4802,8 +4821,8 @@ local monster_chapter = {
 	[37001]={
 		["monster_base"]=30009,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=288500000,
+		["atk"]=3150000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			40021,
@@ -4818,8 +4837,8 @@ local monster_chapter = {
 	},
 	[37101]={
 		["monster_base"]=10054,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=30700000,
+		["atk"]=1770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -4830,8 +4849,8 @@ local monster_chapter = {
 	},
 	[37201]={
 		["monster_base"]=10024,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=42500000,
+		["atk"]=1850000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -4842,8 +4861,8 @@ local monster_chapter = {
 	},
 	[37301]={
 		["monster_base"]=10012,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=47700000,
+		["atk"]=1920000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4854,8 +4873,8 @@ local monster_chapter = {
 	},
 	[37401]={
 		["monster_base"]=10048,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=63100000,
+		["atk"]=1980000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4867,8 +4886,8 @@ local monster_chapter = {
 	[37501]={
 		["monster_base"]=20009,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=87200000,
+		["atk"]=2030000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30025,
@@ -4886,8 +4905,8 @@ local monster_chapter = {
 	},
 	[37601]={
 		["monster_base"]=10048,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=60000000,
+		["atk"]=2040000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20139,
@@ -4898,8 +4917,8 @@ local monster_chapter = {
 	},
 	[37701]={
 		["monster_base"]=10054,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=66700000,
+		["atk"]=2260000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -4910,8 +4929,8 @@ local monster_chapter = {
 	},
 	[37801]={
 		["monster_base"]=10012,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=77300000,
+		["atk"]=2120000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20031,
@@ -4922,8 +4941,8 @@ local monster_chapter = {
 	},
 	[37901]={
 		["monster_base"]=10024,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=87300000,
+		["atk"]=2320000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20067,
@@ -4935,8 +4954,8 @@ local monster_chapter = {
 	[38001]={
 		["monster_base"]=20006,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=164900000,
+		["atk"]=2210000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30016,
@@ -4953,8 +4972,8 @@ local monster_chapter = {
 	},
 	[38101]={
 		["monster_base"]=10020,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=95700000,
+		["atk"]=2210000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -4965,8 +4984,8 @@ local monster_chapter = {
 	},
 	[38201]={
 		["monster_base"]=10053,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=108000000,
+		["atk"]=2280000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -4977,8 +4996,8 @@ local monster_chapter = {
 	},
 	[38301]={
 		["monster_base"]=10006,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=114200000,
+		["atk"]=2340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -4989,8 +5008,8 @@ local monster_chapter = {
 	},
 	[38401]={
 		["monster_base"]=10004,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=123900000,
+		["atk"]=2410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -5002,8 +5021,8 @@ local monster_chapter = {
 	[38501]={
 		["monster_base"]=20004,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=224300000,
+		["atk"]=2260000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30010,
@@ -5017,8 +5036,8 @@ local monster_chapter = {
 	},
 	[38601]={
 		["monster_base"]=10053,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=148900000,
+		["atk"]=2450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -5029,8 +5048,8 @@ local monster_chapter = {
 	},
 	[38701]={
 		["monster_base"]=10049,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=158200000,
+		["atk"]=2530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20142,
@@ -5041,8 +5060,8 @@ local monster_chapter = {
 	},
 	[38801]={
 		["monster_base"]=10020,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=174100000,
+		["atk"]=2590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20055,
@@ -5053,8 +5072,8 @@ local monster_chapter = {
 	},
 	[38901]={
 		["monster_base"]=10054,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=190000000,
+		["atk"]=2640000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5066,8 +5085,8 @@ local monster_chapter = {
 	[39001]={
 		["monster_base"]=20010,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=299700000,
+		["atk"]=3280000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30028,
@@ -5086,8 +5105,8 @@ local monster_chapter = {
 	},
 	[39101]={
 		["monster_base"]=10052,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=32700000,
+		["atk"]=1900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -5098,8 +5117,8 @@ local monster_chapter = {
 	},
 	[39201]={
 		["monster_base"]=10050,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=45200000,
+		["atk"]=1990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -5110,8 +5129,8 @@ local monster_chapter = {
 	},
 	[39301]={
 		["monster_base"]=10010,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=50700000,
+		["atk"]=2060000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -5122,8 +5141,8 @@ local monster_chapter = {
 	},
 	[39401]={
 		["monster_base"]=10053,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=67100000,
+		["atk"]=2120000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -5135,8 +5154,8 @@ local monster_chapter = {
 	[39501]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=92700000,
+		["atk"]=2180000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30013,
@@ -5150,8 +5169,8 @@ local monster_chapter = {
 	},
 	[39601]={
 		["monster_base"]=10040,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=63800000,
+		["atk"]=2190000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -5162,8 +5181,8 @@ local monster_chapter = {
 	},
 	[39701]={
 		["monster_base"]=10052,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=70900000,
+		["atk"]=2420000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -5174,8 +5193,8 @@ local monster_chapter = {
 	},
 	[39801]={
 		["monster_base"]=10054,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=82200000,
+		["atk"]=2270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5186,8 +5205,8 @@ local monster_chapter = {
 	},
 	[39901]={
 		["monster_base"]=10038,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=92800000,
+		["atk"]=2490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -5199,8 +5218,8 @@ local monster_chapter = {
 	[40001]={
 		["monster_base"]=20015,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=175200000,
+		["atk"]=2360000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30043,
@@ -5217,8 +5236,8 @@ local monster_chapter = {
 	},
 	[40101]={
 		["monster_base"]=10009,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=101700000,
+		["atk"]=2370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -5229,8 +5248,8 @@ local monster_chapter = {
 	},
 	[40201]={
 		["monster_base"]=10054,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=114800000,
+		["atk"]=2440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5241,8 +5260,8 @@ local monster_chapter = {
 	},
 	[40301]={
 		["monster_base"]=10052,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=121300000,
+		["atk"]=2510000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -5253,8 +5272,8 @@ local monster_chapter = {
 	},
 	[40401]={
 		["monster_base"]=10050,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=131600000,
+		["atk"]=2580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -5266,8 +5285,8 @@ local monster_chapter = {
 	[40501]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=238300000,
+		["atk"]=2420000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30022,
@@ -5281,8 +5300,8 @@ local monster_chapter = {
 	},
 	[40601]={
 		["monster_base"]=10038,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=158200000,
+		["atk"]=2630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -5293,8 +5312,8 @@ local monster_chapter = {
 	},
 	[40701]={
 		["monster_base"]=10053,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=168100000,
+		["atk"]=2700000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -5305,8 +5324,8 @@ local monster_chapter = {
 	},
 	[40801]={
 		["monster_base"]=10050,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=185000000,
+		["atk"]=2770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -5317,8 +5336,8 @@ local monster_chapter = {
 	},
 	[40901]={
 		["monster_base"]=10040,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=201900000,
+		["atk"]=2820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -5330,8 +5349,8 @@ local monster_chapter = {
 	[41001]={
 		["monster_base"]=30015,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=318400000,
+		["atk"]=3500000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			40025,
@@ -5346,8 +5365,8 @@ local monster_chapter = {
 	},
 	[41101]={
 		["monster_base"]=10043,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=34100000,
+		["atk"]=2010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -5358,8 +5377,8 @@ local monster_chapter = {
 	},
 	[41201]={
 		["monster_base"]=10054,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=47200000,
+		["atk"]=2090000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5370,8 +5389,8 @@ local monster_chapter = {
 	},
 	[41301]={
 		["monster_base"]=10038,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=52900000,
+		["atk"]=2170000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -5382,8 +5401,8 @@ local monster_chapter = {
 	},
 	[41401]={
 		["monster_base"]=10053,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=70000000,
+		["atk"]=2230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -5395,8 +5414,8 @@ local monster_chapter = {
 	[41501]={
 		["monster_base"]=20010,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=96700000,
+		["atk"]=2290000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30028,
@@ -5415,8 +5434,8 @@ local monster_chapter = {
 	},
 	[41601]={
 		["monster_base"]=10038,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=66600000,
+		["atk"]=2300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -5427,8 +5446,8 @@ local monster_chapter = {
 	},
 	[41701]={
 		["monster_base"]=10053,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=74000000,
+		["atk"]=2540000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -5439,8 +5458,8 @@ local monster_chapter = {
 	},
 	[41801]={
 		["monster_base"]=10006,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=85700000,
+		["atk"]=2390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
@@ -5451,8 +5470,8 @@ local monster_chapter = {
 	},
 	[41901]={
 		["monster_base"]=10004,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=96800000,
+		["atk"]=2610000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
@@ -5464,8 +5483,8 @@ local monster_chapter = {
 	[42001]={
 		["monster_base"]=20004,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=182700000,
+		["atk"]=2480000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30010,
@@ -5479,8 +5498,8 @@ local monster_chapter = {
 	},
 	[42101]={
 		["monster_base"]=10052,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=106100000,
+		["atk"]=2490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -5491,8 +5510,8 @@ local monster_chapter = {
 	},
 	[42201]={
 		["monster_base"]=10050,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=119700000,
+		["atk"]=2570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -5503,8 +5522,8 @@ local monster_chapter = {
 	},
 	[42301]={
 		["monster_base"]=10010,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=126500000,
+		["atk"]=2640000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -5515,8 +5534,8 @@ local monster_chapter = {
 	},
 	[42401]={
 		["monster_base"]=10039,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=137200000,
+		["atk"]=2710000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -5528,8 +5547,8 @@ local monster_chapter = {
 	[42501]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=248500000,
+		["atk"]=2540000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30013,
@@ -5543,8 +5562,8 @@ local monster_chapter = {
 	},
 	[42601]={
 		["monster_base"]=10040,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=165000000,
+		["atk"]=2760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -5555,8 +5574,8 @@ local monster_chapter = {
 	},
 	[42701]={
 		["monster_base"]=10010,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=175300000,
+		["atk"]=2840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -5567,8 +5586,8 @@ local monster_chapter = {
 	},
 	[42801]={
 		["monster_base"]=10040,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=192900000,
+		["atk"]=2910000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -5579,8 +5598,8 @@ local monster_chapter = {
 	},
 	[42901]={
 		["monster_base"]=10009,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=210500000,
+		["atk"]=2970000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -5592,8 +5611,8 @@ local monster_chapter = {
 	[43001]={
 		["monster_base"]=20024,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=331900000,
+		["atk"]=3660000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30070,
@@ -5608,8 +5627,8 @@ local monster_chapter = {
 	},
 	[43101]={
 		["monster_base"]=10009,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=34800000,
+		["atk"]=2060000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -5620,8 +5639,8 @@ local monster_chapter = {
 	},
 	[43201]={
 		["monster_base"]=10054,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=48100000,
+		["atk"]=2150000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5632,8 +5651,8 @@ local monster_chapter = {
 	},
 	[43301]={
 		["monster_base"]=10052,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=53900000,
+		["atk"]=2230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -5644,8 +5663,8 @@ local monster_chapter = {
 	},
 	[43401]={
 		["monster_base"]=10050,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=71300000,
+		["atk"]=2300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -5657,8 +5676,8 @@ local monster_chapter = {
 	[43501]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=98500000,
+		["atk"]=2340000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30022,
@@ -5672,8 +5691,8 @@ local monster_chapter = {
 	},
 	[43601]={
 		["monster_base"]=10044,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=67900000,
+		["atk"]=2370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -5684,8 +5703,8 @@ local monster_chapter = {
 	},
 	[43701]={
 		["monster_base"]=10054,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=75400000,
+		["atk"]=2610000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5696,8 +5715,8 @@ local monster_chapter = {
 	},
 	[43801]={
 		["monster_base"]=10014,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=87300000,
+		["atk"]=2460000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20037,
@@ -5708,8 +5727,8 @@ local monster_chapter = {
 	},
 	[43901]={
 		["monster_base"]=10018,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=98600000,
+		["atk"]=2680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20049,
@@ -5721,8 +5740,8 @@ local monster_chapter = {
 	[44001]={
 		["monster_base"]=20014,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=186100000,
+		["atk"]=2540000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30040,
@@ -5739,8 +5758,8 @@ local monster_chapter = {
 	},
 	[44101]={
 		["monster_base"]=10009,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=108100000,
+		["atk"]=2560000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -5751,8 +5770,8 @@ local monster_chapter = {
 	},
 	[44201]={
 		["monster_base"]=10010,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=121900000,
+		["atk"]=2640000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -5763,8 +5782,8 @@ local monster_chapter = {
 	},
 	[44301]={
 		["monster_base"]=10053,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=128900000,
+		["atk"]=2710000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -5775,8 +5794,8 @@ local monster_chapter = {
 	},
 	[44401]={
 		["monster_base"]=10039,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=139800000,
+		["atk"]=2780000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -5788,8 +5807,8 @@ local monster_chapter = {
 	[44501]={
 		["monster_base"]=20012,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=253100000,
+		["atk"]=2600000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30034,
@@ -5803,8 +5822,8 @@ local monster_chapter = {
 	},
 	[44601]={
 		["monster_base"]=10052,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=168100000,
+		["atk"]=2830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -5815,8 +5834,8 @@ local monster_chapter = {
 	},
 	[44701]={
 		["monster_base"]=10043,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=178500000,
+		["atk"]=2910000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -5827,8 +5846,8 @@ local monster_chapter = {
 	},
 	[44801]={
 		["monster_base"]=10054,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=196500000,
+		["atk"]=2980000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5839,8 +5858,8 @@ local monster_chapter = {
 	},
 	[44901]={
 		["monster_base"]=10050,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=214400000,
+		["atk"]=3040000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -5852,8 +5871,8 @@ local monster_chapter = {
 	[45001]={
 		["monster_base"]=20019,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=338000000,
+		["atk"]=3750000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30055,
@@ -5871,8 +5890,8 @@ local monster_chapter = {
 	},
 	[45101]={
 		["monster_base"]=10046,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=37600000,
+		["atk"]=2250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20133,
@@ -5883,8 +5902,8 @@ local monster_chapter = {
 	},
 	[45201]={
 		["monster_base"]=10043,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=51900000,
+		["atk"]=2350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -5895,8 +5914,8 @@ local monster_chapter = {
 	},
 	[45301]={
 		["monster_base"]=10050,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=58200000,
+		["atk"]=2430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -5907,8 +5926,8 @@ local monster_chapter = {
 	},
 	[45401]={
 		["monster_base"]=10054,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=76900000,
+		["atk"]=2500000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -5920,8 +5939,8 @@ local monster_chapter = {
 	[45501]={
 		["monster_base"]=20010,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=106300000,
+		["atk"]=2550000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30028,
@@ -5940,8 +5959,8 @@ local monster_chapter = {
 	},
 	[45601]={
 		["monster_base"]=10052,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=73300000,
+		["atk"]=2580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -5952,8 +5971,8 @@ local monster_chapter = {
 	},
 	[45701]={
 		["monster_base"]=10045,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=81400000,
+		["atk"]=2840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -5964,8 +5983,8 @@ local monster_chapter = {
 	},
 	[45801]={
 		["monster_base"]=10043,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=94200000,
+		["atk"]=2670000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -5976,8 +5995,8 @@ local monster_chapter = {
 	},
 	[45901]={
 		["monster_base"]=10053,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=106400000,
+		["atk"]=2920000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -5989,8 +6008,8 @@ local monster_chapter = {
 	[46001]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=200800000,
+		["atk"]=2760000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30013,
@@ -6004,8 +6023,8 @@ local monster_chapter = {
 	},
 	[46101]={
 		["monster_base"]=10045,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=116600000,
+		["atk"]=2790000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -6016,8 +6035,8 @@ local monster_chapter = {
 	},
 	[46201]={
 		["monster_base"]=10052,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=131500000,
+		["atk"]=2870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -6028,8 +6047,8 @@ local monster_chapter = {
 	},
 	[46301]={
 		["monster_base"]=10010,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=139100000,
+		["atk"]=2940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -6040,8 +6059,8 @@ local monster_chapter = {
 	},
 	[46401]={
 		["monster_base"]=10039,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=150800000,
+		["atk"]=3030000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -6053,8 +6072,8 @@ local monster_chapter = {
 	[46501]={
 		["monster_base"]=20012,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=273000000,
+		["atk"]=2820000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30034,
@@ -6068,8 +6087,8 @@ local monster_chapter = {
 	},
 	[46601]={
 		["monster_base"]=10050,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=181300000,
+		["atk"]=3080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -6080,8 +6099,8 @@ local monster_chapter = {
 	},
 	[46701]={
 		["monster_base"]=10043,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=192600000,
+		["atk"]=3170000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -6092,8 +6111,8 @@ local monster_chapter = {
 	},
 	[46801]={
 		["monster_base"]=10046,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=212000000,
+		["atk"]=3240000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20133,
@@ -6104,8 +6123,8 @@ local monster_chapter = {
 	},
 	[46901]={
 		["monster_base"]=10054,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=231300000,
+		["atk"]=3310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -6117,8 +6136,8 @@ local monster_chapter = {
 	[47001]={
 		["monster_base"]=20020,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=364600000,
+		["atk"]=4060000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30058,
@@ -6136,8 +6155,8 @@ local monster_chapter = {
 	},
 	[47101]={
 		["monster_base"]=10047,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=38400000,
+		["atk"]=2310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20136,
@@ -6148,8 +6167,8 @@ local monster_chapter = {
 	},
 	[47201]={
 		["monster_base"]=10038,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=52900000,
+		["atk"]=2410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -6160,8 +6179,8 @@ local monster_chapter = {
 	},
 	[47301]={
 		["monster_base"]=10021,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=59400000,
+		["atk"]=2490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20058,
@@ -6172,8 +6191,8 @@ local monster_chapter = {
 	},
 	[47401]={
 		["monster_base"]=10040,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=78400000,
+		["atk"]=2570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -6185,8 +6204,8 @@ local monster_chapter = {
 	[47501]={
 		["monster_base"]=20017,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=108400000,
+		["atk"]=2610000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30049,
@@ -6194,15 +6213,14 @@ local monster_chapter = {
 			30051
 		},
 		["skill"]={
-			10027,
-			10028
+			10027
 		},
 		["monster_exp"]=18000
 	},
 	[47601]={
 		["monster_base"]=10010,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=74800000,
+		["atk"]=2650000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -6213,8 +6231,8 @@ local monster_chapter = {
 	},
 	[47701]={
 		["monster_base"]=10039,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=83000000,
+		["atk"]=2920000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -6225,8 +6243,8 @@ local monster_chapter = {
 	},
 	[47801]={
 		["monster_base"]=10040,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=96100000,
+		["atk"]=2750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -6237,8 +6255,8 @@ local monster_chapter = {
 	},
 	[47901]={
 		["monster_base"]=10009,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=108500000,
+		["atk"]=2990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -6250,8 +6268,8 @@ local monster_chapter = {
 	[48001]={
 		["monster_base"]=20024,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=204700000,
+		["atk"]=2830000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30070,
@@ -6266,8 +6284,8 @@ local monster_chapter = {
 	},
 	[48101]={
 		["monster_base"]=10052,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=118900000,
+		["atk"]=2860000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -6278,8 +6296,8 @@ local monster_chapter = {
 	},
 	[48201]={
 		["monster_base"]=10043,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=134100000,
+		["atk"]=2950000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -6290,8 +6308,8 @@ local monster_chapter = {
 	},
 	[48301]={
 		["monster_base"]=10050,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=141800000,
+		["atk"]=3020000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -6302,8 +6320,8 @@ local monster_chapter = {
 	},
 	[48401]={
 		["monster_base"]=10054,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=153700000,
+		["atk"]=3110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -6315,8 +6333,8 @@ local monster_chapter = {
 	[48501]={
 		["monster_base"]=20019,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=278300000,
+		["atk"]=2890000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30055,
@@ -6334,8 +6352,8 @@ local monster_chapter = {
 	},
 	[48601]={
 		["monster_base"]=10029,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=184800000,
+		["atk"]=3160000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -6346,8 +6364,8 @@ local monster_chapter = {
 	},
 	[48701]={
 		["monster_base"]=10050,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=196300000,
+		["atk"]=3250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20145,
@@ -6358,8 +6376,8 @@ local monster_chapter = {
 	},
 	[48801]={
 		["monster_base"]=10043,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=216100000,
+		["atk"]=3330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -6370,8 +6388,8 @@ local monster_chapter = {
 	},
 	[48901]={
 		["monster_base"]=10028,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=235800000,
+		["atk"]=3390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -6383,8 +6401,8 @@ local monster_chapter = {
 	[49001]={
 		["monster_base"]=20013,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=371600000,
+		["atk"]=4150000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30037,
@@ -6399,8 +6417,8 @@ local monster_chapter = {
 	},
 	[49101]={
 		["monster_base"]=10052,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=41500000,
+		["atk"]=2520000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -6411,8 +6429,8 @@ local monster_chapter = {
 	},
 	[49201]={
 		["monster_base"]=10045,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=57200000,
+		["atk"]=2630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20130,
@@ -6423,8 +6441,8 @@ local monster_chapter = {
 	},
 	[49301]={
 		["monster_base"]=10043,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=64200000,
+		["atk"]=2720000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20124,
@@ -6435,8 +6453,8 @@ local monster_chapter = {
 	},
 	[49401]={
 		["monster_base"]=10053,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=84700000,
+		["atk"]=2800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -6448,8 +6466,8 @@ local monster_chapter = {
 	[49501]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=117100000,
+		["atk"]=2840000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30013,
@@ -6463,8 +6481,8 @@ local monster_chapter = {
 	},
 	[49601]={
 		["monster_base"]=10010,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=80800000,
+		["atk"]=2880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -6475,8 +6493,8 @@ local monster_chapter = {
 	},
 	[49701]={
 		["monster_base"]=10039,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=89700000,
+		["atk"]=3170000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -6487,8 +6505,8 @@ local monster_chapter = {
 	},
 	[49801]={
 		["monster_base"]=10040,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=103900000,
+		["atk"]=2990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -6499,8 +6517,8 @@ local monster_chapter = {
 	},
 	[49901]={
 		["monster_base"]=10009,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=117300000,
+		["atk"]=3260000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -6512,8 +6530,8 @@ local monster_chapter = {
 	[50001]={
 		["monster_base"]=20024,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=221200000,
+		["atk"]=3070000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30070,
@@ -6528,8 +6546,8 @@ local monster_chapter = {
 	},
 	[50101]={
 		["monster_base"]=10040,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=128500000,
+		["atk"]=3110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -6540,8 +6558,8 @@ local monster_chapter = {
 	},
 	[50201]={
 		["monster_base"]=10039,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=144900000,
+		["atk"]=3200000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -6552,8 +6570,8 @@ local monster_chapter = {
 	},
 	[50301]={
 		["monster_base"]=10010,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=153200000,
+		["atk"]=3280000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -6564,8 +6582,8 @@ local monster_chapter = {
 	},
 	[50401]={
 		["monster_base"]=10039,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=166100000,
+		["atk"]=3380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -6577,8 +6595,8 @@ local monster_chapter = {
 	[50501]={
 		["monster_base"]=20012,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=300700000,
+		["atk"]=3140000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30034,
@@ -6592,8 +6610,8 @@ local monster_chapter = {
 	},
 	[50601]={
 		["monster_base"]=10010,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=199700000,
+		["atk"]=3440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -6604,8 +6622,8 @@ local monster_chapter = {
 	},
 	[50701]={
 		["monster_base"]=10040,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=212100000,
+		["atk"]=3530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20115,
@@ -6616,8 +6634,8 @@ local monster_chapter = {
 	},
 	[50801]={
 		["monster_base"]=10038,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=233500000,
+		["atk"]=3620000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20109,
@@ -6628,8 +6646,8 @@ local monster_chapter = {
 	},
 	[50901]={
 		["monster_base"]=10032,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=254800000,
+		["atk"]=3680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20091,
@@ -6641,8 +6659,8 @@ local monster_chapter = {
 	[51001]={
 		["monster_base"]=20018,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=401500000,
+		["atk"]=4500000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30052,
@@ -6660,8 +6678,8 @@ local monster_chapter = {
 	},
 	[51101]={
 		["monster_base"]=10033,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=45000000,
+		["atk"]=2750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -6672,8 +6690,8 @@ local monster_chapter = {
 	},
 	[51201]={
 		["monster_base"]=10029,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=62000000,
+		["atk"]=2870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -6684,8 +6702,8 @@ local monster_chapter = {
 	},
 	[51301]={
 		["monster_base"]=10031,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=69600000,
+		["atk"]=2970000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20088,
@@ -6696,8 +6714,8 @@ local monster_chapter = {
 	},
 	[51401]={
 		["monster_base"]=10028,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=91800000,
+		["atk"]=3050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -6709,8 +6727,8 @@ local monster_chapter = {
 	[51501]={
 		["monster_base"]=20013,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=126900000,
+		["atk"]=3090000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30037,
@@ -6725,8 +6743,8 @@ local monster_chapter = {
 	},
 	[51601]={
 		["monster_base"]=10030,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=87600000,
+		["atk"]=3140000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20085,
@@ -6737,8 +6755,8 @@ local monster_chapter = {
 	},
 	[51701]={
 		["monster_base"]=10029,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=97200000,
+		["atk"]=3460000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -6749,8 +6767,8 @@ local monster_chapter = {
 	},
 	[51801]={
 		["monster_base"]=10033,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=112600000,
+		["atk"]=3260000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -6761,8 +6779,8 @@ local monster_chapter = {
 	},
 	[51901]={
 		["monster_base"]=10054,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=127100000,
+		["atk"]=3550000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -6774,8 +6792,8 @@ local monster_chapter = {
 	[52001]={
 		["monster_base"]=20010,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=239700000,
+		["atk"]=3340000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30028,
@@ -6794,8 +6812,8 @@ local monster_chapter = {
 	},
 	[52101]={
 		["monster_base"]=10053,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=139300000,
+		["atk"]=3390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -6806,8 +6824,8 @@ local monster_chapter = {
 	},
 	[52201]={
 		["monster_base"]=10033,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=157100000,
+		["atk"]=3490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -6818,8 +6836,8 @@ local monster_chapter = {
 	},
 	[52301]={
 		["monster_base"]=10029,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=166000000,
+		["atk"]=3580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -6830,8 +6848,8 @@ local monster_chapter = {
 	},
 	[52401]={
 		["monster_base"]=10054,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=180000000,
+		["atk"]=3680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -6843,8 +6861,8 @@ local monster_chapter = {
 	[52501]={
 		["monster_base"]=20020,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=325900000,
+		["atk"]=3420000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30058,
@@ -6862,8 +6880,8 @@ local monster_chapter = {
 	},
 	[52601]={
 		["monster_base"]=10053,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=216400000,
+		["atk"]=3750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -6874,8 +6892,8 @@ local monster_chapter = {
 	},
 	[52701]={
 		["monster_base"]=10028,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=229900000,
+		["atk"]=3850000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -6886,8 +6904,8 @@ local monster_chapter = {
 	},
 	[52801]={
 		["monster_base"]=10046,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=253100000,
+		["atk"]=3940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20133,
@@ -6898,8 +6916,8 @@ local monster_chapter = {
 	},
 	[52901]={
 		["monster_base"]=10058,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=276100000,
+		["atk"]=4010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20169,
@@ -6911,8 +6929,8 @@ local monster_chapter = {
 	[53001]={
 		["monster_base"]=20032,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=435100000,
+		["atk"]=4900000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30094,
@@ -6933,8 +6951,8 @@ local monster_chapter = {
 	},
 	[53101]={
 		["monster_base"]=10057,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=41800000,
+		["atk"]=2580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20166,
@@ -6945,8 +6963,8 @@ local monster_chapter = {
 	},
 	[53201]={
 		["monster_base"]=10046,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=57600000,
+		["atk"]=2690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20133,
@@ -6957,8 +6975,8 @@ local monster_chapter = {
 	},
 	[53301]={
 		["monster_base"]=10052,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=64700000,
+		["atk"]=2780000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -6969,8 +6987,8 @@ local monster_chapter = {
 	},
 	[53401]={
 		["monster_base"]=10029,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=85300000,
+		["atk"]=2860000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -6982,8 +7000,8 @@ local monster_chapter = {
 	[53501]={
 		["monster_base"]=20008,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=117800000,
+		["atk"]=2880000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30022,
@@ -6997,8 +7015,8 @@ local monster_chapter = {
 	},
 	[53601]={
 		["monster_base"]=10058,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=81400000,
+		["atk"]=2940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20169,
@@ -7009,8 +7027,8 @@ local monster_chapter = {
 	},
 	[53701]={
 		["monster_base"]=10033,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=90300000,
+		["atk"]=3230000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20094,
@@ -7021,8 +7039,8 @@ local monster_chapter = {
 	},
 	[53801]={
 		["monster_base"]=10044,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=104600000,
+		["atk"]=3050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20127,
@@ -7033,8 +7051,8 @@ local monster_chapter = {
 	},
 	[53901]={
 		["monster_base"]=10053,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=118000000,
+		["atk"]=3320000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -7046,20 +7064,23 @@ local monster_chapter = {
 	[54001]={
 		["monster_base"]=20011,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=222600000,
+		["atk"]=3120000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30031,
 			30032,
 			30033
 		},
+		["skill"]={
+			10018
+		},
 		["monster_exp"]=12000
 	},
 	[54101]={
 		["monster_base"]=10029,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=129400000,
+		["atk"]=3170000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20082,
@@ -7070,8 +7091,8 @@ local monster_chapter = {
 	},
 	[54201]={
 		["monster_base"]=10058,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=145900000,
+		["atk"]=3260000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20169,
@@ -7082,8 +7103,8 @@ local monster_chapter = {
 	},
 	[54301]={
 		["monster_base"]=10052,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=154100000,
+		["atk"]=3340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20151,
@@ -7094,8 +7115,8 @@ local monster_chapter = {
 	},
 	[54401]={
 		["monster_base"]=10054,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=167100000,
+		["atk"]=3440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20157,
@@ -7107,8 +7128,8 @@ local monster_chapter = {
 	[54501]={
 		["monster_base"]=20005,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=302600000,
+		["atk"]=3190000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30013,
@@ -7122,8 +7143,8 @@ local monster_chapter = {
 	},
 	[54601]={
 		["monster_base"]=10053,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=200900000,
+		["atk"]=3500000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -7134,8 +7155,8 @@ local monster_chapter = {
 	},
 	[54701]={
 		["monster_base"]=10028,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=213500000,
+		["atk"]=3590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20079,
@@ -7146,8 +7167,8 @@ local monster_chapter = {
 	},
 	[54801]={
 		["monster_base"]=10046,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=235000000,
+		["atk"]=3680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20133,
@@ -7158,8 +7179,8 @@ local monster_chapter = {
 	},
 	[54901]={
 		["monster_base"]=10057,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=256300000,
+		["atk"]=3750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20166,
@@ -7171,8 +7192,8 @@ local monster_chapter = {
 	[55001]={
 		["monster_base"]=20032,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=323120000,
+		["atk"]=4104000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30094,
@@ -7195,8 +7216,8 @@ local monster_chapter = {
 	[55101]={
 		["monster_base"]=20030,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=242340000,
+		["atk"]=3648000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30088,
@@ -7214,8 +7235,8 @@ local monster_chapter = {
 	},
 	[55201]={
 		["monster_base"]=10056,
-		["hp"]=15500000,
-		["atk"]=770000,
+		["hp"]=46200000,
+		["atk"]=2870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20163,
@@ -7226,8 +7247,8 @@ local monster_chapter = {
 	},
 	[55301]={
 		["monster_base"]=10009,
-		["hp"]=21900000,
-		["atk"]=800000,
+		["hp"]=63700000,
+		["atk"]=2990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -7238,8 +7259,8 @@ local monster_chapter = {
 	},
 	[55401]={
 		["monster_base"]=10010,
-		["hp"]=24600000,
-		["atk"]=840000,
+		["hp"]=71500000,
+		["atk"]=3090000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20028,
@@ -7250,8 +7271,8 @@ local monster_chapter = {
 	},
 	[55501]={
 		["monster_base"]=10039,
-		["hp"]=32600000,
-		["atk"]=880000,
+		["hp"]=94300000,
+		["atk"]=3180000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20112,
@@ -7263,8 +7284,8 @@ local monster_chapter = {
 	[55601]={
 		["monster_base"]=20012,
 		["is_boss"]=1,
-		["hp"]=45300000,
-		["atk"]=940000,
+		["hp"]=130200000,
+		["atk"]=3200000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30034,
@@ -7278,8 +7299,8 @@ local monster_chapter = {
 	},
 	[55701]={
 		["monster_base"]=10009,
-		["hp"]=30800000,
-		["atk"]=900000,
+		["hp"]=90000000,
+		["atk"]=3270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20025,
@@ -7290,8 +7311,8 @@ local monster_chapter = {
 	},
 	[55801]={
 		["monster_base"]=10055,
-		["hp"]=34500000,
-		["atk"]=1010000,
+		["hp"]=99800000,
+		["atk"]=3600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20160,
@@ -7302,8 +7323,8 @@ local monster_chapter = {
 	},
 	[55901]={
 		["monster_base"]=10046,
-		["hp"]=39900000,
-		["atk"]=940000,
+		["hp"]=115600000,
+		["atk"]=3390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20133,
@@ -7314,8 +7335,8 @@ local monster_chapter = {
 	},
 	[56001]={
 		["monster_base"]=10057,
-		["hp"]=45300000,
-		["atk"]=1050000,
+		["hp"]=130400000,
+		["atk"]=3690000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20166,
@@ -7327,8 +7348,8 @@ local monster_chapter = {
 	[56101]={
 		["monster_base"]=20030,
 		["is_boss"]=1,
-		["hp"]=86700000,
-		["atk"]=1050000,
+		["hp"]=246000000,
+		["atk"]=3460000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30088,
@@ -7346,8 +7367,8 @@ local monster_chapter = {
 	},
 	[56201]={
 		["monster_base"]=10058,
-		["hp"]=50200000,
-		["atk"]=1010000,
+		["hp"]=143000000,
+		["atk"]=3520000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20169,
@@ -7358,8 +7379,8 @@ local monster_chapter = {
 	},
 	[56301]={
 		["monster_base"]=10051,
-		["hp"]=56900000,
-		["atk"]=1050000,
+		["hp"]=161300000,
+		["atk"]=3630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20148,
@@ -7370,8 +7391,8 @@ local monster_chapter = {
 	},
 	[56401]={
 		["monster_base"]=10053,
-		["hp"]=60000000,
-		["atk"]=1080000,
+		["hp"]=170300000,
+		["atk"]=3720000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20154,
@@ -7382,8 +7403,8 @@ local monster_chapter = {
 	},
 	[56501]={
 		["monster_base"]=10055,
-		["hp"]=65000000,
-		["atk"]=1110000,
+		["hp"]=184700000,
+		["atk"]=3820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20160,
@@ -7395,8 +7416,8 @@ local monster_chapter = {
 	[56601]={
 		["monster_base"]=20029,
 		["is_boss"]=1,
-		["hp"]=126300000,
-		["atk"]=1160000,
+		["hp"]=334400000,
+		["atk"]=3540000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30085,
@@ -7404,14 +7425,14 @@ local monster_chapter = {
 			30087
 		},
 		["skill"]={
-			10018
+			10065
 		},
 		["monster_exp"]=24000
 	},
 	[56701]={
 		["monster_base"]=10058,
-		["hp"]=87200000,
-		["atk"]=1270000,
+		["hp"]=222000000,
+		["atk"]=3890000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20169,
@@ -7422,8 +7443,8 @@ local monster_chapter = {
 	},
 	[56801]={
 		["monster_base"]=10051,
-		["hp"]=92500000,
-		["atk"]=1300000,
+		["hp"]=236000000,
+		["atk"]=3990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20148,
@@ -7434,8 +7455,8 @@ local monster_chapter = {
 	},
 	[56901]={
 		["monster_base"]=10055,
-		["hp"]=101800000,
-		["atk"]=1340000,
+		["hp"]=259700000,
+		["atk"]=4090000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20160,
@@ -7446,8 +7467,8 @@ local monster_chapter = {
 	},
 	[57001]={
 		["monster_base"]=10057,
-		["hp"]=111000000,
-		["atk"]=1380000,
+		["hp"]=283300000,
+		["atk"]=4160000,
 		["atk_times"]=3,
 		["hurt_skill"]={
 			20166,
@@ -7459,8 +7480,8 @@ local monster_chapter = {
 	[57101]={
 		["monster_base"]=20031,
 		["is_boss"]=2,
-		["hp"]=195000000,
-		["atk"]=2000000,
+		["hp"]=446300000,
+		["atk"]=5060000,
 		["atk_times"]=4,
 		["hurt_skill"]={
 			30091,
diff --git a/lua/app/config/monster_daily_challenge.lua b/lua/app/config/monster_daily_challenge.lua
index 211f4ad2..8a17b7e6 100644
--- a/lua/app/config/monster_daily_challenge.lua
+++ b/lua/app/config/monster_daily_challenge.lua
@@ -585,7 +585,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=18000
 	},
 	[4602]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=15000000,
 		["atk"]=300000,
 		["atk_times"]=3,
@@ -621,7 +621,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=11000
 	},
 	[4902]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=22000000,
 		["atk"]=340000,
 		["atk_times"]=3,
@@ -670,7 +670,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=18000
 	},
 	[5302]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=27000000,
 		["atk"]=350000,
 		["atk_times"]=3,
@@ -1274,7 +1274,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=22000
 	},
 	[10102]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=8700000,
 		["atk"]=380000,
 		["atk_times"]=3,
@@ -1359,7 +1359,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=10000
 	},
 	[10802]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=24700000,
 		["atk"]=520000,
 		["atk_times"]=3,
@@ -1420,7 +1420,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=18000
 	},
 	[11302]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=36900000,
 		["atk"]=600000,
 		["atk_times"]=3,
@@ -1481,7 +1481,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=16000
 	},
 	[11802]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=61700000,
 		["atk"]=750000,
 		["atk_times"]=3,
@@ -1718,7 +1718,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=15000
 	},
 	[13702]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=58800000,
 		["atk"]=780000,
 		["atk_times"]=3,
@@ -1806,7 +1806,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=17000
 	},
 	[14402]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=26700000,
 		["atk"]=680000,
 		["atk_times"]=3,
@@ -1843,7 +1843,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=9000
 	},
 	[14702]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=28200000,
 		["atk"]=790000,
 		["atk_times"]=3,
@@ -1989,7 +1989,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=17000
 	},
 	[15902]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=82600000,
 		["atk"]=990000,
 		["atk_times"]=3,
@@ -2175,7 +2175,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=21000
 	},
 	[17402]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=57200000,
 		["atk"]=960000,
 		["atk_times"]=3,
@@ -2339,7 +2339,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=9000
 	},
 	[18702]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
@@ -2473,7 +2473,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=16000
 	},
 	[19802]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index b7124e65..db161989 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -264,7 +264,7 @@ local skill = {
 		["trigger"]=7,
 		["effect"]={
 			{
-				["type"]="dmg_addition_blue_add",
+				["type"]="dmg_addition_red_add",
 				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=1
@@ -933,22 +933,12 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_red",
-				["num"]=20000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_red",
-				["num"]=40000,
+				["num"]=60000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1,
-			2
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -1501,7 +1491,7 @@ local skill = {
 			{
 				{
 					["type"]="state",
-					["attr"]="lethargy",
+					["attr"]="vulnerable",
 					["op"]=">",
 					["v"]=0,
 					["side"]=2
@@ -1560,7 +1550,7 @@ local skill = {
 			{
 				{
 					["type"]="state",
-					["attr"]="lethargy",
+					["attr"]="vulnerable",
 					["op"]=">",
 					["v"]=0,
 					["side"]=2
@@ -1688,31 +1678,19 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=6680,
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
 				["type"]="hurt_yellow",
-				["num"]=6680,
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
 				["type"]="hurt_yellow",
-				["num"]=6680,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_yellow",
-				["num"]=6680,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_yellow",
-				["num"]=6680,
+				["num"]=13400,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -1730,9 +1708,7 @@ local skill = {
 		["effect_block"]={
 			1,
 			2,
-			3,
-			4,
-			5
+			3
 		},
 		["skill_position"]=1,
 		["shake_time"]=200,
@@ -2535,7 +2511,25 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_green",
-				["num"]=33400,
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=9400,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -2550,6 +2544,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
+		["effect_block"]={
+			1,
+			2,
+			3,
+			4
+		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -2605,7 +2605,25 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_green",
-				["num"]=33400,
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=9400,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -2626,6 +2644,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
+		["effect_block"]={
+			1,
+			2,
+			3,
+			5
+		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -2668,7 +2692,25 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_green",
-				["num"]=33400,
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=9400,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -2689,6 +2731,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
+		["effect_block"]={
+			1,
+			2,
+			3,
+			5
+		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -3352,7 +3400,19 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_blue",
-				["num"]=40000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_blue",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_blue",
+				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -3364,6 +3424,11 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1,
+			2,
+			4
+		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
@@ -4170,7 +4235,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=5000,
 				["round"]=2
 			}
@@ -4215,7 +4280,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -4645,7 +4710,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=999
 			}
@@ -4757,7 +4822,7 @@ local skill = {
 			2
 		},
 		["skill_position"]=1,
-		["cd"]=2,
+		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -4923,14 +4988,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=30000,
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["skill_position"]=1,
 		["cd"]=2,
@@ -5028,6 +5107,10 @@ local skill = {
 		["cd_start"]=0
 	},
 	[10027]={
+		["skill_type"]=9,
+		["skill_type_parameter"]={
+			10000
+		},
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -5039,9 +5122,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5058,15 +5138,6 @@ local skill = {
 			400
 		}
 	},
-	[10028]={
-		["skill_type"]=9,
-		["skill_type_parameter"]={
-			10000
-		},
-		["skill_position"]=2,
-		["cd"]=3,
-		["cd_start"]=0
-	},
 	[10029]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -5082,6 +5153,12 @@ local skill = {
 				["num"]=3500,
 				["ratio"]=10000,
 				["round"]=2
+			},
+			{
+				["type"]="lock",
+				["num"]=0,
+				["ratio"]=10000,
+				["round"]=1
 			}
 		},
 		["obj"]=2,
@@ -5101,22 +5178,6 @@ local skill = {
 			400
 		}
 	},
-	[10030]={
-		["effect_type"]=1,
-		["trigger"]=1,
-		["effect"]={
-			{
-				["type"]="lock",
-				["num"]=0,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=2,
-		["skill_position"]=2,
-		["cd"]=3,
-		["cd_start"]=0
-	},
 	[10031]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -5233,9 +5294,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5292,7 +5350,7 @@ local skill = {
 			1,
 			2,
 			3,
-			4
+			5
 		},
 		["skill_position"]=2,
 		["cd"]=3,
@@ -5321,14 +5379,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=30000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["skill_position"]=2,
 		["cd"]=2,
@@ -5482,7 +5554,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -5532,7 +5604,7 @@ local skill = {
 			1,
 			2,
 			3,
-			4
+			5
 		},
 		["skill_position"]=2,
 		["cd"]=3,
@@ -5561,9 +5633,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["name_act"]="skill01"
@@ -5578,14 +5647,35 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=50000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3,
+			4
 		},
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5612,9 +5702,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5655,9 +5742,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5688,14 +5772,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=20000,
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=15000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5711,20 +5809,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=20000,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="lock",
-				["num"]=0,
+				["type"]="hurt",
+				["num"]=5000,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["cd"]=2,
 		["cd_start"]=1,
@@ -5752,9 +5858,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["name_act"]="skill01"
@@ -5796,9 +5899,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5853,9 +5953,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5881,9 +5978,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5910,9 +6004,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5944,9 +6035,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5954,6 +6042,194 @@ local skill = {
 		["sound_hit"]=4200120,
 		["name_act"]="skill02"
 	},
+	[10060]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=60000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["skill_position"]=2,
+		["cd"]=2,
+		["cd_start"]=0,
+		["sound_hit"]=3300120,
+		["name_act"]="skill01",
+		["fx_self"]=200011
+	},
+	[10061]={
+		["effect_type"]=2,
+		["trigger"]=5,
+		["effect"]={
+			{
+				["type"]="vulnerable",
+				["num"]=2500,
+				["ratio"]=2500,
+				["round"]=1
+			}
+		},
+		["obj"]=2,
+		["cd"]=0,
+		["cd_start"]=0
+	},
+	[10062]={
+		["skill_type"]=3,
+		["skill_type_parameter"]={
+			5,
+			2
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=1,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["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
+		}
+	},
+	[10063]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=1,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["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
+		}
+	},
+	[10064]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=1,
+				["ratio"]=10000,
+				["round"]=2
+			},
+			{
+				["type"]="weaken",
+				["num"]=2500,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["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
+		}
+	},
+	[10065]={
+		["skill_type"]=3,
+		["skill_type_parameter"]={
+			2,
+			2
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=1500,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="burn",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["effect_block"]={
+			1,
+			3
+		},
+		["skill_position"]=1,
+		["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
+		}
+	},
 	[20001]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -11456,6 +11732,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=552
+data=skill,count=556
 }
 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 5d85d128..2e56a0b5 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -1356,7 +1356,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=2400121,
+				["num"]=2300121,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1762,7 +1762,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=10,
+				["num"]=3200121,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1779,7 +1779,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=2200121,
+				["num"]=3200122,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1824,14 +1824,6 @@ local skill_rogue = {
 				["range"]=1
 			}
 		},
-		["effect"]={
-			{
-				["type"]="add_skill",
-				["num"]=9,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
 		["obj"]=5,
 		["icon"]="48"
 	},
@@ -3163,7 +3155,8 @@ local skill_rogue = {
 		["weight"]=100000,
 		["qlt"]=4,
 		["type"]=6,
-		["skill_position"]=5
+		["skill_position"]=5,
+		["icon"]="190"
 	},
 	[5400101]={
 		["limit_times"]=1,
@@ -3175,7 +3168,7 @@ local skill_rogue = {
 			10000
 		},
 		["skill_position"]=5,
-		["icon"]="190"
+		["icon"]="164"
 	},
 	[5400102]={
 		["limit_times"]=1,
@@ -3192,7 +3185,7 @@ local skill_rogue = {
 			}
 		},
 		["obj"]=7,
-		["icon"]="164"
+		["icon"]="165"
 	},
 	[5400103]={
 		["limit_times"]=1,
@@ -3209,7 +3202,7 @@ local skill_rogue = {
 			}
 		},
 		["obj"]=7,
-		["icon"]="165"
+		["icon"]="166"
 	},
 	[5400104]={
 		["limit_times"]=1,
@@ -3226,7 +3219,7 @@ local skill_rogue = {
 			}
 		},
 		["obj"]=7,
-		["icon"]="166"
+		["icon"]="167"
 	},
 	[5400105]={
 		["limit_times"]=1,
@@ -3237,41 +3230,41 @@ local skill_rogue = {
 			5400123
 		},
 		["skill_position"]=5,
-		["icon"]="167"
+		["icon"]="168"
 	},
 	[5400106]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=12,
+		["type"]=9,
 		["skill_position"]=5,
 		["effect"]={
 			{
 				["type"]="add_skill",
 				["num"]=5400124,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=0
 			}
 		},
 		["obj"]=7,
-		["icon"]="168"
+		["icon"]="169"
 	},
 	[5400107]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=12,
+		["type"]=9,
 		["skill_position"]=5,
 		["effect"]={
 			{
 				["type"]="add_skill",
 				["num"]=5400125,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=0
 			}
 		},
 		["obj"]=7,
-		["icon"]="169"
+		["icon"]="170"
 	}
 }
 local config = {
diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua
index cff0dd8f..abe5edfa 100644
--- a/lua/app/config/strings/cn/buff.lua
+++ b/lua/app/config/strings/cn/buff.lua
@@ -23,6 +23,10 @@ local buff = {
 		["desc"]="极致抗性：受到所有英雄的伤害降低{0}。",
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["desc"]="伤害提升：造成的伤害提升{0}。",
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["desc"]="眩晕：本回合无法行动。",
 		["name"]="stun"
@@ -124,6 +128,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -152,6 +157,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua
index 1ea9e591..3996b226 100644
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@@ -175,6 +175,15 @@ local localization_global =
     ["SHOP_DESC_28"] = "每日特惠",
     ["SHOP_DESC_29"] = "\"每日特惠\"将每日刷新,通过观看广告可以额外刷新",
     ["HERO_DESC_11"] = "活动获得",
+    ["SHOP_DESC_30"] = "是否使用钻石刷新每日特惠?",
+    ["SHOP_DESC_31"] = "确认购买",
+    ["SHOP_DESC_32"] = "是否花费金币购买",
+    ["SHOP_DESC_33"] = "是否花费钻石购买",
+    ["SHOP_DESC_34"] = "首充豪礼",
+    ["SHOP_DESC_35"] = "充值购买任意商品,即可获得如下奖励,仅此一次！",
+    ["SHOP_DESC_36"] = "商店",
+    ["FUNC_OPEN_LEVEL"] = "玩家等级{0}开启",
+    ["FUNC_OPEN_STAGE"] = "通关章节{0}开启",
 }
 
 return localization_global
\ No newline at end of file
diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua
index 3460b2b2..ece99382 100644
--- a/lua/app/config/strings/cn/skill_rogue.lua
+++ b/lua/app/config/strings/cn/skill_rogue.lua
@@ -261,7 +261,7 @@ local skill_rogue = {
 		["desc"]="旋风骨技能伤害提升。"
 	},
 	[2300103]={
-		["desc"]="旋风骨对昏睡敌人有50%概率附加眩晕效果，1回合。"
+		["desc"]="旋风骨对易伤敌人有50%概率附加眩晕效果，1回合。"
 	},
 	[2300104]={
 		["desc"]="旋风骨附加的流血效果，回合数+1。"
diff --git a/lua/app/config/strings/cn/tutorial.lua b/lua/app/config/strings/cn/tutorial.lua
index e2ffe253..37625b97 100644
--- a/lua/app/config/strings/cn/tutorial.lua
+++ b/lua/app/config/strings/cn/tutorial.lua
@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 		["value"]="领取宝箱，获取第五位英雄"
+	},
+	["tutorial_txt_5"]={
+		["value"]="前往商城，获得更多英雄！"
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/de/buff.lua b/lua/app/config/strings/de/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/de/buff.lua
+++ b/lua/app/config/strings/de/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/de/tutorial.lua b/lua/app/config/strings/de/tutorial.lua
index b73ffd67..0002ffde 100644
--- a/lua/app/config/strings/de/tutorial.lua
+++ b/lua/app/config/strings/de/tutorial.lua
@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/en/buff.lua
+++ b/lua/app/config/strings/en/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua
index 9a577270..273478b3 100644
--- a/lua/app/config/strings/en/tutorial.lua
+++ b/lua/app/config/strings/en/tutorial.lua
@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 		["value"]="Claim chest to unlock the 5th hero"
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/fr/buff.lua b/lua/app/config/strings/fr/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/fr/buff.lua
+++ b/lua/app/config/strings/fr/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/fr/tutorial.lua b/lua/app/config/strings/fr/tutorial.lua
index b73ffd67..0002ffde 100644
--- a/lua/app/config/strings/fr/tutorial.lua
+++ b/lua/app/config/strings/fr/tutorial.lua
@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/id/buff.lua
+++ b/lua/app/config/strings/id/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/ja/buff.lua
+++ b/lua/app/config/strings/ja/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ja/tutorial.lua b/lua/app/config/strings/ja/tutorial.lua
index b73ffd67..0002ffde 100644
--- a/lua/app/config/strings/ja/tutorial.lua
+++ b/lua/app/config/strings/ja/tutorial.lua
@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/ko/buff.lua
+++ b/lua/app/config/strings/ko/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ko/tutorial.lua b/lua/app/config/strings/ko/tutorial.lua
index b73ffd67..0002ffde 100644
--- a/lua/app/config/strings/ko/tutorial.lua
+++ b/lua/app/config/strings/ko/tutorial.lua
@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/pt/buff.lua
+++ b/lua/app/config/strings/pt/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ru/buff.lua b/lua/app/config/strings/ru/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/ru/buff.lua
+++ b/lua/app/config/strings/ru/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/th/buff.lua
+++ b/lua/app/config/strings/th/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/vi/buff.lua
+++ b/lua/app/config/strings/vi/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua
index 35d9630c..3653def0 100644
--- a/lua/app/config/strings/zh/buff.lua
+++ b/lua/app/config/strings/zh/buff.lua
@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/strings/zh/tutorial.lua b/lua/app/config/strings/zh/tutorial.lua
index e9b2b67a..41fe959b 100644
--- a/lua/app/config/strings/zh/tutorial.lua
+++ b/lua/app/config/strings/zh/tutorial.lua
@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 		["value"]="領取寶箱，獲取第五位英雄"
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua
index ee367a4b..debad207 100644
--- a/lua/app/config/tutorial.lua
+++ b/lua/app/config/tutorial.lua
@@ -344,7 +344,7 @@ local tutorial = {
 	[40040]={
 		["next_id"]=40050,
 		["type"]=2,
-		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_1",
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_3",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
@@ -409,6 +409,7 @@ local tutorial = {
 		}
 	},
 	[40080]={
+		["next_id"]=40090,
 		["type"]=2,
 		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn",
 		["arrow_direction"]=1,
@@ -416,9 +417,38 @@ local tutorial = {
 			0,
 			-50
 		}
+	},
+	[40090]={
+		["next_id"]=40100,
+		["type"]=2,
+		["txt"]="tutorial_txt_5",
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[40100]={
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/shop_comp/main/scrollrect/viewport/content/box_sell_cell/bg/box_1/buy_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
 	}
 }
 local config = {
-data=tutorial,count=32
+data=tutorial,count=34
 }
 return config
\ No newline at end of file
diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua
index 9ece3038..40a68039 100644
--- a/lua/app/global/global_const.lua
+++ b/lua/app/global/global_const.lua
@@ -265,6 +265,7 @@ GConst.MESSAGE_BOX_TYPE = {
 
 GConst.MESSAGE_BOX_SHOW_TODAY = {
 	BOUNTY_BUY_LEVEL = 1,
+	HOT_SELL_BUY = 2,
 }
 
 GConst.QUALITY_TYPE =
diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua
index dc5dd155..eb3fe696 100644
--- a/lua/app/module/battle/component/battle_unit_comp.lua
+++ b/lua/app/module/battle/component/battle_unit_comp.lua
@@ -1329,6 +1329,8 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
 	if validEffectIdx then
 		effectStartIdx = validEffectIdx[1] + 1
 		effectEndIdx = validEffectIdx[2]
+	else
+		effectEndIdx = #effectList
 	end
 	for i = effectStartIdx, effectEndIdx do
 		local effect = effectList[i]
@@ -1370,12 +1372,15 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
 end
 
 function BattleUnitComp:judgeSkillEffectCondition(skill, index)
-	if not skill then
+	if not skill or skill:haveBuffCondition() then
 		return true
 	end
 
-	local buffConditions = skill:getBuffCondition(index)
-	local conditionRel = skill:getBuffConditionRel(index)
+	local buffConditionIndex, conditionRel = skill:getBuffConditionRel(index)
+	if not buffConditionIndex then
+		return true
+	end
+	local buffConditions = skill:getBuffCondition(buffConditionIndex)
 
 	return BATTLE_SKILL_CONDITION_HANDLE.judgeSkillEffectCondition(buffConditions, conditionRel, self.battleController)
 end
@@ -1601,6 +1606,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d
 				self:onAttackOver()
 			end
 
+			self.battleController:resetTimeSpeed()
+
 			self:changeState(UNIT_STATE.DEAD)
 		elseif damage < 0 then
 			self:playHurt()
diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua
index 09004fe5..13ea89ec 100644
--- a/lua/app/module/battle/controller/battle_controller.lua
+++ b/lua/app/module/battle/controller/battle_controller.lua
@@ -2216,26 +2216,34 @@ function BattleController:resetGrids(posList)
         return
     end
 
-    local canRandomElmentList = {}
+    if not self.canRandomElmentList then
+        self.canRandomElmentList = {}
+    end
+
+    for i = #self.canRandomElmentList, 1, -1 do
+        table.remove(self.canRandomElmentList)
+    end
+
+    local elementCount = 0
     for typeName, typeNum in pairs(BattleConst.ELEMENT_TYPE) do
         if not lockElementMap[typeNum] and  not self:getSealElementType()[typeNum] and self.battleData:getSkillEntityByElement(typeNum) then
-            table.insert(canRandomElmentList, typeNum)
+            table.insert(self.canRandomElmentList, typeNum)
+            elementCount = elementCount + 1
         end
     end
 
-    if not canRandomElmentList[1] then
+    if elementCount <= 0 then
         return
     end
 
-    local elementCount = #canRandomElmentList
-    local mainElement = canRandomElmentList[math.random(1, elementCount)]
+    local mainElement = self.canRandomElmentList[math.random(1, elementCount)]
 
     for typeNum, _ in pairs(lockElementMap) do
-        table.insert(canRandomElmentList, typeNum)
+        table.insert(self.canRandomElmentList, typeNum)
         elementCount = elementCount + 1
     end
 
-    local resetPosInfo = self:_dealResetGridsDataFunc2(useMap, emptySnapList, mainElement, backupSkill, keepSnapList, posMap, canRandomElmentList, elementCount, lockElementMap)
+    local resetPosInfo = self:_dealResetGridsDataFunc2(useMap, emptySnapList, mainElement, backupSkill, keepSnapList, posMap, self.canRandomElmentList, elementCount, lockElementMap)
 
     return resetPosInfo
 end
diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua
index 787dccf6..e93544c1 100644
--- a/lua/app/module/battle/skill/battle_board_skill_handle.lua
+++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua
@@ -336,11 +336,13 @@ local function _takeAddSkillEnergy(atkUnitComp, skillEntity, battleController)
         local boardSkills
         local count = 0
         for eType, entity in pairs(battleController.battleData:getSkillEntities()) do
-            if not boardSkills then
-                boardSkills = {}
+            if entity:getUnlocked() then
+                if not boardSkills then
+                    boardSkills = {}
+                end
+                table.insert(boardSkills, eType)
+                count = count + 1
             end
-            table.insert(boardSkills, eType)
-            count = count + 1
         end
         if count <= 0 then
             return
diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua
index c6d052f1..c5233966 100644
--- a/lua/app/module/battle/team/battle_team.lua
+++ b/lua/app/module/battle/team/battle_team.lua
@@ -400,6 +400,9 @@ function BattleTeam:doBuffWork()
 	buffEffect = nil
 	for i = count, 1, -1 do
 		buffEffect = self.buffList[i]
+		if not buffEffect then
+			break
+		end
 		buffEffect.round = buffEffect.round - 1
 		BattleBuffHandle.doBuffWork(self.mainUnit, buffEffect)
 		if buffEffect.round <= 0 then
diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua
index a8fa62c0..23ba40e6 100644
--- a/lua/app/module/maincity/maincity_const.lua
+++ b/lua/app/module/maincity/maincity_const.lua
@@ -25,6 +25,7 @@ MainCityConst.LEFT_SIDE_BARS = {
 MainCityConst.RIGHT_SIDE_BARS = {
 	"app/ui/main_city/cell/side_bar_gold_pig_cell",
 	"app/ui/main_city/cell/side_bar_growth_fund_cell",
+	"app/ui/main_city/cell/side_bar_first_recharge_cell",
 	"app/ui/main_city/cell/side_bar_beginner_gift_cell",
 	"app/ui/main_city/cell/side_bar_grow_up_gift_1_cell",
 	"app/ui/main_city/cell/side_bar_grow_up_gift_2_cell",
diff --git a/lua/app/module/shop/shop_const.lua b/lua/app/module/shop/shop_const.lua
index 02eee668..e0377914 100644
--- a/lua/app/module/shop/shop_const.lua
+++ b/lua/app/module/shop/shop_const.lua
@@ -1,5 +1,6 @@
 local ShopConst = {}
 
+ShopConst.FIRST_RECHARGE_ID = 10102 -- 首充礼包ID
 ShopConst.BEGINNER_GIFT_ID = 40102 -- 新手礼包ID
 ShopConst.MAIN_UI_POP_TYPE = { -- 当触发弹窗时,相关联的类型礼包也要触发
     [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
@@ -9,4 +10,31 @@ ShopConst.MAIN_UI_POP_TYPE = { -- 当触发弹窗时,相关联的类型礼包也
     [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = true
 }
 
+ShopConst.GEM_ICON_NAME = {
+    [1] = "shop_diamond_1",
+    [2] = "shop_diamond_1",
+    [3] = "shop_diamond_2",
+    [4] = "shop_diamond_3",
+    [5] = "shop_diamond_4",
+    [6] = "shop_diamond_5",
+    [7] = "shop_diamond_6",
+    [8] = "shop_diamond_7",
+    [9] = "shop_diamond_8",
+    [10] = "shop_diamond_8",
+    [11] = "shop_diamond_8",
+    [12] = "shop_diamond_8",
+    [13] = "shop_diamond_8",
+    [14] = "shop_diamond_8",
+    [15] = "shop_diamond_8",
+    [16] = "shop_diamond_8",
+    [17] = "shop_diamond_8",
+    [18] = "shop_diamond_8",
+    [19] = "shop_diamond_8",
+}
+ShopConst.COIN_ICON_NAME = {
+    [1] = "shop_species_1",
+    [2] = "shop_species_2",
+    [3] = "shop_species_3",
+}
+
 return ShopConst
\ No newline at end of file
diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua
index 5a6851e6..1ceb87d4 100644
--- a/lua/app/module/shop/shop_manager.lua
+++ b/lua/app/module/shop/shop_manager.lua
@@ -24,13 +24,17 @@ end
 -- 触发弹窗礼包
 function ShopManager:triggerGiftPopUI(actType, actId)
     if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then
-        UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId})
+        self:showGiftPopUI(actType, actId, false)
         DataManager.ShopData:removePopUpGift(actType, actId)
     end
 end
 
-function ShopManager:showGiftPopUI(actType, actId)
-    UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = true})
+function ShopManager:showGiftPopUI(actType, actId, onlySelf)
+    if actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.FIRST_RECHARGE_ID then
+        UIManager:showUI("app/ui/shop/first_recharge_pop_ui")
+    else
+        UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf})
+    end
 end
 
 -- 触发金币弹窗礼包
@@ -63,11 +67,32 @@ function ShopManager:buyMallDailyGift(id, isAd)
         end
     end
 
-    local responseData = {
-        rewards = rewards,
-        costs = costs
-    }
-    self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY)
+    -- 二次弹窗确认
+    if costs then
+        local isCoin = costs.id == GConst.ItemConst.ITEM_ID_GOLD
+        local params ={
+            titleTx = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_31),
+            content = isCoin and I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_32) or I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33),
+            boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
+            showToday = GConst.MESSAGE_BOX_SHOW_TODAY.HOT_SELL_BUY,
+            costId = costs.id,
+            costNum = costs.num,
+            okFunc = function()
+                local responseData = {
+                    rewards = rewards,
+                    costs = costs
+                }
+                self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY)
+            end,
+        }
+	    GFunc.showMessageBox(params)
+    else
+        local responseData = {
+            rewards = rewards,
+            costs = costs
+        }
+        self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY)
+    end
 end
 
 function ShopManager:buyMallDailyGiftFinish(result)
diff --git a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua
index c1dd3bd1..5fcfbc4f 100644
--- a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua
+++ b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua
@@ -6,11 +6,11 @@ function SideBarBeginnerGiftCell:getIsOpen()
 end
 
 function SideBarBeginnerGiftCell:getIconRes()
-    return "main_btn_gift_1" -- TODOJ
+    return "main_btn_gift_1"
 end
 
 function SideBarBeginnerGiftCell:onClick()
-    ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID)
+    ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID, true)
 end
 
 function SideBarBeginnerGiftCell:getIsShowRedPoint()
diff --git a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua
new file mode 100644
index 00000000..16ccd14a
--- /dev/null
+++ b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua
@@ -0,0 +1,24 @@
+local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell"
+local SideBarFirstRechargeCell = class("SideBarFirstRechargeCell", SideBarBaseCellComp)
+
+function SideBarFirstRechargeCell:getIsOpen()
+    return DataManager.ShopData:getShowFirstRechargeSideBar()
+end
+
+function SideBarFirstRechargeCell:getIconRes()
+    return "main_btn_gift_3"
+end
+
+function SideBarFirstRechargeCell:getIsShowRedPoint()
+    return DataManager.ShopData:showFirstRechargeRp()
+end
+
+function SideBarFirstRechargeCell:onClick()
+    ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID, true)
+end
+
+function SideBarFirstRechargeCell:getIsShowRedPoint()
+    return false
+end
+
+return SideBarFirstRechargeCell
\ No newline at end of file
diff --git a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta
new file mode 100644
index 00000000..09f7fa0a
--- /dev/null
+++ b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 19280ea11e6e84d4a8e2c067c3127203
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua
index 4e33bd44..c8888638 100644
--- a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua
+++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua
@@ -6,13 +6,13 @@ function SideBarGrowUpGift1Cell:getIsOpen()
 end
 
 function SideBarGrowUpGift1Cell:getIconRes()
-    return "main_btn_gift_2" -- TODOJ
+    return "main_btn_gift_2"
 end
 
 function SideBarGrowUpGift1Cell:onClick()
     local gift = DataManager.ShopData:getValidGrowUpGifts()[1]
     if gift then
-        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id)
+        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id, true)
     end
 end
 
diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua
index 5e4dcd1a..2d8fe520 100644
--- a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua
+++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua
@@ -6,13 +6,13 @@ function SideBarGrowUpGift2Cell:getIsOpen()
 end
 
 function SideBarGrowUpGift2Cell:getIconRes()
-    return "main_btn_gift_2" -- TODOJ
+    return "main_btn_gift_2"
 end
 
 function SideBarGrowUpGift2Cell:onClick()
     local gift = DataManager.ShopData:getValidGrowUpGifts()[2]
     if gift then
-        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id)
+        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id, true)
     end
 end
 
diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index 30ca9c22..908517f8 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -130,6 +130,18 @@ function MainCityUI:_addListeners()
         -- 引导完成时 检测主界面的弹窗是否要触发
         self:checkGift()
     end)
+    self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function()
+        if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then
+            if self.selectedIndex == MainCityUI.CLICK_BTN_TYPE[3] then
+                return
+            end
+            BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[3]])
+            self.bottomBtnSpines[3]:playAnimComplete("born", false, false, function()
+                self.bottomBtnSpines[3]:playAnim("idle", false, false)
+            end)
+            self:refreshBottom(3, true)
+        end
+    end)
     DataManager.MailData:checkNewMail()
 end
 
@@ -189,6 +201,7 @@ function MainCityUI:_bind()
                 self.subComps[self.selectedIndex]:refresh()
             end
         end
+        self:refreshBottomRp()
     end)
     self:bind(DataManager.SummonData, "isDirty", function()
         if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.SHOP and self.subComps[self.selectedIndex] then
@@ -206,6 +219,11 @@ function MainCityUI:initBottomUI()
     for i = 1, 3 do
         local cellCom = CellManager:addCellComp(uiMap["main_ui.bottom_node.bottom_btn_cell_" .. i], BOTTOM_BTN_CELL)
         cellCom:addClickListener(function()
+            if i == 3 then -- 商城有开启条件
+                if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then
+                    return
+                end
+            end
             if self.selectedIndex == i then
                 return
             end
@@ -750,6 +768,12 @@ function MainCityUI:refreshBottomRp()
     else
         heroRpObj:removeRedPoint()
     end
+    local shopRpObj = uiMap["main_ui.bottom_node.icons.ui_spine_obj_3.rp_node"]
+    if DataManager.ShopData:getRp() then
+        shopRpObj:addRedPoint(0, 0, 1)
+    else
+        shopRpObj:removeRedPoint()
+    end
 end
 
 function MainCityUI:refreshSettingBtn()
@@ -843,6 +867,7 @@ function MainCityUI:checkGift()
         -- 先遍历找出符合弹出的类型
         local beginnerGiftIds = {}
         local levelUpGiftIds = {}
+        local firstRechargeIds = {}
         for _, actId in ipairs(popUpGift) do
             local cfgInfo = DataManager.ShopData:getActGiftConfig()[actId]
             if cfgInfo then
@@ -854,8 +879,17 @@ function MainCityUI:checkGift()
                 if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT then
                     table.insert(levelUpGiftIds, actId)
                 end
+                -- 首充礼包
+                if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE then
+                    table.insert(firstRechargeIds, actId)
+                end
             end
         end
+        -- 首充礼包
+        if #firstRechargeIds then
+            ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, firstRechargeIds[1])
+            return true
+        end
         -- 新手礼包
         if #beginnerGiftIds > 0 then
             ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, beginnerGiftIds[1])
@@ -866,8 +900,6 @@ function MainCityUI:checkGift()
             ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, levelUpGiftIds[1])
             return true
         end
-        
-        return true
     end
     -- 特殊的 成长礼包
     local popUpGift = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT)
diff --git a/lua/app/ui/shop/box_hero_ui.lua b/lua/app/ui/shop/box_hero_ui.lua
index 5e12fde3..b001c724 100644
--- a/lua/app/ui/shop/box_hero_ui.lua
+++ b/lua/app/ui/shop/box_hero_ui.lua
@@ -1,12 +1,12 @@
 local BoxHeroUI = class("BoxHeroUI", BaseUI)
 
 local TITLE_TEXT = {
-	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "普通宝箱TD", -- TODOJ
-	[GConst.SummonConst.SUMMON_TYPE.LV_2] = "精致宝箱TD",
-	[GConst.SummonConst.SUMMON_TYPE.LV_3] = "珍贵宝箱TD"
+	[GConst.SummonConst.SUMMON_TYPE.LV_1] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_1), -- 普通宝箱
+	[GConst.SummonConst.SUMMON_TYPE.LV_2] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_2), -- 精致宝箱
+	[GConst.SummonConst.SUMMON_TYPE.LV_3] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_3), -- 珍贵宝箱
 }
 local ICON_NAME = {
-	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", -- TODOJ
+	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1",
 	[GConst.SummonConst.SUMMON_TYPE.LV_2] = "shop_chest_2",
 	[GConst.SummonConst.SUMMON_TYPE.LV_3] = "shop_chest_3"
 }
diff --git a/lua/app/ui/shop/box_level_ui.lua b/lua/app/ui/shop/box_level_ui.lua
index 5d202806..0112b1d7 100644
--- a/lua/app/ui/shop/box_level_ui.lua
+++ b/lua/app/ui/shop/box_level_ui.lua
@@ -36,7 +36,7 @@ function BoxLevelUI:onLoadRootComplete()
     self.box1Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_1.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box1Add2Text = self.uiMap["box_level_ui.bg.box_1.add_node_2.text"]
     self.box1Desc = self.uiMap["box_level_ui.bg.box_1.none_text"]
-    self.box1Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
 	self.box2Node = self.uiMap["box_level_ui.bg.box_2"]
     self.box2Add1Node = self.uiMap["box_level_ui.bg.box_2.add_node_1"]
@@ -46,7 +46,7 @@ function BoxLevelUI:onLoadRootComplete()
     self.box2Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_2.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box2Add2Text = self.uiMap["box_level_ui.bg.box_2.add_node_2.text"]
     self.box2Desc = self.uiMap["box_level_ui.bg.box_2.none_text"]
-    self.box2Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box2Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.box3Node = self.uiMap["box_level_ui.bg.box_3"]
     self.box3Add1Node = self.uiMap["box_level_ui.bg.box_3.add_node_1"]
@@ -56,10 +56,10 @@ function BoxLevelUI:onLoadRootComplete()
     self.box3Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_3.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box3Add2Text = self.uiMap["box_level_ui.bg.box_3.add_node_2.text"]
     self.box3Desc = self.uiMap["box_level_ui.bg.box_3.none_text"]
-    self.box3Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box3Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.bottomDesc = self.uiMap["box_level_ui.bg.title"]
-    self.bottomDesc:setText("开宝箱提升等级，增加宝箱奖励TD") -- TODOJ
+    self.bottomDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_5)) -- 开宝箱提升等级,增加宝箱奖励
 
     self.leftArrow:addClickListener(function()
         self.level = self.level - 1
diff --git a/lua/app/ui/shop/box_level_up_ui.lua b/lua/app/ui/shop/box_level_up_ui.lua
index 033a0420..25fae603 100644
--- a/lua/app/ui/shop/box_level_up_ui.lua
+++ b/lua/app/ui/shop/box_level_up_ui.lua
@@ -30,7 +30,7 @@ function BoxLevelUpUI:onLoadRootComplete()
     self.box1Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_1.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box1Add2Text = self.uiMap["box_level_up_ui.box_1.add_node_2.text"]
     self.box1Desc = self.uiMap["box_level_up_ui.box_1.none_text"]
-    self.box1Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
 	self.box2Node = self.uiMap["box_level_up_ui.box_2"]
     self.box2Add1Node = self.uiMap["box_level_up_ui.box_2.add_node_1"]
@@ -40,7 +40,7 @@ function BoxLevelUpUI:onLoadRootComplete()
     self.box2Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_2.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box2Add2Text = self.uiMap["box_level_up_ui.box_2.add_node_2.text"]
     self.box2Desc = self.uiMap["box_level_up_ui.box_2.none_text"]
-    self.box2Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box2Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.box3Node = self.uiMap["box_level_up_ui.box_3"]
     self.box3Add1Node = self.uiMap["box_level_up_ui.box_3.add_node_1"]
@@ -50,7 +50,7 @@ function BoxLevelUpUI:onLoadRootComplete()
     self.box3Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_3.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box3Add2Text = self.uiMap["box_level_up_ui.box_3.add_node_2.text"]
     self.box3Desc = self.uiMap["box_level_up_ui.box_3.none_text"]
-    self.box3Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box3Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.closeTx = self.uiMap["box_level_up_ui.close_tx"]
 
@@ -58,9 +58,9 @@ function BoxLevelUpUI:onLoadRootComplete()
 end
 
 function BoxLevelUpUI:refresh()
-    self.titleTx:setText("宝箱等级提升!TD") -- TODOJ
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_6)) -- 宝箱等级提升!
     self.lvTx:setText("Lv." .. tostring(self.level))
-    self.closeTx:setText("点击继续TD") -- TODOJ
+    self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) -- 点击继续
 
     self.box1Add1Node:setVisible(false)
     self.box1Add2Node:setVisible(false)
diff --git a/lua/app/ui/shop/box_open_ui.lua b/lua/app/ui/shop/box_open_ui.lua
index c091b969..e6cf95ef 100644
--- a/lua/app/ui/shop/box_open_ui.lua
+++ b/lua/app/ui/shop/box_open_ui.lua
@@ -1,7 +1,7 @@
 local BoxOpenUI = class("BoxOpenUI", BaseUI)
 
 local ICON_NAME = {
-	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", -- TODOJ
+	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1",
 	[GConst.SummonConst.SUMMON_TYPE.LV_2] = "shop_chest_2",
 	[GConst.SummonConst.SUMMON_TYPE.LV_3] = "shop_chest_3"
 }
@@ -28,7 +28,7 @@ function BoxOpenUI:onLoadRootComplete()
     self.btnText = self.uiMap["box_open_ui.open_btn.text"]
 
     self.boxImg:setSprite(GConst.ATLAS_PATH.SHOP, ICON_NAME[self.summonType])
-    self.btnText:setText("立即打开") -- TODOJ
+    self.btnText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_7)) -- 立即打开
 
     self.openBtn:addClickListener(function()
         ModuleManager.ShopManager:showBoxRewardUI(self.params)
diff --git a/lua/app/ui/shop/box_reward_ui.lua b/lua/app/ui/shop/box_reward_ui.lua
index df9fa8be..222e0523 100644
--- a/lua/app/ui/shop/box_reward_ui.lua
+++ b/lua/app/ui/shop/box_reward_ui.lua
@@ -35,7 +35,7 @@ function BoxRewardUI:onLoadRootComplete()
     self.uiMap = self.root:genAllChildren()
 
     self.titleTx = self.uiMap["box_reward_ui.title.text"]
-    self.titleTx:setText("恭喜获得TD") -- TODOJ
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_8)) -- 恭喜获得
 
     self.scrollRectObj = self.uiMap["box_reward_ui.scroll_rect"]
     self.scrollRect = self.scrollRectObj:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
@@ -60,7 +60,7 @@ function BoxRewardUI:onLoadRootComplete()
     end
 
     self.closeTx = self.uiMap["box_reward_ui.close_tx"]
-    self.closeTx:setText("点击关闭TD") -- TODOJ
+    self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC))
 
     self.mask = self.uiMap["box_reward_ui.mask"]
     self.mask:addClickListener(function()
diff --git a/lua/app/ui/shop/cell/beginner_sell_cell.lua b/lua/app/ui/shop/cell/beginner_sell_cell.lua
index d0674590..10c20019 100644
--- a/lua/app/ui/shop/cell/beginner_sell_cell.lua
+++ b/lua/app/ui/shop/cell/beginner_sell_cell.lua
@@ -51,9 +51,9 @@ function BeginnerSellCell:refresh()
         self.offImg:setVisible(false)
     end
     -- 限购
-    self.limitText:setText("限购1次TD") -- 章节礼包默认限购1次 TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次
     -- 标题
-    self.titleText:setText("新手礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_11)) -- 新手礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0
diff --git a/lua/app/ui/shop/cell/box_sell_cell.lua b/lua/app/ui/shop/cell/box_sell_cell.lua
index 46c1de02..2b1a4aaf 100644
--- a/lua/app/ui/shop/cell/box_sell_cell.lua
+++ b/lua/app/ui/shop/cell/box_sell_cell.lua
@@ -8,24 +8,24 @@ function BoxSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.bg = uiMap["box_sell_cell.bg"]
 	local boxNameTx1 = uiMap["box_sell_cell.bg.box_1.name_tx"]
-	boxNameTx1:setText("临时文本:普通宝箱")
+	boxNameTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_1)) -- 普通宝箱
 	local boxDescTx1 = uiMap["box_sell_cell.bg.box_1.desc_tx"]
-	boxDescTx1:setText("临时文本:必出<color=#5fff57>普通</color>英雄")
+	boxDescTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_24)) -- 必出<color=#5fff57>普通</color>英雄
 	self.boxBuyBtn1 = uiMap["box_sell_cell.bg.box_1.buy_btn"]
 	self.boxBuyBtnCoin1 = uiMap["box_sell_cell.bg.box_1.buy_btn.coin"]
 	self.boxBuyBtnTx1 = uiMap["box_sell_cell.bg.box_1.buy_btn.buy_tx"]
 	local boxNameTx2 = uiMap["box_sell_cell.bg.box_2.name_tx"]
-	boxNameTx2:setText("临时文本:精致宝箱")
+	boxNameTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_2)) -- 精致宝箱
 	local boxDescTx2 = uiMap["box_sell_cell.bg.box_2.desc_tx"]
-	boxDescTx2:setText("临时文本:必出<color=#8aedff>稀有</color>英雄")
+	boxDescTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_25)) -- 必出<color=#8aedff>稀有</color>英雄
 	self.boxBuyBtn2 = uiMap["box_sell_cell.bg.box_2.buy_btn"]
 	self.boxBuyBtnCoin2 = uiMap["box_sell_cell.bg.box_2.buy_btn.coin"]
 	self.boxBuyBtnTx2 = uiMap["box_sell_cell.bg.box_2.buy_btn.buy_tx"]
 	self.box3 = uiMap["box_sell_cell.bg.box_3"]
 	local boxNameTx3 = uiMap["box_sell_cell.bg.box_3.name_tx"]
-	boxNameTx3:setText("临时文本:珍贵")
+	boxNameTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_3)) -- 珍贵宝箱
 	local boxDescTx3 = uiMap["box_sell_cell.bg.box_3.desc_tx"]
-	boxDescTx3:setText("临时文本:必出<color=#ff8af0>史诗</color>英雄")
+	boxDescTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_26)) -- 必出<color=#ff8af0>史诗</color>英雄
 	self.boxBuyBtn3 = uiMap["box_sell_cell.bg.box_3.buy_btn"]
 	self.boxBuyBtnCoin3 = uiMap["box_sell_cell.bg.box_3.buy_btn.coin"]
 	self.boxBuyBtnTx3 = uiMap["box_sell_cell.bg.box_3.buy_btn.buy_tx"]
@@ -34,7 +34,7 @@ function BoxSellCell:init()
 	self.progressTx = uiMap["box_sell_cell.bg.progress_tx"]
 	self.helpBtn = uiMap["box_sell_cell.bg.help_btn"]
 	local titleTx = uiMap["box_sell_cell.title_bg.text"]
-	titleTx:setText("临时文本:宝箱")
+	titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_27)) -- 宝箱
 
 	self.boxBuyBtn1:addClickListener(function()
 		self:onClickBox(GConst.SummonConst.SUMMON_TYPE.LV_1)
@@ -72,12 +72,12 @@ function BoxSellCell:refreshLv()
 	local lv = DataManager.SummonData:getSummonLevel()
 	local exp = DataManager.SummonData:getSummonExp()
 	local maxExp = DataManager.SummonData:getSummonMaxExp()
-	self.progressLv:setText("Lv." .. tostring(lv)) -- TODOJ
+	self.progressLv:setText("Lv." .. tostring(lv))
 	if maxExp and maxExp > 0 then
-		self.progressTx:setText(tostring(exp) .. "/" .. tostring(maxExp)) -- TODOJ
+		self.progressTx:setText(tostring(exp) .. "/" .. tostring(maxExp))
 		self.progressSlider.value = exp / maxExp
 	else
-		self.progressTx:setText("MAX") -- TODOJ
+		self.progressTx:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX))
 		self.progressSlider.value = 1
 	end
 end
diff --git a/lua/app/ui/shop/cell/chapter_cell.lua b/lua/app/ui/shop/cell/chapter_cell.lua
index ceb58a85..3d7f187e 100644
--- a/lua/app/ui/shop/cell/chapter_cell.lua
+++ b/lua/app/ui/shop/cell/chapter_cell.lua
@@ -67,9 +67,9 @@ function ChapterCell:refresh(idx, cfgInfo, totalCount, arrowCallback)
     -- 超值
     self.offText:setText(tostring(cfgInfo.value * 100) .. "%")
     -- 限购
-    self.limitText:setText("限购1次TD") -- 章节礼包默认限购1次 TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次
     -- 标题
-    self.titleText:setText("第" .. tostring(cfgInfo.chapter) .. "章礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_19, tostring(cfgInfo.chapter))) -- 第{0}章礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0
diff --git a/lua/app/ui/shop/cell/coin_sell_cell.lua b/lua/app/ui/shop/cell/coin_sell_cell.lua
index 914eb2be..5989b888 100644
--- a/lua/app/ui/shop/cell/coin_sell_cell.lua
+++ b/lua/app/ui/shop/cell/coin_sell_cell.lua
@@ -47,9 +47,9 @@ function CoinSellCell:refresh()
         -- 超值
         self.offText:setText(tostring(cfgInfo.value) .. "%")
         -- 限购
-        self.limitText:setText("限购" .. tostring(cfgInfo.limit) .. "次TD") -- TODOJ
+        self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, tostring(cfgInfo.limit))) -- 限购{0}次
         -- 标题
-        self.titleText:setText("金币礼包TD") -- TODOJ
+        self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14))
         -- 奖励
         local rewardList = cfgInfo.reward
         local count = rewardList and #rewardList or 0
diff --git a/lua/app/ui/shop/cell/gem_cell.lua b/lua/app/ui/shop/cell/gem_cell.lua
index 721e4cd2..0dc48263 100644
--- a/lua/app/ui/shop/cell/gem_cell.lua
+++ b/lua/app/ui/shop/cell/gem_cell.lua
@@ -17,7 +17,7 @@ function GemCell:init()
 	self.adText = uiMap["gem_cell.ad.desc"]
 	self.sellOutText = uiMap["gem_cell.sell_out"]
 
-    self.sellOutText:setText("已购买TD") -- TODOJ
+    self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20))
 end
 
 function GemCell:refresh(id, cfgInfo)
@@ -31,6 +31,7 @@ function GemCell:refresh(id, cfgInfo)
 	local hasDoubleTimes = bought < limit
 	local leftDoubleTimes = limit - bought
 	
+	self.icon:setSprite(GConst.ATLAS_PATH.SHOP, GConst.ShopConst.GEM_ICON_NAME[id])
 	if isFree then -- 免费广告
 		self.adNode:setVisible(true)
 		self.priceText:setVisible(false)
@@ -39,11 +40,11 @@ function GemCell:refresh(id, cfgInfo)
 		GFunc.setAdsSprite(self.adImg)
 		local adLeftCount = adMaxTimes - bought
 		if adLeftCount > 0 then
-			self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ
+			self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x)
 			GFunc.centerImgAndTx(self.adImg, self.adText, 5)
 			self.sellOutText:setVisible(false)
 
-			self:getBaseObject():addRedPoint(105, 150, 0.6)
+			self:getBaseObject():addRedPoint(100, 145, 0.6)
 		else
 			self.adNode:setVisible(false)
 			self.sellOutText:setVisible(true)
@@ -56,7 +57,7 @@ function GemCell:refresh(id, cfgInfo)
 
 		if hasDoubleTimes then -- 有双倍效果
 			self.doubleNode:setVisible(true)
-			self.doubleDesc:setText("剩余次数:" .. tostring(leftDoubleTimes) .. "TD") -- TODOJ
+			self.doubleDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_21, tostring(leftDoubleTimes))) -- 剩余次数:{0}
 			self.doubleText:setText("+" .. tostring(reward.num * 2))
 			GFunc.centerImgAndTx(self.doubleImg, self.doubleText, 5)
 			self.doubleOriginText:setText(reward.num)
diff --git a/lua/app/ui/shop/cell/gem_sell_cell.lua b/lua/app/ui/shop/cell/gem_sell_cell.lua
index 204a79ff..ce9930fc 100644
--- a/lua/app/ui/shop/cell/gem_sell_cell.lua
+++ b/lua/app/ui/shop/cell/gem_sell_cell.lua
@@ -3,13 +3,13 @@ local GemSellCell = class("GemSellCell", BaseCell)
 function GemSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	local titleTx = uiMap["gem_sell_cell.title_bg.text"]
-	titleTx:setText("临时文本:钻石")
+	titleTx:setText(ModuleManager.ItemManager:getItemName(GConst.ItemConst.ITEM_ID_GEM))
 
 	self.cells = {}
 	self.cellHeight = 0
 	local cellHeight = nil
-	local cfg = ConfigManager:getConfig("mall_treasure")
-	for i = 1, 19 do -- 正常9个 提审19个 暂未处理提审模式 -- TODOJ
+	local cfg = DataManager.ShopData:getMallTreasureConfig() -- 审核模式读取另一张表
+	for i = 1, 19 do -- 正常9个 提审19个
 		local cell = uiMap["gem_sell_cell.cell_" .. i]
 		if cellHeight == nil then
 			local w, h = cell:fastGetSizeDelta()
@@ -30,7 +30,7 @@ function GemSellCell:init()
 end
 
 function GemSellCell:refresh()
-	local cfg = ConfigManager:getConfig("mall_treasure")
+	local cfg = DataManager.ShopData:getMallTreasureConfig()
 	for k, v in ipairs(self.cells) do
 		local id = k -- 目前配置表结构如此
 		v:refresh(id, cfg[id])
@@ -49,8 +49,4 @@ function GemSellCell:setVisible(visible)
 	self.baseObject:setVisible(visible)
 end
 
-function GemSellCell:onClickGift(id)
-	Logger.logHighlight("Click id:%s", id) -- TODOJ
-end
-
 return GemSellCell
\ No newline at end of file
diff --git a/lua/app/ui/shop/cell/gold_cell.lua b/lua/app/ui/shop/cell/gold_cell.lua
index 995d99af..70434791 100644
--- a/lua/app/ui/shop/cell/gold_cell.lua
+++ b/lua/app/ui/shop/cell/gold_cell.lua
@@ -14,7 +14,7 @@ function GoldCell:init()
 	self.descText = uiMap["gold_cell.desc"]
 	self.sellOutText = uiMap["gold_cell.sell_out"]
 
-    self.sellOutText:setText("已购买TD") -- TODOJ
+    self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) -- 已购买
 end
 
 function GoldCell:refresh(id, cfgInfo)
@@ -23,8 +23,9 @@ function GoldCell:refresh(id, cfgInfo)
 	local adMaxTimes = cfgInfo.daily or 0
 	local goldNum = DataManager.ShopData:getCommonDailyCoinNum(idleTime)
 
+	self.icon:setSprite(GConst.ATLAS_PATH.SHOP, GConst.ShopConst.COIN_ICON_NAME[id])
+
 	local isFree = adMaxTimes > 0
-	
 	if isFree then -- 免费广告
 		self.adNode:setVisible(true)
 		self.costNode:setVisible(false)
@@ -33,11 +34,11 @@ function GoldCell:refresh(id, cfgInfo)
 		local bought = DataManager.ShopData:getCommonDailyCoinAdBuyCount() -- 金币礼包购买次数
 		local adLeftCount = adMaxTimes - bought
 		if adLeftCount > 0 then
-			self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ
+			self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x)
 			GFunc.centerImgAndTx(self.adImg, self.adText, 5)
 			self.sellOutText:setVisible(false)
 
-			self:getBaseObject():addRedPoint(105, 150, 0.6)
+			self:getBaseObject():addRedPoint(100, 145, 0.6)
 		else
 			self.adNode:setVisible(false)
 			self.sellOutText:setVisible(true)
@@ -54,7 +55,7 @@ function GoldCell:refresh(id, cfgInfo)
 	end
 	self.nameText:setText(GFunc.num2Str(goldNum))
 	
-	self.descText:setText("金币礼包:" .. tostring(id) .. "TD") -- TODOJ
+	self.descText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14)) -- 金币礼包
 
     self:addClickListener(function()
 		self:onClickGift(id, isFree)
@@ -82,7 +83,16 @@ function GoldCell:onClickGift(id, isAd)
 		if not GFunc.checkCost(costs.id, costs.num, true) then
 			return
 		end
-		ModuleManager.ShopManager:buyMallIdleCoin(id, isAd)
+		-- 二次提示
+		local params = {
+			content = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33), -- 是否使用钻石刷新每日特惠?
+			boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
+			okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+			okFunc = function()
+				ModuleManager.ShopManager:buyMallIdleCoin(id, isAd)
+			end
+		}
+		GFunc.showMessageBox(params)
 	end
 end
 
diff --git a/lua/app/ui/shop/cell/gold_sell_cell.lua b/lua/app/ui/shop/cell/gold_sell_cell.lua
index d3a3904c..7cd52e9c 100644
--- a/lua/app/ui/shop/cell/gold_sell_cell.lua
+++ b/lua/app/ui/shop/cell/gold_sell_cell.lua
@@ -3,7 +3,7 @@ local GoldSellCell = class("GoldSellCell", BaseCell)
 function GoldSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	local titleTx = uiMap["gold_sell_cell.title_bg.text"]
-	titleTx:setText("临时文本:金币")
+	titleTx:setText(ModuleManager.ItemManager:getItemName(GConst.ItemConst.ITEM_ID_GOLD))
 
 	self.cells = {}
 	self.cellHeight = 0
diff --git a/lua/app/ui/shop/cell/grow_cell.lua b/lua/app/ui/shop/cell/grow_cell.lua
index 6abd2af5..63a8adbe 100644
--- a/lua/app/ui/shop/cell/grow_cell.lua
+++ b/lua/app/ui/shop/cell/grow_cell.lua
@@ -46,9 +46,9 @@ function GrowCell:refresh(idx, gift)
     -- 超值
     self.offText:setText(tostring(cfgInfo.value) .. "%")
     -- 限购
-    self.limitText:setText("限购" .. tostring(cfgInfo.limit) .. "次TD") -- TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, tostring(cfgInfo.limit))) -- 限购{0}次
     -- 标题
-    self.titleText:setText("成长礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_13)) -- 成长礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0
diff --git a/lua/app/ui/shop/cell/hot_cell.lua b/lua/app/ui/shop/cell/hot_cell.lua
index 35ddc775..3ee3541c 100644
--- a/lua/app/ui/shop/cell/hot_cell.lua
+++ b/lua/app/ui/shop/cell/hot_cell.lua
@@ -21,7 +21,7 @@ function HotCell:init()
     self.heroNumText = uiMap["hot_cell.hero.num_tx"]
     self.sellOutText = uiMap["hot_cell.sell_out"]
 
-    self.sellOutText:setText("已购买TD") -- TODOJ
+    self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) -- 已购买
 end
 
 function HotCell:refresh(data)
@@ -57,11 +57,11 @@ function HotCell:refresh(data)
         GFunc.setAdsSprite(self.adImg)
         local adLeftCount = DataManager.ShopData:getMallDailyFirstItemAdMaxCount() - bought
         if adLeftCount > 0 then
-            self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ
+            self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x)
             GFunc.centerImgAndTx(self.adImg, self.adText, 5)
             self.sellOutText:setVisible(false)
 
-            self:getBaseObject():addRedPoint(105, 150, 0.6)
+            self:getBaseObject():addRedPoint(100, 145, 0.6)
         else
             self.adNode:setVisible(false)
             self.sellOutText:setVisible(true)
diff --git a/lua/app/ui/shop/cell/hot_sell_cell.lua b/lua/app/ui/shop/cell/hot_sell_cell.lua
index f255de99..15550963 100644
--- a/lua/app/ui/shop/cell/hot_sell_cell.lua
+++ b/lua/app/ui/shop/cell/hot_sell_cell.lua
@@ -6,9 +6,9 @@ function HotSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.cellHeight = self.baseObject:fastGetSizeDeltaY() + 20
 
-	uiMap["hot_sell_cell.title_bg.text"]:setText("临时文本:每日特惠")
+	uiMap["hot_sell_cell.title_bg.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_28)) -- 每日特惠
 	uiMap["hot_sell_cell.help_btn"]:addClickListener(function()
-
+		ModuleManager.TipsManager:showDescTips(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_29), uiMap["hot_sell_cell.help_btn"])
 	end)
 	self.timeTx = uiMap["hot_sell_cell.time_tx"]
 	self.cells = {}
@@ -30,25 +30,24 @@ end
 
 function HotSellCell:refresh()
 	local goods = DataManager.ShopData:getMallDailyGoods()
-	local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 免费刷新次数
-	local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 钻石刷新次数
+	local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 剩余免费刷新次数
+	local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 剩余钻石刷新次数
 	local gemRefreshCost = DataManager.ShopData:getMallDailyDiamondResetCost() -- 钻石刷新消耗
-
 	if freeRefreshCount > 0 then
-		self.refreshBtn:setVisible(true)
+		self.refreshBtn:setActive(true)
 		self.refreshAdImg:setVisible(true)
 		GFunc.setAdsSprite(self.refreshAdImg)
 		self.refreshGemImg:setVisible(false)
-		self.refreshText:setText("刷新TD") -- TODOJ
-		self.refreshBtn:addRedPoint(70, 30, 0.6)
+		self.refreshText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_REFRESH))
+		self.refreshBtn:addRedPoint(80, 30, 0.6)
 	elseif gemRefreshCount > 0 then
-		self.refreshBtn:setVisible(true)
+		self.refreshBtn:setActive(true)
 		self.refreshAdImg:setVisible(false)
 		self.refreshGemImg:setVisible(true)
 		self.refreshText:setText(gemRefreshCost)
 		self.refreshBtn:removeRedPoint()
 	else
-		self.refreshBtn:setVisible(false)
+		self.refreshBtn:setActive(false)
 		self.refreshBtn:removeRedPoint()
 	end
 
@@ -68,7 +67,7 @@ function HotSellCell:refreshTime()
 	if remainTime < 0 then
 		remainTime = 0
 	end
-	self.timeTx:setText("刷新时间TD:" .. GFunc.getTimeStrWithHMS(remainTime)) -- TODOJ
+	self.timeTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_22, GFunc.getTimeStrWithHMS(remainTime)))-- 刷新时间:{0}
 end
 
 function HotSellCell:getCellHeight()
@@ -94,7 +93,16 @@ function HotSellCell:onClickRefresh()
 		end)
 	elseif gemRefreshCount > 0 then
 		if GFunc.checkCost(GConst.ItemConst.ITEM_ID_GEM, gemRefreshCost, true) then
-			ModuleManager.ShopManager:resetMallDailyGift(2)
+			-- 二次提示
+			local params = {
+				content = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_30), -- 是否使用钻石刷新每日特惠?
+				boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
+				okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+				okFunc = function()
+					ModuleManager.ShopManager:resetMallDailyGift(2)
+				end
+			}
+			GFunc.showMessageBox(params)
 		end
 	end
 end
diff --git a/lua/app/ui/shop/cell/level_cell.lua b/lua/app/ui/shop/cell/level_cell.lua
index 95f716e0..99325557 100644
--- a/lua/app/ui/shop/cell/level_cell.lua
+++ b/lua/app/ui/shop/cell/level_cell.lua
@@ -43,9 +43,9 @@ function LevelCell:refresh(idx, cfgInfo, clickCallback)
     -- 超值
     self.offText:setText(tostring(cfgInfo.value) .. "%")
     -- 限购
-    self.limitText:setText("限购1次TD") -- 默认限购1次 TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次
     -- 标题
-    self.titleText:setText(tostring(cfgInfo.parameter) .. "级助力礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_23, tostring(cfgInfo.parameter))) -- {0}级助力礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0
diff --git a/lua/app/ui/shop/first_recharge_pop_ui.lua b/lua/app/ui/shop/first_recharge_pop_ui.lua
new file mode 100644
index 00000000..4090f6ab
--- /dev/null
+++ b/lua/app/ui/shop/first_recharge_pop_ui.lua
@@ -0,0 +1,107 @@
+local FirstRechargePopUI = class("FirstRechargePopUI", BaseUI)
+local MAX_ITEM_NUM = 3
+
+function FirstRechargePopUI:ctor()
+end
+
+function FirstRechargePopUI:isFullScreen()
+    return false
+end
+
+function FirstRechargePopUI:getPrefabPath()
+    return "assets/prefabs/ui/shop/first_recharge_pop_ui.prefab"
+end
+
+function FirstRechargePopUI:onLoadRootComplete()
+    self.uiMap = self.root:genAllChildren()
+	self.uiMap["first_recharge_pop_ui.close_btn"]:addClickListener(function()
+        self:closeUI()
+	end)
+
+	self.titleTx = self.uiMap["first_recharge_pop_ui.bg.title_bg.title"]
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_34)) -- 首充豪礼
+
+	self.itemNodeList = {}
+	self.itemCellList = {}
+	self.itemTextList = {}
+    self.itemHelpList = {}
+	for i = 1, MAX_ITEM_NUM do
+		table.insert(self.itemNodeList, self.uiMap["first_recharge_pop_ui.bg.item_" .. i])
+		table.insert(self.itemCellList, CellManager:addCellComp(self.uiMap["first_recharge_pop_ui.bg.item_".. i .. ".item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL))
+		table.insert(self.itemTextList, self.uiMap["first_recharge_pop_ui.bg.item_".. i .. ".num"])
+        table.insert(self.itemHelpList, self.uiMap["first_recharge_pop_ui.bg.item_" .. i .. ".help"])
+    end
+
+    self.descText = self.uiMap["first_recharge_pop_ui.bg.desc_text"]
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_35)) -- 充值购买任意商品,即可获得如下奖励,仅此一次！
+
+	self.funcBtn = self.uiMap["first_recharge_pop_ui.bg.func_btn"]
+	self.btnJumpText = self.uiMap["first_recharge_pop_ui.bg.func_btn.jump_text"]
+    self.btnGetText = self.uiMap["first_recharge_pop_ui.bg.func_btn.get_text"]
+	self.btnIcon = self.uiMap["first_recharge_pop_ui.bg.func_btn.icon"]
+
+    self.btnJumpText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_36)) -- 商店
+    self.btnGetText:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) -- 领取
+
+	self.funcBtn:addClickListener(function()
+		self:onClickFuncBtn()
+	end)
+
+    self:_bind()
+	self:refresh()
+end
+
+function FirstRechargePopUI:_bind()
+    self:bind(DataManager.ShopData, "isDirty", function()
+        self:refresh()
+    end)
+end
+
+function FirstRechargePopUI:refresh()
+    local cfgInfo = PayManager:getGiftConfigInfo(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID)
+	local rewards = cfgInfo.reward or {}
+	for i = 1, MAX_ITEM_NUM do
+		if i <= #rewards then
+			self.itemNodeList[i]:setVisible(true)
+			self.itemCellList[i]:refreshByCfg(rewards[i].id, 0)
+			self.itemCellList[i]:setNum("")
+			self.itemTextList[i]:setText(rewards[i].num)
+			self.itemCellList[i]:addClickListener(function()
+				ModuleManager.TipsManager:showItemTips(rewards[i].id, self.itemCellList[i]:getBaseObject())
+			end)
+            self.itemHelpList[i]:setVisible(false)
+		else
+			self.itemNodeList[i]:setVisible(false)
+		end
+	end
+
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+    if canGet then
+        self.btnIcon:setVisible(false)
+        self.btnJumpText:setVisible(false)
+        self.btnGetText:setVisible(true)
+    else
+        local hasGet = DataManager.ShopData:getHasGotFirstRechargeReward()
+        if hasGet then
+            self:closeUI()
+        else
+            self.btnIcon:setVisible(true)
+            self.btnJumpText:setVisible(true)
+            self.btnGetText:setVisible(false)
+        end
+    end
+end
+
+function FirstRechargePopUI:onClickFuncBtn()
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+    if canGet then
+        PayManager:purchasePackage(GConst.ShopConst.FIRST_RECHARGE_ID, PayManager.PURCHARSE_TYPE.ACT_GIFT)
+    else
+        EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP)
+        self:closeUI()
+    end
+end
+
+return FirstRechargePopUI
\ No newline at end of file
diff --git a/lua/app/ui/shop/first_recharge_pop_ui.lua.meta b/lua/app/ui/shop/first_recharge_pop_ui.lua.meta
new file mode 100644
index 00000000..a062972f
--- /dev/null
+++ b/lua/app/ui/shop/first_recharge_pop_ui.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d1ea4328dc9ac714d8d6e25ef668467e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua
index 3026ef52..381fdc14 100644
--- a/lua/app/ui/shop/gift_pop_ui.lua
+++ b/lua/app/ui/shop/gift_pop_ui.lua
@@ -2,21 +2,23 @@ local GiftPopUI = class("GiftPopUI", BaseUI)
 
 local GIFT_BG_NAME = {
     [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
-        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png", -- TODOJ
-        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png", -- TODOJ
-        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png",
+        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png",
+        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png",
+        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png",
     },
-	[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png", -- TODOJ
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png", -- TODOJ
+	[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png",
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png",
 }
 local GIFT_TITLE_TEXT = {
     [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
-        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "新手礼包TD", -- TODOJ
-        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "金币礼包TD", -- TODOJ
-        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "助力礼包TD", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_9),
+        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_11),
+        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_12),
+        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14),
     },
-    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "章节礼包TD", -- TODOJ
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "成长礼包TD", -- TODOJ
+    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_10),
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_13),
 }
 
 local MAX_ITEM_NUM = 4
@@ -148,6 +150,21 @@ function GiftPopUI:refresh(needCheck)
 	    self.buyBtnTx:setText(GFunc.getFormatPrice(rechargeId))
     end
 
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and self.actId == GConst.ShopConst.FIRST_RECHARGE_ID then
+        local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+        if canGet then
+            self.buyBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
+        else
+            local hasGet = DataManager.ShopData:getHasGotFirstRechargeReward()
+            if hasGet then
+                self:closeUI()
+            else
+                self.buyBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_15)) -- 前往商店
+            end
+        end
+    end
+
     self:updateTime()
 end
 
@@ -157,10 +174,7 @@ function GiftPopUI:updateTime()
     if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then
         local cfgInfo = DataManager.ShopData:getActGiftConfig()[self.actId]
         if cfgInfo then
-            if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE then -- 首充礼包
-                hasTime = true
-                self.timeText:setText("TODOJ") -- TODOJ
-            elseif cfgInfo and cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT then -- 金币礼包
+            if cfgInfo and cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT then -- 金币礼包
                 hasTime = true
                 local remainTime = 0
                 local triggerTime = DataManager.ShopData:getCoinGiftTriggerTime()
@@ -187,7 +201,18 @@ function GiftPopUI:updateTime()
 end
 
 function GiftPopUI:onClickGift()
-	PayManager:purchasePackage(self.actId, self.actType)
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and self.actId == GConst.ShopConst.FIRST_RECHARGE_ID then
+        local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+        if canGet then
+            PayManager:purchasePackage(self.actId, self.actType)
+        else
+            EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP)
+            self:closeUI()
+        end
+    else
+        PayManager:purchasePackage(self.actId, self.actType)
+    end
 end
 
 -- 如果还有需要显示的 则直接刷新而不是关闭本界面
diff --git a/lua/app/ui/shop/shop_comp.lua b/lua/app/ui/shop/shop_comp.lua
index 14eabb26..e031b27d 100644
--- a/lua/app/ui/shop/shop_comp.lua
+++ b/lua/app/ui/shop/shop_comp.lua
@@ -38,10 +38,10 @@ function ShopComp:initTitlePage()
 	self.subTitleIcon2 = self.uiMap["shop_comp.title_node.btn_cell_2.icon"]
 	self.subTitleBtn2 = self.uiMap["shop_comp.title_node.btn_cell_2"]
 	
-	self.subTitleText1:setText("特惠商品TD") -- TODOJ 特惠商品
-	self.subTitleSelectText1:setText("特惠商品TD") -- TODOJ 特惠商品
-	self.subTitleText2:setText("主要商品TD") -- TODOJ 主要商品
-	self.subTitleSelectText2:setText("主要商品TD") -- TODOJ 主要商品
+	self.subTitleText1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_16)) -- 特惠商品
+	self.subTitleSelectText1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_16)) -- 特惠商品
+	self.subTitleText2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_17)) -- 主要商品
+	self.subTitleSelectText2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_17)) -- 主要商品
 
 	self.subTitleBtn1:addClickListener(function()
 		self:switchPage(PAGE_DISCOUNT)
diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua
index 9142ebde..fb15983f 100644
--- a/lua/app/userdata/battle/skill/battle_skill_entity.lua
+++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua
@@ -30,6 +30,7 @@ function BattleSkillEntity:init()
 		self.available = false
 	end
 	self:clearRecordData()
+	self.buffConditionRel = nil
 end
 
 function BattleSkillEntity:initSkillEffect()
@@ -210,12 +211,17 @@ function BattleSkillEntity:getBuffConditionRel(index)
 	if not self.skillInfo.condition_rel then
 		return
 	end
-	for _, info in ipairs(self.skillInfo.condition_rel)  do
-		if info[1] == index then
-			return info[2]
+	if not self.buffConditionRel then
+		self.buffConditionRel = {}
+		for i, info in ipairs(self.skillInfo.condition_rel)  do
+			self.buffConditionRel[info[1]] = {i, info[2]}
 		end
 	end
-	return self.skillInfo.condition_rel[index]
+	return self.buffConditionRel[index]
+end
+
+function BattleSkillEntity:haveBuffCondition()
+	return self.skillInfo.condition_rel ~= nil
 end
 
 function BattleSkillEntity:getTargetType()
diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua
index 9afcaec6..9c75981d 100644
--- a/lua/app/userdata/shop/shop_data.lua
+++ b/lua/app/userdata/shop/shop_data.lua
@@ -6,6 +6,7 @@ end
 
 function ShopData:initBase()
     self:initActChapterStoreData()
+    self:initFirstRecharge()
     self:initCrossDay()
 end
 
@@ -117,9 +118,6 @@ function ShopData:markPopUpGift(actType, actId)
     if not self.needPopUpGift[actType] then
         self.needPopUpGift[actType] = {}
     end
-
-    Logger.logHighlight("markPopUpGift -- actType:%s  actId:%s",actType, actId)
-
     table.insert(self.needPopUpGift[actType], actId)
 end
 
@@ -128,9 +126,6 @@ function ShopData:removePopUpGift(actType, actId)
         if self.needPopUpGift[actType] then
             for index, id in ipairs(self.needPopUpGift[actType]) do
                 if id == actId then
-
-                    Logger.logHighlight("removePopUpGift -- actType:%s  actId:%s",actType, actId)
-
                     table.remove(self.needPopUpGift[actType], index)
                     break
                 end
@@ -262,7 +257,7 @@ function ShopData:addMallDailyAdResetCount()
 end
 
 function ShopData:getMallDailyAdLeftCount()
-    return 1 - self.mallDailyAdResetCount -- TODOJ 目前无配置表
+    return 1 - self.mallDailyAdResetCount -- 目前无配置表
 end
 
 function ShopData:getMallDailyDiamondResetCount()
@@ -274,7 +269,7 @@ function ShopData:addMallDailyDiamondResetCount()
 end
 
 function ShopData:getMallDailyDiamondLeftCount()
-    return 1 - self.mallDailyDiamondResetCount -- TODOJ 目前无配置表
+    return 1 - self.mallDailyDiamondResetCount -- 目前无配置表
 end
 
 function ShopData:getMallDailyGoods()
@@ -282,17 +277,17 @@ function ShopData:getMallDailyGoods()
 end
 
 function ShopData:getMallDailyDiamondResetCost()
-    return 30 -- TODOJ 目前无配置表
+    return 30 -- 目前无配置表
 end
 
 -- 每日特惠 广告商品最大购买次数
 function ShopData:getMallDailyFirstItemAdMaxCount()
-    return 1 -- TODOJ 目前无配置表
+    return 1 -- 目前无配置表
 end
 
 -- 每日特惠 常规商品最大购买次数
 function ShopData:getMallDailyGoodsLimitCount()
-    return 1 -- TODOJ 目前无配置表
+    return 1 -- 目前无配置表
 end
 
 -- 每日特惠 是否开启
@@ -356,7 +351,7 @@ end
 
 -- 常驻钻石礼包 **********************************************************************************************
 function ShopData:getMallTreasureConfig()
-    return ConfigManager:getConfig("mall_treasure")
+    return ConfigManager:getConfig("mall_treasure") -- 审核模式会去读另一张表 TODOJ
 end
 
 -- 常驻钻石礼包结束 ----------------------------------------------------------------------------------------------
@@ -421,8 +416,9 @@ function ShopData:getBeginnerGiftHasBuy()
     end
 end
 
+-- 新手礼包侧边栏展示时间
 function ShopData:getBeginnerGiftSideBarDurationTime()
-    return 3 * 24 * 3600 -- 暂无配置表 TODOJ
+    return 3 * 24 * 3600 -- 目前无配置表
 end
 
 -- 未购买且在开服的3天内
@@ -717,4 +713,75 @@ end
 
 -- 成长礼包结束 ----------------------------------------------------------------------------------------------
 
+-- 首充 **********************************************************************************************
+
+-- 用于标记是否弹窗 要求等级不低于2 未领取该奖励
+function ShopData:initFirstRecharge()
+    local lv = DataManager.PlayerData:getLv()
+    if lv > 1 and not self:getHasGotFirstRechargeReward() then
+        self:markPopUpGift(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID)
+    end
+end
+
+-- 是否有首充奖励 有支付且未领取
+function ShopData:getHasFirstRechargeReward()
+    local pay = DataManager.PlayerData:getTotalPayAmount()
+    if pay > 0 and not self:getHasGotFirstRechargeReward() then
+        return true
+    else
+        return false
+    end
+end
+
+-- 是否已领取首充奖励
+function ShopData:getHasGotFirstRechargeReward()
+    -- 通用act礼包中是否有已购
+    local boughtNum = self:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID)
+    return boughtNum > 0
+end
+
+-- 侧边栏是否展示 要求等级不低于2 未领取该奖励
+function ShopData:getShowFirstRechargeSideBar()
+    local lv = DataManager.PlayerData:getLv()
+    if lv > 1 and not self:getHasGotFirstRechargeReward() then
+        return true
+    else
+        return false
+    end
+end
+
+-- 侧边栏红点
+function ShopData:showFirstRechargeRp()
+    return self:getHasFirstRechargeReward()
+end
+
+-- 首充结束 ----------------------------------------------------------------------------------------------
+
+-- 底部栏是否有红点
+function ShopData:getRp()
+    if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, true) then
+        return false
+    end
+
+    local isHotOpen = ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL_DAILY, true)
+    -- 主要商品 每日特惠广告道具
+    local hotAdGoods = self:getMallDailyGoods() and self:getMallDailyGoods()[1]
+    local hotAdGoodsBuyCount = hotAdGoods and hotAdGoods.bought or 0
+    local hotAdGoodsRp = self:getMallDailyFirstItemAdMaxCount() - hotAdGoodsBuyCount > 0
+    -- 主要商品 每日特惠刷新
+    local hotRefreshRp = self:getMallDailyAdLeftCount() > 0
+    -- 主要商品 钻石广告道具
+    local gemAdId = 1 -- 约定首位为免费栏位
+    local cfgInfo = self:getMallTreasureConfig()[gemAdId] 
+    local gemAdMaxTimes = cfgInfo.daily or 0
+    local gemAdRp =  gemAdMaxTimes - DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.MALL_TREASURE, gemAdId) > 0
+    -- 主要商品 金币广告道具
+    local coinAdId = 1 -- 约定首位为免费栏位
+    local cfgInfo = self:getMallGoldConfig()[coinAdId] 
+    local coinAdMaxTimes = cfgInfo.daily or 0
+    local coinAdRp =  coinAdMaxTimes - DataManager.ShopData:getCommonDailyCoinAdBuyCount() > 0
+
+    return (isHotOpen and (hotAdGoodsRp or hotRefreshRp)) or gemAdRp or coinAdRp
+end
+
 return ShopData
\ No newline at end of file