【主题活动】商店

dev_chengFeng
ZhangBiao 2021-07-23 19:05:53 +08:00
parent d571e3126d
commit 38bbb808b4
4 changed files with 5 additions and 3 deletions

View File

@ -1239,6 +1239,7 @@ ActivityTypeDef = {
ChaoFanRuSheng = 500, --超凡入圣
JourneyWithWind = 72, --缥缈之旅
FifteenDayGiftNotice = 80,--15日登陆预告
DynamicActShop = 81,--主题活动商店
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {

View File

@ -141,7 +141,7 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
--LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
-- LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
for n, m in ipairs(v.mission) do
--LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then

View File

@ -70,7 +70,7 @@ function ActivityMainPanel:CheckActOpen(_index)
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType)
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then
if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then
if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero then
if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[_index].ActiveType == ActivityTypeDef.DynamicActShop then
_CurPageIndex = _index
elseif GlobalActConfig[id].ShowArt == this.activityType then
_CurPageIndex = _index
@ -216,7 +216,7 @@ function this.PageTabAdapter(tab, index, status)
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActiveType)
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) then
if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then
if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero then
if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[index].ActiveType == ActivityTypeDef.DynamicActShop then
isshow = true
elseif GlobalActConfig[id].ShowArt == this.activityType then
isshow = true

View File

@ -156,6 +156,7 @@ function ShopViewNew:OnShow(_sortingOrder)
end
end
self.ShopType = self.actConfig.ShopData[1][1]
-- LogYellow("self.ShopType:"..tostring(self.ShopType))
if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then
self.parent.tabbox.gameObject:SetActive(false)
else