config

lua/app/config/chapter_board.lua

@@ -8031,23 +8031,23 @@ local chapter_board = {
 				0
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
@@ -8229,23 +8229,23 @@ local chapter_board = {
 				0
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{
-				9,
+				0,
 				2
 			},
 			{

lua/app/config/func_open.lua

@@ -61,6 +61,10 @@ local func_open = {
 		["time"]=3,
 		["pop_ups"]=1
 	},
+	["ad"]={
+		["stage"]=2,
+		["pop_ups"]=1
+	},
 	["card_ad"]={
 		["stage"]=5,
 		["pop_ups"]=1
@@ -69,6 +73,10 @@ local func_open = {
 		["stage"]=2,
 		["pop_ups"]=1
 	},
+	["speed_btn"]={
+		["stage"]=2,
+		["pop_ups"]=1
+	},
 	["act_sevenday"]={
 		["stage"]=3,
 		["pop_ups"]=1
@@ -107,6 +115,6 @@ local func_open = {
 	}
 }
 local config = {
-data=func_open,count=26
+data=func_open,count=28
 }
 return config

lua/app/config/skill.lua

@@ -12731,7 +12731,7 @@ local skill = {
 		["fx_self"]=500003
 	},
 	[30004]={
-		["battle_icon"]="45002",
+		["battle_icon"]="m30001_1",
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={

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

@@ -342,15 +342,15 @@ local buff = {
 		["tips_desc"]="反伤：反弹{0}对方伤害，怪物特性不可被移除。",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="亢奋",
 		["desc"]="亢奋：普攻次数+{0}。",
 		["tips_desc"]="亢奋：普攻次数增加。",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["show_name"]="概率免控",
 		["desc"]="免控：50%概率免疫所有控制",
 		["tips_desc"]="免控：50%概率免疫所有控制。",
@@ -418,8 +418,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -3,46 +3,46 @@ local tutorial = {
 		["value"]="选择技能，继续战斗"
 	},
 	["tutorial_txt_2"]={
-		["value"]="领取宝箱，解锁新英雄"
+		["value"]="领取宝箱，解锁<color=#cd5700>新英雄</color>"
 	},
 	["tutorial_txt_3"]={
-		["value"]="消耗饮料提升英雄等级"
+		["value"]="消耗<color=#cd5700>饮料</color>提升英雄等级"
 	},
 	["tutorial_txt_4"]={
-		["value"]="回到主线继续吧！"
+		["value"]="回到<color=#cd5700>主线</color>继续吧！"
 	},
 	["tutorial_txt_5"]={
-		["value"]="公司的研发中心开启了！"
+		["value"]="公司的<color=#cd5700>研发中心</color>开启了！"
 	},
 	["tutorial_txt_6"]={
-		["value"]="研发中心可以获得不同品质的科技卡片，为团队提供额外效果。"
+		["value"]="研发中心可以获得不同品质的<color=#cd5700>科技卡片</color>，为团队<color=#cd5700>提供额外效果</color>。"
 	},
 	["tutorial_txt_7"]={
-		["value"]="英雄装备功能开启了"
+		["value"]="<color=#cd5700>英雄装备</color>功能开启了"
 	},
 	["tutorial_txt_8"]={
-		["value"]="穿戴的装备将绑定在上阵位置上，更换英雄上阵不会变化。"
+		["value"]="穿戴的<color=#cd5700>装备将</color>绑定在上阵位置上，更换英雄上阵不会变化。"
 	},
 	["tutorial_txt_9"]={
-		["value"]="想要更多更好的装备，除了主线还有每日挑战。"
+		["value"]="想要更多更好的装备，除了主线还有<color=#cd5700>每日挑战</color>。"
 	},
 	["tutorial_txt_10"]={
-		["value"]="挑战任务完成可以获得更高品质的装备。点击查看。"
+		["value"]="挑战任务完成可以获得<color=#cd5700>更高品质</color>的装备。点击查看。"
 	},
 	["tutorial_txt_11"]={
-		["value"]="欢迎来到竞技场，请点击匹配。"
+		["value"]="欢迎来到<color=#cd5700>竞技场</color>，请点击匹配。"
 	},
 	["tutorial_txt_12"]={
 		["value"]="对手不强，让我们直接开始。"
 	},
 	["tutorial_txt_13"]={
-		["value"]="请点击这里查看对战规则。"
+		["value"]="请点击这里查看<color=#cd5700>对战规则</color>。"
 	},
 	["tutorial_txt_14"]={
-		["value"]="英雄召唤功能开启了，可以召唤额外英雄。"
+		["value"]="<color=#cd5700>英雄召唤</color>功能开启了，可以召唤额外英雄。"
 	},
 	["tutorial_txt_15"]={
-		["value"]="每天都有1次免费召唤。"
+		["value"]="每天都有<color=#cd5700>1次免费召唤</color>。"
 	}
 }
 local config = {

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

@@ -207,12 +207,12 @@ local buff = {
 		["id"]=97,
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -274,8 +274,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="Damage Counter: Reflects {0} of the enemy's damage. Monster buff cannot be removed.",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="Rage",
 		["desc"]="Rage: Normal attack +<color=#3cff28>{0}</color>.",
 		["tips_desc"]="Rage: More normal attacks.",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="Select skills to continue battle"
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="Claim chest to unlock new hero"
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="Welcome to the Arena. Please click matchmaking."
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="The opponent is not strong. Let's start."
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="Please click here to view the battle rules."
+
 	},
 	["tutorial_txt_14"]={
 

lua/app/config/strings/es/buff.lua

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="Daño Reflexivo: refleja {0} de daño del oponente. Los atributos de monstruos no pueden ser removidos.",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="Excitado",
 		["desc"]="Excitado: número de ataques comunes + <color=#3cff28>{0}</color>.",
 		["tips_desc"]="Excitado: aumenta el número de ATQ común.",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="Elige una habilidad y sigue luchando."
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="Colecta el cofre y desbloquea nuevos héroes"
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="¡Bienvenido(a) a la Arena! Haz clic para emparejar."
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="El oponente no es fuerte. Empecemos."
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="Haz clic aquí para ver las reglas del juego."
+
 	},
 	["tutorial_txt_14"]={
 

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

@@ -207,12 +207,12 @@ local buff = {
 		["id"]=97,
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -274,8 +274,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="DMG Balik: Memantulkan {0} dari kerusakan musuh. Monster buff tidak dapat dihilangkan.",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="Excited",
 		["desc"]="Excited: ATK Normal +<color=#3cff28>{0}</color>.",
 		["tips_desc"]="Excited: Jumlah ATK Normal bertambah.",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="Pilih skill untuk melanjutkan battle"
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="Klaim peti untuk membuka hero baru"
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="Selamat datang di Arena. Silakan ketuk matchmaking."
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="Lawannya tidak kuat. Mari kita mulai."
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="Silakan ketuk di sini untuk melihat aturan battle."
+
 	},
 	["tutorial_txt_14"]={
 

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="反射：{0}のダメージを反射する。モンスターの特性は削除できない。",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="興奮",
 		["desc"]="興奮：通常攻撃の回数が<color=#3cff28>+{0}</color>。",
 		["tips_desc"]="興奮：通常攻撃の回数が増加する。",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="スキルを選択して、バトルを続けよう"
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="宝箱を受取って、新ヒーローを解放しよう"
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="闘技場へようこそ。マッチングをタップしてください。"
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="相手は弱いので、さっそく始めましょう。"
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="ここをタップして、対戦ルールを確認してください。"
+
 	},
 	["tutorial_txt_14"]={
 

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="피해 반사: 상대의 대미지를 반사하며 몬스터 특성은 제거될 수 없습니다.",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="과열 상태",
 		["desc"]="과열 상태: 일반 공격 횟수+<color=#3cff28>{0}</color>",
 		["tips_desc"]="과열 상태: 일반 공격 횟수가 증가합니다.",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="스킬을 선택하고 전투를 계속해 주세요."
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="보물 상자를 획득하고 새로운 영웅을 잠금 해제하세요."
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="아레나에 오신 것을 환영합니다. 클릭하여 매칭하세요."
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="강한 상대가 아닙니다. 바로 시작해 볼까요?"
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="대결 규칙을 보려면 이곳을 클릭해 주세요."
+
 	},
 	["tutorial_txt_14"]={
 

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="Reflexão: reflete {0} do dano do oponente. O atributo do monstro não pode ser removido.",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="Excitado",
 		["desc"]="Excitado: número de golpes comuns + <color=#3cff28>{0}</color>.",
 		["tips_desc"]="Excitação: aumenta o número de ataques básicos.",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="Selecione uma habilidade e continue o combate."
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="Colete o baú para desbloquear novos heróis."
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="Bem-vindo(a) à Arena! Clique em pareamento."
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="O oponente não é muito forte. Vamos começar diretamente."
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="Confira as regras de batalha aqui."
+
 	},
 	["tutorial_txt_14"]={
 

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

@@ -207,12 +207,12 @@ local buff = {
 		["id"]=97,
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -274,8 +274,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="สะท้อนดาเมจ: สะท้อนดาเมจ{0}ของฝ่ายตรงข้าม และคุณสมบัติเฉพาะมอนสเตอร์ไม่สามารถถูกลบได้",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="ตื่นเต้น",
 		["desc"]="ตื่นเต้น:จำนวนโจมตีทั่วไป+<color=#3cff28>{0}</color>",
 		["tips_desc"]="ตื่นเต้น: จำนวนโจมตีทั่วไปเพิ่มขึ้น",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="เลือกสกิลและต่อสู้ต่อไป"
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="รับหีบและปลดล็อกฮีโร่ใหม่"
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="ยินดีต้อนรับสู่อารีน่า แตะเพื่อจับคู่"
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="คู่ต่อสู้ไม่แข็งแกร่ง เริ่มโดยตรงกันเถอะ"
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="กรุณาแตะที่นี่เพื่อดูกติกาของเกม"
+
 	},
 	["tutorial_txt_14"]={
 

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="Phản ST: Phản đòn {0} sát thương lên đối phương, đặc tính Quái không thể bị xóa đi.",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="Phấn Khởi",
 		["desc"]="Phấn Khởi: Lượt đánh thường +<color=#3cff28>{0}</color>.",
 		["tips_desc"]="Phấn Khởi: Tăng lượt đánh thường.",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="Chọn kỹ năng, chiến đấu tiếp"
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="Nhận rương, mở khóa Anh Hùng mới"
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="Chào mừng đến đấu trường, hãy ấn ghép đối thủ."
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="Đối thủ không mạnh, trực tiếp bắt đầu."
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="Hãy ấn vào đây xem quy tắc."
+
 	},
 	["tutorial_txt_14"]={
 

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

@@ -336,15 +336,15 @@ local buff = {
 		["tips_desc"]="反傷：反彈{0}對方傷害，怪物特性不可被移除。",
 		["name"]="forever_thorns"
 	},
-	[98]={
+	[103]={
-		["id"]=98,
+		["id"]=103,
 		["show_name"]="亢奮",
 		["desc"]="亢奮：普攻次數+<color=#3cff28>{0}</color>。",
 		["tips_desc"]="亢奮：普攻次數增加。",
 		["name"]="forever_normal_attack_add"
 	},
-	[99]={
+	[104]={
-		["id"]=99,
+		["id"]=104,
 		["name"]="forever_uncontrolled"
 	},
 	[105]={
@@ -406,8 +406,8 @@ local keys = {
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
 		["forever_thorns"]=buff[97],
-		["forever_normal_attack_add"]=buff[98],
+		["forever_normal_attack_add"]=buff[103],
-		["forever_uncontrolled"]=buff[99],
+		["forever_uncontrolled"]=buff[104],
 		["attr_normal_hurtp_all_add"]=buff[105]
 	}
 }

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

@@ -1,9 +1,9 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="選擇技能，繼續戰鬥"
+
 	},
 	["tutorial_txt_2"]={
-		["value"]="領取寶箱，解鎖新英雄"
+
 	},
 	["tutorial_txt_3"]={
 
@@ -30,13 +30,13 @@ local tutorial = {
 
 	},
 	["tutorial_txt_11"]={
-		["value"]="歡迎來到競技場，請點擊匹配。"
+
 	},
 	["tutorial_txt_12"]={
-		["value"]="對手不強，讓我們直接開始。"
+
 	},
 	["tutorial_txt_13"]={
-		["value"]="請點擊這裡查看對戰規則。"
+
 	},
 	["tutorial_txt_14"]={
 

lua/app/config/tutorial.lua

@@ -204,10 +204,11 @@ local tutorial = {
 		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			40
 		}
 	},
 	[20090]={
+		["next_id"]=20100,
 		["type"]=3,
 		["txt"]="tutorial_txt_4",
 		["txt_offset"]={
@@ -218,7 +219,7 @@ local tutorial = {
 		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			40
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -230,6 +231,15 @@ local tutorial = {
 			0
 		}
 	},
+	[20100]={
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/fight_btn",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-40
+		}
+	},
 	[30000]={
 		["next_id"]=30010,
 		["type"]=3,
@@ -241,6 +251,15 @@ local tutorial = {
 		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_4",
 		["arrow_direction"]=2,
 		["arrow_offset"]={
+			0,
+			50
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
 			0,
 			0
 		}
@@ -249,8 +268,16 @@ local tutorial = {
 		["next_id"]=30020,
 		["type"]=2,
 		["target_name"]="main_ui(Clone)/sub_ui_node/company_comp/talent_btn",
-		["arrow_direction"]=1,
+		["arrow_direction"]=2,
 		["arrow_offset"]={
+			0,
+			50
+		},
+		["square_size"]={
+			50,
+			100
+		},
+		["square_offset"]={
 			0,
 			0
 		}
@@ -260,13 +287,13 @@ local tutorial = {
 		["txt"]="tutorial_txt_6",
 		["txt_offset"]={
 			0,
-			0
+			145
 		},
 		["target_name"]="talent_ui(Clone)/get_btn",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -290,7 +317,7 @@ local tutorial = {
 		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -308,6 +335,15 @@ local tutorial = {
 		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
+			0,
+			-100
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			25,
+			50
+		},
+		["square_offset"]={
 			0,
 			0
 		}
@@ -318,13 +354,19 @@ local tutorial = {
 		["target_name"]="hero_detail_ui(Clone)/bottom/btns/page_btn_3",
 		["arrow_direction"]=2,
 		["arrow_offset"]={
+			0,
+			50
+		},
+		["show_mask"]=2,
+		["circle_r"]=100,
+		["circle_offset"]={
 			0,
 			0
 		}
 	},
 	[40030]={
 		["next_id"]=40040,
-		["type"]=2,
+		["type"]=3,
 		["txt"]="tutorial_txt_8",
 		["txt_offset"]={
 			0,
@@ -334,7 +376,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		}
 	},
 	[40040]={
@@ -346,12 +388,22 @@ local tutorial = {
 			0,
 			0
 		},
-		["target_name"]="hero_detail_ui(Clone)/bottom/close_btn"
+		["target_name"]="hero_detail_ui(Clone)/bottom/close_btn",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			40
+		}
 	},
 	[40050]={
 		["next_id"]=40060,
 		["type"]=2,
-		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3"
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			40
+		}
 	},
 	[40060]={
 		["next_id"]=40070,
@@ -364,11 +416,6 @@ local tutorial = {
 		}
 	},
 	[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",
@@ -376,10 +423,10 @@ local tutorial = {
 			0,
 			180
 		},
-		["target_name"]="rewards_tips(Clone)/bg/reward2_node/reward_layout/reward_cell_1",
+		["target_name"]="daily_challenge_task_ui(Clone)/bg/task_cell_1/reward_cell_1",
-		["arrow_direction"]=4,
+		["arrow_direction"]=3,
 		["arrow_offset"]={
-			20,
+			-20,
 			0
 		},
 		["show_mask"]=2,
@@ -393,10 +440,10 @@ local tutorial = {
 		["next_id"]=50010,
 		["type"]=2,
 		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/arena_btn",
-		["arrow_direction"]=4,
+		["arrow_direction"]=1,
 		["arrow_offset"]={
-			20,
+			0,
-			0
+			-50
 		},
 		["show_mask"]=2,
 		["circle_r"]=100,
@@ -411,7 +458,7 @@ local tutorial = {
 		["txt"]="tutorial_txt_11",
 		["txt_offset"]={
 			0,
-			200
+			250
 		},
 		["target_name"]="arena_ui(Clone)/fight_btn",
 		["arrow_direction"]=1,
@@ -448,7 +495,7 @@ local tutorial = {
 		["txt"]="tutorial_txt_13",
 		["txt_offset"]={
 			0,
-			880
+			680
 		},
 		["target_name"]="battle_ui_pvp(Clone)/top_node/close_btn",
 		["arrow_direction"]=1,
@@ -501,10 +548,10 @@ local tutorial = {
 			0
 		},
 		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right_btn",
-		["arrow_direction"]=1,
+		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			40
 		},
 		["show_mask"]=2,
 		["circle_r"]=100,
@@ -518,13 +565,13 @@ local tutorial = {
 		["txt"]="tutorial_txt_15",
 		["txt_offset"]={
 			0,
-			0
+			-190
 		},
 		["target_name"]="summon_main_ui(Clone)/node/btn_summon_free",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		}
 	}
 }