diff --git a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab index de690292bd..21f2de5804 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab @@ -530,8 +530,6 @@ GameObject: - component: {fileID: 224589745136464296} - component: {fileID: 222198797386434666} - component: {fileID: 114494932353159536} - - component: {fileID: 5038354978497588369} - - component: {fileID: 8693738714112075235} m_Layer: 5 m_Name: titlebg m_TagString: Untagged @@ -597,44 +595,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!223 &5038354978497588369 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1193305904911520} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &8693738714112075235 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1193305904911520} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &1232340992504996 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index b16c2fa052..63bc074929 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -204,6 +204,8 @@ function DynamicActivityPanel:InitComponent() this.tabbox = Util.GetGameObject(self.gameObject, "bg/tabbox") this.btnBack = Util.GetGameObject(self.gameObject, "bg/btnBack") this.content = Util.GetGameObject(self.gameObject, "bg/pageContent") + this.tabList = Util.GetGameObject(self.gameObject,"bg/tabbox") + this.bottomBar = Util.GetGameObject(self.gameObject,"bg/bottomBar") this.PageList = {} for i=1,#curActivityCount do this.PageList[i] = curActivityCount[i].new(self, Util.GetGameObject(self.transform, "bg/pageContent/page"..i),this.UpView) @@ -269,6 +271,9 @@ end -- 打开,重新打开时回调 function DynamicActivityPanel:OnShow() + this.btnBack:SetActive(true) + this.tabList:SetActive(true) + this.bottomBar:SetActive(true) if _CurPageIndex then this.PageTabCtrl:ChangeTab(_CurPageIndex) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua index 46049ae97d..c8211a5230 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua @@ -136,6 +136,7 @@ function XinJiangLaiXi:Refresh() end function XinJiangLaiXi:OnShowData() + this.shop:SetActive(false) if not itemsGrid then itemsGrid = {} end @@ -218,7 +219,11 @@ function XinJiangLaiXi:OnHide() if self.timer then self.timer:Stop() self.timer = nil - end + end + if this.shopView then + this.shopView = SubUIManager.Close(this.shopView) + this.shopView = nil + end sortingOrder = 0 end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 752197ac28..45325ada02 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -853,8 +853,8 @@ function this:BindEvent() if dynamicAct then curindex = GlobalActConfig[dynamicAct].ShowArt end - LogBlue("当前选中页签0:"..curindex) - UIManager.OpenPanel(UIName.DynamicActivityPanel,curindex) + -- LogBlue("当前选中页签0:"..curindex) + UIManager.OpenPanel(UIName.DynamicActivityPanel) end) --神将合成、神将置换 diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 0e25464bb2..71f6e6f370 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -575,7 +575,7 @@ function this:ShowShop(shopType,_sortingOrder) self.ScrollView:ForeachItemGO(function (index, go) go.gameObject:SetActive(false) end) - self.titleBg:GetComponent("Canvas").sortingOrder = _sortingOrder + 1 + -- self.titleBg:GetComponent("Canvas").sortingOrder = _sortingOrder + 1 this.sortingOrder = _sortingOrder -- 红点销毁 self.refreshRedpot:SetActive(false) @@ -643,7 +643,7 @@ function this:SetSortLayer(sortLayer) item:SetEffectLayer(sortLayer)--this.sortingOrder) end - self.titleBg:GetComponent("Canvas").sortingOrder = sortLayer + 1 + -- self.titleBg:GetComponent("Canvas").sortingOrder = sortLayer + 1 -- 保存层级 this.sortingOrder = sortLayer