From 5eca5552996f1af180bc791fbaf9fcedc579ad63 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 24 Jan 2022 16:07:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=AE=E7=94=9F=E9=97=A8=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/HomeLand/HomeLandPanel.prefab | 280 ++++++++++++++++++ .../~Lua/Modules/HomeLand/HomeLandPanel.lua | 7 +- 2 files changed, 285 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab index 7b7630a5ca..c66d9c3084 100644 --- a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab @@ -6316,6 +6316,8 @@ GameObject: - component: {fileID: 8035390706952675266} - component: {fileID: 3608192753789553086} - component: {fileID: 4521201577711672699} + - component: {fileID: 4084493871022364981} + - component: {fileID: 3089559987505261056} m_Layer: 0 m_Name: Btns m_TagString: Untagged @@ -6437,6 +6439,44 @@ MonoBehaviour: m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!223 &4084493871022364981 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2808734959129876900} + 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 &3089559987505261056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2808734959129876900} + 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 &2980784693534889506 GameObject: m_ObjectHideFlags: 0 @@ -15311,6 +15351,8 @@ GameObject: - component: {fileID: 2426673999685186718} - component: {fileID: 3214386944318076342} - component: {fileID: 2202674687720082334} + - component: {fileID: 4678861969549411193} + - component: {fileID: 1256077686677747704} m_Layer: 0 m_Name: Btns m_TagString: Untagged @@ -15432,6 +15474,44 @@ MonoBehaviour: m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!223 &4678861969549411193 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6571846824652359215} + 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 &1256077686677747704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6571846824652359215} + 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 &6596380537826428912 GameObject: m_ObjectHideFlags: 0 @@ -15595,6 +15675,8 @@ GameObject: - component: {fileID: 7585626210457838639} - component: {fileID: 3324071201075241553} - component: {fileID: 703791106367441219} + - component: {fileID: 8279109856249411865} + - component: {fileID: 8684619980196981302} m_Layer: 0 m_Name: Btns m_TagString: Untagged @@ -15716,6 +15798,44 @@ MonoBehaviour: m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!223 &8279109856249411865 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6697242505617539661} + 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 &8684619980196981302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6697242505617539661} + 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 &6701423179986170875 GameObject: m_ObjectHideFlags: 0 @@ -17194,6 +17314,8 @@ GameObject: - component: {fileID: 4694673261403415046} - component: {fileID: 623786016550461046} - component: {fileID: 5452294493036122645} + - component: {fileID: 1904771118934056559} + - component: {fileID: 2236650716987984212} m_Layer: 0 m_Name: Btns m_TagString: Untagged @@ -17315,6 +17437,44 @@ MonoBehaviour: m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!223 &1904771118934056559 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7232657525012117120} + 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 &2236650716987984212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7232657525012117120} + 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 &7252765211078755709 GameObject: m_ObjectHideFlags: 0 @@ -17688,6 +17848,8 @@ GameObject: - component: {fileID: 1341291141850117007} - component: {fileID: 5663256679325593081} - component: {fileID: 2891419772154641078} + - component: {fileID: 4549004173193772049} + - component: {fileID: 585548956262101058} m_Layer: 0 m_Name: Btns m_TagString: Untagged @@ -17809,6 +17971,44 @@ MonoBehaviour: m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!223 &4549004173193772049 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7369864977568712998} + 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 &585548956262101058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7369864977568712998} + 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 &7396158549555508630 GameObject: m_ObjectHideFlags: 0 @@ -18699,6 +18899,8 @@ GameObject: - component: {fileID: 3636963445681719557} - component: {fileID: 1704556422499644312} - component: {fileID: 290363720771280224} + - component: {fileID: 8152325339717365218} + - component: {fileID: 9054518348190999372} m_Layer: 0 m_Name: Btns m_TagString: Untagged @@ -18820,6 +19022,44 @@ MonoBehaviour: m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!223 &8152325339717365218 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7743504300749488973} + 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 &9054518348190999372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7743504300749488973} + 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 &7750345063225594242 GameObject: m_ObjectHideFlags: 0 @@ -19414,6 +19654,8 @@ GameObject: - component: {fileID: 7655588476642649938} - component: {fileID: 3208896590189980640} - component: {fileID: 1869541345616426217} + - component: {fileID: 6194670119584761468} + - component: {fileID: 2374742443256953751} m_Layer: 0 m_Name: Btns m_TagString: Untagged @@ -19535,6 +19777,44 @@ MonoBehaviour: m_Spacing: {x: 100, y: 100} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!223 &6194670119584761468 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989605344790892453} + 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 &2374742443256953751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989605344790892453} + 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 &8023941863189335435 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua index 652ee53eb8..cde56153b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua @@ -64,6 +64,7 @@ function HomeLand:InitComponent() self.mapData[i].CanGet = Util.GetGameObject(self.mapData[i].Obj,"CanGet") self.mapData[i].Icon = Util.GetGameObject(self.mapData[i].Obj,"CanGet/Image"):GetComponent("Image") self.mapData[i].Btns = Util.GetGameObject(self.mapData[i].Obj,"Btns") + self.mapData[i].BtnsCanvas = self.mapData[i].Btns:GetComponent("Canvas") self.mapData[i].OpenLimit = Util.GetGameObject(self.mapData[i].Title,"OpenLimit") self.mapData[i].limitText = Util.GetGameObject(self.mapData[i].OpenLimit,"OpenLimitText"):GetComponent("Text") self.mapData[i].upgradeImg = Util.GetGameObject(self.mapData[i].Obj,"Updating") @@ -71,7 +72,6 @@ function HomeLand:InitComponent() self.mapData[i].updateTime = Util.GetGameObject(self.mapData[i].Obj,"updateTime") self.mapData[i].updateTimeText = Util.GetGameObject(self.mapData[i].updateTime,"updateText"):GetComponent("Text") self.mapData[i].timeSlide = Util.GetGameObject(self.mapData[i].updateTime,"Slide/Image"):GetComponent("Image") - self.mapData[i].btnDetail = Util.GetGameObject(self.mapData[i].Btns,"Detail") self.mapData[i].btnUpgrade = Util.GetGameObject(self.mapData[i].Btns,"Upgrade") self.mapData[i].upGradeRed = Util.GetGameObject(self.mapData[i].btnUpgrade,"upGradeRed") @@ -303,6 +303,8 @@ function HomeLand:OnSortingOrderChange() local curObj = self.mapData[i] Util.SetParticleSortLayer(curObj.effect1,self.sortingOrder + 1) Util.SetParticleSortLayer(curObj.effect2,self.sortingOrder + 1) + curObj.BtnsCanvas.overrideSorting = true + curObj.BtnsCanvas.sortingOrder = self.sortingOrder + 2 end end @@ -397,7 +399,8 @@ function HomeLand:SetBuildsState() curObj.CanGet:SetActive(false) Util.SetParticleSortLayer(curObj.effect1,self.sortingOrder + 1) Util.SetParticleSortLayer(curObj.effect2,self.sortingOrder + 1) - + curObj.BtnsCanvas.overrideSorting = true + curObj.BtnsCanvas.sortingOrder = self.sortingOrder + 2 if data.dataMain.IsOpen == 1 then--部分建筑未进入版本显示未开放 --如果主城未到等级,显示开启条件 if HomeLandConfig[i].UnlockLevel[1] == 1 and PlayerManager.level < HomeLandConfig[i].UnlockLevel[2] then