From 1f44d96a3261c53ffc39b9f1150fd48ba09d4a38 Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Sun, 23 Apr 2023 17:30:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/config/fx.lua                         |  42 +-
 lua/app/config/hero.lua                       | 448 +++++++++---------
 .../localization_global_const.lua             |   1 +
 lua/app/config/monster_base.lua               |  90 ++--
 lua/app/config/skill.lua                      | 260 +++++-----
 lua/app/config/strings/cn/global.lua          |   1 +
 lua/app/config/tutorial.lua                   |   2 +-
 7 files changed, 476 insertions(+), 368 deletions(-)

diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua
index a5854afa..b1d0f3bb 100644
--- a/lua/app/config/fx.lua
+++ b/lua/app/config/fx.lua
@@ -1,4 +1,44 @@
 local fx = {
+	[1]={
+		["res"]="sfx_common_hit_hong_b01",
+		["bind"]="root"
+	},
+	[2]={
+		["res"]="sfx_common_hit_hong_b02",
+		["bind"]="root"
+	},
+	[3]={
+		["res"]="sfx_common_hit_jin_b01",
+		["bind"]="root"
+	},
+	[4]={
+		["res"]="sfx_common_hit_jin_b02",
+		["bind"]="root"
+	},
+	[5]={
+		["res"]="sfx_common_hit_lv_b01",
+		["bind"]="root"
+	},
+	[6]={
+		["res"]="sfx_common_hit_lv_b02",
+		["bind"]="root"
+	},
+	[7]={
+		["res"]="sfx_common_hit_lan_b01",
+		["bind"]="root"
+	},
+	[8]={
+		["res"]="sfx_common_hit_lan_b02",
+		["bind"]="root"
+	},
+	[9]={
+		["res"]="sfx_common_hit_zi_b01",
+		["bind"]="root"
+	},
+	[10]={
+		["res"]="sfx_common_hit_zi_b02",
+		["bind"]="root"
+	},
 	[100000]={
 		["res"]="sfx_m10001_b01",
 		["bind"]="root"
@@ -369,6 +409,6 @@ local fx = {
 	}
 }
 local config = {
-data=fx,count=92
+data=fx,count=102
 }
 return config
\ No newline at end of file
diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua
index 67d10390..8869da6e 100644
--- a/lua/app/config/hero.lua
+++ b/lua/app/config/hero.lua
@@ -18,37 +18,37 @@ local hero = {
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
-			2240000,
-			2480000,
-			2740000,
-			3000000,
-			3280000,
-			3580000,
-			3900000,
-			4260000,
-			4660000,
-			5100000,
-			5580000,
-			6120000,
-			6720000,
-			7400000
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
 		},
 		["atk"]={
 			1000000,
-			1120000,
-			1240000,
-			1370000,
-			1500000,
-			1640000,
-			1790000,
-			1950000,
-			2130000,
-			2330000,
-			2550000,
-			2790000,
-			3060000,
-			3360000,
-			3700000
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
 		},
 		["model_id"]="p0005",
 		["icon"]="5",
@@ -74,37 +74,37 @@ local hero = {
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
-			2240000,
-			2480000,
-			2740000,
-			3000000,
-			3280000,
-			3580000,
-			3900000,
-			4260000,
-			4660000,
-			5100000,
-			5580000,
-			6120000,
-			6720000,
-			7400000
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
 		},
 		["atk"]={
 			1000000,
-			1120000,
-			1240000,
-			1370000,
-			1500000,
-			1640000,
-			1790000,
-			1950000,
-			2130000,
-			2330000,
-			2550000,
-			2790000,
-			3060000,
-			3360000,
-			3700000
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
 		},
 		["model_id"]="p0002",
 		["icon"]="2",
@@ -130,37 +130,37 @@ local hero = {
 		["begin_lv"]=3,
 		["hp"]={
 			3000000,
-			3320000,
-			3640000,
-			3980000,
-			4320000,
-			4680000,
-			5080000,
-			5500000,
-			5960000,
-			6480000,
-			7060000,
-			7680000,
-			8380000,
-			9160000,
-			10040000
+			3520000,
+			4040000,
+			4580000,
+			5160000,
+			5760000,
+			6420000,
+			7120000,
+			7900000,
+			8760000,
+			9700000,
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
 			1500000,
-			1660000,
-			1820000,
-			1990000,
-			2160000,
-			2340000,
-			2540000,
-			2750000,
-			2980000,
-			3240000,
-			3530000,
-			3840000,
-			4190000,
-			4580000,
-			5020000
+			1760000,
+			2020000,
+			2290000,
+			2580000,
+			2880000,
+			3210000,
+			3560000,
+			3950000,
+			4380000,
+			4850000,
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0007",
 		["icon"]="7",
@@ -186,37 +186,37 @@ local hero = {
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
-			2240000,
-			2480000,
-			2740000,
-			3000000,
-			3280000,
-			3580000,
-			3900000,
-			4260000,
-			4660000,
-			5100000,
-			5580000,
-			6120000,
-			6720000,
-			7400000
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
 		},
 		["atk"]={
 			1000000,
-			1120000,
-			1240000,
-			1370000,
-			1500000,
-			1640000,
-			1790000,
-			1950000,
-			2130000,
-			2330000,
-			2550000,
-			2790000,
-			3060000,
-			3360000,
-			3700000
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
 		},
 		["model_id"]="p0001",
 		["icon"]="1",
@@ -242,37 +242,37 @@ local hero = {
 		["begin_lv"]=3,
 		["hp"]={
 			3000000,
-			3320000,
-			3640000,
-			3980000,
-			4320000,
-			4680000,
-			5080000,
-			5500000,
-			5960000,
-			6480000,
-			7060000,
-			7680000,
-			8380000,
-			9160000,
-			10040000
+			3520000,
+			4040000,
+			4580000,
+			5160000,
+			5760000,
+			6420000,
+			7120000,
+			7900000,
+			8760000,
+			9700000,
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
 			1500000,
-			1660000,
-			1820000,
-			1990000,
-			2160000,
-			2340000,
-			2540000,
-			2750000,
-			2980000,
-			3240000,
-			3530000,
-			3840000,
-			4190000,
-			4580000,
-			5020000
+			1760000,
+			2020000,
+			2290000,
+			2580000,
+			2880000,
+			3210000,
+			3560000,
+			3950000,
+			4380000,
+			4850000,
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0006",
 		["icon"]="6",
@@ -298,37 +298,37 @@ local hero = {
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
-			2240000,
-			2480000,
-			2740000,
-			3000000,
-			3280000,
-			3580000,
-			3900000,
-			4260000,
-			4660000,
-			5100000,
-			5580000,
-			6120000,
-			6720000,
-			7400000
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
 		},
 		["atk"]={
 			1000000,
-			1120000,
-			1240000,
-			1370000,
-			1500000,
-			1640000,
-			1790000,
-			1950000,
-			2130000,
-			2330000,
-			2550000,
-			2790000,
-			3060000,
-			3360000,
-			3700000
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
 		},
 		["model_id"]="p0003",
 		["icon"]="3",
@@ -354,37 +354,37 @@ local hero = {
 		["begin_lv"]=3,
 		["hp"]={
 			3000000,
-			3320000,
-			3640000,
-			3980000,
-			4320000,
-			4680000,
-			5080000,
-			5500000,
-			5960000,
-			6480000,
-			7060000,
-			7680000,
-			8380000,
-			9160000,
-			10040000
+			3520000,
+			4040000,
+			4580000,
+			5160000,
+			5760000,
+			6420000,
+			7120000,
+			7900000,
+			8760000,
+			9700000,
+			10740000,
+			11920000,
+			13220000,
+			14700000
 		},
 		["atk"]={
 			1500000,
-			1660000,
-			1820000,
-			1990000,
-			2160000,
-			2340000,
-			2540000,
-			2750000,
-			2980000,
-			3240000,
-			3530000,
-			3840000,
-			4190000,
-			4580000,
-			5020000
+			1760000,
+			2020000,
+			2290000,
+			2580000,
+			2880000,
+			3210000,
+			3560000,
+			3950000,
+			4380000,
+			4850000,
+			5370000,
+			5960000,
+			6610000,
+			7350000
 		},
 		["model_id"]="p0008",
 		["icon"]="8",
@@ -410,37 +410,37 @@ local hero = {
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
-			2240000,
-			2480000,
-			2740000,
-			3000000,
-			3280000,
-			3580000,
-			3900000,
-			4260000,
-			4660000,
-			5100000,
-			5580000,
-			6120000,
-			6720000,
-			7400000
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
 		},
 		["atk"]={
 			1000000,
-			1120000,
-			1240000,
-			1370000,
-			1500000,
-			1640000,
-			1790000,
-			1950000,
-			2130000,
-			2330000,
-			2550000,
-			2790000,
-			3060000,
-			3360000,
-			3700000
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
 		},
 		["model_id"]="p0004",
 		["icon"]="4",
diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua
index a9ed8382..23f992d1 100644
--- a/lua/app/config/localization/localization_global_const.lua
+++ b/lua/app/config/localization/localization_global_const.lua
@@ -40,6 +40,7 @@ local LocalizationGlobalConst =
 	HERO_DESC_9 = "HERO_DESC_9",
 	HERO_DESC_10 = "HERO_DESC_10",
 	BATTLE_DESC_8 = "BATTLE_DESC_8",
+	MAIN_BTN_2 = "MAIN_BTN_2",
 }
 
 return LocalizationGlobalConst
\ No newline at end of file
diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua
index 19efabfc..28e08431 100644
--- a/lua/app/config/monster_base.lua
+++ b/lua/app/config/monster_base.lua
@@ -1,123 +1,153 @@
 local monster_base = {
 	[10001]={
 		["hurt_num"]=3,
-		["model_id"]="m10001"
+		["model_id"]="m10001",
+		["body"]=3
 	},
 	[10002]={
 		["hurt_num"]=3,
-		["model_id"]="m10002"
+		["model_id"]="m10002",
+		["body"]=3
 	},
 	[10003]={
 		["hurt_num"]=3,
-		["model_id"]="m10003"
+		["model_id"]="m10003",
+		["body"]=3
 	},
 	[10004]={
 		["hurt_num"]=3,
-		["model_id"]="m10004"
+		["model_id"]="m10004",
+		["body"]=3
 	},
 	[10005]={
 		["hurt_num"]=3,
-		["model_id"]="m10005"
+		["model_id"]="m10005",
+		["body"]=3
 	},
 	[10006]={
 		["hurt_num"]=3,
-		["model_id"]="m10006"
+		["model_id"]="m10006",
+		["body"]=3
 	},
 	[10007]={
 		["hurt_num"]=3,
-		["model_id"]="m10007"
+		["model_id"]="m10007",
+		["body"]=3
 	},
 	[10008]={
 		["hurt_num"]=3,
-		["model_id"]="m10008"
+		["model_id"]="m10008",
+		["body"]=3
 	},
 	[10009]={
 		["hurt_num"]=3,
-		["model_id"]="m10009"
+		["model_id"]="m10009",
+		["body"]=3
 	},
 	[10010]={
 		["hurt_num"]=3,
-		["model_id"]="m10010"
+		["model_id"]="m10010",
+		["body"]=2
 	},
 	[10011]={
 		["hurt_num"]=3,
-		["model_id"]="m10011"
+		["model_id"]="m10011",
+		["body"]=2
 	},
 	[10012]={
 		["hurt_num"]=3,
-		["model_id"]="m10012"
+		["model_id"]="m10012",
+		["body"]=2
 	},
 	[10013]={
 		["hurt_num"]=3,
-		["model_id"]="m10013"
+		["model_id"]="m10013",
+		["body"]=2
 	},
 	[10014]={
 		["hurt_num"]=3,
-		["model_id"]="m10014"
+		["model_id"]="m10014",
+		["body"]=2
 	},
 	[10015]={
 		["hurt_num"]=3,
-		["model_id"]="m10015"
+		["model_id"]="m10015",
+		["body"]=2
 	},
 	[10016]={
 		["hurt_num"]=3,
-		["model_id"]="m10016"
+		["model_id"]="m10016",
+		["body"]=2
 	},
 	[10017]={
 		["hurt_num"]=3,
-		["model_id"]="m10017"
+		["model_id"]="m10017",
+		["body"]=2
 	},
 	[10018]={
 		["hurt_num"]=3,
-		["model_id"]="m10018"
+		["model_id"]="m10018",
+		["body"]=2
 	},
 	[20001]={
 		["hurt_num"]=1,
-		["model_id"]="m20001"
+		["model_id"]="m20001",
+		["body"]=1
 	},
 	[20002]={
 		["hurt_num"]=1,
-		["model_id"]="m20002"
+		["model_id"]="m20002",
+		["body"]=1
 	},
 	[20003]={
 		["hurt_num"]=3,
-		["model_id"]="m20003"
+		["model_id"]="m20003",
+		["body"]=1
 	},
 	[20004]={
 		["hurt_num"]=3,
-		["model_id"]="m20004"
+		["model_id"]="m20004",
+		["body"]=1
 	},
 	[20005]={
 		["hurt_num"]=3,
-		["model_id"]="m20005"
+		["model_id"]="m20005",
+		["body"]=1
 	},
 	[20006]={
 		["hurt_num"]=3,
-		["model_id"]="m20006"
+		["model_id"]="m20006",
+		["body"]=1
 	},
 	[20007]={
 		["hurt_num"]=3,
-		["model_id"]="m20007"
+		["model_id"]="m20007",
+		["body"]=1
 	},
 	[20008]={
 		["hurt_num"]=3,
-		["model_id"]="m20008"
+		["model_id"]="m20008",
+		["body"]=1
 	},
 	[20009]={
 		["hurt_num"]=3,
-		["model_id"]="m20009"
+		["model_id"]="m20009",
+		["body"]=1
 	},
 	[20010]={
 		["hurt_num"]=3,
-		["model_id"]="m20010"
+		["model_id"]="m20010",
+		["body"]=1
 	},
 	[20011]={
 		["hurt_num"]=3,
-		["model_id"]="m20011"
+		["model_id"]="m20011",
+		["body"]=1
 	},
 	[20012]={
 		["hurt_num"]=3,
-		["model_id"]="m20012"
+		["model_id"]="m20012",
+		["body"]=1
 	}
 }
 local config = {
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index d24d7fb3..3fe57295 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -95,7 +95,8 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=2
 	},
 	[1200111]={
 		["position"]=1,
@@ -114,7 +115,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
-		["fx_self"]=300017
+		["fx_self"]=300017,
+		["fx_target"]=2
 	},
 	[1200112]={
 		["position"]=1,
@@ -133,7 +135,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
-		["fx_self"]=300018
+		["fx_self"]=300018,
+		["fx_target"]=2
 	},
 	[1200113]={
 		["position"]=1,
@@ -152,7 +155,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
-		["fx_self"]=300019
+		["fx_self"]=300019,
+		["fx_target"]=2
 	},
 	[1200114]={
 		["position"]=1,
@@ -171,7 +175,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack04",
-		["fx_self"]=300020
+		["fx_self"]=300020,
+		["fx_target"]=2
 	},
 	[1200120]={
 		["energy"]=10,
@@ -209,10 +214,11 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=4
 	},
 	[2200111]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -228,10 +234,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
-		["fx_self"]=300004
+		["fx_self"]=300004,
+		["fx_target"]=4
 	},
 	[2200112]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -247,10 +254,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
-		["fx_self"]=300005
+		["fx_self"]=300005,
+		["fx_target"]=4
 	},
 	[2200113]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -266,10 +274,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
-		["fx_self"]=300006
+		["fx_self"]=300006,
+		["fx_target"]=4
 	},
 	[2200114]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -285,7 +294,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack04",
-		["fx_self"]=300007
+		["fx_self"]=300007,
+		["fx_target"]=4
 	},
 	[2200120]={
 		["energy"]=10,
@@ -309,7 +319,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=4,
 		["name_act"]="skill01",
-		["fx_self"]=300008
+		["fx_self"]=300008,
+		["fx_target"]=4
 	},
 	[2200121]={
 		["energy"]=10,
@@ -351,7 +362,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=4,
 		["name_act"]="skill01",
-		["fx_self"]=300008
+		["fx_self"]=300008,
+		["fx_target"]=4
 	},
 	[2300110]={
 		["position"]=2,
@@ -368,10 +380,11 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=4
 	},
 	[2300111]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -387,10 +400,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
-		["fx_self"]=300026
+		["fx_self"]=300026,
+		["fx_target"]=4
 	},
 	[2300112]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -406,10 +420,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
