From 171e9a46902c74e8ff809be3ec4b1246f45c102c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 24 Dec 2020 10:45:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=B7=85?= =?UTF-8?q?=E5=B3=B0=E8=B5=9B=EF=BC=8C=E5=8D=81=E7=BB=9D=E9=98=B5=E9=A2=84?= =?UTF-8?q?=E5=91=8A=E5=9B=BE=E6=A0=87=E5=8F=8C=E8=A1=8C=E6=96=87=E5=AD=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivityAtlas/ShengXingYouLi.meta | 8 ---- .../DynamicActivityAtlas/XiangYaoDuoBao.meta | 8 ---- .../Prefabs/UI/Main/MainPanel.prefab | 44 +++++++++---------- 3 files changed, 22 insertions(+), 38 deletions(-) delete mode 100644 Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta delete mode 100644 Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta deleted file mode 100644 index 8745c534e3..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 814a374fa5248bc4f92e382b5827589b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta deleted file mode 100644 index cb21bda1d5..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 095aa8f76340f854aa387f03d93db7d7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index bd282a2f00..4054cc81fd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -7529,7 +7529,7 @@ ParticleSystem: --- !u!199 &3612650515471756776 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16399,7 +16399,7 @@ ParticleSystem: --- !u!199 &2077135144819501974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22379,7 +22379,7 @@ ParticleSystem: --- !u!199 &5382233283546536858 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26918,8 +26918,8 @@ 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: -6.6, y: -76.6} - m_SizeDelta: {x: 191.9, y: 42.5} + m_AnchoredPosition: {x: -6.6, y: -89.59} + m_SizeDelta: {x: 191.9, y: 59.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &527630820219155363 CanvasRenderer: @@ -31616,7 +31616,7 @@ ParticleSystem: --- !u!199 &4678487443364567018 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36753,7 +36753,7 @@ ParticleSystem: --- !u!199 &3301434479282110283 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41733,7 +41733,7 @@ ParticleSystem: --- !u!199 &8715317583352480221 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42260,8 +42260,8 @@ 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: -6.6, y: -76.6} - m_SizeDelta: {x: 160, y: 28} + m_AnchoredPosition: {x: -6.6, y: -89.1} + m_SizeDelta: {x: 160, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4497326119887660237 CanvasRenderer: @@ -47824,7 +47824,7 @@ ParticleSystem: --- !u!199 &8426323061574149814 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48065,7 +48065,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: -6.6, y: -76.6} + m_AnchoredPosition: {x: -6.6, y: -89.59} m_SizeDelta: {x: 191.9, y: 42.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8669910255439078306 @@ -53122,7 +53122,7 @@ ParticleSystem: --- !u!199 &3988090302360095373 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58867,7 +58867,7 @@ ParticleSystem: --- !u!199 &5461926455895321923 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63901,7 +63901,7 @@ ParticleSystem: --- !u!199 &6960492284779320589 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69943,7 +69943,7 @@ ParticleSystem: --- !u!199 &4261467272199160834 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77060,7 +77060,7 @@ ParticleSystem: --- !u!199 &5519341793566101665 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87193,7 +87193,7 @@ ParticleSystem: --- !u!199 &1706209193022837301 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93941,7 +93941,7 @@ ParticleSystem: --- !u!199 &8234207848460451360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99153,7 +99153,7 @@ ParticleSystem: --- !u!199 &3615746855071839570 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100344,8 +100344,8 @@ 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: -6.6, y: -76.6} - m_SizeDelta: {x: 160, y: 28} + m_AnchoredPosition: {x: -6.6, y: -90.945} + m_SizeDelta: {x: 160, y: 56.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6610456779521311710 CanvasRenderer: