【商城界面】提交
parent
0aff8013ad
commit
5393485f65
|
@ -14,8 +14,7 @@ this.OpenUIList = {}
|
|||
this.selectIndex = {dataType = 0,goodsId = {}}
|
||||
this.selectIndex2 = {dataType = 0,goodsId = {}}
|
||||
this.NiuQiIndex = 1
|
||||
this.growIndex = 0
|
||||
this.growcurIndex = 0
|
||||
this.Index = 0--成长礼包需要的index
|
||||
|
||||
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.growIndex = 0
|
||||
DynamicActivityManager.growStateIndex = 0
|
||||
Timer.New(function()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.MoneyPay.OnPayResultSuccess, msg.goodsId)
|
||||
end, 0.5):Start()
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
local EveryDayGiftNew = {}
|
||||
local rechargeNum = 0
|
||||
local growIndex = 0
|
||||
local growData = {}
|
||||
local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
|
||||
local onKeyPackId = 1008
|
||||
|
@ -140,62 +139,72 @@ function EveryDayGiftNew:RefreshData(none,isTop,isAni)
|
|||
-- 刷新一键购买显示
|
||||
self:RefreshOneKeyShow()
|
||||
end
|
||||
-- local actData = ActivityGiftManager.GetActivityTypeInfo(89)
|
||||
-- if actData then
|
||||
-- LogYellow("actData.id:"..tostring(actData.activityId).." time:"..tostring(actData.endTime))
|
||||
-- for i = 1, 3 do
|
||||
-- LogGreen("missionId:"..tostring(actData.mission[i].missionId).." state:"..tostring(actData.mission[i].state))
|
||||
-- end
|
||||
-- end
|
||||
end
|
||||
|
||||
--==============================成长礼包部分==========================
|
||||
--==============================成长礼包部分==========================(rechargeViewNew中有完全相同的部分,复制过去)
|
||||
function EveryDayGiftNew:SetGrowGift()
|
||||
growData = DynamicActivityManager.GetGiftDataByType({{2,20}})
|
||||
local rechargeNum = VipManager.GetChargedNum()--已经充值的金额
|
||||
table.sort(growData,function (a,b)
|
||||
return a.data.shopItemData.BuyRule[2] < b.data.shopItemData.BuyRule[2]
|
||||
end)
|
||||
if DynamicActivityManager.growIndex == 0 then
|
||||
--计算当前声望等级
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
for i = 1, #growData do
|
||||
-- LogGreen(i..": rule:"..tostring(growData[i].data.shopItemData.BuyRule[2]).." data?"..tostring(growData[i]))
|
||||
if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.growIndex = i
|
||||
DynamicActivityManager.growcurIndex = i
|
||||
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.Index = i
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
growIndex = DynamicActivityManager.growIndex
|
||||
self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.growcurIndex].data.shopItemData.BuyRule[2] - rechargeNum, DynamicActivityManager.growcurIndex)
|
||||
self:RefreshReward(growData[growIndex],growIndex)
|
||||
--如果所有都没有,说明超范围了
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = #growData
|
||||
end
|
||||
--先设置上部是空的
|
||||
self.tip.text = ""
|
||||
|
||||
LogRed("当前声望Index:"..tostring(DynamicActivityManager.Index))
|
||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
|
||||
self:RefreshReward(data)
|
||||
|
||||
Util.AddOnceClick(self.btnLeft,function ()
|
||||
if growData[growIndex - 1] then
|
||||
DynamicActivityManager.growIndex = DynamicActivityManager.growIndex - 1
|
||||
growIndex = growIndex - 1
|
||||
self:RefreshReward(growData[growIndex],growIndex)
|
||||
if growData[DynamicActivityManager.Index - 1] then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.Index - 1
|
||||
self:RefreshReward(growData[DynamicActivityManager.Index])
|
||||
end
|
||||
end)
|
||||
Util.AddOnceClick(self.btnRight,function ()
|
||||
if growData[growIndex + 1] then
|
||||
DynamicActivityManager.growIndex = DynamicActivityManager.growIndex + 1
|
||||
growIndex = growIndex + 1
|
||||
self:RefreshReward(growData[growIndex])
|
||||
if growData[DynamicActivityManager.Index + 1] then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.Index + 1
|
||||
self:RefreshReward(growData[DynamicActivityManager.Index])
|
||||
end
|
||||
end)
|
||||
end
|
||||
--刷新奖励、按钮显示
|
||||
function EveryDayGiftNew:RefreshReward(Data)
|
||||
local rechargeNum = VipManager.GetChargedNum()--已经充值的金额
|
||||
self.btnLeft:SetActive(not not growData[growIndex - 1])
|
||||
self.btnRight:SetActive(not not growData[growIndex + 1])
|
||||
-- LogPink(growIndex.." 金额:"..tostring(Data.data.shopItemData.BuyRule[2]).." 限购:"..tostring(Data.data.limitNum).." 已购:"..tostring(Data.data.boughtNum).." rechargeNum:"..tostring(rechargeNum))
|
||||
self.icon.sprite = self.spLoader:LoadSprite("t_tequan_vip"..growIndex-1)
|
||||
self.btnLeft:SetActive(not not growData[DynamicActivityManager.Index - 1])--左按钮显示
|
||||
self.btnRight:SetActive(not not growData[DynamicActivityManager.Index + 1])--右按钮显示
|
||||
-- LogPink(DynamicActivityManager.Index.." 金额:"..tostring(Data.data.shopItemData.BuyRule[2]).." 限购:"..tostring(Data.data.limitNum).." 已购:"..tostring(Data.data.boughtNum).." rechargeNum:"..tostring(rechargeNum))
|
||||
local text = 0
|
||||
local num = 0
|
||||
if DynamicActivityManager.Index < 2 then
|
||||
num = growData[2].data.shopItemData.BuyRule[2]
|
||||
elseif DynamicActivityManager.Index + 1 > #growData then
|
||||
text = DynamicActivityManager.Index
|
||||
num = growData[#growData].data.shopItemData.BuyRule[2]
|
||||
else
|
||||
text = DynamicActivityManager.Index-1
|
||||
num = growData[DynamicActivityManager.Index].data.shopItemData.BuyRule[2]
|
||||
end
|
||||
|
||||
local size = rechargeNum/Data.data.shopItemData.BuyRule[2]
|
||||
local size = rechargeNum/num
|
||||
size = size > 1 and 1 or size
|
||||
self.icon.sprite = self.spLoader:LoadSprite("t_tequan_vip"..text)
|
||||
self.progress:GetComponent("RectTransform").sizeDelta = Vector3.New(483*size,12,0)
|
||||
self.value.text = string.format("%s/%s",rechargeNum,Data.data.shopItemData.BuyRule[2])
|
||||
self.value.text = string.format("%s/%s",rechargeNum,num)
|
||||
self.price.text = Data.data.price
|
||||
self.btnRed:SetActive(false)
|
||||
|
||||
|
@ -417,7 +426,6 @@ function EveryDayGiftNew:OnDestroy()
|
|||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
DynamicActivityManager.growIndex = 0
|
||||
end
|
||||
|
||||
--特权商城专属
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
local RechargeViewNew = {}
|
||||
local growIndex = 0
|
||||
local growData = {}
|
||||
function RechargeViewNew:New(gameObject)
|
||||
local b = {}
|
||||
|
@ -67,53 +66,70 @@ function RechargeViewNew:OnShow(_sortingOrder)
|
|||
self:SetGrowGift()
|
||||
end
|
||||
|
||||
--==============================成长礼包部分==========================
|
||||
--==============================成长礼包部分==========================(rechargeViewNew中有完全相同的部分,复制过去)
|
||||
function RechargeViewNew:SetGrowGift()
|
||||
growData = DynamicActivityManager.GetGiftDataByType({{2,20}})
|
||||
local rechargeNum = VipManager.GetChargedNum()--已经充值的金额
|
||||
table.sort(growData,function (a,b)
|
||||
return a.data.shopItemData.BuyRule[2] < b.data.shopItemData.BuyRule[2]
|
||||
end)
|
||||
if DynamicActivityManager.growIndex == 0 then
|
||||
--计算当前声望等级
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
for i = 1, #growData do
|
||||
-- LogGreen(i..": rule:"..tostring(growData[i].data.shopItemData.BuyRule[2]).." data?"..tostring(growData[i]))
|
||||
if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.growIndex = i
|
||||
DynamicActivityManager.growcurIndex = i
|
||||
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.Index = i
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
growIndex = DynamicActivityManager.growIndex
|
||||
self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.growcurIndex].data.shopItemData.BuyRule[2] - rechargeNum, DynamicActivityManager.growcurIndex)
|
||||
self:RefreshReward(growData[growIndex],growIndex)
|
||||
--如果所有都没有,说明超范围了
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = #growData
|
||||
end
|
||||
--先设置上部是空的
|
||||
self.tip.text = ""
|
||||
|
||||
LogRed("当前声望Index:"..tostring(DynamicActivityManager.Index))
|
||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
|
||||
self:RefreshReward(data)
|
||||
|
||||
Util.AddOnceClick(self.btnLeft,function ()
|
||||
if growData[growIndex - 1] then
|
||||
DynamicActivityManager.growIndex = DynamicActivityManager.growIndex - 1
|
||||
growIndex = growIndex - 1
|
||||
self:RefreshReward(growData[growIndex],growIndex)
|
||||
if growData[DynamicActivityManager.Index - 1] then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.Index - 1
|
||||
self:RefreshReward(growData[DynamicActivityManager.Index])
|
||||
end
|
||||
end)
|
||||
Util.AddOnceClick(self.btnRight,function ()
|
||||
if growData[growIndex + 1] then
|
||||
DynamicActivityManager.growIndex = DynamicActivityManager.growIndex + 1
|
||||
growIndex = growIndex + 1
|
||||
self:RefreshReward(growData[growIndex])
|
||||
if growData[DynamicActivityManager.Index + 1] then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.Index + 1
|
||||
self:RefreshReward(growData[DynamicActivityManager.Index])
|
||||
end
|
||||
end)
|
||||
end
|
||||
--刷新奖励、按钮显示
|
||||
function RechargeViewNew:RefreshReward(Data)
|
||||
local rechargeNum = VipManager.GetChargedNum()--已经充值的金额
|
||||
self.btnLeft:SetActive(not not growData[growIndex - 1])
|
||||
self.btnRight:SetActive(not not growData[growIndex + 1])
|
||||
-- LogPink(growIndex.." 金额:"..tostring(Data.data.shopItemData.BuyRule[2]).." 限购:"..tostring(Data.data.limitNum).." 已购:"..tostring(Data.data.boughtNum).." rechargeNum:"..tostring(rechargeNum))
|
||||
self.icon.sprite = self.spLoader:LoadSprite("t_tequan_vip"..growIndex-1)
|
||||
self.btnLeft:SetActive(not not growData[DynamicActivityManager.Index - 1])--左按钮显示
|
||||
self.btnRight:SetActive(not not growData[DynamicActivityManager.Index + 1])--右按钮显示
|
||||
-- LogPink(DynamicActivityManager.Index.." 金额:"..tostring(Data.data.shopItemData.BuyRule[2]).." 限购:"..tostring(Data.data.limitNum).." 已购:"..tostring(Data.data.boughtNum).." rechargeNum:"..tostring(rechargeNum))
|
||||
local text = 0
|
||||
local num = 0
|
||||
if DynamicActivityManager.Index < 2 then
|
||||
num = growData[2].data.shopItemData.BuyRule[2]
|
||||
elseif DynamicActivityManager.Index + 1 > #growData then
|
||||
text = DynamicActivityManager.Index
|
||||
num = growData[#growData].data.shopItemData.BuyRule[2]
|
||||
else
|
||||
text = DynamicActivityManager.Index-1
|
||||
num = growData[DynamicActivityManager.Index].data.shopItemData.BuyRule[2]
|
||||
end
|
||||
|
||||
local size = rechargeNum/Data.data.shopItemData.BuyRule[2]
|
||||
local size = rechargeNum/num
|
||||
size = size > 1 and 1 or size
|
||||
self.icon.sprite = self.spLoader:LoadSprite("t_tequan_vip"..text)
|
||||
self.progress:GetComponent("RectTransform").sizeDelta = Vector3.New(483*size,12,0)
|
||||
self.value.text = string.format("%s/%s",rechargeNum,Data.data.shopItemData.BuyRule[2])
|
||||
self.value.text = string.format("%s/%s",rechargeNum,num)
|
||||
self.price.text = Data.data.price
|
||||
self.btnRed:SetActive(false)
|
||||
|
||||
|
|
Loading…
Reference in New Issue