From 7f8dcf2416eda300098811bf6775931da9be422c Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 21 Jun 2022 14:40:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=BF=9E=E5=86=B2=E8=BF=94=E5=88=A9]=3D=3D=3D?= =?UTF-8?q?=3D=3D=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=95=8F=E6=84=9F=E5=AD=97=E7=AC=A6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContinuePackage/PremiumRebatePanel.lua | 20 ++++++++++++------- .../~Lua/Modules/Guild/GuildManager.lua | 2 +- .../~Lua/Modules/Guild/MyGuildManager.lua | 2 +- .../~Lua/Modules/Popup/NameManager.lua | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index 0e02994e36..6bae985347 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -12,6 +12,7 @@ local BTNS = { } local curPage = 1 local redList = {} +local gridPar function PremiumRebatePanel:InitComponent() this.spLoader = SpriteLoader.New() this.backBtn = Util.GetGameObject(self.gameObject, "closeBtn") @@ -29,6 +30,7 @@ function PremiumRebatePanel:InitComponent() this.scrollView.moveTween.Strength = 2 this.scrollView.elastic = false this.itemViewList = {} + grid=Util.GetGameObject(self.gameObject, "Bg/scroll/ScrollCycleView/grid"):GetComponent("RectTransform") this.sortingOrder = 0 end @@ -91,8 +93,8 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function PremiumRebatePanel:OnShow() - this.grid=Util.GetGameObject(self.gameObject, "Bg/scroll/ScrollCycleView/grid"):GetComponent("RectTransform") this:Refresh(true,true) + FixedUpdateBeat:Add(this.OnUpdate,self) this.PageTabCtrl:Init(this.tabbox.gameObject, BTNS,curPage) end @@ -118,11 +120,15 @@ function PremiumRebatePanel:Refresh(isTop,isAni) end function this.OnUpdate() - if this.grid and this.grid.localPosition.y>2140 then - this.jiantou:SetActive(false) - else - this.jiantou:SetActive(true) + + if gridPar~=nil then + if gridPar.localPosition and gridPar.localPosition.y>2140 then + this.jiantou:SetActive(false) + else + this.jiantou:SetActive(true) + end end + end function PremiumRebatePanel:SetRewardShow(isTop,isAni) @@ -224,13 +230,13 @@ function PremiumRebatePanel:SetTime() end function PremiumRebatePanel:OnClose() - FixedUpdateBeat:Remove(this.OnUpdate,self) + --FixedUpdateBeat:Remove(this.OnUpdate,self) end --界面销毁时调用(用于子类重写) function PremiumRebatePanel:OnDestroy() this.spLoader:Destroy() - + FixedUpdateBeat:Remove(this.OnUpdate,self) this.itemViewList = {} for k,v in pairs(redList) do ClearRedPointObject(k,v) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua index 14667a6e19..2d83b560d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua @@ -47,7 +47,7 @@ end -- 请求创建公会 function GuildManager.RequestCreateGuild(name, announce, func) if not NameManager.CheckStringRight(name) then - PopupTipPanel.ShowTip("名字不合法") + PopupTipPanel.ShowTip("名称含有敏感字符") return end if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD) then diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua index f823d4255a..6cba24bd21 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua @@ -371,7 +371,7 @@ end -- 请求修改公会名称 function MyGuildManager.RequestChangeGuildName(name, func) if not NameManager.CheckStringRight(name) then - PopupTipPanel.ShowTip("名字不合法") + PopupTipPanel.ShowTip("名称含有敏感字符") return end local pos = this.GetMyPositionInGuild() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua b/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua index 0ea62a244a..b0f602f6c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua @@ -1,4 +1,4 @@ -local RandomName = ConfigManager.GetConfig(ConfigName.RandomName) +local RandomName = ConfigManager.GetConfig(ConfigName.RandomName) local this = { roleName = "", roleSex = ROLE_SEX.BOY @@ -67,7 +67,7 @@ end --更改玩家姓名 function this.ChangeUserName(type, name, teamPosId, sex, callBack) if not this.CheckStringRight(name) then - PopupTipPanel.ShowTip("名字不合法") + PopupTipPanel.ShowTip("名称含有敏感字符") return end NetManager.ChangeUserNameRequest(type, name, teamPosId, sex, function()