diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index d7fdb70583..ac7f88c66f 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1600,7 +1600,7 @@ Language = { [11599] = GetLanguageStrById("确认花费%s妖晶抽取10次乾坤宝盒?"), [11600] = GetLanguageStrById("包含4星或更高星级的英雄"), [11601] = GetLanguageStrById("确认送神"), - [11602] = GetLanguageStrById("恭送英雄会获得仙缘余尘,若英雄已升级,突破或进阶,还会返还%s%s消耗的金币、成长护符和九转金丹,是否确定恭送所选英雄?\n\n\t\t\t\t\t\t\t送神后获得:"), + [11602] = GetLanguageStrById("退役英雄会获得仙缘余尘,若英雄已升级,突破或进阶,还会返还%s%s消耗的金币、成长护符和九转金丹,是否确定退役所选英雄?\n\n\t\t\t\t\t\t\t送神后获得:"), [11603] = GetLanguageStrById("宝物分解"), [11604] = GetLanguageStrById("宝物将分解为"), [11605] = GetLanguageStrById(",若宝物已强化、精炼或神应,分解后将清空强化、精炼等级和神应等级,并100%返还养成材料。"), @@ -1734,7 +1734,7 @@ Language = { [11733] = GetLanguageStrById("英雄归元"), [11734] = GetLanguageStrById("生命卡归元"), [11735] = GetLanguageStrById("圣器分解"), - [11736] = GetLanguageStrById("请选择需要恭送的英雄!"), + [11736] = GetLanguageStrById("请选择需要退役的英雄!"), [11737] = GetLanguageStrById("最多选择%s个英雄!"), [11738] = GetLanguageStrById("此英雄已在"), [11739] = GetLanguageStrById("队伍内,是否前往编队界面将其下阵?"), diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua index 8463fe528f..2ea45d7b4b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua @@ -54,6 +54,7 @@ function PokemonInfoPanel:InitComponent() this.pokemonIcon = Util.GetGameObject(self.gameObject, "curObj/pokemonIcon") this.rightpokemonIcon = Util.GetGameObject(self.gameObject, "rightObj/rightpokemonIcon") this.nirvanaBtn=Util.GetGameObject(self.transform,"nirvanaBtn") + Util.GetGameObject(self.transform,"nirvanaBtn/Image/Text"):GetComponent("Text").text="重塑" this.replaceBtn=Util.GetGameObject(self.transform,"rightBtnList/replaceBtn") this.restBtn=Util.GetGameObject(self.transform,"rightBtnList/restBtn") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua index 8bac412364..f89aee032a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua @@ -69,7 +69,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11601] --返还比 local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,35).Value)/100 - this.bodyText.text=string.format("恭送英雄会获得仙缘余尘,若英雄已升级,\n 突破或进阶,还会返还%s%s的消耗。\n是否确定恭送所选英雄?",num,"%") + this.bodyText.text=string.format("退役英雄会获得仙缘余尘,若英雄已升级,\n 突破或进阶,还会返还%s%s的消耗。\n是否确定退役所选英雄?",num,"%") local data={} for i, v in pairs(dropList) do diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index a80ceebbe1..e11188871e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -13,6 +13,7 @@ function this:InitComponent(gameObject) this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition --回溯按钮 this.confirmBtn=Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/ConfirmBtn") + Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/ConfirmBtn/Image/Text"):GetComponent("Text").text="退役" Util.GetGameObject(this.confirmBtn,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_ls_03") this.shopBtn=Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/shopBtn") this.shopBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_shenjiang_32")