diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 6c9bed19a3..b14975839d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -7148,7 +7148,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 81 m_ChildAlignment: 8 - m_Spacing: -55 + m_Spacing: -67.38 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -19691,7 +19691,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 208.70001, y: 187.80005} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2875914181687123874 CanvasRenderer: @@ -22318,7 +22318,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.175, y: 0} - m_SizeDelta: {x: 204.35, y: 200} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9007943773351537917 CanvasRenderer: @@ -56721,13 +56721,14 @@ RectTransform: m_Children: - {fileID: 1395028326126029132} - {fileID: 2534243185546137147} + - {fileID: 327077116440716071} m_Father: {fileID: 7019400324678272696} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 208.70001, y: 187.80005} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9159988997322425420 CanvasRenderer: @@ -62161,7 +62162,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 208.70001, y: 187.80005} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8445632292948232348 CanvasRenderer: @@ -71713,7 +71714,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 167.95, y: -93.900024} - m_SizeDelta: {x: 208.70001, y: 187.80005} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4144326890380073377 CanvasRenderer: @@ -77883,7 +77884,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 208.70001, y: 187.80005} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3006110700099534767 CanvasRenderer: @@ -87181,13 +87182,14 @@ RectTransform: m_Children: - {fileID: 2641714763032379374} - {fileID: 4972939020597592494} + - {fileID: 8945139777762677077} m_Father: {fileID: 7019400324678272696} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 208.70001, y: 187.80005} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2501439414024540677 CanvasRenderer: @@ -93802,6 +93804,186 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2915872257903245040} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3558140865767409497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2025934754434711663} + m_Modifications: + - target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_Name + value: UI_Effect_jinkuang_Yuan + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.2 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} +--- !u!4 &8945139777762677077 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + m_PrefabInstance: {fileID: 3558140865767409497} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5316650647926830379 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1248926969036112801} + m_Modifications: + - target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_Name + value: UI_Effect_jinkuang_Yuan + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.2 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} +--- !u!4 &327077116440716071 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + m_PrefabInstance: {fileID: 5316650647926830379} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7358839094465195630 PrefabInstance: m_ObjectHideFlags: 0 @@ -93869,6 +94051,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} --- !u!4 &3124744241822447714 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 5bdb967f2b..3d969e2376 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -140,6 +140,7 @@ function this:InitComponent() --新神尊特权 this.btnShenzun=Util.GetGameObject(self.gameObject,"RightDown/btnShenzun") this.shenzunRedPoint = Util.GetGameObject(this.btnShenzun,"redPoint") + this.shenzunEffect=Util.GetGameObject(self.gameObject,"RightDown/btnShenzun/UI_Effect_jinkuang_Yuan") --gm修改器 this.btnGMChange=Util.GetGameObject(self.gameObject,"RightDown/btnGMChange") this.gmEffect=Util.GetGameObject(self.gameObject,"RightDown/btnGMChange/UI_Effect_jinkuang_Yuan") @@ -154,6 +155,7 @@ function this:InitComponent() this.gmRedPoint:SetActive(false) --名望系统 this.btnMingWang=Util.GetGameObject(self.gameObject,"RightDown/btnMingWang") + this.mingwangEffect=Util.GetGameObject(self.gameObject,"RightDown/btnMingWang/UI_Effect_jinkuang_Yuan") Util.GetGameObject(this.btnMingWang,"Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("gm_mingwang_icon") this.mwRedPoint = Util.GetGameObject(this.btnMingWang,"redPoint") this.mwRedPoint:SetActive(false) @@ -876,6 +878,8 @@ function this:OnSortingOrderChange() Util.AddParticleSortLayer(this.sgEffect[2], self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.rpFifteenDayEffect, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.gmEffect, self.sortingOrder - orginLayer) + Util.AddParticleSortLayer(this.shenzunEffect, self.sortingOrder - orginLayer) + Util.AddParticleSortLayer(this.mingwangEffect, self.sortingOrder - orginLayer) orginLayer = self.sortingOrder this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })