Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
wangyuan 2020-07-28 21:15:31 +08:00
commit b2c515de97
10 changed files with 25 additions and 15 deletions

View File

@ -159,8 +159,8 @@ function CarbonTypePanelV2:RemoveListener()
end
--副本类型 1 综合 2 万象
function CarbonTypePanelV2:OnOpen(_type)
carbonType = _type
function CarbonTypePanelV2:OnOpen()
carbonType = PlayerManager.carbonType
LogBlue("carbonType1:"..carbonType)
if carbonType == 1 then
-- 清除一下选得副本类型
@ -182,6 +182,8 @@ end
--界面打开时调用(用于子类重写)
function CarbonTypePanelV2:OnShow(...)
carbonType = PlayerManager.carbonType
LogBlue("carbonType2:"..carbonType)
this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title)
this.title:GetComponent("RectTransform").localPosition = type[carbonType].titlePos
this.title:GetComponent("RectTransform").sizeDelta = type[carbonType].titleSize
@ -402,7 +404,7 @@ function CarbonTypePanelV2:OnClose()
this.refreshTimer = nil
end
this.isPlayDoorAudio = false
carbons = {}
carbonType = 0
end
--界面销毁时调用(用于子类重写)
@ -411,6 +413,7 @@ function CarbonTypePanelV2:OnDestroy()
if this.BtView then
SubUIManager.Close(this.BtView)
end
carbons = {}
end
return CarbonTypePanelV2

View File

@ -14,11 +14,11 @@ local carbonIndex=0--副本索引
--顶部背景图
local titleBg={
[1]={bg="r_richang_banner_5",titleTip = specialConfig[45].Value,pos = Vector3.New(257.08,658.37,0)},
[2]={bg="r_richang_banner_4",titleTip = specialConfig[44].Value,pos = Vector3.New(257.08,651.24,0)},
[1]={bg="r_richang_banner_5",titleTip = specialConfig[41].Value,pos = Vector3.New(257.08,658.37,0)},
[2]={bg="r_richang_banner_4",titleTip = specialConfig[42].Value,pos = Vector3.New(257.08,651.24,0)},
[3]={bg="r_richang_banner_3",titleTip = specialConfig[43].Value,pos = Vector3.New(257.08,658.37,0)},
[4]={bg="r_richang_banner_2",titleTip = specialConfig[42].Value,pos = Vector3.New(257.08,651.24,0)},
[5]={bg="r_richang_banner_1",titleTip = specialConfig[41].Value,pos = Vector3.New(257.08,651.24,0)},
[4]={bg="r_richang_banner_2",titleTip = specialConfig[44].Value,pos = Vector3.New(257.08,651.24,0)},
[5]={bg="r_richang_banner_1",titleTip = specialConfig[45].Value,pos = Vector3.New(257.08,651.24,0)},
}
--难度图片
local qualityBg={

View File

@ -50,7 +50,8 @@ function EndLessCarbonPanel:BindEvent()
Util.AddClick(this.btnBack, function ()
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
--检测到上一个面板打开之后,关闭自己
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()

View File

@ -84,7 +84,8 @@ function PlotCarbonPanel:BindEvent()
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
UIManager.OpenPanel(UIName.CarbonTypePanelV,1)
PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV)
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
UIManager.ClosePanel(UIName.PlotCarbonPanel)
end)

View File

@ -51,7 +51,8 @@ function TrialCarbonPanel:BindEvent()
ClearRedPointObject(RedPointType.EpicExplore_GetReward)
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
UIManager.ClosePanel(UIName.TrialCarbonPanel)
end)

View File

@ -477,11 +477,12 @@ function this.RemainTimeDown()
end
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.OpenPanel(UIName.CarbonTypePanelV2,1)
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12195])
elseif ExpeditionManager.ExpeditionState == 3 then
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12195])
end
end

View File

@ -654,7 +654,8 @@ function this:BindEvent()
end)
Util.AddClick(this.btnColorfulWorld, function()
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
UIManager.OpenPanel(UIName.CarbonTypePanelV2,2)
PlayerManager.carbonType = 2
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
end

View File

@ -49,7 +49,8 @@ end
function MonsterCampPanel:BindEvent()
Util.AddClick(this.btnBack, function ()
-- UIManager.OpenPanel(UIName.MainPanel)
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
self:ClosePanel()
end)

View File

@ -74,7 +74,8 @@ function this:OpenJieling()
end
-- 打开副本选择界面
function this:OpenCarbon()
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1)
PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
end
function this:OpenGuild()
JumpManager.GoJump(4001)