Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-09-23 14:51:15 +08:00
commit 524521d526
3 changed files with 4 additions and 2 deletions

View File

@ -1299,6 +1299,7 @@ ActivityTypeDef = {
FifteenDayGiftNotice = 80,--15日登陆预告
DynamicActShop = 81,--主题活动商店
QiJieTreasure = 83,--七界秘宝
linglongshangshi = 20005,
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {
@ -2430,6 +2431,7 @@ DirectBuyType = {
XIANSHISHANGSHI = 22, --限时商市
ZHENQIBAOGE = 23, --珍奇宝阁
XINRENSHANGCHENG = 30, --新人商城
linglongShagnshi = 40,
}
--新月卡类型定义
MONTH_CARD_TYPE = {

View File

@ -130,7 +130,7 @@ function EveryDayGift:OnShow(_sortingOrder)
end
end
if self.actType == ActivityTypeDef.DynamicAct_Treasure or self.actType == ActivityTypeDef.DynamicAct_TimeLimitShop then
if self.actType == ActivityTypeDef.DynamicAct_Treasure or self.actType == ActivityTypeDef.DynamicAct_TimeLimitShop or self.actType == ActivityTypeDef.linglongshangshi then
self.parent.tabbox.gameObject:SetActive(false)
else
self.parent.tabbox.gameObject:SetActive(true)

View File

@ -255,7 +255,7 @@ function GiftPre:SetContent1()
if self.data.DataType == DataType.Direct and self.data.buyType == DirectBuyType.DAILY_GIFT then--每日礼包
self:SetType2()
elseif self.data.DataType == DataType.Direct and (self.data.buyType == DirectBuyType.WEEK_GIFT or self.data.buyType == DirectBuyType.MONTH_GIFT or self.data.buyType == DirectBuyType.XIANSHISHANGSHI or self.data.buyType == DirectBuyType.ZHENQIBAOGE) then--周月礼包
elseif self.data.DataType == DataType.Direct and (self.data.buyType == DirectBuyType.WEEK_GIFT or self.data.buyType == DirectBuyType.MONTH_GIFT or self.data.buyType == DirectBuyType.XIANSHISHANGSHI or self.data.buyType == DirectBuyType.ZHENQIBAOGE or self.data.buyType == DirectBuyType.linglongShagnshi) then--周月礼包
self.grid:GetComponent("RectTransform").anchoredPosition = offSetX[1].scroll
self.upLayout.gameObject:SetActive(false)
elseif self.data.DataType == DataType.Shop and self.data.buyType == SHOP_TYPE.VIP_GIFT then--特权