【牛气冲天】提交

dev_chengFeng
ZhangBiao 2021-03-22 11:09:49 +08:00
parent 16a933e530
commit 3d665074a2
3 changed files with 29 additions and 8 deletions

View File

@ -1101,6 +1101,7 @@ ActivityTypeDef = {
EightDayGift = 56,--八日登陆 EightDayGift = 56,--八日登陆
SignInfo = 57,--三日七日签到 SignInfo = 57,--三日七日签到
NiuZhuan = 61,--牛转乾坤 NiuZhuan = 61,--牛转乾坤
NiuQi = 62,--牛气冲天
--主题活动 --主题活动
ShengXingYouLi=50,--升星有礼(指定猎妖师进阶) ShengXingYouLi=50,--升星有礼(指定猎妖师进阶)

View File

@ -370,6 +370,7 @@ UIName = {
NiuZhuanQianKunPanel = 377,--牛转钱坤界面 NiuZhuanQianKunPanel = 377,--牛转钱坤界面
BattleBossInfoPanel = 379,--战斗boss详情界面 BattleBossInfoPanel = 379,--战斗boss详情界面
SysPanel = 380,--系统消息弹窗 SysPanel = 380,--系统消息弹窗
NiuQiChongTianPanel = 382,--牛气冲天
} }
SubUIConfig = { SubUIConfig = {

View File

@ -674,21 +674,38 @@ function this.CreatActivity()
--绑定新的红点 --绑定新的红点
BindRedPointObject(v.RpType,activityTabs[k].redpot) BindRedPointObject(v.RpType,activityTabs[k].redpot)
end end
if v.ActiveType > 0 then if v.ActiveType > 0 then
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then
local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0) local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0)
if tempConfig then if tempConfig then
activityTabs[k].img.sprite = Util.LoadSprite(tempConfig.Icon[1]) activityTabs[k].img.sprite = Util.LoadSprite(tempConfig.Icon[1])
else else
activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1]) activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1])
end end
else else
activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1]) activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1])
end end
else else
activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1]) activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1])
end end
--开发用
-- LogGreen("v.ActiveType:"..v.ActiveType)
-- if v.ActiveType == 62 then
-- local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
-- LogRed("activityId:"..tostring(activityId))
-- LogRed("IsQualifiled:"..tostring(ActivityGiftManager.IsQualifiled(v.ActiveType)))
-- local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0)
-- local imageName = ""
-- if activityId and activityId > 0 and tempConfig then
-- imageName = tempConfig.Icon[1]
-- else
-- imageName = v.Icon[1]
-- end
-- LogRed("imageName:"..tostring(imageName))
-- end
activityTabs[k].img:SetNativeSize() activityTabs[k].img:SetNativeSize()
Util.AddOnceClick(activityTabs[k].go,function() Util.AddOnceClick(activityTabs[k].go,function()
if v.ActiveType > 0 then if v.ActiveType > 0 then
@ -732,6 +749,8 @@ function this:TabBtnAction(id,actType,data)
UIManager.OpenPanel(UIName.SupremeHeroPopup) UIManager.OpenPanel(UIName.SupremeHeroPopup)
elseif id == ActivityTypeDef.NiuZhuan then elseif id == ActivityTypeDef.NiuZhuan then
UIManager.OpenPanel(UIName.NiuZhuanQianKunPanel) UIManager.OpenPanel(UIName.NiuZhuanQianKunPanel)
elseif id == ActivityTypeDef.NiuQi then
UIManager.OpenPanel(UIName.NiuQiChongTianPanel)
end end
elseif actType == 2 then elseif actType == 2 then
if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then