【商城界面】提交
parent
7d02fd5394
commit
45241e1d5d
|
|
@ -15,6 +15,7 @@ this.selectIndex = {dataType = 0,goodsId = {}}
|
|||
this.selectIndex2 = {dataType = 0,goodsId = {}}
|
||||
this.NiuQiIndex = 1
|
||||
this.Index = 0--成长礼包需要的index
|
||||
this.curLevel = 0--当前声望等级
|
||||
|
||||
this.TaiChuMiJuanData = {}
|
||||
function this.SetTaiChuMiJuanData(msg,fun)
|
||||
|
|
|
|||
|
|
@ -737,7 +737,7 @@ function this.PaySuccess(buffer)
|
|||
PopupTipPanel.ShowTip(tip)
|
||||
--FirstRechargeManager.RefreshAccumRechargeValue(msg.goodsId)
|
||||
-- 延时0.5秒刷新。避免sdk支付时商店次数未刷新,界面刷新的问题
|
||||
DynamicActivityManager.growStateIndex = 0
|
||||
DynamicActivityManager.Index = 0
|
||||
Timer.New(function()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.MoneyPay.OnPayResultSuccess, msg.goodsId)
|
||||
end, 0.5):Start()
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ function EveryDayGiftNew:BindEvent()
|
|||
FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
MonthCardManager.CheckMonthCardPatFace()
|
||||
self:RefreshData(nil,false,false)
|
||||
end)
|
||||
end)
|
||||
|
|
@ -149,20 +150,24 @@ function EveryDayGiftNew:SetGrowGift()
|
|||
return a.data.shopItemData.BuyRule[2] < b.data.shopItemData.BuyRule[2]
|
||||
end)
|
||||
--计算当前声望等级
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
if DynamicActivityManager.curLevel == 0 then
|
||||
for i = 1, #growData do
|
||||
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.Index = i
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.curLevel = DynamicActivityManager.Index
|
||||
end
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
--如果所有都没有,说明超范围了
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = #growData
|
||||
if DynamicActivityManager.curLevel == 0 then
|
||||
DynamicActivityManager.curLevel = #growData
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.curLevel = DynamicActivityManager.Index
|
||||
end
|
||||
end
|
||||
--先设置上部是空的
|
||||
self.tip.text = ""
|
||||
|
||||
-- LogRed("当前声望Index:"..tostring(DynamicActivityManager.Index))
|
||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||
|
|
@ -199,6 +204,13 @@ function EveryDayGiftNew:RefreshReward(Data)
|
|||
text = DynamicActivityManager.Index-1
|
||||
num = growData[DynamicActivityManager.Index].data.shopItemData.BuyRule[2]
|
||||
end
|
||||
if DynamicActivityManager.curLevel < 2 then
|
||||
self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum)
|
||||
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)
|
||||
end
|
||||
|
||||
local size = rechargeNum/num
|
||||
size = size > 1 and 1 or size
|
||||
|
|
|
|||
|
|
@ -74,20 +74,24 @@ function RechargeViewNew:SetGrowGift()
|
|||
return a.data.shopItemData.BuyRule[2] < b.data.shopItemData.BuyRule[2]
|
||||
end)
|
||||
--计算当前声望等级
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
if DynamicActivityManager.curLevel == 0 then
|
||||
for i = 1, #growData do
|
||||
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.Index = i
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.curLevel = DynamicActivityManager.Index
|
||||
end
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
--如果所有都没有,说明超范围了
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = #growData
|
||||
if DynamicActivityManager.curLevel == 0 then
|
||||
DynamicActivityManager.curLevel = #growData
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.curLevel = DynamicActivityManager.Index
|
||||
end
|
||||
end
|
||||
--先设置上部是空的
|
||||
self.tip.text = ""
|
||||
|
||||
-- LogRed("当前声望Index:"..tostring(DynamicActivityManager.Index))
|
||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||
|
|
@ -124,6 +128,13 @@ function RechargeViewNew:RefreshReward(Data)
|
|||
text = DynamicActivityManager.Index-1
|
||||
num = growData[DynamicActivityManager.Index].data.shopItemData.BuyRule[2]
|
||||
end
|
||||
if DynamicActivityManager.curLevel < 2 then
|
||||
self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum)
|
||||
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)
|
||||
end
|
||||
|
||||
local size = rechargeNum/num
|
||||
size = size > 1 and 1 or size
|
||||
|
|
|
|||
Loading…
Reference in New Issue