Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
e3a34ea941
|
|
@ -3,6 +3,7 @@ local allData={}
|
|||
local itemsGrid = {}--item重复利用
|
||||
local this=XianShiShangShi
|
||||
local parent
|
||||
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
function XianShiShangShi:ctor(mainPanel, gameObject)
|
||||
self.mainPanel = mainPanel
|
||||
self.gameObject = gameObject
|
||||
|
|
@ -47,7 +48,13 @@ function XianShiShangShi:OnShow(_sortingOrder,_parent)
|
|||
XianShiShangShi:SetTime()
|
||||
end
|
||||
function XianShiShangShi:OnShowData()
|
||||
allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 22, "Type", GoodsTypeDef.DirectPurchaseGift)
|
||||
allData={}
|
||||
-- allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 22, "Type", GoodsTypeDef.DirectPurchaseGift)
|
||||
local curActId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_TimeLimitShop)
|
||||
for i = 1, #GlobalActivity[curActId].CanBuyRechargeId do
|
||||
local data = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "Id", GlobalActivity[curActId].CanBuyRechargeId[i])
|
||||
table.insert(allData,data)
|
||||
end
|
||||
if allData then
|
||||
this.SortData(allData)
|
||||
this.ScrollView:SetData(allData, function (index, go)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ local allData={}
|
|||
local itemsGrid = {}--item重复利用
|
||||
local this=ZhenQiYiBaoPage
|
||||
local parent
|
||||
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
function ZhenQiYiBaoPage:ctor(mainPanel, gameObject)
|
||||
self.mainPanel = mainPanel
|
||||
self.gameObject = gameObject
|
||||
|
|
@ -47,7 +48,13 @@ function ZhenQiYiBaoPage:OnShow(_sortingOrder,_parent)
|
|||
ZhenQiYiBaoPage:SetTime()
|
||||
end
|
||||
function ZhenQiYiBaoPage:OnShowData()
|
||||
allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 23, "Type", GoodsTypeDef.DirectPurchaseGift)
|
||||
allData={}
|
||||
-- allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 23, "Type", GoodsTypeDef.DirectPurchaseGift)
|
||||
local curActId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_Treasure)
|
||||
for i = 1, #GlobalActivity[curActId].CanBuyRechargeId do
|
||||
local data = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "Id", GlobalActivity[curActId].CanBuyRechargeId[i])
|
||||
table.insert(allData,data)
|
||||
end
|
||||
if allData then
|
||||
this.SortData(allData)
|
||||
this.ScrollView:SetData(allData, function (index, go)
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ function GrowthGiftPage:RefreshShowData(item, data)
|
|||
|
||||
local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)--当前礼包奖励的活动类型(6\7\8\9\16)(成长礼包的不同档位奖励ActivityId不同,虽然同为成长基金)
|
||||
local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, data.Id)--获取活动数据 self.context.Id
|
||||
local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)--当前礼包ID(101\102\103\104\105)
|
||||
local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1])--当前礼包ID(101\102\103\104\105)
|
||||
local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward)
|
||||
--item
|
||||
local shadow = Util.GetGameObject(item, "shadow")
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ function GrowthGiftTaskItem:OnSortingOrderChange(cursortingOrder)
|
|||
end
|
||||
function GrowthGiftTaskItem:SetValue()
|
||||
local activityInfo = ActivityGiftManager.GetActivityInfo(GrowthRewardId, self.context.Id)--获取活动数据 self.context.Id
|
||||
local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)--判断当前礼包是否已投资
|
||||
local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1])--判断当前礼包是否已投资
|
||||
|
||||
if activityInfo then
|
||||
self.state = activityInfo.state
|
||||
|
|
@ -81,7 +81,7 @@ end
|
|||
|
||||
function GrowthGiftTaskItem:OnBtnDealClicked()
|
||||
local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward)
|
||||
local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)
|
||||
local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1])
|
||||
if not openStatus or (goods and goods.buyTimes < 1) then
|
||||
PopupTipPanel.ShowTip(Language[11474])
|
||||
return
|
||||
|
|
|
|||
Loading…
Reference in New Issue