diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua
index ed920bc5..6c9295e5 100644
--- a/lua/app/common/bi_report.lua
+++ b/lua/app/common/bi_report.lua
@@ -84,7 +84,10 @@ BIReport.ITEM_GET_TYPE = {
 	PLAYER_LV_UP = "PlayerLvUp",
 	GOLD_PIG = "GoldPig",
 	BATTLE_SKILL_REFRESH = "BattleSkillRefresh",
-	LEVEL_FUND = "LevelFund"
+	LEVEL_FUND = "LevelFund",
+	GROW_UP_GIFT = "GrowUpGift", -- 成长礼包
+	SEVEN_DAY_TASK = "SevenDayTask",
+	SEVEN_DAY_STEP_REWARD = "SevenDayStepReward",
 }
 
 BIReport.ADS_CLICK_TYPE = {
@@ -135,6 +138,7 @@ BIReport.GIFT_TYPE = {
 	MALL_TREASURE = "MallTreasure",
 	ACT_CHAPTER_STORE = "ActChapterStore",
 	LEVEL_FUND = "LevelFund",
+	GROW_UP_GIFT = "GrowUpGift",
 }
 
 BIReport.COIN_TYPE = {
diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua
index 7427cfab..2e08160a 100644
--- a/lua/app/common/data_manager.lua
+++ b/lua/app/common/data_manager.lua
@@ -17,10 +17,11 @@ function DataManager:init()
 	self:initManager("ActivityData", "app/userdata/activity/activity_data")
 	self:initManager("GoldPigData", "app/userdata/activity/gold_pig/gold_pig_data")
 	self:initManager("BountyData", "app/userdata/bounty/bounty_data")
+	self:initManager("TaskData", "app/userdata/task/task_data")
 	self:initManager("DailyTaskData", "app/userdata/task/daily_task_data")
 	self:initManager("IdleData", "app/userdata/idle/idle_data")
 	self:initManager("FundData", "app/userdata/fund/fund_data")
-	-- self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data")
+	self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data")
 	self:initManager("ShopData", "app/userdata/shop/shop_data")
 	self:initManager("SummonData", "app/userdata/summon/summon_data")
 end
@@ -92,10 +93,11 @@ function DataManager:clear()
 	self.DailyTaskData:clear()
 	self.IdleData:clear()
 	self.FundData:clear()
-	-- self.SevenDayData:clear()
+	self.SevenDayData:clear()
 	self.ShopData:clear()
 	self.SummonData:clear()
-	
+	-- 任务数据最后清理
+	self.TaskData:clear()
 	ModuleManager.TaskManager:clear()
 end
 
@@ -124,12 +126,12 @@ function DataManager:initWithServerData(data)
 	-- 任务要在BountyData之后初始化，依赖BountyData的数据
 	self.DailyTaskData:init(data.task_daily)
 	self.IdleData:init(data.idle)
-	-- self.SevenDayData:init(data.SevenDayData)
+	self.SevenDayData:init(data.seven_day)
 	self.ShopData:initBase()
 	self.ShopData:initActGift(data.act) -- 礼包购买信息
 	self.ShopData:initMallDaily(data.mall_daily) -- 每日特惠
 	self.ShopData:initCommonDailyGoldGift(data.mall_idle and data.mall_idle.ad_count) -- 常驻金币礼包
-	self.ShopData:initGrowUpGift(data.act_grow_up_gift) -- 成长礼包
+	self.ShopData:initGrowUpGift(data.act_grow_up_gift, data.now_ts) -- 成长礼包
 	self.ShopData:initLevelUpGift(data.act_level_up_gift) -- 助力/金币礼包
 	self.SummonData:init(data.summon, true) 
 	-- 成长基金要在ShopData和PlayerDataBagData还有之后初始化，依赖这些数据
@@ -137,6 +139,8 @@ function DataManager:initWithServerData(data)
 		self.FundData:init(data.fund.funds)
 	end
 
+	-- 任务数据最后初始化,依赖其他模块的数据
+	self.TaskData:init()
 	self:scheduleGlobal()
 	self:checkDataBind()
 end
@@ -243,6 +247,7 @@ function DataManager:scheduleGlobal()
 					end
 				end
 			end
+			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_LOGIN_DAY)
 		end
 	end, 1)
 end
diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua
index 2522ce22..290a7089 100644
--- a/lua/app/common/module_manager.lua
+++ b/lua/app/common/module_manager.lua
@@ -25,8 +25,8 @@ local MODULE_PATHS = {
 	ChapterManager = "app/module/chapter/chapter_manager",
 	-- 挂机
 	IdleManager = "app/module/idle/idle_manager",
-	-- 活动
-	-- SevenDayManager = "app/module/activity/seven_day/seven_day_manager",
+	-- 七天乐
+	SevenDayManager = "app/module/activity/seven_day/seven_day_manager",
 	-- 基金
 	FundManager = "app/module/fund/fund_manager",
 	-- 设置
@@ -52,6 +52,7 @@ local MODULE_PATHS = {
 -- 这里的key对应func_open里的id
 ModuleManager.MODULE_KEY = {
 	GOLD_PIG = "act_gold_pig",
+	SEVEN_DAY = "act_sevenday",
 	TASK = "task",
 	STORE_BOX_OPEN = "store_box_open",
 	STORE_BOX_3_OPEN = "store_box_3_open",
diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua
index a87604fb..9fc449b8 100644
--- a/lua/app/common/pay_manager.lua
+++ b/lua/app/common/pay_manager.lua
@@ -24,6 +24,7 @@ PayManager.PURCHARSE_TYPE_CONFIG = {
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = "act_gold_pig",
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = "mall_treasure",
     [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "act_chapter_store",
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "act_growup_gift",
 }
 
 PayManager.BI_ITEM_GET_TYPE = {
@@ -38,6 +39,7 @@ PayManager.BI_ITEM_GET_TYPE = {
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE,
     [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = BIReport.ITEM_GET_TYPE.ACT_CHAPTER_STORE,
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = BIReport.ITEM_GET_TYPE.GROW_UP_GIFT,
 }
 
 PayManager.BI_GIFT_TYPE = {
@@ -52,6 +54,7 @@ PayManager.BI_GIFT_TYPE = {
     [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG,
     [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE,
     [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = BIReport.GIFT_TYPE.ACT_CHAPTER_STORE,
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = BIReport.GIFT_TYPE.GROW_UP_GIFT,
 }
 
 function PayManager:getItemGetType(purchaseType, id)
diff --git a/lua/app/common/server_push_manager.lua b/lua/app/common/server_push_manager.lua
index c9660f92..9084d100 100644
--- a/lua/app/common/server_push_manager.lua
+++ b/lua/app/common/server_push_manager.lua
@@ -17,6 +17,7 @@ function ServerPushManager:initWhenLogin()
     self:addServerPushListener(ProtoMsgType.FromMsgEnum.NewMailNtf, ModuleManager.MailManager, ModuleManager.MailManager.needUpdateMail)
     self:addServerPushListener(ProtoMsgType.FromMsgEnum.PigLevelUpNtf, ModuleManager.ActivityManager, ModuleManager.ActivityManager.onBoughtGoldPigFinish)
     self:addServerPushListener(ProtoMsgType.FromMsgEnum.TriggerLevelUpGiftNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onTriggerLevelUpGift)
+    self:addServerPushListener(ProtoMsgType.FromMsgEnum.TriggerGrowUpGiftNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onTriggerGrowUpGift)
     self:addServerPushListener(ProtoMsgType.FromMsgEnum.MallDailyResetNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onMallDailyReset)
 end
 
diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua
index ba15d969..e1b15a17 100644
--- a/lua/app/config/chapter.lua
+++ b/lua/app/config/chapter.lua
@@ -154,21 +154,6 @@ local chapter = {
 			1401,
 			1501
 		},
-		["mystery_box"]={
-			1
-		},
-		["mystery_box_reward"]={
-			{
-				{
-					["type"]=1,
- 					["type_for_nothing"]="Vw==",
-					["id"]=2,
- 					["id_for_nothing"]="VA==",
-					["num"]=10,
- 					["num_for_nothing"]="Vwg="
-				}
-			}
-		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -321,32 +306,6 @@ local chapter = {
 			2901,
 			3001
 		},
-		["mystery_box"]={
-			1,
-			3
-		},
-		["mystery_box_reward"]={
-			{
-				{
-					["type"]=1,
- 					["type_for_nothing"]="Vw==",
-					["id"]=4,
- 					["id_for_nothing"]="Ug==",
-					["num"]=10,
- 					["num_for_nothing"]="Vwg="
-				}
-			},
-			{
-				{
-					["type"]=1,
- 					["type_for_nothing"]="Vw==",
-					["id"]=2,
- 					["id_for_nothing"]="VA==",
-					["num"]=10,
- 					["num_for_nothing"]="Vwg="
-				}
-			}
-		},
 		["wave_reward"]={
 			{
 				["type"]=1,
diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua
index bc579951..5e35d5f3 100644
--- a/lua/app/config/chapter_board.lua
+++ b/lua/app/config/chapter_board.lua
@@ -277,8 +277,8 @@ local chapter_board = {
 				0
 			},
 			{
-				14,
-				0
+				0,
+				1
 			},
 			{
 				2,
@@ -292,208 +292,10 @@ local chapter_board = {
 				2,
 				0
 			},
-			{
-				14,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			}
-		},
-		["mystery_box_board"]={
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
 			{
 				0,
 				1
 			},
-			{
-				0,
-				2
-			},
-			{
-				0,
-				1
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				3
-			},
-			{
-				0,
-				1
-			},
-			{
-				0,
-				3
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				14,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				14,
-				0
-			},
 			{
 				1,
 				0
@@ -539,7 +341,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				1,
 				0
 			},
 			{
@@ -735,16 +537,16 @@ local chapter_board = {
 				0
 			},
 			{
-				14,
-				0
+				0,
+				1
 			},
 			{
 				2,
 				0
 			},
 			{
-				14,
-				0
+				0,
+				1
 			},
 			{
 				1,
@@ -1010,204 +812,6 @@ local chapter_board = {
 				1,
 				0
 			}
-		},
-		["mystery_box_board"]={
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				0,
-				1
-			},
-			{
-				0,
-				2
-			},
-			{
-				0,
-				1
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				0,
-				2
-			},
-			{
-				0,
-				1
-			},
-			{
-				0,
-				4
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				0,
-				2
-			},
-			{
-				3,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				14,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				14,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				15,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			}
 		}
 	},
 	[5]={
@@ -1608,204 +1212,6 @@ local chapter_board = {
 				1,
 				0
 			}
-		},
-		["mystery_box_board"]={
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				1
-			},
-			{
-				0,
-				2
-			},
-			{
-				0,
-				1
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				0,
-				2
-			},
-			{
-				0,
-				3
-			},
-			{
-				0,
-				2
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				0,
-				1
-			},
-			{
-				2,
-				0
-			},
-			{
-				0,
-				1
-			},
-			{
-				2,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				2,
-				0
-			},
-			{
-				14,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				14,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				15,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				14,
-				0
-			},
-			{
-				3,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			}
 		}
 	},
 	[7]={
@@ -7789,7 +7195,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -8367,7 +7773,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -9185,7 +8591,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -9583,7 +8989,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -10153,7 +9559,7 @@ local chapter_board = {
 				5
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -10979,7 +10385,7 @@ local chapter_board = {
 				1
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -11549,7 +10955,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -11975,7 +11381,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -12573,7 +11979,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -13355,7 +12761,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -14169,7 +13575,7 @@ local chapter_board = {
 				1
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -14523,7 +13929,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -15177,7 +14583,7 @@ local chapter_board = {
 				4
 			},
 			{
-				15,
+				17,
 				0
 			}
 		}
@@ -15567,7 +14973,7 @@ local chapter_board = {
 				2
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -16465,7 +15871,7 @@ local chapter_board = {
 				1
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -16903,7 +16309,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -17317,7 +16723,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -17955,7 +17361,7 @@ local chapter_board = {
 				4
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -18737,7 +18143,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -19315,7 +18721,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -19721,7 +19127,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -20359,7 +19765,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			}
 		}
@@ -20957,7 +20363,7 @@ local chapter_board = {
 				1
 			},
 			{
-				15,
+				17,
 				0
 			}
 		}
@@ -21743,7 +21149,7 @@ local chapter_board = {
 				2
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -22341,7 +21747,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -22883,7 +22289,7 @@ local chapter_board = {
 				3
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -23709,7 +23115,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -24135,7 +23541,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -24505,7 +23911,7 @@ local chapter_board = {
 				4
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -25103,7 +24509,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -26045,7 +25451,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -26527,7 +25933,7 @@ local chapter_board = {
 				1
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -27085,7 +26491,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -27611,7 +27017,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -28333,7 +27739,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			}
 		}
@@ -28691,7 +28097,7 @@ local chapter_board = {
 				2
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -29461,7 +28867,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -30019,7 +29425,7 @@ local chapter_board = {
 				2
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -30885,7 +30291,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
@@ -31227,7 +30633,7 @@ local chapter_board = {
 				0
 			},
 			{
-				15,
+				17,
 				0
 			},
 			{
diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua
index 20962575..4a3e0215 100644
--- a/lua/app/config/const.lua
+++ b/lua/app/config/const.lua
@@ -185,9 +185,12 @@ local const = {
 	},
 	["act_gift_downshift_number"]={
 		["value"]=15
+	},
+	["act_sevenday_time"]={
+		["value"]=7
 	}
 }
 local config = {
-data=const,count=39
+data=const,count=40
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua
index eba7a87b..9ebdea82 100644
--- a/lua/app/config/func_open.lua
+++ b/lua/app/config/func_open.lua
@@ -16,8 +16,7 @@ local func_open = {
 		["stage"]=2
 	},
 	["act_sevenday"]={
-		["stage"]=2,
-		["pop_ups"]=1
+		["stage"]=2
 	},
 	["mall"]={
 		["stage"]=1
diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua
index 1a101352..41d8d6a9 100644
--- a/lua/app/config/hero.lua
+++ b/lua/app/config/hero.lua
@@ -113,7 +113,8 @@ local hero = {
 		["model_id"]="p0014",
 		["icon"]="5",
 		["item_id"]=13001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[13002]={
 		["position"]=1,
@@ -171,7 +172,8 @@ local hero = {
 		["model_id"]="p0009",
 		["icon"]="5",
 		["item_id"]=13002,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[14001]={
 		["position"]=1,
@@ -229,7 +231,8 @@ local hero = {
 		["model_id"]="p0011",
 		["icon"]="5",
 		["item_id"]=14001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[22001]={
 		["position"]=2,
@@ -345,7 +348,8 @@ local hero = {
 		["model_id"]="p0010",
 		["icon"]="5",
 		["item_id"]=23001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[23002]={
 		["position"]=2,
@@ -403,7 +407,8 @@ local hero = {
 		["model_id"]="p0012",
 		["icon"]="5",
 		["item_id"]=23002,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[24001]={
 		["position"]=2,
@@ -461,7 +466,8 @@ local hero = {
 		["model_id"]="p0007",
 		["icon"]="7",
 		["item_id"]=24001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[32001]={
 		["position"]=3,
@@ -577,7 +583,8 @@ local hero = {
 		["model_id"]="p0006",
 		["icon"]="6",
 		["item_id"]=33001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[33002]={
 		["position"]=3,
@@ -635,7 +642,8 @@ local hero = {
 		["model_id"]="p0006",
 		["icon"]="6",
 		["item_id"]=33002,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[34001]={
 		["position"]=3,
@@ -693,7 +701,8 @@ local hero = {
 		["model_id"]="p0006",
 		["icon"]="6",
 		["item_id"]=34001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[42001]={
 		["position"]=4,
@@ -809,7 +818,8 @@ local hero = {
 		["model_id"]="p0003",
 		["icon"]="3",
 		["item_id"]=43001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[43002]={
 		["position"]=4,
@@ -867,7 +877,8 @@ local hero = {
 		["model_id"]="p0003",
 		["icon"]="3",
 		["item_id"]=43002,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[44001]={
 		["position"]=4,
@@ -925,7 +936,8 @@ local hero = {
 		["model_id"]="p0008",
 		["icon"]="8",
 		["item_id"]=44001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[52001]={
 		["position"]=5,
@@ -1041,7 +1053,8 @@ local hero = {
 		["model_id"]="p0015",
 		["icon"]="4",
 		["item_id"]=53001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[53002]={
 		["position"]=5,
@@ -1099,7 +1112,8 @@ local hero = {
 		["model_id"]="p0004",
 		["icon"]="4",
 		["item_id"]=53002,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	},
 	[54001]={
 		["position"]=5,
@@ -1157,7 +1171,8 @@ local hero = {
 		["model_id"]="p0004",
 		["icon"]="4",
 		["item_id"]=54001,
-		["unlock_chapter"]=3
+		["unlock_chapter"]=3,
+		["is_show"]=1
 	}
 }
 local config = {
diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua
index a2928856..24061061 100644
--- a/lua/app/config/localization/localization_global_const.lua
+++ b/lua/app/config/localization/localization_global_const.lua
@@ -133,6 +133,16 @@ local LocalizationGlobalConst =
 	SIDE_BAR_FULL = "SIDE_BAR_FULL",
 	DAILY_CHALLENGE = "DAILY_CHALLENGE",
 	LEVEL_FUND_DESC_1 = "LEVEL_FUND_DESC_1",
+	BUFF_DESC = "BUFF_DESC",
+	DAILY_CHALLENGE_DESC_1 = "DAILY_CHALLENGE_DESC_1",
+	DISCONNECT_RELOGIN = "DISCONNECT_RELOGIN",
+	RECONNECT = "RECONNECT",
+	RELOGIN = "RELOGIN",
+	SEVEN_DAY_TITLE = "SEVEN_DAY_TITLE",
+	SEVEN_DAY_DESC_1 = "SEVEN_DAY_DESC_1",
+	DAY_X = "DAY_X",
+	DAY_X_UNLOCK = "DAY_X_UNLOCK",
+	SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2",
 }
 
 return LocalizationGlobalConst
\ No newline at end of file
diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua
index 2b5593e2..11862c10 100644
--- a/lua/app/config/monster_base.lua
+++ b/lua/app/config/monster_base.lua
@@ -33,16 +33,12 @@ local monster_base = {
 	},
 	[10009]={
 		["model_id"]="m10009",
-		["body"]=3
+		["body"]=2
 	},
 	[10010]={
 		["model_id"]="m10010",
 		["body"]=2
 	},
-	[10011]={
-		["model_id"]="m10011",
-		["body"]=2
-	},
 	[10012]={
 		["model_id"]="m10012",
 		["body"]=2
@@ -75,6 +71,38 @@ local monster_base = {
 		["model_id"]="m10019",
 		["body"]=2
 	},
+	[10020]={
+		["model_id"]="m10020",
+		["body"]=3
+	},
+	[10021]={
+		["model_id"]="m10021",
+		["body"]=3
+	},
+	[10022]={
+		["model_id"]="m10022",
+		["body"]=3
+	},
+	[10023]={
+		["model_id"]="m10023",
+		["body"]=3
+	},
+	[10024]={
+		["model_id"]="m10024",
+		["body"]=2
+	},
+	[10025]={
+		["model_id"]="m10025",
+		["body"]=2
+	},
+	[10026]={
+		["model_id"]="m10026",
+		["body"]=2
+	},
+	[10027]={
+		["model_id"]="m10027",
+		["body"]=2
+	},
 	[10028]={
 		["model_id"]="m10028",
 		["body"]=2
@@ -99,10 +127,110 @@ local monster_base = {
 		["model_id"]="m10033",
 		["body"]=2
 	},
+	[10034]={
+		["model_id"]="m10034",
+		["body"]=2
+	},
+	[10035]={
+		["model_id"]="m10035",
+		["body"]=2
+	},
+	[10036]={
+		["model_id"]="m10036",
+		["body"]=2
+	},
+	[10037]={
+		["model_id"]="m10037",
+		["body"]=2
+	},
+	[10038]={
+		["model_id"]="m10038",
+		["body"]=2
+	},
 	[10039]={
 		["model_id"]="m10039",
 		["body"]=2
 	},
+	[10040]={
+		["model_id"]="m10040",
+		["body"]=2
+	},
+	[10041]={
+		["model_id"]="m10041",
+		["body"]=2
+	},
+	[10042]={
+		["model_id"]="m10042",
+		["body"]=2
+	},
+	[10043]={
+		["model_id"]="m10043",
+		["body"]=2
+	},
+	[10044]={
+		["model_id"]="m10044",
+		["body"]=2
+	},
+	[10045]={
+		["model_id"]="m10045",
+		["body"]=2
+	},
+	[10046]={
+		["model_id"]="m10046",
+		["body"]=2
+	},
+	[10047]={
+		["model_id"]="m10047",
+		["body"]=2
+	},
+	[10048]={
+		["model_id"]="m10048",
+		["body"]=2
+	},
+	[10049]={
+		["model_id"]="m10049",
+		["body"]=2
+	},
+	[10050]={
+		["model_id"]="m10050",
+		["body"]=2
+	},
+	[10051]={
+		["model_id"]="m10051",
+		["body"]=2
+	},
+	[10052]={
+		["model_id"]="m10052",
+		["body"]=2
+	},
+	[10053]={
+		["model_id"]="m10053",
+		["body"]=3
+	},
+	[10054]={
+		["model_id"]="m10054",
+		["body"]=3
+	},
+	[10055]={
+		["model_id"]="m10055",
+		["body"]=2
+	},
+	[10056]={
+		["model_id"]="m10056",
+		["body"]=2
+	},
+	[10057]={
+		["model_id"]="m10057",
+		["body"]=2
+	},
+	[10058]={
+		["model_id"]="m10058",
+		["body"]=2
+	},
+	[10059]={
+		["model_id"]="m10059",
+		["body"]=2
+	},
 	[20001]={
 		["model_id"]="m20001",
 		["body"]=1
@@ -175,6 +303,62 @@ local monster_base = {
 		["model_id"]="m20018",
 		["body"]=1
 	},
+	[20019]={
+		["model_id"]="m20019",
+		["body"]=1
+	},
+	[20020]={
+		["model_id"]="m20020",
+		["body"]=1
+	},
+	[20021]={
+		["model_id"]="m20021",
+		["body"]=1
+	},
+	[20022]={
+		["model_id"]="m20022",
+		["body"]=1
+	},
+	[20023]={
+		["model_id"]="m20023",
+		["body"]=1
+	},
+	[20024]={
+		["model_id"]="m20024",
+		["body"]=1
+	},
+	[20025]={
+		["model_id"]="m20025",
+		["body"]=1
+	},
+	[20026]={
+		["model_id"]="m20026",
+		["body"]=1
+	},
+	[20027]={
+		["model_id"]="m20027",
+		["body"]=1
+	},
+	[20028]={
+		["model_id"]="m20028",
+		["body"]=1
+	},
+	[20029]={
+		["model_id"]="m20029",
+		["body"]=1
+	},
+	[20030]={
+		["model_id"]="m20030",
+		["body"]=1
+	},
+	[20031]={
+		["model_id"]="m20031",
+		["body"]=1
+	},
+	[20032]={
+		["model_id"]="m20032",
+		["body"]=1
+	},
 	[30001]={
 		["model_id"]="p0001",
 		["body"]=1
@@ -225,6 +409,6 @@ local monster_base = {
 	}
 }
 local config = {
-data=monster_base,count=56
+data=monster_base,count=102
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua
index da3f6101..a4319153 100644
--- a/lua/app/config/monster_chapter.lua
+++ b/lua/app/config/monster_chapter.lua
@@ -5,45 +5,45 @@ local monster_chapter = {
 		["atk"]=200000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=11000
 	},
 	[201]={
-		["monster_base"]=10004,
+		["monster_base"]=10002,
 		["hp"]=5000000,
 		["atk"]=200000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20004,
+			20005,
+			20006
 		},
 		["monster_exp"]=4000
 	},
 	[301]={
-		["monster_base"]=10002,
+		["monster_base"]=10003,
 		["hp"]=12000000,
 		["atk"]=200000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20007,
+			20008,
+			20009
 		},
 		["monster_exp"]=8000
 	},
 	[401]={
-		["monster_base"]=10006,
+		["monster_base"]=10005,
 		["hp"]=13000000,
 		["atk"]=200000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=12000
 	},
@@ -54,9 +54,9 @@ local monster_chapter = {
 		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30010,
+			30011,
+			30012
 		},
 		["skill"]={
 			10015
@@ -64,63 +64,63 @@ local monster_chapter = {
 		["monster_exp"]=18000
 	},
 	[601]={
-		["monster_base"]=10010,
+		["monster_base"]=10008,
 		["hp"]=8000000,
 		["atk"]=250000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20022,
+			20023,
+			20024
 		},
 		["monster_exp"]=11000
 	},
 	[701]={
-		["monster_base"]=10003,
+		["monster_base"]=10004,
 		["hp"]=8000000,
 		["atk"]=250000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=11000
 	},
 	[801]={
-		["monster_base"]=10004,
+		["monster_base"]=10001,
 		["hp"]=10000000,
 		["atk"]=250000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=17000
 	},
 	[901]={
-		["monster_base"]=10001,
+		["monster_base"]=10007,
 		["hp"]=12000000,
 		["atk"]=280000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=19000
 	},
 	[1001]={
-		["monster_base"]=20004,
+		["monster_base"]=20014,
 		["is_boss"]=1,
 		["hp"]=20000000,
 		["atk"]=340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30040,
+			30041,
+			30042
 		},
 		["skill"]={
 			10016
@@ -131,63 +131,63 @@ local monster_chapter = {
 		["monster_exp"]=18000
 	},
 	[1101]={
-		["monster_base"]=10002,
+		["monster_base"]=10006,
 		["hp"]=15000000,
 		["atk"]=300000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=9000
 	},
 	[1201]={
-		["monster_base"]=10010,
+		["monster_base"]=10007,
 		["hp"]=17000000,
 		["atk"]=310000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=10000
 	},
 	[1301]={
-		["monster_base"]=10008,
+		["monster_base"]=10002,
 		["hp"]=20000000,
 		["atk"]=320000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20004,
+			20005,
+			20006
 		},
 		["monster_exp"]=11000
 	},
 	[1401]={
-		["monster_base"]=10004,
+		["monster_base"]=10005,
 		["hp"]=22000000,
 		["atk"]=330000,
 		["atk_times"]=2,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=12000
 	},
 	[1501]={
-		["monster_base"]=20012,
+		["monster_base"]=20015,
 		["is_boss"]=2,
 		["hp"]=36000000,
 		["atk"]=380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
 		},
 		["skill"]={
 			10016
@@ -203,180 +203,189 @@ local monster_chapter = {
 		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=11000
 	},
 	[1701]={
-		["monster_base"]=10007,
+		["monster_base"]=10001,
 		["hp"]=8000000,
 		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=11000
 	},
 	[1801]={
-		["monster_base"]=10008,
+		["monster_base"]=10038,
 		["hp"]=11000000,
 		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=17000
 	},
 	[1901]={
-		["monster_base"]=10010,
+		["monster_base"]=10007,
 		["hp"]=14000000,
 		["atk"]=280000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=19000
 	},
 	[2001]={
-		["monster_base"]=20012,
+		["monster_base"]=20004,
 		["is_boss"]=1,
 		["hp"]=20000000,
 		["atk"]=340000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30010,
+			30011,
+			30012
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=18000
 	},
 	[2101]={
-		["monster_base"]=10011,
+		["monster_base"]=10038,
 		["hp"]=15000000,
 		["atk"]=300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=9000
 	},
 	[2201]={
-		["monster_base"]=10010,
+		["monster_base"]=10007,
 		["hp"]=18000000,
 		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=10000
 	},
 	[2301]={
-		["monster_base"]=10007,
+		["monster_base"]=10010,
 		["hp"]=20000000,
 		["atk"]=320000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=11000
 	},
 	[2401]={
-		["monster_base"]=10011,
+		["monster_base"]=10001,
 		["hp"]=22000000,
 		["atk"]=340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=12000
 	},
 	[2501]={
-		["monster_base"]=20010,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=39000000,
 		["atk"]=390000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=12000
 	},
 	[2601]={
-		["monster_base"]=10010,
+		["monster_base"]=10039,
 		["hp"]=20000000,
 		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=16000
 	},
 	[2701]={
-		["monster_base"]=10009,
+		["monster_base"]=10002,
 		["hp"]=24000000,
 		["atk"]=340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20004,
+			20005,
+			20006
 		},
 		["monster_exp"]=18000
 	},
 	[2801]={
-		["monster_base"]=10011,
+		["monster_base"]=10001,
 		["hp"]=27000000,
 		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=21000
 	},
 	[2901]={
-		["monster_base"]=10003,
+		["monster_base"]=10009,
 		["hp"]=30000000,
 		["atk"]=360000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=22000
 	},
 	[3001]={
-		["monster_base"]=20011,
+		["monster_base"]=20012,
 		["is_boss"]=2,
 		["hp"]=46000000,
 		["atk"]=420000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
 		},
 		["skill"]={
 			10017
@@ -384,246 +393,255 @@ local monster_chapter = {
 		["monster_exp"]=24000
 	},
 	[3101]={
-		["monster_base"]=10012,
+		["monster_base"]=10010,
 		["hp"]=8000000,
 		["atk"]=250000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=11000
 	},
 	[3201]={
-		["monster_base"]=10006,
+		["monster_base"]=10039,
 		["hp"]=11000000,
 		["atk"]=270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=11000
 	},
 	[3301]={
-		["monster_base"]=10016,
+		["monster_base"]=10040,
 		["hp"]=12000000,
 		["atk"]=290000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=17000
 	},
 	[3401]={
-		["monster_base"]=10005,
+		["monster_base"]=10038,
 		["hp"]=15000000,
 		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=19000
 	},
 	[3501]={
-		["monster_base"]=20009,
+		["monster_base"]=20011,
 		["is_boss"]=1,
 		["hp"]=23000000,
 		["atk"]=370000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30031,
+			30032,
+			30033
 		},
 		["monster_exp"]=18000
 	},
 	[3601]={
-		["monster_base"]=10005,
+		["monster_base"]=10009,
 		["hp"]=15000000,
 		["atk"]=310000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=9000
 	},
 	[3701]={
-		["monster_base"]=10012,
+		["monster_base"]=10010,
 		["hp"]=17000000,
 		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=10000
 	},
 	[3801]={
-		["monster_base"]=10006,
+		["monster_base"]=10038,
 		["hp"]=20000000,
 		["atk"]=330000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=11000
 	},
 	[3901]={
-		["monster_base"]=10016,
+		["monster_base"]=10040,
 		["hp"]=22000000,
 		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=12000
 	},
 	[4001]={
-		["monster_base"]=20002,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=42000000,
 		["atk"]=400000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=12000
 	},
 	[4101]={
-		["monster_base"]=10005,
+		["monster_base"]=10039,
 		["hp"]=23000000,
 		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=16000
 	},
 	[4201]={
-		["monster_base"]=10012,
+		["monster_base"]=10040,
 		["hp"]=28000000,
 		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=18000
 	},
 	[4301]={
-		["monster_base"]=10016,
+		["monster_base"]=10038,
 		["hp"]=31000000,
 		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=21000
 	},
 	[4401]={
-		["monster_base"]=10006,
+		["monster_base"]=10009,
 		["hp"]=35000000,
 		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=22000
 	},
 	[4501]={
-		["monster_base"]=20002,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=52000000,
 		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=24000
 	},
 	[4601]={
-		["monster_base"]=10012,
+		["monster_base"]=10040,
 		["hp"]=40000000,
 		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=15000
 	},
 	[4701]={
-		["monster_base"]=10006,
+		["monster_base"]=10009,
 		["hp"]=44000000,
 		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=16000
 	},
 	[4801]={
-		["monster_base"]=10016,
+		["monster_base"]=10038,
 		["hp"]=50000000,
 		["atk"]=470000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=17000
 	},
 	[4901]={
-		["monster_base"]=10005,
+		["monster_base"]=10039,
 		["hp"]=54000000,
 		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=17000
 	},
 	[5001]={
-		["monster_base"]=20009,
+		["monster_base"]=20029,
 		["is_boss"]=2,
 		["hp"]=90000000,
 		["atk"]=550000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30085,
+			30086,
+			30087
 		},
 		["skill"]={
 			10018
@@ -631,63 +649,66 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[5101]={
-		["monster_base"]=10013,
+		["monster_base"]=10016,
 		["hp"]=8500000,
 		["atk"]=350000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20043,
+			20044,
+			20045
 		},
 		["monster_exp"]=11000
 	},
 	[5201]={
-		["monster_base"]=10001,
+		["monster_base"]=10002,
 		["hp"]=12000000,
 		["atk"]=370000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20004,
+			20005,
+			20006
 		},
 		["monster_exp"]=11000
 	},
 	[5301]={
-		["monster_base"]=10004,
+		["monster_base"]=10003,
 		["hp"]=13500000,
 		["atk"]=390000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20007,
+			20008,
+			20009
 		},
 		["monster_exp"]=17000
 	},
 	[5401]={
-		["monster_base"]=10013,
+		["monster_base"]=10019,
 		["hp"]=18000000,
 		["atk"]=410000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=19000
 	},
 	[5501]={
-		["monster_base"]=20006,
+		["monster_base"]=20002,
 		["is_boss"]=1,
 		["hp"]=25000000,
 		["atk"]=470000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30004,
+			30005,
+			30006
+		},
+		["skill"]={
+			10019
 		},
 		["monster_exp"]=18000
 	},
@@ -697,21 +718,21 @@ local monster_chapter = {
 		["atk"]=430000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=9000
 	},
 	[5701]={
-		["monster_base"]=10010,
+		["monster_base"]=10017,
 		["hp"]=19000000,
 		["atk"]=490000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20046,
+			20047,
+			20048
 		},
 		["monster_exp"]=10000
 	},
@@ -721,159 +742,168 @@ local monster_chapter = {
 		["atk"]=450000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=11000
 	},
 	[5901]={
-		["monster_base"]=10013,
+		["monster_base"]=10018,
 		["hp"]=25000000,
 		["atk"]=510000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20049,
+			20050,
+			20051
 		},
 		["monster_exp"]=12000
 	},
 	[6001]={
-		["monster_base"]=20007,
+		["monster_base"]=20014,
 		["is_boss"]=1,
 		["hp"]=52000000,
 		["atk"]=570000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30040,
+			30041,
+			30042
 		},
 		["skill"]={
-			10019
+			10016
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=12000
 	},
 	[6101]={
-		["monster_base"]=10004,
+		["monster_base"]=10019,
 		["hp"]=30000000,
 		["atk"]=530000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=16000
 	},
 	[6201]={
-		["monster_base"]=10013,
+		["monster_base"]=10008,
 		["hp"]=34000000,
 		["atk"]=550000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20022,
+			20023,
+			20024
 		},
 		["monster_exp"]=18000
 	},
 	[6301]={
-		["monster_base"]=10010,
+		["monster_base"]=10016,
 		["hp"]=36000000,
 		["atk"]=570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20043,
+			20044,
+			20045
 		},
 		["monster_exp"]=21000
 	},
 	[6401]={
-		["monster_base"]=10007,
+		["monster_base"]=10003,
 		["hp"]=39000000,
 		["atk"]=590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20007,
+			20008,
+			20009
 		},
 		["monster_exp"]=22000
 	},
 	[6501]={
-		["monster_base"]=20011,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=71000000,
 		["atk"]=590000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=24000
 	},
 	[6601]={
-		["monster_base"]=10013,
+		["monster_base"]=10018,
 		["hp"]=47000000,
 		["atk"]=610000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20049,
+			20050,
+			20051
 		},
 		["monster_exp"]=15000
 	},
 	[6701]={
-		["monster_base"]=10007,
+		["monster_base"]=10004,
 		["hp"]=50000000,
 		["atk"]=630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=16000
 	},
 	[6801]={
-		["monster_base"]=10004,
+		["monster_base"]=10007,
 		["hp"]=55000000,
 		["atk"]=650000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=17000
 	},
 	[6901]={
-		["monster_base"]=10010,
+		["monster_base"]=10017,
 		["hp"]=60000000,
 		["atk"]=670000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20046,
+			20047,
+			20048
 		},
 		["monster_exp"]=17000
 	},
 	[7001]={
-		["monster_base"]=20007,
+		["monster_base"]=20001,
 		["is_boss"]=2,
 		["hp"]=95000000,
 		["atk"]=920000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30001,
+			30002,
+			30003
 		},
 		["skill"]={
 			10020
@@ -881,247 +911,247 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[7101]={
-		["monster_base"]=10011,
+		["monster_base"]=10042,
 		["hp"]=8700000,
 		["atk"]=380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20121,
+			20122,
+			20123
 		},
 		["monster_exp"]=11000
 	},
 	[7201]={
-		["monster_base"]=10010,
+		["monster_base"]=10041,
 		["hp"]=12300000,
 		["atk"]=400000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20118,
+			20119,
+			20120
 		},
 		["monster_exp"]=11000
 	},
 	[7301]={
-		["monster_base"]=10007,
+		["monster_base"]=10013,
 		["hp"]=13800000,
 		["atk"]=420000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=17000
 	},
 	[7401]={
-		["monster_base"]=10004,
+		["monster_base"]=10019,
 		["hp"]=18400000,
 		["atk"]=440000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=19000
 	},
 	[7501]={
-		["monster_base"]=20008,
+		["monster_base"]=20022,
 		["is_boss"]=1,
 		["hp"]=25600000,
 		["atk"]=490000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30064,
+			30065,
+			30066
 		},
 		["monster_exp"]=18000
 	},
 	[7601]={
-		["monster_base"]=10006,
+		["monster_base"]=10001,
 		["hp"]=19100000,
 		["atk"]=500000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=9000
 	},
 	[7701]={
-		["monster_base"]=10010,
+		["monster_base"]=10005,
 		["hp"]=21300000,
 		["atk"]=570000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=10000
 	},
 	[7801]={
-		["monster_base"]=10011,
+		["monster_base"]=10041,
 		["hp"]=24700000,
 		["atk"]=520000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20118,
+			20119,
+			20120
 		},
 		["monster_exp"]=11000
 	},
 	[7901]={
-		["monster_base"]=10004,
+		["monster_base"]=10013,
 		["hp"]=28100000,
 		["atk"]=590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=12000
 	},
 	[8001]={
-		["monster_base"]=20006,
+		["monster_base"]=20023,
 		["is_boss"]=1,
 		["hp"]=53300000,
 		["atk"]=600000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30067,
+			30068,
+			30069
 		},
 		["monster_exp"]=12000
 	},
 	[8101]={
-		["monster_base"]=10006,
+		["monster_base"]=10042,
 		["hp"]=30800000,
 		["atk"]=560000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20121,
+			20122,
+			20123
 		},
 		["monster_exp"]=16000
 	},
 	[8201]={
-		["monster_base"]=10010,
+		["monster_base"]=10001,
 		["hp"]=34900000,
 		["atk"]=580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=18000
 	},
 	[8301]={
-		["monster_base"]=10011,
+		["monster_base"]=10013,
 		["hp"]=36900000,
 		["atk"]=600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=21000
 	},
 	[8401]={
-		["monster_base"]=10002,
+		["monster_base"]=10044,
 		["hp"]=40000000,
 		["atk"]=620000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=22000
 	},
 	[8501]={
-		["monster_base"]=20007,
+		["monster_base"]=20022,
 		["is_boss"]=1,
 		["hp"]=72800000,
 		["atk"]=620000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30064,
+			30065,
+			30066
 		},
 		["monster_exp"]=24000
 	},
 	[8601]={
-		["monster_base"]=10004,
+		["monster_base"]=10041,
 		["hp"]=52800000,
 		["atk"]=700000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20118,
+			20119,
+			20120
 		},
 		["monster_exp"]=15000
 	},
 	[8701]={
-		["monster_base"]=10002,
+		["monster_base"]=10001,
 		["hp"]=56100000,
 		["atk"]=720000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=16000
 	},
 	[8801]={
-		["monster_base"]=10011,
+		["monster_base"]=10042,
 		["hp"]=61700000,
 		["atk"]=750000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20121,
+			20122,
+			20123
 		},
 		["monster_exp"]=17000
 	},
 	[8901]={
-		["monster_base"]=10013,
+		["monster_base"]=10044,
 		["hp"]=67300000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=17000
 	},
 	[9001]={
-		["monster_base"]=20008,
+		["monster_base"]=30003,
 		["is_boss"]=2,
 		["hp"]=108900000,
 		["atk"]=1070000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10004,
-			10005,
-			10006,
-			10007
+			40001,
+			40002,
+			40003,
+			40004
 		},
 		["skill"]={
 			10021,
@@ -1130,246 +1160,246 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[9101]={
-		["monster_base"]=10017,
+		["monster_base"]=10041,
 		["hp"]=11000000,
 		["atk"]=500000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20118,
+			20119,
+			20120
 		},
 		["monster_exp"]=11000
 	},
 	[9201]={
-		["monster_base"]=10004,
+		["monster_base"]=10001,
 		["hp"]=15600000,
 		["atk"]=520000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=11000
 	},
 	[9301]={
-		["monster_base"]=10002,
+		["monster_base"]=10013,
 		["hp"]=17500000,
 		["atk"]=550000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=17000
 	},
 	[9401]={
-		["monster_base"]=10014,
+		["monster_base"]=10044,
 		["hp"]=23300000,
 		["atk"]=580000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=19000
 	},
 	[9501]={
-		["monster_base"]=20005,
+		["monster_base"]=20026,
 		["is_boss"]=1,
 		["hp"]=32400000,
 		["atk"]=640000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30076,
+			30077,
+			30078
 		},
 		["monster_exp"]=18000
 	},
 	[9601]={
-		["monster_base"]=10017,
+		["monster_base"]=10001,
 		["hp"]=22000000,
 		["atk"]=600000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=9000
 	},
 	[9701]={
-		["monster_base"]=10014,
+		["monster_base"]=10042,
 		["hp"]=24600000,
 		["atk"]=670000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20121,
+			20122,
+			20123
 		},
 		["monster_exp"]=10000
 	},
 	[9801]={
-		["monster_base"]=10004,
+		["monster_base"]=10005,
 		["hp"]=28500000,
 		["atk"]=630000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=11000
 	},
 	[9901]={
-		["monster_base"]=10002,
+		["monster_base"]=10013,
 		["hp"]=32400000,
 		["atk"]=700000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=12000
 	},
 	[10001]={
-		["monster_base"]=20010,
+		["monster_base"]=20022,
 		["is_boss"]=1,
 		["hp"]=59700000,
 		["atk"]=690000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30064,
+			30065,
+			30066
 		},
 		["monster_exp"]=12000
 	},
 	[10101]={
-		["monster_base"]=10002,
+		["monster_base"]=10001,
 		["hp"]=34500000,
 		["atk"]=650000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=16000
 	},
 	[10201]={
-		["monster_base"]=10010,
+		["monster_base"]=10042,
 		["hp"]=39100000,
 		["atk"]=670000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20121,
+			20122,
+			20123
 		},
 		["monster_exp"]=18000
 	},
 	[10301]={
-		["monster_base"]=10003,
+		["monster_base"]=10013,
 		["hp"]=41300000,
 		["atk"]=700000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=21000
 	},
 	[10401]={
-		["monster_base"]=10008,
+		["monster_base"]=10001,
 		["hp"]=44800000,
 		["atk"]=720000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=22000
 	},
 	[10501]={
-		["monster_base"]=20011,
+		["monster_base"]=20023,
 		["is_boss"]=1,
 		["hp"]=81500000,
 		["atk"]=710000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30067,
+			30068,
+			30069
 		},
 		["monster_exp"]=24000
 	},
 	[10601]={
-		["monster_base"]=10007,
+		["monster_base"]=10042,
 		["hp"]=55400000,
 		["atk"]=760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20121,
+			20122,
+			20123
 		},
 		["monster_exp"]=15000
 	},
 	[10701]={
-		["monster_base"]=10011,
+		["monster_base"]=10044,
 		["hp"]=58800000,
 		["atk"]=780000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=16000
 	},
 	[10801]={
-		["monster_base"]=10012,
+		["monster_base"]=10013,
 		["hp"]=64700000,
 		["atk"]=810000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=17000
 	},
 	[10901]={
-		["monster_base"]=10016,
+		["monster_base"]=10041,
 		["hp"]=70600000,
 		["atk"]=830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20118,
+			20119,
+			20120
 		},
 		["monster_exp"]=17000
 	},
 	[11001]={
-		["monster_base"]=20005,
+		["monster_base"]=20025,
 		["is_boss"]=2,
 		["hp"]=121900000,
 		["atk"]=1210000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30073,
+			30074,
+			30075
 		},
 		["skill"]={
 			10023
@@ -1382,228 +1412,240 @@ local monster_chapter = {
 		["atk"]=590000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=11000
 	},
 	[11201]={
-		["monster_base"]=10003,
+		["monster_base"]=10009,
 		["hp"]=17900000,
 		["atk"]=620000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=11000
 	},
 	[11301]={
-		["monster_base"]=10009,
+		["monster_base"]=10038,
 		["hp"]=20100000,
 		["atk"]=650000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=17000
 	},
 	[11401]={
-		["monster_base"]=10011,
+		["monster_base"]=10039,
 		["hp"]=26700000,
 		["atk"]=680000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=19000
 	},
 	[11501]={
-		["monster_base"]=20008,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=37100000,
 		["atk"]=750000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=18000
 	},
 	[11601]={
-		["monster_base"]=10007,
+		["monster_base"]=10013,
 		["hp"]=25200000,
 		["atk"]=700000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=9000
 	},
 	[11701]={
-		["monster_base"]=10011,
+		["monster_base"]=10016,
 		["hp"]=28200000,
 		["atk"]=790000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20043,
+			20044,
+			20045
 		},
 		["monster_exp"]=10000
 	},
 	[11801]={
-		["monster_base"]=10012,
+		["monster_base"]=10015,
 		["hp"]=32700000,
 		["atk"]=740000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20040,
+			20041,
+			20042
 		},
 		["monster_exp"]=11000
 	},
 	[11901]={
-		["monster_base"]=10016,
+		["monster_base"]=10017,
 		["hp"]=37100000,
 		["atk"]=830000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20046,
+			20047,
+			20048
 		},
 		["monster_exp"]=12000
 	},
 	[12001]={
-		["monster_base"]=20001,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=68400000,
 		["atk"]=800000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=12000
 	},
 	[12101]={
-		["monster_base"]=10017,
+		["monster_base"]=10018,
 		["hp"]=39500000,
 		["atk"]=760000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20049,
+			20050,
+			20051
 		},
 		["monster_exp"]=16000
 	},
 	[12201]={
-		["monster_base"]=10014,
+		["monster_base"]=10003,
 		["hp"]=44800000,
 		["atk"]=790000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20007,
+			20008,
+			20009
 		},
 		["monster_exp"]=18000
 	},
 	[12301]={
-		["monster_base"]=10004,
+		["monster_base"]=10006,
 		["hp"]=47300000,
 		["atk"]=820000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=21000
 	},
 	[12401]={
-		["monster_base"]=10002,
+		["monster_base"]=10014,
 		["hp"]=51300000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20037,
+			20038,
+			20039
 		},
 		["monster_exp"]=22000
 	},
 	[12501]={
-		["monster_base"]=20004,
+		["monster_base"]=20001,
 		["is_boss"]=1,
 		["hp"]=97800000,
 		["atk"]=870000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			10020
 		},
 		["monster_exp"]=24000
 	},
 	[12601]={
-		["monster_base"]=10010,
+		["monster_base"]=10030,
 		["hp"]=64800000,
 		["atk"]=910000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20085,
+			20086,
+			20087
 		},
 		["monster_exp"]=15000
 	},
 	[12701]={
-		["monster_base"]=10003,
+		["monster_base"]=10032,
 		["hp"]=68800000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=16000
 	},
 	[12801]={
-		["monster_base"]=10009,
+		["monster_base"]=10031,
 		["hp"]=75700000,
 		["atk"]=960000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20088,
+			20089,
+			20090
 		},
 		["monster_exp"]=17000
 	},
 	[12901]={
-		["monster_base"]=10011,
+		["monster_base"]=10033,
 		["hp"]=82600000,
 		["atk"]=990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=17000
 	},
@@ -1614,9 +1656,9 @@ local monster_chapter = {
 		["atk"]=1320000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
 		},
 		["skill"]={
 			10024
@@ -1624,111 +1666,117 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[13101]={
-		["monster_base"]=10015,
+		["monster_base"]=10030,
 		["hp"]=13300000,
 		["atk"]=640000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20085,
+			20086,
+			20087
 		},
 		["monster_exp"]=11000
 	},
 	[13201]={
-		["monster_base"]=10017,
+		["monster_base"]=10033,
 		["hp"]=18800000,
 		["atk"]=670000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=11000
 	},
 	[13301]={
-		["monster_base"]=10014,
+		["monster_base"]=10019,
 		["hp"]=21100000,
 		["atk"]=700000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=17000
 	},
 	[13401]={
-		["monster_base"]=10018,
+		["monster_base"]=10012,
 		["hp"]=28000000,
 		["atk"]=740000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=19000
 	},
 	[13501]={
-		["monster_base"]=20001,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=41400000,
 		["atk"]=850000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=18000
 	},
 	[13601]={
-		["monster_base"]=10012,
+		["monster_base"]=10017,
 		["hp"]=28100000,
 		["atk"]=810000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20046,
+			20047,
+			20048
 		},
 		["monster_exp"]=9000
 	},
 	[13701]={
-		["monster_base"]=10017,
+		["monster_base"]=10013,
 		["hp"]=31500000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=10000
 	},
 	[13801]={
-		["monster_base"]=10014,
+		["monster_base"]=10032,
 		["hp"]=36500000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=11000
 	},
 	[13901]={
-		["monster_base"]=10016,
+		["monster_base"]=10033,
 		["hp"]=41400000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=12000
 	},
@@ -1739,70 +1787,76 @@ local monster_chapter = {
 		["atk"]=910000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=12000
 	},
 	[14101]={
-		["monster_base"]=10010,
+		["monster_base"]=10031,
 		["hp"]=44100000,
 		["atk"]=870000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20088,
+			20089,
+			20090
 		},
 		["monster_exp"]=16000
 	},
 	[14201]={
-		["monster_base"]=10003,
+		["monster_base"]=10034,
 		["hp"]=50000000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20097,
+			20098,
+			20099
 		},
 		["monster_exp"]=18000
 	},
 	[14301]={
-		["monster_base"]=10009,
+		["monster_base"]=10003,
 		["hp"]=52800000,
 		["atk"]=930000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20007,
+			20008,
+			20009
 		},
 		["monster_exp"]=21000
 	},
 	[14401]={
-		["monster_base"]=10011,
+		["monster_base"]=10014,
 		["hp"]=57200000,
 		["atk"]=960000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20037,
+			20038,
+			20039
 		},
 		["monster_exp"]=22000
 	},
 	[14501]={
-		["monster_base"]=20004,
+		["monster_base"]=20001,
 		["is_boss"]=1,
 		["hp"]=104100000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			10020
 		},
 		["monster_exp"]=24000
 	},
@@ -1812,59 +1866,59 @@ local monster_chapter = {
 		["atk"]=990000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20040,
+			20041,
+			20042
 		},
 		["monster_exp"]=15000
 	},
 	[14701]={
-		["monster_base"]=10017,
+		["monster_base"]=10016,
 		["hp"]=73200000,
 		["atk"]=1020000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20043,
+			20044,
+			20045
 		},
 		["monster_exp"]=16000
 	},
 	[14801]={
-		["monster_base"]=10014,
+		["monster_base"]=10030,
 		["hp"]=80600000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20085,
+			20086,
+			20087
 		},
 		["monster_exp"]=17000
 	},
 	[14901]={
-		["monster_base"]=10018,
+		["monster_base"]=10035,
 		["hp"]=87900000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20100,
+			20101,
+			20102
 		},
 		["monster_exp"]=17000
 	},
 	[15001]={
-		["monster_base"]=20003,
+		["monster_base"]=30006,
 		["is_boss"]=2,
 		["hp"]=145500000,
 		["atk"]=1480000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10004,
-			10005,
-			10006,
-			10007
+			40005,
+			40006,
+			40007,
+			40008
 		},
 		["skill"]={
 			10025,
@@ -1873,148 +1927,154 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[15101]={
-		["monster_base"]=10012,
+		["monster_base"]=10034,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20097,
+			20098,
+			20099
 		},
 		["monster_exp"]=11000
 	},
 	[15201]={
-		["monster_base"]=10017,
+		["monster_base"]=10032,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=11000
 	},
 	[15301]={
-		["monster_base"]=10014,
+		["monster_base"]=10002,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20004,
+			20005,
+			20006
 		},
 		["monster_exp"]=17000
 	},
 	[15401]={
-		["monster_base"]=10016,
+		["monster_base"]=10005,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=19000
 	},
 	[15501]={
-		["monster_base"]=20005,
+		["monster_base"]=20007,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30019,
+			30020,
+			30021
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=18000
 	},
 	[15601]={
-		["monster_base"]=10007,
+		["monster_base"]=10001,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=9000
 	},
 	[15701]={
-		["monster_base"]=10011,
+		["monster_base"]=10007,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=10000
 	},
 	[15801]={
-		["monster_base"]=10012,
+		["monster_base"]=10040,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=11000
 	},
 	[15901]={
-		["monster_base"]=10016,
+		["monster_base"]=10039,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=12000
 	},
 	[16001]={
-		["monster_base"]=20007,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=12000
 	},
 	[16101]={
-		["monster_base"]=10015,
+		["monster_base"]=10039,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=16000
 	},
 	[16201]={
-		["monster_base"]=10017,
+		["monster_base"]=10038,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=18000
 	},
@@ -2024,95 +2084,101 @@ local monster_chapter = {
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20037,
+			20038,
+			20039
 		},
 		["monster_exp"]=21000
 	},
 	[16401]={
-		["monster_base"]=10018,
+		["monster_base"]=10019,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=22000
 	},
 	[16501]={
-		["monster_base"]=20008,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=24000
 	},
 	[16601]={
-		["monster_base"]=10004,
+		["monster_base"]=10016,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20043,
+			20044,
+			20045
 		},
 		["monster_exp"]=15000
 	},
 	[16701]={
-		["monster_base"]=10002,
+		["monster_base"]=10005,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=16000
 	},
 	[16801]={
-		["monster_base"]=10011,
+		["monster_base"]=10040,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=17000
 	},
 	[16901]={
-		["monster_base"]=10013,
+		["monster_base"]=10039,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=17000
 	},
 	[17001]={
-		["monster_base"]=20003,
+		["monster_base"]=20017,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30049,
+			30050,
+			30051
 		},
 		["skill"]={
 			10027,
@@ -2121,50 +2187,50 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[17101]={
-		["monster_base"]=10012,
+		["monster_base"]=10010,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=11000
 	},
 	[17201]={
-		["monster_base"]=10017,
+		["monster_base"]=10038,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=11000
 	},
 	[17301]={
-		["monster_base"]=10014,
+		["monster_base"]=10033,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=17000
 	},
 	[17401]={
-		["monster_base"]=10016,
+		["monster_base"]=10031,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20088,
+			20089,
+			20090
 		},
 		["monster_exp"]=19000
 	},
@@ -2175,179 +2241,189 @@ local monster_chapter = {
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=18000
 	},
 	[17601]={
-		["monster_base"]=10007,
+		["monster_base"]=10030,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20085,
+			20086,
+			20087
 		},
 		["monster_exp"]=9000
 	},
 	[17701]={
-		["monster_base"]=10011,
+		["monster_base"]=10035,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20100,
+			20101,
+			20102
 		},
 		["monster_exp"]=10000
 	},
 	[17801]={
-		["monster_base"]=10012,
+		["monster_base"]=10039,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=11000
 	},
 	[17901]={
-		["monster_base"]=10016,
+		["monster_base"]=10010,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=12000
 	},
 	[18001]={
-		["monster_base"]=20007,
+		["monster_base"]=20017,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30049,
+			30050,
+			30051
+		},
+		["skill"]={
+			10027,
+			10028
 		},
 		["monster_exp"]=12000
 	},
 	[18101]={
-		["monster_base"]=10015,
+		["monster_base"]=10038,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=16000
 	},
 	[18201]={
-		["monster_base"]=10017,
+		["monster_base"]=10040,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=18000
 	},
 	[18301]={
-		["monster_base"]=10014,
+		["monster_base"]=10010,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=21000
 	},
 	[18401]={
-		["monster_base"]=10018,
+		["monster_base"]=10039,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=22000
 	},
 	[18501]={
-		["monster_base"]=20008,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=24000
 	},
 	[18601]={
-		["monster_base"]=10004,
+		["monster_base"]=10032,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=15000
 	},
 	[18701]={
-		["monster_base"]=10002,
+		["monster_base"]=10034,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20097,
+			20098,
+			20099
 		},
 		["monster_exp"]=16000
 	},
 	[18801]={
-		["monster_base"]=10011,
+		["monster_base"]=10035,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20100,
+			20101,
+			20102
 		},
 		["monster_exp"]=17000
 	},
 	[18901]={
-		["monster_base"]=10013,
+		["monster_base"]=10033,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=17000
 	},
