From 7ea798b69309ea88d73d94de86fa185e3d8320f0 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 25 Feb 2021 15:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B4=BB=E5=8A=A8=E4=BB=8B=E7=BB=8D=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=86=85=E5=AE=B9=E6=94=B9=E4=B8=BA=E5=8F=AF=E6=BB=91?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page12.prefab | 110 ++++-------------- .../Prefabs/UI/DynamicActicity/page14.prefab | 53 ++++++--- .../Prefabs/UI/DynamicActicity/page3.prefab | 39 +++++-- .../Prefabs/UI/DynamicActicity/page4.prefab | 39 +++++-- 4 files changed, 113 insertions(+), 128 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab index d580714bbc..2ba4a5ba25 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab @@ -643,7 +643,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4408826367995821685 RectTransform: m_ObjectHideFlags: 0 @@ -1682,6 +1682,7 @@ GameObject: - component: {fileID: 816005676610236215} - component: {fileID: 5193339339344367836} - component: {fileID: 299629318622383970} + - component: {fileID: 1834529110067380256} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1700,14 +1701,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 849088679854438805} + m_Father: {fileID: 6505667543915279014} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 425.05, y: -19} - m_SizeDelta: {x: 850.1, y: 38} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 458.5, y: -0.000020025258} + m_SizeDelta: {x: 850.1, y: 0} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &5193339339344367836 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1750,6 +1751,20 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1.27 m_Text: +--- !u!114 &1834529110067380256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429415102135865355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &1468525258524545275 GameObject: m_ObjectHideFlags: 0 @@ -4659,81 +4674,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4208876692029983025} m_CullTransparentMesh: 0 ---- !u!1 &4243952795311934618 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 849088679854438805} - - component: {fileID: 5697281256234186425} - - component: {fileID: 4061829450427730194} - m_Layer: 5 - m_Name: grid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &849088679854438805 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4243952795311934618} - 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: 816005676610236215} - m_Father: {fileID: 6505667543915279014} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.000012159, y: -46} - m_SizeDelta: {x: 850.1, y: 38} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &5697281256234186425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4243952795311934618} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &4061829450427730194 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4243952795311934618} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, 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_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 --- !u!1 &4316813271701194156 GameObject: m_ObjectHideFlags: 0 @@ -8679,15 +8619,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 849088679854438805} + - {fileID: 816005676610236215} m_Father: {fileID: 2680458337350967071} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.5, y: -536.2799} + m_AnchoredPosition: {x: 458.5, y: -363.88} m_SizeDelta: {x: 917, y: 398.66} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &5568747603554451701 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8703,12 +8643,12 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8485809854369217552} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Content: {fileID: 849088679854438805} + m_Content: {fileID: 816005676610236215} m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab index 6ef064918d..5bf49cc662 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab @@ -2367,6 +2367,7 @@ GameObject: - component: {fileID: 2338547606788189034} - component: {fileID: 7862881715742596568} - component: {fileID: 8308223648630376202} + - component: {fileID: 3860429360585780994} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2390,9 +2391,9 @@ 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: 0.000006170684, y: -41.31} - m_SizeDelta: {x: 850.1, y: 399.2} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 191.66986} + m_SizeDelta: {x: 850.1, y: 0} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &7862881715742596568 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2435,6 +2436,20 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1.27 m_Text: +--- !u!114 &3860429360585780994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2624568799117268437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2657941374812061363 GameObject: m_ObjectHideFlags: 0 @@ -4554,9 +4569,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.5, y: -536.2799} - m_SizeDelta: {x: 917, y: 344.8} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 458.5, y: -363.87994} + m_SizeDelta: {x: 917, y: 398.66} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &5793210257777429095 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4572,7 +4587,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4549683016496093124} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4604,7 +4619,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4549683016496093124} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -9201,7 +9216,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4944397495160175821 RectTransform: m_ObjectHideFlags: 0 @@ -9313,11 +9328,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2132785343472515193} m_Modifications: - - target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, - type: 3} - propertyPath: m_Name - value: Effect_xiaozhuanfeng_hit01 - objectReference: {fileID: 0} - target: {fileID: 1934794854557949801, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, type: 3} propertyPath: m_LocalPosition.x @@ -9373,6 +9383,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, + type: 3} + propertyPath: m_Name + value: Effect_xiaozhuanfeng_hit01 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, type: 3} --- !u!4 &2487093841126313949 stripped @@ -9388,11 +9403,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2132785343472515193} m_Modifications: - - target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2, - type: 3} - propertyPath: m_Name - value: Effect_xiaozhuanfeng_hit02 - objectReference: {fileID: 0} - target: {fileID: 5538650172890135995, guid: c97934c2eec98be49b26b06232d68cf2, type: 3} propertyPath: m_LocalPosition.x @@ -9448,6 +9458,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2, + type: 3} + propertyPath: m_Name + value: Effect_xiaozhuanfeng_hit02 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c97934c2eec98be49b26b06232d68cf2, type: 3} --- !u!4 &1934620330201386658 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab index 9409177193..7554634874 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab @@ -6979,7 +6979,7 @@ ParticleSystem: --- !u!199 &6683236217412788304 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -8438,6 +8438,7 @@ GameObject: - component: {fileID: 4107486288919078871} - component: {fileID: 674029230174665073} - component: {fileID: 6815070236539301390} + - component: {fileID: 3479256785309430233} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -8459,11 +8460,11 @@ RectTransform: m_Father: {fileID: 6878634906363755089} 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: 0.000006170684, y: -41.31} - m_SizeDelta: {x: 850.1, y: 399.2} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.0000121593475, y: -182.83006} + m_SizeDelta: {x: 850.1, y: 33} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &674029230174665073 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8506,6 +8507,20 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1.2 m_Text: +--- !u!114 &3479256785309430233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2488068171699288377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2517640124157905789 GameObject: m_ObjectHideFlags: 0 @@ -12772,9 +12787,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.5, y: -536.2799} - m_SizeDelta: {x: 917, y: 344.8} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 458.5, y: -363.88} + m_SizeDelta: {x: 917, y: 398.66} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8200922925570426420 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12790,7 +12805,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4479503675688269080} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -12822,7 +12837,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4479503675688269080} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -21787,7 +21802,7 @@ ParticleSystem: --- !u!199 &305727223664186203 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index 0fa7092f2a..5143dd465a 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -8138,6 +8138,7 @@ GameObject: - component: {fileID: 1638832938389854891} - component: {fileID: 3333096047006661289} - component: {fileID: 3651209566855878434} + - component: {fileID: 1618997142111166750} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -8159,11 +8160,11 @@ RectTransform: m_Father: {fileID: 7497974347911553419} 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: 0.000006170684, y: -34.02} - m_SizeDelta: {x: 850.1, y: 466.7} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.0000121593475, y: -180} + m_SizeDelta: {x: 850.1, y: 38} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &3333096047006661289 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8206,6 +8207,20 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1.27 m_Text: +--- !u!114 &1618997142111166750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7773675009234637031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &7889284016643724088 GameObject: m_ObjectHideFlags: 0 @@ -8605,9 +8620,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.5, y: -563.21} + m_AnchoredPosition: {x: 458.5, y: -363.88007} m_SizeDelta: {x: 917, y: 398.66} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &2113068854489763878 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9457,11 +9472,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 9092643564979373074} m_Modifications: - - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, - type: 3} - propertyPath: m_Name - value: Effect_UI_changjing_qiankuanbaoguo - objectReference: {fileID: 0} - target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} propertyPath: m_LocalPosition.x @@ -9517,6 +9527,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_Name + value: Effect_UI_changjing_qiankuanbaoguo + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} --- !u!4 &582742966390753427 stripped