From bc854c038999d6c973342480e3916d41d9f4cdef Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 25 Jul 2022 16:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=95=B0=E5=AD=97=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E3=80=91=3D=3D=3D=3D=E6=9C=80=E5=90=8E=E4=B8=80=E5=85=B3?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua | 7 ++++++- .../~Lua/Modules/RatioNumber/RatioNumberManager.lua | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua index 4214d41747..581cad7135 100644 --- a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua @@ -390,8 +390,13 @@ function this.ShowDayDataActivityReward() end, Language[10731], Language[10019],nil, false) end else + --LogError("3333333333333") if curRewardTaskData.state == 0 then - PopupTipPanel.ShowTip("完成当日所有目标才可领取!") + --PopupTipPanel.ShowTip("完成当日所有目标才可领取!") + MsgPanel.ShowTwo("当前仍有未激活的月卡,是否前往查看激活?", function() + end, function() + JumpManager.GoJump(36004) + end, Language[10731], Language[10019],nil, false) end end end) diff --git a/Assets/ManagedResources/~Lua/Modules/RatioNumber/RatioNumberManager.lua b/Assets/ManagedResources/~Lua/Modules/RatioNumber/RatioNumberManager.lua index 58455afc70..abf2373668 100644 --- a/Assets/ManagedResources/~Lua/Modules/RatioNumber/RatioNumberManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RatioNumber/RatioNumberManager.lua @@ -127,6 +127,10 @@ function this.CheckRedPoint() end end end + --最后一关 + if this.chapterId==8 and this.levelId==16 then + return false + end return isShow end