From c86307d328876ca5041298a0e11405cab82adc5c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 8 Apr 2021 17:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E6=B7=BB=E5=8A=A0=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E9=A1=B5=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/HandBook/HandBookHeroInfoPanel.lua | 16 +++++++++++++--- .../Modules/RoleInfo/HandBookRoleSkinPanel.lua | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index d08e76b4c6..5abf69d368 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -409,18 +409,21 @@ end local beginV3 local endV3 local distance + function HandBookHeroInfoPanel:OnBeginDrag(Pointgo, data) beginV3=this.curLiveObj.transform.anchoredPosition end + function HandBookHeroInfoPanel:OnDrag(Pointgo, data) distance=Vector2.Distance(beginV3,this.curLiveObj.transform.anchoredPosition) end + function HandBookHeroInfoPanel:OnEndDrag(Pointgo, data) endV3=this.curLiveObj.transform.anchoredPosition if distance>250 and endV3.x<0 then - self:RightBtnOnClick() + this:RightBtnOnClick() elseif distance>250 and endV3.x>0 then - self:LeftBtnOnClick() + this:LeftBtnOnClick() else this.curLiveObj:GetComponent("RectTransform"):DOAnchorPos(Vector2.New(heroConFigData.Position[1],heroConFigData.Position[2]), 0.5, false):SetEase(Ease.Linear) end @@ -429,7 +432,14 @@ end --界面关闭时调用(用于子类重写) function HandBookHeroInfoPanel:OnClose() - + for _, page in pairs(this.PageList) do + if page.OnHide then + page:OnHide() + end + if page.OnClose then + page:OnClose() + end + end if this.leftLiveObj then poolManager:UnLoadLive(GetResourcePath(leftHeroData.Live), this.leftLiveObj) this.leftLiveObj = nil diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/HandBookRoleSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/HandBookRoleSkinPanel.lua index 44a51ac0f7..6f06ed7fda 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/HandBookRoleSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/HandBookRoleSkinPanel.lua @@ -130,6 +130,7 @@ function HandBookRoleSkinPanel:BtnAction(skinId,data) end function HandBookRoleSkinPanel:OnHide() + LogGreen("11111111111111111111111111111111111") this.gameObject:SetActive(false) if parent then parent:ChangeCurentHeroSkinLive()