Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

lua/app/common/event_manager.lua

@@ -27,6 +27,8 @@ EventManager.CUSTOM_EVENT = {
 	BOSS_ENTER_ANI_OVER = "BOSS_ENTER_ANI_OVER",
 	TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", 		-- 邮件到时间请求是否有新邮件
 	SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC",
+	GO_SHOP = "GO_SHOP", -- 跳转商店
+	UPDATE_MAIN_MALL_HEIGHT = "UPDATE_MAIN_MALL_HEIGHT", -- 更新主要商品的高度
 	-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
 	-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
 }

lua/app/common/pay_manager.lua

@@ -103,7 +103,6 @@ function PayManager:getGiftConfigInfo(purchaseType, id)
         return
     end
     local cfg = ConfigManager:getConfig(cfgName)
-    local cfg = ConfigManager:getConfig(cfgName)
     if not cfg or not cfg[id] then
         return
     end

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

lua/app/global/global_const.lua

@@ -265,6 +265,7 @@ GConst.MESSAGE_BOX_TYPE = {
 
 GConst.MESSAGE_BOX_SHOW_TODAY = {
 	BOUNTY_BUY_LEVEL = 1,
+	HOT_SELL_BUY = 2,
 }
 
 GConst.QUALITY_TYPE =

lua/app/module/battle/component/battle_unit_comp.lua

@@ -1329,6 +1329,8 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
 	if validEffectIdx then
 		effectStartIdx = validEffectIdx[1] + 1
 		effectEndIdx = validEffectIdx[2]
+	else
+		effectEndIdx = #effectList
 	end
 	for i = effectStartIdx, effectEndIdx do
 		local effect = effectList[i]
@@ -1370,12 +1372,15 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
 end
 
 function BattleUnitComp:judgeSkillEffectCondition(skill, index)
-	if not skill then
+	if not skill or skill:haveBuffCondition() then
 		return true
 	end
 
-	local buffConditions = skill:getBuffCondition(index)
+	local buffConditionIndex, conditionRel = skill:getBuffConditionRel(index)
-	local conditionRel = skill:getBuffConditionRel(index)
+	if not buffConditionIndex then
+		return true
+	end
+	local buffConditions = skill:getBuffCondition(buffConditionIndex)
 
 	return BATTLE_SKILL_CONDITION_HANDLE.judgeSkillEffectCondition(buffConditions, conditionRel, self.battleController)
 end
@@ -1601,6 +1606,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d
 				self:onAttackOver()
 			end
 
+			self.battleController:resetTimeSpeed()
+
 			self:changeState(UNIT_STATE.DEAD)
 		elseif damage < 0 then
 			self:playHurt()

lua/app/module/battle/controller/battle_controller.lua

@@ -2216,26 +2216,34 @@ function BattleController:resetGrids(posList)
         return
     end
 
-    local canRandomElmentList = {}
+    if not self.canRandomElmentList then
+        self.canRandomElmentList = {}
+    end
+
+    for i = #self.canRandomElmentList, 1, -1 do
+        table.remove(self.canRandomElmentList)
+    end
+
+    local elementCount = 0
     for typeName, typeNum in pairs(BattleConst.ELEMENT_TYPE) do
         if not lockElementMap[typeNum] and  not self:getSealElementType()[typeNum] and self.battleData:getSkillEntityByElement(typeNum) then
-            table.insert(canRandomElmentList, typeNum)
+            table.insert(self.canRandomElmentList, typeNum)
+            elementCount = elementCount + 1
         end
     end
 
-    if not canRandomElmentList[1] then
+    if elementCount <= 0 then
         return
     end
 
-    local elementCount = #canRandomElmentList
+    local mainElement = self.canRandomElmentList[math.random(1, elementCount)]
-    local mainElement = canRandomElmentList[math.random(1, elementCount)]
 
     for typeNum, _ in pairs(lockElementMap) do
-        table.insert(canRandomElmentList, typeNum)
+        table.insert(self.canRandomElmentList, typeNum)
         elementCount = elementCount + 1
     end
 
-    local resetPosInfo = self:_dealResetGridsDataFunc2(useMap, emptySnapList, mainElement, backupSkill, keepSnapList, posMap, canRandomElmentList, elementCount, lockElementMap)
+    local resetPosInfo = self:_dealResetGridsDataFunc2(useMap, emptySnapList, mainElement, backupSkill, keepSnapList, posMap, self.canRandomElmentList, elementCount, lockElementMap)
 
     return resetPosInfo
 end

lua/app/module/battle/skill/battle_board_skill_handle.lua

@@ -336,12 +336,14 @@ local function _takeAddSkillEnergy(atkUnitComp, skillEntity, battleController)
         local boardSkills
         local count = 0
         for eType, entity in pairs(battleController.battleData:getSkillEntities()) do
+            if entity:getUnlocked() then
                 if not boardSkills then
                     boardSkills = {}
                 end
                 table.insert(boardSkills, eType)
                 count = count + 1
             end
+        end
         if count <= 0 then
             return
         end

lua/app/module/battle/team/battle_team.lua

@@ -400,6 +400,9 @@ function BattleTeam:doBuffWork()
 	buffEffect = nil
 	for i = count, 1, -1 do
 		buffEffect = self.buffList[i]
+		if not buffEffect then
+			break
+		end
 		buffEffect.round = buffEffect.round - 1
 		BattleBuffHandle.doBuffWork(self.mainUnit, buffEffect)
 		if buffEffect.round <= 0 then

lua/app/module/maincity/maincity_const.lua

@@ -25,6 +25,7 @@ MainCityConst.LEFT_SIDE_BARS = {
 MainCityConst.RIGHT_SIDE_BARS = {
 	"app/ui/main_city/cell/side_bar_gold_pig_cell",
 	"app/ui/main_city/cell/side_bar_growth_fund_cell",
+	"app/ui/main_city/cell/side_bar_first_recharge_cell",
 	"app/ui/main_city/cell/side_bar_beginner_gift_cell",
 	"app/ui/main_city/cell/side_bar_grow_up_gift_1_cell",
 	"app/ui/main_city/cell/side_bar_grow_up_gift_2_cell",

lua/app/module/shop/shop_const.lua

@@ -1,5 +1,6 @@
 local ShopConst = {}
 
+ShopConst.FIRST_RECHARGE_ID = 10102 -- 首充礼包ID
 ShopConst.BEGINNER_GIFT_ID = 40102 -- 新手礼包ID
 ShopConst.MAIN_UI_POP_TYPE = { -- 当触发弹窗时,相关联的类型礼包也要触发
     [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
@@ -9,4 +10,31 @@ ShopConst.MAIN_UI_POP_TYPE = { -- 当触发弹窗时,相关联的类型礼包也
     [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = true
 }
 
+ShopConst.GEM_ICON_NAME = {
+    [1] = "shop_diamond_1",
+    [2] = "shop_diamond_1",
+    [3] = "shop_diamond_2",
+    [4] = "shop_diamond_3",
+    [5] = "shop_diamond_4",
+    [6] = "shop_diamond_5",
+    [7] = "shop_diamond_6",
+    [8] = "shop_diamond_7",
+    [9] = "shop_diamond_8",
+    [10] = "shop_diamond_8",
+    [11] = "shop_diamond_8",
+    [12] = "shop_diamond_8",
+    [13] = "shop_diamond_8",
+    [14] = "shop_diamond_8",
+    [15] = "shop_diamond_8",
+    [16] = "shop_diamond_8",
+    [17] = "shop_diamond_8",
+    [18] = "shop_diamond_8",
+    [19] = "shop_diamond_8",
+}
+ShopConst.COIN_ICON_NAME = {
+    [1] = "shop_species_1",
+    [2] = "shop_species_2",
+    [3] = "shop_species_3",
+}
+
 return ShopConst

lua/app/module/shop/shop_manager.lua

@@ -24,13 +24,17 @@ end
 -- 触发弹窗礼包
 function ShopManager:triggerGiftPopUI(actType, actId)
     if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then
-        UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId})
+        self:showGiftPopUI(actType, actId, false)
         DataManager.ShopData:removePopUpGift(actType, actId)
     end
 end
 
-function ShopManager:showGiftPopUI(actType, actId)
+function ShopManager:showGiftPopUI(actType, actId, onlySelf)
-    UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = true})
+    if actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.FIRST_RECHARGE_ID then
+        UIManager:showUI("app/ui/shop/first_recharge_pop_ui")
+    else
+        UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf})
+    end
 end
 
 -- 触发金币弹窗礼包
