From 70a575cbb376c6eff705abc8e94f01342e0e5a0b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 10 Sep 2020 14:25:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=B8=B8=E9=A9=BB=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Bag/BagPanel.lua | 4 +++ .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 10 +++++-- .../~Lua/Modules/Carbon/CarbonTypePanelV3.lua | 3 +++ .../~Lua/Modules/Expert/ExpertPanel.lua | 4 +-- .../GlobalActTimeCtrl/ActTimeCtrlManager.lua | 6 ++--- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 4 +++ .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 4 +++ .../~Lua/Modules/Vip/VipPanelV2.lua | 4 +++ Assets/ManagedResources/~Lua/View/BtView.lua | 27 +++++++++++++++++++ 9 files changed, 59 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index fe03cf3b35..036805afa8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -750,6 +750,10 @@ function BagPanel:OnDestroy() SubUIManager.Close(this.UpView) SubUIManager.Close(this.BtView) + SubUIManager.Close(this.playerHead) + this.playerHead = nil + this.UpView = nil + this.BtView = nil this.ScrollView = nil this.ScrollView1 = nil ClearRedPointObject(RedPointType.Bag_HeroDebris, tabs1RedPoint[ItemBaseType.HeroChip]) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 9874a52bbe..8066105259 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -504,10 +504,16 @@ end function CarbonTypePanelV2:OnDestroy() hasFresh = false if this.BtView then - SubUIManager.Close(this.BtView) + SubUIManager.Close(this.BtView) end carbons = {} - this.playerHead=nil + SubUIManager.Close(this.playerHead) + SubUIManager.Close(this.UpView) + this.playerHead = nil + this.UpView = nil + this.BtView = nil + + ClearRedPointObject(RedPointType.Setting, this.headRedpot) for k,v in ipairs(carbons) do local data diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua index 2f9bbeae9f..ce7afd69a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua @@ -127,6 +127,9 @@ end function CarbonTypePanelV3:OnDestroy() hasFresh = false SubUIManager.Close(this.UpView) + SubUIManager.Close(this.playerHead) + + ClearRedPointObject(RedPointType.Setting, this.headRedpot) end return CarbonTypePanelV3 \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index f0e810d33b..bd89209a40 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -104,9 +104,9 @@ function ExpertPanel:BindEvent() -- this.heroStarGift:BindEvent() this.upLvRewardGrid:BindEvent() Util.AddClick(self.btnBack, function() - --self:ClosePanel() if this.isPlayingLackCatAni == false then - UIManager.OpenPanel(UIName.MainPanel) + -- UIManager.OpenPanel(UIName.MainPanel) + self:ClosePanel() end end) for i = 1, allActivityNum do diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index e104a08fc5..090dfdf6c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua @@ -84,9 +84,9 @@ function this.InitMsg(msg) this.serData[id].endTime = endTime this.serData[id].restTime = restTime - LogRed( - string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s", - id, startTime, endTime)) + -- LogRed( + -- string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s", + -- id, startTime, endTime)) -- 用于标记是否解锁使用 local typeId = AllActSetConfig[id].IsIDdSame diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index ad8e6e4cb9..d8bc26a671 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -574,6 +574,10 @@ function GuildMainCityPanel:OnDestroy() SubUIManager.Close(this.UpView) SubUIManager.Close(this.BtView) SubUIManager.Close(this.playerHead) + this.ChatTipView = nil + this.playerHead = nil + this.UpView = nil + this.BtView = nil -- 移除红点 for type, data in pairs(_GuildBuildConfig) do if data.btnName then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 0a97981754..9e88fc3710 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -379,12 +379,16 @@ end --界面销毁时调用(用于子类重写) function RoleListPanel:OnDestroy() + SubUIManager.Close(this.playerHead) SubUIManager.Close(this.UpView) SubUIManager.Close(this.BtView) ClearRedPointObject(RedPointType.Setting, this.headRedpot) ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint) this.ScrollView = nil + this.playerHead = nil + this.UpView = nil + this.BtView = nil end return RoleListPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua index 51c31f13f5..136f06aa36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua @@ -192,6 +192,10 @@ end function VipPanelV2:OnDestroy() SubUIManager.Close(this.UpView) SubUIManager.Close(this.BtView) + SubUIManager.Close(this.playerHead) + this.playerHead = nil + this.UpView = nil + this.BtView = nil end function VipPanelV2:InitVipContext() diff --git a/Assets/ManagedResources/~Lua/View/BtView.lua b/Assets/ManagedResources/~Lua/View/BtView.lua index afe5a8791c..6c89623495 100644 --- a/Assets/ManagedResources/~Lua/View/BtView.lua +++ b/Assets/ManagedResources/~Lua/View/BtView.lua @@ -4,6 +4,10 @@ local bagPanelUI local RoleListPanelUI --- 静态数据 local static_openId = 0 + +-- 当前打开的界面 +local _CurPanel = nil + function BtView:New(gameObject) local b = {} b.gameObject = gameObject @@ -47,10 +51,24 @@ function this:InitComponent() end +function this:CloseCurPanel() + if not _CurPanel then + return + end + -- 这界面不关闭 + if _CurPanel == UIName.MainPanel or _CurPanel == UIName.FightPointPassMainPanel then + return + end + if UIManager.IsOpen(_CurPanel) then + UIManager.ClosePanel(_CurPanel, true) + end +end + -- 主城 function this:OPenMainCity() if not UIManager.IsOpen(UIName.MainPanel) then UIManager.OpenPanel(UIName.MainPanel) + _CurPanel = UIName.MainPanel end end --打开英雄列表界面 @@ -59,28 +77,34 @@ function this:OpenChengYuan() HeroManager.heroListPanelSortID = 1 HeroManager.heroListPanelProID = 0 RoleListPanelUI = UIManager.OpenPanel(UIName.RoleListPanel) + _CurPanel = UIName.RoleListPanel end end --打开仓库界面 function this:OpenCangKu() if not UIManager.IsOpen(UIName.BagPanel) or (bagPanelUI and bagPanelUI.isFristOpen == false) then bagPanelUI = UIManager.OpenPanel(UIName.BagPanel) + _CurPanel = UIName.BagPanel end end -- 挂机界面 function this:OpenJieling() UIManager.OpenPanel(UIName.FightPointPassMainPanel) + _CurPanel = UIName.FightPointPassMainPanel end -- 打开副本选择界面 function this:OpenCarbon() PlayerManager.carbonType = 1 UIManager.OpenPanel(UIName.CarbonTypePanelV2) + _CurPanel = UIName.CarbonTypePanelV2 end function this:OpenGuild() JumpManager.GoJump(4001) + _CurPanel = UIName.GuildMainCityPanel end function this:OpenVIP() UIManager.OpenPanel(UIName.VipPanelV2) + _CurPanel = UIName.VipPanelV2 end --绑定事件(用于子类重写) @@ -170,6 +194,9 @@ end function this:OnBtnClick(pt) local isOpen = self:CheckIsOpen(pt) if isOpen then + -- 关闭当前界面 + this:CloseCurPanel() + -- 打开新界面 local btnFunc = self._BtnConfig[pt].clickFunc if btnFunc then btnFunc(self) From 2bf4247d5937d8cc144b13f9b9a939d9e261e4b2 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 10 Sep 2020 14:25:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsdk=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua index b353ad5279..56a45697d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua @@ -36,6 +36,7 @@ function this.Initialize() AppConst.OpenId = result[2] AppConst.TokenStr = result[4] AppConst.SdkChannel = result[5] + AppConst.SdkPackageName = AndroidDeviceInfo.Instance:GetPackageName() end -- 判断是否是注册并登录 if this.isRegister then From bccc1204e7f7e5846769abe6c28815bf688f83f8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 10 Sep 2020 14:28:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Setting/SettingPanel.prefab | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab index dcf2173336..7bc9251094 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab @@ -318,7 +318,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1172898592 RectTransform: m_ObjectHideFlags: 0 @@ -1889,7 +1889,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8996595556620474117 RectTransform: m_ObjectHideFlags: 0 @@ -4843,7 +4843,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6323907669162332623 RectTransform: m_ObjectHideFlags: 0 @@ -9379,7 +9379,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5075207361646036926 RectTransform: m_ObjectHideFlags: 0 @@ -13678,7 +13678,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7403415200051497663 RectTransform: m_ObjectHideFlags: 0 @@ -15324,10 +15324,10 @@ RectTransform: m_Father: {fileID: 861513193} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 310, y: -210} - m_SizeDelta: {x: 420, y: 90} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1028344318468334643 CanvasRenderer: