删除账号

lua/app/common/bi_report.lua

@@ -35,6 +35,7 @@ BIReport.ACCOUNT_OPT_TYPE = {
 	LOGIN_FAILED = "LoginFailed",
 	BIND_CLICK = "BindClick",
 	BIND_FINISH = "BindFinish",
+	DELETE = "Delete"
 }
 
 BIReport.CHAPTER_OPT_TYPE = {
@@ -765,7 +766,6 @@ function BIReport:postMailOpen(mailId)
 		event_type = BIReport.MAIL_OPT_TYPE.OPEN,
 	}
 	self:report(EVENT_NAME_MAIL_OPT, args)
-	BIReport:printArgsStr(EVENT_NAME_MAIL_OPT, args)
 end
 
 function BIReport:postMailClaim(mailId)
@@ -778,7 +778,14 @@ function BIReport:postMailClaim(mailId)
 		event_type = BIReport.MAIL_OPT_TYPE.CLAIM,
 	}
 	self:report(EVENT_NAME_MAIL_OPT, args)
-	BIReport:printArgsStr(EVENT_NAME_MAIL_OPT, args)
+end
+
+function BIReport:postAccountDelete(loginType)
+	local args = {
+		login_type = loginType,
+		event_type = BIReport.ACCOUNT_OPT_TYPE.DELETE,
+	}
+	self:report(EVENT_NAME_ACCOUNT_OPT, args)
 end
 
 return BIReport

lua/app/common/module_manager.lua

@@ -49,6 +49,8 @@ local MODULE_PATHS = {
 	MailManager = "app/module/mail/mail_manager",
 	-- 玩家
 	PlayerManager = "app/module/player/player_manager",
+	-- 账号
+	AccountManager= "app/module/account/account_manager",
 }
 
 -- 这里的key对应func_open里的id

lua/app/config/func_open.lua