@@ -63,11 +67,32 @@ function ShopManager:buyMallDailyGift(id, isAd)
         end
     end
 
+    -- 二次弹窗确认
+    if costs then
+        local isCoin = costs.id == GConst.ItemConst.ITEM_ID_GOLD
+        local params ={
+            titleTx = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_31),
+            content = isCoin and I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_32) or I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33),
+            boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
+            showToday = GConst.MESSAGE_BOX_SHOW_TODAY.HOT_SELL_BUY,
+            costId = costs.id,
+            costNum = costs.num,
+            okFunc = function()
                 local responseData = {
                     rewards = rewards,
                     costs = costs
                 }
                 self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY)
+            end,
+        }
+	    GFunc.showMessageBox(params)
+    else
+        local responseData = {
+            rewards = rewards,
+            costs = costs
+        }
+        self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY)
+    end
 end
 
 function ShopManager:buyMallDailyGiftFinish(result)

lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua

@@ -6,11 +6,11 @@ function SideBarBeginnerGiftCell:getIsOpen()
 end
 
 function SideBarBeginnerGiftCell:getIconRes()
-    return "main_btn_gift_1" -- TODOJ
+    return "main_btn_gift_1"
 end
 
 function SideBarBeginnerGiftCell:onClick()
-    ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID)
+    ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID, true)
 end
 
 function SideBarBeginnerGiftCell:getIsShowRedPoint()

lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua

@@ -0,0 +1,24 @@
+local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell"
+local SideBarFirstRechargeCell = class("SideBarFirstRechargeCell", SideBarBaseCellComp)
+
+function SideBarFirstRechargeCell:getIsOpen()
+    return DataManager.ShopData:getShowFirstRechargeSideBar()
+end
+
+function SideBarFirstRechargeCell:getIconRes()
+    return "main_btn_gift_3"
+end
+
+function SideBarFirstRechargeCell:getIsShowRedPoint()
+    return DataManager.ShopData:showFirstRechargeRp()
+end
+
+function SideBarFirstRechargeCell:onClick()
+    ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID, true)
+end
+
+function SideBarFirstRechargeCell:getIsShowRedPoint()
+    return false
+end
+
+return SideBarFirstRechargeCell

lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta

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

lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua

@@ -6,13 +6,13 @@ function SideBarGrowUpGift1Cell:getIsOpen()
 end
 
 function SideBarGrowUpGift1Cell:getIconRes()
-    return "main_btn_gift_2" -- TODOJ
+    return "main_btn_gift_2"
 end
 
 function SideBarGrowUpGift1Cell:onClick()
     local gift = DataManager.ShopData:getValidGrowUpGifts()[1]
     if gift then
-        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id)
+        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id, true)
     end
 end
 

lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua

@@ -6,13 +6,13 @@ function SideBarGrowUpGift2Cell:getIsOpen()
 end
 
 function SideBarGrowUpGift2Cell:getIconRes()
-    return "main_btn_gift_2" -- TODOJ
+    return "main_btn_gift_2"
 end
 
 function SideBarGrowUpGift2Cell:onClick()
     local gift = DataManager.ShopData:getValidGrowUpGifts()[2]
     if gift then
-        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id)
+        ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id, true)
     end
 end
 

lua/app/ui/main_city/main_city_ui.lua

@@ -130,6 +130,18 @@ function MainCityUI:_addListeners()
         -- 引导完成时 检测主界面的弹窗是否要触发
         self:checkGift()
     end)
+    self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function()
+        if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then
+            if self.selectedIndex == MainCityUI.CLICK_BTN_TYPE[3] then
+                return
+            end
+            BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[3]])
+            self.bottomBtnSpines[3]:playAnimComplete("born", false, false, function()
+                self.bottomBtnSpines[3]:playAnim("idle", false, false)
+            end)
+            self:refreshBottom(3, true)
+        end
+    end)
     DataManager.MailData:checkNewMail()
 end
 
@@ -189,6 +201,7 @@ function MainCityUI:_bind()
                 self.subComps[self.selectedIndex]:refresh()
             end
         end
+        self:refreshBottomRp()
     end)
     self:bind(DataManager.SummonData, "isDirty", function()
         if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.SHOP and self.subComps[self.selectedIndex] then
@@ -206,6 +219,11 @@ function MainCityUI:initBottomUI()
     for i = 1, 3 do
         local cellCom = CellManager:addCellComp(uiMap["main_ui.bottom_node.bottom_btn_cell_" .. i], BOTTOM_BTN_CELL)
         cellCom:addClickListener(function()
+            if i == 3 then -- 商城有开启条件
+                if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then
+                    return
+                end
+            end
             if self.selectedIndex == i then
                 return
             end
@@ -750,6 +768,12 @@ function MainCityUI:refreshBottomRp()
     else
         heroRpObj:removeRedPoint()
     end
+    local shopRpObj = uiMap["main_ui.bottom_node.icons.ui_spine_obj_3.rp_node"]
+    if DataManager.ShopData:getRp() then
+        shopRpObj:addRedPoint(0, 0, 1)
+    else
+        shopRpObj:removeRedPoint()
+    end
 end
 
 function MainCityUI:refreshSettingBtn()
@@ -843,6 +867,7 @@ function MainCityUI:checkGift()
         -- 先遍历找出符合弹出的类型
         local beginnerGiftIds = {}
         local levelUpGiftIds = {}
+        local firstRechargeIds = {}
         for _, actId in ipairs(popUpGift) do
             local cfgInfo = DataManager.ShopData:getActGiftConfig()[actId]
             if cfgInfo then
@@ -854,8 +879,17 @@ function MainCityUI:checkGift()
                 if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT then
                     table.insert(levelUpGiftIds, actId)
                 end
+                -- 首充礼包
+                if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE then
+                    table.insert(firstRechargeIds, actId)
                 end
             end
+        end
+        -- 首充礼包
+        if #firstRechargeIds then
+            ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, firstRechargeIds[1])
+            return true
+        end
         -- 新手礼包
         if #beginnerGiftIds > 0 then
             ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, beginnerGiftIds[1])
