【副本】新界面提交
parent
7b66ae5db4
commit
e64223b78b
|
@ -57,11 +57,11 @@ function EndLessCarbonPanel:BindEvent()
|
||||||
end
|
end
|
||||||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||||
PlayerManager.carbonType = 1
|
-- PlayerManager.carbonType = 1
|
||||||
UIManager.OpenPanel(UIName.MainPanel)
|
UIManager.OpenPanel(UIName.MainPanel)
|
||||||
|
|
||||||
--检测到上一个面板打开之后,关闭自己
|
--检测到上一个面板打开之后,关闭自己
|
||||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
CallBackOnPanelOpen(UIName.CarbonsPanel, function()
|
||||||
UIManager.ClosePanel(UIName.EndLessCarbonPanel)
|
UIManager.ClosePanel(UIName.EndLessCarbonPanel)
|
||||||
end)
|
end)
|
||||||
CarbonManager.difficulty = 0
|
CarbonManager.difficulty = 0
|
||||||
|
|
|
@ -7,56 +7,67 @@ local carbonData = {
|
||||||
Imgname = "11",
|
Imgname = "11",
|
||||||
ImgPos = Vector2(-200,650),
|
ImgPos = Vector2(-200,650),
|
||||||
btnPos = Vector2(0,0),
|
btnPos = Vector2(0,0),
|
||||||
redPointType = RedPointType.HeroExplore
|
redPointType = RedPointType.HeroExplore,
|
||||||
},
|
},
|
||||||
[2] = {
|
[2] = {
|
||||||
id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔
|
id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔
|
||||||
Imgname = "12",
|
Imgname = "12",
|
||||||
ImgPos = Vector2(200,650),
|
ImgPos = Vector2(200,650),
|
||||||
btnPos = Vector2(0,0),
|
btnPos = Vector2(0,0),
|
||||||
redPointType = RedPointType.EpicExplore
|
redPointType = RedPointType.EpicExplore,
|
||||||
|
--次数特权
|
||||||
|
Privileges ={
|
||||||
|
[1] = {
|
||||||
|
id = PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM,
|
||||||
|
string = "免费挑战次数:%s"
|
||||||
|
},
|
||||||
|
[2] = {
|
||||||
|
id = PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM,
|
||||||
|
string = "剩余购买次数:%s"
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
[3] = {
|
[3] = {
|
||||||
id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫
|
id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫
|
||||||
Imgname = "13",
|
Imgname = "13",
|
||||||
ImgPos = Vector2(-200,300),
|
ImgPos = Vector2(-200,300),
|
||||||
btnPos = Vector2(0,0),
|
btnPos = Vector2(0,0),
|
||||||
redPointType = RedPointType.OrdinaryExplore
|
redPointType = RedPointType.OrdinaryExplore,
|
||||||
},
|
},
|
||||||
[4] = {
|
[4] = {
|
||||||
id = FUNCTION_OPEN_TYPE.CARDELAY, --车迟斗法
|
id = FUNCTION_OPEN_TYPE.CARDELAY, --车迟斗法
|
||||||
Imgname = "14",
|
Imgname = "14",
|
||||||
ImgPos = Vector2(200,300),
|
ImgPos = Vector2(200,300),
|
||||||
btnPos = Vector2(0,0),
|
btnPos = Vector2(0,0),
|
||||||
redPointType = RedPointType.LegendExplore
|
redPointType = RedPointType.LegendExplore,
|
||||||
},
|
},
|
||||||
[5] = {
|
[5] = {
|
||||||
id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽
|
id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽
|
||||||
Imgname = "15",
|
Imgname = "15",
|
||||||
ImgPos = Vector2(-200,-100),
|
ImgPos = Vector2(-200,-100),
|
||||||
btnPos = Vector2(149, -6.33),
|
btnPos = Vector2(0,0),
|
||||||
redPointType = RedPointType.EndLess
|
redPointType = RedPointType.EndLess,
|
||||||
},
|
},
|
||||||
[6] = {
|
[6] = {
|
||||||
id = FUNCTION_OPEN_TYPE.TRIAL, --森罗
|
id = FUNCTION_OPEN_TYPE.TRIAL, --森罗
|
||||||
Imgname = "16",
|
Imgname = "16",
|
||||||
ImgPos = Vector2(200,-100),
|
ImgPos = Vector2(200,-100),
|
||||||
btnPos = Vector2(274.5, -408.1),
|
btnPos = Vector2(274.5, -408.1),
|
||||||
redPointType = RedPointType.Trial
|
redPointType = RedPointType.Trial,
|
||||||
},
|
},
|
||||||
[7] = {
|
[7] = {
|
||||||
id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕
|
id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕
|
||||||
Imgname = "17",
|
Imgname = "17",
|
||||||
ImgPos = Vector2(-200,-400),
|
ImgPos = Vector2(-200,-400),
|
||||||
btnPos = Vector2(149, -6.33),
|
btnPos = Vector2(0,0),
|
||||||
redPointType = RedPointType.People_Mirror
|
redPointType = RedPointType.People_Mirror,
|
||||||
},
|
},
|
||||||
[8] = {
|
[8] = {
|
||||||
id = FUNCTION_OPEN_TYPE.FIGHTLEVEL, --山河社稷图
|
id = FUNCTION_OPEN_TYPE.FIGHTLEVEL, --山河社稷图
|
||||||
Imgname = "18",
|
Imgname = "18",
|
||||||
ImgPos = Vector2(200,-400),
|
ImgPos = Vector2(200,-400),
|
||||||
btnPos = Vector2(149, -6.33),
|
btnPos = Vector2(0,0),
|
||||||
redPointType = RedPointType.FightLevel
|
redPointType = RedPointType.FightLevel,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,7 +97,7 @@ end
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
function CarbonsPanel:RemoveListener()
|
function CarbonsPanel:RemoveListener()
|
||||||
end
|
end
|
||||||
--副本类型 1 综合 2 万象
|
|
||||||
function CarbonsPanel:OnOpen()
|
function CarbonsPanel:OnOpen()
|
||||||
self.BtView.gameObject:SetActive(true)
|
self.BtView.gameObject:SetActive(true)
|
||||||
self.BtView:OnOpen(self, {sortOrder = self.sortingOrder, panelType = PanelTypeView.Carbon})
|
self.BtView:OnOpen(self, {sortOrder = self.sortingOrder, panelType = PanelTypeView.Carbon})
|
||||||
|
@ -115,7 +126,12 @@ function CarbonsPanel:ShowMap()
|
||||||
go:SetActive(true)
|
go:SetActive(true)
|
||||||
go.transform.localPosition = carbonData[i].ImgPos
|
go.transform.localPosition = carbonData[i].ImgPos
|
||||||
go:GetComponent("Image").sprite = self.spLoader:LoadSprite(carbonData[i].Imgname)
|
go:GetComponent("Image").sprite = self.spLoader:LoadSprite(carbonData[i].Imgname)
|
||||||
-- go:GetComponent("Image"):SetNativeSize()
|
go:GetComponent("Image"):SetNativeSize()
|
||||||
|
|
||||||
|
|
||||||
|
Util.AddOnceClick(go,function ()
|
||||||
|
self:BtnClick(carbonData[i].id)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -85,9 +85,9 @@ function PlotCarbonPanel:BindEvent()
|
||||||
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
||||||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||||
PlayerManager.carbonType = 1
|
-- PlayerManager.carbonType = 1
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV)
|
UIManager.OpenPanel(UIName.CarbonTypePanelV)
|
||||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
CallBackOnPanelOpen(UIName.CarbonsPanel, function()
|
||||||
UIManager.ClosePanel(UIName.PlotCarbonPanel)
|
UIManager.ClosePanel(UIName.PlotCarbonPanel)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -52,9 +52,9 @@ function TrialCarbonPanel:BindEvent()
|
||||||
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
|
||||||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||||
PlayerManager.carbonType = 1
|
-- PlayerManager.carbonType = 1
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
CallBackOnPanelOpen(UIName.CarbonsPanel, function()
|
||||||
UIManager.ClosePanel(UIName.TrialCarbonPanel)
|
UIManager.ClosePanel(UIName.TrialCarbonPanel)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -257,7 +257,7 @@ function this:OnClose()
|
||||||
end
|
end
|
||||||
this.isPlayDoorAudio = false
|
this.isPlayDoorAudio = false
|
||||||
self.gameObject:SetActive(false)
|
self.gameObject:SetActive(false)
|
||||||
PlayerManager.carbonType = 2
|
-- PlayerManager.carbonType = 2
|
||||||
if this.UpView then
|
if this.UpView then
|
||||||
SubUIManager.Close(this.UpView)
|
SubUIManager.Close(this.UpView)
|
||||||
this.UpView = nil
|
this.UpView = nil
|
||||||
|
|
|
@ -482,14 +482,14 @@ 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
|
-- PlayerManager.carbonType = 1
|
||||||
if ExpeditionManager.ExpeditionState == 2 then
|
if ExpeditionManager.ExpeditionState == 2 then
|
||||||
UIManager.ClosePanel(UIName.ExpeditionMainPanel)
|
UIManager.ClosePanel(UIName.ExpeditionMainPanel)
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||||
PopupTipPanel.ShowTip(Language[12183])
|
PopupTipPanel.ShowTip(Language[12183])
|
||||||
elseif ExpeditionManager.ExpeditionState == 3 then
|
elseif ExpeditionManager.ExpeditionState == 3 then
|
||||||
UIManager.ClosePanel(UIName.ExpeditionMainPanel)
|
UIManager.ClosePanel(UIName.ExpeditionMainPanel)
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||||
PopupTipPanel.ShowTip(Language[12183])
|
PopupTipPanel.ShowTip(Language[12183])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -449,8 +449,8 @@ function this:BindEvent()
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.btnColorfulWorld, function()
|
Util.AddClick(this.btnColorfulWorld, function()
|
||||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then
|
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then
|
||||||
PlayerManager.carbonType = 2
|
-- PlayerManager.carbonType = 2
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||||
else
|
else
|
||||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS)
|
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS)
|
||||||
PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2]))
|
PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2]))
|
||||||
|
|
|
@ -35,8 +35,8 @@ end
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function MonsterCampMainPanel:BindEvent()
|
function MonsterCampMainPanel:BindEvent()
|
||||||
Util.AddClick(this.btnBack, function ()
|
Util.AddClick(this.btnBack, function ()
|
||||||
PlayerManager.carbonType = 1
|
-- PlayerManager.carbonType = 1
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -54,8 +54,8 @@ function MonsterCampPanel:BindEvent()
|
||||||
BindRedPointObject(RedPointType.EpicExplore,this.btnRewardRed)
|
BindRedPointObject(RedPointType.EpicExplore,this.btnRewardRed)
|
||||||
Util.AddClick(this.btnBack, function ()
|
Util.AddClick(this.btnBack, function ()
|
||||||
-- UIManager.OpenPanel(UIName.MainPanel)
|
-- UIManager.OpenPanel(UIName.MainPanel)
|
||||||
PlayerManager.carbonType = 1
|
-- PlayerManager.carbonType = 1
|
||||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ function this:OpenJieling()
|
||||||
end
|
end
|
||||||
-- 打开副本选择界面
|
-- 打开副本选择界面
|
||||||
function this:OpenCarbon()
|
function this:OpenCarbon()
|
||||||
PlayerManager.carbonType = 1
|
-- PlayerManager.carbonType = 1
|
||||||
-- UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
-- UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||||
UIManager.OpenPanel(UIName.CarbonsPanel)
|
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue