【声望】修改

dev_chengFeng
ZhangBiao 2021-12-20 15:02:14 +08:00
parent 6d93ab7dca
commit 680b956474
3 changed files with 27 additions and 18 deletions

View File

@ -138,14 +138,13 @@ function ActivityMainPanel:OnOpen(_activityType,_index,change)
this:ClosePanel() this:ClosePanel()
end end
end end
Log("_CurPageIndex:".._CurPageIndex)
end end
-- 打开,重新打开时回调 -- 打开,重新打开时回调
function ActivityMainPanel:OnShow() function ActivityMainPanel:OnShow()
SoundManager.PlayMusic(SoundConfig.BGM_Main) SoundManager.PlayMusic(SoundConfig.BGM_Main)
orginLayer = self.sortingOrder orginLayer = self.sortingOrder
LogGreen("_CurPageIndex OnShow:".._CurPageIndex) Log("_CurPageIndex OnShow:".._CurPageIndex)
if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then
_CurPageIndex = #tabs _CurPageIndex = #tabs
end end

View File

@ -152,12 +152,17 @@ function EveryDayGiftNew:SetGrowGift()
--计算当前声望等级 --计算当前声望等级
if DynamicActivityManager.curLevel == 0 then if DynamicActivityManager.curLevel == 0 then
for i = 1, #growData do for i = 1, #growData do
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then
DynamicActivityManager.curLevel = i if rechargeNum ~= 0 then
if DynamicActivityManager.Index == 0 then DynamicActivityManager.curLevel = i
DynamicActivityManager.Index = DynamicActivityManager.curLevel if DynamicActivityManager.Index == 0 then
DynamicActivityManager.Index = DynamicActivityManager.curLevel
end
break
else
DynamicActivityManager.curLevel = 1
DynamicActivityManager.Index = 1
end end
break
end end
end end
end end
@ -169,7 +174,7 @@ function EveryDayGiftNew:SetGrowGift()
end end
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] local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
self:RefreshReward(data) self:RefreshReward(data)
@ -198,7 +203,7 @@ function EveryDayGiftNew:RefreshReward(Data)
if DynamicActivityManager.Index < 2 then if DynamicActivityManager.Index < 2 then
num = growData[2].data.shopItemData.BuyRule[2] num = growData[2].data.shopItemData.BuyRule[2]
elseif DynamicActivityManager.Index + 1 > #growData then elseif DynamicActivityManager.Index + 1 > #growData then
text = #growData text = #growData-1
num = growData[#growData].data.shopItemData.BuyRule[2] num = growData[#growData].data.shopItemData.BuyRule[2]
else else
text = DynamicActivityManager.Index-1 text = DynamicActivityManager.Index-1
@ -209,7 +214,7 @@ function EveryDayGiftNew:RefreshReward(Data)
elseif DynamicActivityManager.curLevel + 1 > #growData then elseif DynamicActivityManager.curLevel + 1 > #growData then
self.tip.text = "" self.tip.text = ""
else 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 end
local size = rechargeNum/num local size = rechargeNum/num

View File

@ -76,12 +76,17 @@ function RechargeViewNew:SetGrowGift()
--计算当前声望等级 --计算当前声望等级
if DynamicActivityManager.curLevel == 0 then if DynamicActivityManager.curLevel == 0 then
for i = 1, #growData do for i = 1, #growData do
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then
DynamicActivityManager.curLevel = i if rechargeNum ~= 0 then
if DynamicActivityManager.Index == 0 then DynamicActivityManager.curLevel = i
DynamicActivityManager.Index = DynamicActivityManager.curLevel if DynamicActivityManager.Index == 0 then
DynamicActivityManager.Index = DynamicActivityManager.curLevel
end
break
else
DynamicActivityManager.curLevel = 1
DynamicActivityManager.Index = 1
end end
break
end end
end end
end end
@ -93,7 +98,7 @@ function RechargeViewNew:SetGrowGift()
end end
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] local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
self:RefreshReward(data) self:RefreshReward(data)
@ -122,7 +127,7 @@ function RechargeViewNew:RefreshReward(Data)
if DynamicActivityManager.Index < 2 then if DynamicActivityManager.Index < 2 then
num = growData[2].data.shopItemData.BuyRule[2] num = growData[2].data.shopItemData.BuyRule[2]
elseif DynamicActivityManager.Index + 1 > #growData then elseif DynamicActivityManager.Index + 1 > #growData then
text = #growData text = #growData-1
num = growData[#growData].data.shopItemData.BuyRule[2] num = growData[#growData].data.shopItemData.BuyRule[2]
else else
text = DynamicActivityManager.Index-1 text = DynamicActivityManager.Index-1
@ -133,7 +138,7 @@ function RechargeViewNew:RefreshReward(Data)
elseif DynamicActivityManager.curLevel + 1 > #growData then elseif DynamicActivityManager.curLevel + 1 > #growData then
self.tip.text = "" self.tip.text = ""
else 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 end
local size = rechargeNum/num local size = rechargeNum/num