@@ -866,8 +900,6 @@ function MainCityUI:checkGift()
             ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, levelUpGiftIds[1])
             return true
         end
-        
-        return true
     end
     -- 特殊的 成长礼包
     local popUpGift = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT)

lua/app/ui/shop/box_hero_ui.lua

@@ -1,12 +1,12 @@
 local BoxHeroUI = class("BoxHeroUI", BaseUI)
 
 local TITLE_TEXT = {
-	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "普通宝箱TD", -- TODOJ
+	[GConst.SummonConst.SUMMON_TYPE.LV_1] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_1), -- 普通宝箱
-	[GConst.SummonConst.SUMMON_TYPE.LV_2] = "精致宝箱TD",
+	[GConst.SummonConst.SUMMON_TYPE.LV_2] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_2), -- 精致宝箱
-	[GConst.SummonConst.SUMMON_TYPE.LV_3] = "珍贵宝箱TD"
+	[GConst.SummonConst.SUMMON_TYPE.LV_3] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_3), -- 珍贵宝箱
 }
 local ICON_NAME = {
-	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", -- TODOJ
+	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1",
 	[GConst.SummonConst.SUMMON_TYPE.LV_2] = "shop_chest_2",
 	[GConst.SummonConst.SUMMON_TYPE.LV_3] = "shop_chest_3"
 }

lua/app/ui/shop/box_level_ui.lua

@@ -36,7 +36,7 @@ function BoxLevelUI:onLoadRootComplete()
     self.box1Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_1.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box1Add2Text = self.uiMap["box_level_ui.bg.box_1.add_node_2.text"]
     self.box1Desc = self.uiMap["box_level_ui.bg.box_1.none_text"]
-    self.box1Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
 	self.box2Node = self.uiMap["box_level_ui.bg.box_2"]
     self.box2Add1Node = self.uiMap["box_level_ui.bg.box_2.add_node_1"]
@@ -46,7 +46,7 @@ function BoxLevelUI:onLoadRootComplete()
     self.box2Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_2.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box2Add2Text = self.uiMap["box_level_ui.bg.box_2.add_node_2.text"]
     self.box2Desc = self.uiMap["box_level_ui.bg.box_2.none_text"]
-    self.box2Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box2Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.box3Node = self.uiMap["box_level_ui.bg.box_3"]
     self.box3Add1Node = self.uiMap["box_level_ui.bg.box_3.add_node_1"]
@@ -56,10 +56,10 @@ function BoxLevelUI:onLoadRootComplete()
     self.box3Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_3.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box3Add2Text = self.uiMap["box_level_ui.bg.box_3.add_node_2.text"]
     self.box3Desc = self.uiMap["box_level_ui.bg.box_3.none_text"]
-    self.box3Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box3Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.bottomDesc = self.uiMap["box_level_ui.bg.title"]
-    self.bottomDesc:setText("开宝箱提升等级，增加宝箱奖励TD") -- TODOJ
+    self.bottomDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_5)) -- 开宝箱提升等级,增加宝箱奖励
 
     self.leftArrow:addClickListener(function()
         self.level = self.level - 1

lua/app/ui/shop/box_level_up_ui.lua

@@ -30,7 +30,7 @@ function BoxLevelUpUI:onLoadRootComplete()
     self.box1Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_1.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box1Add2Text = self.uiMap["box_level_up_ui.box_1.add_node_2.text"]
     self.box1Desc = self.uiMap["box_level_up_ui.box_1.none_text"]
-    self.box1Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
 	self.box2Node = self.uiMap["box_level_up_ui.box_2"]
     self.box2Add1Node = self.uiMap["box_level_up_ui.box_2.add_node_1"]
@@ -40,7 +40,7 @@ function BoxLevelUpUI:onLoadRootComplete()
     self.box2Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_2.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box2Add2Text = self.uiMap["box_level_up_ui.box_2.add_node_2.text"]
     self.box2Desc = self.uiMap["box_level_up_ui.box_2.none_text"]
-    self.box2Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box2Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.box3Node = self.uiMap["box_level_up_ui.box_3"]
     self.box3Add1Node = self.uiMap["box_level_up_ui.box_3.add_node_1"]
@@ -50,7 +50,7 @@ function BoxLevelUpUI:onLoadRootComplete()
     self.box3Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_3.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
     self.box3Add2Text = self.uiMap["box_level_up_ui.box_3.add_node_2.text"]
     self.box3Desc = self.uiMap["box_level_up_ui.box_3.none_text"]
-    self.box3Desc:setText("无额外奖励加成TD") -- TODOJ
+    self.box3Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
 
     self.closeTx = self.uiMap["box_level_up_ui.close_tx"]
 
@@ -58,9 +58,9 @@ function BoxLevelUpUI:onLoadRootComplete()
 end
 
 function BoxLevelUpUI:refresh()
-    self.titleTx:setText("宝箱等级提升!TD") -- TODOJ
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_6)) -- 宝箱等级提升!
     self.lvTx:setText("Lv." .. tostring(self.level))
-    self.closeTx:setText("点击继续TD") -- TODOJ
+    self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) -- 点击继续
 
     self.box1Add1Node:setVisible(false)
     self.box1Add2Node:setVisible(false)

lua/app/ui/shop/box_open_ui.lua

@@ -1,7 +1,7 @@
 local BoxOpenUI = class("BoxOpenUI", BaseUI)
 
 local ICON_NAME = {
-	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", -- TODOJ
+	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1",
 	[GConst.SummonConst.SUMMON_TYPE.LV_2] = "shop_chest_2",
 	[GConst.SummonConst.SUMMON_TYPE.LV_3] = "shop_chest_3"
 }
@@ -28,7 +28,7 @@ function BoxOpenUI:onLoadRootComplete()
     self.btnText = self.uiMap["box_open_ui.open_btn.text"]
 
     self.boxImg:setSprite(GConst.ATLAS_PATH.SHOP, ICON_NAME[self.summonType])
-    self.btnText:setText("立即打开") -- TODOJ
+    self.btnText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_7)) -- 立即打开
 
     self.openBtn:addClickListener(function()
         ModuleManager.ShopManager:showBoxRewardUI(self.params)

lua/app/ui/shop/box_reward_ui.lua

@@ -35,7 +35,7 @@ function BoxRewardUI:onLoadRootComplete()
     self.uiMap = self.root:genAllChildren()
 
     self.titleTx = self.uiMap["box_reward_ui.title.text"]
-    self.titleTx:setText("恭喜获得TD") -- TODOJ
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_8)) -- 恭喜获得
 
     self.scrollRectObj = self.uiMap["box_reward_ui.scroll_rect"]
     self.scrollRect = self.scrollRectObj:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