-		["fx_self"]=300027
+		["fx_self"]=300027,
+		["fx_target"]=4
 	},
 	[2300113]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -425,10 +440,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
-		["fx_self"]=300028
+		["fx_self"]=300028,
+		["fx_target"]=4
 	},
 	[2300114]={
-		["position"]=1,
+		["position"]=2,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -444,7 +460,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack04",
-		["fx_self"]=300029
+		["fx_self"]=300029,
+		["fx_target"]=4
 	},
 	[2300120]={
 		["energy"]=10,
@@ -560,10 +577,11 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=6
 	},
 	[3200111]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -579,10 +597,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
-		["fx_self"]=300000
+		["fx_self"]=300000,
+		["fx_target"]=6
 	},
 	[3200112]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -598,10 +617,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
-		["fx_self"]=300001
+		["fx_self"]=300001,
+		["fx_target"]=5
 	},
 	[3200113]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -617,10 +637,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
-		["fx_self"]=300002
+		["fx_self"]=300002,
+		["fx_target"]=6
 	},
 	[3200114]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -636,7 +657,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack04",
-		["fx_self"]=300003
+		["fx_self"]=300003,
+		["fx_target"]=6
 	},
 	[3200120]={
 		["energy"]=10,
@@ -660,7 +682,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="skill01",
-		["fx_self"]=300003
+		["fx_self"]=300003,
+		["fx_target"]=6
 	},
 	[3300110]={
 		["position"]=3,
@@ -677,10 +700,11 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=5
 	},
 	[3300111]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -699,7 +723,7 @@ local skill = {
 		["fx_target"]=300021
 	},
 	[3300112]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -718,7 +742,7 @@ local skill = {
 		["fx_target"]=300022
 	},
 	[3300113]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -737,7 +761,7 @@ local skill = {
 		["fx_target"]=300023
 	},
 	[3300114]={
-		["position"]=1,
+		["position"]=3,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -792,10 +816,11 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=7
 	},
 	[4200111]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -814,7 +839,7 @@ local skill = {
 		["fx_target"]=300009
 	},
 	[4200112]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -833,7 +858,7 @@ local skill = {
 		["fx_target"]=300010
 	},
 	[4200113]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -852,7 +877,7 @@ local skill = {
 		["fx_target"]=300011
 	},
 	[4200114]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -902,10 +927,11 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=8
 	},
 	[4300111]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -921,10 +947,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