@@ -2358,9 +2434,9 @@ local monster_chapter = {
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30007,
+			30008,
+			30009
 		},
 		["skill"]={
 			10029,
@@ -2372,111 +2448,115 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[19101]={
-		["monster_base"]=10012,
+		["monster_base"]=10020,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20055,
+			20056,
+			20057
 		},
 		["monster_exp"]=11000
 	},
 	[19201]={
-		["monster_base"]=10017,
+		["monster_base"]=10038,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=11000
 	},
 	[19301]={
-		["monster_base"]=10014,
+		["monster_base"]=10021,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20058,
+			20059,
+			20060
 		},
 		["monster_exp"]=17000
 	},
 	[19401]={
-		["monster_base"]=10016,
+		["monster_base"]=10040,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=19000
 	},
 	[19501]={
-		["monster_base"]=20005,
+		["monster_base"]=20017,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30049,
+			30050,
+			30051
+		},
+		["skill"]={
+			10027,
+			10028
 		},
 		["monster_exp"]=18000
 	},
 	[19601]={
-		["monster_base"]=10007,
+		["monster_base"]=10022,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=9000
 	},
 	[19701]={
-		["monster_base"]=10011,
+		["monster_base"]=10004,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=10000
 	},
 	[19801]={
-		["monster_base"]=10012,
+		["monster_base"]=10023,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20064,
+			20065,
+			20066
 		},
 		["monster_exp"]=11000
 	},
 	[19901]={
-		["monster_base"]=10016,
+		["monster_base"]=10007,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=12000
 	},
@@ -2487,132 +2567,141 @@ local monster_chapter = {
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30019,
+			30020,
+			30021
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=12000
 	},
 	[20101]={
-		["monster_base"]=10015,
+		["monster_base"]=10048,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=16000
 	},
 	[20201]={
-		["monster_base"]=10017,
+		["monster_base"]=10023,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20064,
+			20065,
+			20066
 		},
 		["monster_exp"]=18000
 	},
 	[20301]={
-		["monster_base"]=10014,
+		["monster_base"]=10006,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=21000
 	},
 	[20401]={
-		["monster_base"]=10018,
+		["monster_base"]=10047,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20136,
+			20137,
+			20138
 		},
 		["monster_exp"]=22000
 	},
 	[20501]={
-		["monster_base"]=20008,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=24000
 	},
 	[20601]={
-		["monster_base"]=10004,
+		["monster_base"]=10021,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20058,
+			20059,
+			20060
 		},
 		["monster_exp"]=15000
 	},
 	[20701]={
-		["monster_base"]=10002,
+		["monster_base"]=10006,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=16000
 	},
 	[20801]={
-		["monster_base"]=10011,
+		["monster_base"]=10048,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=17000
 	},
 	[20901]={
-		["monster_base"]=10013,
+		["monster_base"]=10023,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20064,
+			20065,
+			20066
 		},
 		["monster_exp"]=17000
 	},
 	[21001]={
-		["monster_base"]=20003,
+		["monster_base"]=30014,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10004,
-			10005,
-			10006,
-			10007
+			40009,
+			40010,
+			40011,
+			40012
 		},
 		["skill"]={
 			10031
@@ -2620,246 +2709,259 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[21101]={
-		["monster_base"]=10012,
+		["monster_base"]=10024,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20067,
+			20068,
+			20069
 		},
 		["monster_exp"]=11000
 	},
 	[21201]={
-		["monster_base"]=10017,
+		["monster_base"]=10006,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=11000
 	},
 	[21301]={
-		["monster_base"]=10014,
+		["monster_base"]=10007,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=17000
 	},
 	[21401]={
-		["monster_base"]=10016,
+		["monster_base"]=10023,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20064,
+			20065,
+			20066
 		},
 		["monster_exp"]=19000
 	},
 	[21501]={
-		["monster_base"]=20005,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=18000
 	},
 	[21601]={
-		["monster_base"]=10007,
+		["monster_base"]=10048,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=9000
 	},
 	[21701]={
-		["monster_base"]=10011,
+		["monster_base"]=10025,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20070,
+			20071,
+			20072
 		},
 		["monster_exp"]=10000
 	},
 	[21801]={
-		["monster_base"]=10012,
+		["monster_base"]=10004,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=11000
 	},
 	[21901]={
-		["monster_base"]=10016,
+		["monster_base"]=10022,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=12000
 	},
 	[22001]={
-		["monster_base"]=20007,
+		["monster_base"]=20005,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=12000
 	},
 	[22101]={
-		["monster_base"]=10015,
+		["monster_base"]=10047,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20136,
+			20137,
+			20138
 		},
 		["monster_exp"]=16000
 	},
 	[22201]={
-		["monster_base"]=10017,
+		["monster_base"]=10026,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=18000
 	},
 	[22301]={
-		["monster_base"]=10014,
+		["monster_base"]=10006,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=21000
 	},
 	[22401]={
-		["monster_base"]=10018,
+		["monster_base"]=10040,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=22000
 	},
 	[22501]={
-		["monster_base"]=20008,
+		["monster_base"]=20017,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30049,
+			30050,
+			30051
+		},
+		["skill"]={
+			10027,
+			10028
 		},
 		["monster_exp"]=24000
 	},
 	[22601]={
-		["monster_base"]=10004,
+		["monster_base"]=10020,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20055,
+			20056,
+			20057
 		},
 		["monster_exp"]=15000
 	},
 	[22701]={
-		["monster_base"]=10002,
+		["monster_base"]=10010,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=16000
 	},
 	[22801]={
-		["monster_base"]=10011,
+		["monster_base"]=10038,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=17000
 	},
 	[22901]={
-		["monster_base"]=10013,
+		["monster_base"]=10027,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20076,
+			20077,
+			20078
 		},
 		["monster_exp"]=17000
 	},
 	[23001]={
-		["monster_base"]=20003,
+		["monster_base"]=20008,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30022,
+			30023,
+			30024
 		},
 		["skill"]={
 			10032
@@ -2867,246 +2969,261 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[23101]={
-		["monster_base"]=10012,
+		["monster_base"]=10005,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=11000
 	},
 	[23201]={
-		["monster_base"]=10017,
+		["monster_base"]=10022,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=11000
 	},
 	[23301]={
-		["monster_base"]=10014,
+		["monster_base"]=10005,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=17000
 	},
 	[23401]={
-		["monster_base"]=10016,
+		["monster_base"]=10026,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=19000
 	},
 	[23501]={
-		["monster_base"]=20005,
+		["monster_base"]=20014,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30040,
+			30041,
+			30042
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=18000
 	},
 	[23601]={
-		["monster_base"]=10007,
+		["monster_base"]=10022,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=9000
 	},
 	[23701]={
-		["monster_base"]=10011,
+		["monster_base"]=10026,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=10000
 	},
 	[23801]={
-		["monster_base"]=10012,
+		["monster_base"]=10032,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=11000
 	},
 	[23901]={
-		["monster_base"]=10016,
+		["monster_base"]=10044,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=12000
 	},
 	[24001]={
-		["monster_base"]=20007,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=12000
 	},
 	[24101]={
-		["monster_base"]=10015,
+		["monster_base"]=10001,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=16000
 	},
 	[24201]={
-		["monster_base"]=10017,
+		["monster_base"]=10022,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=18000
 	},
 	[24301]={
-		["monster_base"]=10014,
+		["monster_base"]=10044,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=21000
 	},
 	[24401]={
-		["monster_base"]=10018,
+		["monster_base"]=10019,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=22000
 	},
 	[24501]={
-		["monster_base"]=20008,
+		["monster_base"]=20001,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30001,
+			30002,
+			30003
+		},
+		["skill"]={
+			10020
 		},
 		["monster_exp"]=24000
 	},
 	[24601]={
-		["monster_base"]=10004,
+		["monster_base"]=10013,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=15000
 	},
 	[24701]={
-		["monster_base"]=10002,
+		["monster_base"]=10005,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=16000
 	},
 	[24801]={
-		["monster_base"]=10011,
+		["monster_base"]=10026,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=17000
 	},
 	[24901]={
-		["monster_base"]=10013,
+		["monster_base"]=10032,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=17000
 	},
 	[25001]={
-		["monster_base"]=20003,
+		["monster_base"]=20006,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30016,
+			30017,
+			30018
 		},
 		["skill"]={
 			10033
@@ -3117,246 +3234,258 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[25101]={
-		["monster_base"]=10012,
+		["monster_base"]=10044,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=11000
 	},
 	[25201]={
-		["monster_base"]=10017,
+		["monster_base"]=10013,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=11000
 	},
 	[25301]={
-		["monster_base"]=10014,
+		["monster_base"]=10001,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=17000
 	},
 	[25401]={
-		["monster_base"]=10016,
+		["monster_base"]=10026,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=19000
 	},
 	[25501]={
-		["monster_base"]=20005,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=18000
 	},
 	[25601]={
-		["monster_base"]=10007,
+		["monster_base"]=10022,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=9000
 	},
 	[25701]={
-		["monster_base"]=10011,
+		["monster_base"]=10044,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=10000
 	},
 	[25801]={
-		["monster_base"]=10012,
+		["monster_base"]=10032,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=11000
 	},
 	[25901]={
-		["monster_base"]=10016,
+		["monster_base"]=10019,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=12000
 	},
 	[26001]={
-		["monster_base"]=20007,
+		["monster_base"]=20008,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30022,
+			30023,
+			30024
+		},
+		["skill"]={
+			10032
 		},
 		["monster_exp"]=12000
 	},
 	[26101]={
-		["monster_base"]=10015,
+		["monster_base"]=10026,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=16000
 	},
 	[26201]={
-		["monster_base"]=10017,
+		["monster_base"]=10001,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=18000
 	},
 	[26301]={
-		["monster_base"]=10014,
+		["monster_base"]=10044,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=21000
 	},
 	[26401]={
-		["monster_base"]=10018,
+		["monster_base"]=10013,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=22000
 	},
 	[26501]={
-		["monster_base"]=20008,
+		["monster_base"]=20002,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30004,
+			30005,
+			30006
+		},
+		["skill"]={
+			10019
 		},
 		["monster_exp"]=24000
 	},
 	[26601]={
-		["monster_base"]=10004,
+		["monster_base"]=10001,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=15000
 	},
 	[26701]={
-		["monster_base"]=10002,
+		["monster_base"]=10032,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=16000
 	},
 	[26801]={
-		["monster_base"]=10011,
+		["monster_base"]=10022,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=17000
 	},
 	[26901]={
-		["monster_base"]=10013,
+		["monster_base"]=10005,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=17000
 	},
 	[27001]={
-		["monster_base"]=20003,
+		["monster_base"]=20021,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30061,
+			30062,
+			30063
 		},
 		["skill"]={
 			10034
@@ -3368,247 +3497,262 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[27101]={
-		["monster_base"]=10012,
+		["monster_base"]=10022,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=11000
 	},
 	[27201]={
-		["monster_base"]=10017,
+		["monster_base"]=10044,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=11000
 	},
 	[27301]={
-		["monster_base"]=10014,
+		["monster_base"]=10032,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=17000
 	},
 	[27401]={
-		["monster_base"]=10016,
+		["monster_base"]=10019,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=19000
 	},
 	[27501]={
-		["monster_base"]=20005,
+		["monster_base"]=20008,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30022,
+			30023,
+			30024
+		},
+		["skill"]={
+			10032
 		},
 		["monster_exp"]=18000
 	},
 	[27601]={
-		["monster_base"]=10007,
+		["monster_base"]=10005,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=9000
 	},
 	[27701]={
-		["monster_base"]=10011,
+		["monster_base"]=10022,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=10000
 	},
 	[27801]={
-		["monster_base"]=10012,
+		["monster_base"]=10005,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=11000
 	},
 	[27901]={
-		["monster_base"]=10016,
+		["monster_base"]=10026,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=12000
 	},
 	[28001]={
-		["monster_base"]=20007,
+		["monster_base"]=20014,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30040,
+			30041,
+			30042
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=12000
 	},
 	[28101]={
-		["monster_base"]=10015,
+		["monster_base"]=10013,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=16000
 	},
 	[28201]={
-		["monster_base"]=10017,
+		["monster_base"]=10005,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=18000
 	},
 	[28301]={
-		["monster_base"]=10014,
+		["monster_base"]=10026,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=21000
 	},
 	[28401]={
-		["monster_base"]=10018,
+		["monster_base"]=10032,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=22000
 	},
 	[28501]={
-		["monster_base"]=20008,
+		["monster_base"]=20006,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30016,
+			30017,
+			30018
+		},
+		["skill"]={
+			10033
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=24000
 	},
 	[28601]={
-		["monster_base"]=10004,
+		["monster_base"]=10013,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=15000
 	},
 	[28701]={
-		["monster_base"]=10002,
+		["monster_base"]=10005,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=16000
 	},
 	[28801]={
-		["monster_base"]=10011,
+		["monster_base"]=10026,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=17000
 	},
 	[28901]={
-		["monster_base"]=10013,
+		["monster_base"]=10001,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=17000
 	},
 	[29001]={
-		["monster_base"]=20003,
+		["monster_base"]=30010,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10004,
-			10005,
-			10006,
-			10007
+			40013,
+			40014,
+			40015,
+			40016
 		},
 		["skill"]={
 			10035
@@ -3616,246 +3760,262 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[29101]={
-		["monster_base"]=10012,
+		["monster_base"]=10013,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=11000
 	},
 	[29201]={
-		["monster_base"]=10017,
+		["monster_base"]=10005,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=11000
 	},
 	[29301]={
-		["monster_base"]=10014,
+		["monster_base"]=10026,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=17000
 	},
 	[29401]={
-		["monster_base"]=10016,
+		["monster_base"]=10032,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=19000
 	},
 	[29501]={
-		["monster_base"]=20005,
+		["monster_base"]=20006,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30016,
+			30017,
+			30018
+		},
+		["skill"]={
+			10033
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=18000
 	},
 	[29601]={
-		["monster_base"]=10007,
+		["monster_base"]=10001,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=9000
 	},
 	[29701]={
-		["monster_base"]=10011,
+		["monster_base"]=10032,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=10000
 	},
 	[29801]={
-		["monster_base"]=10012,
+		["monster_base"]=10022,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=11000
 	},
 	[29901]={
-		["monster_base"]=10016,
+		["monster_base"]=10005,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=12000
 	},
 	[30001]={
-		["monster_base"]=20007,
+		["monster_base"]=20021,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30061,
+			30062,
+			30063
+		},
+		["skill"]={
+			10034
+		},
+		["passive_skill"]={
+			10011,
+			10008
 		},
 		["monster_exp"]=12000
 	},
 	[30101]={
-		["monster_base"]=10015,
+		["monster_base"]=10022,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20061,
+			20062,
+			20063
 		},
 		["monster_exp"]=16000
 	},
 	[30201]={
-		["monster_base"]=10017,
+		["monster_base"]=10004,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=18000
 	},
 	[30301]={
-		["monster_base"]=10014,
+		["monster_base"]=10023,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20064,
+			20065,
+			20066
 		},
 		["monster_exp"]=21000
 	},
 	[30401]={
-		["monster_base"]=10018,
+		["monster_base"]=10007,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20019,
+			20020,
+			20021
 		},
 		["monster_exp"]=22000
 	},
 	[30501]={
-		["monster_base"]=20008,
+		["monster_base"]=20007,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30019,
+			30020,
+			30021
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=24000
 	},
 	[30601]={
-		["monster_base"]=10004,
+		["monster_base"]=10019,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=15000
 	},
 	[30701]={
-		["monster_base"]=10002,
+		["monster_base"]=10023,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20064,
+			20065,
+			20066
 		},
 		["monster_exp"]=16000
 	},
 	[30801]={
-		["monster_base"]=10011,
+		["monster_base"]=10005,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=17000
 	},
 	[30901]={
-		["monster_base"]=10013,
+		["monster_base"]=10033,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=17000
 	},
 	[31001]={
-		["monster_base"]=20003,
+		["monster_base"]=20016,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30046,
+			30047,
+			30048
 		},
 		["skill"]={
 			10036
@@ -3867,87 +4027,90 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[31101]={
-		["monster_base"]=10012,
+		["monster_base"]=10026,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20073,
+			20074,
+			20075
 		},
 		["monster_exp"]=11000
 	},
 	[31201]={
-		["monster_base"]=10017,
+		["monster_base"]=10001,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20001,
+			20002,
+			20003
 		},
 		["monster_exp"]=11000
 	},
 	[31301]={
-		["monster_base"]=10014,
+		["monster_base"]=10044,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=17000
 	},
 	[31401]={
-		["monster_base"]=10016,
+		["monster_base"]=10013,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20034,
+			20035,
+			20036
 		},
 		["monster_exp"]=19000
 	},
 	[31501]={
-		["monster_base"]=20005,
+		["monster_base"]=20002,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30004,
+			30005,
+			30006
+		},
+		["skill"]={
+			10019
 		},
 		["monster_exp"]=18000
 	},
 	[31601]={
-		["monster_base"]=10007,
+		["monster_base"]=10048,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=9000
 	},
 	[31701]={
-		["monster_base"]=10011,
+		["monster_base"]=10006,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=10000
 	},
@@ -3957,82 +4120,85 @@ local monster_chapter = {
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=11000
 	},
 	[31901]={
-		["monster_base"]=10016,
+		["monster_base"]=10004,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=12000
 	},
 	[32001]={
-		["monster_base"]=20007,
+		["monster_base"]=20004,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30010,
+			30011,
+			30012
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=12000
 	},
 	[32101]={
-		["monster_base"]=10015,
+		["monster_base"]=10024,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20067,
+			20068,
+			20069
 		},
 		["monster_exp"]=16000
 	},
 	[32201]={
-		["monster_base"]=10017,
+		["monster_base"]=10044,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=18000
 	},
 	[32301]={
-		["monster_base"]=10014,
+		["monster_base"]=10016,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20043,
+			20044,
+			20045
 		},
 		["monster_exp"]=21000
 	},
 	[32401]={
-		["monster_base"]=10018,
+		["monster_base"]=10019,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20052,
+			20053,
+			20054
 		},
 		["monster_exp"]=22000
 	},
@@ -4043,9 +4209,12 @@ local monster_chapter = {
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30022,
+			30023,
+			30024
+		},
+		["skill"]={
+			10032
 		},
 		["monster_exp"]=24000
 	},
@@ -4055,59 +4224,59 @@ local monster_chapter = {
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=15000
 	},
 	[32701]={
-		["monster_base"]=10002,
+		["monster_base"]=10006,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=16000
 	},
 	[32801]={
-		["monster_base"]=10011,
+		["monster_base"]=10048,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=17000
 	},
 	[32901]={
-		["monster_base"]=10013,
+		["monster_base"]=10037,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20106,
+			20107,
+			20108
 		},
 		["monster_exp"]=17000
 	},
 	[33001]={
-		["monster_base"]=20003,
+		["monster_base"]=30006,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10004,
-			10005,
-			10006,
-			10007
+			40017,
+			40018,
+			40019,
+			40020
 		},
 		["skill"]={
 			10038
@@ -4118,111 +4287,117 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[33101]={
-		["monster_base"]=10012,
+		["monster_base"]=10049,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20142,
+			20143,
+			20144
 		},
 		["monster_exp"]=11000
 	},
 	[33201]={
-		["monster_base"]=10017,
+		["monster_base"]=10005,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20013,
+			20014,
+			20015
 		},
 		["monster_exp"]=11000
 	},
 	[33301]={
-		["monster_base"]=10014,
+		["monster_base"]=10024,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20067,
+			20068,
+			20069
 		},
 		["monster_exp"]=17000
 	},
 	[33401]={
-		["monster_base"]=10016,
+		["monster_base"]=10012,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=19000
 	},
 	[33501]={
-		["monster_base"]=20005,
+		["monster_base"]=20006,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30016,
+			30017,
+			30018
+		},
+		["skill"]={
+			10033
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=18000
 	},
 	[33601]={
-		["monster_base"]=10007,
+		["monster_base"]=10048,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=9000
 	},
 	[33701]={
-		["monster_base"]=10011,
+		["monster_base"]=10049,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20142,
+			20143,
+			20144
 		},
 		["monster_exp"]=10000
 	},
 	[33801]={
-		["monster_base"]=10012,
+		["monster_base"]=10004,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=11000
 	},
 	[33901]={
-		["monster_base"]=10016,
+		["monster_base"]=10006,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=12000
 	},
@@ -4233,70 +4408,76 @@ local monster_chapter = {
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30019,
+			30020,
+			30021
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=12000
 	},
 	[34101]={
-		["monster_base"]=10015,
+		["monster_base"]=10020,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20055,
+			20056,
+			20057
 		},
 		["monster_exp"]=16000
 	},
 	[34201]={
-		["monster_base"]=10017,
+		["monster_base"]=10024,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20067,
+			20068,
+			20069
 		},
 		["monster_exp"]=18000
 	},
 	[34301]={
-		["monster_base"]=10014,
+		["monster_base"]=10012,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=21000
 	},
 	[34401]={
-		["monster_base"]=10018,
+		["monster_base"]=10016,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20043,
+			20044,
+			20045
 		},
 		["monster_exp"]=22000
 	},
 	[34501]={
-		["monster_base"]=20008,
+		["monster_base"]=20002,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30004,
+			30005,
+			30006
+		},
+		["skill"]={
+			10019
 		},
 		["monster_exp"]=24000
 	},
@@ -4306,58 +4487,58 @@ local monster_chapter = {
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=15000
 	},
 	[34701]={
-		["monster_base"]=10002,
+		["monster_base"]=10012,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=16000
 	},
 	[34801]={
-		["monster_base"]=10011,
+		["monster_base"]=10049,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20142,
+			20143,
+			20144
 		},
 		["monster_exp"]=17000
 	},
 	[34901]={
-		["monster_base"]=10013,
+		["monster_base"]=10048,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=17000
 	},
 	[35001]={
-		["monster_base"]=20003,
+		["monster_base"]=20009,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30025,
+			30026,
+			30027
 		},
 		["skill"]={
 			10039
@@ -4369,197 +4550,216 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[35101]={
-		["monster_base"]=10012,
+		["monster_base"]=10004,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=11000
 	},
 	[35201]={
-		["monster_base"]=10017,
+		["monster_base"]=10020,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20055,
+			20056,
+			20057
 		},
 		["monster_exp"]=11000
 	},
 	[35301]={
-		["monster_base"]=10014,
+		["monster_base"]=10048,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=17000
 	},
 	[35401]={
-		["monster_base"]=10016,
+		["monster_base"]=10012,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=19000
 	},
 	[35501]={
-		["monster_base"]=20005,
+		["monster_base"]=20014,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30040,
+			30041,
+			30042
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=18000
 	},
 	[35601]={
-		["monster_base"]=10007,
+		["monster_base"]=10004,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=9000
 	},
 	[35701]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=10000
 	},
 	[35801]={
-		["monster_base"]=10012,
+		["monster_base"]=10037,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20106,
+			20107,
+			20108
 		},
 		["monster_exp"]=11000
 	},
 	[35901]={
-		["monster_base"]=10016,
+		["monster_base"]=10048,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=12000
 	},
 	[36001]={
-		["monster_base"]=20007,
+		["monster_base"]=20009,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30025,
+			30026,
+			30027
+		},
+		["skill"]={
+			10039
+		},
+		["passive_skill"]={
+			10010,
+			10011
 		},
 		["monster_exp"]=12000
 	},
 	[36101]={
-		["monster_base"]=10015,
+		["monster_base"]=10014,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20037,
+			20038,
+			20039
 		},
 		["monster_exp"]=16000
 	},
 	[36201]={
-		["monster_base"]=10017,
+		["monster_base"]=10027,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20076,
+			20077,
+			20078
 		},
 		["monster_exp"]=18000
 	},
 	[36301]={
-		["monster_base"]=10014,
+		["monster_base"]=10017,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20046,
+			20047,
+			20048
 		},
 		["monster_exp"]=21000
 	},
 	[36401]={
-		["monster_base"]=10018,
+		["monster_base"]=10023,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20064,
+			20065,
+			20066
 		},
 		["monster_exp"]=22000
 	},
 	[36501]={
-		["monster_base"]=20008,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=24000
 	},
 	[36601]={
-		["monster_base"]=10004,
+		["monster_base"]=10014,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20037,
+			20038,
+			20039
 		},
 		["monster_exp"]=15000
 	},
@@ -4569,47 +4769,47 @@ local monster_chapter = {
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20004,
+			20005,
+			20006
 		},
 		["monster_exp"]=16000
 	},
 	[36801]={
-		["monster_base"]=10011,
+		["monster_base"]=10029,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20082,
+			20083,
+			20084
 		},
 		["monster_exp"]=17000
 	},
 	[36901]={
-		["monster_base"]=10013,
+		["monster_base"]=10036,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20103,
+			20104,
+			20105
 		},
 		["monster_exp"]=17000
 	},
 	[37001]={
-		["monster_base"]=20003,
+		["monster_base"]=30009,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10004,
-			10005,
-			10006,
-			10007
+			40021,
+			40022,
+			40023,
+			40024
 		},
 		["skill"]={
 			10040
@@ -4617,87 +4817,94 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[37101]={
-		["monster_base"]=10012,
+		["monster_base"]=10054,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=11000
 	},
 	[37201]={
-		["monster_base"]=10017,
+		["monster_base"]=10024,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20067,
+			20068,
+			20069
 		},
 		["monster_exp"]=11000
 	},
 	[37301]={
-		["monster_base"]=10014,
+		["monster_base"]=10012,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=17000
 	},
 	[37401]={
-		["monster_base"]=10016,
+		["monster_base"]=10048,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=19000
 	},
 	[37501]={
-		["monster_base"]=20005,
+		["monster_base"]=20009,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30025,
+			30026,
+			30027
+		},
+		["skill"]={
+			10039
+		},
+		["passive_skill"]={
+			10010,
+			10011
 		},
 		["monster_exp"]=18000
 	},
 	[37601]={
-		["monster_base"]=10007,
+		["monster_base"]=10048,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20139,
+			20140,
+			20141
 		},
 		["monster_exp"]=9000
 	},
 	[37701]={
-		["monster_base"]=10011,
+		["monster_base"]=10054,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=10000
 	},