@@ -60,7 +60,7 @@ function BoxRewardUI:onLoadRootComplete()
     end
 
     self.closeTx = self.uiMap["box_reward_ui.close_tx"]
-    self.closeTx:setText("点击关闭TD") -- TODOJ
+    self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC))
 
     self.mask = self.uiMap["box_reward_ui.mask"]
     self.mask:addClickListener(function()

lua/app/ui/shop/cell/beginner_sell_cell.lua

@@ -51,9 +51,9 @@ function BeginnerSellCell:refresh()
         self.offImg:setVisible(false)
     end
     -- 限购
-    self.limitText:setText("限购1次TD") -- 章节礼包默认限购1次 TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次
     -- 标题
-    self.titleText:setText("新手礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_11)) -- 新手礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0

lua/app/ui/shop/cell/box_sell_cell.lua

@@ -8,24 +8,24 @@ function BoxSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.bg = uiMap["box_sell_cell.bg"]
 	local boxNameTx1 = uiMap["box_sell_cell.bg.box_1.name_tx"]
-	boxNameTx1:setText("临时文本:普通宝箱")
+	boxNameTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_1)) -- 普通宝箱
 	local boxDescTx1 = uiMap["box_sell_cell.bg.box_1.desc_tx"]
-	boxDescTx1:setText("临时文本:必出<color=#5fff57>普通</color>英雄")
+	boxDescTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_24)) -- 必出<color=#5fff57>普通</color>英雄
 	self.boxBuyBtn1 = uiMap["box_sell_cell.bg.box_1.buy_btn"]
 	self.boxBuyBtnCoin1 = uiMap["box_sell_cell.bg.box_1.buy_btn.coin"]
 	self.boxBuyBtnTx1 = uiMap["box_sell_cell.bg.box_1.buy_btn.buy_tx"]
 	local boxNameTx2 = uiMap["box_sell_cell.bg.box_2.name_tx"]
-	boxNameTx2:setText("临时文本:精致宝箱")
+	boxNameTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_2)) -- 精致宝箱
 	local boxDescTx2 = uiMap["box_sell_cell.bg.box_2.desc_tx"]
-	boxDescTx2:setText("临时文本:必出<color=#8aedff>稀有</color>英雄")
+	boxDescTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_25)) -- 必出<color=#8aedff>稀有</color>英雄
 	self.boxBuyBtn2 = uiMap["box_sell_cell.bg.box_2.buy_btn"]
 	self.boxBuyBtnCoin2 = uiMap["box_sell_cell.bg.box_2.buy_btn.coin"]
 	self.boxBuyBtnTx2 = uiMap["box_sell_cell.bg.box_2.buy_btn.buy_tx"]
 	self.box3 = uiMap["box_sell_cell.bg.box_3"]
 	local boxNameTx3 = uiMap["box_sell_cell.bg.box_3.name_tx"]
-	boxNameTx3:setText("临时文本:珍贵")
+	boxNameTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_3)) -- 珍贵宝箱
 	local boxDescTx3 = uiMap["box_sell_cell.bg.box_3.desc_tx"]
-	boxDescTx3:setText("临时文本:必出<color=#ff8af0>史诗</color>英雄")
+	boxDescTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_26)) -- 必出<color=#ff8af0>史诗</color>英雄
 	self.boxBuyBtn3 = uiMap["box_sell_cell.bg.box_3.buy_btn"]
 	self.boxBuyBtnCoin3 = uiMap["box_sell_cell.bg.box_3.buy_btn.coin"]
 	self.boxBuyBtnTx3 = uiMap["box_sell_cell.bg.box_3.buy_btn.buy_tx"]
@@ -34,7 +34,7 @@ function BoxSellCell:init()
 	self.progressTx = uiMap["box_sell_cell.bg.progress_tx"]
 	self.helpBtn = uiMap["box_sell_cell.bg.help_btn"]
 	local titleTx = uiMap["box_sell_cell.title_bg.text"]
-	titleTx:setText("临时文本:宝箱")
+	titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_27)) -- 宝箱
 
 	self.boxBuyBtn1:addClickListener(function()
 		self:onClickBox(GConst.SummonConst.SUMMON_TYPE.LV_1)
@@ -72,12 +72,12 @@ function BoxSellCell:refreshLv()
 	local lv = DataManager.SummonData:getSummonLevel()
 	local exp = DataManager.SummonData:getSummonExp()
 	local maxExp = DataManager.SummonData:getSummonMaxExp()
-	self.progressLv:setText("Lv." .. tostring(lv)) -- TODOJ
+	self.progressLv:setText("Lv." .. tostring(lv))
 	if maxExp and maxExp > 0 then
-		self.progressTx:setText(tostring(exp) .. "/" .. tostring(maxExp)) -- TODOJ
+		self.progressTx:setText(tostring(exp) .. "/" .. tostring(maxExp))
 		self.progressSlider.value = exp / maxExp
 	else
-		self.progressTx:setText("MAX") -- TODOJ
+		self.progressTx:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX))
 		self.progressSlider.value = 1
 	end
 end

lua/app/ui/shop/cell/chapter_cell.lua

@@ -67,9 +67,9 @@ function ChapterCell:refresh(idx, cfgInfo, totalCount, arrowCallback)
     -- 超值
     self.offText:setText(tostring(cfgInfo.value * 100) .. "%")
     -- 限购
-    self.limitText:setText("限购1次TD") -- 章节礼包默认限购1次 TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次
     -- 标题
-    self.titleText:setText("第" .. tostring(cfgInfo.chapter) .. "章礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_19, tostring(cfgInfo.chapter))) -- 第{0}章礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0

lua/app/ui/shop/cell/coin_sell_cell.lua

@@ -47,9 +47,9 @@ function CoinSellCell:refresh()
         -- 超值
         self.offText:setText(tostring(cfgInfo.value) .. "%")
         -- 限购
-        self.limitText:setText("限购" .. tostring(cfgInfo.limit) .. "次TD") -- TODOJ
+        self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, tostring(cfgInfo.limit))) -- 限购{0}次
         -- 标题
-        self.titleText:setText("金币礼包TD") -- TODOJ
+        self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14))
         -- 奖励
         local rewardList = cfgInfo.reward
         local count = rewardList and #rewardList or 0

lua/app/ui/shop/cell/gem_cell.lua

@@ -17,7 +17,7 @@ function GemCell:init()
 	self.adText = uiMap["gem_cell.ad.desc"]
 	self.sellOutText = uiMap["gem_cell.sell_out"]
 
-    self.sellOutText:setText("已购买TD") -- TODOJ
+    self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20))
 end
 
 function GemCell:refresh(id, cfgInfo)
