From ad2ec008812fa613b27f28882f4e1714c525d87f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 15:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E9=95=BF=E5=9F=BA=E9=87=91=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E9=9A=90=E5=8A=A0=E5=85=A5=E7=A4=BC=E5=8C=85=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 2 ++ .../~Lua/Modules/Operating/OperatingPanel.lua | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 8aff68d615..8ce9ebb398 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -44,7 +44,7 @@ function this.LoginRequest(openId, func) data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or "" data.openId = openId data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid - data.platform_s = AppConst.isSDK and "ADR" or "PC" + data.platform_s = AppConst.Platform --and "ADR" or "PC" local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.LOGIN_REQUEST, MessageTypeProto_pb.LOGIN_RESPONSE, msg, function(buffer) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 13d7d84879..cf3fed272f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -201,6 +201,8 @@ end function this.GetGrowthRedPointState() local redPoint = false + local hasGift = OperatingManager.HasGoodsByShowType(4) + if not hasGift then return false end local giftGoodsInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward) if giftGoodsInfo then return false end local openId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index c0d584e4a0..d878fe0cc1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -215,12 +215,15 @@ function OperatingPanel:RefreshTabStatus() --判断成长基金活动是否开启或结束(16是最后一档活动ActivityId) local t2 = false local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) - local singleRewardData if GrowthRewardId then--是否开启 t2 = true end - if GrowthRewardId == 16 then--是否结束 - singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324) + local hasGift = OperatingManager.HasGoodsByShowType(4) + if t2 and not hasGift then + t2 = false + end + if t2 and GrowthRewardId == 16 then--是否结束 + local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324) if not singleRewardData then t2 = false else