-		["fx_self"]=300030
+		["fx_self"]=300030,
+		["fx_target"]=8
 	},
 	[4300112]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -940,10 +967,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
-		["fx_self"]=300030
+		["fx_self"]=300030,
+		["fx_target"]=8
 	},
 	[4300113]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -959,10 +987,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
-		["fx_self"]=300030
+		["fx_self"]=300030,
+		["fx_target"]=8
 	},
 	[4300114]={
-		["position"]=1,
+		["position"]=4,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -978,7 +1007,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack04",
-		["fx_self"]=300030
+		["fx_self"]=300030,
+		["fx_target"]=8
 	},
 	[4300120]={
 		["energy"]=10,
@@ -1073,10 +1103,11 @@ local skill = {
 		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
-		["name_act"]="support01"
+		["name_act"]="support01",
+		["fx_target"]=10
 	},
 	[5200111]={
-		["position"]=1,
+		["position"]=5,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -1092,10 +1123,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
-		["fx_self"]=300013
+		["fx_self"]=300013,
+		["fx_target"]=10
 	},
 	[5200112]={
-		["position"]=1,
+		["position"]=5,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -1111,10 +1143,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
-		["fx_self"]=300013
+		["fx_self"]=300013,
+		["fx_target"]=10
 	},
 	[5200113]={
-		["position"]=1,
+		["position"]=5,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -1130,10 +1163,11 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
-		["fx_self"]=300014
+		["fx_self"]=300014,
+		["fx_target"]=10
 	},
 	[5200114]={
-		["position"]=1,
+		["position"]=5,
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
@@ -1149,7 +1183,8 @@ local skill = {
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack04",
-		["fx_self"]=300015
+		["fx_self"]=300015,
+		["fx_target"]=10
 	},
 	[5200120]={
 		["energy"]=10,
@@ -1171,7 +1206,8 @@ local skill = {
 		["obj"]=1,
 		["skill_position"]=2,
 		["name_act"]="skill01",
-		["fx_self"]=300016
+		["fx_self"]=300016,
+		["fx_target"]=10
 	},
 	[5200121]={
 		["energy"]=10,
@@ -1207,7 +1243,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1225,7 +1261,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1243,7 +1279,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -1315,7 +1351,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1333,7 +1369,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1351,7 +1387,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -1369,7 +1405,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1387,7 +1423,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1405,7 +1441,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -1423,7 +1459,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1441,7 +1477,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1459,7 +1495,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1477,7 +1513,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1495,7 +1531,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -1513,7 +1549,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1531,7 +1567,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1549,7 +1585,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -1707,7 +1743,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1726,7 +1762,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1745,7 +1781,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -1770,7 +1806,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["cd"]=3,
 		["cd_start"]=1
 	},
@@ -1878,7 +1914,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -1896,7 +1932,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -1914,7 +1950,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -1932,7 +1968,7 @@ local skill = {
 			}
 		},
 		["obj"]=1,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["cd"]=3,
 		["cd_start"]=1
 	},
@@ -1992,7 +2028,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -2010,7 +2046,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -2028,7 +2064,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -2078,7 +2114,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -2096,7 +2132,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -2114,7 +2150,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -2176,7 +2212,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -2194,7 +2230,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -2212,7 +2248,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -2291,7 +2327,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -2309,7 +2345,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -2327,7 +2363,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -2393,7 +2429,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -2411,7 +2447,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -2429,7 +2465,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -2478,7 +2514,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -2496,7 +2532,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -2514,7 +2550,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -2537,7 +2573,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["cd"]=3,
 		["cd_start"]=1,
 		["shake_time"]=100,
@@ -2570,7 +2606,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack01",
@@ -2588,7 +2624,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack02",
@@ -2606,7 +2642,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["name_act"]="attack03",
@@ -2624,7 +2660,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=2,
+		["skill_position"]=1,
 		["cd"]=3,
 		["cd_start"]=2,
 		["shake_time"]=100,
diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua
index f7fdb4a0..7f3f8850 100644
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@@ -40,6 +40,7 @@ local localization_global =
     ["HERO_DESC_9"] = "信息",
     ["HERO_DESC_10"] = "通关章节{0}解锁",
     ["BATTLE_DESC_8"] = "还有可上阵英雄",
+    ["MAIN_BTN_2"] = "英雄",
 }
 
 return localization_global
\ No newline at end of file
diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua
index 5e2825c4..02ec0ffa 100644
--- a/lua/app/config/tutorial.lua
+++ b/lua/app/config/tutorial.lua
@@ -146,7 +146,7 @@ local tutorial = {
 	[20050]={
 		["next_id"]=20060,
 		["type"]=2,
-		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_4",
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,