@@ -31,6 +31,7 @@ function GemCell:refresh(id, cfgInfo)
 	local hasDoubleTimes = bought < limit
 	local leftDoubleTimes = limit - bought
 	
+	self.icon:setSprite(GConst.ATLAS_PATH.SHOP, GConst.ShopConst.GEM_ICON_NAME[id])
 	if isFree then -- 免费广告
 		self.adNode:setVisible(true)
 		self.priceText:setVisible(false)
@@ -39,11 +40,11 @@ function GemCell:refresh(id, cfgInfo)
 		GFunc.setAdsSprite(self.adImg)
 		local adLeftCount = adMaxTimes - bought
 		if adLeftCount > 0 then
-			self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ
+			self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x)
 			GFunc.centerImgAndTx(self.adImg, self.adText, 5)
 			self.sellOutText:setVisible(false)
 
-			self:getBaseObject():addRedPoint(105, 150, 0.6)
+			self:getBaseObject():addRedPoint(100, 145, 0.6)
 		else
 			self.adNode:setVisible(false)
 			self.sellOutText:setVisible(true)
@@ -56,7 +57,7 @@ function GemCell:refresh(id, cfgInfo)
 
 		if hasDoubleTimes then -- 有双倍效果
 			self.doubleNode:setVisible(true)
-			self.doubleDesc:setText("剩余次数:" .. tostring(leftDoubleTimes) .. "TD") -- TODOJ
+			self.doubleDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_21, tostring(leftDoubleTimes))) -- 剩余次数:{0}
 			self.doubleText:setText("+" .. tostring(reward.num * 2))
 			GFunc.centerImgAndTx(self.doubleImg, self.doubleText, 5)
 			self.doubleOriginText:setText(reward.num)

lua/app/ui/shop/cell/gem_sell_cell.lua

@@ -3,13 +3,13 @@ local GemSellCell = class("GemSellCell", BaseCell)
 function GemSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	local titleTx = uiMap["gem_sell_cell.title_bg.text"]
-	titleTx:setText("临时文本:钻石")
+	titleTx:setText(ModuleManager.ItemManager:getItemName(GConst.ItemConst.ITEM_ID_GEM))
 
 	self.cells = {}
 	self.cellHeight = 0
 	local cellHeight = nil
-	local cfg = ConfigManager:getConfig("mall_treasure")
+	local cfg = DataManager.ShopData:getMallTreasureConfig() -- 审核模式读取另一张表
-	for i = 1, 19 do -- 正常9个 提审19个 暂未处理提审模式 -- TODOJ
+	for i = 1, 19 do -- 正常9个 提审19个
 		local cell = uiMap["gem_sell_cell.cell_" .. i]
 		if cellHeight == nil then
 			local w, h = cell:fastGetSizeDelta()
@@ -30,7 +30,7 @@ function GemSellCell:init()
 end
 
 function GemSellCell:refresh()
-	local cfg = ConfigManager:getConfig("mall_treasure")
+	local cfg = DataManager.ShopData:getMallTreasureConfig()
 	for k, v in ipairs(self.cells) do
 		local id = k -- 目前配置表结构如此
 		v:refresh(id, cfg[id])
@@ -49,8 +49,4 @@ function GemSellCell:setVisible(visible)
 	self.baseObject:setVisible(visible)
 end
 
-function GemSellCell:onClickGift(id)
-	Logger.logHighlight("Click id:%s", id) -- TODOJ
-end
-
 return GemSellCell

lua/app/ui/shop/cell/gold_cell.lua

@@ -14,7 +14,7 @@ function GoldCell:init()
 	self.descText = uiMap["gold_cell.desc"]
 	self.sellOutText = uiMap["gold_cell.sell_out"]
 
-    self.sellOutText:setText("已购买TD") -- TODOJ
+    self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) -- 已购买
 end
 
 function GoldCell:refresh(id, cfgInfo)
@@ -23,8 +23,9 @@ function GoldCell:refresh(id, cfgInfo)
 	local adMaxTimes = cfgInfo.daily or 0
 	local goldNum = DataManager.ShopData:getCommonDailyCoinNum(idleTime)
 
-	local isFree = adMaxTimes > 0
+	self.icon:setSprite(GConst.ATLAS_PATH.SHOP, GConst.ShopConst.COIN_ICON_NAME[id])
 
+	local isFree = adMaxTimes > 0
 	if isFree then -- 免费广告
 		self.adNode:setVisible(true)
 		self.costNode:setVisible(false)
@@ -33,11 +34,11 @@ function GoldCell:refresh(id, cfgInfo)
 		local bought = DataManager.ShopData:getCommonDailyCoinAdBuyCount() -- 金币礼包购买次数
 		local adLeftCount = adMaxTimes - bought
 		if adLeftCount > 0 then
-			self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ
+			self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x)
 			GFunc.centerImgAndTx(self.adImg, self.adText, 5)
 			self.sellOutText:setVisible(false)
 
-			self:getBaseObject():addRedPoint(105, 150, 0.6)
+			self:getBaseObject():addRedPoint(100, 145, 0.6)
 		else
 			self.adNode:setVisible(false)
 			self.sellOutText:setVisible(true)
@@ -54,7 +55,7 @@ function GoldCell:refresh(id, cfgInfo)
 	end
 	self.nameText:setText(GFunc.num2Str(goldNum))
 	
-	self.descText:setText("金币礼包:" .. tostring(id) .. "TD") -- TODOJ
+	self.descText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14)) -- 金币礼包
 
     self:addClickListener(function()
 		self:onClickGift(id, isFree)
@@ -82,8 +83,17 @@ function GoldCell:onClickGift(id, isAd)
 		if not GFunc.checkCost(costs.id, costs.num, true) then
 			return
 		end
+		-- 二次提示
+		local params = {
+			content = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33), -- 是否使用钻石刷新每日特惠?
+			boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
+			okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+			okFunc = function()
 				ModuleManager.ShopManager:buyMallIdleCoin(id, isAd)
 			end
+		}
+		GFunc.showMessageBox(params)
+	end
 end
 
 return GoldCell

lua/app/ui/shop/cell/gold_sell_cell.lua

@@ -3,7 +3,7 @@ local GoldSellCell = class("GoldSellCell", BaseCell)
 function GoldSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	local titleTx = uiMap["gold_sell_cell.title_bg.text"]
-	titleTx:setText("临时文本:金币")
+	titleTx:setText(ModuleManager.ItemManager:getItemName(GConst.ItemConst.ITEM_ID_GOLD))
 
 	self.cells = {}
 	self.cellHeight = 0

lua/app/ui/shop/cell/grow_cell.lua

@@ -46,9 +46,9 @@ function GrowCell:refresh(idx, gift)
     -- 超值
     self.offText:setText(tostring(cfgInfo.value) .. "%")
     -- 限购
-    self.limitText:setText("限购" .. tostring(cfgInfo.limit) .. "次TD") -- TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, tostring(cfgInfo.limit))) -- 限购{0}次
     -- 标题
