From ba4debba7b0828ba2d26759c94b0303eca217111 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 May 2021 18:13:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E5=B7=A6=E4=B8=8A=E8=A7=92=E6=8C=89=E9=92=AE=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Main/MainPanel.prefab | 84 +++++++++++++------ .../~Lua/Modules/Main/MainPanel.lua | 12 +-- 2 files changed, 66 insertions(+), 30 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 5d521a3518..a86e02ac1d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -7174,7 +7174,7 @@ ParticleSystem: --- !u!199 &3612650515471756776 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14365,7 +14365,7 @@ ParticleSystem: --- !u!199 &2077135144819501974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20141,7 +20141,7 @@ ParticleSystem: --- !u!199 &5382233283546536858 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20342,7 +20342,7 @@ RectTransform: m_Children: - {fileID: 6379532960330795117} m_Father: {fileID: 1080492301643067761} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -23265,7 +23265,7 @@ RectTransform: - {fileID: 6659065993044168394} - {fileID: 7037522940098548935} m_Father: {fileID: 1080492301643067761} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -28023,7 +28023,7 @@ ParticleSystem: --- !u!199 &4678487443364567018 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -32821,7 +32821,7 @@ ParticleSystem: --- !u!199 &3301434479282110283 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33034,6 +33034,42 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3594557387201502275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8935360825500051851} + m_Layer: 5 + m_Name: seven + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8935360825500051851 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3594557387201502275} + 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: 9158673223480268760} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3609404473290929707 GameObject: m_ObjectHideFlags: 0 @@ -38570,7 +38606,7 @@ ParticleSystem: --- !u!199 &8426323061574149814 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39068,7 +39104,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9158673223480268760} - {fileID: 1080492301643067761} m_Father: {fileID: 986452627335843391} m_RootOrder: 4 @@ -43717,7 +43752,7 @@ ParticleSystem: --- !u!199 &3988090302360095373 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48994,7 +49029,7 @@ ParticleSystem: --- !u!199 &5461926455895321923 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54214,7 +54249,7 @@ ParticleSystem: --- !u!199 &6960492284779320589 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60499,7 +60534,7 @@ ParticleSystem: --- !u!199 &4261467272199160834 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66864,7 +66899,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: 98, y: -71} + m_AnchoredPosition: {x: 98, y: -118} m_SizeDelta: {x: 197, y: 252} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5090937801259970180 @@ -72518,7 +72553,7 @@ ParticleSystem: --- !u!199 &1706209193022837301 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77677,7 +77712,7 @@ ParticleSystem: --- !u!199 &2319946449668926234 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77986,10 +78021,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8935360825500051851} - {fileID: 3958316192645827337} - {fileID: 4093429386761372513} m_Father: {fileID: 1470640894515440942} - m_RootOrder: 1 + 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} @@ -78017,7 +78053,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 128, y: 128} - m_Spacing: {x: 0, y: 50} + m_Spacing: {x: 0, y: 10} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &7843894361434356181 @@ -84066,7 +84102,7 @@ ParticleSystem: --- !u!199 &8234207848460451360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -89132,7 +89168,7 @@ ParticleSystem: --- !u!199 &3615746855071839570 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -89644,12 +89680,12 @@ RectTransform: - {fileID: 1262562981263151929} - {fileID: 7197682040908398844} - {fileID: 6053165393311337297} - m_Father: {fileID: 1470640894515440942} + m_Father: {fileID: 8935360825500051851} 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: 117, y: 202.70006} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 117, y: -62} m_SizeDelta: {x: 234, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4556295833810989776 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index edd41d3c6d..dbf808e8ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -75,15 +75,15 @@ function this:InitComponent() ---------------topLeftPart---------------- -- 七日登陆奖励预览入口 - this.sgBtn=Util.GetGameObject(self.gameObject,"LeftUp/sevenGift") - this.sgRoot=Util.GetGameObject(this.sgBtn,"root") + this.sgBtn=Util.GetGameObject(self.gameObject,"LeftUp/seven") + this.sgRoot=Util.GetGameObject(this.sgBtn,"sevenGift/root") this.sgItemView = SubUIManager.Open(SubUIConfig.ItemView,this.sgRoot.transform) - this.sgType=Util.GetGameObject(this.sgBtn,"type"):GetComponent("Text") - this.sgName=Util.GetGameObject(this.sgBtn,"name"):GetComponent("Text") - this.sgInfo=Util.GetGameObject(this.sgBtn,"info"):GetComponent("Text") + this.sgType=Util.GetGameObject(this.sgBtn,"sevenGift/type"):GetComponent("Text") + this.sgName=Util.GetGameObject(this.sgBtn,"sevenGift/name"):GetComponent("Text") + this.sgInfo=Util.GetGameObject(this.sgBtn,"sevenGift/info"):GetComponent("Text") this.sgEffect={} for i = 1, 2 do - this.sgEffect[i]=Util.GetGameObject(this.sgBtn,"effect/effect"..i) + this.sgEffect[i]=Util.GetGameObject(this.sgBtn,"sevenGift/effect/effect"..i) end effectAdapte(Util.GetGameObject(this.sgEffect[2], "ziti mask (1)")) From 9f8858b4f70784c20e8142fa79d00f5fcd193d87 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 May 2021 18:20:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E5=B7=A6=E4=B8=8A=E8=A7=92=E6=8C=89=E9=92=AE=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab | 8 ++++---- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index a86e02ac1d..f538568c9a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -67806,10 +67806,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tweenSequeue: - - initV3: {x: -146, y: 202.7, z: 0} + - initV3: {x: -146, y: -64, z: 0} initFloat: 0 isInit: 1 - changeV3: {x: 117, y: 202.7, z: 0} + changeV3: {x: 117, y: -64, z: 0} changeFloat: 0 duration: 0.2 delay: 0 @@ -78029,7 +78029,7 @@ RectTransform: 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_AnchoredPosition: {x: -102, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6454860829896586398 @@ -89685,7 +89685,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: 117, y: -62} + m_AnchoredPosition: {x: 117, y: -64} m_SizeDelta: {x: 234, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4556295833810989776 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index dbf808e8ae..7f7af883fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -75,7 +75,7 @@ function this:InitComponent() ---------------topLeftPart---------------- -- 七日登陆奖励预览入口 - this.sgBtn=Util.GetGameObject(self.gameObject,"LeftUp/seven") + this.sgBtn=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/seven") this.sgRoot=Util.GetGameObject(this.sgBtn,"sevenGift/root") this.sgItemView = SubUIManager.Open(SubUIConfig.ItemView,this.sgRoot.transform) this.sgType=Util.GetGameObject(this.sgBtn,"sevenGift/type"):GetComponent("Text")