【提交】

dev_chengFeng
ZhangBiao 2021-07-26 15:07:49 +08:00
parent da34a5834b
commit 07de90eb45
2 changed files with 12 additions and 6 deletions

View File

@ -224,7 +224,7 @@ end
function this.InitTaskData(curData,taskType,configName)
local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId)
local allMissionData = TaskManager.GetTypeTaskList(taskType)
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
Log("this.DynamicActType:"..this.DynamicActType)
for i=1,#allListData do
for j=1,#allMissionData do
-- LogGreen("this.DynamicActType:"..this.DynamicActType)

View File

@ -1,5 +1,6 @@

local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig)
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
-- 通用得商店逻辑
local ShopViewNew = {}
local sortingOrder = 0
@ -148,15 +149,19 @@ function ShopViewNew:OnShow(_sortingOrder)
LogGreen("id:"..id)
if id and id > 0 then
self.actId = id
local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id)
if config then
self.actConfig = config
local actConfig
local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType)
if not actConfig then
actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType)
end
if actConfig then
self.actConfig = actConfig
end
end
end
end
end
self.ShopType = self.actConfig.ShopData[1][1]
-- LogYellow("self.ShopType:"..tostring(self.ShopType))
LogYellow("self.ShopType:"..tostring(self.ShopType))
if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then
self.parent.tabbox.gameObject:SetActive(false)
else
@ -172,6 +177,7 @@ function ShopViewNew:ShowShop()
end)
-- 红点销毁
self.refreshRedpot:SetActive(false)
LogYellow("self.ShopType:"..tostring(self.ShopType))
self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id
self.ShopConfig = _ShopTypeConfig[self.ShopId]
-- 显示帮助按钮