Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-04-02 15:12:59 +08:00
commit 528f2cdc51
2 changed files with 4 additions and 2 deletions

View File

@ -2277,4 +2277,6 @@
[12276] = GetLanguageStrById("灵兽篇"),
[12277] = GetLanguageStrById("激活属性:"),
[12278] = GetLanguageStrById("激活成功,获得%s%s"),
[12279] = GetLanguageStrById("破盾"),
[12280] = GetLanguageStrById("清除"),
}

View File

@ -978,9 +978,9 @@ function this.GetArtFontConfig(_ArtFontType)
if _ArtFontType == BattleArtFontType.Immune then
return {type = 2, content = Language[10203]}
elseif _ArtFontType == BattleArtFontType.Shield then
return {type = 2, content = Language[12236]}
return {type = 2, content = Language[12279]}
elseif _ArtFontType == BattleArtFontType.clear then
return {type = 2, content = Language[12237]}
return {type = 2, content = Language[12280]}
end
end