Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
3a6806bb3b
|
@ -1031,7 +1031,7 @@ JumpType = {
|
|||
XiangYaoDuoBao = 10020,--降妖夺宝
|
||||
HeadChange = 10021, --巅峰赛
|
||||
XianShiDuiHuan = 10022, --主题活动限时兑换
|
||||
ZhuTiHuoDong = 20000,
|
||||
ZhuTiHuoDong = 20000, --主题活动任务
|
||||
QianKunShangDian = 20044, --乾坤商店
|
||||
SheJiDaDianShangDian = 20060, --社稷大典商店
|
||||
XinJiangLaiXiShangDian = 20200, --社稷大典商店
|
||||
|
@ -2083,8 +2083,8 @@ RecruitType = {
|
|||
XiangYaoSingle = 48, --降妖夺宝单抽
|
||||
XiangYaoTen = 49, --降妖夺宝十连
|
||||
|
||||
PrayerSingle = 44, --限时召唤单抽
|
||||
PrayerTen = 45, --限时召唤十连
|
||||
PrayerSingle = 50, --限时召唤单抽
|
||||
PrayerTen = 51, --限时召唤十连
|
||||
}
|
||||
ItemBaseType = {
|
||||
Special = 1, --特殊
|
||||
|
|
|
@ -33,8 +33,12 @@ local _ConditionConfig = {
|
|||
local v2 = condition[2]
|
||||
local record = HardStageEventManager.GetRoundDamageRecord()
|
||||
if record then
|
||||
if record[v1] and record[v1] >= v2 then
|
||||
return 1
|
||||
if record then
|
||||
for key, value in pairs(record) do
|
||||
if key<=v1 and value>=v2 then
|
||||
return 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return 0
|
||||
|
|
|
@ -67,8 +67,16 @@ function ActivityMainPanel:CheckActOpen(_index)
|
|||
if tabs[_index].IfBack == 1 then
|
||||
if tabs[_index].ActiveType > 0 then
|
||||
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
|
||||
_CurPageIndex = _index
|
||||
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
|
||||
elseif GlobalActConfig[id].ShowArt == this.activityType then
|
||||
_CurPageIndex = _index
|
||||
end
|
||||
else
|
||||
_CurPageIndex = _index
|
||||
end
|
||||
end
|
||||
elseif tabs[_index].FunType > 0 then
|
||||
if ActTimeCtrlManager.SingleFuncState(tabs[_index].FunType) then
|
||||
|
@ -96,12 +104,12 @@ end
|
|||
--界面打开时调用(用于子类重写)
|
||||
function ActivityMainPanel:OnOpen(_activityType,_index)
|
||||
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
|
||||
DynamicActivityManager.curActivityType = this.activityType
|
||||
tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType)
|
||||
_CurPageIndex = 0
|
||||
LogGreen("_index:"..tostring(_index))
|
||||
Log("#tabs:"..tostring(#tabs).." _index:"..tostring(_index))
|
||||
if _index and _index > 0 then
|
||||
self:CheckActOpen(_index)
|
||||
end
|
||||
|
@ -120,9 +128,9 @@ function ActivityMainPanel:OnOpen(_activityType,_index)
|
|||
end)
|
||||
else
|
||||
this:ClosePanel()
|
||||
end
|
||||
end
|
||||
end
|
||||
LogGreen("_CurPageIndex:".._CurPageIndex)
|
||||
Log("_CurPageIndex:".._CurPageIndex)
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
|
|
|
@ -484,9 +484,11 @@ function this.RefreshPanelShowByState()
|
|||
if ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then
|
||||
PlayerManager.carbonType = 1
|
||||
if ExpeditionManager.ExpeditionState == 2 then
|
||||
UIManager.ClosePanel(UIName.ExpeditionMainPanel)
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
PopupTipPanel.ShowTip(Language[12183])
|
||||
elseif ExpeditionManager.ExpeditionState == 3 then
|
||||
UIManager.ClosePanel(UIName.ExpeditionMainPanel)
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
PopupTipPanel.ShowTip(Language[12183])
|
||||
end
|
||||
|
|
|
@ -602,7 +602,12 @@ local jumpDic = {
|
|||
end
|
||||
end,
|
||||
[JumpType.TimeLimiteCall] = function (data)
|
||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) then
|
||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
||||
else
|
||||
ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[2])
|
||||
end
|
||||
end,
|
||||
[JumpType.QianKunBox] = function (data)
|
||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
||||
|
|
|
@ -202,6 +202,7 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
end
|
||||
elseif itemConfigData then
|
||||
JumpManager.GoJump(itemConfigData.UseJump,function ()
|
||||
Log("UseJump:"..tostring(itemConfigData.UseJump))
|
||||
this:ClosePanel()
|
||||
end)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue