diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index a06d9e3506..f15a59ba40 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -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 \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 25370d74a4..7fffeb2e55 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -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={ diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index dcc49882c4..0dcff04b6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -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() diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua index 9c3bddbebd..c2ee633909 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua index eae6e99623..1744bf1041 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 763ef8421a..8390233793 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 76fd9c111f..bc8b8818fa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua index 142d22d26c..25dd961602 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/View/BtView.lua b/Assets/ManagedResources/~Lua/View/BtView.lua index 56a9f4bd43..a8b057fcb4 100644 --- a/Assets/ManagedResources/~Lua/View/BtView.lua +++ b/Assets/ManagedResources/~Lua/View/BtView.lua @@ -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) diff --git a/data_execl/base_data/SkillConfig.xlsx b/data_execl/base_data/SkillConfig.xlsx index 7c26ae821b..186d66a783 100644 Binary files a/data_execl/base_data/SkillConfig.xlsx and b/data_execl/base_data/SkillConfig.xlsx differ