@@ -28,7 +28,7 @@ local func_open = {
 		["pop_ups"]=1
 	},
 	["mall_daily"]={
-		["stage"]=5,
+		["stage"]=4,
 		["icon"]="main_mall_daily"
 	},
 	["store_box_open"]={
@@ -40,7 +40,7 @@ local func_open = {
 		["pop_ups"]=1
 	},
 	["daily_challenge"]={
-		["stage"]=8,
+		["stage"]=4,
 		["icon"]="main_daily_challenge"
 	},
 	["act_gift_show_open"]={

lua/app/config/fx.lua

@@ -433,9 +433,24 @@ local fx = {
 	[300034]={
 		["res"]="sfx_p0007_b05",
 		["bind"]="root"
+	},
+	[300035]={
+		["res"]="sfx_p0004_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[300036]={
+		["res"]="sfx_p0004_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[300037]={
+		["res"]="sfx_p0004_b04",
+		["bind"]="root",
+		["flip"]=1
 	}
 }
 local config = {
-data=fx,count=108
+data=fx,count=111
 }
 return config

lua/app/config/hero.lua

@@ -77,38 +77,38 @@ local hero = {
 		["rouge_skill_7"]=1300107,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0014",
 		["icon"]="6",
@@ -136,38 +136,38 @@ local hero = {
 		["rouge_skill_7"]=1300207,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0009",
 		["icon"]="11",
@@ -195,38 +195,38 @@ local hero = {
 		["rouge_skill_7"]=1400107,
 		["begin_lv"]=5,
 		["hp"]={
-			2000000,
+			6000000,
-			2400000,
+			6800000,
-			2800000,
+			7600000,
-			3220000,
+			8440000,
-			3660000,
+			9320000,
-			4120000,
+			10240000,
-			4620000,
+			11240000,
-			5160000,
+			12320000,
-			5760000,
+			13520000,
-			6420000,
+			14840000,
-			7140000,
+			16280000,
-			7940000,
+			17880000,
-			8840000,
+			19680000,
-			9840000,
+			21680000,
-			10980000
+			23960000
 		},
 		["atk"]={
-			1000000,
+			3000000,
-			1200000,
+			3400000,
-			1400000,
+			3800000,
-			1610000,
+			4220000,
-			1830000,
+			4660000,
-			2060000,
+			5120000,
-			2310000,
+			5620000,
-			2580000,
+			6160000,
-			2880000,
+			6760000,
-			3210000,
+			7420000,
-			3570000,
+			8140000,
-			3970000,
+			8940000,
-			4420000,
+			9840000,
-			4920000,
+			10840000,
-			5490000
+			11980000
 		},
 		["model_id"]="p0011",
 		["icon"]="16",
@@ -311,38 +311,38 @@ local hero = {
 		["rouge_skill_7"]=2300107,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0010",
 		["icon"]="12",
@@ -370,38 +370,38 @@ local hero = {
 		["rouge_skill_7"]=2300207,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0012",
 		["icon"]="7",
@@ -429,38 +429,38 @@ local hero = {
 		["rouge_skill_7"]=2400107,
 		["begin_lv"]=5,
 		["hp"]={
-			2000000,
+			6000000,
-			2400000,
+			6800000,
-			2800000,
+			7600000,
-			3220000,
+			8440000,
-			3660000,
+			9320000,
-			4120000,
+			10240000,
-			4620000,
+			11240000,
-			5160000,
+			12320000,
-			5760000,
+			13520000,
-			6420000,
+			14840000,
-			7140000,
+			16280000,
-			7940000,
+			17880000,
-			8840000,
+			19680000,
-			9840000,
+			21680000,
-			10980000
+			23960000
 		},
 		["atk"]={
-			1000000,
+			3000000,
-			1200000,
+			3400000,
-			1400000,
+			3800000,
-			1610000,
+			4220000,
-			1830000,
+			4660000,
-			2060000,
+			5120000,
-			2310000,
+			5620000,
-			2580000,
+			6160000,
-			2880000,
+			6760000,
-			3210000,
+			7420000,
-			3570000,
+			8140000,
-			3970000,
+			8940000,
-			4420000,
+			9840000,
-			4920000,
+			10840000,
-			5490000
+			11980000
 		},
 		["model_id"]="p0007",
 		["icon"]="17",
@@ -546,38 +546,38 @@ local hero = {
 		["rouge_skill_7"]=3300107,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0006",
 		["icon"]="8",
@@ -605,38 +605,38 @@ local hero = {
 		["rouge_skill_7"]=3300207,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0020",
 		["icon"]="13",
@@ -664,38 +664,38 @@ local hero = {
 		["rouge_skill_7"]=3400107,
 		["begin_lv"]=5,
 		["hp"]={
-			2000000,
+			6000000,
-			2400000,
+			6800000,
-			2800000,
+			7600000,
-			3220000,
+			8440000,
-			3660000,
+			9320000,
-			4120000,
+			10240000,
-			4620000,
+			11240000,
-			5160000,
+			12320000,
-			5760000,
+			13520000,
-			6420000,
+			14840000,
-			7140000,
+			16280000,
-			7940000,
+			17880000,
-			8840000,
+			19680000,
-			9840000,
+			21680000,
-			10980000
+			23960000
 		},
 		["atk"]={
-			1000000,
+			3000000,
-			1200000,
+			3400000,
-			1400000,
+			3800000,
-			1610000,
+			4220000,
-			1830000,
+			4660000,
-			2060000,
+			5120000,
-			2310000,
+			5620000,
-			2580000,
+			6160000,
-			2880000,
+			6760000,
-			3210000,
+			7420000,
-			3570000,
+			8140000,
-			3970000,
+			8940000,
-			4420000,
+			9840000,
-			4920000,
+			10840000,
-			5490000
+			11980000
 		},
 		["model_id"]="p0016",
 		["icon"]="18",
@@ -781,38 +781,38 @@ local hero = {
 		["rouge_skill_7"]=4300107,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0022",
 		["icon"]="9",
@@ -840,38 +840,38 @@ local hero = {
 		["rouge_skill_7"]=4300207,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0021",
 		["icon"]="14",
@@ -899,38 +899,38 @@ local hero = {
 		["rouge_skill_7"]=4400107,
 		["begin_lv"]=5,
 		["hp"]={
-			2000000,
+			6000000,
-			2400000,
+			6800000,
-			2800000,
+			7600000,
-			3220000,
+			8440000,
-			3660000,
+			9320000,
-			4120000,
+			10240000,
-			4620000,
+			11240000,
-			5160000,
+			12320000,
-			5760000,
+			13520000,
-			6420000,
+			14840000,
-			7140000,
+			16280000,
-			7940000,
+			17880000,
-			8840000,
+			19680000,
-			9840000,
+			21680000,
-			10980000
+			23960000
 		},
 		["atk"]={
-			1000000,
+			3000000,
-			1200000,
+			3400000,
-			1400000,
+			3800000,
-			1610000,
+			4220000,
-			1830000,
+			4660000,
-			2060000,
+			5120000,
-			2310000,
+			5620000,
-			2580000,
+			6160000,
-			2880000,
+			6760000,
-			3210000,
+			7420000,
-			3570000,
+			8140000,
-			3970000,
+			8940000,
-			4420000,
+			9840000,
-			4920000,
+			10840000,
-			5490000
+			11980000
 		},
 		["model_id"]="p0008",
 		["icon"]="19",
@@ -1017,38 +1017,38 @@ local hero = {
 		["rouge_skill_7"]=5300107,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0015",
 		["icon"]="10",
@@ -1076,38 +1076,38 @@ local hero = {
 		["rouge_skill_7"]=5300207,
 		["begin_lv"]=3,
 		["hp"]={
-			2000000,
+			3000000,
-			2400000,
+			3520000,
-			2800000,
+			4040000,
-			3220000,
+			4580000,
-			3660000,
-			4120000,
-			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7140000,
+			7120000,
-			7940000,
+			7900000,
-			8840000,
+			8760000,
-			9840000,
+			9700000,
-			10980000
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
-			1000000,
+			1500000,
-			1200000,
+			1760000,
-			1400000,
+			2020000,
-			1610000,
+			2290000,
-			1830000,
-			2060000,
-			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3570000,
+			3560000,
-			3970000,
+			3950000,
-			4420000,
+			4380000,
-			4920000,
+			4850000,
-			5490000
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0019",
 		["icon"]="15",
@@ -1135,38 +1135,38 @@ local hero = {
 		["rouge_skill_7"]=5400107,
 		["begin_lv"]=5,
 		["hp"]={
-			2000000,
+			6000000,
-			2400000,
+			6800000,
-			2800000,
+			7600000,
-			3220000,
+			8440000,
-			3660000,
+			9320000,
-			4120000,
+			10240000,
-			4620000,
+			11240000,
-			5160000,
+			12320000,
-			5760000,
+			13520000,
-			6420000,
+			14840000,
-			7140000,
+			16280000,
-			7940000,
+			17880000,
-			8840000,
+			19680000,
-			9840000,
+			21680000,
-			10980000
+			23960000
 		},
 		["atk"]={
-			1000000,
+			3000000,
-			1200000,
+			3400000,
-			1400000,
+			3800000,
-			1610000,
+			4220000,
-			1830000,
+			4660000,
-			2060000,
+			5120000,
-			2310000,
+			5620000,
-			2580000,
+			6160000,
-			2880000,
+			6760000,
-			3210000,
+			7420000,
-			3570000,
+			8140000,
-			3970000,
+			8940000,
-			4420000,
+			9840000,
-			4920000,
+			10840000,
-			5490000
+			11980000
 		},
 		["model_id"]="p0023",
 		["icon"]="20",

lua/app/config/item.lua

@@ -321,7 +321,7 @@ local item = {
 	[18]={
 		["type"]=4,
 		["qlt"]=1,
-		["icon"]="11",
+		["icon"]="18",
 		["reward"]={
 			{
 				["type"]=1,

lua/app/config/localization/localization_global_const.lua

@@ -189,6 +189,11 @@ local LocalizationGlobalConst =
 	BOUNTY_TITLE = "BOUNTY_TITLE",
 	REMAIN_TIME = "REMAIN_TIME",
 	BATTLE_DESC_11 = "BATTLE_DESC_11",
+	NO_NETWORK = "NO_NETWORK",
+	NETWORK_ERROE_1 = "NETWORK_ERROE_1",
+	NO_ADS = "NO_ADS",
+	BESURE_DELETE_TIPS_DESC = "BESURE_DELETE_TIPS_DESC",
+	BESURE_DELETE_ACCOUNT_DESC = "BESURE_DELETE_ACCOUNT_DESC",
 }
 
 return LocalizationGlobalConst

lua/app/config/skill.lua

@@ -2217,7 +2217,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="dmg_addition_green_add",
-				["num"]=2000,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -2829,7 +2829,8 @@ local skill = {
 		["energy"]=10,
 		["link"]=1,
 		["position"]=3,
-		["method"]=2,
+		["method"]=1,
+		["skill_type"]=0,
 		["battle_icon"]="18",
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -2921,6 +2922,57 @@ local skill = {
 		},
 		["obj"]=2
 	},
+	[3400125]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=3,
+		["method"]=2,
+		["skill_type"]=4,
+		["boardrange"]={
+			{
+				["type"]=1,
+				["range"]=2
+			},
+			{
+				["type"]=2,
+				["range"]=2
+			}
+		},
+		["battle_icon"]="18",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_green",
+				["num"]=43750,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["eliminate_effect"]={
+			{
+				["type"]="dmg_addition_all_add",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["eliminate_obj"]=1,
+		["skill_position"]=1,
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]=2200120,
+		["name_act"]="skill01",
+		["fx_self"]=300008,
+		["fx_target"]=4,
+		["fx_target_delay"]=1100,
+		["bullet_time"]={
+			1100,
+			3000,
+			400
+		}
+	},
 	[4200110]={
 		["position"]=4,
 		["effect_type"]=1,
@@ -3192,11 +3244,8 @@ local skill = {
 		["energy"]=10,
 		["link"]=1,
 		["position"]=4,
-		["method"]=2,
+		["method"]=1,
-		["skill_type"]=4,
+		["skill_type"]=0,
-		["boardrange"]={
-
-		},
 		["battle_icon"]="9",
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -3299,6 +3348,47 @@ local skill = {
 		["obj"]=1,
 		["skill_position"]=2
 	},
+	[4300125]={
+		["energy"]=10,
+		["link"]=1,
+		["position"]=4,
+		["method"]=2,
+		["skill_type"]=4,
+		["boardrange"]={
+			{
+				["type"]=3,
+				["range"]=2
+			},
+			{
+				["type"]=4,
+				["range"]=2
+			}
+		},
+		["battle_icon"]="9",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt_blue",
+				["num"]=40000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=1,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=2,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]=4200120,
+		["name_act"]="skill01",
+		["fx_target"]=300011
+	},
 	[4300210]={
 		["position"]=4,
 		["effect_type"]=1,
@@ -4242,7 +4332,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=5000,
+				["num"]=2500,
 				["ratio"]=5000,
 				["round"]=2
 			}
@@ -4287,7 +4377,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=5000,
+				["num"]=2500,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -4717,7 +4807,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=5000,
+				["num"]=2500,
 				["ratio"]=10000,
 				["round"]=999
 			}
@@ -6308,7 +6398,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=5000,
+				["num"]=2500,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -6361,7 +6451,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=5000,
+				["num"]=2500,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -11874,7 +11964,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200111,
 		["name_act"]="attack01",
-		["fx_target"]=300013
+		["fx_target"]=300035
 	},
 	[40030]={
 		["effect_type"]=1,
@@ -11893,7 +11983,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200112,
 		["name_act"]="attack02",
-		["fx_target"]=300013
+		["fx_target"]=300035
 	},
 	[40031]={
 		["effect_type"]=1,
@@ -11912,7 +12002,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200113,
 		["name_act"]="attack03",
-		["fx_target"]=300014
+		["fx_target"]=300036
 	},
 	[40032]={
 		["effect_type"]=1,
@@ -11931,7 +12021,7 @@ local skill = {
 		["shake_type"]=1,
 		["sound_hit"]=5200114,
 		["name_act"]="attack04",
-		["fx_target"]=300015
+		["fx_target"]=300037
 	},
 	[40033]={
 		["effect_type"]=1,
@@ -12087,6 +12177,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=570
+data=skill,count=572
 }
 return config

lua/app/config/skill_rogue.lua

@@ -2138,18 +2138,11 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=2,
+		["type"]=1,
-		["skill_position"]=3,
+		["parameter"]={
-		["boardrange"]={
+			3400125
-			{
-				["type"]=1,
-				["range"]=2
-			},
-			{
-				["type"]=2,
-				["range"]=2
-			}
 		},
+		["skill_position"]=3,
 		["icon"]="151"
 	},
 	[3400103]={
@@ -2379,18 +2372,11 @@ local skill_rogue = {
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=2,
+		["type"]=1,
-		["skill_position"]=4,
+		["parameter"]={
-		["boardrange"]={
+			4300125
-			{
-				["type"]=3,
-				["range"]=2
-			},
-			{
-				["type"]=4,
-				["range"]=2
-			}
 		},
+		["skill_position"]=4,
 		["icon"]="87"
 	},
 	[4300102]={

lua/app/config/strings/cn/func_open.lua

@@ -1,46 +1,51 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
-		["name"]="战令",
+		["name"]="金猪"
-		["desc"]="大陆贸易点，可购买多种道具"
+	},
+	["bounty_open"]={
+		["name"]="战令"
 	},
 	["task"]={
-		["name"]="任务",
+		["name"]="任务"
-		["desc"]="呼朋唤友，集结各方力量"
 	},
 	["act_level_gift"]={
-		["name"]="成长基金",
+		["name"]="成长基金"
-		["desc"]="帝国科技，打造理想装备"
 	},
 	["idle_drop"]={
-		["name"]="挂机",
+		["name"]="挂机奖励"
-		["desc"]="快速获取游戏道具"
 	},
 	["act_sevenday"]={
-		["name"]="七天乐",
+		["name"]="七天乐"
-		["desc"]="团队作战"
 	},
 	["mall"]={
-		["name"]="商城",
+		["name"]="商城"
-		["desc"]="玩家对决，为荣誉而战"
 	},
 	["mall_daily"]={
-		["name"]="商城每日商店",
+		["name"]="每日特惠"
-		["desc"]="突破极限，创新记录"
 	},
-	["store_box"]={
+	["store_box_open"]={
-		["name"]="商城普通宝箱+精致宝箱",
+		["name"]="商城宝箱"
-		["desc"]="战斗速度增加一倍"
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
-		["name"]="商城珍贵宝箱",
+		["name"]="珍贵宝箱"
-		["desc"]="解放双手，策略制胜"
 	},
 	["daily_challenge"]={
-		["name"]="每日挑战开启章节",
+		["name"]="每日挑战"
-		["desc"]="多方成长，强化英雄"
+	},
+	["act_gift_show_open"]={
+		["name"]="弹窗礼包"
+	},
+	["first_charge"]={
+		["name"]="首充礼包"
+	},
+	["new_player_gift"]={
+		["name"]="新手礼包"
+	},
+	["mail_open"]={
+		["name"]="邮箱"
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/cn/global.lua

@@ -189,6 +189,11 @@ local localization_global =
     ["BOUNTY_TITLE"] = "通行证",
     ["REMAIN_TIME"] = "剩余时间：{0}",
     ["BATTLE_DESC_11"] = "神秘宝箱",
+    ["NO_NETWORK"] = "无网络连接，请连接网络后重试",
+    ["NETWORK_ERROE_1"] = "服务器通信繁忙，请稍后重试",
+    ["NO_ADS"] = "新广告还没有准备好",
+    ["BESURE_DELETE_TIPS_DESC"] = "是否要删除账号，删除后将清除所有信息和内容，账号重新登陆后将是初始1级新手状态。如果确定请输入“{0}”",
+    ["BESURE_DELETE_ACCOUNT_DESC"] = "确认删除",
 }
 
 return localization_global

lua/app/config/strings/de/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/en/buff.lua

@@ -1,122 +1,152 @@
 local buff = {
 	[7]={
 		["id"]=7,
+		["desc"]="Red Resistance: Reduces damage taken from Red element heroes by <color=#3cff28>{0}</color>.",
 		["name"]="dec_dmg_red_add"
 	},
 	[8]={
 		["id"]=8,
+		["desc"]="Yellow Resistance: Reduces damage taken from Yellow element heroes by <color=#3cff28>{0}</color>.",
 		["name"]="dec_dmg_yellow_add"
 	},
 	[9]={
 		["id"]=9,
+		["desc"]="Green Resistance: Reduces damage taken from Green element heroes by <color=#3cff28>{0}</color>.",
 		["name"]="dec_dmg_green_add"
 	},
 	[10]={
 		["id"]=10,
+		["desc"]="Blue Resistance: Reduces damage taken from Blue element heroes by <color=#3cff28>{0}</color>.",
 		["name"]="dec_dmg_blue_add"
 	},
 	[11]={
 		["id"]=11,
+		["desc"]="Purple Resistance: Reduces damage taken from Purple element heroes by <color=#3cff28>{0}</color>.",
 		["name"]="dec_dmg_purple_add"
 	},
 	[12]={
 		["id"]=12,
+		["desc"]="Ultimate Resistance: Reduces damage taken from all heroes by <color=#3cff28>{0}</color>.",
 		["name"]="dec_dmg_all_add"
 	},
 	[24]={
 		["id"]=24,
+		["desc"]="Damage Increased: The damage dealt is increased by {0}.",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
+		["desc"]="Stun: Unable to take any action this turn.",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
+		["desc"]="Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
+		["desc"]="Freeze: Normal attack -<color=#3cff28>{0}</color>.",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
+		["desc"]="Rage: Normal attack +<color=#3cff28>{0}</color>.",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
+		["desc"]="Counter Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>200%</color> of the damage back to the enemy.",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
+		["desc"]="Burn: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
+		["desc"]="Vulnerable: Increases all damage taken by <color=#3cff28>{0}</color>.",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
+		["desc"]="Frozen: Unable to take any action and buff won't take effect this turn.",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
+		["desc"]="Poisoned: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
+		["desc"]="Imprison: Can only use normal attack this turn.",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
+		["desc"]="Corruption: Reduces HP recovery effect by <color=#3cff28>{0}</color>.",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
+		["desc"]="Bleed: Restores the attacker's HP upon hit and deals damage equal to <color=#3cff28>{0}</color> of the attacker's attack at the end of the turn.",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
+		["desc"]="Weak: Reduces damage dealt by <color=#3cff28>{0}</color>.",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
+		["desc"]="Drowsy: Unable to take any action this turn until getting hit.",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
+		["desc"]="Curse: Attacks will not deal damage but instead heal the opponent.",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
+		["desc"]="Lock: Locks a random color on the board that cannot be selected later.",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
+		["desc"]="Head-start: Act first every turn.",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
+		["desc"]="Undead: Does not die from fatal damage.",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
+		["desc"]="Counterattack: Has a <color=#3cff28>{0}</color> chance to counterattack after taking direct damage.",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
+		["desc"]="Damage Counter: Reflects <color=#3cff28>{0}</color> of the enemy's damage.",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
+		["desc"]="Counter Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>400%</color> of the enemy's damage.",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
+		["desc"]="Freeze Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
+		["desc"]="Freeze Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>400%</color> of the enemy's damage.",
 		["name"]="shield_ice_rebound_400"
 	}
 }

lua/app/config/strings/en/chapter.lua

@@ -1,93 +1,93 @@
 local chapter = {
 	[1]={
-
+		["name"]="1. Town Square"
 	},
 	[2]={
-
+		["name"]="2. Town Fortress"
 	},
 	[3]={
-
+		["name"]="3. Town Mine"
 	},
 	[4]={
-
+		["name"]="4. Dark Mine"
 	},
 	[5]={
-
+		["name"]="5. Empire Border"
 	},
 	[6]={
-
+		["name"]="6. Snowy Jungle (West)"
 	},
 	[7]={
-
+		["name"]="7. Snowy Jungle (East)"
 	},
 	[8]={
-
+		["name"]="8. Castle Perimeter"
 	},
 	[9]={
-
+		["name"]="9. Castle Main Gate"
 	},
 	[10]={
-
+		["name"]="10. Empire Castle"
 	},
 	[11]={
-
+		["name"]="11. Castle Depths"
 	},
 	[12]={
-
+		["name"]="12. Castle Secret Passage"
 	},
 	[13]={
-
+		["name"]="13. Secret Passage Exit"
 	},
 	[14]={
-
+		["name"]="14. Castle Lakeside"
 	},
 	[15]={
-
+		["name"]="15. East Shore"
 	},
 	[16]={
-
+		["name"]="16. Corrupted Swamp"
 	},
 	[17]={
-
+		["name"]="17. Swamp Ruins"
 	},
 	[18]={
-
+		["name"]="18. Rainforest Entrance"
 	},
 	[19]={
-
+		["name"]="19. Rainforest"
 	},
 	[20]={
-
+		["name"]="20. Giant Temple"
 	},
 	[21]={
-
+		["name"]="21. South of Temple"
 	},
 	[22]={
-
+		["name"]="22. Mysterious Altar"
 	},
 	[23]={
-
+		["name"]="23. Demon Altar"
 	},
 	[24]={
-
+		["name"]="24. Strange Cave"
 	},
 	[25]={
-
+		["name"]="25. Deep Cave"
 	},
 	[26]={
-
+		["name"]="26. Demon City West Street"
 	},
 	[27]={
-
+		["name"]="27. Demon City East Street"
 	},
 	[28]={
-
+		["name"]="28. Demon City Center"
 	},
 	[29]={
-
+		["name"]="29. Demon City Pathway"
 	},
 	[30]={
-
+		["name"]="30. Demon City Exit"
 	}
 }
 local config = {

lua/app/config/strings/en/func_open.lua

@@ -1,36 +1,51 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
-		["desc"]="Trading Spot of the continent."
+
+	},
+	["bounty_open"]={
+
 	},
 	["task"]={
-		["desc"]="Gather friends to unify strength."
+
 	},
 	["act_level_gift"]={
-		["desc"]="Empire technology to craft ideal gear."
+
 	},
 	["idle_drop"]={
-		["desc"]="Get game items fast."
+
 	},
 	["act_sevenday"]={
-		["desc"]="Team Battle"
+
 	},
 	["mall"]={
-		["desc"]="Players duel. Fight for honor."
+
 	},
 	["mall_daily"]={
-		["desc"]="Break limit. New record."
+
 	},
-	["store_box"]={
+	["store_box_open"]={
-		["desc"]="Battle speed doubles"
+
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
-		["desc"]="Free up your hands."
+
 	},
 	["daily_challenge"]={
-		["desc"]="Multiple growth to strengthen heroes."
+
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/en/global.lua

@@ -56,9 +56,82 @@ local localization_global =
     ["CLICK_COPY_ACOUNT_DESC"] = "Click to copy your PlayerID",
     ["APP"] = "Version:",
     ["CHAPTER_DESC_1"] = "The Best Record: {0}",
-    ["ACT_SEVENDAY_TITLE"] = "HAPPY SEVENDAY",
+    ["SETTING_DESC"] = "Settings",
-    ["BTN_CLAIM"] = "CLAIM",
+    ["SETTING_DESC_MUSIC"] = "Music",
-    ["BTN_DONE"] = "GOT",
+    ["SETTING_DESC_VOICE"] = "Sound",
+    ["SETTING_DESC_LANGUAGE"] = "Language",
+    ["SERVICE_DESC"] = "Terms of Use",
+    ["PRIVACY_DESC"] = "Privacy Policy",
+    ["CLIENT_VERSION"] = "Current Version: {0}",
+    ["BIND_ACCOUNT_DESC"] = "Bind Account",
+    ["CHANGE_ACCOUNT_DESC"] = "Switch Account",
+    ["DELETE_ACCOUNT_DESC"] = "Delete Account",
+    ["SETTING_DESC_1"] = "ID:{0}",
+    ["ACCOUNT_ALREADY_BINDED_DESC"] = "Registered",
+    ["LANGUAGE_DESC"] = "Language",
+    ["ACT_SEVENDAY_TITLE"] = "Server Carnival",
+    ["ACT_SEVENDAY_LEFTTIME"] = "Time Remaining: {0} day(s) {1} hour(s)",
+    ["ACT_SEVENDAY_TASK"] = "Quest Completed: {0}/{1}",
+    ["ACT_SEVENDAY_DESC"] = "New quests will be unlocked daily.",
+    ["BTN_CLAIM"] = "Obtain",
+    ["BTN_DONE"] = "Got",
+    ["BOUNTY_BUY_LEVEL_TITLE"] = "Confirm Level Unlock",
+    ["BOUNTY_BUY_LEVEL_COUNTENT"] = "Unlock current level immediately\nLevel rewards will be unlocked instantly, and your earned points will remain the same.",
+    ["BOUNTY_PURCHASE_NAME"] = "Golden Pass",
+    ["BOUNTY_DESC_1"] = "Unlock rewards and reward quests",
+    ["BOUNTY_DESC_2"] = "Obtain the Premium Pass to level up by 10 for richer rewards instantly!",
+    ["REWARD_BOX_DESC"] = "Reward Chest",
+    ["BOUNTY_DESC_3"] = "Upon completing all content of the Pass, you can receive a reward chest for every 1000 points.",
+    ["STR_MAX"] = "MAX",
+    ["ALREADY_ACTIVE"] = "Activated",
+    ["ACTIVE_BOUNTY"] = "Activate Golden Pass",
+    ["BOUNTY_FREE_NAME"] = "Free Pass",
+    ["CONFIRM_IGNORE"] = "Don't show again today",
+    ["MAIL_NAME"] = "Mailbox",
+    ["COLLET_REWARDS"] = "Claim Rewards",
+    ["TASK_NAME"] = "Mission",
+    ["TASK_DAILY"] = "Daily",
+    ["TASK_CHALLENGE"] = "Challenge",
+    ["TASK_HELP_1"] = "Refreshes daily and quest will be reset. Watch ads to refresh quests.",
+    ["STR_REFRESH"] = "Refresh",
+    ["STR_UNLOCK"] = "Unlock",
+    ["TASK_DESC_1"] = "Pass-exclusive Quest",
+    ["STR_COMPLETED"] = "Completed",
+    ["HERO_CARD_TIPS_DESC"] = "Possible Hero Card Rewards:",
+    ["HERO_CARD_DESC_QLT_2"] = "Uncommon Hero",
+    ["HERO_CARD_DESC_QLT_3"] = "Rare Hero",
+    ["HERO_CARD_DESC_QLT_4"] = "Epic Hero",
+    ["HERO_CARD_DESC_QLT_5"] = "Legendary Hero",
+    ["HERO_CARD_DESC_QLT_6"] = "Mythical Hero",
+    ["IDLE_DROP_REWARD"] = "AFK Rewards",
+    ["IDLE_DROP_DESC_1"] = "More chapters cleared brings greater rewards",
+    ["PER_HOUR"] = "{0}/ h",
+    ["IDLE_DROP_DESC_2"] = "Longest AFK: {0} hour(s)",
+    ["IDLE_QUICK"] = "Fast AFK",
+    ["IDLE_DROP_DESC_3"] = "Obtain {0} hours of AFK rewards immediately",
+    ["STR_FREE"] = "Free",
+    ["TODAY_REMAIN_TIMES"] = "{0} chance(s) left today",
+    ["BUY_ENERGY"] = "Buy Energy",
+    ["MAIL_TITLE"] = "Mailbox",
+    ["BTN_DELETE_ALL_READ_MAIL"] = "Delete Read",
+    ["BTN_CLAIM_ALL"] = "Claim All",
+    ["BTN_READ"] = "Read",
+    ["BATTLE_DESC_9"] = "{0} Attack: <color=#ffffff>{1}</color>",
+    ["BATTLE_DESC_10"] = "Activated Effect",
+    ["BLOCK_DESC"] = "Block",
+    ["COUNTER_ATTACK_DESC"] = "Counterattack",
+    ["EXPIRES_IN_HOURS"] = "Expires in {0} hour(s)",
+    ["EXTRA_REWARDS"] = "Extra Bonus",
+    ["PLAYER_LEVEL_UP_DESC"] = "Congrats on reaching level {0}",
+    ["LEVEL_UP_REWARD"] = "Level-Up Rewards",
+    ["CLICK_TO_CONTINUE"] = "Tap to continue",
+    ["BOUNTY_DESC_4"] = "Buying this pass will exceed the pass level limit and result in loss. Confirm to buy it?",
+    ["RELOGIN"] = "Re-login",
+    ["GOLD_PIG_CLOSE_DESC"] = "Golden Pig has expired. Seize the next opportunity.",
+    ["GOLD_PIG_TITLE"] = "Super Value Golden Pig",
+    ["GOLD_PIG_DESC"] = "Challenge stages and collect Diamonds for a great deal.",
+    ["SIDE_BAR_FULL"] = "MAX",
+    ["DAILY_CHALLENGE"] = "Daily Challenge",
 }
 
 return localization_global

lua/app/config/strings/en/hero.lua

@@ -1,63 +1,63 @@
 local hero = {
 	[12001]={
-
+		["name"]="Dancer"
 	},
 	[13001]={
-
+		["name"]="Claude"
 	},
 	[13002]={
-
+		["name"]="Flare"
 	},
 	[14001]={
-
+		["name"]="Alexander"
 	},
 	[22001]={
-
+		["name"]="Blade Maid"
 	},
 	[23001]={
-
+		["name"]="Barbarian"
 	},
 	[23002]={
-
+		["name"]="Er-Ya"
 	},
 	[24001]={
-
+		["name"]="Claymore Kid"
 	},
 	[32001]={
-
+		["name"]="Onion"
 	},
 	[33001]={
-
+		["name"]="Fawn"
 	},
 	[33002]={
-
+		["name"]="Timberwolf"
 	},
 	[34001]={
-
+		["name"]="Mulan"
 	},
 	[42001]={
-
+		["name"]="Iceheart"
 	},
 	[43001]={
-
+		["name"]="Ice Maiden"
 	},
 	[43002]={
-
+		["name"]="Raven"
 	},
 	[44001]={
-
+		["name"]="Frost Enchantress"
 	},
 	[52001]={
-
+		["name"]="Ninja Lun"
 	},
 	[53001]={
-
+		["name"]="Witch Kiki"
 	},
 	[53002]={
-
+		["name"]="Soul Hunter"
 	},
 	[54001]={
-
+		["name"]="Butterfly"
 	}
 }
 local config = {

lua/app/config/strings/en/item.lua

@@ -13,114 +13,122 @@ local item = {
 	},
 	[4]={
 		["name"]="Outstanding Hero",
-		["desc"]="Allows you to get an outstanding hero"
+		["desc"]="Can obtain Uncommon Hero"
 	},
 	[5]={
 		["name"]="Rare Hero",
-		["desc"]="Allows you to get a rare hero"
+		["desc"]="Can obtain Rare Hero"
 	},
 	[6]={
 		["name"]="Epic Hero",
-		["desc"]="Allows you to get an epic hero"
+		["desc"]="Can obtain Epic Hero"
 	},
 	[7]={
-
+		["desc"]="Accumulated points can level up Pass."
 	},
 	[8]={
-
+		["desc"]="Can obtain heroes of the above qualities."
 	},
 	[9]={
-
+		["desc"]="Can obtain heroes of the above qualities."
 	},
 	[10]={
-
+		["desc"]="Hero chests adorned with gold."
 	},
 	[11]={
-
+		["desc"]="Powerful heroes are inside."
 	},
 	[12]={
-
+		["desc"]="Accumulate to a certain quantity for an upgrade."
 	},
 	[13]={
-
+		["desc"]="Used to open Normal Chest in the shop."
 	},
 	[14]={
-
+		["desc"]="Used to open Exquisite Chest in the shop."
 	},
 	[15]={
-
+		["desc"]="Used to open Precious Chest in the shop."
 	},
 	[16]={
-
+		["desc"]="Obtained by completing 5 daily quests."
 	},
 	[17]={
-
+		["desc"]="You can watch ads anywhere in the game to earn rewards."
 	},
 	[18]={
-
+		["desc"]="A huge Platinum Chest!"
 	},
 	[19]={
-
+		["desc"]="AFK rewards include random shards. The quantity and quality will increase with the progress of the stages."
 	},
 	[12001]={
-		["name"]="Roxy Shard"
+		["name"]="Roxy Shard",
+		["desc"]="Dancer Shard, collect the shards to activate or upgrade."
 	},
 	[13001]={
-		["name"]="Carla Shard"
+		["name"]="Carla Shard",
+		["desc"]="Claude Shard， collect the shards to activate or upgrade."
 	},
 	[13002]={
-		["name"]="Great Sword Robert Shard"
+		["name"]="Great Sword Robert Shard",
+		["desc"]="Flare Shard, collect the shards to activate or upgrade."
 	},
 	[14001]={
-		["name"]="Aske Shard"
+		["name"]="Aske Shard",
+		["desc"]="Alexander Shard, collect the shards to activate or upgrade."
 	},
 	[22001]={
-		["name"]="Evelyn Shard"
+		["name"]="Evelyn Shard",
+		["desc"]="Blade Maid Shard, collect the shards to activate or upgrade."
 	},
 	[23001]={
-		["name"]="Lilith Shard"
+		["name"]="Lilith Shard",
+		["desc"]="Barbarian Shard, collect the shards to activate or upgrade."
 	},
 	[23002]={
-		["name"]="White-Hair Catherine Shard"
+		["name"]="White-Hair Catherine Shard",
+		["desc"]="Er-Ya Shard, collect the shards to activate or upgrade."
 	},
 	[24001]={
-		["name"]="Allen Shard"
+		["name"]="Allen Shard",
+		["desc"]="Claymore Kid Shard, collect the shards to activate or upgrade."
 	},
 	[32001]={
-
+		["desc"]="Onion Shard, collect the shards to activate or upgrade."
 	},
 	[33001]={
-
+		["desc"]="Fawn Shard, collect the shards to activate or upgrade."
 	},
 	[33002]={
-
+		["desc"]="Timberwolf Shard, collect the shards to activate or upgrade."
 	},
 	[34001]={
-
+		["desc"]="Mulan Shard, collect the shards to activate or upgrade."
 	},
 	[42001]={
-
+		["desc"]="Iceheart Shard, collect the shards to activate or upgrade."
 	},
 	[43001]={
-
+		["desc"]="Ice Maiden Shard, collect the shards to activate or upgrade."
 	},
 	[43002]={
-
+		["desc"]="Raven Shard, collect the shards to activate or upgrade."
 	},
 	[44001]={
-
+		["desc"]="Frost Enchantress Shard, collect the shards to activate or upgrade."
 	},
 	[52001]={
-
+		["desc"]="Ninja Lun Shard, collect the shards to activate or upgrade."
 	},
 	[53001]={
-
+		["desc"]="Witch Kiki Shard, collect the shards to activate or upgrade."
 	},
 	[53002]={
-
+		["desc"]="Soul Hunter Shard, collect the shards to activate or upgrade."
 	},
 	[54001]={
-
+		["desc"]="Butterfly Shard, collect the shards to activate or upgrade."
 	}
 }
 local config = {

lua/app/config/strings/en/monster_base.lua

@@ -174,76 +174,76 @@ local monster_base = {
 
 	},
 	[20001]={
-
+		["name"]="Jungle Divine Archer"
 	},
 	[20002]={
-
+		["name"]="Jungle Divine Hunter"
 	},
 	[20003]={
-
+		["name"]="Mighty Dragon"
 	},
 	[20004]={
-
+		["name"]="Elite Goblin"
 	},
 	[20005]={
-
+		["name"]="Ancient Fortress"
 	},
 	[20006]={
-
+		["name"]="Armor the Green Turtle"
 	},
 	[20007]={
 
 	},
 	[20008]={
-
+		["name"]="Rock Giant"
 	},
 	[20009]={
-
+		["name"]="Treant Priest"
 	},
 	[20010]={
-
+		["name"]="Fire Spirit Guardian"
 	},
 	[20011]={
-
+		["name"]="Goblin Golem"
 	},
 	[20012]={
-
+		["name"]="Skeleton King"
 	},
 	[20013]={
-
+		["name"]="Clown King"
 	},
 	[20014]={
-
+		["name"]="Steel Shield Chieftain (green)"
 	},
 	[20015]={
-
+		["name"]="Steel Shield Chieftain (red)"
 	},
 	[20016]={
-
+		["name"]="One-eyed Cyclone"
 	},
 	[20017]={
-
+		["name"]="Skeleton Mage"
 	},
 	[20018]={
-
+		["name"]="Vile Mage"
 	},
 	[20019]={
-
+		["name"]="Fire Spirit Swordsman"
 	},
 	[20020]={
-
+		["name"]="Fire Spirit King"
 	},
 	[20021]={
-
+		["name"]="Zhuo Yide DH"
 	},
 	[20022]={
-
+		["name"]="Yeti Blacksmith"
 	},
 	[20023]={
 
 	},
 	[20024]={
-
+		["name"]="Winged Demon"
 	},
 	[20025]={
 
@@ -252,7 +252,7 @@ local monster_base = {
 
 	},
 	[20027]={
-
+		["name"]="Horton the Red Turtle"
 	},
 	[20028]={
 
@@ -261,70 +261,70 @@ local monster_base = {
 
 	},
 	[20030]={
-
+		["name"]="Demon Shard"
 	},
 	[20031]={
-
+		["name"]="Demon Guardian"
 	},
 	[20032]={
-
+		["name"]="Ancient Demon"
 	},
 	[30001]={
-
+		["name"]="Onion"
 	},
 	[30002]={
-
+		["name"]="Blade Maid"
 	},
 	[30003]={
-
+		["name"]="Iceheart"
 	},
 	[30004]={
-
+		["name"]="Ninja Lun"
 	},
 	[30005]={
-
+		["name"]="Dancer"
 	},
 	[30006]={
-
+		["name"]="Fawn"
 	},
 	[30007]={
-
+		["name"]="Claymore Kid"
 	},
 	[30008]={
-
+		["name"]="Frost Enchantress"
 	},
 	[30009]={
-
+		["name"]="Flare"
 	},
 	[30010]={
-
+		["name"]="Barbarian"
 	},
 	[30011]={
-
+		["name"]="Alexander"
 	},
 	[30012]={
-
+		["name"]="Er-Ya"
 	},
 	[30014]={
-
+		["name"]="Claude"
 	},
 	[30015]={
-
+		["name"]="Witch Kiki"
 	},
 	[30016]={
-
+		["name"]="Mulan"
 	},
 	[30017]={
 
 	},
 	[30019]={
-
+		["name"]="Soul Hunter"
 	},
 	[30020]={
-
+		["name"]="Timberwolf"
 	},
 	[30022]={
-
+		["name"]="Ice Maiden"
 	}
 }
 local config = {

lua/app/config/strings/en/skill.lua

@@ -1,42 +1,42 @@
 local skill = {
 	[1200120]={
-
+		["desc"]="Dispersion Dance: Clear <color=#3cff28>5</color> grids horizontally and deal skill damage once."
 	},
 	[1300120]={
-
+		["desc"]="Claymore Cyclone: Deal skill damage multiple times."
 	},
 	[1300220]={
-
+		["desc"]="Flame Punch: Clear <color=#3cff28>5</color> grids vertically, dealing skill damage once, with a <color=#3cff28>50%</color> chance to inflict Burn for <color=#3cff28>2</color> turns."
 	},
 	[1400120]={
-
+		["desc"]="Steel Strike: Change the color of 4 adjacent elements and deal massive skill damage multiple times."
 	},
 	[2200120]={
-
+		["desc"]="Unsheathe: Deal one additional hit of skill damage."
 	},
 	[2300120]={
-
+		["desc"]="Bone Cyclone: Deal skill damage multiple times."
 	},
 	[2300220]={
-
+		["desc"]="Phantom Blade: Increase the skill damage and deal skill damage multiple times."
 	},
 	[2400120]={
-
+		["desc"]="Claymore Crush: Deal one additional hit of massive skill damage."
 	},
 	[3200120]={
-
+		["desc"]="Lance Thrust: Deal one additional hit of skill damage."
 	},
 	[3300120]={
-
+		["desc"]="Rapid Recovery: Restore HP for this turn."
 	},
 	[3300220]={
 
 	},
 	[3400120]={
-
+		["desc"]="Moon Chaser: Increase damage and deal massive skill damage once."
 	},
 	[4200120]={
-
+		["desc"]="Elemental Link: Clear <color=#3cff28>3</color> random elements and deal skill damage once."
 	},
 	[4300120]={
 
@@ -45,10 +45,10 @@ local skill = {
 
 	},
 	[4400120]={
-
+		["desc"]="Frost Sword Dance: Clear <color=#3cff28>3</color> random elements and deal skill damage once. Inflict Freeze for <color=#3cff28>1</color> turn."
 	},
 	[5200120]={
-
+		["desc"]="Shield Art: Apply a shield to the team for <color=#3cff28>1</color> turn."
 	},
 	[5300120]={
 

lua/app/config/strings/en/skill_rogue.lua

@@ -132,244 +132,244 @@ local skill_rogue = {
 		["desc"]="Turns <color=#3cff28>5</color> random Non-Purple elements into Purple"
 	},
 	[1200100]={
-
+		["desc"]="Unleashed Dispersion Dance: Clear <color=#3cff28>5</color> grids horizontally and deal skill damage once."
 	},
 	[1200101]={
-
+		["desc"]="Dispersion Danc has a <color=#3cff28>30%</color> chance to burn enemies for <color=#3cff28>2</color> turns."
 	},
 	[1200102]={
-
+		["desc"]="When Dispersion Dance is used, normal attack damage increases by <color=#3cff28>10%</color> for this turn."
 	},
 	[1200103]={
-
+		["desc"]="Dispersion Dance deals <color=#3cff28>50%</color> more damage to freeze enemies."
 	},
 	[1200104]={
-
+		["desc"]="Dispersion Dance clears an additional 4 grids vertically."
 	},
 	[1200105]={
-
+		["desc"]="When Dispersion Dance links <color=#3cff28>5</color> or more elements, applies Rage to the team for <color=#3cff28>2</color> turns."
 	},
 	[1200106]={
-
+		["desc"]="Dancer's attack increases by <color=#3cff28>15%</color>."
 	},
 	[1200107]={
-
+		["desc"]="The requirement to apply Rage with Dispersion Dance is reduced to linking more than <color=#3cff28>3</color> elements."
 	},
 	[1300100]={
-
+		["desc"]="Unleashed Claymore Cyclone: Deal skill damage multiple times."
 	},
 	[1300101]={
-
+		["desc"]="Claymore Cyclone can inflict Burn for <color=#3cff28>2</color> turns."
 	},
 	[1300102]={
-
+		["desc"]="Claymore Cyclone deals <color=#3cff28>50%</color> more damage to bleeding enemies."
 	},
 	[1300103]={
-
+		["desc"]="Claymore Cyclone damage increases."
 	},
 	[1300104]={
-
+		["desc"]="Increase the damage of Burn inflicted by Claymore Cyclone."
 	},
 	[1300105]={
-
+		["desc"]="When Claymore Cyclone links <color=#3cff28>4</color> or more elements, increases damage by <color=#3cff28>30%</color> for <color=#3cff28>2</color> turns."
 	},
 	[1300106]={
-
+		["desc"]="Claymore Cyclone damage increase effect lasts +<color=#3cff28>1</color> turns."
 	},
 	[1300107]={
-
+		["desc"]="If Claymore Cyclone kills an enemy, grants the team Rage for <color=#3cff28>2</color> turns."
 	},
 	[1300200]={
-
+		["desc"]="Unleashed Flame Punch: Clear <color=#3cff28>5</color> grids vertically and deal skill damage once. Has a <color=#3cff28>50%</color> chance to inflict Burn for <color=#3cff28>2</color> turns."
 	},
 	[1300201]={
-
+		["desc"]="Flame Punch clears an additional <color=#3cff28>4</color> grids horizontally."
 	},
 	[1300202]={
-
+		["desc"]="Flame Punch deals <color=#3cff28>50%</color> more damage to imprisoned enemies."
 	},
 	[1300203]={
-
+		["desc"]="The chance of Burn inflicted by Flame Punch increases to <color=#3cff28>100%</color>."
 	},
 	[1300204]={
-
+		["desc"]="Flame Punch clears an additional <color=#3cff28>2</color> grids vertically."
 	},
 	[1300205]={
-
+		["desc"]="Increase the damage of Burn inflicted by Flame Punch."
 	},
 	[1300206]={
-
+		["desc"]="Flare's attack increases by <color=#3cff28>15%</color>."
 	},
 	[1300207]={
-
+		["desc"]="Flame Punch will be cast <color=#3cff28>2</color> times."
 	},
 	[1400100]={
-
+		["desc"]="Unleashed Steel Strike: Change the color of 4 adjacent elements and deal massive skill damage multiple times."
 	},
 	[1400101]={
-
+		["desc"]="Steel Strike can inflict Burn for <color=#3cff28>2</color> turns."
 	},
 	[1400102]={
-
+		["desc"]="Steel Strike applies the stun effect for <color=#3cff28>1</color> turns."
 	},
 	[1400103]={
-
+		["desc"]="Steel Strike deals <color=#3cff28>1</color> additional damage to bleeding enemies."
 	},
 	[1400104]={
-
+		["desc"]="Steel Strike stun effect lasts +<color=#3cff28>1</color> turns."
 	},
 	[1400105]={
-
+		["desc"]="Increase the damage of Burn inflicted by Steel Strike. Lasts +<color=#3cff28>1</color> turns."
 	},
 	[1400106]={
-
+		["desc"]="Alexander's attack increases by <color=#3cff28>15%</color>."
 	},
 	[1400107]={
-
+		["desc"]="For every <color=#3cff28>4</color> elements linked, Steel Strike launches 1 Fireball to deal damage."
 	},
 	[2200100]={
-
+		["desc"]="Unleashed Unsheathe: Deal one additional hit of skill damage."
 	},
 	[2200101]={
-
+		["desc"]="Unsheathe damage increases."
 	},
 	[2200102]={
-
+		["desc"]="Unsheathe clears an additional 4 grids vertically."
 	},
 	[2200103]={
-
+		["desc"]="Unsheathe deals <color=#3cff28>50%</color> more damage to burning enemies."
 	},
 	[2200104]={
-
+		["desc"]="Blade Maid's attack increases by <color=#3cff28>15%</color>."
 	},
 	[2200105]={
-
+		["desc"]="Unsheathe will be cast <color=#3cff28>2</color> times."
 	},
 	[2200106]={
-
+		["desc"]="Unsheathe can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[2200107]={
-
+		["desc"]="When Unsheathe links <color=#3cff28>5</color> or more elements, skill damage increases."
 	},
 	[2300100]={
-
+		["desc"]="Unleashed Cyclone Bone: Deal skill damage multiple times."
 	},
 	[2300101]={
-
+		["desc"]="Cyclone Bone can inflict Bleed for <color=#3cff28>2</color> turns."
 	},
 	[2300102]={
-
+		["desc"]="Cyclone Bone damage increases."
 	},
 	[2300103]={
-
+		["desc"]="Cyclone Bone has a <color=#3cff28>50%</color> chance to stun Drowsy enemies for <color=#3cff28>1</color> turns."
 	},
 	[2300104]={
-
+		["desc"]="Cyclone Bone Bleed effect lasts +<color=#3cff28>1</color> turns."
 	},
 	[2300105]={
-
+		["desc"]="For each <color=#3cff28>1</color> enemy that dies from bleeding, Barbarian's damage is increased by <color=#3cff28>10%</color>."
 	},
 	[2300106]={
-
+		["desc"]="Cyclone Bone Stun effect lasts +<color=#3cff28>1</color> turns."
 	},
 	[2300107]={
-
+		["desc"]="Barbarian's attack increases by <color=#3cff28>15%</color>."
 	},
 	[2300200]={
-
+		["desc"]="Unleashed Phantom Blade: Increase the skill damage and deal skill damage multiple times."
 	},
 	[2300201]={
-
+		["desc"]="Phantom Blade can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[2300202]={
-
+		["desc"]="Er-Ya's attack increases by <color=#3cff28>15%</color>."
 	},
 	[2300203]={
-
+		["desc"]="When Phantom Blade is used, normal attack damage increases by <color=#3cff28>10%</color> for this turn."
 	},
 	[2300204]={
-
+		["desc"]="Phantom Blade can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[2300205]={
-
+		["desc"]="When Phantom Blade links <color=#3cff28>4</color> or more elements, critical rate increases by <color=#3cff28>20%</color> for this turn."
 	},
 	[2300206]={
-
+		["desc"]="When Phantom Blade links <color=#3cff28>4</color> or more elements, critical rate increases by <color=#3cff28>30%</color> for this turn."
 	},
 	[2300207]={
-
+		["desc"]="When Phantom Slash is used, critical damage against enemies with below <color=#3cff28>50%</color> HP increases by <color=#3cff28>50%</color> for this turn."
 	},
 	[2400100]={
-
+		["desc"]="Unleashed Claymore Crush: Deal one additional hit of massive skill damage."
 	},
 	[2400101]={
-
+		["desc"]="Claymore Crush can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[2400102]={
-
+		["desc"]="Against frozen enemies, Claymore Crush's damage increases significantly and has a <color=#3cff28>50%</color> chance to inflict Stun that lasts <color=#3cff28>1</color> turn."
 	},
 	[2400103]={
-
+		["desc"]="The chance of Stun inflicted by Claymore Crush increases to <color=#3cff28>70%</color>."
 	},
 	[2400104]={
-
+		["desc"]="Claymore Kid's attack increases by <color=#3cff28>15%</color>."
 	},
 	[2400105]={
-
+		["desc"]="Claymore Crush's damage increases significantly and has a <color=#3cff28>50%</color> chance to inflict Imprison that lasts <color=#3cff28>1</color> turn."
 	},
 	[2400106]={
-
+		["desc"]="The chance of Imprison inflicted by Claymore Crush increases to <color=#3cff28>70%</color>."
 	},
 	[2400107]={
-
+		["desc"]="Claymore Crush deals double damage."
 	},
 	[3200100]={
-
+		["desc"]="Unleashed Lance Thrust: Deal one additional hit of skill damage."
 	},
 	[3200101]={
-
+		["desc"]="Lance Thrust can restore HP."
 	},
 	[3200102]={
-
+		["desc"]="Lance Thrust deals <color=#3cff28>50%</color> more damage to poisoned enemies."
 	},
 	[3200103]={
-
+		["desc"]="Lance Thrust damage increases."
 	},
 	[3200104]={
-
+		["desc"]="Lance Thrust can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[3200105]={
-
+		["desc"]="Lance Thrust has a <color=#3cff28>30%</color> chance to stun enemies for <color=#3cff28>1</color> turns."
 	},
 	[3200106]={
-
+		["desc"]="The chance of Stun inflicted by Lance Thrust increases by <color=#3cff28>20%</color>."
 	},
 	[3200107]={
-
+		["desc"]="After Lance Thrust is used, the team gains <color=#3cff28>20%</color> block for <color=#3cff28>2</color> turns."
 	},
 	[3300100]={
-
+		["desc"]="Unleashed Rapid Recovery: Restore HP for this turn."
 	},
 	[3300101]={
-
+		["desc"]="Rapid Recovery's HP recovery effect is increased."
 	},
 	[3300102]={
-
+		["desc"]="When Rapid Recovery is used, normal attack damage increases by <color=#3cff28>15%</color> for this turn."
 	},
 	[3300103]={
-
+		["desc"]="Rapid Recovery can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[3300104]={
-
+		["desc"]="Rapid Recovery increases additional skill damage to the team for <color=#3cff28>2</color> turns."
 	},
 	[3300105]={
-
+		["desc"]="When Rapid Recovery is used, normal attacks recover HP for this turn."
 	},
 	[3300106]={
-
+		["desc"]="Rapid Recovery skill damage increase effect lasts +<color=#3cff28>1</color> turns."
 	},
 	[3300107]={
-
+		["desc"]="When Rapid Recovery links <color=#3cff28>5</color> or more elements, HP recovery effect increases."
 	},
 	[3300200]={
 
@@ -396,52 +396,52 @@ local skill_rogue = {
 
 	},
 	[3400100]={
-
+		["desc"]="Unleashed Moonchaser: Increase damage and deal massive skill damage once."
 	},
 	[3400101]={
-
+		["desc"]="Moonchaser can inflict Vulnerable for <color=#3cff28>2</color> turns."
 	},
 	[3400102]={
-
+		["desc"]="Moonchaser clears an additional 4 grids vertically."
 	},
 	[3400103]={
-
+		["desc"]="Mulan's attack increases by <color=#3cff28>15%</color>."
 	},
 	[3400104]={
-
+		["desc"]="Vulnerable effect of Moonchaser increases."
 	},
 	[3400105]={
-
+		["desc"]="Moonchaser can inflict Bleed for <color=#3cff28>2</color> turns."
 	},
 	[3400106]={
-
+		["desc"]="Bleed effect of Moonchaser increases."
 	},
 	[3400107]={
-
+		["desc"]="When Moonchaser links <color=#3cff28>4</color> or more elements, it will be cast by <color=#3cff28>2</color> times."
 	},
 	[4200100]={
-
+		["desc"]="Unleashed Elemental Link: Clear <color=#3cff28>3</color> random elements and deal skill damage once."
 	},
 	[4200101]={
-
+		["desc"]="Elemental Link clears <color=#3cff28>2</color> more random elements."
 	},
 	[4200102]={
-
+		["desc"]="When Elemental Link is used, normal attack damage increases by <color=#3cff28>10%</color> for this turn."
 	},
 	[4200103]={
-
+		["desc"]="Elemental Link has a <color=#3cff28>50%</color> chance to inflict freeze for <color=#3cff28>2</color> turns."
 	},
 	[4200104]={
-
+		["desc"]="Elemental Link clears <color=#3cff28>2</color> more random elements."
 	},
 	[4200105]={
-
+		["desc"]="Elemental Link has a <color=#3cff28>50%</color> chance to inflict frozen to freeze enemies for <color=#3cff28>1</color> turn."
 	},
 	[4200106]={
-
+		["desc"]="Iceheart's attack increases by <color=#3cff28>15%</color>."
 	},
 	[4200107]={
-
+		["desc"]="The chance of Frozen inflicted by Elemental Link increases to <color=#3cff28>40%</color>."
 	},
 	[4300100]={
 
@@ -492,52 +492,52 @@ local skill_rogue = {
 
 	},
 	[4400100]={
-
+		["desc"]="Unleashed Frost Sword Dance: Clear <color=#3cff28>3</color> random elements and deal skill damage once. Inflict Freeze for <color=#3cff28>1</color> turn."
 	},
 	[4400101]={
-
+		["desc"]="Frost Sword Dance Freeze effect lasts +<color=#3cff28>1</color> turns."
 	},
 	[4400102]={
-
+		["desc"]="Frost Sword Dance deals <color=#3cff28>50%</color> more damage to burning enemies."
 	},
 	[4400103]={
-
+		["desc"]="Frost Sword Dance clears <color=#3cff28>3</color> more random elements."
 	},
 	[4400104]={
-
+		["desc"]="Freeze effect of Frost Sword Dance increases."
 	},
 	[4400105]={
-
+		["desc"]="Frost Sword Dance has a <color=#3cff28>50%</color> chance to inflict frozen for <color=#3cff28>2</color> turns."
 	},
 	[4400106]={
-
+		["desc"]="Frost Enchantress' attack increases by <color=#3cff28>15%</color>."
 	},
 	[4400107]={
-
+		["desc"]="The chance of Frozen inflicted by Frost Sword Dance increases to <color=#3cff28>70%</color>."
 	},
 	[5200100]={
-
+		["desc"]="Unleashed Shield Art: Apply a shield to the team for <color=#3cff28>1</color> turn."
 	},
 	[5200101]={
-
+		["desc"]="The shield from Shield Art absorbs more damage."
 	},
 	[5200102]={
-
+		["desc"]="Shield Art have a <color=#3cff28>10%</color> chance of poisoning with this attack for <color=#3cff28>2</color> turns when used."
 	},
 	[5200103]={
-
+		["desc"]="Shield from Shield Art lasts +<color=#3cff28>1</color> turns."
 	},
 	[5200104]={
-
+		["desc"]="Shield Art can clear additional <color=#3cff28>4</color> grids in the X direction."
 	},
 	[5200105]={
-
+		["desc"]="Shield from Shield Art can reflect <color=#3cff28>200%</color> of damage."
 	},
 	[5200106]={
-
+		["desc"]="Ninja Lun's attack increases by <color=#3cff28>15%</color>."
 	},
 	[5200107]={
-
+		["desc"]="Damage counter effect of the shield from Shield Art is doubled."
 	},
 	[5300100]={
 

lua/app/config/strings/en/task.lua

@@ -1,279 +1,279 @@
 local task = {
 	[1]={
-
+		["desc"]="Ads watched"
 	},
 	[2]={
-
+		["desc"]="Complete all daily quests"
 	},
 	[3]={
-
+		["desc"]="Ads Time"
 	},
 	[4]={
-
+		["desc"]="Obtain Gold Coins"
 	},
 	[5]={
-
+		["desc"]="Obtain Gold Coins"
 	},
 	[6]={
-
+		["desc"]="Obtain Gold Coins"
 	},
 	[7]={
-
+		["desc"]="Obtain Gold Coins"
 	},
 	[8]={
-
+		["desc"]="Obtain Diamonds"
 	},
 	[9]={
-
+		["desc"]="Obtain Diamonds"
 	},
 	[10]={
-
+		["desc"]="Obtain Diamonds"
 	},
 	[11]={
-
+		["desc"]="Obtain Diamonds"
 	},
 	[12]={
-
+		["desc"]="Spend Gold Coins"
 	},
 	[13]={
-
+		["desc"]="Spend Gold Coins"
 	},
 	[14]={
-
+		["desc"]="Spend Gold Coins"
 	},
 	[15]={
-
+		["desc"]="Spend Gold Coins"
 	},
 	[16]={
-
+		["desc"]="Spend Diamonds"
 	},
 	[17]={
-
+		["desc"]="Spend Diamonds"
 	},
 	[18]={
-
+		["desc"]="Spend Diamonds"
 	},
 	[19]={
-
+		["desc"]="Spend Diamonds"
 	},
 	[20]={
-
+		["desc"]="Open Any Chest in the Shop"
 	},
 	[21]={
-
+		["desc"]="Open Any Chest in the Shop"
 	},
 	[22]={
-
+		["desc"]="Open Any Chest in the Shop"
 	},
 	[23]={
-
+		["desc"]="Open Any Chest in the Shop"
 	},
 	[24]={
-
+		["desc"]="Open Epic Chest in the Shop"
 	},
 	[25]={
-
+		["desc"]="Open Epic Chest in the Shop"
 	},
 	[26]={
-
+		["desc"]="Open Epic Chest in the Shop"
 	},
 	[27]={
-
+		["desc"]="Open Epic Chest in the Shop"
 	},
 	[28]={
-
+		["desc"]="Open skill lamp in the stage"
 	},
 	[29]={
-
+		["desc"]="Open skill lamp in the stage"
 	},
 	[30]={
-
+		["desc"]="Open skill lamp in the stage"
 	},
 	[31]={
-
+		["desc"]="Open skill lamp in the stage"
 	},
 	[32]={
-
+		["desc"]="Win the battle"
 	},
 	[33]={
-
+		["desc"]="Win the battle"
 	},
 	[34]={
-
+		["desc"]="Win the battle"
 	},
 	[35]={
-
+		["desc"]="Win the battle"
 	},
 	[36]={
-
+		["desc"]="Upgrade Hero"
 	},
 	[37]={
-
+		["desc"]="Upgrade Hero"
 	},
 	[38]={
-
+		["desc"]="Upgrade Hero"
 	},
 	[39]={
-
+		["desc"]="Upgrade Hero"
 	},
 	[40]={
-
+		["desc"]="Obtain Hero Shard"
 	},
 	[41]={
-
+		["desc"]="Obtain Hero Shard"
 	},
 	[42]={
-
+		["desc"]="Obtain Hero Shard"
 	},
 	[43]={
-
+		["desc"]="Obtain Hero Shard"
 	},
 	[44]={
-
+		["desc"]="Kill boss"
 	},
 	[45]={
-
+		["desc"]="Kill boss"
 	},
 	[46]={
-
+		["desc"]="Kill boss"
 	},
 	[47]={
-
+		["desc"]="Kill boss"
 	},
 	[48]={
-
+		["desc"]="Kill minions"
 	},
 	[49]={
-
+		["desc"]="Kill minions"
 	},
 	[50]={
-
+		["desc"]="Kill minions"
 	},
 	[51]={
-
+		["desc"]="Kill minions"
 	},
 	[52]={
-
+		["desc"]="Elements cleared"
 	},
 	[53]={
-
+		["desc"]="Elements cleared"
 	},
 	[54]={
-
+		["desc"]="Elements cleared"
 	},
 	[55]={
-
+		["desc"]="Elements cleared"
 	},
 	[56]={
-
+		["desc"]="6-Links"
 	},
 	[57]={
-
+		["desc"]="6-Links"
 	},
 	[58]={
-
+		["desc"]="6-Links"
 	},
 	[59]={
-
+		["desc"]="6-Links"
 	},
 	[60]={
-
+		["desc"]="8-Links"
 	},
 	[61]={
-
+		["desc"]="8-Links"
 	},
 	[62]={
-
+		["desc"]="8-Links"
 	},
 	[63]={
-
+		["desc"]="8-Links"
 	},
 	[64]={
-
+		["desc"]="10 Combos or more in battle"
 	},
 	[65]={
-
+		["desc"]="10 Combos or more in battle"
 	},
 	[66]={
-
+		["desc"]="10 Combos or more in battle"
 	},
 	[67]={
-
+		["desc"]="10 Combos or more in battle"
 	},
 	[68]={
-
+		["desc"]="Skills released in battle"
 	},
 	[69]={
-
+		["desc"]="Skills released in battle"
 	},
 	[70]={
-
+		["desc"]="Skills released in battle"
 	},
 	[71]={
-
+		["desc"]="Skills released in battle"
 	},
 	[72]={
-
+		["desc"]="Clear battle waves"
 	},
 	[73]={
-
+		["desc"]="Clear battle waves"
 	},
 	[74]={
-
+		["desc"]="Clear battle waves"
 	},
 	[75]={
-
+		["desc"]="Clear battle waves"
 	},
 	[76]={
-
+		["desc"]="Obtain Gold Coins"
 	},
 	[77]={
-
+		["desc"]="Obtain Diamonds"
 	},
 	[78]={
-
+		["desc"]="Spend Diamonds"
 	},
 	[79]={
-
+		["desc"]="Open Any Chest in the Shop"
 	},
 	[80]={
-
+		["desc"]="Open Epic Chest in the Shop"
 	},
 	[81]={
-
+		["desc"]="Open skill lamp in the stage"
 	},
 	[82]={
-
+		["desc"]="Win the battle"
 	},
 	[83]={
-
+		["desc"]="Upgrade Hero"
 	},
 	[84]={
-
+		["desc"]="Obtain Hero Shard"
 	},
 	[85]={
-
+		["desc"]="Kill boss"
 	},
 	[86]={
-
+		["desc"]="Kill minions"
 	},
 	[87]={
-
+		["desc"]="Elements cleared"
 	},
 	[88]={
-
+		["desc"]="6-Links"
 	},
 	[89]={
-
+		["desc"]="8-Links"
 	},
 	[90]={
-
+		["desc"]="10 Combos or more in battle"
 	},
 	[91]={
-
+		["desc"]="Skills released in battle"
 	},
 	[92]={
-
+		["desc"]="Clear battle waves"
 	}
 }
 local config = {

lua/app/config/strings/fpt/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/fr/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/id/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/ja/item.lua

@@ -12,112 +12,112 @@ local item = {
 		["desc"]="ステージクリアに必要なのは、当然スタミナだぜ。"
 	},
 	[4]={
-
+		["name"]="Uncommon Hero"
 	},
 	[5]={
-
+		["name"]="Rare Hero"
 	},
 	[6]={
-
+		["name"]="Epic Hero"
 	},
 	[7]={
-
+		["name"]="Pass Point"
 	},
 	[8]={
-
+		["name"]="Wooden Box"
 	},
 	[9]={
-
+		["name"]="Wooden Chest"
 	},
 	[10]={
-
+		["name"]="Gold Chest"
 	},
 	[11]={
-
+		["name"]="Platinum Chest"
 	},
 	[12]={
-
+		["name"]="EXP"
 	},
 	[13]={
-
+		["name"]="Common Key"
 	},
 	[14]={
-
+		["name"]="Exquisite Key"
 	},
 	[15]={
-
+		["name"]="Precious Key"
 	},
 	[16]={
-
+		["name"]="Quest Chest"
 	},
 	[17]={
-
+		["name"]="Ad Chest"
 	},
 	[18]={
-
+		["name"]="Platinum Large Chest"
 	},
 	[19]={
-
+		["name"]="Random Shard"
 	},
 	[12001]={
-
+		["name"]="Dancer Shard"
 	},
 	[13001]={
-
+		["name"]="Claude Shard"
 	},
 	[13002]={
-
+		["name"]="Flare Shard"
 	},
 	[14001]={
-
+		["name"]="Alexander Shard"
 	},
 	[22001]={
-
+		["name"]="Blade Maid Shard"
 	},
 	[23001]={
-
+		["name"]="Barbarian Shard"
 	},
 	[23002]={
-
+		["name"]="Er-Ya Shard"
 	},
 	[24001]={
-
+		["name"]="Claymore Kid Shard"
 	},
 	[32001]={
-
+		["name"]="Onion Shard"
 	},
 	[33001]={
-
+		["name"]="Fawn Shard"
 	},
 	[33002]={
-
+		["name"]="Timberwolf Shard"
 	},
 	[34001]={
-
+		["name"]="Mulan Shard"
 	},
 	[42001]={
-
+		["name"]="Iceheart Shard"
 	},
 	[43001]={
-
+		["name"]="Ice Maiden Shard"
 	},
 	[43002]={
-
+		["name"]="Raven Shard"
 	},
 	[44001]={
-
+		["name"]="Frost Enchantress Shard"
 	},
 	[52001]={
-
+		["name"]="Ninja Lun Shard"
 	},
 	[53001]={
-
+		["name"]="Witch Kiki Shard"
 	},
 	[53002]={
-
+		["name"]="Soul Hunter Shard"
 	},
 	[54001]={
-
+		["name"]="Butterfly Shard"
 	}
 }
 local config = {

lua/app/config/strings/jp/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/ko/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/ru/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/th/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/vi/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/zh/buff.lua

@@ -1,122 +1,152 @@
 local buff = {
 	[7]={
 		["id"]=7,
+		["desc"]="紅色抗性：受到紅色元素英雄的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="dec_dmg_red_add"
 	},
 	[8]={
 		["id"]=8,
+		["desc"]="黃色抗性：受到黃色元素英雄的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="dec_dmg_yellow_add"
 	},
 	[9]={
 		["id"]=9,
+		["desc"]="綠色抗性：受到綠色元素英雄的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="dec_dmg_green_add"
 	},
 	[10]={
 		["id"]=10,
+		["desc"]="藍色抗性：受到藍色元素英雄的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="dec_dmg_blue_add"
 	},
 	[11]={
 		["id"]=11,
+		["desc"]="紫色抗性：受到紫色元素英雄的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="dec_dmg_purple_add"
 	},
 	[12]={
 		["id"]=12,
+		["desc"]="極致抗性：受到所有英雄的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="dec_dmg_all_add"
 	},
 	[24]={
 		["id"]=24,
+		["desc"]="傷害提升：造成的傷害提升{0}。",
 		["name"]="dmg_addition_all_add"
 	},
 	[33]={
 		["id"]=33,
+		["desc"]="暈眩：本回合無法行動。",
 		["name"]="stun"
 	},
 	[34]={
 		["id"]=34,
+		["desc"]="護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。",
 		["name"]="shield"
 	},
 	[36]={
 		["id"]=36,
+		["desc"]="冰霜：普攻次數-<color=#3cff28>{0}</color>。",
 		["name"]="normal_attack_dec"
 	},
 	[37]={
 		["id"]=37,
+		["desc"]="亢奮：普攻次數+<color=#3cff28>{0}</color>。",
 		["name"]="normal_attack_add"
 	},
 	[47]={
 		["id"]=47,
+		["desc"]="反傷護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>200%</color>敵方傷害。",
 		["name"]="shield_rebound_200"
 	},
 	[48]={
 		["id"]=48,
+		["desc"]="灼燒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
 		["name"]="burn"
 	},
 	[49]={
 		["id"]=49,
+		["desc"]="易傷：受到所有傷害提高<color=#3cff28>{0}</color>。",
 		["name"]="vulnerable"
 	},
 	[50]={
 		["id"]=50,
+		["desc"]="凍結：本回合無法行動，且增益效果無效。",
 		["name"]="frozen"
 	},
 	[51]={
 		["id"]=51,
+		["desc"]="中毒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
 		["name"]="poison"
 	},
 	[52]={
 		["id"]=52,
+		["desc"]="禁錮：本回合只可使用普攻。",
 		["name"]="imprison"
 	},
 	[53]={
 		["id"]=53,
+		["desc"]="腐敗：生命回復效果降低<color=#3cff28>{0}</color>。",
 		["name"]="corrupt"
 	},
 	[54]={
 		["id"]=54,
+		["desc"]="流血：受擊時回復攻擊者生命，回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
 		["name"]="bleed"
 	},
 	[55]={
 		["id"]=55,
+		["desc"]="虛弱：造成的傷害降低<color=#3cff28>{0}</color>。",
 		["name"]="weaken"
 	},
 	[56]={
 		["id"]=56,
+		["desc"]="昏睡：本回合無法行動，受擊會移去效果。",
 		["name"]="lethargy"
 	},
 	[57]={
 		["id"]=57,
+		["desc"]="詛咒：攻擊不會造成傷害，而會治療對方。",
 		["name"]="curse"
 	},
 	[58]={
 		["id"]=58,
+		["desc"]="鎖定：隨機鎖定棋盤上的一種顏色，無法選中。",
 		["name"]="lock"
 	},
 	[59]={
 		["id"]=59,
+		["desc"]="先手：每回合都率先出手。",
 		["name"]="first_hand"
 	},
 	[61]={
 		["id"]=61,
+		["desc"]="不死：受到致命傷害不會死亡。",
 		["name"]="undead"
 	},
 	[62]={
 		["id"]=62,
+		["desc"]="反擊：受到直接傷害時有<color=#3cff28>{0}</color>的機率進行反擊。",
 		["name"]="counterattack"
 	},
 	[63]={
 		["id"]=63,
+		["desc"]="反傷：反彈<color=#3cff28>{0}</color>敵方傷害。",
 		["name"]="thorns"
 	},
 	[73]={
 		["id"]=73,
+		["desc"]="反傷護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>400%</color>敵方傷害。",
 		["name"]="shield_rebound_400"
 	},
 	[74]={
 		["id"]=74,
+		["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。",
 		["name"]="shield_ice"
 	},
 	[75]={
 		["id"]=75,
+		["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>400%</color>敵方傷害。",
 		["name"]="shield_ice_rebound_400"
 	}
 }

lua/app/config/strings/zh/chapter.lua

@@ -1,93 +1,93 @@
 local chapter = {
 	[1]={
-
+		["name"]="1.小鎮廣場"
 	},
 	[2]={
-
+		["name"]="2.小鎮堡壘"
 	},
 	[3]={
-
+		["name"]="3.小鎮礦山"
 	},
 	[4]={
-
+		["name"]="4.幽暗礦洞"
 	},
 	[5]={
-
+		["name"]="5.帝國邊境"
 	},
 	[6]={
-
+		["name"]="6.異雪叢林（西）"
 	},
 	[7]={
-
+		["name"]="7.異雪叢林（東）"
 	},
 	[8]={
-
+		["name"]="8.城堡外圍"
 	},
 	[9]={
-
+		["name"]="9.城堡正門"
 	},
 	[10]={
-
+		["name"]="10.帝國城堡"
 	},
 	[11]={
-
+		["name"]="11.城堡深處"
 	},
 	[12]={
-
+		["name"]="12.城堡密道"
 	},
 	[13]={
-
+		["name"]="13.密道出口"
 	},
 	[14]={
-
+		["name"]="14.城堡湖畔"
 	},
 	[15]={
-
+		["name"]="15.湖畔東岸"
 	},
 	[16]={
-
+		["name"]="16.腐敗沼澤"
 	},
 	[17]={
-
+		["name"]="17.沼澤遺跡"
 	},
 	[18]={
-
+		["name"]="18.雨林入口"
 	},
 	[19]={
-
+		["name"]="19.熱帶雨林"
 	},
 	[20]={
-
+		["name"]="20.巨大神廟"
 	},
 	[21]={
-
+		["name"]="21.神廟下方"
 	},
 	[22]={
-
+		["name"]="22.神秘祭壇"
 	},
 	[23]={
-
+		["name"]="23.惡魔祭壇"
 	},
 	[24]={
-
+		["name"]="24.奇怪洞穴"
 	},
 	[25]={
-
+		["name"]="25.洞穴深處"
 	},
 	[26]={
-
+		["name"]="26.魔都西街"
 	},
 	[27]={
-
+		["name"]="27.魔都東街"
 	},
 	[28]={
-
+		["name"]="28.魔都中心"
 	},
 	[29]={
-
+		["name"]="29.魔都通路"
 	},
 	[30]={
-
+		["name"]="30.魔都出口"
 	}
 }
 local config = {

lua/app/config/strings/zh/func_open.lua

@@ -1,5 +1,8 @@
 local func_open = {
-	["bounty"]={
+	["act_gold_pig"]={
+
+	},
+	["bounty_open"]={
 
 	},
 	["task"]={
@@ -20,17 +23,29 @@ local func_open = {
 	["mall_daily"]={
 
 	},
-	["store_box"]={
+	["store_box_open"]={
 
 	},
-	["store_box_3"]={
+	["store_box_3_open"]={
 
 	},
 	["daily_challenge"]={
 
+	},
+	["act_gift_show_open"]={
+
+	},
+	["first_charge"]={
+
+	},
+	["new_player_gift"]={
+
+	},
+	["mail_open"]={
+
 	}
 }
 local config = {
-data=func_open,count=10
+data=func_open,count=15
 }
 return config

lua/app/config/strings/zh/global.lua

@@ -56,6 +56,82 @@ local localization_global =
     ["CLICK_COPY_ACOUNT_DESC"] = "點擊複製用戶ID",
     ["APP"] = "版本號：",
     ["CHAPTER_DESC_1"] = "最高紀錄：{0}",
+    ["SETTING_DESC"] = "設定",
+    ["SETTING_DESC_MUSIC"] = "音樂",
+    ["SETTING_DESC_VOICE"] = "音效",
+    ["SETTING_DESC_LANGUAGE"] = "語言",
+    ["SERVICE_DESC"] = "使用條款",
+    ["PRIVACY_DESC"] = "隱私政策",
+    ["CLIENT_VERSION"] = "目前版本:{0}",
+    ["BIND_ACCOUNT_DESC"] = "綁定帳號",
+    ["CHANGE_ACCOUNT_DESC"] = "切換帳號",
+    ["DELETE_ACCOUNT_DESC"] = "刪除帳號",
+    ["SETTING_DESC_1"] = "ID:{0}",
+    ["ACCOUNT_ALREADY_BINDED_DESC"] = "已綁定",
+    ["LANGUAGE_DESC"] = "語言",
+    ["ACT_SEVENDAY_TITLE"] = "開服嘉年華",
+    ["ACT_SEVENDAY_LEFTTIME"] = "剩餘時間：{0}天{1}小時",
+    ["ACT_SEVENDAY_TASK"] = "任務完成：{0}/{1}",
+    ["ACT_SEVENDAY_DESC"] = "每日將開啟新的任務。",
+    ["BTN_CLAIM"] = "領取",
+    ["BTN_DONE"] = "已領取",
+    ["BOUNTY_BUY_LEVEL_TITLE"] = "確認解鎖等級",
+    ["BOUNTY_BUY_LEVEL_COUNTENT"] = "立即解鎖目前等級\n等級獎勵將立即解鎖，你收集到的積分數量不變",
+    ["BOUNTY_PURCHASE_NAME"] = "黃金通行證",
+    ["BOUNTY_DESC_1"] = "解鎖獎勵和獎勵任務",
+    ["BOUNTY_DESC_2"] = "獲得高級通行證，+10級，立即獲得更多獎勵！",
+    ["REWARD_BOX_DESC"] = "獎勵寶箱",
+    ["BOUNTY_DESC_3"] = "當你完成通行證上的所有內容,之後每1000積分可以獲取一個獎勵寶箱",
+    ["STR_MAX"] = "MAX",
+    ["ALREADY_ACTIVE"] = "已激活",
+    ["ACTIVE_BOUNTY"] = "啟用黃金通行證",
+    ["BOUNTY_FREE_NAME"] = "免費通行證",
+    ["CONFIRM_IGNORE"] = "今日不再提示",
+    ["MAIL_NAME"] = "郵箱",
+    ["COLLET_REWARDS"] = "收集獎勵",
+    ["TASK_NAME"] = "任務",
+    ["TASK_DAILY"] = "日常",
+    ["TASK_CHALLENGE"] = "挑戰",
+    ["TASK_HELP_1"] = "每日刷新，刷新後任務將重置，可以觀看廣告刷新任務",
+    ["STR_REFRESH"] = "刷新",
+    ["STR_UNLOCK"] = "解鎖",
+    ["TASK_DESC_1"] = "通行證專屬任務",
+    ["STR_COMPLETED"] = "已完成",
+    ["HERO_CARD_TIPS_DESC"] = "可能會獲得以下英雄卡牌：",
+    ["HERO_CARD_DESC_QLT_2"] = "優秀英雄",
+    ["HERO_CARD_DESC_QLT_3"] = "稀有英雄",
+    ["HERO_CARD_DESC_QLT_4"] = "史詩英雄",
+    ["HERO_CARD_DESC_QLT_5"] = "傳說英雄",
+    ["HERO_CARD_DESC_QLT_6"] = "神話英雄",
+    ["IDLE_DROP_REWARD"] = "挂機獎勵",
+    ["IDLE_DROP_DESC_1"] = "章節越後面，收益越多",
+    ["PER_HOUR"] = "{0}/小時",
+    ["IDLE_DROP_DESC_2"] = "最長挂機{0}小時",
+    ["IDLE_QUICK"] = "快速挂機",
+    ["IDLE_DROP_DESC_3"] = "立即領取{0}小時的挂機收益",
+    ["STR_FREE"] = "免費",
+    ["TODAY_REMAIN_TIMES"] = "今日剩餘{0}次",
+    ["BUY_ENERGY"] = "購買體力",
+    ["MAIL_TITLE"] = "郵箱",
+    ["BTN_DELETE_ALL_READ_MAIL"] = "刪除已讀郵件",
+    ["BTN_CLAIM_ALL"] = "全部領取",
+    ["BTN_READ"] = "讀取",
+    ["BATTLE_DESC_9"] = "{0}攻擊力：<color=#ffffff>{1}</color>",
+    ["BATTLE_DESC_10"] = "已啟用效果",
+    ["BLOCK_DESC"] = "格擋",
+    ["COUNTER_ATTACK_DESC"] = "反擊",
+    ["EXPIRES_IN_HOURS"] = "{0}小時到期",
+    ["EXTRA_REWARDS"] = "額外獎勵",
+    ["PLAYER_LEVEL_UP_DESC"] = "恭喜等級達到{0}級",
+    ["LEVEL_UP_REWARD"] = "升級獎勵",
+    ["CLICK_TO_CONTINUE"] = "點擊繼續",
+    ["BOUNTY_DESC_4"] = "購買此通行證會超過通行證等級上限，將會造成損失，確定要購買嗎？",
+    ["RELOGIN"] = "重新登入",
+    ["GOLD_PIG_CLOSE_DESC"] = "金豬期限已到，請把握下次機會",
+    ["GOLD_PIG_TITLE"] = "超值金豬",
+    ["GOLD_PIG_DESC"] = "挑戰關卡並收集鑽石，你就可以得到一筆划算的交易。",
+    ["SIDE_BAR_FULL"] = "MAX",
+    ["DAILY_CHALLENGE"] = "每日挑戰",
 }
 
 return localization_global

lua/app/config/strings/zh/hero.lua

@@ -1,63 +1,63 @@
 local hero = {
 	[12001]={
-
+		["name"]="舞孃"
 	},
 	[13001]={
-
+		["name"]="克勞德"
 	},
 	[13002]={
-
+		["name"]="火旺"
 	},
 	[14001]={
-
+		["name"]="亞歷山大"
 	},
 	[22001]={
-
+		["name"]="刀妹"
 	},
 	[23001]={
-
+		["name"]="野蠻人"
 	},
 	[23002]={
-
+		["name"]="二丫"
 	},
 	[24001]={
-
+		["name"]="巨劍魔童"
 	},
 	[32001]={
-
+		["name"]="洋蔥頭"
 	},
 	[33001]={
-
+		["name"]="小鹿"
 	},
 	[33002]={
-
+		["name"]="森林之狼"
 	},
 	[34001]={
-
+		["name"]="木蘭"
 	},
 	[42001]={
-
+		["name"]="冰心"
 	},
 	[43001]={
-
+		["name"]="冰女"
 	},
 	[43002]={
-
+		["name"]="烏鴉姐"
 	},
 	[44001]={
-
+		["name"]="寒冰妖姬"
 	},
 	[52001]={
-
+		["name"]="忍者倫"
 	},
 	[53001]={
-
+		["name"]="魔女琪琪"
 	},
 	[53002]={
-
+		["name"]="靈魂獵手"
 	},
 	[54001]={
-
+		["name"]="胡蝶"
 	}
 }
 local config = {

lua/app/config/strings/zh/item.lua

@@ -24,103 +24,136 @@ local item = {
 		["desc"]="可以獲得史詩英雄。"
 	},
 	[7]={
-
+		["name"]="通行證積分",
+		["desc"]="累積積分可提高通行證等級。"
 	},
 	[8]={
-
+		["name"]="木盒子",
+		["desc"]="可以開出以上品級英雄。"
 	},
 	[9]={
-
+		["name"]="木箱子",
+		["desc"]="可以開出以上品級英雄。"
 	},
 	[10]={
-
+		["name"]="金箱子",
+		["desc"]="用黃金裝飾的英雄寶箱。"
 	},
 	[11]={
-
+		["name"]="白金箱子",
+		["desc"]="厲害的英雄都在這裡。"
 	},
 	[12]={
-
+		["name"]="經驗",
+		["desc"]="累積達到特定數量可升級。"
 	},
 	[13]={
-
+		["name"]="普通鑰匙",
+		["desc"]="可以在商城開啟普通寶箱。"
 	},
 	[14]={
-
+		["name"]="精緻鑰匙",
+		["desc"]="可以在商城開啟精緻寶箱。"
 	},
 	[15]={
-
+		["name"]="珍貴鑰匙",
+		["desc"]="可以在商城開啟珍貴寶箱。"
 	},
 	[16]={
-
+		["name"]="任務寶箱",
+		["desc"]="完成5個日常任務可獲得。"
 	},
 	[17]={
-
+		["name"]="廣告寶箱",
+		["desc"]="你可以在遊戲中任何地方看廣告，獲取獎勵。"
 	},
 	[18]={
-
+		["name"]="白金大箱子",
+		["desc"]="大大的白金箱子！"
 	},
 	[19]={
-
+		["name"]="隨機碎片",
+		["desc"]="挂機可獲得隨機碎片，領取數量和品級將根據關卡提高。"
 	},
 	[12001]={
-		["desc"]="洛克西英雄碎片,湊齊可解鎖或升級。"
+		["name"]="舞孃碎片",
+		["desc"]="舞娘碎片，湊齊可激活或升級。"
 	},
 	[13001]={
-		["desc"]="卡拉英雄碎片,湊齊可解鎖或升級。"
+		["name"]="克勞德碎片",
+		["desc"]="克勞德碎片，湊齊可激活或升級。"
 	},
 	[13002]={
-		["desc"]="巨劍羅伯特英雄碎片,湊齊可解鎖或升級。"
+		["name"]="火旺碎片",
+		["desc"]="火旺碎片，湊齊可激活或升級。"
 	},
 	[14001]={
-		["desc"]="阿斯克英雄碎片,湊齊可解鎖或升級。"
+		["name"]="亞歷山大碎片",
+		["desc"]="亞歷山大碎片，湊齊可激活或升級。"
 	},
 	[22001]={
-		["desc"]="艾芙琳英雄碎片,湊齊可解鎖或升級。"
+		["name"]="刀妹碎片",
+		["desc"]="刀妹碎片，湊齊可激活或升級。"
 	},
 	[23001]={
-		["desc"]="莉莉絲英雄碎片,湊齊可解鎖或升級。"
+		["name"]="野蠻人碎片",
+		["desc"]="野蠻人碎片，湊齊可激活或升級。"
 	},
 	[23002]={
-		["desc"]="白髮凱瑟琳英雄碎片,湊齊可解鎖或升級。"
+		["name"]="二丫碎片",
+		["desc"]="二丫碎片，湊齊可激活或升級。"
 	},
 	[24001]={
-		["desc"]="艾倫英雄碎片,湊齊可解鎖或升級。"
+		["name"]="巨劍魔童碎片",
+		["desc"]="巨劍魔童碎片，湊齊可激活或升級。"
 	},
 	[32001]={
-
+		["name"]="洋蔥頭碎片",
+		["desc"]="洋蔥頭碎片，湊齊可激活或升級。"
 	},
 	[33001]={
-
+		["name"]="小鹿碎片",
+		["desc"]="小鹿碎片，湊齊可激活或升級。"
 	},
 	[33002]={
-
+		["name"]="森林之狼碎片",
+		["desc"]="森林狼碎片，湊齊可激活或升級。"
 	},
 	[34001]={
-
+		["name"]="木蘭碎片",
+		["desc"]="木蘭碎片，湊齊可激活或升級。"
 	},
 	[42001]={
-
+		["name"]="冰心碎片",
+		["desc"]="冰心碎片，湊齊可激活或升級。"
 	},
 	[43001]={
-
+		["name"]="冰女碎片",
+		["desc"]="冰女碎片，湊齊可激活或升級。"
 	},
 	[43002]={
-
+		["name"]="烏鴉姐碎片",
+		["desc"]="鴉姐碎片，湊齊可激活或升級。"
 	},
 	[44001]={
-
+		["name"]="寒冰妖姬碎片",
+		["desc"]="寒冰妖姬碎片，湊齊可激活或升級。"
 	},
 	[52001]={
-
+		["name"]="忍者倫碎片",
+		["desc"]="忍者倫碎片，湊齊可激活或升級。"
 	},
 	[53001]={
-
+		["name"]="魔女琪琪碎片",
+		["desc"]="魔女琪琪碎片，湊齊可激活或升級。"
 	},
 	[53002]={
-
+		["name"]="靈魂獵手碎片",
+		["desc"]="靈魂獵手碎片，湊齊可激活或升級。"
 	},
 	[54001]={
-
+		["name"]="胡蝶碎片",
+		["desc"]="蝴蝶碎片，湊齊可激活或升級。"
 	}
 }
 local config = {

lua/app/config/strings/zh/monster_base.lua

@@ -174,76 +174,76 @@ local monster_base = {
 
 	},
 	[20001]={
-
+		["name"]="叢林神射手"
 	},
 	[20002]={
-
+		["name"]="叢林神獵手"
 	},
 	[20003]={
-
+		["name"]="王之巨龍"
 	},
 	[20004]={
-
+		["name"]="菁英哥布林"
 	},
 	[20005]={
-
+		["name"]="遠古堡壘"
 	},
 	[20006]={
-
+		["name"]="綠龜剛鎧"
 	},
 	[20007]={
 
 	},
 	[20008]={
-
+		["name"]="石巨人"
 	},
 	[20009]={
-
+		["name"]="樹精祭祀"
 	},
 	[20010]={
-
+		["name"]="火靈守衛"
 	},
 	[20011]={
-
+		["name"]="地精魔像"
 	},
 	[20012]={
-
+		["name"]="骷髏王"
 	},
 	[20013]={
-
+		["name"]="小丑之王"
 	},
 	[20014]={
-
+		["name"]="鋼盾綠首領"
 	},
 	[20015]={
-
+		["name"]="鋼盾紅首領"
 	},
 	[20016]={
-
+		["name"]="獨眼旋風"
 	},
 	[20017]={
-
+		["name"]="骷髏法師"
 	},
 	[20018]={
-
+		["name"]="惡毒法師"
 	},
 	[20019]={
-
+		["name"]="火靈刀客"
 	},
 	[20020]={
-
+		["name"]="火靈王"
 	},
 	[20021]={
-
+		["name"]="卓一德DH"
 	},
 	[20022]={
-
+		["name"]="雪人鐵匠"
 	},
 	[20023]={
 
 	},
 	[20024]={
-
+		["name"]="飛天魔"
 	},
 	[20025]={
 
@@ -252,7 +252,7 @@ local monster_base = {
 
 	},
 	[20027]={
-
+		["name"]="紅龜霍頓"
 	},
 	[20028]={
 
@@ -261,70 +261,70 @@ local monster_base = {
 
 	},
 	[20030]={
-
+		["name"]="魔神碎片"
 	},
 	[20031]={
-
+		["name"]="魔神守護者"
 	},
 	[20032]={
-
+		["name"]="遠古魔神"
 	},
 	[30001]={
-
+		["name"]="洋蔥頭"
 	},
 	[30002]={
-
+		["name"]="刀妹"
 	},
 	[30003]={
-
+		["name"]="冰心"
 	},
 	[30004]={
-
+		["name"]="忍者倫"
 	},
 	[30005]={
-
+		["name"]="舞孃"
 	},
 	[30006]={
-
+		["name"]="小鹿"
 	},
 	[30007]={
-
+		["name"]="巨劍魔童"
 	},
 	[30008]={
-
+		["name"]="寒冰妖姬"
 	},
 	[30009]={
-
+		["name"]="火旺"
 	},
 	[30010]={
-
+		["name"]="野蠻人"
 	},
 	[30011]={
-
+		["name"]="亞歷山大"
 	},
 	[30012]={
-
+		["name"]="二丫"
 	},
 	[30014]={
-
+		["name"]="克勞德"
 	},
 	[30015]={
-
+		["name"]="魔女琪琪"
 	},
 	[30016]={
-
+		["name"]="木蘭"
 	},
 	[30017]={
 
 	},
 	[30019]={
-
+		["name"]="靈魂獵手"
 	},
 	[30020]={
-
+		["name"]="森林之狼"
 	},
 	[30022]={
-
+		["name"]="冰女"
 	}
 }
 local config = {

lua/app/config/strings/zh/skill.lua

@@ -1,42 +1,42 @@
 local skill = {
 	[1200120]={
-
+		["desc"]="舞步消散：沿橫向消除<color=#3cff28>5</color>格，並造成一次技能傷害。"
 	},
 	[1300120]={
-
+		["desc"]="巨劍旋風：額外造成數次技能傷害。"
 	},
 	[1300220]={
-
+		["desc"]="炎拳：沿直向消除<color=#3cff28>5</color>格，並造成一次技能傷害，<color=#3cff28>50%</color>機率附帶灼燒效果，<color=#3cff28>2</color>回合。"
 	},
 	[1400120]={
-
+		["desc"]="鋼鐵重擊：將周圍<color=#3cff28>4</color>個元素變色，並造成數次大量技能傷害。"
 	},
 	[2200120]={
-
+		["desc"]="拔刀斬：額外造成一次技能傷害。"
 	},
 	[2300120]={
-
+		["desc"]="骨旋風：額外造成數次技能傷害。"
 	},
 	[2300220]={
-
+		["desc"]="幻影劍襲：使用後本次技能傷害提高，並額外造成數次大量技能傷害。"
 	},
 	[2400120]={
-
+		["desc"]="巨劍轟擊：額外造成一次巨大技能傷害。"
 	},
 	[3200120]={
-
+		["desc"]="長槍突刺：額外造成一次技能傷害。"
 	},
 	[3300120]={
-
+		["desc"]="急速治療：使用後本次回復生命。"
 	},
 	[3300220]={
 
 	},
 	[3400120]={
-
+		["desc"]="流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。"
 	},
 	[4200120]={
-
+		["desc"]="元素連接：隨機消除<color=#3cff28>3</color>個元素，並造成一次技能傷害。"
 	},
 	[4300120]={
 
@@ -45,10 +45,10 @@ local skill = {
 
 	},
 	[4400120]={
-
+		["desc"]="冰霜劍舞：隨機消除<color=#3cff28>3</color>個元素，並造成一次技能傷害，附帶冰霜效果，<color=#3cff28>1</color>回合。"
 	},
 	[5200120]={
-
+		["desc"]="護盾術：賦予團隊一個護盾，<color=#3cff28>1</color>回合。"
 	},
 	[5300120]={
 

lua/app/config/strings/zh/skill_rogue.lua

@@ -132,244 +132,244 @@ local skill_rogue = {
 		["desc"]="將場上隨機<color=#3cff28>5</color>個非紫色元素變為紫色"
 	},
 	[1200100]={
-
+		["desc"]="解鎖舞步消散：沿橫向消除<color=#3cff28>5</color>格，並造成一次技能傷害。"
 	},
 	[1200101]={
-
+		["desc"]="舞步消散有<color=#3cff28>30%</color>概率附加灼燒效果，<color=#3cff28>2</color>回合。"
 	},
 	[1200102]={
-
+		["desc"]="舞步消散使用時本次普攻傷害提高<color=#3cff28>10%</color>。"
 	},
 	[1200103]={
-
+		["desc"]="舞步消散對冰霜敵人的傷害增加<color=#3cff28>50%</color>。"
 	},
 	[1200104]={
-
+		["desc"]="舞步消散直向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[1200105]={
-
+		["desc"]="舞步消散連接<color=#3cff28>5</color>個元素及以上時，賦予團隊亢奮效果，<color=#3cff28>2</color>回合。"
 	},
 	[1200106]={
-
+		["desc"]="舞孃攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[1200107]={
-
+		["desc"]="舞步消散附帶亢奮效果的要求降低至連接超過<color=#3cff28>3</color>個元素。"
 	},
 	[1300100]={
-
+		["desc"]="解鎖巨劍旋風：額外造成數次技能傷害。"
 	},
 	[1300101]={
-
+		["desc"]="巨劍旋風可附帶灼燒效果，<color=#3cff28>2</color>回合。"
 	},
 	[1300102]={
-
+		["desc"]="巨劍旋風對流血敵人的傷害增加<color=#3cff28>50%</color>。"
 	},
 	[1300103]={
-
+		["desc"]="巨劍旋風技能傷害提高。"
 	},
 	[1300104]={
-
+		["desc"]="巨劍旋風附帶的灼燒傷效果，傷害提高。"
 	},
 	[1300105]={
-
+		["desc"]="巨劍旋風連接<color=#3cff28>4</color>個元素及以上時，傷害提高<color=#3cff28>30%</color>，<color=#3cff28>2</color>回合。"
 	},
 	[1300106]={
-
+		["desc"]="巨劍旋風附帶的傷害提高效果，回合數+<color=#3cff28>1</color>。"
 	},
 	[1300107]={
-
+		["desc"]="巨劍旋風擊殺敵人則為團隊賦予亢奮效果，<color=#3cff28>2</color>回合。"
 	},
 	[1300200]={
-
+		["desc"]="解鎖炎拳：沿直向消除<color=#3cff28>5</color>格，並造成一次技能傷害，<color=#3cff28>50%</color>機率附帶灼燒效果，<color=#3cff28>2</color>回合。"
 	},
 	[1300201]={
-
+		["desc"]="炎拳沿橫向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[1300202]={
-
+		["desc"]="炎拳對禁錮敵人的傷害增加<color=#3cff28>50%</color>。"
 	},
 	[1300203]={
-
+		["desc"]="炎拳的灼燒機率提高到<color=#3cff28>100%</color>。"
 	},
 	[1300204]={
-
+		["desc"]="炎拳直向可額外消除<color=#3cff28>2</color>格。"
 	},
 	[1300205]={
-
+		["desc"]="炎拳附帶的灼燒效果，傷害提高。"
 	},
 	[1300206]={
-
+		["desc"]="火旺攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[1300207]={
-
+		["desc"]="炎拳攻擊將釋放<color=#3cff28>2</color>次。"
 	},
 	[1400100]={
-
+		["desc"]="解鎖鋼鐵重擊：將周圍<color=#3cff28>4</color>個元素變色，並造成數次大量技能傷害。"
 	},
 	[1400101]={
-
+		["desc"]="鋼鐵重擊可附帶灼燒效果，<color=#3cff28>2</color>回合。"
 	},
 	[1400102]={
-
+		["desc"]="鋼鐵重擊附加眩暈效果，<color=#3cff28>1</color>回合。"
 	},
 	[1400103]={
-
+		["desc"]="鋼鐵重擊對流血敵人額外造成<color=#3cff28>1</color>次傷害。"
 	},
 	[1400104]={
-
+		["desc"]="鋼鐵重擊附加的眩暈，回合數<color=#3cff28>+1</color>。"
 	},
 	[1400105]={
-
+		["desc"]="鋼鐵重擊附帶的灼燒效果，傷害提高，回合數+<color=#3cff28>1</color>。"
 	},
 	[1400106]={
-
+		["desc"]="亞歷山大攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[1400107]={
-
+		["desc"]="鋼鐵重擊每連接<color=#3cff28>4</color>個元素則額外發射1個火球造成傷害。"
 	},
 	[2200100]={
-
+		["desc"]="解鎖拔刀斬：額外造成一次技能傷害。"
 	},
 	[2200101]={
-
+		["desc"]="拔刀斬技能傷害提高。"
 	},
 	[2200102]={
-
+		["desc"]="拔刀斬直向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[2200103]={
-
+		["desc"]="拔刀斬對灼燒敵人的傷害增加<color=#3cff28>50%</color>。"
 	},
 	[2200104]={
-
+		["desc"]="刀妹攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[2200105]={
-
+		["desc"]="拔刀斬攻擊將釋放<color=#3cff28>2</color>次。"
 	},
 	[2200106]={
-
+		["desc"]="拔刀斬沿X方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[2200107]={
-
+		["desc"]="拔刀斬連接<color=#3cff28>5</color>個元素或以上時，則技能傷害提高。"
 	},
 	[2300100]={
-
+		["desc"]="解鎖旋風骨：額外造成數次技能傷害。"
 	},
 	[2300101]={
-
+		["desc"]="旋風骨可附帶流血效果，<color=#3cff28>2</color>回合。"
 	},
 	[2300102]={
-
+		["desc"]="旋風骨技能傷害提高。"
 	},
 	[2300103]={
-
+		["desc"]="旋風骨對昏睡敵人有<color=#3cff28>50%</color>機率附帶暈眩效果，<color=#3cff28>1</color>回合。"
 	},
 	[2300104]={
-
+		["desc"]="旋風骨附帶的流血效果，回合數+<color=#3cff28>1</color>。"
 	},
 	[2300105]={
-
+		["desc"]="每有<color=#3cff28>1</color>名敵人因流血死亡，則野蠻人傷害提高<color=#3cff28>10%</color>。"
 	},
 	[2300106]={
-
+		["desc"]="旋風骨附帶的暈眩效果，回合數+<color=#3cff28>1</color>。"
 	},
 	[2300107]={
-
+		["desc"]="野蠻人攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[2300200]={
-
+		["desc"]="解鎖幻影劍襲：使用後本次技能傷害提高，並額外造成數次大量技能傷害。"
 	},
 	[2300201]={
-
+		["desc"]="幻影劍襲沿＋方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[2300202]={
-
+		["desc"]="二丫攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[2300203]={
-
+		["desc"]="幻影劍襲使用時本次普攻傷害提高<color=#3cff28>10%</color>。"
 	},
 	[2300204]={
-
+		["desc"]="幻影劍襲沿X方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[2300205]={
-
+		["desc"]="幻影劍襲連接<color=#3cff28>4</color>個元素或以上時，本回合暴擊提高<color=#3cff28>20%</color>。"
 	},
 	[2300206]={
-
+		["desc"]="幻影劍襲連接<color=#3cff28>4</color>個元素或以上時，本回合暴擊提高<color=#3cff28>30</color>%。"
 	},
 	[2300207]={
-
+		["desc"]="幻影劍襲使用時本回合對生命值<color=#3cff28>50%</color>以下的敵人暴擊傷害提高<color=#3cff28>50%</color>。"
 	},
 	[2400100]={
-
+		["desc"]="解鎖巨劍轟擊：額外造成一次巨大技能傷害。"
 	},
 	[2400101]={
-
+		["desc"]="巨劍轟擊沿X方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[2400102]={
-
+		["desc"]="巨劍轟擊對凍結敵人傷害大幅增加，並有<color=#3cff28>50%</color>機率附帶暈眩效果，<color=#3cff28>1</color>回合。"
 	},
 	[2400103]={
-
+		["desc"]="巨劍轟擊附帶暈眩效果的機率提高到<color=#3cff28>70%</color>。"
 	},
 	[2400104]={
-
+		["desc"]="巨劍魔童攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[2400105]={
-
+		["desc"]="巨劍轟擊技能傷害大幅增加，並有<color=#3cff28>50%</color>機率附帶禁錮效果，<color=#3cff28>1</color>回合。"
 	},
 	[2400106]={
-
+		["desc"]="巨劍轟擊附帶禁錮效果的機率提高到<color=#3cff28>70%</color>。"
 	},
 	[2400107]={
-
+		["desc"]="巨劍轟擊將造成雙倍傷害。"
 	},
 	[3200100]={
-
+		["desc"]="解鎖長槍突刺：額外造成一次技能傷害。"
 	},
 	[3200101]={
-
+		["desc"]="長槍突刺可回復一定量生命。"
 	},
 	[3200102]={
-
+		["desc"]="長槍突刺對中毒敵人的傷害增加<color=#3cff28>50%</color>。"
 	},
 	[3200103]={
-
+		["desc"]="長槍突刺傷害提高。"
 	},
 	[3200104]={
-
+		["desc"]="長槍突刺沿X方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[3200105]={
-
+		["desc"]="長槍突刺有<color=#3cff28>30%</color>機率附帶暈眩效果，<color=#3cff28>1</color>回合。"
 	},
 	[3200106]={
-
+		["desc"]="長槍突刺暈眩機率提高<color=#3cff28>20%</color>"
 	},
 	[3200107]={
-
+		["desc"]="長槍突刺後為團隊增加<color=#3cff28>20%</color>格擋，<color=#3cff28>2</color>回合"
 	},
 	[3300100]={
-
+		["desc"]="解鎖急速治療：使用後本次回復生命。"
 	},
 	[3300101]={
-
+		["desc"]="急速治療回血效果提高。"
 	},
 	[3300102]={
-
+		["desc"]="急速治療使用時本次普攻傷害提高<color=#3cff28>15%</color>。"
 	},
 	[3300103]={
-
+		["desc"]="急速治療沿＋方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[3300104]={
-
+		["desc"]="急速治療額外為團隊提供技能傷害提高效果，<color=#3cff28>2</color>回合。"
 	},
 	[3300105]={
-
+		["desc"]="急速治療使用時本次普攻每一擊都將回復生命。"
 	},
 	[3300106]={
-
+		["desc"]="急速治療附帶的技能傷害提高效果，回合數+<color=#3cff28>1</color>。"
 	},
 	[3300107]={
-
+		["desc"]="急速治療連接<color=#3cff28>5</color>個元素或以上時，回血效果提高。"
 	},
 	[3300200]={
 
@@ -396,52 +396,52 @@ local skill_rogue = {
 
 	},
 	[3400100]={
-
+		["desc"]="解鎖流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。"
 	},
 	[3400101]={
-
+		["desc"]="流星追月可附帶易傷效果，<color=#3cff28>2</color>回合。"
 	},
 	[3400102]={
-
+		["desc"]="流星追月直向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[3400103]={
-
+		["desc"]="木蘭攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[3400104]={
-
+		["desc"]="流星追月附帶的易傷效果，效果提高。"
 	},
 	[3400105]={
-
+		["desc"]="流星追月可附帶流血效果，<color=#3cff28>2</color>回合。"
 	},
 	[3400106]={
-
+		["desc"]="流星追月附帶的流血效果，傷害提高。"
 	},
 	[3400107]={
-
+		["desc"]="流星追月連接<color=#3cff28>4</color>個元素或以上時，流星追月攻擊將釋放<color=#3cff28>2</color>次。"
 	},
 	[4200100]={
-
+		["desc"]="解鎖元素連接：隨機消除<color=#3cff28>3</color>個元素，並造成一次技能傷害。"
 	},
 	[4200101]={
-
+		["desc"]="元素連接隨機消除元素+<color=#3cff28>2</color>。"
 	},
 	[4200102]={
-
+		["desc"]="元素連接使用時本次普攻傷害提高<color=#3cff28>10%</color>。"
 	},
 	[4200103]={
-
+		["desc"]="元素連接有<color=#3cff28>50%</color>機率附帶冰霜效果，<color=#3cff28>2</color>回合。"
 	},
 	[4200104]={
-
+		["desc"]="元素連接隨機消除元素+<color=#3cff28>2</color>。"
 	},
 	[4200105]={
-
+		["desc"]="元素連接對冰霜敵人有<color=#3cff28>20%</color>機率附帶凍結效果，<color=#3cff28>1</color>回合。"
 	},
 	[4200106]={
-
+		["desc"]="冰心攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[4200107]={
-
+		["desc"]="元素連接附帶凍結效果機率提高到<color=#3cff28>40%</color>。"
 	},
 	[4300100]={
 
@@ -492,52 +492,52 @@ local skill_rogue = {
 
 	},
 	[4400100]={
-
+		["desc"]="解鎖冰霜劍舞：隨機消除<color=#3cff28>3</color>個元素，並造成一次技能傷害，附帶冰霜效果，<color=#3cff28>1</color>回合。"
 	},
 	[4400101]={
-
+		["desc"]="冰霜劍舞附帶的冰霜效果，回合數+<color=#3cff28>1</color>"
 	},
 	[4400102]={
-
+		["desc"]="冰霜劍舞對灼燒敵人傷害增加<color=#3cff28>50%</color>。"
 	},
 	[4400103]={
-
+		["desc"]="冰霜劍舞隨機消除元素+<color=#3cff28>3</color>"
 	},
 	[4400104]={
-
+		["desc"]="冰霜劍舞附帶的冰霜效果，效果提高。"
 	},
 	[4400105]={
-
+		["desc"]="冰霜劍舞有<color=#3cff28>50%</color>機率附帶凍結效果，<color=#3cff28>2</color>回合。"
 	},
 	[4400106]={
-
+		["desc"]="寒冰妖姬攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[4400107]={
-
+		["desc"]="冰霜劍舞附帶凍結效果機率提高到<color=#3cff28>70%</color>。"
 	},
 	[5200100]={
-
+		["desc"]="解鎖護盾術：為團隊增加一個護盾，<color=#3cff28>1</color>回合。"
 	},
 	[5200101]={
-
+		["desc"]="護盾術增加的護盾，承受傷害提高。"
 	},
 	[5200102]={
 
 	},
 	[5200103]={
-
+		["desc"]="護盾術增加的護盾，回合數+<color=#3cff28>1</color>。"
 	},
 	[5200104]={
-
+		["desc"]="護盾術沿＋方向可額外消除<color=#3cff28>4</color>格。"
 	},
 	[5200105]={
-
+		["desc"]="護盾術增加的護盾，可反傷<color=#3cff28>200%</color>。"
 	},
 	[5200106]={
-
+		["desc"]="忍者倫攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[5200107]={
-
+		["desc"]="護盾術增加的護盾，反傷效果翻倍。"
 	},
 	[5300100]={
 

lua/app/config/strings/zh/task.lua

@@ -1,279 +1,279 @@
 local task = {
 	[1]={
-
+		["desc"]="累積觀看廣告"
 	},
 	[2]={
-
+		["desc"]="完成所有日常任務"
 	},
 	[3]={
-
+		["desc"]="廣告時間"
 	},
 	[4]={
-
+		["desc"]="獲得金幣"
 	},
 	[5]={
-
+		["desc"]="獲得金幣"
 	},
 	[6]={
-
+		["desc"]="獲得金幣"
 	},
 	[7]={
-
+		["desc"]="獲得金幣"
 	},
 	[8]={
-
+		["desc"]="獲得鑽石"
 	},
 	[9]={
-
+		["desc"]="獲得鑽石"
 	},
 	[10]={
-
+		["desc"]="獲得鑽石"
 	},
 	[11]={
-
+		["desc"]="獲得鑽石"
 	},
 	[12]={
-
+		["desc"]="花費金幣"
 	},
 	[13]={
-
+		["desc"]="花費金幣"
 	},
 	[14]={
-
+		["desc"]="花費金幣"
 	},
 	[15]={
-
+		["desc"]="花費金幣"
 	},
 	[16]={
-
+		["desc"]="花費鑽石"
 	},
 	[17]={
-
+		["desc"]="花費鑽石"
 	},
 	[18]={
-
+		["desc"]="花費鑽石"
 	},
 	[19]={
-
+		["desc"]="花費鑽石"
 	},
 	[20]={
-
+		["desc"]="開啟商城任意寶箱"
 	},
 	[21]={
-
+		["desc"]="開啟商城任意寶箱"
 	},
 	[22]={
-
+		["desc"]="開啟商城任意寶箱"
 	},
 	[23]={
-
+		["desc"]="開啟商城任意寶箱"
 	},
 	[24]={
-
+		["desc"]="開啟商城史詩寶箱"
 	},
 	[25]={
-
+		["desc"]="開啟商城史詩寶箱"
 	},
 	[26]={
-
+		["desc"]="開啟商城史詩寶箱"
 	},
 	[27]={
-
+		["desc"]="開啟商城史詩寶箱"
 	},
 	[28]={
-
+		["desc"]="關卡內打開技能神燈"
 	},
 	[29]={
-
+		["desc"]="關卡內打開技能神燈"
 	},
 	[30]={
-
+		["desc"]="關卡內打開技能神燈"
 	},
 	[31]={
-
+		["desc"]="關卡內打開技能神燈"
 	},
 	[32]={
-
+		["desc"]="在戰鬥中獲勝"
 	},
 	[33]={
-
+		["desc"]="在戰鬥中獲勝"
 	},
 	[34]={
-
+		["desc"]="在戰鬥中獲勝"
 	},
 	[35]={
-
+		["desc"]="在戰鬥中獲勝"
 	},
 	[36]={
-
+		["desc"]="升級你的英雄"
 	},
 	[37]={
-
+		["desc"]="升級你的英雄"
 	},
 	[38]={
-
+		["desc"]="升級你的英雄"
 	},
 	[39]={
-
+		["desc"]="升級你的英雄"
 	},
 	[40]={
-
+		["desc"]="獲得英雄碎片"
 	},
 	[41]={
-
+		["desc"]="獲得英雄碎片"
 	},
 	[42]={
-
+		["desc"]="獲得英雄碎片"
 	},
 	[43]={
-
+		["desc"]="獲得英雄碎片"
 	},
 	[44]={
-
+		["desc"]="擊殺首領"
 	},
 	[45]={
-
+		["desc"]="擊殺首領"
 	},
 	[46]={
-
+		["desc"]="擊殺首領"
 	},
 	[47]={
-
+		["desc"]="擊殺首領"
 	},
 	[48]={
-
+		["desc"]="擊殺小怪"
 	},
 	[49]={
-
+		["desc"]="擊殺小怪"
 	},
 	[50]={
-
+		["desc"]="擊殺小怪"
 	},
 	[51]={
-
+		["desc"]="擊殺小怪"
 	},
 	[52]={
-
+		["desc"]="累積消除元素"
 	},
 	[53]={
-
+		["desc"]="累積消除元素"
 	},
 	[54]={
-
+		["desc"]="累積消除元素"
 	},
 	[55]={
-
+		["desc"]="累積消除元素"
 	},
 	[56]={
-
+		["desc"]="6連消次數"
 	},
 	[57]={
-
+		["desc"]="6連消次數"
 	},
 	[58]={
-
+		["desc"]="6連消次數"
 	},
 	[59]={
-
+		["desc"]="6連消次數"
 	},
 	[60]={
-
+		["desc"]="8連消次數"
 	},
 	[61]={
-
+		["desc"]="8連消次數"
 	},
 	[62]={
-
+		["desc"]="8連消次數"
 	},
 	[63]={
-
+		["desc"]="8連消次數"
 	},
 	[64]={
-
+		["desc"]="戰鬥中超過10連擊次數"
 	},
 	[65]={
-
+		["desc"]="戰鬥中超過10連擊次數"
 	},
 	[66]={
-
+		["desc"]="戰鬥中超過10連擊次數"
 	},
 	[67]={
-
+		["desc"]="戰鬥中超過10連擊次數"
 	},
 	[68]={
-
+		["desc"]="戰鬥中釋放技能次數"
 	},
 	[69]={
-
+		["desc"]="戰鬥中釋放技能次數"
 	},
 	[70]={
-
+		["desc"]="戰鬥中釋放技能次數"
 	},
 	[71]={
-
+		["desc"]="戰鬥中釋放技能次數"
 	},
 	[72]={
-
+		["desc"]="完成戰鬥波次"
 	},
 	[73]={
-
+		["desc"]="完成戰鬥波次"
 	},
 	[74]={
-
+		["desc"]="完成戰鬥波次"
 	},
 	[75]={
-
+		["desc"]="完成戰鬥波次"
 	},
 	[76]={
-
+		["desc"]="獲得金幣"
 	},
 	[77]={
-
+		["desc"]="獲得鑽石"
 	},
 	[78]={
-
+		["desc"]="花費鑽石"
 	},
 	[79]={
-
+		["desc"]="開啟商城任意寶箱"
 	},
 	[80]={
-
+		["desc"]="開啟商城史詩寶箱"
 	},
 	[81]={
-
+		["desc"]="關卡內打開技能神燈"
 	},
 	[82]={
-
+		["desc"]="在戰鬥中獲勝"
 	},
 	[83]={
-
+		["desc"]="升級你的英雄"
 	},
 	[84]={
-
+		["desc"]="獲得英雄碎片"
 	},
 	[85]={
-
+		["desc"]="擊殺首領"
 	},
 	[86]={
-
+		["desc"]="擊殺小怪"
 	},
 	[87]={
-
+		["desc"]="累積消除元素"
 	},
 	[88]={
-
+		["desc"]="6連消次數"
 	},
 	[89]={
-
+		["desc"]="8連消次數"
 	},
 	[90]={
-
+		["desc"]="戰鬥中超過10連擊次數"
 	},
 	[91]={
-
+		["desc"]="戰鬥中釋放技能次數"
 	},
 	[92]={
-
+		["desc"]="完成戰鬥波次"
 	}
 }
 local config = {

lua/app/config/task_daily_challenge.lua

@@ -5,10 +5,18 @@ local task_daily_challenge = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=1,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vw==",
-				["num"]=200,
+				["num"]=1000,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VwhcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
 			}
 		},
 		["number"]=1
@@ -22,16 +30,16 @@ local task_daily_challenge = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=200,
+				["num"]=20,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=13,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Vws=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["number"]=2
@@ -44,16 +52,16 @@ local task_daily_challenge = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=200,
+				["num"]=20,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=13,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Vws=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["number"]=2
@@ -66,16 +74,16 @@ local task_daily_challenge = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=200,
+				["num"]=20,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=13,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="Vws=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["number"]=2
@@ -89,24 +97,24 @@ local task_daily_challenge = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=200,
+				["num"]=30,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VQg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=14001,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="VwxcA2Q=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=3,
+				["id"]=5,
- 				["id_for_nothing"]="VQ==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=10,
+				["num"]=15,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw0="
 			}
 		},
 		["number"]=3
@@ -119,24 +127,24 @@ local task_daily_challenge = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=200,
+				["num"]=30,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VQg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=14001,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="VwxcA2Q=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=3,
+				["id"]=5,
- 				["id_for_nothing"]="VQ==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=10,
+				["num"]=15,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw0="
 			}
 		},
 		["number"]=3
@@ -168,24 +176,24 @@ local task_daily_challenge = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=200,
+				["num"]=30,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VQg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=14001,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="VwxcA2Q=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=3,
+				["id"]=5,
- 				["id_for_nothing"]="VQ==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=10,
+				["num"]=15,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw0="
 			}
 		},
 		["number"]=3
@@ -199,24 +207,24 @@ local task_daily_challenge = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=200,
+				["num"]=30,
- 				["num_for_nothing"]="VAhc"
+ 				["num_for_nothing"]="VQg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=14001,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="VwxcA2Q=",
-				["num"]=10,
+				["num"]=1,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=3,
+				["id"]=5,
- 				["id_for_nothing"]="VQ==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=10,
+				["num"]=15,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="Vw0="
 			}
 		},
 		["number"]=3

lua/app/module/account.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b8f4a8cf53417314abb0cba97d791459
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

lua/app/module/account/account_manager.lua

@@ -0,0 +1,28 @@
+local AccountManager = class("AccountManager", BaseModule)
+
+function AccountManager:showBindUI()
+    if DataManager.PlayerData:isBinded() then
+        return
+    end
+    UIManager:showUI("app/ui/game_setting/setting_binding_ui")
+end
+
+function AccountManager:showDeleteUI()
+    return UIManager:showUI("app/ui/game_setting/account_delete_ui")
+end
+
+function AccountManager:deleteAccount()
+	self:sendMessage(ProtoMsgType.FromMsgEnum.DeleteReq, {}, {}, self.onDeleteAccount, BIReport.ITEM_GET_TYPE.NONE)
+end
+
+function AccountManager:onDeleteAccount(result)
+	if result.err_code == GConst.ERROR_STR.SUCCESS then -- 删除账号成功
+		local info = LocalData:getLastLoginInfo()
+		BIReport:postAccountDelete(info.type)
+		ModuleManager.LoginManager:goToLoginScene()
+	else
+		GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_FAILED))
+    end
+end
+
+return AccountManager

lua/app/module/account/account_manager.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: fbc7bda584c3578478d7e7fe2bb9e7a1
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/module/login/login_manager.lua

@@ -101,6 +101,7 @@ function LoginManager:goToLoginScene()
 	ModuleManager.BattleManager:clearOnExitScene()
 	NetManager:closeAndClear()
 	UIManager:backToLoginWithoutLogout()
+	UIManager:clearUIPrefabCache()
 	DataManager:clear()
 end
 

lua/app/net/net_manager.lua

@@ -215,12 +215,17 @@ function NetManager:connect(domain, port, callback, socketName)
             pbData.status = not pbData.err_code and 0 or ProtoMsgDispatch:getErrCodeEnum(pbData.err_code)
             if pbData.status ~= 0 then
                 self:closeAndClear()
-                local lastLoginType = LocalData:getLastLoginType()
+                local accountInfo = LocalData:getAccountInfo()
-                if lastLoginType == NetManager.LOGIN_TYPE.GOOGLE or lastLoginType == NetManager.LOGIN_TYPE.APPLE then
+                local loginType
-                    local loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE
+                local lastLoginType
-                    if lastLoginType == NetManager.LOGIN_TYPE.APPLE then
+                if accountInfo.google_id and accountInfo.google_id ~= "" then
-                        loginType = SDKManager.BF_LOGIN_TYPE.APPLE
+                    loginType = SDKManager.BF_LOGIN_TYPE.GOOGLE
-                    end
+                    lastLoginType = NetManager.LOGIN_TYPE.GOOGLE
+                elseif accountInfo.apple_id and accountInfo.apple_id ~= "" then
+                    loginType = SDKManager.BF_LOGIN_TYPE.APPLE
+                    lastLoginType = NetManager.LOGIN_TYPE.APPLE
+                end
+                if loginType then
                     SDKManager:login(function(params)
                         if not params.token then
                             return

lua/app/ui/game_setting/account_delete_ui.lua

@@ -0,0 +1,63 @@
+local AccountDeleteUI = class("AccountDeleteUI", BaseUI)
+
+function AccountDeleteUI:isFullScreen()
+    return false
+end
+
+function AccountDeleteUI:showCommonBG()
+    return false
+end
+
+function AccountDeleteUI:getPrefabPath()
+    return "assets/prefabs/ui/setting/account_delete_ui.prefab"
+end
+
+function AccountDeleteUI:onClose()
+    if self.inputFieldObj then
+        self.inputFieldObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD).text = GConst.EMPTY_STRING
+    end
+end
+
+function AccountDeleteUI:ctor()
+    self.besureTxStr = I18N:getGlobalText(I18N.GlobalConst.BESURE_DELETE_ACCOUNT_DESC)
+end
+
+function AccountDeleteUI:onLoadRootComplete()
+    local uiMap = self.root:genAllChildren()
+    self.okBtn = uiMap["account_delete_ui.title_bg_img.change_btn"]
+    self.btnTx = uiMap["account_delete_ui.title_bg_img.change_btn.text"]
+    self.okBtnGray = uiMap["account_delete_ui.title_bg_img.change_btn.gray"]
+	self.inputFieldObj = uiMap["account_delete_ui.title_bg_img.input_field"]
+
+	self.okBtn:addClickListener(function()
+        local content = self.inputFieldObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD).text
+        if content == self.besureTxStr then
+            ModuleManager.AccountManager:deleteAccount()
+        end
+    end)
+
+	uiMap["account_delete_ui.title_bg_img.close_btn"]:addClickListener(function()
+        self:closeUI()
+    end)
+
+    self:_display()
+end
+
+function AccountDeleteUI:_display()
+    local uiMap = self.root:genAllChildren()
+    uiMap["account_delete_ui.title_bg_img.title_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.MESSAGE_BOX_TITLE))
+    uiMap["account_delete_ui.title_bg_img.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.BESURE_DELETE_TIPS_DESC, self.besureTxStr))
+
+    self:refreshBtn(true)
+    self.inputFieldObj:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD).onValueChanged:AddListener(function(content)
+        self:refreshBtn(content ~= self.besureTxStr)
+    end)
+end
+
+function AccountDeleteUI:refreshBtn(gray)
+    self.okBtnGray:setVisible(gray)
+    self.okBtn:setTouchEnable(not gray)
+	self.btnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK))
+end
+
+return AccountDeleteUI

lua/app/ui/game_setting/account_delete_ui.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 2dba9e1bf395ae54584347a571d14188
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/game_setting/game_setting_ui.lua

@@ -62,6 +62,7 @@ function GameSettingUI:initLoginBtn()
     local deleteTx = self.uiMap["game_setting_ui.bg.delete_tx"]
     deleteTx:setText(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_DESC))
     deleteTx:addClickListener(function()
+        ModuleManager.AccountManager:showDeleteUI()
     end)
 end
 

lua/app/ui/ui_manager.lua

@@ -405,7 +405,6 @@ end
 -- 显示引导节点
 function UIManager:showTutorial()
 	self.tutorialCanvas:setActive(true)
-	self:hideChatBtn()
 end
 
 -- 隐藏引导节点
@@ -972,23 +971,14 @@ function UIManager:showNotchScreen()
 	end
 end
 
-function UIManager:backToLogin(clearLoginType)
+function UIManager:backToLogin()
 	self:stopCurrentBGM()
-
+	SDKManager:logout()
-	SDKManager:gameLogout(clearLoginType or false, function ()
+	-- 清除引导
-		-- 移除
+	ModuleManager.TutorialManager:stopTutorial()
-		-- SchedulerManager:removeCrossDaySId()
+	self:closeAllUI()
-
+	ModuleManager.BattleManager:clearOnExitScene()
-		-- 清除引导
+	Game:showLoginUI()
-		ModuleManager.TutorialManager:stopTutorial()
-		-- 触发断线回到Login界面事件
-		-- EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.LOGOUT_BACK_TO_LOGIN)
-
-		self:closeAllUI()
-		ModuleManager.BattleManager:clearOnExitScene()
-		self:hideChatBtn()
-		Game:showLoginUI()
-	end)
 end
 
 function UIManager:backToLoginWithoutLogout()
@@ -997,7 +987,6 @@ function UIManager:backToLoginWithoutLogout()
 
 	self:closeAllUI()
 	ModuleManager.BattleManager:clearOnExitScene()
-	self:hideChatBtn()
 	Game:showLoginUI()
 end