@@ -4707,156 +4914,165 @@ local monster_chapter = {
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20031,
+			20032,
+			20033
 		},
 		["monster_exp"]=11000
 	},
 	[37901]={
-		["monster_base"]=10016,
+		["monster_base"]=10024,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20067,
+			20068,
+			20069
 		},
 		["monster_exp"]=12000
 	},
 	[38001]={
-		["monster_base"]=20007,
+		["monster_base"]=20006,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30016,
+			30017,
+			30018
+		},
+		["skill"]={
+			10033
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=12000
 	},
 	[38101]={
-		["monster_base"]=10015,
+		["monster_base"]=10020,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20055,
+			20056,
+			20057
 		},
 		["monster_exp"]=16000
 	},
 	[38201]={
-		["monster_base"]=10017,
+		["monster_base"]=10053,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=18000
 	},
 	[38301]={
-		["monster_base"]=10014,
+		["monster_base"]=10006,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=21000
 	},
 	[38401]={
-		["monster_base"]=10018,
+		["monster_base"]=10004,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=22000
 	},
 	[38501]={
-		["monster_base"]=20008,
+		["monster_base"]=20004,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30010,
+			30011,
+			30012
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=24000
 	},
 	[38601]={
-		["monster_base"]=10004,
+		["monster_base"]=10053,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=15000
 	},
 	[38701]={
-		["monster_base"]=10002,
+		["monster_base"]=10049,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20142,
+			20143,
+			20144
 		},
 		["monster_exp"]=16000
 	},
 	[38801]={
-		["monster_base"]=10011,
+		["monster_base"]=10020,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20055,
+			20056,
+			20057
 		},
 		["monster_exp"]=17000
 	},
 	[38901]={
-		["monster_base"]=10013,
+		["monster_base"]=10054,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=17000
 	},
 	[39001]={
-		["monster_base"]=20003,
+		["monster_base"]=20010,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30028,
+			30029,
+			30030
 		},
 		["skill"]={
 			10041
@@ -4869,50 +5085,50 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[39101]={
-		["monster_base"]=10012,
+		["monster_base"]=10052,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=11000
 	},
 	[39201]={
-		["monster_base"]=10017,
+		["monster_base"]=10050,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=11000
 	},
 	[39301]={
-		["monster_base"]=10014,
+		["monster_base"]=10010,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=17000
 	},
 	[39401]={
-		["monster_base"]=10016,
+		["monster_base"]=10053,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=19000
 	},
@@ -4923,118 +5139,127 @@ local monster_chapter = {
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=18000
 	},
 	[39601]={
-		["monster_base"]=10007,
+		["monster_base"]=10040,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=9000
 	},
 	[39701]={
-		["monster_base"]=10011,
+		["monster_base"]=10052,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=10000
 	},
 	[39801]={
-		["monster_base"]=10012,
+		["monster_base"]=10054,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=11000
 	},
 	[39901]={
-		["monster_base"]=10016,
+		["monster_base"]=10038,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=12000
 	},
 	[40001]={
-		["monster_base"]=20007,
+		["monster_base"]=20015,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30043,
+			30044,
+			30045
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10008
 		},
 		["monster_exp"]=12000
 	},
 	[40101]={
-		["monster_base"]=10015,
+		["monster_base"]=10009,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=16000
 	},
 	[40201]={
-		["monster_base"]=10017,
+		["monster_base"]=10054,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=18000
 	},
 	[40301]={
-		["monster_base"]=10014,
+		["monster_base"]=10052,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=21000
 	},
 	[40401]={
-		["monster_base"]=10018,
+		["monster_base"]=10050,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=22000
 	},
@@ -5045,71 +5270,74 @@ local monster_chapter = {
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30022,
+			30023,
+			30024
+		},
+		["skill"]={
+			10032
 		},
 		["monster_exp"]=24000
 	},
 	[40601]={
-		["monster_base"]=10004,
+		["monster_base"]=10038,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=15000
 	},
 	[40701]={
-		["monster_base"]=10002,
+		["monster_base"]=10053,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=16000
 	},
 	[40801]={
-		["monster_base"]=10011,
+		["monster_base"]=10050,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=17000
 	},
 	[40901]={
-		["monster_base"]=10013,
+		["monster_base"]=10040,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=17000
 	},
 	[41001]={
-		["monster_base"]=20003,
+		["monster_base"]=30005,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10004,
-			10005,
-			10006,
-			10007
+			40025,
+			40026,
+			40027,
+			40028
 		},
 		["skill"]={
 			10042
@@ -5117,246 +5345,260 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[41101]={
-		["monster_base"]=10012,
+		["monster_base"]=10043,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=11000
 	},
 	[41201]={
-		["monster_base"]=10017,
+		["monster_base"]=10054,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=11000
 	},
 	[41301]={
-		["monster_base"]=10014,
+		["monster_base"]=10038,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=17000
 	},
 	[41401]={
-		["monster_base"]=10016,
+		["monster_base"]=10053,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=19000
 	},
 	[41501]={
-		["monster_base"]=20005,
+		["monster_base"]=20010,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30028,
+			30029,
+			30030
+		},
+		["skill"]={
+			10041
+		},
+		["passive_skill"]={
+			10008,
+			10009,
+			10013
 		},
 		["monster_exp"]=18000
 	},
 	[41601]={
-		["monster_base"]=10007,
+		["monster_base"]=10038,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=9000
 	},
 	[41701]={
-		["monster_base"]=10011,
+		["monster_base"]=10053,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=10000
 	},
 	[41801]={
-		["monster_base"]=10012,
+		["monster_base"]=10006,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20016,
+			20017,
+			20018
 		},
 		["monster_exp"]=11000
 	},
 	[41901]={
-		["monster_base"]=10016,
+		["monster_base"]=10004,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20010,
+			20011,
+			20012
 		},
 		["monster_exp"]=12000
 	},
 	[42001]={
-		["monster_base"]=20007,
+		["monster_base"]=20004,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30010,
+			30011,
+			30012
+		},
+		["skill"]={
+			10015
 		},
 		["monster_exp"]=12000
 	},
 	[42101]={
-		["monster_base"]=10015,
+		["monster_base"]=10052,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=16000
 	},
 	[42201]={
-		["monster_base"]=10017,
+		["monster_base"]=10050,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=18000
 	},
 	[42301]={
-		["monster_base"]=10014,
+		["monster_base"]=10010,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=21000
 	},
 	[42401]={
-		["monster_base"]=10018,
+		["monster_base"]=10039,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=22000
 	},
 	[42501]={
-		["monster_base"]=20008,
+		["monster_base"]=20005,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=24000
 	},
 	[42601]={
-		["monster_base"]=10004,
+		["monster_base"]=10040,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=15000
 	},
 	[42701]={
-		["monster_base"]=10002,
+		["monster_base"]=10010,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=16000
 	},
 	[42801]={
-		["monster_base"]=10011,
+		["monster_base"]=10040,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=17000
 	},
 	[42901]={
-		["monster_base"]=10013,
+		["monster_base"]=10009,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=17000
 	},
 	[43001]={
-		["monster_base"]=20003,
+		["monster_base"]=20024,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30070,
+			30071,
+			30072
 		},
 		["skill"]={
 			10043,
@@ -5365,246 +5607,258 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[43101]={
-		["monster_base"]=10012,
+		["monster_base"]=10009,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=11000
 	},
 	[43201]={
-		["monster_base"]=10017,
+		["monster_base"]=10054,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=11000
 	},
 	[43301]={
-		["monster_base"]=10014,
+		["monster_base"]=10052,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=17000
 	},
 	[43401]={
-		["monster_base"]=10016,
+		["monster_base"]=10050,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=19000
 	},
 	[43501]={
-		["monster_base"]=20005,
+		["monster_base"]=20008,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30022,
+			30023,
+			30024
+		},
+		["skill"]={
+			10032
 		},
 		["monster_exp"]=18000
 	},
 	[43601]={
-		["monster_base"]=10007,
+		["monster_base"]=10044,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=9000
 	},
 	[43701]={
-		["monster_base"]=10011,
+		["monster_base"]=10054,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=10000
 	},
 	[43801]={
-		["monster_base"]=10012,
+		["monster_base"]=10014,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20037,
+			20038,
+			20039
 		},
 		["monster_exp"]=11000
 	},
 	[43901]={
-		["monster_base"]=10016,
+		["monster_base"]=10018,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20049,
+			20050,
+			20051
 		},
 		["monster_exp"]=12000
 	},
 	[44001]={
-		["monster_base"]=20007,
+		["monster_base"]=20014,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30040,
+			30041,
+			30042
+		},
+		["skill"]={
+			10016
+		},
+		["passive_skill"]={
+			10010
 		},
 		["monster_exp"]=12000
 	},
 	[44101]={
-		["monster_base"]=10015,
+		["monster_base"]=10009,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=16000
 	},
 	[44201]={
-		["monster_base"]=10017,
+		["monster_base"]=10010,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=18000
 	},
 	[44301]={
-		["monster_base"]=10014,
+		["monster_base"]=10053,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=21000
 	},
 	[44401]={
-		["monster_base"]=10018,
+		["monster_base"]=10039,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=22000
 	},
 	[44501]={
-		["monster_base"]=20008,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=24000
 	},
 	[44601]={
-		["monster_base"]=10004,
+		["monster_base"]=10052,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=15000
 	},
 	[44701]={
-		["monster_base"]=10002,
+		["monster_base"]=10043,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=16000
 	},
 	[44801]={
-		["monster_base"]=10011,
+		["monster_base"]=10054,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=17000
 	},
 	[44901]={
-		["monster_base"]=10013,
+		["monster_base"]=10050,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=17000
 	},
 	[45001]={
-		["monster_base"]=20003,
+		["monster_base"]=20019,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30055,
+			30056,
+			30057
 		},
 		["skill"]={
 			10045
@@ -5616,246 +5870,260 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[45101]={
-		["monster_base"]=10012,
+		["monster_base"]=10046,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20133,
+			20134,
+			20135
 		},
 		["monster_exp"]=11000
 	},
 	[45201]={
-		["monster_base"]=10017,
+		["monster_base"]=10043,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=11000
 	},
 	[45301]={
-		["monster_base"]=10014,
+		["monster_base"]=10050,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=17000
 	},
 	[45401]={
-		["monster_base"]=10016,
+		["monster_base"]=10054,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=19000
 	},
 	[45501]={
-		["monster_base"]=20005,
+		["monster_base"]=20010,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30028,
+			30029,
+			30030
+		},
+		["skill"]={
+			10041
+		},
+		["passive_skill"]={
+			10008,
+			10009,
+			10013
 		},
 		["monster_exp"]=18000
 	},
 	[45601]={
-		["monster_base"]=10007,
+		["monster_base"]=10052,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=9000
 	},
 	[45701]={
-		["monster_base"]=10011,
+		["monster_base"]=10045,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20130,
+			20131,
+			20132
 		},
 		["monster_exp"]=10000
 	},
 	[45801]={
-		["monster_base"]=10012,
+		["monster_base"]=10043,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=11000
 	},
 	[45901]={
-		["monster_base"]=10016,
+		["monster_base"]=10053,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=12000
 	},
 	[46001]={
-		["monster_base"]=20007,
+		["monster_base"]=20005,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=12000
 	},
 	[46101]={
-		["monster_base"]=10015,
+		["monster_base"]=10045,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20130,
+			20131,
+			20132
 		},
 		["monster_exp"]=16000
 	},
 	[46201]={
-		["monster_base"]=10017,
+		["monster_base"]=10052,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=18000
 	},
 	[46301]={
-		["monster_base"]=10014,
+		["monster_base"]=10010,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=21000
 	},
 	[46401]={
-		["monster_base"]=10018,
+		["monster_base"]=10039,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=22000
 	},
 	[46501]={
-		["monster_base"]=20008,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=24000
 	},
 	[46601]={
-		["monster_base"]=10004,
+		["monster_base"]=10050,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=15000
 	},
 	[46701]={
-		["monster_base"]=10002,
+		["monster_base"]=10043,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=16000
 	},
 	[46801]={
-		["monster_base"]=10011,
+		["monster_base"]=10046,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20133,
+			20134,
+			20135
 		},
 		["monster_exp"]=17000
 	},
 	[46901]={
-		["monster_base"]=10013,
+		["monster_base"]=10054,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=17000
 	},
 	[47001]={
-		["monster_base"]=20003,
+		["monster_base"]=20020,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30058,
+			30059,
+			30060
 		},
 		["skill"]={
 			10047
@@ -5867,246 +6135,261 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[47101]={
-		["monster_base"]=10012,
+		["monster_base"]=10047,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20136,
+			20137,
+			20138
 		},
 		["monster_exp"]=11000
 	},
 	[47201]={
-		["monster_base"]=10017,
+		["monster_base"]=10038,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=11000
 	},
 	[47301]={
-		["monster_base"]=10014,
+		["monster_base"]=10021,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20058,
+			20059,
+			20060
 		},
 		["monster_exp"]=17000
 	},
 	[47401]={
-		["monster_base"]=10016,
+		["monster_base"]=10040,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=19000
 	},
 	[47501]={
-		["monster_base"]=20005,
+		["monster_base"]=20017,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30049,
+			30050,
+			30051
+		},
+		["skill"]={
+			10027,
+			10028
 		},
 		["monster_exp"]=18000
 	},
 	[47601]={
-		["monster_base"]=10007,
+		["monster_base"]=10010,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=9000
 	},
 	[47701]={
-		["monster_base"]=10011,
+		["monster_base"]=10039,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=10000
 	},
 	[47801]={
-		["monster_base"]=10012,
+		["monster_base"]=10040,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=11000
 	},
 	[47901]={
-		["monster_base"]=10016,
+		["monster_base"]=10009,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=12000
 	},
 	[48001]={
-		["monster_base"]=20007,
+		["monster_base"]=20024,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30070,
+			30071,
+			30072
+		},
+		["skill"]={
+			10043,
+			10044
 		},
 		["monster_exp"]=12000
 	},
 	[48101]={
-		["monster_base"]=10015,
+		["monster_base"]=10052,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=16000
 	},
 	[48201]={
-		["monster_base"]=10017,
+		["monster_base"]=10043,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=18000
 	},
 	[48301]={
-		["monster_base"]=10014,
+		["monster_base"]=10050,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=21000
 	},
 	[48401]={
-		["monster_base"]=10018,
+		["monster_base"]=10054,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=22000
 	},
 	[48501]={
-		["monster_base"]=20008,
+		["monster_base"]=20019,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30055,
+			30056,
+			30057
+		},
+		["skill"]={
+			10045
+		},
+		["passive_skill"]={
+			10046,
+			10013
 		},
 		["monster_exp"]=24000
 	},
 	[48601]={
-		["monster_base"]=10004,
+		["monster_base"]=10029,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20082,
+			20083,
+			20084
 		},
 		["monster_exp"]=15000
 	},
 	[48701]={
-		["monster_base"]=10002,
+		["monster_base"]=10050,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20145,
+			20146,
+			20147
 		},
 		["monster_exp"]=16000
 	},
 	[48801]={
-		["monster_base"]=10011,
+		["monster_base"]=10043,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=17000
 	},
 	[48901]={
-		["monster_base"]=10013,
+		["monster_base"]=10028,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20079,
+			20080,
+			20081
 		},
 		["monster_exp"]=17000
 	},
 	[49001]={
-		["monster_base"]=20003,
+		["monster_base"]=20013,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30037,
+			30038,
+			30039
 		},
 		["skill"]={
 			10049,
@@ -6115,50 +6398,50 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[49101]={
-		["monster_base"]=10012,
+		["monster_base"]=10052,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=11000
 	},
 	[49201]={
-		["monster_base"]=10017,
+		["monster_base"]=10045,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20130,
+			20131,
+			20132
 		},
 		["monster_exp"]=11000
 	},
 	[49301]={
-		["monster_base"]=10014,
+		["monster_base"]=10043,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20124,
+			20125,
+			20126
 		},
 		["monster_exp"]=17000
 	},
 	[49401]={
-		["monster_base"]=10016,
+		["monster_base"]=10053,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=19000
 	},
@@ -6169,192 +6452,202 @@ local monster_chapter = {
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=18000
 	},
 	[49601]={
-		["monster_base"]=10007,
+		["monster_base"]=10010,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=9000
 	},
 	[49701]={
-		["monster_base"]=10011,
+		["monster_base"]=10039,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=10000
 	},
 	[49801]={
-		["monster_base"]=10012,
+		["monster_base"]=10040,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=11000
 	},
 	[49901]={
-		["monster_base"]=10016,
+		["monster_base"]=10009,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=12000
 	},
 	[50001]={
-		["monster_base"]=20007,
+		["monster_base"]=20024,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30070,
+			30071,
+			30072
+		},
+		["skill"]={
+			10043,
+			10044
 		},
 		["monster_exp"]=12000
 	},
 	[50101]={
-		["monster_base"]=10015,
+		["monster_base"]=10040,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=16000
 	},
 	[50201]={
-		["monster_base"]=10017,
+		["monster_base"]=10039,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=18000
 	},
 	[50301]={
-		["monster_base"]=10014,
+		["monster_base"]=10010,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=21000
 	},
 	[50401]={
-		["monster_base"]=10018,
+		["monster_base"]=10039,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=22000
 	},
 	[50501]={
-		["monster_base"]=20008,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=24000
 	},
 	[50601]={
-		["monster_base"]=10004,
+		["monster_base"]=10010,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=15000
 	},
 	[50701]={
-		["monster_base"]=10002,
+		["monster_base"]=10040,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20115,
+			20116,
+			20117
 		},
 		["monster_exp"]=16000
 	},
 	[50801]={
-		["monster_base"]=10011,
+		["monster_base"]=10038,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20109,
+			20110,
+			20111
 		},
 		["monster_exp"]=17000
 	},
 	[50901]={
-		["monster_base"]=10013,
+		["monster_base"]=10032,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20091,
+			20092,
+			20093
 		},
 		["monster_exp"]=17000
 	},
 	[51001]={
-		["monster_base"]=20003,
+		["monster_base"]=20018,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30052,
+			30053,
+			30054
 		},
 		["skill"]={
 			10051
@@ -6366,246 +6659,265 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[51101]={
-		["monster_base"]=10012,
+		["monster_base"]=10033,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=11000
 	},
 	[51201]={
-		["monster_base"]=10017,
+		["monster_base"]=10029,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20082,
+			20083,
+			20084
 		},
 		["monster_exp"]=11000
 	},
 	[51301]={
-		["monster_base"]=10014,
+		["monster_base"]=10031,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20088,
+			20089,
+			20090
 		},
 		["monster_exp"]=17000
 	},
 	[51401]={
-		["monster_base"]=10016,
+		["monster_base"]=10028,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20079,
+			20080,
+			20081
 		},
 		["monster_exp"]=19000
 	},
 	[51501]={
-		["monster_base"]=20005,
+		["monster_base"]=20013,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30037,
+			30038,
+			30039
+		},
+		["skill"]={
+			10049,
+			10050
 		},
 		["monster_exp"]=18000
 	},
 	[51601]={
-		["monster_base"]=10007,
+		["monster_base"]=10030,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20085,
+			20086,
+			20087
 		},
 		["monster_exp"]=9000
 	},
 	[51701]={
-		["monster_base"]=10011,
+		["monster_base"]=10029,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20082,
+			20083,
+			20084
 		},
 		["monster_exp"]=10000
 	},
 	[51801]={
-		["monster_base"]=10012,
+		["monster_base"]=10033,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=11000
 	},
 	[51901]={
-		["monster_base"]=10016,
+		["monster_base"]=10054,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=12000
 	},
 	[52001]={
-		["monster_base"]=20007,
+		["monster_base"]=20010,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30028,
+			30029,
+			30030
+		},
+		["skill"]={
+			10041
+		},
+		["passive_skill"]={
+			10008,
+			10009,
+			10013
 		},
 		["monster_exp"]=12000
 	},
 	[52101]={
-		["monster_base"]=10015,
+		["monster_base"]=10053,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=16000
 	},
 	[52201]={
-		["monster_base"]=10017,
+		["monster_base"]=10033,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=18000
 	},
 	[52301]={
-		["monster_base"]=10014,
+		["monster_base"]=10029,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20082,
+			20083,
+			20084
 		},
 		["monster_exp"]=21000
 	},
 	[52401]={
-		["monster_base"]=10018,
+		["monster_base"]=10054,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=22000
 	},
 	[52501]={
-		["monster_base"]=20008,
+		["monster_base"]=20020,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30058,
+			30059,
+			30060
+		},
+		["skill"]={
+			10047
+		},
+		["passive_skill"]={
+			10048,
+			10013
 		},
 		["monster_exp"]=24000
 	},
 	[52601]={
-		["monster_base"]=10004,
+		["monster_base"]=10053,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=15000
 	},
 	[52701]={
-		["monster_base"]=10002,
+		["monster_base"]=10028,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20079,
+			20080,
+			20081
 		},
 		["monster_exp"]=16000
 	},
 	[52801]={
-		["monster_base"]=10011,
+		["monster_base"]=10046,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20133,
+			20134,
+			20135
 		},
 		["monster_exp"]=17000
 	},
 	[52901]={
-		["monster_base"]=10013,
+		["monster_base"]=10058,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20169,
+			20170,
+			20171
 		},
 		["monster_exp"]=17000
 	},
 	[53001]={
-		["monster_base"]=20003,
+		["monster_base"]=20032,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30094,
+			30095,
+			30096
 		},
 		["skill"]={
 			10052,
@@ -6620,246 +6932,252 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[53101]={
-		["monster_base"]=10012,
+		["monster_base"]=10057,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20166,
+			20167,
+			20168
 		},
 		["monster_exp"]=11000
 	},
 	[53201]={
-		["monster_base"]=10017,
+		["monster_base"]=10046,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20133,
+			20134,
+			20135
 		},
 		["monster_exp"]=11000
 	},
 	[53301]={
-		["monster_base"]=10014,
+		["monster_base"]=10052,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=17000
 	},
 	[53401]={
-		["monster_base"]=10016,
+		["monster_base"]=10029,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20082,
+			20083,
+			20084
 		},
 		["monster_exp"]=19000
 	},
 	[53501]={
-		["monster_base"]=20005,
+		["monster_base"]=20008,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30022,
+			30023,
+			30024
+		},
+		["skill"]={
+			10032
 		},
 		["monster_exp"]=18000
 	},
 	[53601]={
-		["monster_base"]=10007,
+		["monster_base"]=10058,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20169,
+			20170,
+			20171
 		},
 		["monster_exp"]=9000
 	},
 	[53701]={
-		["monster_base"]=10011,
+		["monster_base"]=10033,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20094,
+			20095,
+			20096
 		},
 		["monster_exp"]=10000
 	},
 	[53801]={
-		["monster_base"]=10012,
+		["monster_base"]=10044,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20127,
+			20128,
+			20129
 		},
 		["monster_exp"]=11000
 	},
 	[53901]={
-		["monster_base"]=10016,
+		["monster_base"]=10053,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=12000
 	},
 	[54001]={
-		["monster_base"]=20007,
+		["monster_base"]=20011,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30031,
+			30032,
+			30033
 		},
 		["monster_exp"]=12000
 	},
 	[54101]={
-		["monster_base"]=10015,
+		["monster_base"]=10029,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20082,
+			20083,
+			20084
 		},
 		["monster_exp"]=16000
 	},
 	[54201]={
-		["monster_base"]=10017,
+		["monster_base"]=10058,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20169,
+			20170,
+			20171
 		},
 		["monster_exp"]=18000
 	},
 	[54301]={
-		["monster_base"]=10014,
+		["monster_base"]=10052,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20151,
+			20152,
+			20153
 		},
 		["monster_exp"]=21000
 	},
 	[54401]={
-		["monster_base"]=10018,
+		["monster_base"]=10054,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20157,
+			20158,
+			20159
 		},
 		["monster_exp"]=22000
 	},
 	[54501]={
-		["monster_base"]=20008,
+		["monster_base"]=20005,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30013,
+			30014,
+			30015
+		},
+		["skill"]={
+			10024
 		},
 		["monster_exp"]=24000
 	},
 	[54601]={
-		["monster_base"]=10004,
+		["monster_base"]=10053,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=15000
 	},
 	[54701]={
-		["monster_base"]=10002,
+		["monster_base"]=10028,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20079,
+			20080,
+			20081
 		},
 		["monster_exp"]=16000
 	},
 	[54801]={
-		["monster_base"]=10011,
+		["monster_base"]=10046,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20133,
+			20134,
+			20135
 		},
 		["monster_exp"]=17000
 	},
 	[54901]={
-		["monster_base"]=10013,
+		["monster_base"]=10057,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20166,
+			20167,
+			20168
 		},
 		["monster_exp"]=17000
 	},
 	[55001]={
-		["monster_base"]=20003,
+		["monster_base"]=20032,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30094,
+			30095,
+			30096
 		},
 		["skill"]={
 			10052,
@@ -6875,15 +7193,15 @@ local monster_chapter = {
 		["monster_exp"]=11000
 	},
 	[55101]={
-		["monster_base"]=20003,
+		["monster_base"]=20030,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30088,
+			30089,
+			30090
 		},
 		["skill"]={
 			10056,
@@ -6895,246 +7213,259 @@ local monster_chapter = {
 		["monster_exp"]=11000
 	},
 	[55201]={
-		["monster_base"]=10012,
+		["monster_base"]=10056,
 		["hp"]=15500000,
 		["atk"]=770000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20163,
+			20164,
+			20165
 		},
 		["monster_exp"]=11000
 	},
 	[55301]={
-		["monster_base"]=10017,
+		["monster_base"]=10009,
 		["hp"]=21900000,
 		["atk"]=800000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=11000
 	},
 	[55401]={
-		["monster_base"]=10014,
+		["monster_base"]=10010,
 		["hp"]=24600000,
 		["atk"]=840000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20028,
+			20029,
+			20030
 		},
 		["monster_exp"]=17000
 	},
 	[55501]={
-		["monster_base"]=10016,
+		["monster_base"]=10039,
 		["hp"]=32600000,
 		["atk"]=880000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20112,
+			20113,
+			20114
 		},
 		["monster_exp"]=19000
 	},
 	[55601]={
-		["monster_base"]=20005,
+		["monster_base"]=20012,
 		["is_boss"]=1,
 		["hp"]=45300000,
 		["atk"]=940000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30034,
+			30035,
+			30036
+		},
+		["skill"]={
+			10017
 		},
 		["monster_exp"]=18000
 	},
 	[55701]={
-		["monster_base"]=10007,
+		["monster_base"]=10009,
 		["hp"]=30800000,
 		["atk"]=900000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20025,
+			20026,
+			20027
 		},
 		["monster_exp"]=9000
 	},
 	[55801]={
-		["monster_base"]=10011,
+		["monster_base"]=10055,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20160,
+			20161,
+			20162
 		},
 		["monster_exp"]=10000
 	},
 	[55901]={
-		["monster_base"]=10012,
+		["monster_base"]=10046,
 		["hp"]=39900000,
 		["atk"]=940000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20133,
+			20134,
+			20135
 		},
 		["monster_exp"]=11000
 	},
 	[56001]={
-		["monster_base"]=10016,
+		["monster_base"]=10057,
 		["hp"]=45300000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20166,
+			20167,
+			20168
 		},
 		["monster_exp"]=12000
 	},
 	[56101]={
-		["monster_base"]=20007,
+		["monster_base"]=20030,
 		["is_boss"]=1,
 		["hp"]=86700000,
 		["atk"]=1050000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30088,
+			30089,
+			30090
+		},
+		["skill"]={
+			10056,
+			10057
+		},
+		["passive_skill"]={
+			10014
 		},
 		["monster_exp"]=12000
 	},
 	[56201]={
-		["monster_base"]=10015,
+		["monster_base"]=10058,
 		["hp"]=50200000,
 		["atk"]=1010000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20169,
+			20170,
+			20171
 		},
 		["monster_exp"]=16000
 	},
 	[56301]={
-		["monster_base"]=10017,
+		["monster_base"]=10051,
 		["hp"]=56900000,
 		["atk"]=1050000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20148,
+			20149,
+			20150
 		},
 		["monster_exp"]=18000
 	},
 	[56401]={
-		["monster_base"]=10014,
+		["monster_base"]=10053,
 		["hp"]=60000000,
 		["atk"]=1080000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20154,
+			20155,
+			20156
 		},
 		["monster_exp"]=21000
 	},
 	[56501]={
-		["monster_base"]=10018,
+		["monster_base"]=10055,
 		["hp"]=65000000,
 		["atk"]=1110000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20160,
+			20161,
+			20162
 		},
 		["monster_exp"]=22000
 	},
 	[56601]={
-		["monster_base"]=20008,
+		["monster_base"]=20029,
 		["is_boss"]=1,
 		["hp"]=126300000,
 		["atk"]=1160000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30085,
+			30086,
+			30087
+		},
+		["skill"]={
+			10018
 		},
 		["monster_exp"]=24000
 	},
 	[56701]={
-		["monster_base"]=10004,
+		["monster_base"]=10058,
 		["hp"]=87200000,
 		["atk"]=1270000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20169,
+			20170,
+			20171
 		},
 		["monster_exp"]=15000
 	},
 	[56801]={
-		["monster_base"]=10002,
+		["monster_base"]=10051,
 		["hp"]=92500000,
 		["atk"]=1300000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20148,
+			20149,
+			20150
 		},
 		["monster_exp"]=16000
 	},
 	[56901]={
-		["monster_base"]=10011,
+		["monster_base"]=10055,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20160,
+			20161,
+			20162
 		},
 		["monster_exp"]=17000
 	},
 	[57001]={
-		["monster_base"]=10013,
+		["monster_base"]=10057,
 		["hp"]=111000000,
 		["atk"]=1380000,
 		["atk_times"]=3,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			20166,
+			20167,
+			20168
 		},
 		["monster_exp"]=17000
 	},
 	[57101]={
-		["monster_base"]=20003,
+		["monster_base"]=20031,
 		["is_boss"]=2,
 		["hp"]=195000000,
 		["atk"]=2000000,
 		["atk_times"]=4,
 		["hurt_skill"]={
-			10001,
-			10002,
-			10003
+			30091,
+			30092,
+			30093
 		},
 		["skill"]={
 			10058,
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index c84179fd..f1be0253 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -1079,7 +1079,19 @@ local skill = {
 		["obj"]=2
 	},
 	[1400126]={
-		["position"]=1
+		["position"]=1,
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="hurt_red",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["fx_target"]=4
 	},
 	[2200110]={
 		["position"]=2,
@@ -1924,7 +1936,7 @@ local skill = {
 		},
 		["condition_rel"]={
 			{
-				1,
+				2,
 				1
 			}
 		},
@@ -1961,7 +1973,7 @@ local skill = {
 		},
 		["condition_rel"]={
 			{
-				1,
+				2,
 				1
 			}
 		},
@@ -2061,6 +2073,20 @@ local skill = {
 			400
 		}
 	},
+	[2400125]={
+		["position"]=2,
+		["effect_type"]=2,
+		["trigger"]=7,
+		["effect"]={
+			{
+				["type"]="skill_hurt_add",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=2
+	},
 	[3200110]={
 		["position"]=3,
 		["effect_type"]=1,
@@ -4362,6 +4388,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
@@ -4379,6 +4406,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
@@ -4396,6 +4424,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
@@ -4413,6 +4442,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
@@ -4430,6 +4460,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
@@ -4447,6 +4478,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
@@ -4464,6 +4496,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
@@ -4654,12 +4687,22 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=30000,
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=1500,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1,
+			2
+		},
 		["skill_position"]=1,
 		["cd"]=2,
 		["cd_start"]=2,
@@ -4833,6 +4876,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["skill_position"]=1,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -4852,31 +4901,31 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="hurt_yellow",
+				["type"]="hurt",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="hurt_yellow",
+				["type"]="hurt",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="hurt_yellow",
+				["type"]="hurt",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="hurt_yellow",
+				["type"]="hurt",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="hurt_yellow",
+				["type"]="hurt",
 				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
@@ -4947,6 +4996,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5143,6 +5198,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5240,6 +5301,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5484,6 +5551,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["name_act"]="skill01"
@@ -5504,12 +5577,18 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
-		["name_act"]="skill01",
+		["name_act"]="skill02",
 		["fx_target"]=300011
 	},
 	[10045]={
@@ -5529,6 +5608,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5569,6 +5654,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5605,6 +5696,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=2,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5631,6 +5728,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=2,
 		["cd_start"]=1,
 		["shake_time"]=200,
@@ -5657,6 +5760,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			2500
+		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["name_act"]="skill01"
@@ -5698,12 +5807,18 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			2500
+		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
-		["name_act"]="skill01",
+		["name_act"]="skill02",
 		["fx_target"]=300011
 	},
 	[10054]={
@@ -5752,6 +5867,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5777,12 +5898,18 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound_hit"]=4200120,
-		["name_act"]="skill01",
+		["name_act"]="skill02",
 		["fx_target"]=300011
 	},
 	[10058]={
@@ -5803,6 +5930,12 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5817,9 +5950,5459 @@ local skill = {
 			34,
 			2
 		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="burn",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["effect_block"]={
+			1
+		},
+		["block_time"]={
+			1000
+		},
 		["cd"]=3,
-		["cd_start"]=1,
-		["name_act"]="skill01"
+		["cd_start"]=2,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]=4200120,
+		["name_act"]="skill02"
+	},
+	[20001]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20002]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20003]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20004]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20005]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20006]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20007]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20008]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20009]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20010]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20011]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20012]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20013]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20014]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20015]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20016]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20017]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20018]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20019]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20020]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20021]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20022]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20023]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20024]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20025]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20026]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20027]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20028]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20029]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20030]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20031]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20032]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20033]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20034]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20035]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20036]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20037]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20038]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20039]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20040]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20041]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20042]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20043]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20044]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20045]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20046]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20047]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20048]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20049]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20050]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20051]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20052]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20053]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20054]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20055]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20056]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20057]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20058]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20059]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20060]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20061]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20062]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20063]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20064]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20065]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20066]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20067]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20068]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20069]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20070]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20071]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20072]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20073]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20074]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20075]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20076]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20077]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20078]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20079]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20080]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20081]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20082]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20083]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20084]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20085]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20086]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20087]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20088]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20089]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20090]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20091]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20092]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20093]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20094]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20095]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20096]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20097]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20098]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20099]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20100]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20101]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20102]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20103]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20104]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20105]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20106]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20107]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20108]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20109]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20110]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20111]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20112]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20113]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20114]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20115]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20116]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20117]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20118]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20119]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20120]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20121]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20122]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20123]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20124]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20125]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20126]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20127]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20128]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20129]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20130]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20131]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20132]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20133]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20134]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20135]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20136]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20137]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20138]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20139]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20140]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20141]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20142]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20143]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20144]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20145]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20146]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20147]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20148]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20149]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20150]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20151]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20152]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20153]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20154]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20155]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20156]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20157]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20158]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20159]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20160]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20161]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20162]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20163]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20164]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20165]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20166]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20167]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20168]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20169]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20170]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20171]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[20172]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[20173]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[20174]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30001]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30002]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30003]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30004]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30005]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30006]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30007]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30008]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30009]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30010]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30011]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30012]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30013]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30014]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30015]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30016]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30017]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30018]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30019]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30020]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30021]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30022]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30023]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30024]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30025]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30026]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30027]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30028]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30029]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30030]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30031]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30032]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30033]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30034]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30035]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30036]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30037]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30038]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30039]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30040]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30041]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30042]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30043]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30044]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30045]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30046]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30047]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30048]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30049]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30050]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30051]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30052]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30053]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30054]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30055]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30056]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30057]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30058]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30059]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30060]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30061]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30062]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30063]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30064]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30065]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30066]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30067]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30068]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30069]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30070]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30071]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30072]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30073]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30074]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30075]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30076]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30077]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30078]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30079]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30080]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30081]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30082]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30083]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30084]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30085]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30086]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30087]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30088]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30089]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30090]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30091]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30092]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30093]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[30094]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01"
+	},
+	[30095]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02"
+	},
+	[30096]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03"
+	},
+	[40001]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=4200111,
+		["name_act"]="attack01",
+		["fx_target"]=300009
+	},
+	[40002]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=4200112,
+		["name_act"]="attack02",
+		["fx_target"]=300010
+	},
+	[40003]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=4200113,
+		["name_act"]="attack03",
+		["fx_target"]=300011
+	},
+	[40004]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=4200114,
+		["name_act"]="attack04",
+		["fx_target"]=300012
+	},
+	[40005]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200111,
+		["name_act"]="attack01",
+		["fx_self"]=300004,
+		["fx_target"]=4,
+		["fx_target_delay"]=366
+	},
+	[40006]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200112,
+		["name_act"]="attack02",
+		["fx_self"]=300005,
+		["fx_target"]=4,
+		["fx_target_delay"]=400
+	},
+	[40007]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200113,
+		["name_act"]="attack03",
+		["fx_self"]=300006,
+		["fx_target"]=4,
+		["fx_target_delay"]=333
+	},
+	[40008]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200114,
+		["name_act"]="attack04",
+		["fx_self"]=300007,
+		["fx_target"]=4,
+		["fx_target_delay"]=433
+	},
+	[40009]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200111,
+		["name_act"]="attack01",
+		["fx_self"]=300017,
+		["fx_target"]=2,
+		["fx_target_delay"]=300
+	},
+	[40010]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200112,
+		["name_act"]="attack02",
+		["fx_self"]=300018,
+		["fx_target"]=2,
+		["fx_target_delay"]=333
+	},
+	[40011]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200113,
+		["name_act"]="attack03",
+		["fx_self"]=300019,
+		["fx_target"]=2,
+		["fx_target_delay"]=300
+	},
+	[40012]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200114,
+		["name_act"]="attack04",
+		["fx_self"]=300020,
+		["fx_target"]=2,
+		["fx_target_delay"]=333
+	},
+	[40013]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200111,
+		["name_act"]="attack01",
+		["fx_self"]=300004,
+		["fx_target"]=4,
+		["fx_target_delay"]=366
+	},
+	[40014]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200112,
+		["name_act"]="attack02",
+		["fx_self"]=300005,
+		["fx_target"]=4,
+		["fx_target_delay"]=400
+	},
+	[40015]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200113,
+		["name_act"]="attack03",
+		["fx_self"]=300006,
+		["fx_target"]=4,
+		["fx_target_delay"]=333
+	},
+	[40016]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=2200114,
+		["name_act"]="attack04",
+		["fx_self"]=300007,
+		["fx_target"]=4,
+		["fx_target_delay"]=433
+	},
+	[40017]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=3300111,
+		["name_act"]="attack01",
+		["fx_target"]=300021
+	},
+	[40018]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=3300112,
+		["name_act"]="attack02",
+		["fx_target"]=300022
+	},
+	[40019]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=3300113,
+		["name_act"]="attack03",
+		["fx_target"]=300023
+	},
+	[40020]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=3300114,
+		["name_act"]="attack04",
+		["fx_target"]=300024
+	},
+	[40021]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200111,
+		["name_act"]="attack01",
+		["fx_self"]=300017,
+		["fx_target"]=2,
+		["fx_target_delay"]=300
+	},
+	[40022]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200112,
+		["name_act"]="attack02",
+		["fx_self"]=300018,
+		["fx_target"]=2,
+		["fx_target_delay"]=333
+	},
+	[40023]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200113,
+		["name_act"]="attack03",
+		["fx_self"]=300019,
+		["fx_target"]=2,
+		["fx_target_delay"]=300
+	},
+	[40024]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=1200114,
+		["name_act"]="attack04",
+		["fx_self"]=300020,
+		["fx_target"]=2,
+		["fx_target_delay"]=333
+	},
+	[40025]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200111,
+		["name_act"]="attack01",
+		["fx_target"]=300013
+	},
+	[40026]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200112,
+		["name_act"]="attack02",
+		["fx_target"]=300013
+	},
+	[40027]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200113,
+		["name_act"]="attack03",
+		["fx_target"]=300014
+	},
+	[40028]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]=5200114,
+		["name_act"]="attack04",
+		["fx_target"]=300015
 	},
 	[110001]={
 		["skill_type"]=5,
@@ -5899,6 +11482,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=252
+data=skill,count=551
 }
 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 84e97720..15a97a36 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -1746,10 +1746,10 @@ local skill_rogue = {
 		["skill_position"]=2,
 		["effect"]={
 			{
-				["type"]="hurt_yellow",
-				["num"]=33400,
+				["type"]="add_skill",
+				["num"]=2400125,
 				["ratio"]=10000,
-				["round"]=0
+				["round"]=1
 			}
 		},
 		["obj"]=2,
diff --git a/lua/app/config/strings/cn/act_sevenday_quest.lua b/lua/app/config/strings/cn/act_sevenday_quest.lua
new file mode 100644
index 00000000..40aed422
--- /dev/null
+++ b/lua/app/config/strings/cn/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+		["desc"]="累计签到1天"
+	},
+	[2]={
+		["desc"]="通过主线章节2"
+	},
+	[3]={
+		["desc"]="开启1次普通宝箱"
+	},
+	[4]={
+		["desc"]="英雄最高等级达到3"
+	},
+	[5]={
+		["desc"]="拥有5个英雄"
+	},
+	[6]={
+		["desc"]="等级达到3"
+	},
+	[7]={
+		["desc"]="消耗体力50点"
+	},
+	[8]={
+		["desc"]="累计获取钻石50个"
+	},
+	[9]={
+		["desc"]="累计获取金币1000个"
+	},
+	[10]={
+		["desc"]="收看5次广告"
+	},
+	[11]={
+		["desc"]="累计签到2天"
+	},
+	[12]={
+		["desc"]="通过主线章节4"
+	},
+	[13]={
+		["desc"]="开启3次普通宝箱"
+	},
+	[14]={
+		["desc"]="英雄最高等级达到5"
+	},
+	[15]={
+		["desc"]="拥有7个英雄"
+	},
+	[16]={
+		["desc"]="等级达到7"
+	},
+	[17]={
+		["desc"]="消耗体力100点"
+	},
+	[18]={
+		["desc"]="累计获取钻石400个"
+	},
+	[19]={
+		["desc"]="累计获取金币3000个"
+	},
+	[20]={
+		["desc"]="收看10次广告"
+	},
+	[21]={
+		["desc"]="累计签到3天"
+	},
+	[22]={
+		["desc"]="通过主线章节6"
+	},
+	[23]={
+		["desc"]="开启1次精致宝箱"
+	},
+	[24]={
+		["desc"]="拥有9个英雄"
+	},
+	[25]={
+		["desc"]="等级达到10"
+	},
+	[26]={
+		["desc"]="消耗体力150点"
+	},
+	[27]={
+		["desc"]="累计获取钻石800个"
+	},
+	[28]={
+		["desc"]="累计获取金币6000个"
+	},
+	[29]={
+		["desc"]="战斗中连接6消100次"
+	},
+	[30]={
+		["desc"]="收看15次广告"
+	},
+	[31]={
+		["desc"]="累计签到4天"
+	},
+	[32]={
+		["desc"]="通过主线章节8"
+	},
+	[33]={
+		["desc"]="开启2次精致宝箱"
+	},
+	[34]={
+		["desc"]="英雄最高等级达到6"
+	},
+	[35]={
+		["desc"]="拥有11个英雄"
+	},
+	[36]={
+		["desc"]="等级达到13"
+	},
+	[37]={
+		["desc"]="消耗体力200点"
+	},
+	[38]={
+		["desc"]="累计获取钻石1000个"
+	},
+	[39]={
+		["desc"]="累计获取金币10000个"
+	},
+	[40]={
+		["desc"]="收看20次广告"
+	},
+	[41]={
+		["desc"]="累计签到5天"
+	},
+	[42]={
+		["desc"]="通过主线章节10"
+	},
+	[43]={
+		["desc"]="开启1次珍贵宝箱"
+	},
+	[44]={
+		["desc"]="英雄最高等级达到7"
+	},
+	[45]={
+		["desc"]="拥有13个英雄"
+	},
+	[46]={
+		["desc"]="等级达到16"
+	},
+	[47]={
+		["desc"]="消耗体力300点"
+	},
+	[48]={
+		["desc"]="累计获取钻石1500个"
+	},
+	[49]={
+		["desc"]="累计获取金币12000个"
+	},
+	[50]={
+		["desc"]="击杀小怪400个"
+	},
+	[51]={
+		["desc"]="收看25次广告"
+	},
+	[52]={
+		["desc"]="累计签到6天"
+	},
+	[53]={
+		["desc"]="通过主线章节12"
+	},
+	[54]={
+		["desc"]="开启3次精致宝箱"
+	},
+	[55]={
+		["desc"]="拥有15个英雄"
+	},
+	[56]={
+		["desc"]="等级达到18"
+	},
+	[57]={
+		["desc"]="消耗体力400点"
+	},
+	[58]={
+		["desc"]="累计获取钻石2000个"
+	},
+	[59]={
+		["desc"]="累计获取金币15000个"
+	},
+	[60]={
+		["desc"]="战斗中连接8消100次"
+	},
+	[61]={
+		["desc"]="收看30次广告"
+	},
+	[62]={
+		["desc"]="击杀首领150个"
+	},
+	[63]={
+		["desc"]="累计签到7天"
+	},
+	[64]={
+		["desc"]="通过主线章节14"
+	},
+	[65]={
+		["desc"]="开启2次珍贵宝箱"
+	},
+	[66]={
+		["desc"]="英雄最高等级达到8"
+	},
+	[67]={
+		["desc"]="拥有16个英雄"
+	},
+	[68]={
+		["desc"]="等级达到21"
+	},
+	[69]={
+		["desc"]="消耗体力500点"
+	},
+	[70]={
+		["desc"]="累计获取钻石3000个"
+	},
+	[71]={
+		["desc"]="累计获取金币20000个"
+	},
+	[72]={
+		["desc"]="战斗中连接10消40次"
+	},
+	[73]={
+		["desc"]="收看40次广告"
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/cn/act_sevenday_quest.lua.meta b/lua/app/config/strings/cn/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..f3838d83
--- /dev/null
+++ b/lua/app/config/strings/cn/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 4a7ae6bb84740ce4c91ef3a86a67974f
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua
index 85a10727..46da0048 100644
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@@ -133,6 +133,16 @@ local localization_global =
     ["SIDE_BAR_FULL"] = "MAX",
     ["DAILY_CHALLENGE"] = "每日挑战",
     ["LEVEL_FUND_DESC_1"] = "购买成长基金{0}后，可通过提升等级获得钻石。\n多档基金可同时购买",
+    ["BUFF_DESC"] = "BUFF",
+    ["DAILY_CHALLENGE_DESC_1"] = "今日剩余挑战次数不足",
+    ["DISCONNECT_RELOGIN"] = "网络连接已断开, 请重新登录",
+    ["RECONNECT"] = "网络连接已断开,是否重连",
+    ["RELOGIN"] = "重新登录",
+    ["SEVEN_DAY_TITLE"] = "新手七天乐",
+    ["SEVEN_DAY_DESC_1"] = "每天将开启新的任务",
+    ["DAY_X"] = "第{0}天",
+    ["DAY_X_UNLOCK"] = "第{0}天解锁",
+    ["SEVEN_DAY_DESC_2"] = "已完成任务数:<color=#8DFF81>{0}</color>/{1}",
 }
 
 return localization_global
