From 4a204eaba239bdb8fea8f0feaf4cd7a999b0de07 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 31 May 2021 14:22:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=97=A0=E5=B0=BD=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E3=80=91=E5=9C=A8=E7=A7=98=E5=AE=9D=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E7=A7=98=E5=AE=9D=E7=95=8C=E9=9D=A2=E4=B8=8D=E5=85=B3?= =?UTF-8?q?=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/View/EndLessMapView.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 419c2e8d5c..a9aa8ba89a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -753,6 +753,19 @@ function EndLessMapView:OnClose() this.timer:Stop() this.timer = nil end + + if UIManager.IsOpen(UIName.GeneralBigPopup) then + UIManager.ClosePanel(UIName.GeneralBigPopup) + end + if UIManager.IsOpen(UIName.GeneralPopup) then + UIManager.ClosePanel(UIName.GeneralPopup) + end + if UIManager.IsOpen(UIName.TrialRewardPopup) then + UIManager.ClosePanel(UIName.TrialRewardPopup) + end + if UIManager.IsOpen(UIName.EndLessTreasurePanel) then + UIManager.ClosePanel(UIName.EndLessTreasurePanel) + end end function EndLessMapView:OnDestroy() From a86b66a2ebced1b57df5fdc9c9f3acb266638e69 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 31 May 2021 14:46:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=8D=81=E4=B8=80=E6=98=9F?= =?UTF-8?q?=E3=80=91=E8=8B=B1=E9=9B=84=E6=9C=AA=E8=8E=B7=E5=BE=97=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index 7d0da3e2a4..dfccc34276 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -355,7 +355,7 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar -- end -- end -- end - local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum) + local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "OpenStar", _starNum) local curLvNum=1 breakId = 0 upStarId = 0