From 9b20642e9d946a541ccc7392d3cc8496d5eb4601 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Tue, 16 Jan 2024 17:22:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=88=80=E5=88=86=E8=A7=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Popup/View/GeneralPopup_PokemonRestore.lua | 7 ++++++- .../~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua index 6929841271..eaece2141e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua @@ -20,7 +20,8 @@ function this:InitComponent(gameObject) this.confirmBtn=Util.GetGameObject(gameObject,"resetBtn") this.getInfoTxt=Util.GetGameObject(gameObject,"Body/Text"):GetComponent("Text") this.getInfoTxt.text=Language[11574] - Util.GetGameObject(gameObject,"resetBtn/Text"):GetComponent("Text").text=Language[11575] + this.resetBtnTxt=Util.GetGameObject(gameObject,"resetBtn/Text"):GetComponent("Text") + this.resetBtnTxt.text=Language[11575] --滚动条根节点 this.root = Util.GetGameObject(gameObject, "Root") end @@ -54,9 +55,13 @@ function this:OnShow(_parent,...) if type==1 then this.infoTxt.text=Language[11576] this.titleText.text=Language[11573] + this.getInfoTxt.text=Language[11574] + this.resetBtnTxt.text=Language[11575] else this.infoTxt.text="确认要分解所选的名刀或名刀碎片?" this.titleText.text="确认分解" + this.getInfoTxt.text="分解后获得" + this.resetBtnTxt.text="分解" end LogError("#args[1]====="..#args[1]) ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[1]) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua index b701432303..b14d3ecf00 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua @@ -39,7 +39,7 @@ function this:InitComponent(gameObject) this.chipNumTxt=Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/chipObj/Text"):GetComponent("Text") this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/ItemListRoot").transform, - this.cardPre, this.scrollbar, Vector2.New(v21.width, v21.height), 1, 5, Vector2.New(43,15)) + this.cardPre, this.scrollbar, Vector2.New(v21.width, v21.height), 1, 5, Vector2.New(40,15)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1 maxSelectNum = tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,54).Value)