diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index c66a1e8d04..f6f65433f7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -10150,7 +10150,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.2, y: -45.1} + m_AnchoredPosition: {x: 60.199997, y: -45.1} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1445320564638215019 @@ -24313,13 +24313,13 @@ RectTransform: - {fileID: 8460419526808086132} - {fileID: 335761262040917005} - {fileID: 7037522940098548935} - m_Father: {fileID: 1470640894515440942} - m_RootOrder: 1 + m_Father: {fileID: 1080492301643067761} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 83, y: 64} - m_SizeDelta: {x: 127, y: 128} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4367344497533921501 CanvasRenderer: @@ -44805,8 +44805,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9158673223480268760} - - {fileID: 3958316192645827337} - - {fileID: 6379532960330795117} + - {fileID: 1080492301643067761} m_Father: {fileID: 986452627335843391} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -61073,6 +61072,42 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4892231996317496096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6921984787054832038} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6921984787054832038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4892231996317496096} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6379532960330795117} + m_Father: {fileID: 1080492301643067761} + m_RootOrder: 1 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4940234156816609357 GameObject: m_ObjectHideFlags: 0 @@ -70750,16 +70785,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6901911044717125155} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1470640894515440942} - m_RootOrder: 2 + m_Father: {fileID: 6921984787054832038} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -45, y: -329} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98, y: -71} m_SizeDelta: {x: 197, y: 252} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5090937801259970180 @@ -77209,6 +77244,68 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -160} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7802222163529057803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1080492301643067761} + - component: {fileID: 6454860829896586398} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1080492301643067761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7802222163529057803} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3958316192645827337} + - {fileID: 6921984787054832038} + m_Father: {fileID: 1470640894515440942} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -102, y: -118} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6454860829896586398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7802222163529057803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 128, y: 128} + m_Spacing: {x: 0, y: 50} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &7861569015652279171 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 9b2f122878..2fb2ca27ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -87,7 +87,7 @@ function this:InitComponent() effectAdapte(Util.GetGameObject(this.sgEffect[2], "ziti mask (1)")) --十五日登录 - this.fgBtn=Util.GetGameObject(self.gameObject,"LeftUp/FifteenDayGift") + this.fgBtn=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/FifteenDayGift") this.rpFifteenDayGift = Util.GetGameObject(this.fgBtn,"redPoint") this.rpFifteenDayEffect = Util.GetGameObject(this.fgBtn,"UI_Effect_DengLu15Day_YuanKuang") @@ -117,7 +117,7 @@ function this:InitComponent() this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng,"redPoint") --六星前往 - this.btnSixStarGo=Util.GetGameObject(self.gameObject,"LeftUp/sixStarHero") + this.btnSixStarGo=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/GameObject/sixStarHero") -------------------场景中的按钮------------------------ -- 按钮