diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index bbfcaa6d..16dc63ef 100644 --- a/lua/app/config/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 42d87daf..1552ef22 100644 --- a/lua/app/config/fx.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index b23d516e..ca976a10 100644 --- a/lua/app/config/skill.lua +++ b/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 diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index 88b21575..bf84f8d5 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/de/buff.lua b/lua/app/config/strings/de/buff.lua index febae412..5878e4ab 100644 --- a/lua/app/config/strings/de/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index 358f88f7..cb257776 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/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 {0} 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 \ No newline at end of file diff --git a/lua/app/config/strings/es/buff.lua b/lua/app/config/strings/es/buff.lua index 016a6d29..16a64c91 100644 --- a/lua/app/config/strings/es/buff.lua +++ b/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 {0} 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 \ No newline at end of file diff --git a/lua/app/config/strings/fr/buff.lua b/lua/app/config/strings/fr/buff.lua index febae412..5878e4ab 100644 --- a/lua/app/config/strings/fr/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua index db1b9ab2..20a374d7 100644 --- a/lua/app/config/strings/id/buff.lua +++ b/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 {0} 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 \ No newline at end of file diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua index 0e311143..1f852a7e 100644 --- a/lua/app/config/strings/ja/buff.lua +++ b/lua/app/config/strings/ja/buff.lua @@ -170,6 +170,11 @@ local buff = { [79]={ ["id"]=79, ["name"]="invincible_shield" + }, + [80]={ + ["id"]=80, + ["desc"]="アイスシールド：最大HP{0}のダメージを無効化する。", + ["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 \ No newline at end of file diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua index 172e9ddd..a21a2b0e 100644 --- a/lua/app/config/strings/ko/buff.lua +++ b/lua/app/config/strings/ko/buff.lua @@ -170,6 +170,11 @@ local buff = { [79]={ ["id"]=79, ["name"]="invincible_shield" + }, + [80]={ + ["id"]=80, + ["desc"]="서리 보호막: 최대 HP의 {0}에 달하는 대미지를 흡수할 수 있습니다.", + ["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 \ No newline at end of file diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua index bb36959c..746fa3c4 100644 --- a/lua/app/config/strings/pt/buff.lua +++ b/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 {0} 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 \ No newline at end of file diff --git a/lua/app/config/strings/ru/buff.lua b/lua/app/config/strings/ru/buff.lua index febae412..5878e4ab 100644 --- a/lua/app/config/strings/ru/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua index ddc9876a..4c74fa53 100644 --- a/lua/app/config/strings/th/buff.lua +++ b/lua/app/config/strings/th/buff.lua @@ -170,6 +170,11 @@ local buff = { [79]={ ["id"]=79, ["name"]="invincible_shield" + }, + [80]={ + ["id"]=80, + ["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด{0}", + ["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 \ No newline at end of file diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua index 33aae869..91acff81 100644 --- a/lua/app/config/strings/vi/buff.lua +++ b/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 {0} 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 \ No newline at end of file diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index 6a6cb4a1..8bcc694a 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -170,6 +170,11 @@ local buff = { [79]={ ["id"]=79, ["name"]="invincible_shield" + }, + [80]={ + ["id"]=80, + ["desc"]="冰霜護盾：可承受最大生命值{0}的傷害。", + ["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 \ No newline at end of file diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index 01b815e1..4e9e8c39 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/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)