-    self.titleText:setText("成长礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_13)) -- 成长礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0

lua/app/ui/shop/cell/hot_cell.lua

@@ -21,7 +21,7 @@ function HotCell:init()
     self.heroNumText = uiMap["hot_cell.hero.num_tx"]
     self.sellOutText = uiMap["hot_cell.sell_out"]
 
-    self.sellOutText:setText("已购买TD") -- TODOJ
+    self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) -- 已购买
 end
 
 function HotCell:refresh(data)
@@ -57,11 +57,11 @@ function HotCell:refresh(data)
         GFunc.setAdsSprite(self.adImg)
         local adLeftCount = DataManager.ShopData:getMallDailyFirstItemAdMaxCount() - bought
         if adLeftCount > 0 then
-            self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ
+            self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x)
             GFunc.centerImgAndTx(self.adImg, self.adText, 5)
             self.sellOutText:setVisible(false)
 
-            self:getBaseObject():addRedPoint(105, 150, 0.6)
+            self:getBaseObject():addRedPoint(100, 145, 0.6)
         else
             self.adNode:setVisible(false)
             self.sellOutText:setVisible(true)

lua/app/ui/shop/cell/hot_sell_cell.lua

@@ -6,9 +6,9 @@ function HotSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.cellHeight = self.baseObject:fastGetSizeDeltaY() + 20
 
-	uiMap["hot_sell_cell.title_bg.text"]:setText("临时文本:每日特惠")
+	uiMap["hot_sell_cell.title_bg.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_28)) -- 每日特惠
 	uiMap["hot_sell_cell.help_btn"]:addClickListener(function()
-
+		ModuleManager.TipsManager:showDescTips(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_29), uiMap["hot_sell_cell.help_btn"])
 	end)
 	self.timeTx = uiMap["hot_sell_cell.time_tx"]
 	self.cells = {}
@@ -30,25 +30,24 @@ end
 
 function HotSellCell:refresh()
 	local goods = DataManager.ShopData:getMallDailyGoods()
-	local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 免费刷新次数
+	local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 剩余免费刷新次数
-	local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 钻石刷新次数
+	local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 剩余钻石刷新次数
 	local gemRefreshCost = DataManager.ShopData:getMallDailyDiamondResetCost() -- 钻石刷新消耗
-
 	if freeRefreshCount > 0 then
-		self.refreshBtn:setVisible(true)
+		self.refreshBtn:setActive(true)
 		self.refreshAdImg:setVisible(true)
 		GFunc.setAdsSprite(self.refreshAdImg)
 		self.refreshGemImg:setVisible(false)
-		self.refreshText:setText("刷新TD") -- TODOJ
+		self.refreshText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_REFRESH))
-		self.refreshBtn:addRedPoint(70, 30, 0.6)
+		self.refreshBtn:addRedPoint(80, 30, 0.6)
 	elseif gemRefreshCount > 0 then
-		self.refreshBtn:setVisible(true)
+		self.refreshBtn:setActive(true)
 		self.refreshAdImg:setVisible(false)
 		self.refreshGemImg:setVisible(true)
 		self.refreshText:setText(gemRefreshCost)
 		self.refreshBtn:removeRedPoint()
 	else
-		self.refreshBtn:setVisible(false)
+		self.refreshBtn:setActive(false)
 		self.refreshBtn:removeRedPoint()
 	end
 
@@ -68,7 +67,7 @@ function HotSellCell:refreshTime()
 	if remainTime < 0 then
 		remainTime = 0
 	end
-	self.timeTx:setText("刷新时间TD:" .. GFunc.getTimeStrWithHMS(remainTime)) -- TODOJ
+	self.timeTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_22, GFunc.getTimeStrWithHMS(remainTime)))-- 刷新时间:{0}
 end
 
 function HotSellCell:getCellHeight()
@@ -94,8 +93,17 @@ function HotSellCell:onClickRefresh()
 		end)
 	elseif gemRefreshCount > 0 then
 		if GFunc.checkCost(GConst.ItemConst.ITEM_ID_GEM, gemRefreshCost, true) then
+			-- 二次提示
+			local params = {
+				content = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_30), -- 是否使用钻石刷新每日特惠?
+				boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
+				okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
+				okFunc = function()
 					ModuleManager.ShopManager:resetMallDailyGift(2)
 				end
+			}
+			GFunc.showMessageBox(params)
+		end
 	end
 end
 

lua/app/ui/shop/cell/level_cell.lua

@@ -43,9 +43,9 @@ function LevelCell:refresh(idx, cfgInfo, clickCallback)
     -- 超值
     self.offText:setText(tostring(cfgInfo.value) .. "%")
     -- 限购
-    self.limitText:setText("限购1次TD") -- 默认限购1次 TODOJ
+    self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次
     -- 标题
-    self.titleText:setText(tostring(cfgInfo.parameter) .. "级助力礼包TD") -- TODOJ
+    self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_23, tostring(cfgInfo.parameter))) -- {0}级助力礼包
     -- 奖励
     local rewardList = cfgInfo.reward
     local count = rewardList and #rewardList or 0

lua/app/ui/shop/first_recharge_pop_ui.lua

