神将来源跳转修改提交
parent
c85f18a814
commit
19247e296e
|
|
@ -36,6 +36,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.WorkShop] = function()--锻造
|
||||
|
|
@ -83,6 +84,7 @@ local jumpDic = {
|
|||
FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ARENA_DEFEND,newFormation,formation.teamPokemonInfos)
|
||||
-- UIManager.OpenPanel(UIName.FormationPanel, FORMATION_TYPE.ARENA_DEFEND)
|
||||
-- PopupTipPanel.ShowTip("请先设置防守阵容")
|
||||
--this.isOpen = false
|
||||
-- return
|
||||
end
|
||||
local openPanle = UIManager.OpenPanel(UIName.ArenaMainPanel)
|
||||
|
|
@ -95,9 +97,11 @@ local jumpDic = {
|
|||
end,
|
||||
[JumpType.HanYuan] = function()--汉元之境
|
||||
PopupTipPanel.ShowTip(Language[11394])
|
||||
this.isOpen = false
|
||||
end,
|
||||
[JumpType.WangHun] = function()--亡魂之海
|
||||
PopupTipPanel.ShowTip(Language[11394])
|
||||
this.isOpen = false
|
||||
end,
|
||||
|
||||
--暂不开放
|
||||
|
|
@ -114,6 +118,7 @@ local jumpDic = {
|
|||
end,
|
||||
[JumpType.WorldBoss] = function()--世界boss
|
||||
PopupTipPanel.ShowTip(Language[11394])
|
||||
this.isOpen = false
|
||||
end,
|
||||
[JumpType.Talking] = function()--聊天
|
||||
UIManager.OpenPanel(UIName.ChatPanel)
|
||||
|
|
@ -157,6 +162,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(JumpType.CommonChallenge))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.HeroChallenge] = function(data)--精英副本
|
||||
|
|
@ -183,6 +189,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(JumpType.HeroChallenge))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.ChapterReward] = function(data)--章节奖励
|
||||
|
|
@ -199,6 +206,7 @@ local jumpDic = {
|
|||
local isActive, tips = ShopManager.IsActive(data[1])
|
||||
if not isActive then
|
||||
PopupTipPanel.ShowTip(tips or Language[10574])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,data[1])
|
||||
|
|
@ -256,6 +264,7 @@ local jumpDic = {
|
|||
end,
|
||||
[JumpType.RechargeStore] = function(data)--充值商店
|
||||
--PopupTipPanel.ShowTip("商店未开启")
|
||||
--this.isOpen = false
|
||||
-- UIManager.OpenPanel(UIName.MainShopPanel,data[1])
|
||||
JumpManager.GoJump(36008)
|
||||
end,
|
||||
|
|
@ -300,6 +309,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.PrayMainPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11396])
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.recharge] = function(data)--充值
|
||||
|
|
@ -323,9 +333,11 @@ local jumpDic = {
|
|||
-- end
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip(Language[11396])
|
||||
--this.isOpen = false
|
||||
-- end
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip(Language[11396])
|
||||
--this.isOpen = false
|
||||
-- end
|
||||
-- else
|
||||
-- this.JumpActivity(JumpType.Expert,data[1])
|
||||
|
|
@ -381,6 +393,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.FormationSetPanel,data[1])
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FormationManager.AllFormationFunIds[data[1]]))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.QuickPurchase] = function(data)--快捷购买
|
||||
|
|
@ -422,6 +435,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.ExpeditionMainPanel,true)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.GuildAid] = function(data)--公会援助
|
||||
|
|
@ -440,6 +454,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
|
||||
end,
|
||||
|
|
@ -461,6 +476,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
|
||||
end,
|
||||
|
|
@ -478,6 +494,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.Compound] = function(data)--锻造炉
|
||||
|
|
@ -489,6 +506,7 @@ local jumpDic = {
|
|||
local num = string.split(string.split(string,"|")[1],"#")[2]
|
||||
if PlayerManager.level < tonumber(num) then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10770],num))
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
end
|
||||
|
|
@ -496,6 +514,7 @@ local jumpDic = {
|
|||
local string = ConfigData[89].Value
|
||||
if PlayerManager.level < tonumber(string) then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10770],string))
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
end
|
||||
|
|
@ -533,9 +552,11 @@ local jumpDic = {
|
|||
else
|
||||
if DeathPosManager.status==DeathPosStatus.Death then
|
||||
PopupTipPanel.ShowTip(Language[10909])
|
||||
this.isOpen = false
|
||||
return
|
||||
elseif DeathPosManager.status==DeathPosStatus.Close then
|
||||
PopupTipPanel.ShowTip(Language[10910])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
if UIManager.IsOpen(UIName.GuildMainCityPanel) then
|
||||
|
|
@ -547,6 +568,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.GuildCarDelay] = function()--车迟斗法
|
||||
|
|
@ -558,6 +580,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.CompoundHero] = function(data)--神将合成、置换
|
||||
|
|
@ -572,6 +595,7 @@ local jumpDic = {
|
|||
local isActive, tips = ShopManager.IsActive(13)
|
||||
if not isActive then
|
||||
PopupTipPanel.ShowTip(tips or Language[10574])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,13)
|
||||
|
|
@ -580,6 +604,7 @@ local jumpDic = {
|
|||
local isActive, tips = ShopManager.IsActive(13)
|
||||
if not isActive then
|
||||
PopupTipPanel.ShowTip(tips or Language[10574])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,13)
|
||||
|
|
@ -630,6 +655,7 @@ local jumpDic = {
|
|||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[2])
|
||||
else
|
||||
PopupTipPanel.ShowTip("活动尚未开启")
|
||||
this.isOpen = false
|
||||
end
|
||||
else
|
||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
||||
|
|
@ -682,6 +708,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.SurpriseBoxPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip("活动尚未开启")
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
|
@ -690,6 +717,7 @@ function this.JumpActivity(data,skipfactor)
|
|||
local isOpen = DynamicActivityManager.IsActivityOpenByJumpIndex(data, skipfactor)
|
||||
if not isOpen then
|
||||
PopupTipPanel.ShowTip("活动尚未开启")
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
if DynamicActivityManager.curActivityType == data then
|
||||
|
|
@ -719,6 +747,7 @@ function this.CheckJump(_jumpId)
|
|||
local b = jumpSData and ActTimeCtrlManager.SingleFuncState(jumpSData.Type)
|
||||
if not b then
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(jumpSData.Type))
|
||||
this.isOpen = false
|
||||
end
|
||||
return b
|
||||
else
|
||||
|
|
@ -734,6 +763,7 @@ function this.GoJumpWithoutTip(_jumpId)
|
|||
end
|
||||
|
||||
function this.GoJump(_jumpId,fun)
|
||||
this.isOpen = true
|
||||
this.jumpId = _jumpId
|
||||
local jumpSData = JumpConfig[_jumpId]
|
||||
if jumpSData then
|
||||
|
|
@ -744,6 +774,7 @@ function this.GoJump(_jumpId,fun)
|
|||
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(jumpSData.Type))
|
||||
this.isOpen = false
|
||||
end
|
||||
else
|
||||
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
||||
|
|
@ -753,7 +784,7 @@ function this.GoJump(_jumpId,fun)
|
|||
end
|
||||
end
|
||||
if fun then
|
||||
fun()
|
||||
fun(this.isOpen)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -217,8 +217,10 @@ function JumpViewNew:GoToJumpData()
|
|||
end
|
||||
DynamicActivityManager.SetSelectIndex(DataType.Direct,goodIdList)
|
||||
end
|
||||
JumpManager.GoJump(self.jumpSData.Id,function()
|
||||
self.parent:ClosePanel()
|
||||
JumpManager.GoJump(self.jumpSData.Id,function(isOpen)
|
||||
if isOpen then
|
||||
self.parent:ClosePanel()
|
||||
end
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue