diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index cb87fd3015..8f02a12537 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激活】\n %s%s%s"), - [11535] = GetLanguageStrById("【+%s激活】\n%s%s"), + [11534] = GetLanguageStrById("【+%s激活】\n %s%s"), + [11535] = GetLanguageStrById("【+%s激活】\n %s%s"), [11536] = GetLanguageStrById("[特性]"), [11537] = GetLanguageStrById("是否消耗%s%s购买一次挑战次数?"), [11538] = GetLanguageStrById("装备出售"), diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua index 8f6b4e6b52..79862d9205 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua @@ -9,7 +9,7 @@ local curLevel local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local curSelectMat={} local starConfig=nil -local costEnough=false +local costEnough=true function this:InitComponent() this.spLoader = SpriteLoader.New() this.mask = Util.GetGameObject(self.gameObject, "mask") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua index 0bb5f375bd..0e10108725 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua @@ -156,7 +156,7 @@ 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], "",dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\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],dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n") end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index c7ddc9a7eb..9ef56791e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -263,9 +263,9 @@ 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], "",dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\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], dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n") + strTable[n]=string.format(Language[11535], dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n") end if dowerData[n].Level==30 or dowerData[n].Level==50 then --特性显示 strTable[n]=string.gsub(strTable[n],"·","") @@ -276,6 +276,7 @@ function this.OnShowHeroAndTalisman() end local str=string.sub(table.concat(strTable),1,-2)--将表里字符串拼接 --去除最后\n + LogError("str====="..str) this.dowerText.text=str end function this.RefrehsHeroAndTalisman()