@@ -0,0 +1,107 @@
+local FirstRechargePopUI = class("FirstRechargePopUI", BaseUI)
+local MAX_ITEM_NUM = 3
+
+function FirstRechargePopUI:ctor()
+end
+
+function FirstRechargePopUI:isFullScreen()
+    return false
+end
+
+function FirstRechargePopUI:getPrefabPath()
+    return "assets/prefabs/ui/shop/first_recharge_pop_ui.prefab"
+end
+
+function FirstRechargePopUI:onLoadRootComplete()
+    self.uiMap = self.root:genAllChildren()
+	self.uiMap["first_recharge_pop_ui.close_btn"]:addClickListener(function()
+        self:closeUI()
+	end)
+
+	self.titleTx = self.uiMap["first_recharge_pop_ui.bg.title_bg.title"]
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_34)) -- 首充豪礼
+
+	self.itemNodeList = {}
+	self.itemCellList = {}
+	self.itemTextList = {}
+    self.itemHelpList = {}
+	for i = 1, MAX_ITEM_NUM do
+		table.insert(self.itemNodeList, self.uiMap["first_recharge_pop_ui.bg.item_" .. i])
+		table.insert(self.itemCellList, CellManager:addCellComp(self.uiMap["first_recharge_pop_ui.bg.item_".. i .. ".item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL))
+		table.insert(self.itemTextList, self.uiMap["first_recharge_pop_ui.bg.item_".. i .. ".num"])
+        table.insert(self.itemHelpList, self.uiMap["first_recharge_pop_ui.bg.item_" .. i .. ".help"])
+    end
+
+    self.descText = self.uiMap["first_recharge_pop_ui.bg.desc_text"]
+    self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_35)) -- 充值购买任意商品,即可获得如下奖励,仅此一次！
+
+	self.funcBtn = self.uiMap["first_recharge_pop_ui.bg.func_btn"]
+	self.btnJumpText = self.uiMap["first_recharge_pop_ui.bg.func_btn.jump_text"]
+    self.btnGetText = self.uiMap["first_recharge_pop_ui.bg.func_btn.get_text"]
+	self.btnIcon = self.uiMap["first_recharge_pop_ui.bg.func_btn.icon"]
+
+    self.btnJumpText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_36)) -- 商店
+    self.btnGetText:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) -- 领取
+
+	self.funcBtn:addClickListener(function()
+		self:onClickFuncBtn()
+	end)
+
+    self:_bind()
+	self:refresh()
+end
+
+function FirstRechargePopUI:_bind()
+    self:bind(DataManager.ShopData, "isDirty", function()
+        self:refresh()
+    end)
+end
+
+function FirstRechargePopUI:refresh()
+    local cfgInfo = PayManager:getGiftConfigInfo(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID)
+	local rewards = cfgInfo.reward or {}
+	for i = 1, MAX_ITEM_NUM do
+		if i <= #rewards then
+			self.itemNodeList[i]:setVisible(true)
+			self.itemCellList[i]:refreshByCfg(rewards[i].id, 0)
+			self.itemCellList[i]:setNum("")
+			self.itemTextList[i]:setText(rewards[i].num)
+			self.itemCellList[i]:addClickListener(function()
+				ModuleManager.TipsManager:showItemTips(rewards[i].id, self.itemCellList[i]:getBaseObject())
+			end)
+            self.itemHelpList[i]:setVisible(false)
+		else
+			self.itemNodeList[i]:setVisible(false)
+		end
+	end
+
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+    if canGet then
+        self.btnIcon:setVisible(false)
+        self.btnJumpText:setVisible(false)
+        self.btnGetText:setVisible(true)
+    else
+        local hasGet = DataManager.ShopData:getHasGotFirstRechargeReward()
+        if hasGet then
+            self:closeUI()
+        else
+            self.btnIcon:setVisible(true)
+            self.btnJumpText:setVisible(true)
+            self.btnGetText:setVisible(false)
+        end
+    end
+end
+
+function FirstRechargePopUI:onClickFuncBtn()
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+    if canGet then
+        PayManager:purchasePackage(GConst.ShopConst.FIRST_RECHARGE_ID, PayManager.PURCHARSE_TYPE.ACT_GIFT)
+    else
+        EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP)
+        self:closeUI()
+    end
+end
+
+return FirstRechargePopUI

lua/app/ui/shop/first_recharge_pop_ui.lua.meta

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

lua/app/ui/shop/gift_pop_ui.lua

@@ -2,21 +2,23 @@ local GiftPopUI = class("GiftPopUI", BaseUI)
 
 local GIFT_BG_NAME = {
     [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
-        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png",
-        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png",
-        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png",
+        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png",
     },
-	[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png", -- TODOJ
+	[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png",
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png", -- TODOJ
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png",
 }
 local GIFT_TITLE_TEXT = {
     [PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
-        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "新手礼包TD", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_9),
-        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "金币礼包TD", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_11),
-        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "助力礼包TD", -- TODOJ
+        [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_12),
+        [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14),
     },
-    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "章节礼包TD", -- TODOJ
+    [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_10),
-    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "成长礼包TD", -- TODOJ
+    [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_13),
 }
 
 local MAX_ITEM_NUM = 4
@@ -148,6 +150,21 @@ function GiftPopUI:refresh(needCheck)
 	    self.buyBtnTx:setText(GFunc.getFormatPrice(rechargeId))
     end
 
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and self.actId == GConst.ShopConst.FIRST_RECHARGE_ID then
+        local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+        if canGet then
+            self.buyBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
+        else
+            local hasGet = DataManager.ShopData:getHasGotFirstRechargeReward()
+            if hasGet then
+                self:closeUI()
+            else
+                self.buyBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_15)) -- 前往商店
+            end
+        end
+    end
+
     self:updateTime()
 end
 
@@ -157,10 +174,7 @@ function GiftPopUI:updateTime()
     if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then
         local cfgInfo = DataManager.ShopData:getActGiftConfig()[self.actId]
         if cfgInfo then
-            if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE then -- 首充礼包
+            if cfgInfo and cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT then -- 金币礼包
-                hasTime = true
-                self.timeText:setText("TODOJ") -- TODOJ
-            elseif cfgInfo and cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT then -- 金币礼包
                 hasTime = true
                 local remainTime = 0
                 local triggerTime = DataManager.ShopData:getCoinGiftTriggerTime()
@@ -187,7 +201,18 @@ function GiftPopUI:updateTime()
 end
 
 function GiftPopUI:onClickGift()
+    -- 对于首充礼包,有跳转商店和领取2个分支
+    if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and self.actId == GConst.ShopConst.FIRST_RECHARGE_ID then
+        local canGet = DataManager.ShopData:getHasFirstRechargeReward()
+        if canGet then
             PayManager:purchasePackage(self.actId, self.actType)
+        else
+            EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP)
+            self:closeUI()
+        end
+    else
+        PayManager:purchasePackage(self.actId, self.actType)
+    end
 end
 
 -- 如果还有需要显示的 则直接刷新而不是关闭本界面

lua/app/ui/shop/shop_comp.lua

@@ -38,10 +38,10 @@ function ShopComp:initTitlePage()
 	self.subTitleIcon2 = self.uiMap["shop_comp.title_node.btn_cell_2.icon"]
 	self.subTitleBtn2 = self.uiMap["shop_comp.title_node.btn_cell_2"]
 	
-	self.subTitleText1:setText("特惠商品TD") -- TODOJ 特惠商品
+	self.subTitleText1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_16)) -- 特惠商品
-	self.subTitleSelectText1:setText("特惠商品TD") -- TODOJ 特惠商品
+	self.subTitleSelectText1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_16)) -- 特惠商品
-	self.subTitleText2:setText("主要商品TD") -- TODOJ 主要商品
+	self.subTitleText2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_17)) -- 主要商品
-	self.subTitleSelectText2:setText("主要商品TD") -- TODOJ 主要商品
+	self.subTitleSelectText2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_17)) -- 主要商品
 
 	self.subTitleBtn1:addClickListener(function()
 		self:switchPage(PAGE_DISCOUNT)

lua/app/userdata/battle/skill/battle_skill_entity.lua

@@ -30,6 +30,7 @@ function BattleSkillEntity:init()
 		self.available = false
 	end
 	self:clearRecordData()
+	self.buffConditionRel = nil
 end
 
 function BattleSkillEntity:initSkillEffect()
@@ -210,12 +211,17 @@ function BattleSkillEntity:getBuffConditionRel(index)
 	if not self.skillInfo.condition_rel then
 		return
 	end
-	for _, info in ipairs(self.skillInfo.condition_rel)  do
+	if not self.buffConditionRel then
-		if info[1] == index then
+		self.buffConditionRel = {}
-			return info[2]
+		for i, info in ipairs(self.skillInfo.condition_rel)  do
+			self.buffConditionRel[info[1]] = {i, info[2]}
 		end
 	end
-	return self.skillInfo.condition_rel[index]
+	return self.buffConditionRel[index]
+end
+
+function BattleSkillEntity:haveBuffCondition()
+	return self.skillInfo.condition_rel ~= nil
 end
 
 function BattleSkillEntity:getTargetType()

lua/app/userdata/shop/shop_data.lua

@@ -6,6 +6,7 @@ end
 
 function ShopData:initBase()
     self:initActChapterStoreData()
+    self:initFirstRecharge()
     self:initCrossDay()
 end
 
@@ -117,9 +118,6 @@ function ShopData:markPopUpGift(actType, actId)
     if not self.needPopUpGift[actType] then
         self.needPopUpGift[actType] = {}
     end
-
-    Logger.logHighlight("markPopUpGift -- actType:%s  actId:%s",actType, actId)
-
     table.insert(self.needPopUpGift[actType], actId)
 end
 
@@ -128,9 +126,6 @@ function ShopData:removePopUpGift(actType, actId)
         if self.needPopUpGift[actType] then
             for index, id in ipairs(self.needPopUpGift[actType]) do
                 if id == actId then
-
-                    Logger.logHighlight("removePopUpGift -- actType:%s  actId:%s",actType, actId)
-
                     table.remove(self.needPopUpGift[actType], index)
                     break
                 end
@@ -262,7 +257,7 @@ function ShopData:addMallDailyAdResetCount()
 end
 
 function ShopData:getMallDailyAdLeftCount()
-    return 1 - self.mallDailyAdResetCount -- TODOJ 目前无配置表
+    return 1 - self.mallDailyAdResetCount -- 目前无配置表
 end
 
 function ShopData:getMallDailyDiamondResetCount()
@@ -274,7 +269,7 @@ function ShopData:addMallDailyDiamondResetCount()
 end
 
 function ShopData:getMallDailyDiamondLeftCount()
-    return 1 - self.mallDailyDiamondResetCount -- TODOJ 目前无配置表
+    return 1 - self.mallDailyDiamondResetCount -- 目前无配置表
 end
 
 function ShopData:getMallDailyGoods()
@@ -282,17 +277,17 @@ function ShopData:getMallDailyGoods()
 end
 
 function ShopData:getMallDailyDiamondResetCost()
-    return 30 -- TODOJ 目前无配置表
+    return 30 -- 目前无配置表
 end
 
 -- 每日特惠 广告商品最大购买次数
 function ShopData:getMallDailyFirstItemAdMaxCount()
-    return 1 -- TODOJ 目前无配置表
+    return 1 -- 目前无配置表
 end
 
 -- 每日特惠 常规商品最大购买次数
 function ShopData:getMallDailyGoodsLimitCount()
-    return 1 -- TODOJ 目前无配置表
+    return 1 -- 目前无配置表
 end
 
 -- 每日特惠 是否开启
@@ -356,7 +351,7 @@ end
 
 -- 常驻钻石礼包 **********************************************************************************************
 function ShopData:getMallTreasureConfig()
-    return ConfigManager:getConfig("mall_treasure")
+    return ConfigManager:getConfig("mall_treasure") -- 审核模式会去读另一张表 TODOJ
 end
 
 -- 常驻钻石礼包结束 ----------------------------------------------------------------------------------------------
@@ -421,8 +416,9 @@ function ShopData:getBeginnerGiftHasBuy()
     end
 end
 
+-- 新手礼包侧边栏展示时间
 function ShopData:getBeginnerGiftSideBarDurationTime()
-    return 3 * 24 * 3600 -- 暂无配置表 TODOJ
+    return 3 * 24 * 3600 -- 目前无配置表
 end
 
 -- 未购买且在开服的3天内
@@ -717,4 +713,75 @@ end
 
 -- 成长礼包结束 ----------------------------------------------------------------------------------------------
 
+-- 首充 **********************************************************************************************
+
+-- 用于标记是否弹窗 要求等级不低于2 未领取该奖励
+function ShopData:initFirstRecharge()
+    local lv = DataManager.PlayerData:getLv()
+    if lv > 1 and not self:getHasGotFirstRechargeReward() then
+        self:markPopUpGift(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID)
+    end
+end
+
+-- 是否有首充奖励 有支付且未领取
+function ShopData:getHasFirstRechargeReward()
+    local pay = DataManager.PlayerData:getTotalPayAmount()
+    if pay > 0 and not self:getHasGotFirstRechargeReward() then
+        return true
+    else
+        return false
+    end
+end
+
+-- 是否已领取首充奖励
+function ShopData:getHasGotFirstRechargeReward()
+    -- 通用act礼包中是否有已购
+    local boughtNum = self:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID)
+    return boughtNum > 0
+end
+
+-- 侧边栏是否展示 要求等级不低于2 未领取该奖励
+function ShopData:getShowFirstRechargeSideBar()
+    local lv = DataManager.PlayerData:getLv()
+    if lv > 1 and not self:getHasGotFirstRechargeReward() then
+        return true
+    else
+        return false
+    end
+end
+
+-- 侧边栏红点
+function ShopData:showFirstRechargeRp()
+    return self:getHasFirstRechargeReward()
+end
+
+-- 首充结束 ----------------------------------------------------------------------------------------------
+
+-- 底部栏是否有红点
+function ShopData:getRp()
+    if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, true) then
+        return false
+    end
+
+    local isHotOpen = ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL_DAILY, true)
+    -- 主要商品 每日特惠广告道具
+    local hotAdGoods = self:getMallDailyGoods() and self:getMallDailyGoods()[1]
+    local hotAdGoodsBuyCount = hotAdGoods and hotAdGoods.bought or 0
+    local hotAdGoodsRp = self:getMallDailyFirstItemAdMaxCount() - hotAdGoodsBuyCount > 0
+    -- 主要商品 每日特惠刷新
+    local hotRefreshRp = self:getMallDailyAdLeftCount() > 0
+    -- 主要商品 钻石广告道具
+    local gemAdId = 1 -- 约定首位为免费栏位
+    local cfgInfo = self:getMallTreasureConfig()[gemAdId] 
+    local gemAdMaxTimes = cfgInfo.daily or 0
+    local gemAdRp =  gemAdMaxTimes - DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.MALL_TREASURE, gemAdId) > 0
+    -- 主要商品 金币广告道具
+    local coinAdId = 1 -- 约定首位为免费栏位
+    local cfgInfo = self:getMallGoldConfig()[coinAdId] 
+    local coinAdMaxTimes = cfgInfo.daily or 0
+    local coinAdRp =  coinAdMaxTimes - DataManager.ShopData:getCommonDailyCoinAdBuyCount() > 0
+
+    return (isHotOpen and (hotAdGoodsRp or hotRefreshRp)) or gemAdRp or coinAdRp
+end
+
 return ShopData