From 90bba41910e6bc9180b92d6e79fef74a51de6c8d Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 20 May 2021 15:47:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=9D=83=E5=8A=A0?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=A5=96=E5=8A=B1=E3=80=913?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Login/LoginPanel.lua | 2 +- .../~Lua/Modules/Net/IndicationManager.lua | 2 +- .../~Lua/Modules/Vip/VipManager.lua | 17 ++++++++--------- .../~Lua/Modules/Vip/VipPanelV2.lua | 7 ++++++- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 2e52453c9f..2f41f3f0cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -465,7 +465,7 @@ function this.ExecuteLoading() function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, function() NetManager.HardStageRequest(LoadingPanel.OnStep) end, - -- function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, + function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, --[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前 -- 登录成功确认 NetManager.LoginConfimRequest() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 830ffcbb08..f9319c69e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -920,7 +920,7 @@ end --Vip等级奖励推送 function this.RefreshLevleRewardDatas(buffer) local data = buffer:DataByte() - local msg = PlayerInfoProto_pb.VipLevelStateRewardResponse() + local msg = PlayerInfoProto_pb.VipLevelStateResponse() msg:ParseFromString(data) VipManager.InitLevleRewardDatas(msg) end diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua index ee735dcc00..f902db30b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua @@ -397,13 +397,13 @@ end function this.CheckNewVipRP() --等级奖励红点 local vipCurLevel = VipManager.GetVipLevel() - -- if levleRewardDatas then - -- for i = 0, #levleRewardDatas do - -- if levleRewardDatas[i].val and levleRewardDatas[i].val == 1 then - -- return true - -- end - -- end - -- end + if levleRewardDatas and #levleRewardDatas > 0 then + for i = 1, #levleRewardDatas do + if levleRewardDatas[i] == 1 then + return true + end + end + end if vipCurLevel >= VipManager.GetMaxVipLevel() then return false @@ -477,9 +477,8 @@ function this.GetAddPro() end --levleRewardDatas vip特权等级奖励初始化 function this.InitLevleRewardDatas(msg) - LogError("----------------------------------") for i = 1, #msg.vipState do - LogError("msg.vipState[i].key "..msg.vipState[i].key.." val "..msg.vipState[i].val) + -- LogPink("msg.vipState[i].key "..msg.vipState[i].key.." val "..msg.vipState[i].val) levleRewardDatas[msg.vipState[i].key] = msg.vipState[i].val--val 0 不可领取 1 可领取 2已领取 end end diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua index 815829c981..870d551f8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua @@ -544,10 +544,15 @@ function VipPanelV2:ShowRewardInfo(level) LogYellow("level "..level) local state = VipManager.GetLevleRewardDatas(level)--0 未领取 1 已领取 local vipCurLevel = VipManager.GetVipLevel() - if state == 0 or state == 1 then + if state == 0 then self.getReawardBtnText.text = Language[10018] + Util.SetGray(self.getReawardBtn, true) + elseif state == 1 then + self.getReawardBtnText.text = Language[10018] + Util.SetGray(self.getReawardBtn, false) elseif state == 2 then self.getReawardBtnText.text = Language[10101] + Util.SetGray(self.getReawardBtn, false) end local curConfig = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, level) local reward = curConfig.Reward From fc1dc601192222975990068a90f7d802101029be Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 20 May 2021 16:11:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=9D=83=E5=8A=A0?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=A5=96=E5=8A=B1=E3=80=914?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Vip/VipManager.lua | 10 ++++++++++ .../ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua index f902db30b4..e1593f5bbc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua @@ -495,4 +495,14 @@ function this.GetLevleRewardDatas(key) end end +function this.GetCurMinCanGetRewardLevel() + if levleRewardDatas and #levleRewardDatas > 0 then + for i = 1, #levleRewardDatas do + if levleRewardDatas[i] == 1 then + return i + end + end + end + return math.min(VipManager.GetVipLevel() + 1, VipManager.GetMaxVipLevel()) +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua index 870d551f8a..2349548e1c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua @@ -202,7 +202,7 @@ function VipPanelV2:SetPanelStatus() local maxLv = VipManager.GetMaxVipLevel() self.curLevel.sprite = this.spLoader:LoadSprite("r_zjm_tequanpaizi_0" .. self.context.vipLevel.."_zh") -- 显示的 - self.curShowLevel = math.min(self.context.vipLevel + 1, maxLv) + self.curShowLevel = VipManager.GetCurMinCanGetRewardLevel()--math.min(self.context.vipLevel + 1, maxLv) self:RefreshPanelStatus(self.curShowLevel) self:CheckTaskShow() self.BtnLeft:SetActive(self.curShowLevel > 1) @@ -541,7 +541,6 @@ function this.CheckVipLvPos(tarObj,lv) end --奖励 function VipPanelV2:ShowRewardInfo(level) - LogYellow("level "..level) local state = VipManager.GetLevleRewardDatas(level)--0 未领取 1 已领取 local vipCurLevel = VipManager.GetVipLevel() if state == 0 then