调整一下英雄解锁的逻辑

lua/app/config/buff.lua

@@ -269,7 +269,7 @@ local buff = {
 		["buff_type"]=1,
 		["stack"]=2,
 		["decr"]=1,
-		["icon"]="normal_attack_dec"
+		["icon"]="high"
 	},
 	[38]={
 		["name"]="block",
@@ -343,19 +343,19 @@ local buff = {
 		["stack"]=1,
 		["decr"]=2,
 		["formula"]=4,
-		["icon"]="shield"
+		["icon"]="burn"
 	},
 	[49]={
 		["name"]="vulnerable",
 		["buff_type"]=1,
 		["decr"]=2,
-		["icon"]="shield"
+		["icon"]="vulnerable"
 	},
 	[50]={
 		["name"]="frozen",
 		["buff_type"]=7,
 		["decr"]=2,
-		["icon"]="shield",
+		["icon"]="frozen",
 		["control_priority"]=1
 	},
 	[51]={
@@ -364,59 +364,59 @@ local buff = {
 		["stack"]=2,
 		["decr"]=2,
 		["formula"]=4,
-		["icon"]="shield"
+		["icon"]="poison"
 	},
 	[52]={
 		["name"]="imprison",
 		["buff_type"]=7,
 		["decr"]=2,
-		["icon"]="shield",
+		["icon"]="imprison",
 		["control_priority"]=4
 	},
 	[53]={
 		["name"]="corrupt",
 		["buff_type"]=1,
 		["decr"]=2,
-		["icon"]="shield"
+		["icon"]="corrupt"
 	},
 	[54]={
 		["name"]="bleed",
 		["buff_type"]=7,
 		["decr"]=2,
 		["formula"]=4,
-		["icon"]="shield"
+		["icon"]="bleed"
 	},
 	[55]={
 		["name"]="weaken",
 		["buff_type"]=1,
 		["decr"]=2,
-		["icon"]="shield"
+		["icon"]="weaken"
 	},
 	[56]={
 		["name"]="lethargy",
 		["buff_type"]=8,
 		["stack"]=1,
 		["decr"]=2,
-		["icon"]="shield",
+		["icon"]="lethargy",
 		["control_priority"]=3
 	},
 	[57]={
 		["name"]="curse",
 		["buff_type"]=1,
 		["decr"]=2,
-		["icon"]="shield"
+		["icon"]="curse"
 	},
 	[58]={
 		["name"]="lock",
 		["buff_type"]=7,
 		["decr"]=2,
-		["icon"]="shield"
+		["icon"]="lock"
 	},
 	[59]={
 		["name"]="first_hand",
 		["buff_type"]=1,
 		["decr"]=1,
-		["icon"]="shield"
+		["icon"]="first_hand"
 	},
 	[60]={
 		["name"]="skill_hurt_add",
@@ -428,20 +428,20 @@ local buff = {
 		["name"]="undead",
 		["buff_type"]=7,
 		["decr"]=1,
-		["icon"]="shield"
+		["icon"]="undead"
 	},
 	[62]={
 		["name"]="counterattack",
 		["buff_type"]=1,
 		["stack"]=1,
 		["decr"]=1,
-		["icon"]="shield"
+		["icon"]="counterattack"
 	},
 	[63]={
 		["name"]="thorns",
 		["buff_type"]=1,
 		["decr"]=1,
-		["icon"]="shield"
+		["icon"]="thorns"
 	},
 	[64]={
 		["name"]="dmg_dec_red_add",

lua/app/config/buff_daily_challenge.lua

@@ -69,10 +69,10 @@ local buff_daily_challenge = {
 		["buff_type"]=1,
 		["effect"]={
 			{
-				["type"]="shield",
+				["type"]="wavehealp",
-				["num"]=10000,
+				["num"]=100,
-				["ratio"]=1000,
+				["ratio"]=10000,
-				["round"]=999
+				["round"]=0
 			}
 		},
 		["obj"]=1
@@ -81,27 +81,15 @@ local buff_daily_challenge = {
 		["buff_type"]=1,
 		["effect"]={
 			{
-				["type"]="wavehealp",
+				["type"]="cured_add",
-				["num"]=100,
+				["num"]=500,
-				["ratio"]=10000,
+				["ratio"]=500,
-				["round"]=0
+				["round"]=999
 			}
 		},
 		["obj"]=1
 	},
 	[8]={
-		["buff_type"]=1,
-		["effect"]={
-			{
-				["type"]="cured_add",
-				["num"]=500,
-				["ratio"]=500,
-				["round"]=999
-			}
-		},
-		["obj"]=1
-	},
-	[9]={
 		["buff_type"]=1,
 		["effect"]={
 			{
@@ -113,31 +101,7 @@ local buff_daily_challenge = {
 		},
 		["obj"]=1
 	},
-	[10]={
+	[9]={
-		["buff_type"]=1,
-		["effect"]={
-			{
-				["type"]="cured_add",
-				["num"]=500,
-				["ratio"]=500,
-				["round"]=999
-			}
-		},
-		["obj"]=1
-	},
-	[11]={
-		["buff_type"]=2,
-		["effect"]={
-			{
-				["type"]="hpp_add",
-				["num"]=2000,
-				["ratio"]=1000,
-				["round"]=999
-			}
-		},
-		["obj"]=2
-	},
-	[12]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -149,7 +113,7 @@ local buff_daily_challenge = {
 		},
 		["obj"]=2
 	},
-	[13]={
+	[10]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -161,7 +125,7 @@ local buff_daily_challenge = {
 		},
 		["obj"]=2
 	},
-	[14]={
+	[11]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -173,7 +137,7 @@ local buff_daily_challenge = {
 		},
 		["obj"]=2
 	},
-	[15]={
+	[12]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -185,7 +149,7 @@ local buff_daily_challenge = {
 		},
 		["obj"]=2
 	},
-	[16]={
+	[13]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -197,43 +161,7 @@ local buff_daily_challenge = {
 		},
 		["obj"]=2
 	},
-	[17]={
+	[14]={
-		["buff_type"]=2,
-		["effect"]={
-			{
-				["type"]="dec_dmg_all_add",
-				["num"]=500,
-				["ratio"]=1000,
-				["round"]=999
-			}
-		},
-		["obj"]=2
-	},
-	[18]={
-		["buff_type"]=2,
-		["effect"]={
-			{
-				["type"]="cured_dec",
-				["num"]=1000,
-				["ratio"]=1000,
-				["round"]=999
-			}
-		},
-		["obj"]=2
-	},
-	[19]={
-		["buff_type"]=2,
-		["effect"]={
-			{
-				["type"]="block",
-				["num"]=500,
-				["ratio"]=1000,
-				["round"]=999
-			}
-		},
-		["obj"]=2
-	},
-	[20]={
 		["buff_type"]=2,
 		["effect"]={
 			{
@@ -247,6 +175,6 @@ local buff_daily_challenge = {
 	}
 }
 local config = {
-data=buff_daily_challenge,count=20
+data=buff_daily_challenge,count=14
 }
 return config

lua/app/config/chapter.lua

@@ -456,7 +456,7 @@ local chapter = {
 		},
 		["mystery_box"]={
 			1,
-			3
+			4
 		},
 		["mystery_box_reward"]={
 			{
@@ -856,7 +856,7 @@ local chapter = {
 		},
 		["mystery_box"]={
 			1,
-			4
+			3
 		},
 		["mystery_box_reward"]={
 			{
@@ -1059,7 +1059,7 @@ local chapter = {
 		},
 		["mystery_box"]={
 			2,
-			3
+			4
 		},
 		["mystery_box_reward"]={
 			{
@@ -1277,8 +1277,8 @@ local chapter = {
 			13001
 		},
 		["mystery_box"]={
-			1,
+			2,
-			4
+			3
 		},
 		["mystery_box_reward"]={
 			{
@@ -1496,7 +1496,7 @@ local chapter = {
 			15001
 		},
 		["mystery_box"]={
-			3,
+			2,
 			4
 		},
 		["mystery_box_reward"]={
@@ -1715,8 +1715,8 @@ local chapter = {
 			17001
 		},
 		["mystery_box"]={
-			2,
+			1,
-			3
+			4
 		},
 		["mystery_box_reward"]={
 			{

lua/app/config/func_open.lua

@@ -5,6 +5,7 @@ local func_open = {
 	},
 	["bounty_open"]={
 		["stage"]=3,
+		["pop_ups"]=1,
 		["icon"]="main_bounty"
 	},
 	["task"]={
@@ -16,7 +17,7 @@ local func_open = {
 		["icon"]="main_act_level_gift"
 	},
 	["idle_drop"]={
-		["stage"]=2,
+		["stage"]=3,
 		["icon"]="main_idle_drop"
 	},
 	["act_sevenday"]={
@@ -24,7 +25,7 @@ local func_open = {
 		["icon"]="main_act_sevenday"
 	},
 	["mall"]={
-		["stage"]=1,
+		["stage"]=2,
 		["icon"]="main_mall"
 	},
 	["mall_daily"]={
@@ -33,10 +34,12 @@ local func_open = {
 	},
 	["store_box_open"]={
 		["stage"]=2,
+		["pop_ups"]=1,
 		["icon"]="main_store_box"
 	},
 	["store_box_3_open"]={
 		["stage"]=5,
+		["pop_ups"]=1,
 		["icon"]="main_store_box_3"
 	},
 	["daily_challenge"]={

lua/app/config/hero.lua

@@ -113,7 +113,7 @@ local hero = {
 		["model_id"]="p0014",
 		["icon"]="6",
 		["item_id"]=13001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=12,
 		["is_show"]=1
 	},
 	[13002]={
@@ -172,7 +172,7 @@ local hero = {
 		["model_id"]="p0009",
 		["icon"]="11",
 		["item_id"]=13002,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=20,
 		["is_show"]=1
 	},
 	[14001]={
@@ -231,7 +231,7 @@ local hero = {
 		["model_id"]="p0011",
 		["icon"]="16",
 		["item_id"]=14001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=25,
 		["is_show"]=1
 	},
 	[22001]={
@@ -348,7 +348,7 @@ local hero = {
 		["model_id"]="p0010",
 		["icon"]="12",
 		["item_id"]=23001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=16,
 		["is_show"]=1
 	},
 	[23002]={
@@ -407,7 +407,7 @@ local hero = {
 		["model_id"]="p0012",
 		["icon"]="7",
 		["item_id"]=23002,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=9,
 		["is_show"]=1
 	},
 	[24001]={
@@ -466,7 +466,7 @@ local hero = {
 		["model_id"]="p0007",
 		["icon"]="17",
 		["item_id"]=24001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=21,
 		["is_show"]=1
 	},
 	[32001]={
@@ -583,7 +583,7 @@ local hero = {
 		["model_id"]="p0006",
 		["icon"]="8",
 		["item_id"]=33001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=4,
 		["is_show"]=1
 	},
 	[33002]={
@@ -642,7 +642,7 @@ local hero = {
 		["model_id"]="p0020",
 		["icon"]="13",
 		["item_id"]=33002,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=18,
 		["is_show"]=1
 	},
 	[34001]={
@@ -701,7 +701,7 @@ local hero = {
 		["model_id"]="p0016",
 		["icon"]="18",
 		["item_id"]=34001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=2,
 		["is_show"]=1
 	},
 	[42001]={
@@ -818,7 +818,7 @@ local hero = {
 		["model_id"]="p0022",
 		["icon"]="9",
 		["item_id"]=43001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=6,
 		["is_show"]=1
 	},
 	[43002]={
@@ -874,10 +874,10 @@ local hero = {
 			4920000,
 			5490000
 		},
-		["model_id"]="p0003",
+		["model_id"]="p0021",
 		["icon"]="14",
 		["item_id"]=43002,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=14,
 		["is_show"]=1
 	},
 	[44001]={
@@ -936,7 +936,7 @@ local hero = {
 		["model_id"]="p0008",
 		["icon"]="19",
 		["item_id"]=44001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=10,
 		["is_show"]=1
 	},
 	[52001]={
@@ -995,7 +995,8 @@ local hero = {
 		["model_id"]="p0004",
 		["icon"]="5",
 		["item_id"]=52001,
-		["unlock_chapter"]=1
+		["unlock_chapter"]=2,
+		["is_show"]=1
 	},
 	[53001]={
 		["position"]=5,
@@ -1053,7 +1054,7 @@ local hero = {
 		["model_id"]="p0015",
 		["icon"]="10",
 		["item_id"]=53001,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=22,
 		["is_show"]=1
 	},
 	[53002]={
@@ -1109,10 +1110,10 @@ local hero = {
 			4920000,
 			5490000
 		},
-		["model_id"]="p0004",
+		["model_id"]="p0019",
 		["icon"]="15",
 		["item_id"]=53002,
-		["unlock_chapter"]=3,
+		["unlock_chapter"]=8,
 		["is_show"]=1
 	},
 	[54001]={
@@ -1168,10 +1169,9 @@ local hero = {
 			4920000,
 			5490000
 		},
-		["model_id"]="p0004",
+		["model_id"]="p0023",
 		["icon"]="20",
 		["item_id"]=54001,
-		["unlock_chapter"]=3,
 		["is_show"]=1
 	}
 }

lua/app/config/localization/localization_global_const.lua

@@ -145,6 +145,36 @@ local LocalizationGlobalConst =
 	SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2",
 	FUNC_UNLOCK = "FUNC_UNLOCK",
 	MAIN_BTN_3 = "MAIN_BTN_3",
+	SHOP_DESC_1 = "SHOP_DESC_1",
+	SHOP_DESC_2 = "SHOP_DESC_2",
+	SHOP_DESC_3 = "SHOP_DESC_3",
+	SHOP_DESC_4 = "SHOP_DESC_4",
+	SHOP_DESC_5 = "SHOP_DESC_5",
+	SHOP_DESC_6 = "SHOP_DESC_6",
+	SHOP_DESC_7 = "SHOP_DESC_7",
+	SHOP_DESC_8 = "SHOP_DESC_8",
+	SHOP_DESC_9 = "SHOP_DESC_9",
+	SHOP_DESC_10 = "SHOP_DESC_10",
+	SHOP_DESC_11 = "SHOP_DESC_11",
+	SHOP_DESC_12 = "SHOP_DESC_12",
+	SHOP_DESC_13 = "SHOP_DESC_13",
+	SHOP_DESC_14 = "SHOP_DESC_14",
+	SHOP_DESC_15 = "SHOP_DESC_15",
+	SHOP_DESC_16 = "SHOP_DESC_16",
+	SHOP_DESC_17 = "SHOP_DESC_17",
+	SHOP_DESC_18 = "SHOP_DESC_18",
+	SHOP_DESC_19 = "SHOP_DESC_19",
+	SHOP_DESC_20 = "SHOP_DESC_20",
+	SHOP_DESC_21 = "SHOP_DESC_21",
+	SHOP_DESC_22 = "SHOP_DESC_22",
+	SHOP_DESC_23 = "SHOP_DESC_23",
+	SHOP_DESC_24 = "SHOP_DESC_24",
+	SHOP_DESC_25 = "SHOP_DESC_25",
+	SHOP_DESC_26 = "SHOP_DESC_26",
+	SHOP_DESC_27 = "SHOP_DESC_27",
+	SHOP_DESC_28 = "SHOP_DESC_28",
+	SHOP_DESC_29 = "SHOP_DESC_29",
+	HERO_DESC_11 = "HERO_DESC_11",
 }
 
 return LocalizationGlobalConst

lua/app/config/skill.lua

@@ -395,11 +395,6 @@ local skill = {
 			2,
 			3
 		},
-		["block_time"]={
-			360,
-			1360,
-			2500
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -488,11 +483,6 @@ local skill = {
 			2,
 			3
 		},
-		["block_time"]={
-			360,
-			1360,
-			2500
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -711,13 +701,6 @@ local skill = {
 			4,
 			6
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510,
-			1810
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -823,13 +806,6 @@ local skill = {
 			4,
 			6
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510,
-			1810
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -973,10 +949,6 @@ local skill = {
 			1,
 			2
 		},
-		["block_time"]={
-			250,
-			1400
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -1439,12 +1411,6 @@ local skill = {
 			3,
 			4
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510
-		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -1515,12 +1481,6 @@ local skill = {
 			3,
 			4
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510
-		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -1583,7 +1543,7 @@ local skill = {
 	[2300125]={
 		["position"]=2,
 		["effect_type"]=2,
-		["trigger"]=8,
+		["trigger"]=10,
 		["effect"]={
 			{
 				["type"]="atkp_yellow_add",
@@ -1774,13 +1734,6 @@ local skill = {
 			4,
 			5
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510,
-			1760
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -3963,12 +3916,6 @@ local skill = {
 			3,
 			4
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1760
-		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
@@ -4146,12 +4093,29 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_purple",
-				["num"]=50000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=30000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1,
+			2,
+			3
+		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
@@ -4341,12 +4305,29 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_purple",
-				["num"]=60000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=35000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1,
+			2,
+			3
+		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
@@ -4386,12 +4367,29 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_purple",
-				["num"]=60000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_purple",
+				["num"]=35000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1,
+			2,
+			3
+		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
@@ -4405,7 +4403,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="skill_hurt_add",
-				["num"]=5000,
+				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=999
 			}
@@ -4925,9 +4923,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["skill_position"]=1,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -4985,13 +4980,6 @@ local skill = {
 			4,
 			5
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510,
-			1760
-		},
 		["skill_position"]=1,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5045,9 +5033,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5158,11 +5143,6 @@ local skill = {
 			2,
 			3
 		},
-		["block_time"]={
-			360,
-			1360,
-			2500
-		},
 		["skill_position"]=1,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5247,9 +5227,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5308,12 +5285,6 @@ local skill = {
 			3,
 			4
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510
-		},
 		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5350,9 +5321,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5488,13 +5456,6 @@ local skill = {
 			4,
 			6
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1510,
-			1810
-		},
 		["skill_position"]=1,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5564,12 +5525,6 @@ local skill = {
 			3,
 			4
 		},
-		["block_time"]={
-			760,
-			1010,
-			1260,
-			1760
-		},
 		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5600,9 +5555,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["name_act"]="skill01"
@@ -5626,9 +5578,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5657,9 +5606,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5703,9 +5649,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5745,9 +5688,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=2,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5777,9 +5717,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=2,
 		["cd_start"]=1,
 		["shake_time"]=200,
@@ -5809,9 +5746,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			2500
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["name_act"]="skill01"
@@ -5856,9 +5790,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			2500
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5916,9 +5847,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5947,9 +5875,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5979,9 +5904,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -6016,9 +5938,6 @@ local skill = {
 		["effect_block"]={
 			1
 		},
-		["block_time"]={
-			1000
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,

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

@@ -145,6 +145,36 @@ local localization_global =
     ["SEVEN_DAY_DESC_2"] = "已完成任务数:<color=#8DFF81>{0}</color>/{1}",
     ["FUNC_UNLOCK"] = "解锁新功能",
     ["MAIN_BTN_3"] = "商城",
+    ["SHOP_DESC_1"] = "普通宝箱",
+    ["SHOP_DESC_2"] = "精致宝箱",
+    ["SHOP_DESC_3"] = "珍贵宝箱",
+    ["SHOP_DESC_4"] = "无额外奖励加成",
+    ["SHOP_DESC_5"] = "开宝箱提升等级,增加宝箱奖励",
+    ["SHOP_DESC_6"] = "宝箱等级提升!",
+    ["SHOP_DESC_7"] = "立即打开",
+    ["SHOP_DESC_8"] = "恭喜获得",
+    ["SHOP_DESC_9"] = "首充礼包",
+    ["SHOP_DESC_10"] = "章节礼包",
+    ["SHOP_DESC_11"] = "新手礼包",
+    ["SHOP_DESC_12"] = "助力礼包",
+    ["SHOP_DESC_13"] = "成长礼包",
+    ["SHOP_DESC_14"] = "金币礼包",
+    ["SHOP_DESC_15"] = "前往商店",
+    ["SHOP_DESC_16"] = "特惠商品",
+    ["SHOP_DESC_17"] = "主要商品",
+    ["SHOP_DESC_18"] = "限购{0}次",
+    ["SHOP_DESC_19"] = "第{0}章礼包",
+    ["SHOP_DESC_20"] = "已购买",
+    ["SHOP_DESC_21"] = "剩余次数:{0}",
+    ["SHOP_DESC_22"] = "刷新时间:{0}",
+    ["SHOP_DESC_23"] = "{0}级助力礼包",
+    ["SHOP_DESC_24"] = "必出<color=#5fff57>普通</color>英雄",
+    ["SHOP_DESC_25"] = "必出<color=#8aedff>稀有</color>英雄",
+    ["SHOP_DESC_26"] = "必出<color=#ff8af0>史诗</color>英雄",
+    ["SHOP_DESC_27"] = "宝箱",
+    ["SHOP_DESC_28"] = "每日特惠",
+    ["SHOP_DESC_29"] = "\"每日特惠\"将每日刷新,通过观看广告可以额外刷新",
+    ["HERO_DESC_11"] = "活动获得",
 }
 
 return localization_global

lua/app/config/strings/cn/skill.lua

@@ -30,7 +30,7 @@ local skill = {
 		["desc"]="急速治疗：使用后本次恢复生命。"
 	},
 	[3300220]={
-		["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。"
+		["desc"]="狼袭瞬杀：使用后本次伤害提升，并造成多次技能伤害。"
 	},
 	[3400120]={
 		["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。"
@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。"
 	},
 	[4300220]={
-		["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。"
+		["desc"]="腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。"
 	},
 	[4400120]={
 		["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。"
@@ -51,7 +51,7 @@ local skill = {
 		["desc"]="护盾术：为团队附加一个护盾，1回合。"
 	},
 	[5300120]={
-		["desc"]="魔女琪琪：额外造成一次大量技能伤害。"
+		["desc"]="魔法扫帚：额外造成一次大量技能伤害。"
 	},
 	[5300220]={
 		["desc"]="灵魂猎手：额外造成一次大量技能伤害。"

lua/app/config/strings/cn/skill_rogue.lua

@@ -468,28 +468,28 @@ local skill_rogue = {
 		["desc"]="霜冻冰晶附加的冰盾，可反伤400%。"
 	},
 	[4300300]={
-		["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。"
+		["desc"]="解锁腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。"
 	},
 	[4300301]={
-		["desc"]="鸦姐技能附加的腐败效果，回合数+1."
+		["desc"]="腐败利刃附加的腐败效果，回合数+1."
 	},
 	[4300302]={
-		["desc"]="鸦姐技能对易伤敌人附加冰霜效果，1回合。"
+		["desc"]="腐败利刃对易伤敌人附加冰霜效果，1回合。"
 	},
 	[4300303]={
-		["desc"]="鸦姐技能使用时本次普攻伤害提升15%。"
+		["desc"]="腐败利刃使用时本次普攻伤害提升15%。"
 	},
 	[4300304]={
-		["desc"]="鸦姐技能附加的冰霜效果，回合数+1。"
+		["desc"]="腐败利刃附加的冰霜效果，回合数+1。"
 	},
 	[4300305]={
-		["desc"]="鸦姐技能附加虚弱效果，2回合。"
+		["desc"]="腐败利刃附加虚弱效果，2回合。"
 	},
 	[4300306]={
-		["desc"]="鸦姐技能沿＋方向可额外消除4格。"
+		["desc"]="腐败利刃沿＋方向可额外消除4格。"
 	},
 	[4300307]={
-		["desc"]="鸦姐技能附加的虚弱效果，回合数+2。"
+		["desc"]="腐败利刃附加的虚弱效果，回合数+2。"
 	},
 	[4400100]={
 		["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。"
@@ -606,7 +606,7 @@ local skill_rogue = {
 		["desc"]="蝴蝶技能激活所需能量-2。"
 	},
 	[5400106]={
-		["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升50%。"
+		["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升10%。"
 	},
 	[5400107]={
 		["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。"

lua/app/ui/common/cell/hero_cell.lua

@@ -42,19 +42,25 @@ function HeroCell:refresh(heroEntity, isGray)
 		self.progress:setSprite(GConst.ATLAS_PATH.COMMON, "common_progress_2", nil, self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER))
 	end
 	self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = fragmentCount / needFragmentCount
-	self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
 	if heroEntity:isUnlock() then
+		if heroEntity:isActived() then
+			self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
 			self.lvTx:setVisible(true)
+		else
+			self.lvTx:setVisible(false)
+		end
 		self.progressBg:setVisible(not heroEntity:isMaxLv())
 		self.unlockTx:setVisible(false)
-		if not heroEntity:isActived() then
-			self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11))
-		end
 	else
 		self.lvTx:setVisible(false)
 		self.progressBg:setVisible(false)
 		self.unlockTx:setVisible(true)
-		self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, heroEntity:getUnlcokChapter()))
+		local unlcokChapter = heroEntity:getUnlcokChapter()
+		if unlcokChapter then
+			self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter))
+		else
+			self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11))
+		end
 	end
 end
 

lua/app/userdata/hero/hero_entity.lua

@@ -107,7 +107,7 @@ function HeroEntity:getCfgAtk(lv)
 end
 
 function HeroEntity:getUnlcokChapter()
-	return self.config.unlock_chapter or 0
+	return self.config.unlock_chapter
 end
 
 function HeroEntity:updateAllAttr()
@@ -165,10 +165,10 @@ function HeroEntity:isUnlock()
 	if self:isActived() then
 		return true
 	end
-	if self:getUnlcokChapter() <= DataManager.ChapterData:getMaxChapterId() or self:canLvUp() then
+	local unlockChapter = self:getUnlcokChapter()
+	if unlockChapter and unlockChapter <= DataManager.ChapterData:getMaxChapterId() then
 		return true
 	end
-
 	return false
 end