\ No newline at end of file
diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua
index 4a627485..11d6bf5f 100644
--- a/lua/app/config/strings/cn/hero.lua
+++ b/lua/app/config/strings/cn/hero.lua
@@ -1,63 +1,83 @@
 local hero = {
 	[12001]={
-		["name"]="舞娘"
+		["name"]="舞娘",
+		["desc"]="舞娘起舞，轻盈的舞步甩在敌人的脸上。"
 	},
 	[13001]={
-		["name"]="克劳德"
+		["name"]="克劳德",
+		["desc"]="克劳德挥舞大剑，剑气形成旋风，灼灼逼人。"
 	},
 	[13002]={
-		["name"]="火旺"
+		["name"]="火旺",
+		["desc"]="火旺擅长炎拳，拳拳带火花，有谁不服，就是邦邦两拳。"
 	},
 	[14001]={
-		["name"]="亚历山大"
+		["name"]="亚历山大",
+		["desc"]="亚历山大的装备，可不是用来好看的。"
 	},
 	[22001]={
-		["name"]="刀妹"
+		["name"]="刀妹",
+		["desc"]="刀妹使用一次拔刀斩终结技，造成大量伤害。"
 	},
 	[23001]={
-		["name"]="野蛮人"
+		["name"]="野蛮人",
+		["desc"]="野蛮人的多段伤害，附加流血。"
 	},
 	[23002]={
-		["name"]="二丫"
+		["name"]="二丫",
+		["desc"]="二丫的链接可以增伤。"
 	},
 	[24001]={
-		["name"]="巨剑魔童"
+		["name"]="巨剑魔童",
+		["desc"]="巨剑魔童可以造成大量伤害，并概率眩晕敌人。"
 	},
 	[32001]={
-		["name"]="洋葱头"
+		["name"]="洋葱头",
+		["desc"]="洋葱头使用一次长枪突刺终结技，造成大量伤害并恢复自身血量。"
 	},
 	[33001]={
-		["name"]="小鹿"
+		["name"]="小鹿",
+		["desc"]="小鹿的急速治疗法，起死回生不过一瞬。"
 	},
 	[33002]={
-		["name"]="森林狼"
+		["name"]="森林狼",
+		["desc"]="森林狼的链接可以增伤，概率附加易伤效果。"
 	},
 	[34001]={
-		["name"]="木兰"
+		["name"]="木兰",
+		["desc"]="木兰的链接可以增伤，并附加易伤效果。"
 	},
 	[42001]={
-		["name"]="冰心"
+		["name"]="冰心",
+		["desc"]="冰心的攻击随机消除额外元素，并造成伤害，有概率冰冻敌人。"
 	},
 	[43001]={
-		["name"]="冰女"
+		["name"]="冰女",
+		["desc"]="冰女的攻击附加冰霜，并增加灼烧伤害。"
 	},
 	[43002]={
-		["name"]="鸦姐"
+		["name"]="鸦姐",
+		["desc"]="鸦姐的攻击一定给敌人附加腐败状态。"
 	},
 	[44001]={
-		["name"]="寒冰妖姬"
+		["name"]="寒冰妖姬",
+		["desc"]="寒冰妖姬随机消除元素，释放一次附带冰霜效果的剑舞攻击。"
 	},
 	[52001]={
-		["name"]="忍者伦"
+		["name"]="忍者伦",
+		["desc"]="忍者伦生成的魔法罩可以承受伤害。"
 	},
 	[53001]={
-		["name"]="魔女琪琪"
+		["name"]="魔女琪琪",
+		["desc"]="魔女琪琪的扫帚攻击命中可以附加负面负面状态。"
 	},
 	[53002]={
-		["name"]="灵魂猎手"
+		["name"]="灵魂猎手",
+		["desc"]="灵魂猎手攻击冰霜敌人概率冰冻敌人。"
 	},
 	[54001]={
-		["name"]="蝴蝶"
+		["name"]="蝴蝶",
+		["desc"]="蝴蝶的技能可以随机增加技能的能量。"
 	}
 }
 local config = {
diff --git a/lua/app/config/strings/cn/task_daily_challenge.lua b/lua/app/config/strings/cn/task_daily_challenge.lua
index ba848a2f..b83a1db6 100644
--- a/lua/app/config/strings/cn/task_daily_challenge.lua
+++ b/lua/app/config/strings/cn/task_daily_challenge.lua
@@ -3,25 +3,25 @@ local task_daily_challenge = {
 		["desc"]="通关每日挑战"
 	},
 	[2]={
-		["desc"]="使用某英雄通关每日挑战"
+		["desc"]="使用{0}通关每日挑战"
 	},
 	[3]={
-		["desc"]="通关时，战斗中超过10连击X次"
+		["desc"]="通关时，战斗中超过10连击{0}次"
 	},
 	[4]={
-		["desc"]="通关时，战斗中超过连接8消X次"
+		["desc"]="通关时，战斗中超过连接8消{0}次"
 	},
 	[5]={
-		["desc"]="通关时某颜色元素英雄释放技能y次"
+		["desc"]="通关时{0}英雄释放技能{1}次"
 	},
 	[6]={
-		["desc"]="X回合内击败最终首领"
+		["desc"]="{0}回合内击败最终首领"
 	},
 	[7]={
-		["desc"]="通关时，某英雄造成伤害占比超过X%"
+		["desc"]="通关时，{0}造成伤害占比超过{1}%"
 	},
 	[8]={
-		["desc"]="通关时，某颜色元素英雄造成伤害占比超过X%"
+		["desc"]="通关时，{0}造成伤害占比超过{1}%"
 	}
 }
 local config = {
diff --git a/lua/app/config/strings/de/act_sevenday_quest.lua b/lua/app/config/strings/de/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/de/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/de/act_sevenday_quest.lua.meta b/lua/app/config/strings/de/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..5b221876
--- /dev/null
+++ b/lua/app/config/strings/de/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: cf1163060a9584e4592b7744e2a8786d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/en/act_sevenday_quest.lua b/lua/app/config/strings/en/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/en/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/en/act_sevenday_quest.lua.meta b/lua/app/config/strings/en/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..cf5ffcd7
--- /dev/null
+++ b/lua/app/config/strings/en/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 8d1f5600fa797854290ed1eca3ec3f45
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/fr/act_sevenday_quest.lua b/lua/app/config/strings/fr/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/fr/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/fr/act_sevenday_quest.lua.meta b/lua/app/config/strings/fr/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..b705dce1
--- /dev/null
+++ b/lua/app/config/strings/fr/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 4cf41c65b215c15449c21f07c6d9f107
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/id/act_sevenday_quest.lua b/lua/app/config/strings/id/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/id/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/id/act_sevenday_quest.lua.meta b/lua/app/config/strings/id/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..8206f688
--- /dev/null
+++ b/lua/app/config/strings/id/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: af7d69c396c5f0944aab0743e6e31421
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/ja/act_sevenday_quest.lua b/lua/app/config/strings/ja/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/ja/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ja/act_sevenday_quest.lua.meta b/lua/app/config/strings/ja/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..260222c0
--- /dev/null
+++ b/lua/app/config/strings/ja/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: f37241374b11a3e4e847398d7b2dab69
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/ko/act_sevenday_quest.lua b/lua/app/config/strings/ko/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/ko/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/ko/act_sevenday_quest.lua.meta b/lua/app/config/strings/ko/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..1e448bdd
--- /dev/null
+++ b/lua/app/config/strings/ko/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 06c613d9c819596448094903d121dcc7
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/pt/act_sevenday_quest.lua b/lua/app/config/strings/pt/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/pt/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/pt/act_sevenday_quest.lua.meta b/lua/app/config/strings/pt/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..f95ff33a
--- /dev/null
+++ b/lua/app/config/strings/pt/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3c0426add8f96b546ba4bd93c1fa3094
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/th/act_sevenday_quest.lua b/lua/app/config/strings/th/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/th/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/th/act_sevenday_quest.lua.meta b/lua/app/config/strings/th/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..6e9999b0
--- /dev/null
+++ b/lua/app/config/strings/th/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 33485f7fd33d3344f9dde1ea540435c6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/vi/act_sevenday_quest.lua b/lua/app/config/strings/vi/act_sevenday_quest.lua
new file mode 100644
index 00000000..0633327b
--- /dev/null
+++ b/lua/app/config/strings/vi/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	},
+	[4]={
+
+	},
+	[5]={
+
+	},
+	[6]={
+
+	},
+	[7]={
+
+	},
+	[8]={
+
+	},
+	[9]={
+
+	},
+	[10]={
+
+	},
+	[11]={
+
+	},
+	[12]={
+
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
+	},
+	[31]={
+
+	},
+	[32]={
+
+	},
+	[33]={
+
+	},
+	[34]={
+
+	},
+	[35]={
+
+	},
+	[36]={
+
+	},
+	[37]={
+
+	},
+	[38]={
+
+	},
+	[39]={
+
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[42]={
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
+	},
+	[48]={
+
+	},
+	[49]={
+
+	},
+	[50]={
+
+	},
+	[51]={
+
+	},
+	[52]={
+
+	},
+	[53]={
+
+	},
+	[54]={
+
+	},
+	[55]={
+
+	},
+	[56]={
+
+	},
+	[57]={
+
+	},
+	[58]={
+
+	},
+	[59]={
+
+	},
+	[60]={
+
+	},
+	[61]={
+
+	},
+	[62]={
+
+	},
+	[63]={
+
+	},
+	[64]={
+
+	},
+	[65]={
+
+	},
+	[66]={
+
+	},
+	[67]={
+
+	},
+	[68]={
+
+	},
+	[69]={
+
+	},
+	[70]={
+
+	},
+	[71]={
+
+	},
+	[72]={
+
+	},
+	[73]={
+
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/vi/act_sevenday_quest.lua.meta b/lua/app/config/strings/vi/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..fd5b07fe
--- /dev/null
+++ b/lua/app/config/strings/vi/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: ccd40ebad42aff14481fcc3a6501edd7
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/zh/act_sevenday_quest.lua b/lua/app/config/strings/zh/act_sevenday_quest.lua
new file mode 100644
index 00000000..40aed422
--- /dev/null
+++ b/lua/app/config/strings/zh/act_sevenday_quest.lua
@@ -0,0 +1,225 @@
+local act_sevenday_quest = {
+	[1]={
+		["desc"]="累计签到1天"
+	},
+	[2]={
+		["desc"]="通过主线章节2"
+	},
+	[3]={
+		["desc"]="开启1次普通宝箱"
+	},
+	[4]={
+		["desc"]="英雄最高等级达到3"
+	},
+	[5]={
+		["desc"]="拥有5个英雄"
+	},
+	[6]={
+		["desc"]="等级达到3"
+	},
+	[7]={
+		["desc"]="消耗体力50点"
+	},
+	[8]={
+		["desc"]="累计获取钻石50个"
+	},
+	[9]={
+		["desc"]="累计获取金币1000个"
+	},
+	[10]={
+		["desc"]="收看5次广告"
+	},
+	[11]={
+		["desc"]="累计签到2天"
+	},
+	[12]={
+		["desc"]="通过主线章节4"
+	},
+	[13]={
+		["desc"]="开启3次普通宝箱"
+	},
+	[14]={
+		["desc"]="英雄最高等级达到5"
+	},
+	[15]={
+		["desc"]="拥有7个英雄"
+	},
+	[16]={
+		["desc"]="等级达到7"
+	},
+	[17]={
+		["desc"]="消耗体力100点"
+	},
+	[18]={
+		["desc"]="累计获取钻石400个"
+	},
+	[19]={
+		["desc"]="累计获取金币3000个"
+	},
+	[20]={
+		["desc"]="收看10次广告"
+	},
+	[21]={
+		["desc"]="累计签到3天"
+	},
+	[22]={
+		["desc"]="通过主线章节6"
+	},
+	[23]={
+		["desc"]="开启1次精致宝箱"
+	},
+	[24]={
+		["desc"]="拥有9个英雄"
+	},
+	[25]={
+		["desc"]="等级达到10"
+	},
+	[26]={
+		["desc"]="消耗体力150点"
+	},
+	[27]={
+		["desc"]="累计获取钻石800个"
+	},
+	[28]={
+		["desc"]="累计获取金币6000个"
+	},
+	[29]={
+		["desc"]="战斗中连接6消100次"
+	},
+	[30]={
+		["desc"]="收看15次广告"
+	},
+	[31]={
+		["desc"]="累计签到4天"
+	},
+	[32]={
+		["desc"]="通过主线章节8"
+	},
+	[33]={
+		["desc"]="开启2次精致宝箱"
+	},
+	[34]={
+		["desc"]="英雄最高等级达到6"
+	},
+	[35]={
+		["desc"]="拥有11个英雄"
+	},
+	[36]={
+		["desc"]="等级达到13"
+	},
+	[37]={
+		["desc"]="消耗体力200点"
+	},
+	[38]={
+		["desc"]="累计获取钻石1000个"
+	},
+	[39]={
+		["desc"]="累计获取金币10000个"
+	},
+	[40]={
+		["desc"]="收看20次广告"
+	},
+	[41]={
+		["desc"]="累计签到5天"
+	},
+	[42]={
+		["desc"]="通过主线章节10"
+	},
+	[43]={
+		["desc"]="开启1次珍贵宝箱"
+	},
+	[44]={
+		["desc"]="英雄最高等级达到7"
+	},
+	[45]={
+		["desc"]="拥有13个英雄"
+	},
+	[46]={
+		["desc"]="等级达到16"
+	},
+	[47]={
+		["desc"]="消耗体力300点"
+	},
+	[48]={
+		["desc"]="累计获取钻石1500个"
+	},
+	[49]={
+		["desc"]="累计获取金币12000个"
+	},
+	[50]={
+		["desc"]="击杀小怪400个"
+	},
+	[51]={
+		["desc"]="收看25次广告"
+	},
+	[52]={
+		["desc"]="累计签到6天"
+	},
+	[53]={
+		["desc"]="通过主线章节12"
+	},
+	[54]={
+		["desc"]="开启3次精致宝箱"
+	},
+	[55]={
+		["desc"]="拥有15个英雄"
+	},
+	[56]={
+		["desc"]="等级达到18"
+	},
+	[57]={
+		["desc"]="消耗体力400点"
+	},
+	[58]={
+		["desc"]="累计获取钻石2000个"
+	},
+	[59]={
+		["desc"]="累计获取金币15000个"
+	},
+	[60]={
+		["desc"]="战斗中连接8消100次"
+	},
+	[61]={
+		["desc"]="收看30次广告"
+	},
+	[62]={
+		["desc"]="击杀首领150个"
+	},
+	[63]={
+		["desc"]="累计签到7天"
+	},
+	[64]={
+		["desc"]="通过主线章节14"
+	},
+	[65]={
+		["desc"]="开启2次珍贵宝箱"
+	},
+	[66]={
+		["desc"]="英雄最高等级达到8"
+	},
+	[67]={
+		["desc"]="拥有16个英雄"
+	},
+	[68]={
+		["desc"]="等级达到21"
+	},
+	[69]={
+		["desc"]="消耗体力500点"
+	},
+	[70]={
+		["desc"]="累计获取钻石3000个"
+	},
+	[71]={
+		["desc"]="累计获取金币20000个"
+	},
+	[72]={
+		["desc"]="战斗中连接10消40次"
+	},
+	[73]={
+		["desc"]="收看40次广告"
+	}
+}
+local config = {
+data=act_sevenday_quest,count=73
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/zh/act_sevenday_quest.lua.meta b/lua/app/config/strings/zh/act_sevenday_quest.lua.meta
new file mode 100644
index 00000000..6fb6f588
--- /dev/null
+++ b/lua/app/config/strings/zh/act_sevenday_quest.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: c4423273220b32a458415b29766e3a1e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua
index 6a26b946..9ece3038 100644
--- a/lua/app/global/global_const.lua
+++ b/lua/app/global/global_const.lua
@@ -188,6 +188,7 @@ GConst.ATLAS_PATH = {
 	SHOP = "assets/arts/atlas/ui/shop.asset",
 	HERO = "assets/arts/atlas/ui/hero.asset",
 	FUND = "assets/arts/atlas/ui/fund.asset",
+	SEVEN_DAY = "assets/arts/atlas/ui/sevenday.asset",
 }
 
 GConst.TOUCH_EVENT = {
diff --git a/lua/app/module/activity/seven_day/seven_day_manager.lua b/lua/app/module/activity/seven_day/seven_day_manager.lua
index 31e1c535..e74f83a2 100644
--- a/lua/app/module/activity/seven_day/seven_day_manager.lua
+++ b/lua/app/module/activity/seven_day/seven_day_manager.lua
@@ -4,62 +4,14 @@ function SevenDayManager:showUI()
     UIManager:showUI("app/ui/activity/seven_day/seven_day_ui")
 end
 
-function SevenDayManager:claimTask(ids)
-    if not DataManager.SevenDayData:getIsOpen() then
-        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_DESC))
-        return
-    end
-
-    local rewards = {}
-    local tasks = {}
-    local specialType = {}
-    local specialTypeCount = 0
-
-    for _, id in ipairs(ids) do
-        if DataManager.SevenDayData:taskCollected(id) then
-            return
-        end
-
-        if not DataManager.SevenDayData:canClaimTask(id) then
-            return
-        end
-
-        local taskType = ModuleManager.TaskManager:dealTaskType(DataManager.SevenDayData:getTaskType(id), nil, true)
-        if taskType then
-            specialType[taskType] = true
-            specialTypeCount = specialTypeCount + 1
-        end
-
-        table.insert(rewards, GFunc.getRewardTableByReward(DataManager.SevenDayData:getTaskReward(id)))
-        tasks[id] = {
-            id = id,
-            -- progress = DataManager.SevenDayData:taskTotalCount(id),
-            progress = DataManager.SevenDayData:taskCount(id),
-            claimed = true
-        }
-    end
-
-    local params = {ids = ids}
-    local responseData = {
-        rewards = rewards,
-        tasks = tasks,
-    }
-
-    if specialTypeCount > 0 then
-        for tasktype, b in pairs(specialType) do
-            ModuleManager.TaskManager:dealTaskType(tasktype, function()
-                specialTypeCount = specialTypeCount - 1
-                if specialTypeCount <= 0 then
-                    self:sendMessage(ProtoMsgType.FromMsgEnum.TaskTutorRewardReq, {}, {}, self.claimTaskFinish, BIReport.ITEM_GET_TYPE.TUTORIAL_TASK)
-                end
-            end)
-        end
-    else
-        self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayTaskRewardReq, params, responseData, self.claimTaskFinish, BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK)
-    end
+function SevenDayManager:claimTaskReward(id)
+    local args = {
+        ids = {id}
+	}
+	self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayTaskRewardReq, args, {}, self.onClaimTaskRewardFinish, BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK)
 end
 
-function SevenDayManager:claimTaskFinish(result)
+function SevenDayManager:onClaimTaskRewardFinish(result)
     if result.status == 0 then
         GFunc.showRewardBox(result.rewards)
         DataManager.SevenDayData:refreshTasks(result.tasks)
@@ -68,30 +20,19 @@ function SevenDayManager:claimTaskFinish(result)
 end
 
 function SevenDayManager:claimStepReward(id)
-    if not DataManager.SevenDayData:getIsOpen() then
-        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_DESC))
-        return
-    end
-
     if DataManager.SevenDayData:getStepCollected(id) then
         return
     end
-
     if not DataManager.SevenDayData:canClaimStepTask(id) then
         return
     end
-
-    local params = {id = id}
-    local responseData = {
-        rewards = {GFunc.getRewardTableByReward(DataManager.SevenDayData:getStepReward(id))},
-        Claimed = {
-            [id] = true
-        }
+    local params = {
+        id = id
     }
-    self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayRewardReq, params, responseData, self.claimStepRewardFinish, BIReport.ITEM_GET_TYPE.SEVEN_DAY_STEP_REWARD)
+    self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayRewardReq, params, {}, self.onClaimStepRewardFinish, BIReport.ITEM_GET_TYPE.SEVEN_DAY_STEP_REWARD)
 end
 
-function SevenDayManager:claimStepRewardFinish(result)
+function SevenDayManager:onClaimStepRewardFinish(result)
     if result.status == 0 then
         GFunc.showRewardBox(result.rewards)
         DataManager.SevenDayData:refreshClaimed(result.Claimed)
diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua
index 8c51ee7f..6aba1fdb 100644
--- a/lua/app/module/chapter/chapter_manager.lua
+++ b/lua/app/module/chapter/chapter_manager.lua
@@ -104,6 +104,7 @@ function ChapterManager:endFightFinish(result)
             end
             -- 章节通关 标记可弹出章节礼包
             DataManager.ShopData:markPopUpGiftForActChapterStore(newMaxChapter - 1)
+            ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER)
         end
 
         ModuleManager.TaskManager:addFightTaskProgress(reqData)
diff --git a/lua/app/module/gm/gm_const.lua b/lua/app/module/gm/gm_const.lua
index 8983f07b..c2b0bef8 100644
--- a/lua/app/module/gm/gm_const.lua
+++ b/lua/app/module/gm/gm_const.lua
@@ -73,6 +73,14 @@ arg1:邮件id
 Example: add_mail 1]],
 		type = "add_mail"
 	},
+	{
+		title = "触发任务",
+		desc = [[触发任务 type:trig_event
+arg1:任务类型
+arg2:任务参数
+Example: trig_event 22 5]],
+		type = "trig_event"
+	},
 }
 
 return GMConst
\ No newline at end of file
diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua
index c5617065..7016bf8d 100644
--- a/lua/app/module/login/login_manager.lua
+++ b/lua/app/module/login/login_manager.lua
@@ -160,7 +160,7 @@ function LoginManager:loginFinish(data)
 	end
 end
 
-function LoginManager:saveAuthArgs(name)
+function LoginManager:saveAuthArgs(isReconnect, name)
 	local args = LocalData:getLastLoginInfo()
 	if name then
 		args.type = NetManager.LOGIN_TYPE.ANONYMOUS
@@ -171,6 +171,7 @@ function LoginManager:saveAuthArgs(name)
 	end
 
 	args.client_info = self:getClientInfo()
+	args.reconnect = isReconnect
 	local sendQueue = LocalData:getSendQueue()
 	args.sync =
 	{
diff --git a/lua/app/module/login/login_ui.lua b/lua/app/module/login/login_ui.lua
index 84c0f597..70c1e556 100644
--- a/lua/app/module/login/login_ui.lua
+++ b/lua/app/module/login/login_ui.lua
@@ -60,7 +60,7 @@ function LoginUI:onLoadRootComplete()
 		end
 
 		self:refreshServerList(serverList)
-		ModuleManager.LoginManager:saveAuthArgs()
+		ModuleManager.LoginManager:saveAuthArgs(false)
 		ModuleManager.LoginManager:initSocket()
 
 		local info = LocalData:getLastLoginInfo()
diff --git a/lua/app/module/login/test_login_ui.lua b/lua/app/module/login/test_login_ui.lua
index 2d0c6985..dddb2844 100644
--- a/lua/app/module/login/test_login_ui.lua
+++ b/lua/app/module/login/test_login_ui.lua
@@ -78,7 +78,7 @@ function TestLoginUI:loginGame()
 	if name == "" then
 		name = nil
 	end
-	ModuleManager.LoginManager:saveAuthArgs(name)
+	ModuleManager.LoginManager:saveAuthArgs(false, name)
 	ModuleManager.LoginManager:initSocket()
 
 	self.uiMap["test_login_ui.login_node.login_btn"]:setTouchEnable(false)
diff --git a/lua/app/module/player/player_manager.lua b/lua/app/module/player/player_manager.lua
index e5915907..43195b26 100644
--- a/lua/app/module/player/player_manager.lua
+++ b/lua/app/module/player/player_manager.lua
@@ -15,8 +15,12 @@ end
 function PlayerManager:onLevelUpFinish(result)
 	if result.err_code == GConst.ERROR_STR.SUCCESS then
 		local currLv = DataManager.PlayerData:getLv()
+		local diffLv = result.level - currLv
 		DataManager.PlayerData:setLv(result.level, result.exp)
-		self:showPlayerUpUI(currLv, result.rewards)
+		if diffLv > 0 then
+			self:showPlayerUpUI(currLv, result.rewards)
+			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_PLAYER_LV_REACH, diffLv)
+		end
 	end
 end
 
diff --git a/lua/app/module/shop/shop_const.lua b/lua/app/module/shop/shop_const.lua
index af8609ea..02eee668 100644
--- a/lua/app/module/shop/shop_const.lua
+++ b/lua/app/module/shop/shop_const.lua
@@ -1,4 +1,4 @@
-local ShopConst = class("ShopConst", BaseModule)
+local ShopConst = {}
 
 ShopConst.BEGINNER_GIFT_ID = 40102 -- 新手礼包ID
 ShopConst.MAIN_UI_POP_TYPE = { -- 当触发弹窗时,相关联的类型礼包也要触发
diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua
index 1dc608a3..7f455710 100644
--- a/lua/app/module/shop/shop_manager.lua
+++ b/lua/app/module/shop/shop_manager.lua
@@ -32,6 +32,11 @@ function ShopManager:triggerCoinGiftPopUI(actId)
     self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId)
 end
 
+-- 触发成长礼包
+function ShopManager:triggerGrowUpGiftPopUI(actId)
+    self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, actId)
+end
+
 -- 购买每日特惠商品
 function ShopManager:buyMallDailyGift(id, isAd)
     if not DataManager.ShopData:getMallDailyIsOpen() then
@@ -164,4 +169,11 @@ function ShopManager:tryTriggerCoinGiftFinish(result)
     end
 end
 
+-- 推送成长礼包
+function ShopManager:onTriggerGrowUpGift(result)
+    DataManager.ShopData:onTriggerGrowUpGift(result.add_grow_up_gift)
+    -- 立即触发弹窗
+    self:triggerGrowUpGiftPopUI(result.add_grow_up_gift.current_grow_up_id)
+end
+
 return ShopManager
\ No newline at end of file
diff --git a/lua/app/module/summon/summon_const.lua b/lua/app/module/summon/summon_const.lua
index 9e11e300..2f0ab07c 100644
--- a/lua/app/module/summon/summon_const.lua
+++ b/lua/app/module/summon/summon_const.lua
@@ -1,4 +1,4 @@
-local SummonConst = class("SummonConst", BaseModule)
+local SummonConst = {}
 
 SummonConst.SUMMON_TYPE = {
     LV_1 = 1, 
diff --git a/lua/app/module/summon/summon_manager.lua b/lua/app/module/summon/summon_manager.lua
index d801b146..091759c6 100644
--- a/lua/app/module/summon/summon_manager.lua
+++ b/lua/app/module/summon/summon_manager.lua
@@ -30,7 +30,19 @@ function SummonManager:summonFinish(result)
     if result.err_code == GConst.ERROR_STR.SUCCESS then
         DataManager.SummonData:cacheSummonRewards(result.rewards) -- 缓存一下 防止有其他地方需要使用
         DataManager.SummonData:init(result.summon_info)
-        ModuleManager.ShopManager:showBoxOpenUI({type = result.reqData.type})
+
+        if result.reqData then
+            local summonType = result.reqData.type
+            ModuleManager.ShopManager:showBoxOpenUI({type = summonType})
+            -- 任务
+            if summonType == GConst.SummonConst.SUMMON_TYPE.LV_1 then
+                ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_1, 1)
+            elseif summonType == GConst.SummonConst.SUMMON_TYPE.LV_2 then
+                ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_2, 1)
+            elseif summonType == GConst.SummonConst.SUMMON_TYPE.LV_3 then
+                ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3, 1)
+            end
+        end
     end
 end
 
diff --git a/lua/app/module/task/task_const.lua b/lua/app/module/task/task_const.lua
index 4015d2f0..250e0537 100644
--- a/lua/app/module/task/task_const.lua
+++ b/lua/app/module/task/task_const.lua
@@ -6,8 +6,8 @@ TaskConst.TASK_TYPE = {
     X_GEM_GOT = 3,
     X_GOLD_COST = 4,
     X_GEM_COST = 5,
-    X_OPEN_SHOP_BOX = 6,
-    X_OPEN_SHOP_EPIC_BOX = 7,
+    X_OPEN_SHOP_BOX = 6,                                        -- 商城里的所有抽卡宝箱
+    X_OPEN_SHOP_BOX_LEVEL_3 = 7,                                -- 商城里的3级抽卡宝箱
     X_SKILL_BOX_GOT_IN_BATTLE = 8,
     X_BATTLE_VICTORY = 9,
     X_HERO_LV_UP = 10,
@@ -21,7 +21,15 @@ TaskConst.TASK_TYPE = {
     X_USE_SKILL = 18,
     X_BATTLE_PASS_WAVE = 19,
     COMPLETED_DALY_TASK = 20,
-    DAILY_TASK_WATCH_AD_SPECIAL = 21
+    DAILY_TASK_WATCH_AD_SPECIAL = 21,
+    X_LOGIN_DAY = 22,
+    X_PLAYER_LV_REACH = 23,
+    X_PASS_CHAPTER = 24,
+    X_HERO_MAX_LV_REACH = 25,                                   -- 英雄最高等级达到X级
+    X_VIT_COST = 26,                                            -- 消耗体力
+    X_NEW_HERO_GOT = 27,                                        -- 拥有X个英雄
+    X_OPEN_SHOP_BOX_LEVEL_1 = 28,                               -- 商城里的1级抽卡宝箱
+    X_OPEN_SHOP_BOX_LEVEL_2 = 29,                               -- 商城里的2级抽卡宝箱
 }
 
 return TaskConst
\ No newline at end of file
diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua
index 32d6a78c..ad54959e 100644
--- a/lua/app/module/task/task_manager.lua
+++ b/lua/app/module/task/task_manager.lua
@@ -180,8 +180,13 @@ function TaskManager:xBattleVictory()
     self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_BATTLE_VICTORY, 1)
 end
 
-function TaskManager:xHeroLvUp()
+function TaskManager:xHeroLvUp(level)
     self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_HERO_LV_UP, 1)
+    local maxLv = DataManager.TaskData:getMaxHeroLv()
+    if maxLv < level then
+        DataManager.TaskData:setMaxHeroLv(level)
+        self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH, level - maxLv)
+    end
 end
 
 function TaskManager:xHeroFragmentGot(count)
@@ -224,6 +229,45 @@ function TaskManager:xBattlePassWave(count)
     self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE, count)
 end
 
