diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 1f668b11e1..de5c973628 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1569,8 +1569,8 @@ [11568] = GetLanguageStrById("/分钟"), [11569] = GetLanguageStrById("灵兽涅槃"), [11570] = GetLanguageStrById("涅槃"), - [11571] = GetLanguageStrById("确认花费  %s将%s涅槃为初始状态,并100%s返还养成消耗"), - [11572] = GetLanguageStrById("确认花费  %s将%s涅槃为初始状态,并100%s返还养成消耗"), + [11571] = GetLanguageStrById("确认花费%s%s将%s涅槃为初始状态,并100%s返还养成消耗"), + [11572] = GetLanguageStrById("确认花费%s%s将%s涅槃为初始状态,并100%s返还养成消耗"), [11573] = GetLanguageStrById("确认放生"), [11574] = GetLanguageStrById("放生后获得"), [11575] = GetLanguageStrById("放生"), diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua index b1a1572029..83ad5e7156 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua @@ -19,6 +19,7 @@ function this:InitComponent(gameObject) this.infoTxt=Util.GetGameObject(gameObject,"Body/Text"):GetComponent("Text") --this.num=Util.GetGameObject(gameObject,"Body/Num"):GetComponent("Text") this.numImage=Util.GetGameObject(gameObject,"Body/Image"):GetComponent("Image") + this.numImage.gameObject:SetActive(false) this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn") this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn") Util.GetGameObject(gameObject,"ConfirmBtn/Text"):GetComponent("Text").text=Language[11570] @@ -65,9 +66,9 @@ function this:OnShow(_parent,...) fun = args[3] --判断妖晶是否充足 if coin>BagManager.GetItemCountById(id) then - this.infoTxt.text=string.format(Language[11571],coin,GetLanguageStrById(lingshouConfig.Name),"%") + this.infoTxt.text=string.format(Language[11571],coin,GetLanguageStrById(itemConfig[id].Name),GetLanguageStrById(lingshouConfig.Name),"%") else - this.infoTxt.text=string.format(Language[11572],coin,GetLanguageStrById(lingshouConfig.Name),"%") + this.infoTxt.text=string.format(Language[11572],coin,GetLanguageStrById(itemConfig[id].Name),GetLanguageStrById(lingshouConfig.Name),"%") end FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[2]) end