副本修改提交
parent
77a7c52ca1
commit
5d70187da8
|
@ -159,8 +159,8 @@ function CarbonTypePanelV2:RemoveListener()
|
||||||
|
|
||||||
end
|
end
|
||||||
--副本类型 1 综合 2 万象
|
--副本类型 1 综合 2 万象
|
||||||
function CarbonTypePanelV2:OnOpen(_type)
|
function CarbonTypePanelV2:OnOpen()
|
||||||
carbonType = _type
|
carbonType = PlayerManager.carbonType
|
||||||
LogBlue("carbonType1:"..carbonType)
|
LogBlue("carbonType1:"..carbonType)
|
||||||
if carbonType == 1 then
|
if carbonType == 1 then
|
||||||
-- 清除一下选得副本类型
|
-- 清除一下选得副本类型
|
||||||
|
@ -182,6 +182,8 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function CarbonTypePanelV2:OnShow(...)
|
function CarbonTypePanelV2:OnShow(...)
|
||||||
|
carbonType = PlayerManager.carbonType
|
||||||
|
LogBlue("carbonType2:"..carbonType)
|
||||||
this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title)
|
this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title)
|
||||||
this.title:GetComponent("RectTransform").localPosition = type[carbonType].titlePos
|
this.title:GetComponent("RectTransform").localPosition = type[carbonType].titlePos
|
||||||
this.title:GetComponent("RectTransform").sizeDelta = type[carbonType].titleSize
|
this.title:GetComponent("RectTransform").sizeDelta = type[carbonType].titleSize
|
||||||
|
@ -402,7 +404,7 @@ function CarbonTypePanelV2:OnClose()
|
||||||
this.refreshTimer = nil
|
this.refreshTimer = nil
|
||||||
end
|
end
|
||||||
this.isPlayDoorAudio = false
|
this.isPlayDoorAudio = false
|
||||||
carbons = {}
|
carbonType = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
|
@ -411,6 +413,7 @@ function CarbonTypePanelV2:OnDestroy()
|
||||||
if this.BtView then
|
if this.BtView then
|
||||||
SubUIManager.Close(this.BtView)
|
SubUIManager.Close(this.BtView)
|
||||||
end
|
end
|
||||||
|
carbons = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
return CarbonTypePanelV2
|
return CarbonTypePanelV2
|
|
@ -50,7 +50,8 @@ function EndLessCarbonPanel:BindEvent()
|
||||||
Util.AddClick(this.btnBack, function ()
|
Util.AddClick(this.btnBack, function ()
|
||||||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
|
PlayerManager.carbonType = 1
|
||||||
|
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
|
|
||||||
--检测到上一个面板打开之后,关闭自己
|
--检测到上一个面板打开之后,关闭自己
|
||||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
||||||
|
|
|
@ -84,7 +84,8 @@ function PlotCarbonPanel:BindEvent()
|
||||||
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
||||||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV,1)
|
PlayerManager.carbonType = 1
|
||||||
|
UIManager.OpenPanel(UIName.CarbonTypePanelV)
|
||||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
||||||
UIManager.ClosePanel(UIName.PlotCarbonPanel)
|
UIManager.ClosePanel(UIName.PlotCarbonPanel)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -51,7 +51,8 @@ function TrialCarbonPanel:BindEvent()
|
||||||
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
||||||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
|
PlayerManager.carbonType = 1
|
||||||
|
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
||||||
UIManager.ClosePanel(UIName.TrialCarbonPanel)
|
UIManager.ClosePanel(UIName.TrialCarbonPanel)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -477,11 +477,12 @@ function this.RemainTimeDown()
|
||||||
end
|
end
|
||||||
function this.RefreshPanelShowByState()
|
function this.RefreshPanelShowByState()
|
||||||
if ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then
|
if ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then
|
||||||
|
PlayerManager.carbonType = 1
|
||||||
if ExpeditionManager.ExpeditionState == 2 then
|
if ExpeditionManager.ExpeditionState == 2 then
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
|
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
PopupTipPanel.ShowTip(Language[12195])
|
PopupTipPanel.ShowTip(Language[12195])
|
||||||
elseif ExpeditionManager.ExpeditionState == 3 then
|
elseif ExpeditionManager.ExpeditionState == 3 then
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
|
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
PopupTipPanel.ShowTip(Language[12195])
|
PopupTipPanel.ShowTip(Language[12195])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -654,7 +654,8 @@ function this:BindEvent()
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.btnColorfulWorld, function()
|
Util.AddClick(this.btnColorfulWorld, function()
|
||||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2,2)
|
PlayerManager.carbonType = 2
|
||||||
|
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
|
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
|
||||||
end
|
end
|
||||||
|
|
|
@ -49,7 +49,8 @@ end
|
||||||
function MonsterCampPanel:BindEvent()
|
function MonsterCampPanel:BindEvent()
|
||||||
Util.AddClick(this.btnBack, function ()
|
Util.AddClick(this.btnBack, function ()
|
||||||
-- UIManager.OpenPanel(UIName.MainPanel)
|
-- UIManager.OpenPanel(UIName.MainPanel)
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
|
PlayerManager.carbonType = 1
|
||||||
|
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,8 @@ function this:OpenJieling()
|
||||||
end
|
end
|
||||||
-- 打开副本选择界面
|
-- 打开副本选择界面
|
||||||
function this:OpenCarbon()
|
function this:OpenCarbon()
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
|
PlayerManager.carbonType = 1
|
||||||
|
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
end
|
end
|
||||||
function this:OpenGuild()
|
function this:OpenGuild()
|
||||||
JumpManager.GoJump(4001)
|
JumpManager.GoJump(4001)
|
||||||
|
|
Loading…
Reference in New Issue