diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 8a2ba958d3..c7b37be884 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -138,14 +138,13 @@ function ActivityMainPanel:OnOpen(_activityType,_index,change) this:ClosePanel() end end - Log("_CurPageIndex:".._CurPageIndex) end -- 打开,重新打开时回调 function ActivityMainPanel:OnShow() SoundManager.PlayMusic(SoundConfig.BGM_Main) orginLayer = self.sortingOrder - LogGreen("_CurPageIndex OnShow:".._CurPageIndex) + Log("_CurPageIndex OnShow:".._CurPageIndex) if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then _CurPageIndex = #tabs end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 3d667cb845..3040470be2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -152,12 +152,17 @@ function EveryDayGiftNew:SetGrowGift() --计算当前声望等级 if DynamicActivityManager.curLevel == 0 then for i = 1, #growData do - if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then - DynamicActivityManager.curLevel = i - if DynamicActivityManager.Index == 0 then - DynamicActivityManager.Index = DynamicActivityManager.curLevel + if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then + if rechargeNum ~= 0 then + DynamicActivityManager.curLevel = i + if DynamicActivityManager.Index == 0 then + DynamicActivityManager.Index = DynamicActivityManager.curLevel + end + break + else + DynamicActivityManager.curLevel = 1 + DynamicActivityManager.Index = 1 end - break end end end @@ -169,7 +174,7 @@ function EveryDayGiftNew:SetGrowGift() end end - -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) + Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) @@ -198,7 +203,7 @@ function EveryDayGiftNew:RefreshReward(Data) if DynamicActivityManager.Index < 2 then num = growData[2].data.shopItemData.BuyRule[2] elseif DynamicActivityManager.Index + 1 > #growData then - text = #growData + text = #growData-1 num = growData[#growData].data.shopItemData.BuyRule[2] else text = DynamicActivityManager.Index-1 @@ -209,7 +214,7 @@ function EveryDayGiftNew:RefreshReward(Data) elseif DynamicActivityManager.curLevel + 1 > #growData then self.tip.text = "" else - self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel) + self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) end local size = rechargeNum/num diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 817e22622c..86ac6cfec0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -76,12 +76,17 @@ function RechargeViewNew:SetGrowGift() --计算当前声望等级 if DynamicActivityManager.curLevel == 0 then for i = 1, #growData do - if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then - DynamicActivityManager.curLevel = i - if DynamicActivityManager.Index == 0 then - DynamicActivityManager.Index = DynamicActivityManager.curLevel + if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then + if rechargeNum ~= 0 then + DynamicActivityManager.curLevel = i + if DynamicActivityManager.Index == 0 then + DynamicActivityManager.Index = DynamicActivityManager.curLevel + end + break + else + DynamicActivityManager.curLevel = 1 + DynamicActivityManager.Index = 1 end - break end end end @@ -93,7 +98,7 @@ function RechargeViewNew:SetGrowGift() end end - -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) + Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) @@ -122,7 +127,7 @@ function RechargeViewNew:RefreshReward(Data) if DynamicActivityManager.Index < 2 then num = growData[2].data.shopItemData.BuyRule[2] elseif DynamicActivityManager.Index + 1 > #growData then - text = #growData + text = #growData-1 num = growData[#growData].data.shopItemData.BuyRule[2] else text = DynamicActivityManager.Index-1 @@ -133,7 +138,7 @@ function RechargeViewNew:RefreshReward(Data) elseif DynamicActivityManager.curLevel + 1 > #growData then self.tip.text = "" else - self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel) + self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) end local size = rechargeNum/num