fix bug

lua/app/config/avatar.lua

@@ -1,95 +1,97 @@
 local avatar = {
 	[13001]={
-		["iconId"]="1",
+		["iconId"]="avatar_13001",
-		["hero"]=13001
+		["hero"]=13001,
+		["unlock"]=true
 	},
 	[14001]={
-		["iconId"]="2",
+		["iconId"]="avatar_14001",
 		["hero"]=14001
 	},
 	[15001]={
-		["iconId"]="3",
+		["iconId"]="avatar_15001",
 		["hero"]=15001
 	},
 	[15002]={
-		["iconId"]="4",
+		["iconId"]="avatar_15002",
 		["hero"]=15002
 	},
 	[16001]={
-		["iconId"]="5",
+		["iconId"]="avatar_16001",
 		["hero"]=16001,
 		["unlock_show"]=true
 	},
 	[23001]={
-		["iconId"]="7",
+		["iconId"]="avatar_23001",
 		["hero"]=23001,
 		["unlock"]=true
 	},
 	[24001]={
-		["iconId"]="8",
+		["iconId"]="avatar_24001",
 		["hero"]=24001
 	},
 	[25001]={
-		["iconId"]="9",
+		["iconId"]="avatar_25001",
 		["hero"]=25001
 	},
 	[25002]={
-		["iconId"]="10",
+		["iconId"]="avatar_25002",
 		["hero"]=25002
 	},
 	[26001]={
-		["iconId"]="11",
+		["iconId"]="avatar_26001",
 		["hero"]=26001,
 		["unlock_show"]=true
 	},
 	[33001]={
-		["iconId"]="13",
+		["iconId"]="avatar_33001",
 		["hero"]=33001,
 		["unlock"]=true
 	},
 	[34001]={
-		["iconId"]="14",
+		["iconId"]="avatar_34001",
 		["hero"]=34001
 	},
 	[35001]={
-		["iconId"]="15",
+		["iconId"]="avatar_35001",
 		["hero"]=35001
 	},
 	[35002]={
-		["iconId"]="16",
+		["iconId"]="avatar_35002",
 		["hero"]=35002
 	},
 	[43001]={
-		["iconId"]="18",
+		["iconId"]="avatar_43001",
 		["hero"]=43001,
 		["unlock"]=true
 	},
 	[44001]={
-		["iconId"]="19",
+		["iconId"]="avatar_44001",
 		["hero"]=44001
 	},
 	[45001]={
-		["iconId"]="20",
+		["iconId"]="avatar_45001",
 		["hero"]=45001
 	},
 	[45002]={
-		["iconId"]="22",
+		["iconId"]="avatar_45002",
 		["hero"]=45002
 	},
 	[53001]={
-		["iconId"]="24",
+		["iconId"]="avatar_53001",
-		["hero"]=53001
+		["hero"]=53001,
+		["unlock"]=true
 	},
 	[54001]={
-		["iconId"]="25",
+		["iconId"]="avatar_54001",
 		["hero"]=54001
 	},
 	[55001]={
-		["iconId"]="26",
+		["iconId"]="avatar_55001",
 		["hero"]=55001
 	},
 	[55002]={
-		["iconId"]="31",
+		["iconId"]="avatar_55002",
 		["hero"]=55002
 	}
 }

lua/app/config/chapter_dungeon.lua