+function TaskManager:xLoginDay()
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_LOGIN_DAY, 1)
+end
+
+function TaskManager:xPlayerLvReach(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_PLAYER_LV_REACH, count)
+end
+
+function TaskManager:xPassChapter()
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER, 1)
+end
+
+function TaskManager:xHeroMaxLvReach(maxlv)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH, maxlv)
+end
+
+function TaskManager:xVitCost(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_VIT_COST, count)
+end
+
+function TaskManager:xNewHeroGot()
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_NEW_HERO_GOT, 1)
+end
+
+function TaskManager:xOpenShopBoxLevel1(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_1, count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX, count)
+end
+
+function TaskManager:xOpenShopBoxLevel2(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_2, count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX, count)
+end
+
+function TaskManager:xOpenShopBoxLevel3(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3, count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX, count)
+end
+
 ---- 没有特殊说明，方法均返回任务增量
 TaskManager.TYPE_DEAL_FUNC = {
     [GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd,
@@ -245,6 +289,14 @@ TaskManager.TYPE_DEAL_FUNC = {
     [GConst.TaskConst.TASK_TYPE.X_COMBO_TEN] = TaskManager.xComboTen,
     [GConst.TaskConst.TASK_TYPE.X_USE_SKILL] = TaskManager.xUseSkill,
     [GConst.TaskConst.TASK_TYPE.X_BATTLE_PASS_WAVE] = TaskManager.xBattlePassWave,
+    [GConst.TaskConst.TASK_TYPE.X_LOGIN_DAY] = TaskManager.xLoginDay,
+    [GConst.TaskConst.TASK_TYPE.X_PLAYER_LV_REACH] = TaskManager.xPlayerLvReach,
+    [GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER] = TaskManager.xPassChapter,
+    [GConst.TaskConst.TASK_TYPE.X_VIT_COST] = TaskManager.xVitCost,
+    [GConst.TaskConst.TASK_TYPE.X_NEW_HERO_GOT] = TaskManager.xNewHeroGot,
+    [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_1] = TaskManager.xOpenShopBoxLevel1,
+    [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_2] = TaskManager.xOpenShopBoxLevel2,
+    [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3] = TaskManager.xOpenShopBoxLevel3,
 }
 
 function TaskManager:taskGoto(taskType)
@@ -261,34 +313,6 @@ TaskManager.gotoFunc = {
     [GConst.TaskConst.TASK_TYPE.X_KILL_MONSTER] = TaskManager.gotoMainUI,
 }
 
-function TaskManager:getTaskDesc(type, count, totalCount)
-    local cfg = I18N:getConfig("task")[type]
-    if not cfg then
-        return GConst.EMPTY_STRING
-    end
-
-    local str = "(" .. count .. "/" .. totalCount .. ")"
-    return I18N:getText("task", type, "desc", str)
-end
-
-function TaskManager:getTaskTutorialDesc(type, count, totalCount)
-    local cfg = I18N:getConfig("task")[type]
-    if not cfg then
-        return GConst.EMPTY_STRING
-    end
-
-    local endStr
-    if count then
-        endStr = "(" .. count .. "/" .. totalCount .. ")"
-    else
-        endStr = "(" .. totalCount .. ")"
-    end
-
-    local str = I18N:getText("task", type, "tutorial_desc") .. endStr
-    return str
-end
-
-
 function TaskManager:dealTaskType(taskType, callback, onlyGet)
     if taskType == GConst.TaskConst.TASK_TYPE.X_KILL_MONSTER then
         if onlyGet then
diff --git a/lua/app/net/net_manager.lua b/lua/app/net/net_manager.lua
index c394122d..f4dbb5f4 100644
--- a/lua/app/net/net_manager.lua
+++ b/lua/app/net/net_manager.lua
@@ -227,12 +227,12 @@ function NetManager:connect(domain, port, callback, socketName)
                             return
                         end
                         LocalData:setLastLoginInfo(lastLoginType, params.id, params.token)
-                        ModuleManager.LoginManager:saveAuthArgs()
+                        ModuleManager.LoginManager:saveAuthArgs(true)
                         ModuleManager.LoginManager:initSocket()
                     end, loginType)
                 else
                     LocalData:setLastLoginInfo()
-                    ModuleManager.LoginManager:saveAuthArgs()
+                    ModuleManager.LoginManager:saveAuthArgs(true)
                     local params = {
                         content = I18N:getGlobalText(I18N.GlobalConst.DISCONNECT_RELOGIN),
                         okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua
index dcec8238..32f5544b 100644
--- a/lua/app/proto/proto_msg_type.lua
+++ b/lua/app/proto/proto_msg_type.lua
@@ -27,6 +27,8 @@ local ProtoMsgType = {
         [1068771132] = "ReconnectRsp",
         [1070841461] = "LoginReq",
         [1070843294] = "LoginRsp",
+        [1433352538] = "ChapterDailyChallengeResetReq",
+        [1433354371] = "ChapterDailyChallengeResetRsp",
         [1471116409] = "BindReq",
         [1471118242] = "BindRsp",
         [1584689751] = "ActPaidResultReq",
@@ -139,6 +141,8 @@ local ProtoMsgType = {
         ReconnectRsp = 1068771132,
         LoginReq = 1070841461,
         LoginRsp = 1070843294,
+        ChapterDailyChallengeResetReq = 1433352538,
+        ChapterDailyChallengeResetRsp = 1433354371,
         BindReq = 1471116409,
         BindRsp = 1471118242,
         ActPaidResultReq = 1584689751,
@@ -251,6 +255,8 @@ local ProtoMsgType = {
         ReconnectRsp = "ReconnectRsp",
         LoginReq = "LoginReq",
         LoginRsp = "LoginRsp",
+        ChapterDailyChallengeResetReq = "ChapterDailyChallengeResetReq",
+        ChapterDailyChallengeResetRsp = "ChapterDailyChallengeResetRsp",
         BindReq = "BindReq",
         BindRsp = "BindRsp",
         ActPaidResultReq = "ActPaidResultReq",
diff --git a/lua/app/ui/activity/seven_day/cell/task_cell.lua b/lua/app/ui/activity/seven_day/cell/task_cell.lua
index f0ffac86..59011440 100644
--- a/lua/app/ui/activity/seven_day/cell/task_cell.lua
+++ b/lua/app/ui/activity/seven_day/cell/task_cell.lua
@@ -1,11 +1,27 @@
 local TaskCell = class("TaskCell", BaseCell)
 
-local TIPS_ICON = {
-    "common_dec_9",
-    "common_dec_10"
-}
+function TaskCell:init()
+    local uiMap = self.baseObject:genAllChildren()
+    self.bg2 = uiMap["task_cell.bg.bg2"]
+    self.rewardCell = uiMap["task_cell.bg.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+    self.desc = uiMap["task_cell.bg.desc"]
+    self.sliderOver = uiMap["task_cell.bg.slider_bg.slider_over"]
+    self.sliderComp = uiMap["task_cell.bg.slider_bg.slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
+    self.sliderTx = uiMap["task_cell.bg.slider_bg.text"]
+    self.cliamBtn = uiMap["task_cell.bg.cliam_btn"]
+    self.cliamBtn:addClickListener(function()
+        if self.id and DataManager.SevenDayData:canClaimTask(self.id) then
+            ModuleManager.SevenDayManager:claimTaskReward(self.id)
+        end
+    end)
+    self.btnGreyImg = uiMap["task_cell.bg.cliam_btn.grey"]
+    self.mask = uiMap["task_cell.bg.mask"]
+    self.cliamBtnTx = uiMap["task_cell.bg.cliam_btn.text"]
+    uiMap["task_cell.bg.mask.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.STR_COMPLETED))
+end
 
-function TaskCell:refresh(id, idx, showAction)
+function TaskCell:refresh(id)
+    self.id = id
     local canClaimTask = DataManager.SevenDayData:canClaimTask(id)
     local collected = DataManager.SevenDayData:taskCollected(id)
     local count = DataManager.SevenDayData:taskCount(id)
@@ -13,96 +29,23 @@ function TaskCell:refresh(id, idx, showAction)
     if collected or count > totalCount then
         count = totalCount
     end
-    local isAdTask = false
     local reward = DataManager.SevenDayData:getTaskReward(id)
+    local taskDesc = DataManager.SevenDayData:getSevenDayTaskDesc(id)
+    self.desc:setText(taskDesc)
 
-    local uiMap = self:getUIMap()
-    local tipsIcon = uiMap["task_cell.bg.tips_icon"]
-    if canClaimTask or collected then
-        tipsIcon:setSprite(GConst.ATLAS_PATH.COMMON, TIPS_ICON[2])
-    else
-        tipsIcon:setSprite(GConst.ATLAS_PATH.COMMON, TIPS_ICON[1])
-    end
-    local desc = uiMap["task_cell.bg.desc"]
-    local progressStr = ModuleManager.TaskManager:getTaskDesc(DataManager.SevenDayData:getTaskType(id), count, totalCount)
-    desc:setText(progressStr)
-
-    local sliderOver = uiMap["task_cell.bg.slider_bg.slider_over"]
-    sliderOver:setVisible(count >= totalCount)
-
-    local sliderComp = uiMap["task_cell.bg.slider_bg.slider"]
-    sliderComp:setVisible(count < totalCount)
-    sliderComp:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = count / totalCount
-
-    if not self.rewardCell then
-        self.rewardCell = CellManager:addCellComp(uiMap["task_cell.bg.reward_cell"], GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
-    end
+    local isComplete = count >= totalCount
+    self.sliderOver:setVisible(isComplete)
+    self.bg2:setVisible(isComplete)
+    self.sliderComp.value = count / totalCount
     self.rewardCell:refreshByConfig(reward)
-    local claimBtn = uiMap["task_cell.bg.cliam_btn"]
-    claimBtn:addClickListener(function()
-        local list = DataManager.SevenDayData:getTaskListByDay(DataManager.SevenDayData:getTaskDay(id))
-        local ids = {}
-        for _, taskId in ipairs(list) do
-            if DataManager.SevenDayData:canClaimTask(taskId) then
-                table.insert(ids, taskId)
-            end
-        end
-        if not ids[1] then
-            return
-        end
-        ModuleManager.SevenDayManager:claimTask(ids)
-    end)
-
-    local claimAdIcon = uiMap["task_cell.bg.cliam_btn.icon"]
-    GFunc.setAdsSprite(claimAdIcon)
-    claimAdIcon:setVisible(isAdTask)
-
-    local claimBtntx = uiMap["task_cell.bg.cliam_btn.tx"]
-    if isAdTask then
-        claimBtntx:setText(GConst.EMPTY_STRING)
-    else
-        claimBtntx:setText(I18N:getGlobalText(I18N.GlobalConst.GET_REWARDS_1))
-    end
-
-    local greyBtn = uiMap["task_cell.bg.grey_btn"]
-    greyBtn:setVisible(not canClaimTask)
-
-    local greyAdIcon = uiMap["task_cell.bg.grey_btn.icon"]
-    GFunc.setAdsSprite(greyAdIcon, true)
-    greyAdIcon:setVisible(isAdTask)
-
-    local greyBtntx = uiMap["task_cell.bg.grey_btn.tx"]
-    if isAdTask then
-        greyBtntx:setText(GConst.EMPTY_STRING)
-    else
-        greyBtntx:setText(I18N:getGlobalText(I18N.GlobalConst.GET_REWARDS_1))
-    end
+    self.sliderTx:setText(count .. "/" .. totalCount)
 
+    self.btnGreyImg:setVisible(not canClaimTask)
+    self.mask:setVisible(collected)
     if collected then
-        greyAdIcon:setVisible(false)
-        greyBtntx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DONE))
-    end
-
-    local mask = uiMap["task_cell.bg.mask"]
-    mask:setVisible(collected)
-
-    local maskTips = uiMap["task_cell.bg.mask.tx"]
-    maskTips:setText(I18N:getGlobalText(I18N.GlobalConst.DAILY_TASK_DESC_2))
-
-    local overBg = uiMap["task_cell.bg.bg2"]
-    overBg:setVisible(count >= totalCount)
-
-    local bg = uiMap["task_cell.bg"]
-    if not bg.aniSeq then
-        if showAction then
-            if bg.aniSeq then
-                bg:setAnchoredPositionX(0)
-            else
-                GFunc.createListMoveXAction(bg, (idx - 1)*0.1, 720, -100, 0)
-            end
-        else
-            bg:setAnchoredPositionX(0)
-        end
+        self.cliamBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DONE))
+    else
+        self.cliamBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
     end
 end
 
diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua
index 11d7e23c..ff2aeddf 100644
--- a/lua/app/ui/activity/seven_day/seven_day_ui.lua
+++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua
@@ -6,11 +6,158 @@ function SevenDayUI:getPrefabPath()
     return "assets/prefabs/ui/activity/seven_day/seven_day_ui.prefab"
 end
 
-function SevenDayUI:ctor()
-    self.day = 1 -- 默认
+function SevenDayUI:getCurrencyParams()
+    if self.currencyParams == nil then
+        self.currencyParams = {
+            itemIds = {
+				GConst.ItemConst.ITEM_ID_GOLD,
+				GConst.ItemConst.ITEM_ID_GEM,
+				GConst.ItemConst.ITEM_ID_VIT,
+			},
+			showType = GConst.CURRENCY_TYPE.HORIZONTAL
+        }
+    end
+ 	return self.currencyParams
 end
 
-function SevenDayUI:srotTaskList(day)
+function SevenDayUI:ctor()
+    self.day = 1
+end
+
+function SevenDayUI:onLoadRootComplete()
+    self.uiMap = self.root:genAllChildren()
+    self:_display()
+    self:_bind()
+
+    self:scheduleGlobal(function()
+		self:updateTime()
+	end, 1)
+    self:updateTime()
+end
+
+function SevenDayUI:_display()
+    self.uiMap["seven_day_ui.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_TITLE))
+    self.uiMap["seven_day_ui.down.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_1))
+    self.uiMap["seven_day_ui.down.close_btn"]:addClickListener(function()
+        self:closeUI()
+    end)
+
+    self:initTop()
+    self:initTasks()
+end
+
+function SevenDayUI:initTop()
+    self.dayTextList = {}
+    self.stepObjs = {}
+    for i = 1, 7 do
+        self.dayTextList[i] = self.uiMap["seven_day_ui.day_bg.day_" .. i]
+        self.dayTextList[i]:setText(I18N:getGlobalText(I18N.GlobalConst.DAY_X, i))
+        self.dayTextList[i]:addClickListener(function()
+            if i > DataManager.SevenDayData:getActDay() then
+                GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAY_X_UNLOCK, i))
+                return
+            end
+            self.day = i
+            self:refreshDay()
+            self:refreshScrollRect()
+        end)
+
+        self.stepObjs[i] = {
+            icon = self.uiMap["seven_day_ui.slider_bg.icon_" .. i],
+            num = self.uiMap["seven_day_ui.slider_bg.num_" .. i],
+        }
+        self.stepObjs[i].icon:addClickListener(function()
+            local list = DataManager.SevenDayData:getStepRewardList()
+            local id = list[i]
+            if id then
+                if DataManager.SevenDayData:canClaimStepTask(id) then
+                    ModuleManager.SevenDayManager:claimStepReward(id)
+                else
+                    local reward = DataManager.SevenDayData:getStepReward(id)
+                    ModuleManager.TipsManager:showRewardTips(reward.id, reward.type, self.stepObjs[i].icon)
+                end
+            end
+        end)
+    end
+    self.finalBoxLight = self.uiMap["seven_day_ui.slider_bg.light_7"]
+    self.sevenDayDesc = self.uiMap["seven_day_ui.slider_bg.desc"]
+    self.sevenDaySliderComp = self.uiMap["seven_day_ui.slider_bg.slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
+    self.daySelectImg = self.uiMap["seven_day_ui.day_bg.day_select"]
+    self.timeTx = self.uiMap["seven_day_ui.title_bg.time"]
+    self.timeIcon = self.uiMap["seven_day_ui.title_bg.time_icon"]
+end
+
+function SevenDayUI:initTasks()
+    self.scrollRectComp = self.uiMap["seven_day_ui.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+    self.scrollRectComp:addInitCallback(function()
+		return TASK_CELL
+	end)
+	self.scrollRectComp:addRefreshCallback(function(index, cell)
+		cell:refresh(self.taskList[index])
+	end)
+    self.scrollRectComp:clearCells()
+    self.scrollRectComp:setTotalCount(0)
+end
+
+function SevenDayUI:_bind()
+    self:bind(DataManager.SevenDayData, "isDirty", function()
+        self:onRefresh()
+    end)
+end
+
+function SevenDayUI:onRefresh()
+    self:refreshDay()
+    self:refreshStepInfo()
+    self:refreshScrollRect()
+end
+
+function SevenDayUI:refreshDay()
+    local actDay = DataManager.SevenDayData:getActDay()
+    for i = 1, 7 do
+        if i == self.day then
+            self.daySelectImg:setAnchoredPositionX(self.dayTextList[i]:fastGetAnchoredPositionX())
+        end
+        if DataManager.SevenDayData:showRedPoint(i) and i <= actDay then
+            self.dayTextList[i]:addRedPoint(40, 26, 0.5)
+        else
+            self.dayTextList[i]:removeRedPoint()
+        end
+    end
+end
+
+function SevenDayUI:refreshStepInfo()
+    local list = DataManager.SevenDayData:getStepRewardList()
+    for index, objs in ipairs(self.stepObjs) do
+        local id = list[index]
+        if id then
+            objs.num:setText(DataManager.SevenDayData:getStepNum(id))
+            if index ~= 7 then
+                if DataManager.SevenDayData:stepOver(id) then
+                    objs.icon:setSprite(GConst.ATLAS_PATH.SEVEN_DAY, "sevenday_chest_1")
+                else
+                    objs.icon:setSprite(GConst.ATLAS_PATH.SEVEN_DAY, "sevenday_chest_2")
+                end
+            end
+        end
+    end
+
+    local count = DataManager.SevenDayData:getCollectedCount()
+    local totalCount = DataManager.SevenDayData:getTotalCount()
+    self.sevenDayDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_2, count, totalCount))
+    self.sevenDaySliderComp.value = count / totalCount
+end
+
+function SevenDayUI:refreshScrollRect()
+    self:sortTaskList(self.day)
+    if self.scrollRectComp:getTotalCount() ~= #self.taskList then -- 打开界面的时候定位到当前可领取的最低等级奖励，如果没有则定位到当前等级
+		self.scrollRectComp:clearCells()
+		self.scrollRectComp:refillCells(#self.taskList)
+	else
+		self.scrollRectComp:updateAllCell()
+	end
+end
+
+function SevenDayUI:sortTaskList(day)
     self.day = day
     self.taskList = DataManager.SevenDayData:getTaskListByDay(day or 1)
     table.sort(self.taskList, function(a, b)
@@ -34,182 +181,19 @@ function SevenDayUI:srotTaskList(day)
     end)
 end
 
-function SevenDayUI:onLoadRootComplete()
-    self:_display()
-    self:_addListeners()
-    self:_bind()
-
-    self.sid = self:scheduleGlobal(function()
-		self:updateTime()
-	end, 1)
-    self:updateTime()
-end
-
-function SevenDayUI:_display()
-    local uiMap = self.root:genAllChildren()
-    uiMap["seven_day_ui.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_1))
-    uiMap["seven_day_ui.img_3.btn_all.tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_4))
-    uiMap["seven_day_ui.img_3.tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_SEVENDAY_DESC))
-
-    local rect = uiMap["seven_day_ui.scrollrect"]:getRectSize()
-    self.maxVisibleCell = math.ceil(rect.height/120)
-
-    self:refreshDay()
-    self:refreshStepInfo()
-    self:refreshScrollRect()
-end
-
-function SevenDayUI:_addListeners()
-    local uiMap = self.root:genAllChildren()
-    uiMap["seven_day_ui.img_3.btn_close"]:addClickListener(function()
-        self:closeUI()
-    end)
-
-    uiMap["seven_day_ui.img_3.btn_all"]:addClickListener(function()
-        local list = DataManager.SevenDayData:getTaskListByDay(self.day or 1)
-        local ids = {}
-        for _, id in ipairs(list) do
-            if DataManager.SevenDayData:canClaimTask(id) then
-                table.insert(ids, id)
-            end
-        end
-        if not ids[1] then
-            return
-        end
-        ModuleManager.SevenDayManager:claimTask(ids)
-    end)
-
-    for i = 1, 7 do
-        local obj = uiMap["seven_day_ui.day_node.day_" .. i]
-        obj:addClickListener(function()
-            if i > DataManager.SevenDayData:getActDay() then
-                GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACT_SEVENDAY_DESC_1, i))
-                return
-            end
-            self.day = i
-            self:refreshDay()
-            self:refreshScrollRect()
-        end)
-    end
-end
-
-function SevenDayUI:_bind()
-    self:bind(DataManager.SevenDayData, "isDirty", function()
-        self:refreshDay()
-        self:refreshStepInfo()
-        self:refreshScrollRect()
-    end)
-end
-
-function SevenDayUI:refreshStepInfo()
-    local uiMap = self.root:genAllChildren()
-    local list = DataManager.SevenDayData:getStepRewardList()
-    if not self.stepObjs then
-        self.stepObjs = {}
-        for i = 1, 7 do
-            self.stepObjs[i] = {
-                icon = uiMap["seven_day_ui.total_node.icon_" .. i],
-                line = uiMap["seven_day_ui.total_node.line_" .. i],
-                lock = uiMap["seven_day_ui.total_node.lock_" .. i],
-                check = uiMap["seven_day_ui.total_node.check_" .. i],
-                num = uiMap["seven_day_ui.total_node.num_" .. i],
-                count = uiMap["seven_day_ui.total_node.count_" .. i],
-                light = uiMap["seven_day_ui.total_node.light_" .. i]
-            }
-        end
-    end
-
-    for index, objs in ipairs(self.stepObjs) do
-        local id = list[index]
-        if id then
-            local reward = DataManager.SevenDayData:getStepReward(id)
-            objs.icon:setSprite(ModuleManager.ItemManager:getItemIcon(reward.id))
-            objs.num:setText("")
-            objs.line:setVisible(DataManager.SevenDayData:stepOver(id))
-            objs.lock:setVisible(not DataManager.SevenDayData:stepOver(id))
-            objs.check:setVisible(DataManager.SevenDayData:getStepCollected(id))
-            objs.count:setText(DataManager.SevenDayData:getStepNum(id))
-            if DataManager.SevenDayData:canClaimStepTask(id) then
-                objs.icon:addClickListener(function()
-                    ModuleManager.SevenDayManager:claimStepReward(id)
-                end)
-                objs.light:setVisible(true)
-            else
-                objs.icon:addClickListener(function()
-                    ModuleManager.TipsManager:showRewardTips(reward.id, reward.type, objs.icon)
-                end)
-                objs.light:setVisible(false)
-            end
-
-        end
-    end
-
-    local desc = uiMap["seven_day_ui.total_node.desc"]
-    local check = uiMap["seven_day_ui.total_node.check"]
-    local count = DataManager.SevenDayData:getCollectedCount()
-    local totalCount = DataManager.SevenDayData:getTotalCount()
-    desc:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_3, count, totalCount))
-    GFunc.centerImgAndTx(check, desc, 9)
-
-    local slider = uiMap["seven_day_ui.total_node.slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
-    slider.value = count / totalCount
-end
-
-function SevenDayUI:refreshDay()
-    local uiMap = self.root:genAllChildren()
-    local highLight = uiMap["seven_day_ui.day_node.page_hl"]
-    local actDay = DataManager.SevenDayData:getActDay()
-    for i = 1, 7 do
-        local obj = uiMap["seven_day_ui.day_node.day_" .. i]
-        local dayStr = I18N:getGlobalText(I18N.GlobalConst.DAY_DESC1, i)
-        if i > actDay then
-            dayStr = string.format("<color=#BCB6B6>%s</color>", dayStr)
-        end
-        obj:setText(dayStr)
-        if i == self.day then
-            highLight:setAnchoredPositionX(obj:getAnchoredPosition().x)
-        end
-        if DataManager.SevenDayData:showRedPoint(i) and i <= actDay then
-            obj:addRedPoint(40, 26, 0.5)
-        else
-            obj:removeRedPoint()
-        end
-    end
-end
-
-function SevenDayUI:refreshScrollRect()
-    self:srotTaskList(self.day)
-    if self.scrollRect then
-        self.scrollRect:updateAllCell()
-        return
-    end
-
-    local uiMap = self.root:genAllChildren()
-    local scrollView = uiMap["seven_day_ui.scrollrect"]
-    self.scrollRect = scrollView:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
-    self.scrollRect:addInitCallback(function()
-		return TASK_CELL
-	end)
-	self.scrollRect:addRefreshCallback(function(index, cell)
-		cell:refresh(self.taskList[index], index, self.maxVisibleCell > 0)
-        self.maxVisibleCell = self.maxVisibleCell - 1
-	end)
-    self.scrollRect:clearCells()
-    self.scrollRect:refillCells(#self.taskList)
-end
-
 function SevenDayUI:updateTime()
-    local uiMap = self.root:genAllChildren()
-    local timeObj = uiMap["seven_day_ui.title_bg.time"]
     local endTime = DataManager.SevenDayData:getEndTime()
     local remainTime = endTime - Time:getServerTime()
-    local str
-    if remainTime > 0 then
-        str = I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_2, Time:formatNumTimeStr(remainTime))
+    if remainTime >= 0 then
+        self.timeTx:setText(GFunc.getTimeStr(remainTime))
+        local remainDay = remainTime // 86400
+        if self.remainDay ~= remainDay then
+            self.remainDay = remainDay
+            GFunc.centerImgAndTx(self.timeIcon, self.timeTx, 14)
+        end
     else
-        str = I18N:getGlobalText(I18N.GlobalConst.ADVENTURE_CLOSED)
+        self:closeUI()
     end
-    timeObj:setText(str)
 end
 
 return SevenDayUI
\ No newline at end of file
diff --git a/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua b/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua
index e4cd05b4..ab2ef947 100644
--- a/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua
+++ b/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua
@@ -2,7 +2,7 @@ local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell"
 local SideBarSevenDaysCell = class("SideBarSevenDaysCell", SideBarBaseCellComp)
 
 function SideBarSevenDaysCell:getIsOpen()
-    return true
+    return DataManager.SevenDayData:getIsOpen()
 end
 
 function SideBarSevenDaysCell:getIconRes()
@@ -10,7 +10,33 @@ function SideBarSevenDaysCell:getIconRes()
 end
 
 function SideBarSevenDaysCell:onClick()
-    
+    ModuleManager.SevenDayManager:showUI()
+end
+
+function SideBarSevenDaysCell:getIsShowRedPoint()
+    return DataManager.SevenDayData:showRedPoint()
+end
+
+function SideBarSevenDaysCell:onRefresh()
+    self.timeBg:setVisible(true)
+    self:_refreshTime()
+end
+
+function SideBarSevenDaysCell:updateTime()
+    if self:getIsOpen() then
+        self:_refreshTime()
+    else
+        self:closeBtn()
+    end
+end
+
+function SideBarSevenDaysCell:_refreshTime()
+    local remainTime = DataManager.SevenDayData:getEndTime() - Time:getServerTime()
+    if remainTime >= 0 then
+        self.timeTx:setText(GFunc.getTimeStr(remainTime))
+    else
+        self.timeTx:setText("00:00:00")
+    end
 end
 
 return SideBarSevenDaysCell
\ No newline at end of file
diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index c0acd0e3..b05b8c17 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -695,9 +695,9 @@ function MainCityUI:setLeftSideBarArrowRedPoint(isShow)
     end
     if isShow then
         if ModuleManager.MaincityManager:getIsMainCityLeftSideBarClose() then
-            self.leftArrowBtn:removeRedPoint()
-        else
             self.leftArrowBtn:addRedPoint()
+        else
+            self.leftArrowBtn:removeRedPoint()
         end
     else
         self.leftArrowBtn:removeRedPoint()
@@ -710,9 +710,9 @@ function MainCityUI:setRightSideBarArrowRedPoint(isShow)
     end
     if isShow then
         if ModuleManager.MaincityManager:getIsMainCityRightSideBarClose() then
-            self.rightArrowBtn:removeRedPoint()
-        else
             self.rightArrowBtn:addRedPoint()
+        else
+            self.rightArrowBtn:removeRedPoint()
         end
     else
         self.rightArrowBtn:removeRedPoint()
@@ -849,6 +849,12 @@ function MainCityUI:checkGift()
         
         return true
     end
+    -- 特殊的 成长礼包
+    local popUpGift = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT)
+    if popUpGift and #popUpGift > 0 then
+        ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, popUpGift[1])
+        return true
+    end
 end
 
 return MainCityUI
\ No newline at end of file
diff --git a/lua/app/ui/shop/cell/beginner_sell_cell.lua b/lua/app/ui/shop/cell/beginner_sell_cell.lua
index de630864..d0674590 100644
--- a/lua/app/ui/shop/cell/beginner_sell_cell.lua
+++ b/lua/app/ui/shop/cell/beginner_sell_cell.lua
@@ -36,6 +36,8 @@ function BeginnerSellCell:init()
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
+
+    self.clickArea = uiMap["gift_cell.bg.click_area"]
 end
 
 function BeginnerSellCell:refresh()
@@ -77,7 +79,7 @@ function BeginnerSellCell:refresh()
     -- 限时(隐藏)
     self.timeImg:setVisible(false)
 
-    self:addClickListener(function()
+    self.clickArea:addClickListener(function()
         self:onClickGift(actGiftId)
     end)
 end
diff --git a/lua/app/ui/shop/cell/chapter_cell.lua b/lua/app/ui/shop/cell/chapter_cell.lua
index fb9ca3b9..ceb58a85 100644
--- a/lua/app/ui/shop/cell/chapter_cell.lua
+++ b/lua/app/ui/shop/cell/chapter_cell.lua
@@ -37,6 +37,8 @@ function ChapterCell:init()
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
+
+    self.clickArea = uiMap["gift_cell.bg.click_area"]
 end
 
 function ChapterCell:refresh(idx, cfgInfo, totalCount, arrowCallback)
@@ -53,10 +55,14 @@ function ChapterCell:refresh(idx, cfgInfo, totalCount, arrowCallback)
     self.rightArrow:setVisible(showRightArrow)
 
 	self.leftArrow:addClickListener(function()
-        arrowCallback(1)
+        if idx > 1 then
+            arrowCallback(1)
+        end
     end)
     self.rightArrow:addClickListener(function()
-        arrowCallback(-1)
+        if idx < totalCount then
+            arrowCallback(-1)
+        end
     end)
     -- 超值
     self.offText:setText(tostring(cfgInfo.value * 100) .. "%")
@@ -90,7 +96,7 @@ function ChapterCell:refresh(idx, cfgInfo, totalCount, arrowCallback)
     -- 限时(隐藏)
     self.timeImg:setVisible(false)
 
-    self:addClickListener(function()
+    self.clickArea:addClickListener(function()
         self:onClickGift(cfgInfo.id)
     end)
 end
diff --git a/lua/app/ui/shop/cell/coin_sell_cell.lua b/lua/app/ui/shop/cell/coin_sell_cell.lua
index f71a6c01..914eb2be 100644
--- a/lua/app/ui/shop/cell/coin_sell_cell.lua
+++ b/lua/app/ui/shop/cell/coin_sell_cell.lua
@@ -36,6 +36,8 @@ function CoinSellCell:init()
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
+
+    self.clickArea = uiMap["gift_cell.bg.click_area"]
 end
 
 function CoinSellCell:refresh()
@@ -74,7 +76,7 @@ function CoinSellCell:refresh()
         self.timeImg:setVisible(true)
         self:refreshTime()
 
-        self:addClickListener(function()
+        self.clickArea:addClickListener(function()
             self:onClickGift(actGiftId)
         end)
     end
diff --git a/lua/app/ui/shop/cell/grow_cell.lua b/lua/app/ui/shop/cell/grow_cell.lua
index 4d971015..6abd2af5 100644
--- a/lua/app/ui/shop/cell/grow_cell.lua
+++ b/lua/app/ui/shop/cell/grow_cell.lua
@@ -35,9 +35,14 @@ function GrowCell:init()
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
+
+    self.clickArea = uiMap["gift_cell.bg.click_area"]
 end
 
-function GrowCell:refresh(idx, cfgInfo, clickCallback)
+function GrowCell:refresh(idx, gift)
+    self.gift = gift
+    self.actId = gift.current_grow_up_id
+    local cfgInfo = DataManager.ShopData:getActGrowUpGiftConfig()[self.actId]
     -- 超值
     self.offText:setText(tostring(cfgInfo.value) .. "%")
     -- 限购
@@ -68,22 +73,30 @@ function GrowCell:refresh(idx, cfgInfo, clickCallback)
     self.priceText2:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
     -- 限时
     self.timeImg:setVisible(true)
-    self:updateTime()
+    self:refreshTime()
 
-    if clickCallback then
-        self:addClickListener(function()
-            clickCallback(cfgInfo.id)
-        end)
-    end
+    self.clickArea:addClickListener(function()
+        self:onClickGift(self.actId)
+    end)
 end
 
 function GrowCell:setVisible(visible)
 	self.baseObject:setVisible(visible)
 end
 
-function GrowCell:updateTime()
-    local leftTime = 3600 -- 数据结构暂无 临时测试 TODOJ
-    self.timeText:setText(Time:formatNumTimeStr(leftTime))
+function GrowCell:refreshTime()
+    local remainTime = 0
+    local cfgInfo = DataManager.ShopData:getActGrowUpGiftConfig()[self.actId]
+    local triggerTime = self.gift.trigger_at // 1000
+    remainTime = triggerTime + (cfgInfo.limit_time or 0) * 3600 - Time:getServerTime()
+    if remainTime <= 0 then
+        remainTime = 0
+    end
+    self.timeText:setText(Time:formatNumTimeStr(remainTime))
+end
+
+function GrowCell:onClickGift(id)
+    PayManager:purchasePackage(id, PayManager.PURCHARSE_TYPE.GROW_UP_GIFT)
 end
 
 return GrowCell
\ No newline at end of file
diff --git a/lua/app/ui/shop/cell/grow_sell_cell.lua b/lua/app/ui/shop/cell/grow_sell_cell.lua
index 546f3879..6c461618 100644
--- a/lua/app/ui/shop/cell/grow_sell_cell.lua
+++ b/lua/app/ui/shop/cell/grow_sell_cell.lua
@@ -11,10 +11,8 @@ function GrowSellCell:init()
         return GROW_CELL
     end)
     self.scrollRect:addRefreshCallback(function(idx, cell)
-        if self.actGrowUpGiftCfg and self.actGrowUpGiftCfg[idx] then
-            cell:refresh(idx, self.actGrowUpGiftCfg[idx], function()
-                self:onClickGift(self.actGrowUpGiftCfg[idx].id)
-            end)
+        if self.actGifts and self.actGifts[idx] then
+            cell:refresh(idx, self.actGifts[idx])
         end
     end)
     self.scrollRect:clearCells()
@@ -23,36 +21,35 @@ function GrowSellCell:init()
 end
 
 function GrowSellCell:refresh()
-    -- 暂无数据部分 测试用 TODOJ
-    local tmpIds = {1014, 2014} 
-    self.actGrowUpGiftCfg = {}
-    local actGrowUpGiftCfg = ConfigManager:getConfig("act_growup_gift")
-    for i = 1, #tmpIds do
-        local cfgInfo = clone(actGrowUpGiftCfg[tmpIds[i]]) 
-        cfgInfo.id = tmpIds[i]
-        table.insert(self.actGrowUpGiftCfg, cfgInfo)
-    end
-    self.scrollRect:refillCells(#self.actGrowUpGiftCfg)
+    self.actGifts = DataManager.ShopData:getValidGrowUpGifts()
+    self.scrollRect:refillCells(#self.actGifts)
 
     self:getBaseObject():setSizeDeltaY(self:getCellHeight())
     self.scrollRectObj:setSizeDeltaY(self:getCellHeight())
 end
 
+function GrowSellCell:refreshTime()
+    if self.scrollRect then
+        if self.curCellCount ~= #self.actGifts then
+            self.curCellCount = self.actGifts 
+            self:refresh()
+        else
+            self.scrollRect:refreshAll()
+        end
+    end
+end
+
 function GrowSellCell:getCellHeight()
-    local cellCount = self.actGrowUpGiftCfg and #self.actGrowUpGiftCfg or 0
+    local cellCount = self.actGifts and #self.actGifts or 0
 	return BASE_CELL_HEIGHT * cellCount
 end
 
 function GrowSellCell:getIsOpen()
-	return false -- true -- TOODJ
+	return #DataManager.ShopData:getValidGrowUpGifts() > 0
 end
 
 function GrowSellCell:setVisible(visible)
 	self.baseObject:setVisible(visible)
 end
 
-function GrowSellCell:onClickGift(id)
-    Logger.logHighlight("Click id:%s", id) -- TODOJ
-end
-
 return GrowSellCell
\ No newline at end of file
diff --git a/lua/app/ui/shop/cell/level_cell.lua b/lua/app/ui/shop/cell/level_cell.lua
index b515aa53..95f716e0 100644
--- a/lua/app/ui/shop/cell/level_cell.lua
+++ b/lua/app/ui/shop/cell/level_cell.lua
@@ -35,6 +35,8 @@ function LevelCell:init()
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
+
+    self.clickArea = uiMap["gift_cell.bg.click_area"]
 end
 
 function LevelCell:refresh(idx, cfgInfo, clickCallback)
@@ -69,7 +71,7 @@ function LevelCell:refresh(idx, cfgInfo, clickCallback)
     -- 限时(隐藏)
     self.timeImg:setVisible(false)
 
-    self:addClickListener(function()
+    self.clickArea:addClickListener(function()
         self:onClickGift(cfgInfo.id)
     end)
 end
diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua
index 9857c44c..a3f02793 100644
--- a/lua/app/ui/shop/gift_pop_ui.lua
+++ b/lua/app/ui/shop/gift_pop_ui.lua
@@ -7,6 +7,7 @@ local GIFT_BG_NAME = {
         [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png", -- TODOJ
     },
 	[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
 }
 local GIFT_TITLE_TEXT = {
     [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
@@ -15,6 +16,7 @@ local GIFT_TITLE_TEXT = {
         [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "助力礼包TD", -- TODOJ
     },
     [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "章节礼包TD", -- TODOJ
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "成长礼包TD", -- TODOJ
 }
 
 local MAX_ITEM_NUM = 4
@@ -96,9 +98,6 @@ function GiftPopUI:refresh(needCheck)
             return
         end
     end
-
-    Logger.logHighlight("refresh -- type:%s  id:%s", self.actType, self.actId)
-
     if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then
         local type = PayManager:getGiftConfigInfo(self.actType, self.actId).type
         self.titleTx:setText(GIFT_TITLE_TEXT[self.actType][type])
diff --git a/lua/app/ui/shop/shop_comp.lua b/lua/app/ui/shop/shop_comp.lua
index 9bc3d06d..c96e151f 100644
--- a/lua/app/ui/shop/shop_comp.lua
+++ b/lua/app/ui/shop/shop_comp.lua
@@ -141,6 +141,9 @@ function ShopComp:refreshTime()
 	if self.coinSellCell and self.coinSellCell:getIsOpen() then
 		self.coinSellCell:refreshTime()
 	end
+	if self.growSellCell and self.growSellCell:getIsOpen() then
+		self.growSellCell:refreshTime()
+	end
 end
 
 function ShopComp:refreshDiscountPage()
diff --git a/lua/app/userdata/activity/seven_day/seven_day_data.lua b/lua/app/userdata/activity/seven_day/seven_day_data.lua
index 24694cfa..09b072df 100644
--- a/lua/app/userdata/activity/seven_day/seven_day_data.lua
+++ b/lua/app/userdata/activity/seven_day/seven_day_data.lua
@@ -1,62 +1,5 @@
 local SevenDayData = class("SevenDayData", BaseData)
 
-local TASK_CFG = ConfigManager:getConfig("act_sevenday_quest")
-local TASK_REWARD_CFG = ConfigManager:getConfig("act_sevenday_quest_reward")
-local TASK_MAX_COUNT = ConfigManager:getConfigNum("act_sevenday_quest")
-local TASK_REWARD_MAX_COUNT = ConfigManager:getConfigNum("act_sevenday_quest_reward")
-
-function SevenDayData:getBg()
-    return "assets/arts/textures/background/activity/activity_dec_1.png"
-end
-
-function SevenDayData:getTitleBg()
-    return "common_menu_bg_2"
-end
-
-function SevenDayData:getTitleIcon()
-    return "activity_dec_1"
-end
-
-function SevenDayData:getTitle()
-    return I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_1)
-end
-
-function SevenDayData:showTimeNode()
-    return true
-end
-
-function SevenDayData:getTimeStr()
-    local str
-    local time = self.endTime - Time:getServerTime()
-    if time > 0 then
-        str = Time:formatNumTime(time)
-    else
-        str = I18N:getGlobalText(I18N.GlobalConst.ACT_OVER_DESC)
-    end
-    return str
-end
-
-function SevenDayData:getRp()
-    return self:showRedPoint()
-end
-
-function SevenDayData:gotoBtnFunc()
-    ModuleManager.SevenDayManager:showUI()
-end
-
-function SevenDayData:getIsOpen()
-    local nowTime = Time:getServerTime()
-    if self.endTime < nowTime or self.openTs > nowTime then
-        return false
-    end
-
-    if self.collectTaskCount >= TASK_MAX_COUNT and self.collectStepCount > TASK_REWARD_MAX_COUNT then
-        return false
-    end
-
-    return true
-end
-
 function SevenDayData:ctor()
     self:clear()
 end
@@ -73,15 +16,20 @@ function SevenDayData:clear()
 end
 
 function SevenDayData:init(data)
-    data = data or {}
+    data = data or GConst.EMPTY_TABLE
     self.openTs = GFunc.formatTimeStep(data.open_day_ts)
-    self.endTime = self.openTs
-    if self.openTs > 0 then
+    if self.openTs and self.openTs > 0 then
+        self.openTs = self.openTs - self.openTs % 86400
         self.endTime = self.openTs + self:getDurationTime()
+    else
+        self.openTs = 0
+        self.endTime = self.openTs
     end
     self.tasks = data.tasks or {}
-    self.stepRewards = data.Claimed or {}
-    self.actDay = data.login_day or 1
+    self.stepRewards = data.claimed or {}
+
+    local today = Time:getBeginningOfServerToday()
+    self.actDay = (today - self.openTs) // 86400 + 1
 
     self:calCollectTaskCount()
     self:initTaskListener()
@@ -92,9 +40,23 @@ function SevenDayData:init(data)
     end)
 end
 
+function SevenDayData:getIsOpen()
+    if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then
+        return false
+    end
+    local nowTime = Time:getServerTime()
+    if self.endTime < nowTime or self.openTs > nowTime then
+        return false
+    end
+    if self.collectTaskCount >= self:getSevenDayTaskMaxCount() and self.collectStepCount >= self:getSevenDayRewardMaxCount() then
+        return false
+    end
+    return true
+end
+
 function SevenDayData:getDurationTime()
     if not self.durationTime then
-        self.durationTime = GFunc.getConstIntValue("seven_day_time") * 86400
+        self.durationTime = GFunc.getConstIntValue("act_sevenday_time") * 86400
     end
     return self.durationTime
 end
@@ -148,16 +110,44 @@ function SevenDayData:setDirty()
     self.data.isDirty = not self.data.isDirty
 end
 
+function SevenDayData:getSevenDayTaskCfg()
+    if self.sevenDayTaskCfg == nil then
+        self.sevenDayTaskCfg = ConfigManager:getConfig("act_sevenday_quest")
+    end
+    return self.sevenDayTaskCfg
+end
+
+function SevenDayData:getSevenDayTaskMaxCount()
+    if self.sevenDayTaskMaxCount == nil then
+        self.sevenDayTaskMaxCount = ConfigManager:getConfigNum("act_sevenday_quest")
+    end
+    return self.sevenDayTaskMaxCount
+end
+
+function SevenDayData:getSevenDayRewardCfg()
+    if self.sevenDayRewardCfg == nil then
+        self.sevenDayRewardCfg = ConfigManager:getConfig("act_sevenday_quest_reward")
+    end
+    return self.sevenDayRewardCfg
+end
+
+function SevenDayData:getSevenDayRewardMaxCount()
+    if self.sevenDayRewardMaxCount == nil then
+        self.sevenDayRewardMaxCount = ConfigManager:getConfigNum("act_sevenday_quest_reward")
+    end
+    return self.sevenDayRewardMaxCount
+end
+
 function SevenDayData:calCollectTaskCount()
     self.collectTaskCount = 0
-    for id, info in ipairs(TASK_CFG) do
+    for id, info in ipairs(self:getSevenDayTaskCfg()) do
         if self:taskCollected(id) then
             self.collectTaskCount = self.collectTaskCount + 1
         end
     end
 
     self.collectStepCount = 0
-    for id, info in ipairs(TASK_REWARD_CFG) do
+    for id, info in ipairs(self:getSevenDayRewardCfg()) do
         if self:getStepCollected(id) then
             self.collectStepCount = self.collectStepCount + 1
         end
@@ -167,7 +157,7 @@ end
 function SevenDayData:getTaskListByDay(day)
     if not self.taskList then
         self.taskList = {}
-        for id, info in ipairs(TASK_CFG) do
+        for id, info in ipairs(self:getSevenDayTaskCfg()) do
             if not self.taskList[info.day] then
                 self.taskList[info.day] = {}
             end
@@ -180,7 +170,7 @@ end
 function SevenDayData:getStepRewardList()
     if not self.stepRewardList then
         self.stepRewardList = {}
-        for id, info in ipairs(TASK_REWARD_CFG) do
+        for id, info in ipairs(self:getSevenDayRewardCfg()) do
             table.insert(self.stepRewardList, id)
         end
     end
@@ -217,7 +207,7 @@ function SevenDayData:taskCount(id)
 end
 
 function SevenDayData:taskTotalCount(id)
-    local cfg = TASK_CFG[id]
+    local cfg = self:getSevenDayTaskCfg()[id]
     if not cfg then
         return 1 -- 防止除法报错
     end
@@ -225,7 +215,7 @@ function SevenDayData:taskTotalCount(id)
 end
 
 function SevenDayData:getTaskReward(id)
-    local cfg = TASK_CFG[id]
+    local cfg = self:getSevenDayTaskCfg()[id]
     if not cfg then
         return
     end
@@ -233,7 +223,7 @@ function SevenDayData:getTaskReward(id)
 end
 
 function SevenDayData:getTaskDay(id)
-    local cfg = TASK_CFG[id]
+    local cfg = self:getSevenDayTaskCfg()[id]
     if not cfg then
         return 1
     end
@@ -241,7 +231,7 @@ function SevenDayData:getTaskDay(id)
 end
 
 function SevenDayData:getTaskType(id)
-    local cfg = TASK_CFG[id]
+    local cfg = self:getSevenDayTaskCfg()[id]
     if not cfg then
         return
     end
@@ -249,7 +239,7 @@ function SevenDayData:getTaskType(id)
 end
 
 function SevenDayData:getTaskDayLimit(id)
-    local cfg = TASK_CFG[id]
+    local cfg = self:getSevenDayTaskCfg()[id]
     if not cfg or not cfg.count_type then
         return
     end
@@ -259,7 +249,7 @@ end
 function SevenDayData:getTaskListByType(taskType)
     if not self.taskTypeMap then
         self.taskTypeMap = {}
-        for id, info in ipairs(TASK_CFG) do
+        for id, info in ipairs(self:getSevenDayTaskCfg()) do
             if not self.taskTypeMap[info.type] then
                 self.taskTypeMap[info.type] = {}
             end
@@ -271,9 +261,6 @@ function SevenDayData:getTaskListByType(taskType)
 end
 
 function SevenDayData:addTaskProgress(id, count)
-    if not self:getIsOpen() then
-        return
-    end
     local dayLimit = self:getTaskDayLimit(id)
     if dayLimit and dayLimit > self:getActDay() then
         return
@@ -282,21 +269,6 @@ function SevenDayData:addTaskProgress(id, count)
     self:setDirty()
 end
 
-function SevenDayData:setTaskProgress(id, count)
-    if not self:getIsOpen() then
-        return
-    end
-    local dayLimit = self:getTaskDayLimit(id)
-    if dayLimit and dayLimit > self:getActDay() then
-        return
-    end
-    if self:getTaskInfo(id).progress > count then
-        return
-    end
-    self:getTaskInfo(id).progress = count
-    self:setDirty()
-end
-
 function SevenDayData:canClaimTask(id)
     if self:taskCollected(id) then
         return false
@@ -306,7 +278,7 @@ function SevenDayData:canClaimTask(id)
 end
 
 function SevenDayData:getStepNum(id)
-    local cfg = TASK_REWARD_CFG[id]
+    local cfg = self:getSevenDayRewardCfg()[id]
     if not cfg then
         return 1 -- 防止除法为0
     end
@@ -318,7 +290,7 @@ function SevenDayData:getStepCollected(id)
 end
 
 function SevenDayData:getStepReward(id)
-    local cfg = TASK_REWARD_CFG[id]
+    local cfg = self:getSevenDayRewardCfg()[id]
     if not cfg then
         return
     end
@@ -348,7 +320,7 @@ function SevenDayData:showRedPoint(day)
     else
         local day = self:getActDay()
         for id, info in pairs(self.tasks) do
-            local cfg = TASK_CFG[id]
+            local cfg = self:getSevenDayTaskCfg()[id]
             if cfg and cfg.day <= day then
                 if self:canClaimTask(id) then
                     return true
@@ -367,7 +339,44 @@ function SevenDayData:showRedPoint(day)
     return false
 end
 
+function SevenDayData:getSevenDayTaskI18NCfg()
+    if self.sevenDayTaskI18NCfg == nil then
+		self.sevenDayTaskI18NCfg = I18N:getConfig("act_sevenday_quest")
+	end
+	return self.sevenDayTaskI18NCfg
+end
+
+function SevenDayData:getSevenDayTaskDesc(id)
+	local cfg = self:getSevenDayTaskI18NCfg()
+    if cfg == nil then
+        return GConst.EMPTY_STRING
+    end
+	return cfg[id].desc
+end
+
 function SevenDayData:initTaskListener()
+    local nowTime = Time:getServerTime()
+    -- 活动结束就不用监听了
+    if self.endTime < nowTime then
+        return false
+    end
+    -- 完成了就不用监听了
+    if self.collectTaskCount >= self:getSevenDayTaskMaxCount() and self.collectStepCount >= self:getSevenDayRewardMaxCount() then
+        return false
+    end
+
+    local cfg = self:getSevenDayTaskCfg()
+    for _, v in ipairs(cfg) do
+        local taskType = v.type
+        ModuleManager.TaskManager:registerTask("SevenDayData", taskType, function(count)
+            local list = self:getTaskListByType(taskType)
+            if #list > 0 then
+                for _, id in ipairs(list) do
+                    self:addTaskProgress(id, count)
+                end
+            end
+        end)
+    end
 end
 
 return SevenDayData
\ No newline at end of file
diff --git a/lua/app/userdata/bag/item_data.lua b/lua/app/userdata/bag/item_data.lua
index 77af1c82..19fde936 100644
--- a/lua/app/userdata/bag/item_data.lua
+++ b/lua/app/userdata/bag/item_data.lua
@@ -154,6 +154,7 @@ function ItemData:addItem(data, itemGetType)
 		CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd("user_gold", data.count)
 	elseif data.id == GConst.ItemConst.ITEM_ID_VIT then
 		if data.count < 0 then
+			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_VIT_COST, -data.count)
 			BIReport:postVitUse(data.count)
 		else
 			BIReport:postVitGet(data.count, itemGetType)
diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua
index 5a0846c7..f397a7c5 100644
--- a/lua/app/userdata/hero/hero_data.lua
+++ b/lua/app/userdata/hero/hero_data.lua
@@ -6,6 +6,7 @@ function HeroData:ctor()
 	self.data.activeCount = 0
 	self.data.isDirty = false
 	self.matchActiveHeroMap = {}
+	self.maxHeroLvOnInit = 0
 end
 
 function HeroData:clear()
@@ -17,6 +18,9 @@ function HeroData:init(data)
 	if data then
 		for id, heroInfo in pairs(data) do
 			self:addHero(heroInfo.id, heroInfo.level)
+			if self.maxHeroLvOnInit < heroInfo.level then
+				self.maxHeroLvOnInit = heroInfo.level
+			end
 		end
 	end
 
@@ -85,6 +89,7 @@ function HeroData:setHeroLv(id, lv)
 	local entity = self:getHeroById(id)
 	if not entity:isActived() then
 		self.data.activeCount = self.data.activeCount + 1
+		ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_NEW_HERO_GOT)
 	end
 	entity:setLv(lv)
 	if entity:isActived() then
@@ -123,4 +128,8 @@ function HeroData:getRp()
 	return false
 end
 
+function HeroData:getMaxHeroLvOnInit()
+	return self.maxHeroLvOnInit
+end
+
 return HeroData
\ No newline at end of file
diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua
index a8a0bd6e..d0f4da5f 100644
--- a/lua/app/userdata/hero/hero_entity.lua
+++ b/lua/app/userdata/hero/hero_entity.lua
@@ -31,7 +31,7 @@ function HeroEntity:setLv(lv)
 		return
 	end
 	self.data.lv = lv
-	ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_HERO_LV_UP)
+	ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_HERO_LV_UP, lv)
 	self:setDirty()
 end
 
diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua
index e4bab0e1..4083955c 100644
--- a/lua/app/userdata/shop/shop_data.lua
+++ b/lua/app/userdata/shop/shop_data.lua
@@ -211,10 +211,10 @@ end
 
 -- 初始化每日特惠
 function ShopData:initMallDaily(mallDaily)
-    if EDITOR_MODE then
-        Logger.logHighlight("初始化 initMallDaily")
-        Logger.printTable(mallDaily)
-    end
+    -- if EDITOR_MODE then
+    --     Logger.logHighlight("初始化 initMallDaily")
+    --     Logger.printTable(mallDaily)
+    -- end
 
     mallDaily = mallDaily or {}
     self.mallDailyAdResetCount = mallDaily.ad_reset_Count or 0
@@ -324,10 +324,10 @@ function ShopData:getMallGoldConfig()
 end
 
 function ShopData:initCommonDailyGoldGift(ad_count)
-    if EDITOR_MODE then
-        Logger.logHighlight("初始化 initCommonDailyGoldGift")
-        Logger.printTable(ad_count)
-    end
+    -- if EDITOR_MODE then
+    --     Logger.logHighlight("初始化 initCommonDailyGoldGift")
+    --     Logger.printTable(ad_count)
+    -- end
 
     ad_count = ad_count or {}
     self.commonDailyGoldBuyCount = ad_count[1] or 0 -- 已购的金币广告礼包次数
@@ -427,10 +427,10 @@ end
 
 -- 初始化助力与金币礼包
 function ShopData:initLevelUpGift(levelUpGift)
-    if EDITOR_MODE then
-        Logger.logHighlight("初始化 助力与金币礼包")
-        Logger.printTable(levelUpGift)
-    end
+    -- if EDITOR_MODE then
+    --     Logger.logHighlight("初始化 助力与金币礼包")
+    --     Logger.printTable(levelUpGift)
+    -- end
 
     levelUpGift = levelUpGift or {}
     self.levelUpGifts = levelUpGift.gifts or {} -- [{trigger_level,current_level_up_gift,trigger_at}]
@@ -442,9 +442,9 @@ function ShopData:initLevelUpGift(levelUpGift)
 end
 
 function ShopData:initCoinGift(id, triggerTime)
-    if EDITOR_MODE then
-        Logger.logHighlight("初始化 金币礼包 -- id:%s  time:%s", id, triggerTime)
-    end
+    -- if EDITOR_MODE then
+    --     Logger.logHighlight("初始化 金币礼包 -- id:%s  time:%s", id, triggerTime)
+    -- end
 
     self.coinGiftId = id or 0 -- 金币礼包触发id
     self.coinGiftTriggerTime = triggerTime or 0 -- 金币礼包触发时间
@@ -485,7 +485,6 @@ function ShopData:getLevelUpGiftActIds()
     local list = {}
     for index, gift in ipairs(self.levelUpGifts) do
         -- 剔除已购的助力礼包 这个礼包只会有一次
-
         if self:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.current_level_up_gift) == 0 then
             table.insert(list, gift.current_level_up_gift)
         end
@@ -527,7 +526,6 @@ function ShopData:getValidCoinGiftId()
                         return actId
                     end
                 end
-
             else -- 没有买过,这个肯定可以购买
                 return actId
             end
@@ -599,8 +597,73 @@ end
 
 -- 成长礼包 **********************************************************************************************
 
+function ShopData:getActGrowUpGiftConfig()
+    return ConfigManager:getConfig("act_growup_gift")
+end
+
 -- 初始化成长礼包
-function ShopData:initGrowUpGift(growUpGift)
+function ShopData:initGrowUpGift(growUpGift, loginTime)
+    if EDITOR_MODE then
+        Logger.logHighlight("初始化成长礼包 growUpGift -- now_ts:%s", loginTime)
+        Logger.printTable(growUpGift)
+    end
+
+    growUpGift = growUpGift or {}
+
+    self.growUpGifts = growUpGift.grow_up_gift or {} -- {hero_id, current_grow_up_id, trigger_at}   
+    for _, gift in ipairs(self.growUpGifts) do -- 标记需要弹出的礼包
+        if gift.trigger_at == loginTime then
+            self:markPopUpGiftForGrowUpGift(gift.current_grow_up_id)
+        end
+    end
+    self:setDirty()
+end
+
+function ShopData:getGrowUpGifts()
+    return self.growUpGifts
+end
+
+-- 获取目前时间有效的成长礼包
+function ShopData:getValidGrowUpGifts()
+    local list = {}
+    for index, gift in ipairs(self:getGrowUpGifts()) do
+        local cfgInfo = self:getActGrowUpGiftConfig()[gift.current_grow_up_id]
+        if cfgInfo then
+            local cd = (cfgInfo.cd or 0) * 3600 
+            local durationTime = (cfgInfo.limit_time or 0) * 3600 
+            local triggerTime = gift.trigger_at // 1000
+            local maxDurationTime = triggerTime + durationTime
+            local maxEndTime = triggerTime + cd
+            -- 是否在有效范围内
+            local isInDurationTime = Time:getServerTime() < maxDurationTime
+            if isInDurationTime then
+                -- 从通用act里找到这个礼包的最后购买时间 如果有且在这个范围内 则这个礼包已经被购买了
+                local hasBuy = false
+                local actGiftDetailData = self:getActGiftDetailData(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id)
+                if actGiftDetailData then
+                    local latestBuyTime = actGiftDetailData.latest_buy_at // 1000
+                    if latestBuyTime > 0 and triggerTime < latestBuyTime and latestBuyTime < maxEndTime then
+                        hasBuy = true
+                    end
+                end
+                if not hasBuy then
+                    table.insert(list, gift)
+                end
+            end
+        end
+    end
+    return list
+end
+
+-- 触发了成长礼包
+function ShopData:onTriggerGrowUpGift(gift)
+    table.insert(self.growUpGifts, gift)
+
+    self:setDirty()
+end
+
+function ShopData:markPopUpGiftForGrowUpGift(actId)
+    self:markPopUpGift(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, actId)
 end
 
 -- 成长礼包结束 ----------------------------------------------------------------------------------------------
diff --git a/lua/app/userdata/task/task_data.lua b/lua/app/userdata/task/task_data.lua
new file mode 100644
index 00000000..f1eeab33
--- /dev/null
+++ b/lua/app/userdata/task/task_data.lua
@@ -0,0 +1,15 @@
+local TaskData = class("TaskData", BaseData)
+
+function TaskData:init()
+	self.maxHeroLv = DataManager.HeroData:getMaxHeroLvOnInit()
+end
+
+function TaskData:getMaxHeroLv()
+	return self.maxHeroLv or 0
+end
+
+function TaskData:setMaxHeroLv(lv)
+	self.maxHeroLv = lv
+end
+
+return TaskData
\ No newline at end of file
diff --git a/lua/app/userdata/task/task_data.lua.meta b/lua/app/userdata/task/task_data.lua.meta
new file mode 100644
index 00000000..97850483
--- /dev/null
+++ b/lua/app/userdata/task/task_data.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d49487deb0a2a4d47996acdf0ec1c57c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}