【特权加等级奖励】3

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()       

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

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

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