更新配置，英雄排序问题

lua/app/config/buff.lua

@@ -693,13 +693,27 @@ local buff = {
 		["id"]=79,
 		["name"]="invincible_shield",
 		["buff_type"]=7,
+		["stack"]=3,
 		["decr"]=3,
 		["icon"]="invincible_shield",
 		["fx_continued"]={
-			26
+			38
 		},
 		["fx_disappear"]={
-			27
+			39
+		}
+	},
+	[80]={
+		["id"]=80,
+		["name"]="shield_ice_02",
+		["buff_type"]=2,
+		["decr"]=3,
+		["icon"]="shield_ice",
+		["fx_continued"]={
+			40
+		},
+		["fx_disappear"]={
+			41
 		}
 	}
 }
@@ -783,12 +797,13 @@ local keys = {
 		["invalid_control"]=buff[76],
 		["end_dmg_addition_all_add"]=buff[77],
 		["end_dmg_dec_all_add"]=buff[78],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=79
+count=80
 }
 return config

lua/app/config/fx.lua

@@ -167,6 +167,15 @@ local fx = {
 		["res"]="sfx_buff_hudun_zi_b01_1",
 		["bind"]="root"
 	},
+	[40]={
+		["res"]="sfx_buff_hudun_lan_b03",
+		["loop"]=1,
+		["bind"]="root"
+	},
+	[41]={
+		["res"]="sfx_buff_hudun_lan_b03_1",
+		["bind"]="root"
+	},
 	[100001]={
 		["res"]="sfx_m10001_b01",
 		["bind"]="root"
@@ -2346,6 +2355,6 @@ local fx = {
 	}
 }
 local config = {
-data=fx,count=554
+data=fx,count=556
 }
 return config

lua/app/config/skill.lua

@@ -9927,7 +9927,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="shield_ice",
+				["type"]="shield_ice_02",
 				["num"]=1500,
 				["ratio"]=10000,
 				["round"]=3
@@ -10279,7 +10279,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="shield_ice",
+				["type"]="shield_ice_02",
 				["num"]=1500,
 				["ratio"]=10000,
 				["round"]=3
@@ -10631,7 +10631,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="shield_ice",
+				["type"]="shield_ice_02",
 				["num"]=1500,
 				["ratio"]=10000,
 				["round"]=3
@@ -10983,7 +10983,7 @@ local skill = {
 		["trigger"]=1,
 		["effect"]={
 			{
-				["type"]="shield_ice",
+				["type"]="shield_ice_02",
 				["num"]=1500,
 				["ratio"]=10000,
 				["round"]=3

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

@@ -172,6 +172,11 @@ local buff = {
 		["show_name"]="意念护盾",
 		["desc"]="意念护盾：护盾存在时不会受到任何伤害，每被攻击命中1次将扣除1层护盾。",
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="冰霜护盾：可承受最大生命值{0}的伤害。",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -206,12 +211,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -122,6 +122,10 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -156,12 +160,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo.",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -122,6 +122,10 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -156,12 +160,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum.",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化する。",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수할 수 있습니다.",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima.",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -122,6 +122,10 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -156,12 +160,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color>",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa.",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

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

@@ -170,6 +170,11 @@ local buff = {
 	[79]={
 		["id"]=79,
 		["name"]="invincible_shield"
+	},
+	[80]={
+		["id"]=80,
+		["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。",
+		["name"]="shield_ice_02"
 	}
 }
 local keys = {
@@ -204,12 +209,13 @@ local keys = {
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
 		["shield_ice_rebound_400"]=buff[75],
-		["invincible_shield"]=buff[79]
+		["invincible_shield"]=buff[79],
+		["shield_ice_02"]=buff[80]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=31
+count=32
 }
 return config

lua/app/ui/hero/hero_comp.lua

@@ -164,6 +164,8 @@ function HeroComp:refreshDungeonArmorFormation()
 end
 
 function HeroComp:refreshScrollRect()
+	self.heroList = DataManager.HeroData:getAllHeroesSort() -- 每次都重新算一次
+
 	for i = 1, 5 do
 		local heroId = self.curFormation[i]
 		local hero = DataManager.HeroData:getHeroById(heroId)