@@ -6,7 +6,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1001
+			1
 		},
 		["monster"]={
 			103
@@ -50,7 +50,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1002
+			2
 		},
 		["monster"]={
 			203
@@ -94,7 +94,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1003
+			3
 		},
 		["monster"]={
 			303
@@ -138,7 +138,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1004
+			4
 		},
 		["monster"]={
 			403
@@ -182,7 +182,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1005
+			5
 		},
 		["monster"]={
 			503
@@ -226,7 +226,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1006
+			6
 		},
 		["monster"]={
 			603
@@ -270,7 +270,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1007
+			7
 		},
 		["monster"]={
 			703
@@ -314,7 +314,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1008
+			8
 		},
 		["monster"]={
 			803
@@ -358,7 +358,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1009
+			9
 		},
 		["monster"]={
 			903
@@ -402,7 +402,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1010
+			10
 		},
 		["monster"]={
 			1003
@@ -446,7 +446,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1011
+			11
 		},
 		["monster"]={
 			1103
@@ -490,7 +490,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1012
+			12
 		},
 		["monster"]={
 			1203
@@ -534,7 +534,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1013
+			13
 		},
 		["monster"]={
 			1303
@@ -578,7 +578,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1014
+			14
 		},
 		["monster"]={
 			1403
@@ -622,7 +622,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1015
+			15
 		},
 		["monster"]={
 			1503
@@ -666,7 +666,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1016
+			16
 		},
 		["monster"]={
 			1603
@@ -710,7 +710,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1017
+			17
 		},
 		["monster"]={
 			1703
@@ -754,7 +754,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1018
+			18
 		},
 		["monster"]={
 			1803
@@ -798,7 +798,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1019
+			19
 		},
 		["monster"]={
 			1903
@@ -841,7 +841,7 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			1020
+			20
 		},
 		["monster"]={
 			2003
@@ -884,10 +884,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2001
+			21
 		},
 		["monster"]={
-			10103
+			100103
 		},
 		["reward"]={
 			{
@@ -928,10 +928,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2002
+			22
 		},
 		["monster"]={
-			10203
+			100203
 		},
 		["reward"]={
 			{
@@ -972,10 +972,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2003
+			23
 		},
 		["monster"]={
-			10303
+			100303
 		},
 		["reward"]={
 			{
@@ -1016,10 +1016,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2004
+			24
 		},
 		["monster"]={
-			10403
+			100403
 		},
 		["reward"]={
 			{
@@ -1060,10 +1060,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2005
+			25
 		},
 		["monster"]={
-			10503
+			100503
 		},
 		["reward"]={
 			{
@@ -1104,10 +1104,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2006
+			26
 		},
 		["monster"]={
-			10603
+			100603
 		},
 		["reward"]={
 			{
@@ -1148,10 +1148,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2007
+			27
 		},
 		["monster"]={
-			10703
+			100703
 		},
 		["reward"]={
 			{
@@ -1192,10 +1192,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2008
+			28
 		},
 		["monster"]={
-			10803
+			100803
 		},
 		["reward"]={
 			{
@@ -1236,10 +1236,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2009
+			29
 		},
 		["monster"]={
-			10903
+			100903
 		},
 		["reward"]={
 			{
@@ -1280,10 +1280,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2010
+			30
 		},
 		["monster"]={
-			11003
+			101003
 		},
 		["reward"]={
 			{
@@ -1324,10 +1324,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2011
+			31
 		},
 		["monster"]={
-			11103
+			101103
 		},
 		["reward"]={
 			{
@@ -1368,10 +1368,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2012
+			32
 		},
 		["monster"]={
-			11203
+			101203
 		},
 		["reward"]={
 			{
@@ -1412,10 +1412,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2013
+			33
 		},
 		["monster"]={
-			11303
+			101303
 		},
 		["reward"]={
 			{
@@ -1456,10 +1456,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2014
+			34
 		},
 		["monster"]={
-			11403
+			101403
 		},
 		["reward"]={
 			{
@@ -1500,10 +1500,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2015
+			35
 		},
 		["monster"]={
-			11503
+			101503
 		},
 		["reward"]={
 			{
@@ -1544,10 +1544,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2016
+			36
 		},
 		["monster"]={
-			11603
+			101603
 		},
 		["reward"]={
 			{
@@ -1588,10 +1588,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2017
+			37
 		},
 		["monster"]={
-			11703
+			101703
 		},
 		["reward"]={
 			{
@@ -1632,10 +1632,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2018
+			38
 		},
 		["monster"]={
-			11803
+			101803
 		},
 		["reward"]={
 			{
@@ -1676,10 +1676,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2019
+			39
 		},
 		["monster"]={
-			11903
+			101903
 		},
 		["reward"]={
 			{
@@ -1719,10 +1719,10 @@ local chapter_dungeon = {
 		["block_icon"]="battle_hinder_gold",
 		["chess_board"]="chessboard_1",
 		["board"]={
-			2020
+			40
 		},
 		["monster"]={
-			12003
+			102003
 		},
 		["reward"]={
 			{

lua/app/config/const.lua

@@ -144,8 +144,8 @@ local const = {
  				["type_for_nothing"]="Vw==",
 				["id"]=8,
  				["id_for_nothing"]="Xg==",
-				["num"]=3,
+				["num"]=5,
- 				["num_for_nothing"]="VQ=="
+ 				["num_for_nothing"]="Uw=="
 			}
 		}
 	},
@@ -156,13 +156,13 @@ local const = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=30,
+				["num"]=100,
- 				["num_for_nothing"]="VQg="
+ 				["num_for_nothing"]="Vwhc"
 			}
 		}
 	},
 	["arena_notes_diamond_times"]={
-		["value"]=3
+		["value"]=2
 	},
 	["arena_notes_ad_buy"]={
 		["reward"]={

lua/app/config/func_open.lua

@@ -15,10 +15,6 @@ local func_open = {
 		["stage"]=2,
 		["icon"]="module_unlock_dailyshop"
 	},
-	["store_box_3_open"]={
-		["stage"]=5,
-		["pop_ups"]=1
-	},
 	["daily_challenge"]={
 		["stage"]=11,
 		["icon"]="module_unlock_dailychallenge"
@@ -36,15 +32,15 @@ local func_open = {
 		["pop_ups"]=1
 	},
 	["company_open"]={
-		["stage"]=2,
+		["stage"]=5,
 		["pop_ups"]=1
 	},
 	["talent_open"]={
-		["stage"]=2,
+		["stage"]=5,
 		["icon"]="module_unlock_arena"
 	},
 	["dungeon_open"]={
-		["stage"]=6,
+		["stage"]=8,
 		["pop_ups"]=1
 	},
 	["summon_open"]={
@@ -52,55 +48,65 @@ local func_open = {
 		["pop_ups"]=1
 	},
 	["first_charge_1"]={
-		["stage"]=1
+		["stage"]=1,
+		["pop_ups"]=1
 	},
 	["first_charge_2"]={
 		["stage"]=1,
-		["time"]=2
+		["time"]=2,
+		["pop_ups"]=1
 	},
 	["first_charge_3"]={
 		["stage"]=18,
-		["time"]=3
+		["time"]=3,
+		["pop_ups"]=1
 	},
 	["card_ad"]={
-		["stage"]=5
+		["stage"]=5,
+		["pop_ups"]=1
 	},
 	["card_monthly"]={
-		["stage"]=2
+		["stage"]=2,
+		["pop_ups"]=1
 	},
 	["act_sevenday"]={
-		["stage"]=3
+		["stage"]=3,
+		["pop_ups"]=1
 	},
 	["dungeon_gold"]={
-		["stage"]=6,
+		["stage"]=8,
-		["pop_ups"]=1,
 		["icon"]="module_5"
 	},
 	["dungeon_res"]={
-		["stage"]=6
-	},
-	["signin_bounty"]={
 		["stage"]=8
 	},
+	["signin_bounty"]={
+		["stage"]=8,
+		["pop_ups"]=1
+	},
 	["signin_30"]={
-		["stage"]=3
+		["stage"]=3,
+		["pop_ups"]=1
 	},
 	["act_gogogo"]={
-		["stage"]=2
+		["stage"]=3,
+		["pop_ups"]=1
 	},
 	["hero_equip"]={
-		["stage"]=13,
+		["stage"]=11,
 		["pop_ups"]=1,
 		["icon"]="module_9"
 	},
 	["act_level_gift"]={
-		["level"]=3
+		["level"]=3,
+		["pop_ups"]=1
 	},
 	["fund_chapter"]={
-		["stage"]=2
+		["stage"]=2,
+		["pop_ups"]=1
 	}
 }
 local config = {
-data=func_open,count=27
+data=func_open,count=26
 }
 return config

lua/app/config/skill.lua

@@ -5448,6 +5448,7 @@ local skill = {
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
+		["sound"]=3500201,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer02"
@@ -5474,6 +5475,7 @@ local skill = {
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
+		["sound"]=3500201,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer01"
@@ -5500,6 +5502,7 @@ local skill = {
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
+		["sound"]=3500201,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -5526,6 +5529,7 @@ local skill = {
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
+		["sound"]=3500204,
 		["name_act"]="attack04",
 		["name_hit"]={
 			"suffer01"
@@ -5593,6 +5597,7 @@ local skill = {
 		},
 		["shake_time"]=250,
 		["shake_type"]=5,
+		["sound"]=3500205,
 		["name_act"]="skill01",
 		["name_hit"]={
 			"suffer02",
@@ -5668,6 +5673,7 @@ local skill = {
 		},
 		["shake_time"]=250,
 		["shake_type"]=5,
+		["sound"]=3500205,
 		["name_act"]="skill01",
 		["name_hit"]={
 			"suffer02",
@@ -5743,6 +5749,7 @@ local skill = {
 		},
 		["shake_time"]=250,
 		["shake_type"]=5,
+		["sound"]=3500205,
 		["name_act"]="skill01",
 		["name_hit"]={
 			"suffer02",
@@ -5818,6 +5825,7 @@ local skill = {
 		},
 		["shake_time"]=250,
 		["shake_type"]=5,
+		["sound"]=3500205,
 		["name_act"]="skill01",
 		["name_hit"]={
 			"suffer02",
@@ -10278,7 +10286,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="heal",
-				["num"]=100000,
+				["num"]=50000,
 				["ratio"]=10000,
 				["round"]=1
 			}

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

@@ -877,14 +877,14 @@ local localization_global =
     ["PRIVILEGE_CARD_DESC_1"] = "已累计{0}天",
     ["PRIVILEGE_CARD_DESC_2"] = "永久免广告特权",
     ["PRIVILEGE_CARD_DESC_3"] = "购买后立即获得",
-    ["PRIVILEGE_CARD_DESC_4"] = "解锁战斗3倍速",
+    ["PRIVILEGE_CARD_DESC_4"] = "解锁战斗2倍速",
-    ["PRIVILEGE_CARD_DESC_5"] = "免费刷新齿轮次数+1",
+    ["PRIVILEGE_CARD_DESC_5"] = "解锁快速挂机不限次",
-    ["PRIVILEGE_CARD_DESC_6"] = "解锁快速挂机不限次",
+    ["PRIVILEGE_CARD_DESC_6"] = "体力上限+80",
     ["PRIVILEGE_CARD_DESC_7"] = "每天领取大量钻石",
     ["STAR_UNLOCK"] = "{0}星解锁",
-    ["HERO_DESC_24"] = "升级将提升全体属性",
+    ["HERO_DESC_24"] = "升星将提升全体属性",
     ["HERO_DESC_25"] = "属性提升",
-    ["HERO_DESC_26"] = "升级英雄可以提升全局增益,将作用于所有英雄的生命、攻击",
+    ["HERO_DESC_26"] = "英雄升星可以提升全局增益,将作用于所有英雄的生命、攻击",
     ["HERO_DESC_27"] = "英雄生命加成",
     ["HERO_DESC_28"] = "英雄攻击加成",
     ["HERO_DESC_29"] = "当前加成",

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

@@ -12,52 +12,34 @@ local tutorial = {
 		["value"]="回到主线继续吧！"
 	},
 	["tutorial_txt_5"]={
-		["value"]="前往商城，获得更多英雄！"
+		["value"]="公司的研发中心开启了！"
 	},
 	["tutorial_txt_6"]={
-		["value"]="挑战任务，获得S级英雄！"
+		["value"]="研发中心可以获得不同品质的科技卡片，为团队提供额外效果。"
 	},
 	["tutorial_txt_7"]={
-		["value"]="新的挑战玩法开启了！"
+		["value"]="英雄装备功能开启了"
 	},
 	["tutorial_txt_8"]={
-		["value"]="欢迎来到竞技场，请点击匹配。"
+		["value"]="穿戴的装备将绑定在上阵位置上，更换英雄上阵不会变化。"
 	},
 	["tutorial_txt_9"]={
-		["value"]="对手不强，让我们直接开始。"
+		["value"]="想要更多更好的装备，除了主线还有每日挑战。"
 	},
 	["tutorial_txt_10"]={
-		["value"]="请点击这里查看对战规则。"
+		["value"]="挑战任务完成可以获得更高品质的装备。点击查看。"
 	},
 	["tutorial_txt_11"]={
-		["value"]="武器可以提升大量进攻类属性！"
+		["value"]="欢迎来到竞技场，请点击匹配。"
 	},
 	["tutorial_txt_12"]={
-		["value"]="让我们先去获取一下武器强化材料吧！"
+		["value"]="对手不强，让我们直接开始。"
 	},
 	["tutorial_txt_13"]={
-		["value"]="防具可以同时提升进攻和生存属性！"
+		["value"]="请点击这里查看对战规则。"
-	},
-	["tutorial_txt_14"]={
-		["value"]="让我们去获取一下防具强化材料吧！"
-	},
-	["tutorial_txt_15"]={
-		["value"]="每名英雄可以最多拥有6个符文。"
-	},
-	["tutorial_txt_16"]={
-		["value"]="符文可以组成套装，提升额外属性。"
-	},
-	["tutorial_txt_17"]={
-		["value"]="符文品质将根据符文铸台的等级提升。"
-	},
-	["tutorial_txt_18"]={
-		["value"]="符文铸台等级所有英雄共享。"
-	},
-	["tutorial_txt_19"]={
-		["value"]="让我们先去获取一下符文材料【符文精粹】吧！"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

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

@@ -37,27 +37,9 @@ local tutorial = {
 	},
 	["tutorial_txt_13"]={
 
-	},
-	["tutorial_txt_14"]={
-
-	},
-	["tutorial_txt_15"]={
-		["value"]="Cada herói pode ter até 6 runas."
-	},
-	["tutorial_txt_16"]={
-		["value"]="As runas podem formar conjuntos, concedendo atributos adicionais."
-	},
-	["tutorial_txt_17"]={
-		["value"]="As runas são aprimoradas à medida da subida do nível da Forja de Runas."
-	},
-	["tutorial_txt_18"]={
-		["value"]="O nível da Forja de Runas é compartilhado por todos os heróis."
-	},
-	["tutorial_txt_19"]={
-		["value"]="Vamos obter a [Essência Rúnica], material para forjar runas!"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

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

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="Get more heroes in the shop!"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="Get S Hero from quests!"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="New challenge gameplay is unlocked!"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="Welcome to the Arena. Please click matchmaking."
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="The opponent is not strong. Let's start."
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="Please click here to view the battle rules."
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="Weapon can incredibly boost attack stats!"
+		["value"]="Welcome to the Arena. Please click matchmaking."
 	},
 	["tutorial_txt_12"]={
-		["value"]="Let's obtain some weapon enhancement materials first!"
+		["value"]="The opponent is not strong. Let's start."
 	},
 	["tutorial_txt_13"]={
-		["value"]="Armor can boost attack and survivability stats!"
+		["value"]="Please click here to view the battle rules."
-	},
-	["tutorial_txt_14"]={
-		["value"]="Let's obtain some armor enhancement materials first!"
-	},
-	["tutorial_txt_15"]={
-		["value"]="Each hero can have a maximum of 6 Runes."
-	},
-	["tutorial_txt_16"]={
-		["value"]="Runes can form sets for extra stats."
-	},
-	["tutorial_txt_17"]={
-		["value"]="Rune quality will increase based on Rune Forge level."
-	},
-	["tutorial_txt_18"]={
-		["value"]="Rune Forge level is shared among all heroes."
-	},
-	["tutorial_txt_19"]={
-		["value"]="Let's first get some [Rune Essences]!"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

lua/app/config/strings/es/tutorial.lua

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="¡Consigue más héroes en la Tienda!"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="¡Desafía las misiones para consiguir héroes de clase S!"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="¡Ha comenzado una nueva jugabilidad de desafío!"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="¡Bienvenido(a) a la Arena! Haz clic para emparejar."
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="El oponente no es fuerte. Empecemos."
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="Haz clic aquí para ver las reglas del juego."
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="¡Las armas pueden mejorar muchos atributos de ataque!"
+		["value"]="¡Bienvenido(a) a la Arena! Haz clic para emparejar."
 	},
 	["tutorial_txt_12"]={
-		["value"]="¡Consigue primero los materiales para refuerzo de armas!"
+		["value"]="El oponente no es fuerte. Empecemos."
 	},
 	["tutorial_txt_13"]={
-		["value"]="¡La armadura puede mejorar los atributos de ataque y supervivencia a la vez!"
+		["value"]="Haz clic aquí para ver las reglas del juego."
-	},
-	["tutorial_txt_14"]={
-		["value"]="Consigue primero los materiales para refuerzo de armadura."
-	},
-	["tutorial_txt_15"]={
-
-	},
-	["tutorial_txt_16"]={
-
-	},
-	["tutorial_txt_17"]={
-
-	},
-	["tutorial_txt_18"]={
-
-	},
-	["tutorial_txt_19"]={
-
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

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

@@ -37,27 +37,9 @@ local tutorial = {
 	},
 	["tutorial_txt_13"]={
 
-	},
-	["tutorial_txt_14"]={
-
-	},
-	["tutorial_txt_15"]={
-		["value"]="ฮีโร่แต่ละคนสามารถมีรูนได้สูงสุด 6 อัน"
-	},
-	["tutorial_txt_16"]={
-		["value"]="รูนสามารถสร้าวเป็นเซ็ทเพื่อเพิ่มสเตตัสเพิ่มเติมได้"
-	},
-	["tutorial_txt_17"]={
-		["value"]="คุณภาพของรูนจะได้รับการอัปตามเลเวลของแท่นหล่อรูน"
-	},
-	["tutorial_txt_18"]={
-		["value"]="ฮีโร่ทั้งหมดจะแชร์เลเวลแท่นหล่อรูนด้วยกัน"
-	},
-	["tutorial_txt_19"]={
-		["value"]="ไปรับวัสดึรูน [แก่นรูน] ก่อนสิ!"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

lua/app/config/strings/id/tutorial.lua

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="Dapatkan lebih banyak Hero di Mall!"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="Tantang misi dan dapatkan Hero level S!"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="Gameplay tantangan baru telah dimulai!"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="Selamat datang di Arena. Silakan ketuk matchmaking."
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="Lawannya tidak kuat. Mari kita mulai."
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="Silakan ketuk di sini untuk melihat aturan battle."
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="Senjata dapat meningkatkan sejumlah besar Stats!"
+		["value"]="Selamat datang di Arena. Silakan ketuk matchmaking."
 	},
 	["tutorial_txt_12"]={
-		["value"]="Dapatkan material booster senjata!"
+		["value"]="Lawannya tidak kuat. Mari kita mulai."
 	},
 	["tutorial_txt_13"]={
-		["value"]="Pertahanan dapat meningkatkan Stats ATK dan Stats bertahan hidup!"
+		["value"]="Silakan ketuk di sini untuk melihat aturan battle."
-	},
-	["tutorial_txt_14"]={
-		["value"]="Dapatkan material booster DEF!"
-	},
-	["tutorial_txt_15"]={
-		["value"]="Setiap hero dapat memiliki maksimal 6 Rune."
-	},
-	["tutorial_txt_16"]={
-		["value"]="Rune dapat membentuk set untuk stats tambahan."
-	},
-	["tutorial_txt_17"]={
-		["value"]="Kualitas Rune akan meningkat berdasarkan level Rune Forge."
-	},
-	["tutorial_txt_18"]={
-		["value"]="Level Rune Forge dimiliki oleh semua hero."
-	},
-	["tutorial_txt_19"]={
-		["value"]="Ayo dapatkan material rune [Esensi Rune] dahulu!"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

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

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="ショップへ移動し、多くのヒーローを入手しよう！"
-	},
-	["tutorial_txt_6"]={
-		["value"]="ミッションに挑戦して、S級ヒーローを入手しよう！"
-	},
-	["tutorial_txt_7"]={
-		["value"]="新たな挑戦コンテンツが解放されました！"
-	},
-	["tutorial_txt_8"]={
-		["value"]="闘技場へようこそ。マッチングをタップしてください。"
-	},
-	["tutorial_txt_9"]={
-		["value"]="相手は弱いので、さっそく始めましょう。"
-	},
-	["tutorial_txt_10"]={
-		["value"]="ここをタップして、対戦ルールを確認してください。"
-	},
-	["tutorial_txt_11"]={
-		["value"]="武器は攻撃ステータスを大幅にアップできます！"
-	},
-	["tutorial_txt_12"]={
-		["value"]="まず武器の強化材料を入手しましょう！"
-	},
-	["tutorial_txt_13"]={
-		["value"]="防具は攻撃と生存ステータスを同時にアップできます！"
-	},
-	["tutorial_txt_14"]={
-		["value"]="防具の強化材料を入手しましょう！"
-	},
-	["tutorial_txt_15"]={
-		["value"]="各ヒーローは最大6つのルーンを持つことができる。"
-	},
-	["tutorial_txt_16"]={
-		["value"]="ルーンを組み合わせてセットで使うと、追加のステータスを強化できる。"
-	},
-	["tutorial_txt_17"]={
-		["value"]="ルーンの品櫃は、ルーン合成台のレベルに応じて上がる。"
-	},
-	["tutorial_txt_18"]={
 
 	},
-	["tutorial_txt_19"]={
+	["tutorial_txt_6"]={
-		["value"]="まずはルーンの材料【ルーンエッセンス】を入手しましょう！"
+
+	},
+	["tutorial_txt_7"]={
+
+	},
+	["tutorial_txt_8"]={
+
+	},
+	["tutorial_txt_9"]={
+
+	},
+	["tutorial_txt_10"]={
+
+	},
+	["tutorial_txt_11"]={
+		["value"]="闘技場へようこそ。マッチングをタップしてください。"
+	},
+	["tutorial_txt_12"]={
+		["value"]="相手は弱いので、さっそく始めましょう。"
+	},
+	["tutorial_txt_13"]={
+		["value"]="ここをタップして、対戦ルールを確認してください。"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

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

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="상점에서 더 많은 영웅을 획득할 수 있습니다!"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="미션에 도전하고 S레벨의 영웅을 획득하세요!"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="새롭게 챌린지 모드가 오픈되었습니다!"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="아레나에 오신 것을 환영합니다. 클릭하여 매칭하세요."
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="강한 상대가 아닙니다. 바로 시작해 볼까요?"
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="대결 규칙을 보려면 이곳을 클릭해 주세요."
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="무기는 공격 유형의 속성을 대폭 향상시킬 수 있습니다!"
+		["value"]="아레나에 오신 것을 환영합니다. 클릭하여 매칭하세요."
 	},
 	["tutorial_txt_12"]={
-		["value"]="함께 무기 강화 재료부터 획득해 볼까요?"
+		["value"]="강한 상대가 아닙니다. 바로 시작해 볼까요?"
 	},
 	["tutorial_txt_13"]={
-		["value"]="방어구는 공격과 생존 속성을 동시에 올려줄 수 있습니다!"
+		["value"]="대결 규칙을 보려면 이곳을 클릭해 주세요."
-	},
-	["tutorial_txt_14"]={
-		["value"]="함께 방어구 강화 재료를 획득해 보아요!"
-	},
-	["tutorial_txt_15"]={
-		["value"]="각 영웅은 최대 6개의 룬을 보유할 수 있습니다."
-	},
-	["tutorial_txt_16"]={
-		["value"]="룬은 세트로 구성되어 추가 속성을 강화할 수 있습니다."
-	},
-	["tutorial_txt_17"]={
-		["value"]="룬 주조대 레벨에 따라 룬의 품질이 향상됩니다."
-	},
-	["tutorial_txt_18"]={
-		["value"]="룬 주조대 레벨은 모든 영웅이 공유합니다."
-	},
-	["tutorial_txt_19"]={
-		["value"]="이제 함께 룬 재료인 [룬 정수]를 모으러 가볼까요?"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

lua/app/config/strings/pt/tutorial.lua

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="Vá até a loja e obtenha mais heróis!"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="Complete desafios e ganhe heróis de classe S!"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="Novo modo de desafio disponível!"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="Bem-vindo(a) à Arena! Clique em pareamento."
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="O oponente não é muito forte. Vamos começar diretamente."
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="Confira as regras de batalha aqui."
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="As armas podem aumentar significativamente os atributos de ataque!"
+		["value"]="Bem-vindo(a) à Arena! Clique em pareamento."
 	},
 	["tutorial_txt_12"]={
-		["value"]="Primeiro, vamos obter os materiais de reforço para as armas!"
+		["value"]="O oponente não é muito forte. Vamos começar diretamente."
 	},
 	["tutorial_txt_13"]={
-		["value"]="As armaduras podem melhorar os atributos tanto de ataque como de sobrevivência!"
+		["value"]="Confira as regras de batalha aqui."
-	},
-	["tutorial_txt_14"]={
-		["value"]="Vamos buscar alguns materiais de reforço para as armaduras!"
-	},
-	["tutorial_txt_15"]={
-		["value"]="Cada héroe puede tener hasta 6 runas."
-	},
-	["tutorial_txt_16"]={
-		["value"]="Las runas pueden formar conjuntos para mejorar atributos adicionales."
-	},
-	["tutorial_txt_17"]={
-		["value"]="La calidad de runas mejorará según el nivel de Forja de Runas."
-	},
-	["tutorial_txt_18"]={
-		["value"]="El nivel de Forja de Runas es compartido por todos los héroes."
-	},
-	["tutorial_txt_19"]={
-		["value"]="Vamos a obtener [Esencia Rúnica], material para forjar runas."
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

lua/app/config/strings/ru/tutorial.lua

@@ -37,27 +37,9 @@ local tutorial = {
 	},
 	["tutorial_txt_13"]={
 
-	},
-	["tutorial_txt_14"]={
-
-	},
-	["tutorial_txt_15"]={
-
-	},
-	["tutorial_txt_16"]={
-
-	},
-	["tutorial_txt_17"]={
-
-	},
-	["tutorial_txt_18"]={
-
-	},
-	["tutorial_txt_19"]={
-
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

lua/app/config/strings/th/tutorial.lua

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="ไปที่ห้างเพื่อรับฮีโร่เพิ่มเติม!"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="ท้าทายภารกิจเพื่อรับฮีโร่ระดับ S!"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="วิธีการเล่นท้าทายใหม่เปิดแล้ว!"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="ยินดีต้อนรับสู่อารีน่า แตะเพื่อจับคู่"
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="คู่ต่อสู้ไม่แข็งแกร่ง เริ่มโดยตรงกันเถอะ"
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="กรุณาแตะที่นี่เพื่อดูกติกาของเกม"
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="อาวุธสามารถสเตตัสโจมตีได้มากมาย!"
+		["value"]="ยินดีต้อนรับสู่อารีน่า แตะเพื่อจับคู่"
 	},
 	["tutorial_txt_12"]={
-		["value"]="ไปหาวัสดุตีบวกอาวุธกันก่อน!"
+		["value"]="คู่ต่อสู้ไม่แข็งแกร่ง เริ่มโดยตรงกันเถอะ"
 	},
 	["tutorial_txt_13"]={
-		["value"]="เกราะสามารถอัปสเตตัสโจมตีและการเอาชีวิตรอดได้ในเวลาเดียวกัน!"
+		["value"]="กรุณาแตะที่นี่เพื่อดูกติกาของเกม"
-	},
-	["tutorial_txt_14"]={
-		["value"]="ไปหาวัสดุตีบวกเกราะกันเถอะ!"
-	},
-	["tutorial_txt_15"]={
-
-	},
-	["tutorial_txt_16"]={
-
-	},
-	["tutorial_txt_17"]={
-
-	},
-	["tutorial_txt_18"]={
-
-	},
-	["tutorial_txt_19"]={
-
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

lua/app/config/strings/vi/tutorial.lua

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="Đến SHOP, nhận thêm nhiều Anh Hùng!"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="Khiêu chiến nhiệm vụ, nhận Anh Hùng S!"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="Đã mở lối chơi khiêu chiến mới!"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="Chào mừng đến đấu trường, hãy ấn ghép đối thủ."
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="Đối thủ không mạnh, trực tiếp bắt đầu."
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="Hãy ấn vào đây xem quy tắc."
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="Vũ khí có thể tăng thuộc tính tấn công!"
+		["value"]="Chào mừng đến đấu trường, hãy ấn ghép đối thủ."
 	},
 	["tutorial_txt_12"]={
-		["value"]="Chúng ta hãy nhận vật liệu cường hóa vũ khí trước đã!"
+		["value"]="Đối thủ không mạnh, trực tiếp bắt đầu."
 	},
 	["tutorial_txt_13"]={
-		["value"]="Phòng cụ có thể cùng lúc tăng thuộc tính tấn công và sinh tồn."
+		["value"]="Hãy ấn vào đây xem quy tắc."
-	},
-	["tutorial_txt_14"]={
-		["value"]="Tiếp theo chúng ta hãy nhận vật liệu cường hóa phòng cụ!"
-	},
-	["tutorial_txt_15"]={
-		["value"]="Mỗi Anh Hùng có thể tối đa có 6 Phù Văn."
-	},
-	["tutorial_txt_16"]={
-		["value"]="Phù Văn có thể tổ hợp thành Bộ, tăng thêm thuộc tính."
-	},
-	["tutorial_txt_17"]={
-		["value"]="Phẩm Phù Văn sẽ tăng theo cấp Đài Đúc Phù Văn."
-	},
-	["tutorial_txt_18"]={
-		["value"]="Tất cả Anh Hùng dùng chung cấp Đài Đúc Phù Văn."
-	},
-	["tutorial_txt_19"]={
-		["value"]="Chúng ta hãy nhận vật liệu Phù Văn [Tinh Túy Phù Văn] trước nhé!"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

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

@@ -12,52 +12,34 @@ local tutorial = {
 
 	},
 	["tutorial_txt_5"]={
-		["value"]="前往商城，獲得更多英雄！"
+
 	},
 	["tutorial_txt_6"]={
-		["value"]="挑戰任務，獲得S級英雄！"
+
 	},
 	["tutorial_txt_7"]={
-		["value"]="新的挑戰玩法開啟了！"
+
 	},
 	["tutorial_txt_8"]={
-		["value"]="歡迎來到競技場，請點擊匹配。"
+
 	},
 	["tutorial_txt_9"]={
-		["value"]="對手不強，讓我們直接開始。"
+
 	},
 	["tutorial_txt_10"]={
-		["value"]="請點擊這裡查看對戰規則。"
+
 	},
 	["tutorial_txt_11"]={
-		["value"]="武器可以提升大量進攻類屬性！"
+		["value"]="歡迎來到競技場，請點擊匹配。"
 	},
 	["tutorial_txt_12"]={
-		["value"]="讓我們先去獲取一下武器強化材料吧！"
+		["value"]="對手不強，讓我們直接開始。"
 	},
 	["tutorial_txt_13"]={
-		["value"]="防具可以同時提升進攻和生存屬性！"
+		["value"]="請點擊這裡查看對戰規則。"
-	},
-	["tutorial_txt_14"]={
-		["value"]="讓我們去獲取一下防具強化的材料吧"
-	},
-	["tutorial_txt_15"]={
-		["value"]="每名英雄最多可以擁有6個符文。"
-	},
-	["tutorial_txt_16"]={
-		["value"]="符文可以組成套裝，提高額外屬性。"
-	},
-	["tutorial_txt_17"]={
-		["value"]="符文品質將根據符文鑄台的等級提高。"
-	},
-	["tutorial_txt_18"]={
-		["value"]="符文鑄台等級所有英雄共享。"
-	},
-	["tutorial_txt_19"]={
-		["value"]="讓我們先去獲取一些符文材料【符文精粹】吧！"
 	}
 }
 local config = {
-data=tutorial,count=19
+data=tutorial,count=13
 }
 return config

lua/app/config/task_achievement.lua

@@ -126,7 +126,6 @@ local task_achievement = {
 	[2]={
 		["type"]=2,
 		["number"]={
-			5000,
 			20000,
 			50000,
 			150000,
@@ -135,7 +134,8 @@ local task_achievement = {
 			1000000,
 			2000000,
 			5000000,
-			10000000
+			10000000,
+			20000000
 		},
 		["reward"]={
 			{
@@ -321,18 +321,18 @@ local task_achievement = {
 		["type"]=47,
 		["number"]={
 			20,
-			40,
+			50,
-			60,
+			100,
-			90,
-			120,
-			160,
 			200,
-			250,
-			300,
-			360,
-			420,
 			500,
-			600
+			800,
+			1200,
+			1800,
+			2400,
+			3200,
+			4000,
+			5000,
+			6000
 		},
 		["reward"]={
 			{
@@ -1086,12 +1086,7 @@ local task_achievement = {
 			2,
 			3,
 			4,
-			5,
+			5
-			6,
-			7,
-			8,
-			9,
-			10
 		},
 		["reward"]={
 			{
@@ -1099,64 +1094,24 @@ local task_achievement = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=10,
+				["num"]=20,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="VAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=10,
+				["num"]=20,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="VAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=10,
+				["num"]=20,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="VAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
 			},
 			{
 				["type"]=1,

lua/app/config/task_daily_stage.lua

@@ -18,18 +18,10 @@ local task_daily_stage = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
+				["id"]=2,
- 				["id_for_nothing"]="Uw==",
+ 				["id_for_nothing"]="VA==",
-				["num"]=1,
+				["num"]=20,
- 				["num_for_nothing"]="Vw=="
+ 				["num_for_nothing"]="VAg="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=500,
- 				["num_for_nothing"]="Uwhc"
 			}
 		}
 	},
@@ -39,10 +31,10 @@ local task_daily_stage = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
+				["id"]=1,
- 				["id_for_nothing"]="Uw==",
+ 				["id_for_nothing"]="Vw==",
-				["num"]=2,
+				["num"]=500,
- 				["num_for_nothing"]="VA=="
+ 				["num_for_nothing"]="Uwhc"
 			},
 			{
 				["type"]=1,
@@ -70,8 +62,8 @@ local task_daily_stage = {
  				["type_for_nothing"]="Vw==",
 				["id"]=5,
  				["id_for_nothing"]="Uw==",
-				["num"]=2,
+				["num"]=1,
- 				["num_for_nothing"]="VA=="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	},
@@ -83,8 +75,8 @@ local task_daily_stage = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=80,
+				["num"]=60,
- 				["num_for_nothing"]="Xgg="
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,

lua/app/config/tutorial.lua

@@ -153,7 +153,7 @@ local tutorial = {
 		}
 	},
 	[20050]={
-		["next_id"]=20040,
+		["next_id"]=20060,
 		["type"]=2,
 		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/bottom_bg/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn",
 		["arrow_direction"]=1,
@@ -162,10 +162,10 @@ local tutorial = {
 			0
 		}
 	},
-	[20040]={
+	[20060]={
-		["next_id"]=20050,
+		["next_id"]=20070,
 		["type"]=2,
-		["heroid"]=13001,
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
@@ -181,8 +181,8 @@ local tutorial = {
 			0
 		}
 	},
-	[20050]={
+	[20070]={
-		["next_id"]=20060,
+		["next_id"]=20080,
 		["type"]=3,
 		["txt"]="tutorial_txt_3",
 		["txt_offset"]={
@@ -190,24 +190,24 @@ local tutorial = {
 			180
 		},
 		["target_name"]="hero_detail_ui(Clone)/middle/hero_info/up/up_5_btn",
-		["arrow_direction"]=1,
+		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
 			0
 		}
 	},
-	[20060]={
+	[20080]={
-		["next_id"]=20070,
+		["next_id"]=20090,
 		["delay"]=1.0,
 		["type"]=2,
 		["target_name"]="hero_detail_ui(Clone)/bottom/close_btn",
-		["arrow_direction"]=1,
+		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
 			0
 		}
 	},
-	[20070]={
+	[20090]={
 		["type"]=3,
 		["txt"]="tutorial_txt_4",
 		["txt_offset"]={
@@ -215,7 +215,7 @@ local tutorial = {
 			40
 		},
 		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3",
-		["arrow_direction"]=1,
+		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
 			0
@@ -229,9 +229,266 @@ local tutorial = {
 			0,
 			0
 		}
+	},
+	[30000]={
+		["next_id"]=30010,
+		["type"]=3,
+		["txt"]="tutorial_txt_5",
+		["txt_offset"]={
+			0,
+			0
+		},
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_4",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			0
+		},
+		["circle_r"]=100,
+		["circle_offset"]={
+			0,
+			0
+		}
+	},
+	[30010]={
+		["next_id"]=30020,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/company_comp/talent_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[30020]={
+		["type"]=3,
+		["txt"]="tutorial_txt_6",
+		["txt_offset"]={
+			0,
+			0
+		},
+		["target_name"]="talent_ui(Clone)/get_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		},
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[40000]={
+		["next_id"]=40010,
+		["type"]=3,
+		["txt"]="tutorial_txt_7",
+		["txt_offset"]={
+			0,
+			0
+		},
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[40010]={
+		["next_id"]=40020,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_1",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[40020]={
+		["next_id"]=40030,
+		["type"]=2,
+		["target_name"]="hero_detail_ui(Clone)/bottom/btns/page_btn_3",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[40030]={
+		["next_id"]=40040,
+		["type"]=2,
+		["txt"]="tutorial_txt_8",
+		["txt_offset"]={
+			0,
+			0
+		},
+		["target_name"]="hero_detail_ui(Clone)/middle/equip_info/equip_node/auto_wear_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		}
+	},
+	[40040]={
+		["next_id"]=40050,
+		["delay"]=1.0,
+		["type"]=3,
+		["txt"]="tutorial_txt_9",
+		["txt_offset"]={
+			0,
+			0
+		},
+		["target_name"]="hero_detail_ui(Clone)/bottom/close_btn"
+	},
+	[40050]={
+		["next_id"]=40060,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3"
+	},
+	[40060]={
+		["next_id"]=40070,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/daily_challenge_btn",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		}
+	},
+	[40070]={
+		["next_id"]=40080,
+		["type"]=2,
+		["target_name"]="daily_challenge_ui(Clone)/task/icon_task2"
+	},
+	[40080]={
+		["delay"]=0.5,
+		["type"]=3,
+		["txt"]="tutorial_txt_10",
+		["txt_offset"]={
+			0,
+			180
+		},
+		["target_name"]="rewards_tips(Clone)/bg/reward2_node/reward_layout/reward_cell_1",
+		["arrow_direction"]=4,
+		["arrow_offset"]={
+			20,
+			0
+		},
+		["show_mask"]=2,
+		["circle_r"]=100,
+		["circle_offset"]={
+			0,
+			0
+		}
+	},
+	[50000]={
+		["next_id"]=50010,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/arena_btn",
+		["arrow_direction"]=4,
+		["arrow_offset"]={
+			20,
+			0
+		},
+		["show_mask"]=2,
+		["circle_r"]=100,
+		["circle_offset"]={
+			0,
+			0
+		}
+	},
+	[50010]={
+		["next_id"]=50020,
+		["type"]=3,
+		["txt"]="tutorial_txt_11",
+		["txt_offset"]={
+			0,
+			200
+		},
+		["target_name"]="arena_ui(Clone)/fight_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
+	},
+	[50020]={
+		["next_id"]=50030,
+		["delay"]=2.5,
+		["type"]=3,
+		["txt"]="tutorial_txt_12",
+		["txt_offset"]={
+			0,
+			90
+		},
+		["target_name"]="arena_match_ui(Clone)/match_result/btn_start",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
+	},
+	[50030]={
+		["next_id"]=50040,
+		["type"]=4,
+		["finish"]=1,
+		["finish_parameter"]=4
+	},
+	[50040]={
+		["next_id"]=50050,
+		["type"]=3,
+		["txt"]="tutorial_txt_13",
+		["txt_offset"]={
+			0,
+			880
+		},
+		["target_name"]="battle_ui_pvp(Clone)/top_node/close_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		},
+		["show_mask"]=2,
+		["circle_r"]=100,
+		["circle_offset"]={
+			0,
+			0
+		}
+	},
+	[50050]={
+		["next_id"]=50060,
+		["type"]=2,
+		["target_name"]="battle_arena_pause_ui(Clone)/skill_node/next_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
+	},
+	[50060]={
+		["next_id"]=50070,
+		["type"]=2,
+		["target_name"]="battle_arena_pause_ui(Clone)/skill_node/next_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
+	},
+	[50070]={
+		["type"]=2,
+		["target_name"]="battle_arena_pause_ui(Clone)/continue_btn",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		}
 	}
 }
 local config = {
-data=tutorial,count=18
+data=tutorial,count=38
 }
 return config

lua/app/config/tutorial_start.lua

@@ -6,9 +6,21 @@ local tutorial_start = {
 	[2]={
 		["start_id"]=20000,
 		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
+	},
+	[3]={
+		["start_id"]=30000,
+		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
+	},
+	[4]={
+		["start_id"]=40000,
+		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
+	},
+	[5]={
+		["start_id"]=50000,
+		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
 	}
 }
 local config = {
-data=tutorial_start,count=2
+data=tutorial_start,count=5
 }
 return config

lua/app/module/tutorial/tutorial_const.lua

@@ -5,14 +5,12 @@ TutorialConst.DEFAULT_RADIUS = 100
 
 TutorialConst.START_TUTORIAL = 1
 TutorialConst.PASS_ONE_CHAPTER = 2
-TutorialConst.TWO_CHAPTER_BOX_CAN_GOT = 3
+TutorialConst.TALENT_OPEN = 3
-TutorialConst.PASS_THREE_CHAPTER = 4
+TutorialConst.DAILY_CHALLENGE_OPEN = 4
-TutorialConst.UNLOCK_DAILY_CHALLENGE = 5
+-- TutorialConst.PASS_THREE_CHAPTER = 4
-TutorialConst.UNLOCK_DUNGEON = 6
+-- TutorialConst.UNLOCK_DAILY_CHALLENGE = 5
-TutorialConst.UNLOCK_ARENA = 7
+-- TutorialConst.UNLOCK_DUNGEON = 6
-TutorialConst.WEAPON_DUNGEON = 8
+TutorialConst.UNLOCK_ARENA = 5
-TutorialConst.ARMOR_DUNGEON = 9
-TutorialConst.RUNE_DUNGEON = 10
 
 TutorialConst.TUTORIAL_TYPE = {
 	CLICK = 1,	-- 点击任意区域

lua/app/ui/common/cell/player_head_cell.lua

@@ -24,7 +24,7 @@ function PlayerHeadCell:refresh(avatarId, frameId, showRp)
 	-- 头像
 	local avatarName = DataManager.PlayerData:getAvatarIconId(avatarId)
 	if avatarName then
-		self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, avatarName, function()
+		self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, avatarName, function()
 			self.imgAvatar:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
 		end)
 	end

lua/app/ui/hero/cell/lv_cell.lua

@@ -28,7 +28,7 @@ function StarCell:refresh(heroEntity, idx)
 	local attrIdx = GFunc.getAttrIdByName(attr.type)
 	local attrNum = GFunc.getFinalAttrValue(attr.type, attr.num)
 	local descTx = ""
-	if not table.containValue(GConst.MATCH_ALL_ATKP_NAME, attr.type) then
+	if not table.containValue(GConst.MATCH_ALL_ATKP_NAME, attr.type) and not table.containValue(GConst.MATCH_ALL_HPP_NAME, attr.type) then
 		descTx = I18N:getText("attr", attrIdx, "desc", heroEntity:getName(), attrNum)
 	else
 		descTx = I18N:getText("attr", attrIdx, "desc", attrNum)

lua/app/ui/main_city/main_city_ui.lua

@@ -686,8 +686,8 @@ function MainCityUI:checkTutorial(onlyCheck)
 		end
 	end
 
-	if DataManager.ChapterData:boxCanGet(2, 1) then
+	if DataManager.TalentData:getIsOpen() then
-		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.TWO_CHAPTER_BOX_CAN_GOT, onlyCheck) then
+		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.TALENT_OPEN, onlyCheck) then
 			return true
 		end
 	end
@@ -710,29 +710,17 @@ function MainCityUI:checkTutorial(onlyCheck)
 	-- 	end
 	-- end
 
+	if DataManager.DailyChallengeData:isOpen() then
+		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.DAILY_CHALLENGE_OPEN, onlyCheck) then
+			return true
+		end
+	end
+
 	if DataManager.ArenaData:isOpen() then
 		if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_ARENA, onlyCheck) then
 			return true
 		end
 	end
-
-	-- if DataManager.DungeonData:isOpen(ModuleManager.MODULE_KEY.EQUIP_WEAPON) then
-	-- 	if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.WEAPON_DUNGEON, onlyCheck) then
-	-- 		return true
-	-- 	end
-	-- end
-
-	-- if DataManager.DungeonData:isOpen(ModuleManager.MODULE_KEY.EQUIP_ARMOR) then
-	-- 	if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.ARMOR_DUNGEON, onlyCheck) then
-	-- 		return true
-	-- 	end
-	-- end
-
-	-- if DataManager.DungeonData:isOpen(ModuleManager.MODULE_KEY.RUNES_OPEN) then
-	-- 	if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.RUNE_DUNGEON, onlyCheck) then
-	-- 		return true
-	-- 	end
-	-- end
 end
 
 -- 检查礼包(首充(作废)/入门/章节/新手/助力/成长/金币顺序)

lua/app/ui/player_info/avatar_cell.lua

@@ -1,41 +1,41 @@
 local AvatarCell = class("AvatarCell", BaseCell)
 
 function AvatarCell:init()
-    self.uiMap = self:getUIMap()
+	self.uiMap = self:getUIMap()
 
-    self.imgAvatar = self.uiMap["avatar_cell.img_avatar"]
+	self.imgAvatar = self.uiMap["avatar_cell.img_avatar"]
-    self.lock = self.uiMap["avatar_cell.lock"]
+	self.lock = self.uiMap["avatar_cell.lock"]
-    self.use = self.uiMap["avatar_cell.use"]
+	self.use = self.uiMap["avatar_cell.use"]
-    self.txUse = self.uiMap["avatar_cell.use.tx_use"]
+	self.txUse = self.uiMap["avatar_cell.use.tx_use"]
-    self.select = self.uiMap["avatar_cell.select"]
+	self.select = self.uiMap["avatar_cell.select"]
 
-    self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.ON_USING_DESC))
+	self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.ON_USING_DESC))
 
-    self:addClickListener(function()
+	self:addClickListener(function()
-        EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.PLAYER_INFO_CLICK_AVATAR, self.id)
+		EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.PLAYER_INFO_CLICK_AVATAR, self.id)
 	end)
 end
 
 function AvatarCell:refresh(id, isSelect)
-    self.id = id
+	self.id = id
 
-    -- 红点
+	-- 红点
-    if DataManager.PlayerData:isNewAvatar(self.id) then
+	if DataManager.PlayerData:isNewAvatar(self.id) then
-        self.baseObject:addRedPoint(45, 45, 1)
+		self.baseObject:addRedPoint(45, 45, 1)
-    else
+	else
-        self.baseObject:removeRedPoint()
+		self.baseObject:removeRedPoint()
-    end
+	end
 
-    -- 背景
+	-- 背景
-    local smallFrame = DataManager.PlayerData:getAvatarBg(self.id)
+	-- local smallFrame = DataManager.PlayerData:getAvatarBg(self.id)
-    if smallFrame then
+	-- if smallFrame then
-        self.baseObject:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame)
+	-- 	self.baseObject:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame)
-    end
+	-- end
 
-    self.select:setActive(isSelect)
+	self.select:setActive(isSelect)
-    self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, DataManager.PlayerData:getAvatarIconId(self.id))
+	self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, DataManager.PlayerData:getAvatarIconId(self.id))
-    self.lock:setActive(not DataManager.PlayerData:isAvatarUnlock(self.id))
+	self.lock:setActive(not DataManager.PlayerData:isAvatarUnlock(self.id))
-    self.use:setActive(DataManager.PlayerData:getUsingAvatarId() == self.id)
+	self.use:setActive(DataManager.PlayerData:getUsingAvatarId() == self.id)
 end
 
 return AvatarCell

lua/app/ui/player_info/frame_cell.lua

@@ -29,7 +29,7 @@ function FrameCell:refresh(id, isSelect)
     self.select:setActive(isSelect)
     local iconId = DataManager.PlayerData:getFrameIconId(self.id)
     self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, iconId)
-    self.lock:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, iconId)
+    -- self.lock:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, iconId)
     self.lock:setActive(not DataManager.PlayerData:isFrameUnlock(self.id))
     self.use:setActive(DataManager.PlayerData:getUsingFrameId() == self.id)
 end

lua/app/ui/player_info/player_info_ui.lua

@@ -1,12 +1,12 @@
 local PlayerInfoUI = class("PlayerInfoUI", BaseUI)
 
 local TAG = {
-    AVATAR = 1,
+	AVATAR = 1,
-    FRAME = 2,
+	FRAME = 2,
 }
 
 function PlayerInfoUI:isFullScreen()
-    return  false
+	return  false
 end
 
 function PlayerInfoUI:onPressBackspace()
@@ -14,12 +14,12 @@ function PlayerInfoUI:onPressBackspace()
 end
 
 function PlayerInfoUI:getPrefabPath()
-    return "assets/prefabs/ui/player_info/player_info_ui.prefab"
+	return "assets/prefabs/ui/player_info/player_info_ui.prefab"
 end
 
 function PlayerInfoUI:ctor()
-    self.selectAvatarId = DataManager.PlayerData:getUsingAvatarId()
+	self.selectAvatarId = DataManager.PlayerData:getUsingAvatarId()
-    self.selectFrameId = DataManager.PlayerData:getUsingFrameId()
+	self.selectFrameId = DataManager.PlayerData:getUsingFrameId()
 end
 
 function PlayerInfoUI:onCover()
@@ -32,229 +32,229 @@ function PlayerInfoUI:onClose()
 end
 
 function PlayerInfoUI:onLoadRootComplete()
-    self.uiMap = self.root:genAllChildren()
+	self.uiMap = self.root:genAllChildren()
 
-    self.txTitle = self.uiMap["player_info_ui.bg.title.tx_title"]
+	self.txTitle = self.uiMap["player_info_ui.bg.tx_title"]
-    self.imgAvatar = self.uiMap["player_info_ui.bg.info.avatar.img_avatar"]
+	self.imgAvatar = self.uiMap["player_info_ui.bg.info.avatar.img_avatar"]
-    self.imgFrame = self.uiMap["player_info_ui.bg.info.avatar.img_frame"]
+	self.imgFrame = self.uiMap["player_info_ui.bg.info.avatar.img_frame"]
-    self.expProg = self.uiMap["player_info_ui.bg.info.exp.exp_prog"]
+	self.expProg = self.uiMap["player_info_ui.bg.info.exp.exp_prog"]
-    self.txLevel = self.uiMap["player_info_ui.bg.info.exp.level.tx_level"]
+	self.txLevel = self.uiMap["player_info_ui.bg.info.exp.level.tx_level"]
-    self.txName = self.uiMap["player_info_ui.bg.info.nickname.tx_name"]
+	self.txName = self.uiMap["player_info_ui.bg.info.nickname.tx_name"]
-    self.btnRename = self.uiMap["player_info_ui.bg.info.nickname.btn_rename"]
+	self.btnRename = self.uiMap["player_info_ui.bg.info.nickname.btn_rename"]
-    self.tagAvatar = self.uiMap["player_info_ui.bg.list.tags.tag_avatar"]
+	self.tagAvatar = self.uiMap["player_info_ui.bg.list.tags.tag_avatar"]
-    self.selectAvatar = self.uiMap["player_info_ui.bg.list.tags.tag_avatar.select"]
+	self.selectAvatar = self.uiMap["player_info_ui.bg.list.tags.tag_avatar.select"]
-    self.txAvatar = self.uiMap["player_info_ui.bg.list.tags.tag_avatar.tx_avatar"]
+	self.txAvatar = self.uiMap["player_info_ui.bg.list.tags.tag_avatar.tx_avatar"]
-    self.txAvatarS = self.uiMap["player_info_ui.bg.list.tags.tag_avatar.select.tx_avatar_s"]
+	self.txAvatarS = self.uiMap["player_info_ui.bg.list.tags.tag_avatar.select.tx_avatar_s"]
-    self.tagFrame = self.uiMap["player_info_ui.bg.list.tags.tag_frame"]
+	self.tagFrame = self.uiMap["player_info_ui.bg.list.tags.tag_frame"]
-    self.selectFrame = self.uiMap["player_info_ui.bg.list.tags.tag_frame.select"]
+	self.selectFrame = self.uiMap["player_info_ui.bg.list.tags.tag_frame.select"]
-    self.txFrame = self.uiMap["player_info_ui.bg.list.tags.tag_frame.tx_frame"]
+	self.txFrame = self.uiMap["player_info_ui.bg.list.tags.tag_frame.tx_frame"]
-    self.txFrameS = self.uiMap["player_info_ui.bg.list.tags.tag_frame.select.tx_frame_s"]
+	self.txFrameS = self.uiMap["player_info_ui.bg.list.tags.tag_frame.select.tx_frame_s"]
-    self.scrollrectAvatar = self.uiMap["player_info_ui.bg.list.scrollrect_avatar"]
+	self.scrollrectAvatar = self.uiMap["player_info_ui.bg.list.scrollrect_avatar"]
-    self.scrollrectFrame = self.uiMap["player_info_ui.bg.list.scrollrect_frame"]
+	self.scrollrectFrame = self.uiMap["player_info_ui.bg.list.scrollrect_frame"]
-    self.txDesc = self.uiMap["player_info_ui.bg.tx_desc"]
+	self.txDesc = self.uiMap["player_info_ui.bg.tx_desc"]
-    self.btnUse = self.uiMap["player_info_ui.bg.btn_use"]
+	self.btnUse = self.uiMap["player_info_ui.bg.btn_use"]
-    self.txUse = self.uiMap["player_info_ui.bg.btn_use.tx_use"]
+	self.txUse = self.uiMap["player_info_ui.bg.btn_use.tx_use"]
-    self.btnClose = self.uiMap["player_info_ui.bg.btn_close"]
+	self.btnClose = self.uiMap["player_info_ui.bg.btn_close"]
-    self.bgAvatar = self.uiMap["player_info_ui.bg.info.avatar"]
+	self.bgAvatar = self.uiMap["player_info_ui.bg.info.avatar"]
 
-    self.curTag = TAG.AVATAR
+	self.curTag = TAG.AVATAR
 
-    self.tagAvatar:addClickListener(function()
+	self.tagAvatar:addClickListener(function()
-        self:refreshScrollrect(TAG.AVATAR)
+		self:refreshScrollrect(TAG.AVATAR)
 	end)
-    self.tagFrame:addClickListener(function()
+	self.tagFrame:addClickListener(function()
-        self:refreshScrollrect(TAG.FRAME)
+		self:refreshScrollrect(TAG.FRAME)
 	end)
-    self.btnRename:addClickListener(function()
+	self.btnRename:addClickListener(function()
-        UIManager:showUI("app/ui/player_info/rename_ui")
+		UIManager:showUI("app/ui/player_info/rename_ui")
-        self:closeUI()
+		self:closeUI()
 	end)
-    self.btnUse:addClickListener(function()
+	self.btnUse:addClickListener(function()
-        if self.curTag == TAG.AVATAR then
+		if self.curTag == TAG.AVATAR then
-            ModuleManager.PlayerManager:reqChangeAvatar(self.selectAvatarId)
+			ModuleManager.PlayerManager:reqChangeAvatar(self.selectAvatarId)
-        elseif self.curTag == TAG.FRAME then
+		elseif self.curTag == TAG.FRAME then
-            ModuleManager.PlayerManager:reqChangeFrame(self.selectFrameId)
+			ModuleManager.PlayerManager:reqChangeFrame(self.selectFrameId)
-        end
+		end
 	end)
-    self.btnClose:addClickListener(function()
+	self.btnClose:addClickListener(function()
-        self:closeUI()
+		self:closeUI()
 	end)
-    self:addEventListener(EventManager.CUSTOM_EVENT.PLAYER_INFO_CLICK_AVATAR, function(id)
+	self:addEventListener(EventManager.CUSTOM_EVENT.PLAYER_INFO_CLICK_AVATAR, function(id)
-        if self.selectAvatarId == id then
+		if self.selectAvatarId == id then
-            return
+			return
-        end
+		end
-        if DataManager.PlayerData:isNewAvatar(id) then
+		if DataManager.PlayerData:isNewAvatar(id) then
-            DataManager.PlayerData:setNewAvatarStatus(id, false)
+			DataManager.PlayerData:setNewAvatarStatus(id, false)
-        end
+		end
-        self.selectAvatarId = id
+		self.selectAvatarId = id
-        self.scrollRectCompAvatar:updateAllCell()
+		self.scrollRectCompAvatar:updateAllCell()
-        self:refreshDesc()
+		self:refreshDesc()
-        self:refreshAvatarAndFrame()
+		self:refreshAvatarAndFrame()
-    end)
+	end)
-    self:addEventListener(EventManager.CUSTOM_EVENT.PLAYER_INFO_CLICK_FRAME, function(id)
+	self:addEventListener(EventManager.CUSTOM_EVENT.PLAYER_INFO_CLICK_FRAME, function(id)
-        if self.selectFrameId == id then
+		if self.selectFrameId == id then
-            return
+			return
-        end
+		end
-        if DataManager.PlayerData:isNewFrame(id) then
+		if DataManager.PlayerData:isNewFrame(id) then
-            DataManager.PlayerData:setNewFrameStatus(id, false)
+			DataManager.PlayerData:setNewFrameStatus(id, false)
-        end
+		end
-        self.selectFrameId = id
+		self.selectFrameId = id
-        self.scrollRectCompFrame:updateAllCell()
+		self.scrollRectCompFrame:updateAllCell()
-        self:refreshDesc()
+		self:refreshDesc()
-        self:refreshAvatarAndFrame()
+		self:refreshAvatarAndFrame()
-    end)
+	end)
-    self:bind(DataManager.PlayerData, "dirty", function()
+	self:bind(DataManager.PlayerData, "dirty", function()
 		self:onRefresh()
 	end)
 end
 
 function PlayerInfoUI:onRefresh()
 	self:refreshScrollrect()
-    self:refreshAvatarAndFrame()
+	self:refreshAvatarAndFrame()
 
-    self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.PLAYER_INFO))
+	self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.PLAYER_INFO))
-    local lv = DataManager.PlayerData:getLv()
+	local lv = DataManager.PlayerData:getLv()
-    local exp = DataManager.PlayerData:getExpPercent()
+	local exp = DataManager.PlayerData:getExpPercent()
-    self.txLevel:setText(GConst.INT_TO_STRING[lv] or tostring(lv))
+	self.txLevel:setText(GConst.INT_TO_STRING[lv] or tostring(lv))
-    self.expProg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = exp
+	self.expProg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = exp
-    self.txName:setText(DataManager.PlayerData:getNickname())
+	self.txName:setText(DataManager.PlayerData:getNickname())
-    self.txAvatar:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_DESC))
+	self.txAvatar:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_DESC))
-    self.txAvatarS:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_DESC))
+	self.txAvatarS:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_DESC))
-    self.txFrame:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_FRAME_DESC))
+	self.txFrame:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_FRAME_DESC))
-    self.txFrameS:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_FRAME_DESC))
+	self.txFrameS:setText(I18N:getGlobalText(I18N.GlobalConst.AVATAR_HEAD_FRAME_DESC))
 
-    -- 红点
+	-- 红点
-    if DataManager.PlayerData:hasNewAvatar() then
+	if DataManager.PlayerData:hasNewAvatar() then
-        self.tagAvatar:addRedPoint(120, 20, 1)
+		self.tagAvatar:addRedPoint(120, 20, 1)
-    else
+	else
-        self.tagAvatar:removeRedPoint()
+		self.tagAvatar:removeRedPoint()
-    end
+	end
-    if DataManager.PlayerData:hasNewFrame() then
+	if DataManager.PlayerData:hasNewFrame() then
-        self.tagFrame:addRedPoint(120, 20, 1)
+		self.tagFrame:addRedPoint(120, 20, 1)
-    else
+	else
-        self.tagFrame:removeRedPoint()
+		self.tagFrame:removeRedPoint()
-    end
+	end
 end
 
 function PlayerInfoUI:refreshScrollrect(selectTag)
-    if selectTag ~= nil then
+	if selectTag ~= nil then
-        self.curTag = selectTag
+		self.curTag = selectTag
-    end
+	end
 
-    if self.curTag == TAG.AVATAR then
+	if self.curTag == TAG.AVATAR then
-        self:showAvatar()
+		self:showAvatar()
-    elseif self.curTag == TAG.FRAME then
+	elseif self.curTag == TAG.FRAME then
-        self:showFrame()
+		self:showFrame()
-    end
+	end
 end
 
 -- 显示头像列表
 function PlayerInfoUI:showAvatar()
-    self.ids = DataManager.PlayerData:getShowAvatarIds()
+	self.ids = DataManager.PlayerData:getShowAvatarIds()
 
-    self.selectAvatar:setActive(true)
+	self.selectAvatar:setActive(true)
-    self.scrollrectAvatar:setActive(true)
+	self.scrollrectAvatar:setActive(true)
-    self.selectFrame:setActive(false)
+	self.selectFrame:setActive(false)
-    self.scrollrectFrame:setActive(false)
+	self.scrollrectFrame:setActive(false)
 
-    if self.scrollRectCompAvatar == nil then
+	if self.scrollRectCompAvatar == nil then
-        self.scrollRectCompAvatar = self.scrollrectAvatar:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+		self.scrollRectCompAvatar = self.scrollrectAvatar:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
-        self.scrollRectCompAvatar:addInitCallback(function()
+		self.scrollRectCompAvatar:addInitCallback(function()
-            return "app/ui/player_info/avatar_cell"
+			return "app/ui/player_info/avatar_cell"
-        end)
+		end)
-        self.scrollRectCompAvatar:addRefreshCallback(function(index, cell)
+		self.scrollRectCompAvatar:addRefreshCallback(function(index, cell)
-            cell:refresh(self.ids[index], self.ids[index] == self.selectAvatarId)
+			cell:refresh(self.ids[index], self.ids[index] == self.selectAvatarId)
-        end)
+		end)
-        self.scrollRectCompAvatar:clearCells()
+		self.scrollRectCompAvatar:clearCells()
-        self.scrollRectCompAvatar:refillCells(#self.ids)
+		self.scrollRectCompAvatar:refillCells(#self.ids)
-    else
+	else
-        self.scrollRectCompAvatar:updateAllCell()
+		self.scrollRectCompAvatar:updateAllCell()
-    end
+	end
 
-    self:refreshDesc()
+	self:refreshDesc()
 end
 
 -- 显示框列表
 function PlayerInfoUI:showFrame()
-    self.ids = DataManager.PlayerData:getShowFrameIds()
+	self.ids = DataManager.PlayerData:getShowFrameIds()
 
-    self.selectAvatar:setActive(false)
+	self.selectAvatar:setActive(false)
-    self.scrollrectAvatar:setActive(false)
+	self.scrollrectAvatar:setActive(false)
-    self.selectFrame:setActive(true)
+	self.selectFrame:setActive(true)
-    self.scrollrectFrame:setActive(true)
+	self.scrollrectFrame:setActive(true)
 
-    if self.scrollRectCompFrame == nil then
+	if self.scrollRectCompFrame == nil then
-        self.scrollRectCompFrame = self.scrollrectFrame:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+		self.scrollRectCompFrame = self.scrollrectFrame:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
-        self.scrollRectCompFrame:addInitCallback(function()
+		self.scrollRectCompFrame:addInitCallback(function()
-            return "app/ui/player_info/frame_cell"
+			return "app/ui/player_info/frame_cell"
-        end)
+		end)
-        self.scrollRectCompFrame:addRefreshCallback(function(index, cell)
+		self.scrollRectCompFrame:addRefreshCallback(function(index, cell)
-            cell:refresh(self.ids[index], self.ids[index] == self.selectFrameId)
+			cell:refresh(self.ids[index], self.ids[index] == self.selectFrameId)
-        end)
+		end)
-        self.scrollRectCompFrame:clearCells()
+		self.scrollRectCompFrame:clearCells()
-        self.scrollRectCompFrame:refillCells(#self.ids)
+		self.scrollRectCompFrame:refillCells(#self.ids)
-    else
+	else
-        self.scrollRectCompFrame:updateAllCell()
+		self.scrollRectCompFrame:updateAllCell()
-    end
+	end
 
-    self:refreshDesc()
+	self:refreshDesc()
 end
 
 -- 刷新头像和头像框
 function PlayerInfoUI:refreshAvatarAndFrame()
-    local smallFrame = DataManager.PlayerData:getAvatarBg(self.selectAvatarId)
+	-- local smallFrame = DataManager.PlayerData:getAvatarBg(self.selectAvatarId)
-    if smallFrame then
+	-- if smallFrame then
-        self.bgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame)
+	-- 	self.bgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame)
-    end
+	-- end
-    local avatarName = DataManager.PlayerData:getAvatarIconId(self.selectAvatarId)
+	local avatarName = DataManager.PlayerData:getAvatarIconId(self.selectAvatarId)
-    if avatarName then
+	if avatarName then
-        self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, avatarName)
+		self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, avatarName)
-    end
+	end
-    local frameName = DataManager.PlayerData:getFrameIconId(self.selectFrameId)
+	local frameName = DataManager.PlayerData:getFrameIconId(self.selectFrameId)
-    if frameName then
+	if frameName then
-        self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, frameName)
+		self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, frameName)
-    end
+	end
 end
 
 -- 刷新描述
 function PlayerInfoUI:refreshDesc()
-    if self.curTag == TAG.AVATAR then
+	if self.curTag == TAG.AVATAR then
-        self.txDesc:setText(DataManager.PlayerData:getAvatarDesc(self.selectAvatarId))
+		self.txDesc:setText(DataManager.PlayerData:getAvatarDesc(self.selectAvatarId))
-        if DataManager.PlayerData:isAvatarUnlock(self.selectAvatarId) and DataManager.PlayerData:getUsingAvatarId() ~= self.selectAvatarId then
+		if DataManager.PlayerData:isAvatarUnlock(self.selectAvatarId) and DataManager.PlayerData:getUsingAvatarId() ~= self.selectAvatarId then
-            -- 已解锁，未使用
+			-- 已解锁，未使用
-            self.btnUse:setTouchEnable(true)
+			self.btnUse:setTouchEnable(true)
-            self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1")
+			self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_3")
-            self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_8))
+			self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_8))
-        else
+		else
-            self.btnUse:setTouchEnable(false)
+			self.btnUse:setTouchEnable(false)
-            self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
+			self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_3")
-            if DataManager.PlayerData:getUsingAvatarId() == self.selectAvatarId then
+			if DataManager.PlayerData:getUsingAvatarId() == self.selectAvatarId then
-                -- 已解锁，已使用
+				-- 已解锁，已使用
-                self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.ON_USING_DESC))
+				self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.ON_USING_DESC))
-            else
+			else
-                -- 未解锁
+				-- 未解锁
-                self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_7))
+				self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_7))
-            end
+			end
-        end
+		end
-    elseif self.curTag == TAG.FRAME then
+	elseif self.curTag == TAG.FRAME then
-        self.txDesc:setText(DataManager.PlayerData:getFrameDesc(self.selectFrameId))
+		self.txDesc:setText(DataManager.PlayerData:getFrameDesc(self.selectFrameId))
-        if DataManager.PlayerData:isFrameUnlock(self.selectFrameId) and DataManager.PlayerData:getUsingFrameId() ~= self.selectFrameId then
+		if DataManager.PlayerData:isFrameUnlock(self.selectFrameId) and DataManager.PlayerData:getUsingFrameId() ~= self.selectFrameId then
-            -- 已解锁，未使用
+			-- 已解锁，未使用
-            self.btnUse:setTouchEnable(true)
+			self.btnUse:setTouchEnable(true)
-            self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1")
+			self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_3")
-            self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_8))
+			self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_8))
-        else
+		else
-            self.btnUse:setTouchEnable(false)
+			self.btnUse:setTouchEnable(false)
-            self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
+			self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_3")
-            if DataManager.PlayerData:getUsingFrameId() == self.selectFrameId then
+			if DataManager.PlayerData:getUsingFrameId() == self.selectFrameId then
-                -- 已解锁，已使用
+				-- 已解锁，已使用
-                self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.ON_USING_DESC))
+				self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.ON_USING_DESC))
-            else
+			else
-                -- 未解锁
+				-- 未解锁
-                self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_7))
+				self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_7))
-            end
+			end
-        end
+		end
-    end
+	end
 end
 
 return PlayerInfoUI

