From 8bae77bd5b09824598fa86675207c27215515c52 Mon Sep 17 00:00:00 2001
From: "PC-202302260912\\Administrator" <1545929779@qq.com>
Date: Fri, 7 Jul 2023 10:27:42 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B3=95=E5=AE=9D]=3D=3D=3D=3D=3D=3D=3D=3D=3D?=
=?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=B3=95=E5=AE=9D=E7=89=B9?=
=?UTF-8?q?=E6=80=A7=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/ManagedResources/~Lua/Common/Language.lua | 4 ++--
.../~Lua/Modules/Popup/TalismanInfoPopup.lua | 10 +++++-----
.../~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index 8355cdf82e..60b24e2d30 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -1532,8 +1532,8 @@ Language = {
[11531] = GetLanguageStrById("徐风细清辉,明日望君归"),
[11532] = GetLanguageStrById("%s【+%s激活】"),
[11533] = GetLanguageStrById("已激活"),
- [11534] = GetLanguageStrById("· %s%s【+%s激活】%s"),
- [11535] = GetLanguageStrById("· %s【+%s激活】%s"),
+ [11534] = GetLanguageStrById("·【+%s激活】\n %s%s%s"),
+ [11535] = GetLanguageStrById("·【+%s激活】\n%s%s"),
[11536] = GetLanguageStrById("[特性]"),
[11537] = GetLanguageStrById("是否消耗%s%s购买一次挑战次数?"),
[11538] = GetLanguageStrById("装备出售"),
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
index a1adb0073a..0bb5f375bd 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
@@ -104,10 +104,10 @@ function this.Show()
this.title.text= string.format( "%s +%s",GetLanguageStrById(itemConfig[data[2]].Name),curLv)
this.talismanIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[data[2]].ResourceID))
this.power.text = TalismanManager.CalculateWarForceBase(curTalismanConFig,0)--法宝战力
- --显示核心特性(25级解锁)
+ --显示核心特性(30级解锁)
local skillLv= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",30).OpenSkillRules[1]
if skillLv then
- if curLv<25 then
+ if curLv<30 then
this.coreText.text=string.format( Language[11532],GetLanguageStrById(passiveSkillConfig[skillLv].Desc),30)
else
this.coreText.text=string.format( "%s【%s】",GetLanguageStrById(passiveSkillConfig[skillLv].Desc),Language[11533])
@@ -156,12 +156,12 @@ function this.Show()
for n=1,#dowerData do
if dowerData[n].Level<=50 then
if curLv>=dowerData[n].Level then
- strTable[n]= string.format( Language[11534], "",GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),dowerData[n].Level,"\n")
+ strTable[n]= string.format( Language[11534], "",dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n")
else
- strTable[n]=string.format( Language[11535],GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),dowerData[n].Level,"\n")
+ strTable[n]=string.format( Language[11535],dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n")
end
- if dowerData[n].Level==25 or dowerData[n].Level==50 then
+ if dowerData[n].Level==30 or dowerData[n].Level==50 then
strTable[n]=string.gsub(strTable[n],"·","")
strTable[n]=Language[11536]..strTable[n]
end
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
index 502aff4d45..5f2a3b0fed 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
@@ -263,11 +263,11 @@ function this.OnShowHeroAndTalisman()
for n=1,#dowerData do
if dowerData[n].Level<=maxLv then
if curLv>=dowerData[n].Level then --如果已激活 显示绿色
- strTable[n]= string.format( Language[11534], "",GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),dowerData[n].Level,"\n")
+ strTable[n]= string.format( Language[11534], "",dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n")
else --否则就正常显示
- strTable[n]=string.format( Language[11535],GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),dowerData[n].Level,"\n")
+ strTable[n]=string.format( Language[11535], dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n")
end
- if dowerData[n].Level==25 or dowerData[n].Level==50 then --特性显示
+ if dowerData[n].Level==30 or dowerData[n].Level==50 then --特性显示
strTable[n]=string.gsub(strTable[n],"·","")
local str=Language[11536]..strTable[n]
strTable[n]=string.gsub(str," "," ") --unity text中的单词过长 避免自动添加空格并换行 将那个空格替换