配置表

lua/app/config/buff.lua

@@ -167,7 +167,8 @@ local buff = {
 		["name"]="dmg_addition_all_add",
 		["buff_type"]=1,
 		["stack"]=2,
-		["decr"]=1
+		["decr"]=1,
+		["icon"]="weakness_all_add"
 	},
 	[25]={
 		["name"]="atkp_color_add",

lua/app/config/buff_daily_challenge.lua

@@ -57,7 +57,7 @@ local buff_daily_challenge = {
 		["buff_type"]=1,
 		["effect"]={
 			{
-				["type"]="add_skill_all",
+				["type"]="skill_hurt_add",
 				["num"]=1500,
 				["ratio"]=1000,
 				["round"]=999
@@ -117,9 +117,9 @@ local buff_daily_challenge = {
 		["buff_type"]=2,
 		["effect"]={
 			{
-				["type"]="atkp_color_add",
+				["type"]="dmg_addition_all_add",
 				["num"]=500,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},
@@ -129,9 +129,9 @@ local buff_daily_challenge = {
 		["buff_type"]=2,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="normal_attack_add",
 				["num"]=1,
-				["ratio"]=1000,
+				["ratio"]=10000,
 				["round"]=999
 			}
 		},

lua/app/config/chapter.lua

@@ -252,10 +252,10 @@ local chapter = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=13,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vws=",
-				["num"]=15,
+				["num"]=1,
- 				["num_for_nothing"]="Vw0="
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["idle_exp"]=6,
@@ -398,10 +398,10 @@ local chapter = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=13,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Vws=",
-				["num"]=20,
+				["num"]=1,
- 				["num_for_nothing"]="VAg="
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["idle_exp"]=6,

lua/app/config/func_open.lua

@@ -17,7 +17,7 @@ local func_open = {
 		["icon"]="main_act_level_gift"
 	},
 	["idle_drop"]={
-		["stage"]=3,
+		["stage"]=2,
 		["icon"]="main_idle_drop"
 	},
 	["act_sevenday"]={
@@ -26,6 +26,7 @@ local func_open = {
 	},
 	["mall"]={
 		["stage"]=2,
+		["pop_ups"]=1,
 		["icon"]="main_mall"
 	},
 	["mall_daily"]={
@@ -43,15 +44,19 @@ local func_open = {
 		["icon"]="main_store_box_3"
 	},
 	["daily_challenge"]={
-		["stage"]=2,
+		["stage"]=8,
 		["icon"]="main_daily_challenge"
 	},
 	["act_gift_show_open"]={
 		["stage"]=3,
 		["pop_ups"]=1
+	},
+	["first_charge"]={
+		["stage"]=2,
+		["pop_ups"]=1
 	}
 }
 local config = {
-data=func_open,count=12
+data=func_open,count=13
 }
 return config

lua/app/config/grid_type.lua

@@ -3,12 +3,12 @@ local grid_type = {
 		["can_fall"]=1
 	},
 	[1]={
-		["icon"]="battle_hinder_4",
+		["icon"]="battle_hinder_1",
 		["cant_link"]=1,
 		["element_invalid"]=1
 	},
 	[2]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_stone_2",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -20,7 +20,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[3]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_stone_1",
 		["next_type"]=2,
 		["break_condition"]={
 			1,
@@ -32,7 +32,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[4]={
-		["icon"]="vine",
+		["icon"]="battle_obstacle_vine",
 		["next_type"]=0,
 		["break_condition"]={
 			2,
@@ -42,7 +42,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b03"
 	},
 	[5]={
-		["icon"]="ice",
+		["icon"]="battle_obstacle_ice",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -54,12 +54,12 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b02"
 	},
 	[6]={
-		["icon"]="lock",
+		["icon"]="battle_obstacle_lock",
 		["can_fall"]=1,
 		["cant_link"]=1
 	},
 	[7]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_stone_3",
 		["next_type"]=3,
 		["break_condition"]={
 			1,
@@ -71,7 +71,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[8]={
-		["icon"]="rocket_up",
+		["icon"]="battle_obstacle_rocket_up",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -87,7 +87,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[9]={
-		["icon"]="rocket_down",
+		["icon"]="battle_obstacle_rocket_down",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -103,7 +103,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[10]={
-		["icon"]="rocket_left",
+		["icon"]="battle_obstacle_rocket_left",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -119,7 +119,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[11]={
-		["icon"]="rocket_right",
+		["icon"]="battle_obstacle_rocket_right",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -135,7 +135,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[12]={
-		["icon"]="leaf",
+		["icon"]="battle_obstacle_leaf",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -147,7 +147,7 @@ local grid_type = {
 		["cant_link"]=1
 	},
 	[13]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_jelly",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -162,7 +162,7 @@ local grid_type = {
 		["effect_trigger"]=1
 	},
 	[14]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_lamp",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -176,7 +176,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[15]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_chest_3",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -191,7 +191,7 @@ local grid_type = {
 		["effect_trigger"]=2
 	},
 	[16]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_chest_2",
 		["next_type"]=15,
 		["break_condition"]={
 			1,
@@ -203,7 +203,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[17]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_chest_1",
 		["next_type"]=16,
 		["break_condition"]={
 			1,
@@ -215,7 +215,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[18]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_stump_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -227,7 +227,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[19]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_stump_2",
 		["next_type"]=18,
 		["break_condition"]={
 			1,
@@ -239,7 +239,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[20]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_stump_3",
 		["next_type"]=19,
 		["break_condition"]={
 			1,
@@ -251,7 +251,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[21]={
-		["icon"]="leaf",
+		["icon"]="battle_obstacle_blister",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -260,10 +260,13 @@ local grid_type = {
 		["break_count"]=1,
 		["break_stay_element"]=1,
 		["can_fall"]=1,
-		["cant_link"]=1
+		["cant_link"]=1,
+		["element_invalid"]=1,
+		["effect"]=2,
+		["effect_trigger"]=1
 	},
 	[22]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_silt",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -278,7 +281,7 @@ local grid_type = {
 		["effect_trigger"]=1
 	},
 	[23]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_poisonous mist",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -293,7 +296,7 @@ local grid_type = {
 		["effect_trigger"]=1
 	},
 	[24]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_altar_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -305,7 +308,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[25]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_altar_2",
 		["next_type"]=24,
 		["break_condition"]={
 			1,
@@ -317,7 +320,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[26]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_altar_3",
 		["next_type"]=25,
 		["break_condition"]={
 			1,
@@ -329,7 +332,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[27]={
-		["icon"]="vine",
+		["icon"]="battle_obstacle_circle",
 		["next_type"]=0,
 		["break_condition"]={
 			2,
@@ -339,7 +342,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b03"
 	},
 	[28]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_stalactite_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -351,7 +354,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[29]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_stalactite_2",
 		["next_type"]=28,
 		["break_condition"]={
 			1,
@@ -363,7 +366,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[30]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_stalactite_3",
 		["next_type"]=29,
 		["break_condition"]={
 			1,
@@ -375,7 +378,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[31]={
-		["icon"]="stone_2",
+		["icon"]="battle_obstacle_Iron_1",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -387,7 +390,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[32]={
-		["icon"]="stone_1",
+		["icon"]="battle_obstacle_Iron_2",
 		["next_type"]=31,
 		["break_condition"]={
 			1,
@@ -399,7 +402,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[33]={
-		["icon"]="stone_3",
+		["icon"]="battle_obstacle_Iron_3",
 		["next_type"]=32,
 		["break_condition"]={
 			1,
@@ -411,7 +414,7 @@ local grid_type = {
 		["break_sfx"]="sfx_piece_za_b01"
 	},
 	[34]={
-		["icon"]="jelly",
+		["icon"]="battle_obstacle_lava",
 		["next_type"]=0,
 		["break_condition"]={
 			1,
@@ -424,9 +427,21 @@ local grid_type = {
 		["element_invalid"]=1,
 		["effect"]=2,
 		["effect_trigger"]=1
+	},
+	[35]={
+		["icon"]="battle_obstacle_tussock",
+		["next_type"]=0,
+		["break_condition"]={
+			1,
+			3
+		},
+		["break_count"]=1,
+		["break_stay_element"]=1,
+		["can_fall"]=1,
+		["cant_link"]=1
 	}
 }
 local config = {
-data=grid_type,count=35
+data=grid_type,count=36
 }
 return config

lua/app/config/hero.lua

@@ -817,7 +817,7 @@ local hero = {
 		["model_id"]="p0022",
 		["icon"]="9",
 		["item_id"]=43001,
-		["unlock_chapter"]=6,
+		["unlock_chapter"]=2,
 		["is_show"]=1
 	},
 	[43002]={
@@ -1112,7 +1112,7 @@ local hero = {
 		["model_id"]="p0019",
 		["icon"]="15",
 		["item_id"]=53002,
-		["unlock_chapter"]=8,
+		["unlock_chapter"]=6,
 		["is_show"]=1
 	},
 	[54001]={

lua/app/config/localization/localization_global_const.lua

@@ -175,6 +175,15 @@ local LocalizationGlobalConst =
 	SHOP_DESC_28 = "SHOP_DESC_28",
 	SHOP_DESC_29 = "SHOP_DESC_29",
 	HERO_DESC_11 = "HERO_DESC_11",
+	SHOP_DESC_30 = "SHOP_DESC_30",
+	SHOP_DESC_31 = "SHOP_DESC_31",
+	SHOP_DESC_32 = "SHOP_DESC_32",
+	SHOP_DESC_33 = "SHOP_DESC_33",
+	SHOP_DESC_34 = "SHOP_DESC_34",
+	SHOP_DESC_35 = "SHOP_DESC_35",
+	SHOP_DESC_36 = "SHOP_DESC_36",
+	FUNC_OPEN_LEVEL = "FUNC_OPEN_LEVEL",
+	FUNC_OPEN_STAGE = "FUNC_OPEN_STAGE",
 }
 
 return LocalizationGlobalConst

lua/app/config/monster_daily_challenge.lua

@@ -585,7 +585,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=18000
 	},
 	[4602]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=15000000,
 		["atk"]=300000,
 		["atk_times"]=3,
@@ -621,7 +621,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=11000
 	},
 	[4902]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=22000000,
 		["atk"]=340000,
 		["atk_times"]=3,
@@ -670,7 +670,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=18000
 	},
 	[5302]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=27000000,
 		["atk"]=350000,
 		["atk_times"]=3,
@@ -1274,7 +1274,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=22000
 	},
 	[10102]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=8700000,
 		["atk"]=380000,
 		["atk_times"]=3,
@@ -1359,7 +1359,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=10000
 	},
 	[10802]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=24700000,
 		["atk"]=520000,
 		["atk_times"]=3,
@@ -1420,7 +1420,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=18000
 	},
 	[11302]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=36900000,
 		["atk"]=600000,
 		["atk_times"]=3,
@@ -1481,7 +1481,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=16000
 	},
 	[11802]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=61700000,
 		["atk"]=750000,
 		["atk_times"]=3,
@@ -1718,7 +1718,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=15000
 	},
 	[13702]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=58800000,
 		["atk"]=780000,
 		["atk_times"]=3,
@@ -1806,7 +1806,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=17000
 	},
 	[14402]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=26700000,
 		["atk"]=680000,
 		["atk_times"]=3,
@@ -1843,7 +1843,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=9000
 	},
 	[14702]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=28200000,
 		["atk"]=790000,
 		["atk_times"]=3,
@@ -1989,7 +1989,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=17000
 	},
 	[15902]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=82600000,
 		["atk"]=990000,
 		["atk_times"]=3,
@@ -2175,7 +2175,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=21000
 	},
 	[17402]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=57200000,
 		["atk"]=960000,
 		["atk_times"]=3,
@@ -2339,7 +2339,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=9000
 	},
 	[18702]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=34500000,
 		["atk"]=1010000,
 		["atk_times"]=3,
@@ -2473,7 +2473,7 @@ local monster_daily_challenge = {
 		["monster_exp"]=16000
 	},
 	[19802]={
-		["monster_base"]=10011,
+		["monster_base"]=10012,
 		["hp"]=101800000,
 		["atk"]=1340000,
 		["atk_times"]=3,

lua/app/config/skill.lua

@@ -264,7 +264,7 @@ local skill = {
 		["trigger"]=7,
 		["effect"]={
 			{
-				["type"]="dmg_addition_blue_add",
+				["type"]="dmg_addition_red_add",
 				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=1
@@ -933,22 +933,12 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_red",
-				["num"]=20000,
+				["num"]=60000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_red",
-				["num"]=40000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1,
-			2
-		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -1501,7 +1491,7 @@ local skill = {
 			{
 				{
 					["type"]="state",
-					["attr"]="lethargy",
+					["attr"]="vulnerable",
 					["op"]=">",
 					["v"]=0,
 					["side"]=2
@@ -1560,7 +1550,7 @@ local skill = {
 			{
 				{
 					["type"]="state",
-					["attr"]="lethargy",
+					["attr"]="vulnerable",
 					["op"]=">",
 					["v"]=0,
 					["side"]=2
@@ -1688,31 +1678,19 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=6680,
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
 				["type"]="hurt_yellow",
-				["num"]=6680,
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
 				["type"]="hurt_yellow",
-				["num"]=6680,
+				["num"]=13400,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_yellow",
-				["num"]=6680,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_yellow",
-				["num"]=6680,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -1730,9 +1708,7 @@ local skill = {
 		["effect_block"]={
 			1,
 			2,
-			3,
+			3
-			4,
-			5
 		},
 		["skill_position"]=1,
 		["shake_time"]=200,
@@ -2535,7 +2511,25 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_green",
-				["num"]=33400,
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=9400,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -2550,6 +2544,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
+		["effect_block"]={
+			1,
+			2,
+			3,
+			4
+		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -2605,7 +2605,25 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_green",
-				["num"]=33400,
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=9400,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -2626,6 +2644,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
+		["effect_block"]={
+			1,
+			2,
+			3,
+			5
+		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -2668,7 +2692,25 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_green",
-				["num"]=33400,
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=8000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_green",
+				["num"]=9400,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -2689,6 +2731,12 @@ local skill = {
 			}
 		},
 		["eliminate_obj"]=1,
+		["effect_block"]={
+			1,
+			2,
+			3,
+			5
+		},
 		["skill_position"]=1,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -3352,7 +3400,19 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_blue",
-				["num"]=40000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_blue",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_blue",
+				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -3364,6 +3424,11 @@ local skill = {
 			}
 		},
 		["obj"]=2,
+		["effect_block"]={
+			1,
+			2,
+			4
+		},
 		["skill_position"]=2,
 		["shake_time"]=200,
 		["shake_type"]=6,
@@ -4170,7 +4235,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=5000,
 				["round"]=2
 			}
@@ -4215,7 +4280,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -4645,7 +4710,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=999
 			}
@@ -4757,7 +4822,7 @@ local skill = {
 			2
 		},
 		["skill_position"]=1,
-		["cd"]=2,
+		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
 		["shake_type"]=5,
@@ -4923,14 +4988,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=30000,
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["skill_position"]=1,
 		["cd"]=2,
@@ -5028,6 +5107,10 @@ local skill = {
 		["cd_start"]=0
 	},
 	[10027]={
+		["skill_type"]=9,
+		["skill_type_parameter"]={
+			10000
+		},
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -5039,9 +5122,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["skill_position"]=2,
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5058,15 +5138,6 @@ local skill = {
 			400
 		}
 	},
-	[10028]={
-		["skill_type"]=9,
-		["skill_type_parameter"]={
-			10000
-		},
-		["skill_position"]=2,
-		["cd"]=3,
-		["cd_start"]=0
-	},
 	[10029]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -5082,6 +5153,12 @@ local skill = {
 				["num"]=3500,
 				["ratio"]=10000,
 				["round"]=2
+			},
+			{
+				["type"]="lock",
+				["num"]=0,
+				["ratio"]=10000,
+				["round"]=1
 			}
 		},
 		["obj"]=2,
@@ -5101,22 +5178,6 @@ local skill = {
 			400
 		}
 	},
-	[10030]={
-		["effect_type"]=1,
-		["trigger"]=1,
-		["effect"]={
-			{
-				["type"]="lock",
-				["num"]=0,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=2,
-		["skill_position"]=2,
-		["cd"]=3,
-		["cd_start"]=0
-	},
 	[10031]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -5233,9 +5294,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5292,7 +5350,7 @@ local skill = {
 			1,
 			2,
 			3,
-			4
+			5
 		},
 		["skill_position"]=2,
 		["cd"]=3,
@@ -5321,14 +5379,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=30000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["skill_position"]=2,
 		["cd"]=2,
@@ -5482,7 +5554,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="counterattack",
-				["num"]=1500,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -5532,7 +5604,7 @@ local skill = {
 			1,
 			2,
 			3,
-			4
+			5
 		},
 		["skill_position"]=2,
 		["cd"]=3,
@@ -5561,9 +5633,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["name_act"]="skill01"
@@ -5578,14 +5647,35 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=50000,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3,
+			4
 		},
 		["cd"]=3,
 		["cd_start"]=0,
@@ -5612,9 +5702,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5655,9 +5742,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5688,14 +5772,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=20000,
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=15000,
 				["ratio"]=10000,
 				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["cd"]=2,
 		["cd_start"]=0,
@@ -5711,20 +5809,28 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=20000,
+				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
-				["type"]="lock",
+				["type"]="hurt",
-				["num"]=0,
+				["num"]=5000,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=0
 			}
 		},
 		["obj"]=2,
 		["effect_block"]={
-			1
+			1,
+			2,
+			3
 		},
 		["cd"]=2,
 		["cd_start"]=1,
@@ -5752,9 +5858,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["name_act"]="skill01"
@@ -5796,9 +5899,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5853,9 +5953,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5881,9 +5978,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5910,9 +6004,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=0,
 		["shake_time"]=200,
@@ -5944,9 +6035,6 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1
-		},
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=200,
@@ -5954,6 +6042,194 @@ local skill = {
 		["sound_hit"]=4200120,
 		["name_act"]="skill02"
 	},
+	[10060]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=60000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["skill_position"]=2,
+		["cd"]=2,
+		["cd_start"]=0,
+		["sound_hit"]=3300120,
+		["name_act"]="skill01",
+		["fx_self"]=200011
+	},
+	[10061]={
+		["effect_type"]=2,
+		["trigger"]=5,
+		["effect"]={
+			{
+				["type"]="vulnerable",
+				["num"]=2500,
+				["ratio"]=2500,
+				["round"]=1
+			}
+		},
+		["obj"]=2,
+		["cd"]=0,
+		["cd_start"]=0
+	},
+	[10062]={
+		["skill_type"]=3,
+		["skill_type_parameter"]={
+			5,
+			2
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=1,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["cd"]=2,
+		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]=10082,
+		["name_act"]="skill01",
+		["fx_self"]=200039,
+		["bullet_time"]={
+			333,
+			3000,
+			666
+		}
+	},
+	[10063]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=1,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["cd"]=3,
+		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]=10082,
+		["name_act"]="skill01",
+		["fx_self"]=200039,
+		["bullet_time"]={
+			333,
+			3000,
+			666
+		}
+	},
+	[10064]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=30000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=1,
+				["ratio"]=10000,
+				["round"]=2
+			},
+			{
+				["type"]="weaken",
+				["num"]=2500,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["cd"]=3,
+		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]=10082,
+		["name_act"]="skill01",
+		["fx_self"]=200039,
+		["bullet_time"]={
+			333,
+			3000,
+			666
+		}
+	},
+	[10065]={
+		["skill_type"]=3,
+		["skill_type_parameter"]={
+			2,
+			2
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=15000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt",
+				["num"]=1500,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="burn",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["effect_block"]={
+			1,
+			3
+		},
+		["skill_position"]=1,
+		["cd"]=3,
+		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]=10082,
+		["name_act"]="skill01",
+		["fx_self"]=200039,
+		["bullet_time"]={
+			333,
+			3000,
+			666
+		}
+	},
 	[20001]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -11456,6 +11732,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=552
+data=skill,count=556
 }
 return config

lua/app/config/skill_rogue.lua

@@ -1356,7 +1356,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=2400121,
+				["num"]=2300121,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1762,7 +1762,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=10,
+				["num"]=3200121,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1779,7 +1779,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=2200121,
+				["num"]=3200122,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1824,14 +1824,6 @@ local skill_rogue = {
 				["range"]=1
 			}
 		},
-		["effect"]={
-			{
-				["type"]="add_skill",
-				["num"]=9,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
 		["obj"]=5,
 		["icon"]="48"
 	},
@@ -3163,7 +3155,8 @@ local skill_rogue = {
 		["weight"]=100000,
 		["qlt"]=4,
 		["type"]=6,
-		["skill_position"]=5
+		["skill_position"]=5,
+		["icon"]="190"
 	},
 	[5400101]={
 		["limit_times"]=1,
@@ -3175,7 +3168,7 @@ local skill_rogue = {
 			10000
 		},
 		["skill_position"]=5,
-		["icon"]="190"
+		["icon"]="164"
 	},
 	[5400102]={
 		["limit_times"]=1,
@@ -3192,7 +3185,7 @@ local skill_rogue = {
 			}
 		},
 		["obj"]=7,
-		["icon"]="164"
+		["icon"]="165"
 	},
 	[5400103]={
 		["limit_times"]=1,
@@ -3209,7 +3202,7 @@ local skill_rogue = {
 			}
 		},
 		["obj"]=7,
-		["icon"]="165"
+		["icon"]="166"
 	},
 	[5400104]={
 		["limit_times"]=1,
@@ -3226,7 +3219,7 @@ local skill_rogue = {
 			}
 		},
 		["obj"]=7,
-		["icon"]="166"
+		["icon"]="167"
 	},
 	[5400105]={
 		["limit_times"]=1,
@@ -3237,41 +3230,41 @@ local skill_rogue = {
 			5400123
 		},
 		["skill_position"]=5,
-		["icon"]="167"
+		["icon"]="168"
 	},
 	[5400106]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=12,
+		["type"]=9,
 		["skill_position"]=5,
 		["effect"]={
 			{
 				["type"]="add_skill",
 				["num"]=5400124,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=0
 			}
 		},
 		["obj"]=7,
-		["icon"]="168"
+		["icon"]="169"
 	},
 	[5400107]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=4,
-		["type"]=12,
+		["type"]=9,
 		["skill_position"]=5,
 		["effect"]={
 			{
 				["type"]="add_skill",
 				["num"]=5400125,
 				["ratio"]=10000,
-				["round"]=1
+				["round"]=0
 			}
 		},
 		["obj"]=7,
-		["icon"]="169"
+		["icon"]="170"
 	}
 }
 local config = {

lua/app/config/strings/cn/buff.lua

@@ -23,6 +23,10 @@ local buff = {
 		["desc"]="极致抗性：受到所有英雄的伤害降低{0}。",
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["desc"]="伤害提升：造成的伤害提升{0}。",
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["desc"]="眩晕：本回合无法行动。",
 		["name"]="stun"
@@ -124,6 +128,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -152,6 +157,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

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

@@ -175,6 +175,15 @@ local localization_global =
     ["SHOP_DESC_28"] = "每日特惠",
     ["SHOP_DESC_29"] = "\"每日特惠\"将每日刷新,通过观看广告可以额外刷新",
     ["HERO_DESC_11"] = "活动获得",
+    ["SHOP_DESC_30"] = "是否使用钻石刷新每日特惠?",
+    ["SHOP_DESC_31"] = "确认购买",
+    ["SHOP_DESC_32"] = "是否花费金币购买",
+    ["SHOP_DESC_33"] = "是否花费钻石购买",
+    ["SHOP_DESC_34"] = "首充豪礼",
+    ["SHOP_DESC_35"] = "充值购买任意商品,即可获得如下奖励,仅此一次！",
+    ["SHOP_DESC_36"] = "商店",
+    ["FUNC_OPEN_LEVEL"] = "玩家等级{0}开启",
+    ["FUNC_OPEN_STAGE"] = "通关章节{0}开启",
 }
 
 return localization_global

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

@@ -261,7 +261,7 @@ local skill_rogue = {
 		["desc"]="旋风骨技能伤害提升。"
 	},
 	[2300103]={
-		["desc"]="旋风骨对昏睡敌人有50%概率附加眩晕效果，1回合。"
+		["desc"]="旋风骨对易伤敌人有50%概率附加眩晕效果，1回合。"
 	},
 	[2300104]={
 		["desc"]="旋风骨附加的流血效果，回合数+1。"

lua/app/config/strings/cn/tutorial.lua

@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 		["value"]="领取宝箱，获取第五位英雄"
+	},
+	["tutorial_txt_5"]={
+		["value"]="前往商城，获得更多英雄！"
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config

lua/app/config/strings/de/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/de/tutorial.lua

@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config

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

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/en/tutorial.lua

@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 		["value"]="Claim chest to unlock the 5th hero"
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config

lua/app/config/strings/fr/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/fr/tutorial.lua

@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config

lua/app/config/strings/id/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/ja/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/ja/tutorial.lua

@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config

lua/app/config/strings/ko/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/ko/tutorial.lua

@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config

lua/app/config/strings/pt/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/ru/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/th/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/vi/buff.lua

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

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

@@ -17,6 +17,9 @@ local buff = {
 	[12]={
 		["name"]="dec_dmg_all_add"
 	},
+	[24]={
+		["name"]="dmg_addition_all_add"
+	},
 	[33]={
 		["name"]="stun"
 	},
@@ -95,6 +98,7 @@ local keys = {
 		["dec_dmg_blue_add"]=buff[10],
 		["dec_dmg_purple_add"]=buff[11],
 		["dec_dmg_all_add"]=buff[12],
+		["dmg_addition_all_add"]=buff[24],
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
@@ -123,6 +127,6 @@ local keys = {
 local config = {
 data=buff,
 keys=keys,
-count=29
+count=30
 }
 return config

lua/app/config/strings/zh/tutorial.lua

@@ -10,9 +10,12 @@ local tutorial = {
 	},
 	["tutorial_txt_4"]={
 		["value"]="領取寶箱，獲取第五位英雄"
+	},
+	["tutorial_txt_5"]={
+
 	}
 }
 local config = {
-data=tutorial,count=4
+data=tutorial,count=5
 }
 return config

lua/app/config/tutorial.lua

@@ -344,7 +344,7 @@ local tutorial = {
 	[40040]={
 		["next_id"]=40050,
 		["type"]=2,
-		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_1",
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_3",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
@@ -409,6 +409,7 @@ local tutorial = {
 		}
 	},
 	[40080]={
+		["next_id"]=40090,
 		["type"]=2,
 		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn",
 		["arrow_direction"]=1,
@@ -416,9 +417,38 @@ local tutorial = {
 			0,
 			-50
 		}
+	},
+	[40090]={
+		["next_id"]=40100,
+		["type"]=2,
+		["txt"]="tutorial_txt_5",
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[40100]={
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/shop_comp/main/scrollrect/viewport/content/box_sell_cell/bg/box_1/buy_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
 	}
 }
 local config = {
-data=tutorial,count=32
+data=tutorial,count=34
 }
 return config