lua/app/ui/player_info/rename_ui.lua

@@ -23,7 +23,7 @@ end
 function RenameUI:onLoadRootComplete()
     self.uiMap = self.root:genAllChildren()
 
-    self.txTitle = self.uiMap["rename_ui.bg.title.tx_title"]
+    self.txTitle = self.uiMap["rename_ui.bg.tx_title"]
     self.txDesc = self.uiMap["rename_ui.bg.tx_desc"]
     self.input = self.uiMap["rename_ui.bg.input"]
     self.txTips = self.uiMap["rename_ui.bg.group.tx_tips"]

lua/app/ui/summon/summon_main_ui.lua

@@ -125,7 +125,6 @@ function SummonMainUI:onLoadRootComplete()
 	uiMap["summon_main_ui.node.skip_node.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_TURNTABLE_DESC_5))
 	self.descBg = uiMap["summon_main_ui.node.desc_bg"]
 	self.descTx = uiMap["summon_main_ui.node.desc_bg.desc_tx"]
-	self.descBg:setActive(false)
 	self.skipNode = uiMap["summon_main_ui.node.skip_node"]
 	self.skipNodeCheck = uiMap["summon_main_ui.node.skip_node.check"]
 	self.skipNodeSelect = uiMap["summon_main_ui.node.skip_node.check.select"]
@@ -237,7 +236,7 @@ end
 --刷新
 function SummonMainUI:onRefresh()
 	self:refreshSummonBtn()
-	-- self:refreshWishBtn()
+	self:refreshSummonDesc()
 	-- self:refreshBtnRedPoint()
 	-- self:refreshPageBtn()
 	self:updateTime()
@@ -301,16 +300,18 @@ function SummonMainUI:refreshSummonBtn()
 	end
 end
 
+function SummonMainUI:refreshSummonDesc()
+	local guarantee1 = DataManager.SummonData:getSummonConfig(self.page).guarantee1
+	if not guarantee1 then
+		self.descBg:setActive(false)
+	else
+		self.descBg:setActive(true)
+		local count = guarantee1 - DataManager.SummonData:getSummonTriggerCount(self.page)
+		self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_FORCE_4, count))
+	end
+end
 --刷新心愿按钮
 -- function SummonMainUI:refreshWishBtn()
--- 	local guarantee1 = DataManager.SummonData:getSummonConfig(self.page).guarantee1
--- 	if not guarantee1 then
--- 		self.descBg:setActive(false)
--- 	else
--- 		self.descBg:setActive(true)
--- 		local count = guarantee1 - DataManager.SummonData:getSummonTriggerCount(self.page)
--- 		self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_FORCE_4, count))
--- 	end
 -- 	local love = DataManager.SummonData:getSummonWishConfig(self.page)
 -- 	if not love then
 -- 		self.btnWish:setActive(false)

lua/app/userdata/talent/talent_data.lua

@@ -30,6 +30,13 @@ end
 function TalentData:clear()
 end
 
+function TalentData:getIsOpen()
+	if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TALENT_OPEN) then
+		return true
+	end
+	return false
+end
+
 function TalentData:getCfgList()
 	return TalentCfg
 end