From a996bbc21934c8fe086cd72b72784485105474b1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 May 2021 22:34:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Carbon/EndLessCarbonPanel.prefab | 6 +++--- .../~Lua/Modules/Map/View/EndLessMapView.lua | 3 +++ .../~Lua/Modules/Player/AutoRecoverManager.lua | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab index c0aaadab00..28e1810716 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab @@ -3659,8 +3659,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: --- !u!1 &8610256016417640590 @@ -3738,7 +3738,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 15fae012e9..3ef918db18 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -713,6 +713,9 @@ function EndLessMapView:ShowCountTime() this.timer = Timer.New(function () local leftTime = AutoRecoverManager.GetRecoverTime(1) + if leftTime < 0 then + leftTime = 0 + end if not this.isPanelClose then this.actCountTime.text = GetTimeMaoHaoStrBySeconds(math.floor(leftTime)).."后恢复1点" end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua index 147d3430cd..ef0b99bcf5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua @@ -41,9 +41,10 @@ local _TimeCheckFunc = { if not itemData then return end + local nextFreshTime = itemData.nextFlushTime local remationTime = nextFreshTime - PlayerManager.serverTime - --LogGreen("remationTime:"..remationTime) + --LogGreen("itemData.nextFlushTime:"..itemData.nextFlushTime.." remationTime:"..remationTime) if remationTime > 0 then return remationTime end From cde2379d78d80d1efe7ebdbb60ebd0708a595011 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 May 2021 22:43:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B8=B8=E9=87=8F=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0ba6f89c53..f7f7b59772 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2027,9 +2027,8 @@ GENERAL_POPUP_TYPE={ PracticeStatePreview = 37,--修行境界预览 RecrutReward = 35, --限时招募奖励 RecrutDetail = 36, --限时招募奖励详情 - WuJinShuXing = 37, XiuXingSelectHero = 38,--修行选择英雄弹窗 - + WuJinShuXing = 40, WuJinSetting = 39, } From 992267821069ef06ec7dd3e8489bfcbc24e74d96 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 27 May 2021 23:09:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE?= =?UTF-8?q?=E7=A8=B7=E5=9B=BE=E3=80=91=E5=BC=80=E5=90=AF=E7=AB=A0=E8=8A=82?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/BattleWinPopup.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index 7f0030a3b2..fed5341723 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -324,12 +324,14 @@ function this.ShowBattleResultByFightLevelType(drop) m_battlePanel:ClosePanel() end this:ClosePanel() + local chapterData = FightLevelManager.GetChapterData(oldBattlefightLevelData.config.Chapter) if FightLevelManager.GetisShowChapterOpenPopup() then - UIManager.OpenPanel(UIName.FightLevelOpenChapterPopup,FightLevelManager.GetCurChapterId(),function() - -- Game.GlobalEvent:DispatchEvent(GameEvent.FightLevel.MainLevelInfoRefresh) - end) - else - -- Game.GlobalEvent:DispatchEvent(GameEvent.FightLevel.MainLevelInfoRefresh) + if oldBattlefightLevelData.config.Section == LengthOfTable(chapterData.node) then + UIManager.OpenPanel(UIName.FightLevelOpenChapterPopup,FightLevelManager.GetCurChapterId(),function() + end) + else + FightLevelManager.SetisShowChapterOpenPopup(false) + end end end end, 8,true,true) From 4bfbd360dd4556f2b149d3a387b30b2d574f075e Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 27 May 2021 23:20:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE?= =?UTF-8?q?=E7=A8=B7=E5=9B=BE=E3=80=91=E7=89=B9=E6=95=88=E5=B1=82=E7=BA=A7?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FightLevel/FightLevelSingleChapterPanel.lua | 12 ++++++++---- .../View/FightLevelInfoPopup_MainLevel.lua | 12 ++++++------ .../~Lua/Modules/Popup/RewardItemPopup.lua | 6 ++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua index f47e58ab39..46b8b38488 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua @@ -72,12 +72,14 @@ function FightLevelSingleChapterPanel:OnSortingOrderChange() --特效层级重设 if starListEffect and #starListEffect > 0 then for i=1,#starListEffect do - Util.AddParticleSortLayer(starListEffect[i], self.sortingOrder - sortingOrder) + -- Util.AddParticleSortLayer(starListEffect[i], self.sortingOrder - sortingOrder) + Util.SetParticleSortLayer(starListEffect[i], self.sortingOrder + 1) end end if levelListEffect and #levelListEffect > 0 then for i=1,#levelListEffect do - Util.AddParticleSortLayer(levelListEffect[i], self.sortingOrder - sortingOrder) + -- Util.AddParticleSortLayer(levelListEffect[i], self.sortingOrder - sortingOrder) + Util.SetParticleSortLayer(levelListEffect[i], self.sortingOrder + 1) end sortingOrder = self.sortingOrder end @@ -189,9 +191,11 @@ function this.SetSingleLevel(levelDatas) UI_Effect_Kuang_JinSe:SetActive(isOpen == 0 and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel) isFarstEffect:SetActive(levelData.isFirst and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel) for j = 1, 3 do - Util.AddParticleSortLayer(Util.GetGameObject(isFarstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder - (sortingOrder - 1)) + -- Util.AddParticleSortLayer(Util.GetGameObject(isFarstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder - (sortingOrder - 1)) + Util.SetParticleSortLayer(Util.GetGameObject(isFarstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder + 1) end - Util.AddParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder - (sortingOrder - 1)) + -- Util.AddParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder - (sortingOrder - 1)) + Util.SetParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder + 1) if levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then --主关卡 prb1:SetActive(true) Util.GetGameObject(prb1, "nameBg"):GetComponent("Image").sprite = this.spLoader:LoadSprite(isOpen == 0 and LevleTitleBg[1] or LevleTitleBg[2]) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua index 34d7ffa71a..790d6dcd26 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevel.lua @@ -102,9 +102,9 @@ function this:ShoeCondition() this.isFirstEffect:SetActive(fightLevelData.isFirst) if starListEffect and #starListEffect > 0 then for i=1,#starListEffect do - Util.AddParticleSortLayer(starListEffect[i], sortingOrder) + -- Util.AddParticleSortLayer(starListEffect[i], sortingOrder) + Util.SetParticleSortLayer(starListEffect[i], sortingOrder + 1) end - LogYellow("sortingOrder "..sortingOrder) end for i = 1, math.max(#condition, #conditionGo) do local go = conditionGo[i] @@ -149,16 +149,16 @@ function this:FormationAdapter() end function this:OnSortingOrderChange(_sortingOrder) - LogYellow("_sortingOrder ".._sortingOrder) for i = 1, #heroListGo do - Util.AddParticleSortLayer(heroListGo[i], _sortingOrder - sortingOrder) + -- Util.AddParticleSortLayer(heroListGo[i], _sortingOrder - sortingOrder) + Util.SetParticleSortLayer(heroListGo[i], _sortingOrder + 1) end if starListEffect and #starListEffect > 0 then for i=1,#starListEffect do - Util.AddParticleSortLayer(starListEffect[i], _sortingOrder - sortingOrder) + -- Util.AddParticleSortLayer(starListEffect[i], _sortingOrder - sortingOrder) + Util.SetParticleSortLayer(starListEffect[i], _sortingOrder + 1) end sortingOrder = _sortingOrder - LogYellow("sortingOrder "..sortingOrder) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 43d5de0d6f..1ac5355044 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -321,7 +321,8 @@ function this.FightLevelShow() this.isFirstEffect:SetActive(curBattlefightLevelData.isFirst) if starListEffect and #starListEffect > 0 then for i=1,#starListEffect do - Util.AddParticleSortLayer(starListEffect[i], this.sortingOrder - (sortingOrder - 1)) + -- Util.AddParticleSortLayer(starListEffect[i], this.sortingOrder - (sortingOrder - 1)) + Util.SetParticleSortLayer(starListEffect[i], this.sortingOrder + 1) end end for i = 1, math.max(#condition, #conditionGo) do @@ -383,7 +384,8 @@ function RewardItemPopup:OnSortingOrderChange() end if starListEffect and #starListEffect > 0 then for i=1,#starListEffect do - Util.AddParticleSortLayer(starListEffect[i], self.sortingOrder - (sortingOrder - 1)) + -- Util.AddParticleSortLayer(starListEffect[i], self.sortingOrder - (sortingOrder - 1)) + Util.SetParticleSortLayer(starListEffect[i], self.sortingOrder + 1) end sortingOrder = self.sortingOrder end