Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
5ec2c38563
|
|
@ -1031,7 +1031,7 @@ JumpType = {
|
||||||
XiangYaoDuoBao = 10020,--降妖夺宝
|
XiangYaoDuoBao = 10020,--降妖夺宝
|
||||||
HeadChange = 10021, --巅峰赛
|
HeadChange = 10021, --巅峰赛
|
||||||
XianShiDuiHuan = 10022, --主题活动限时兑换
|
XianShiDuiHuan = 10022, --主题活动限时兑换
|
||||||
ZhuTiHuoDong = 20000,
|
ZhuTiHuoDong = 20000, --主题活动任务
|
||||||
QianKunShangDian = 20044, --乾坤商店
|
QianKunShangDian = 20044, --乾坤商店
|
||||||
SheJiDaDianShangDian = 20060, --社稷大典商店
|
SheJiDaDianShangDian = 20060, --社稷大典商店
|
||||||
XinJiangLaiXiShangDian = 20200, --社稷大典商店
|
XinJiangLaiXiShangDian = 20200, --社稷大典商店
|
||||||
|
|
|
||||||
|
|
@ -67,8 +67,16 @@ function ActivityMainPanel:CheckActOpen(_index)
|
||||||
if tabs[_index].IfBack == 1 then
|
if tabs[_index].IfBack == 1 then
|
||||||
if tabs[_index].ActiveType > 0 then
|
if tabs[_index].ActiveType > 0 then
|
||||||
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType)
|
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType)
|
||||||
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) and (tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt < 1 or GlobalActConfig[id].ShowArt == this.activityType) then
|
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 then
|
||||||
_CurPageIndex = _index
|
_CurPageIndex = _index
|
||||||
|
elseif GlobalActConfig[id].ShowArt == this.activityType then
|
||||||
|
_CurPageIndex = _index
|
||||||
|
end
|
||||||
|
else
|
||||||
|
_CurPageIndex = _index
|
||||||
|
end
|
||||||
end
|
end
|
||||||
elseif tabs[_index].FunType > 0 then
|
elseif tabs[_index].FunType > 0 then
|
||||||
if ActTimeCtrlManager.SingleFuncState(tabs[_index].FunType) then
|
if ActTimeCtrlManager.SingleFuncState(tabs[_index].FunType) then
|
||||||
|
|
@ -96,12 +104,12 @@ end
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function ActivityMainPanel:OnOpen(_activityType,_index)
|
function ActivityMainPanel:OnOpen(_activityType,_index)
|
||||||
SoundManager.PlaySound(SoundConfig.UI_Hddakai)
|
SoundManager.PlaySound(SoundConfig.UI_Hddakai)
|
||||||
LogGreen("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index))
|
Log("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index))
|
||||||
this.activityType = _activityType
|
this.activityType = _activityType
|
||||||
DynamicActivityManager.curActivityType = this.activityType
|
DynamicActivityManager.curActivityType = this.activityType
|
||||||
tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType)
|
tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType)
|
||||||
_CurPageIndex = 0
|
_CurPageIndex = 0
|
||||||
LogGreen("_index:"..tostring(_index))
|
Log("#tabs:"..tostring(#tabs).." _index:"..tostring(_index))
|
||||||
if _index and _index > 0 then
|
if _index and _index > 0 then
|
||||||
self:CheckActOpen(_index)
|
self:CheckActOpen(_index)
|
||||||
end
|
end
|
||||||
|
|
@ -122,7 +130,7 @@ function ActivityMainPanel:OnOpen(_activityType,_index)
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogGreen("_CurPageIndex:".._CurPageIndex)
|
Log("_CurPageIndex:".._CurPageIndex)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 打开,重新打开时回调
|
-- 打开,重新打开时回调
|
||||||
|
|
|
||||||
|
|
@ -602,7 +602,12 @@ local jumpDic = {
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
[JumpType.TimeLimiteCall] = function (data)
|
[JumpType.TimeLimiteCall] = function (data)
|
||||||
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) then
|
||||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
||||||
|
else
|
||||||
|
ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||||
|
this.JumpActivity(JumpType.ZhuTiHuoDong,data[2])
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
[JumpType.QianKunBox] = function (data)
|
[JumpType.QianKunBox] = function (data)
|
||||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,7 @@ function RewardItemSingleShowPopup:BindEvent()
|
||||||
end
|
end
|
||||||
elseif itemConfigData then
|
elseif itemConfigData then
|
||||||
JumpManager.GoJump(itemConfigData.UseJump,function ()
|
JumpManager.GoJump(itemConfigData.UseJump,function ()
|
||||||
|
Log("UseJump:"..tostring(itemConfigData.UseJump))
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue