diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 2ac2d214e7..6e5931852b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -186,9 +186,9 @@ RectTransform: m_Father: {fileID: 1012972711} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 56, y: -901.38495} m_SizeDelta: {x: 112, y: 168.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &107230299 @@ -307,7 +307,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5042223749266453906} - {fileID: 689865172} m_Father: {fileID: 315397224} m_RootOrder: 0 @@ -5080,7 +5079,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 294560546} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9722,9 +9721,9 @@ RectTransform: m_Father: {fileID: 1012972711} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 117, y: -56} m_SizeDelta: {x: 234, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &698392787 @@ -9866,7 +9865,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -59, y: 18.7} - m_SizeDelta: {x: 0, y: 70} + m_SizeDelta: {x: 381, y: 70} m_Pivot: {x: 1, y: 0} --- !u!114 &708116011 MonoBehaviour: @@ -10101,9 +10100,9 @@ RectTransform: m_Father: {fileID: 1012972711} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 56, y: -544.76} m_SizeDelta: {x: 112, y: 208.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &969518021 @@ -10525,10 +10524,10 @@ RectTransform: m_Father: {fileID: 708116007} 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: 68.95} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 159, y: -35} + m_SizeDelta: {x: 230, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1240811747 CanvasRenderer: @@ -10774,10 +10773,10 @@ RectTransform: m_Father: {fileID: 708116007} 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: 68.95} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 301.5, y: -35} + m_SizeDelta: {x: 55, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1596169479 CanvasRenderer: @@ -20577,9 +20576,9 @@ RectTransform: m_Father: {fileID: 1012972711} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 56, y: -733.26996} m_SizeDelta: {x: 112, y: 148.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2110103218 @@ -40487,9 +40486,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -30.74} m_SizeDelta: {x: 100, y: 61.48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7481411220995830971 @@ -41319,9 +41318,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -270.22998} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -42488,25 +42487,68 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!224 &5042223749266453906 -RectTransform: - m_ObjectHideFlags: 0 +--- !u!199 &2029503781167846324 +ParticleSystemRenderer: + serializedVersion: 6 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1533186584701823329} - 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: 294560546} - 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, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c5d60d0ce8808654b89af40aa1fdd292, type: 2} + - {fileID: 2100000, guid: c5d60d0ce8808654b89af40aa1fdd292, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_RenderMode: 0 + m_SortMode: 0 + m_MinParticleSize: 0 + m_MaxParticleSize: 5 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_ShadowBias: 0 + m_RenderAlignment: 0 + m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_EnableGPUInstancing: 0 + m_ApplyActiveColorSpace: 0 + m_AllowRoll: 1 + m_VertexStreams: 0001030405 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!198 &7925765855785591131 ParticleSystem: m_ObjectHideFlags: 0 @@ -47111,68 +47153,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!199 &2029503781167846324 -ParticleSystemRenderer: - serializedVersion: 6 - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1533186584701823329} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c5d60d0ce8808654b89af40aa1fdd292, type: 2} - - {fileID: 2100000, guid: c5d60d0ce8808654b89af40aa1fdd292, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_RenderMode: 0 - m_SortMode: 0 - m_MinParticleSize: 0 - m_MaxParticleSize: 5 - m_CameraVelocityScale: 0 - m_VelocityScale: 0 - m_LengthScale: 2 - m_SortingFudge: 0 - m_NormalDirection: 1 - m_ShadowBias: 0 - m_RenderAlignment: 0 - m_Pivot: {x: 0, y: 0, z: 0} - m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 - m_EnableGPUInstancing: 0 - m_ApplyActiveColorSpace: 0 - m_AllowRoll: 1 - m_VertexStreams: 0001030405 - m_Mesh: {fileID: 0} - m_Mesh1: {fileID: 0} - m_Mesh2: {fileID: 0} - m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 --- !u!1 &1534675581079605794 GameObject: m_ObjectHideFlags: 0 @@ -52675,9 +52655,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -453.97998} m_SizeDelta: {x: 100, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6889475057108059259 @@ -73351,7 +73331,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3223588515252977199 RectTransform: m_ObjectHideFlags: 0 @@ -74248,9 +74228,9 @@ RectTransform: m_Father: {fileID: 3814890933284291651} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 53, y: -53} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791543136630995348 @@ -74510,7 +74490,6 @@ GameObject: - component: {fileID: 7769250164363960738} - component: {fileID: 1631986815225695271} - component: {fileID: 8884928085519808510} - - component: {fileID: 4686783420370659202} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -74576,48 +74555,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &4686783420370659202 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3988909078317694928} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenSequeue: - - initV3: {x: 1.3, y: 1.3, z: 1.3} - initFloat: 0 - isInit: 1 - changeV3: {x: 1, y: 1, z: 1} - changeFloat: 0 - duration: 0.8 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 1 - loop: 999999999 - loopType: 1 - targetObj: {fileID: 0} - - initV3: {x: 1.3, y: 1.3, z: 1.3} - initFloat: 0 - isInit: 1 - changeV3: {x: 1, y: 1, z: 1} - changeFloat: 0 - duration: 0.8 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 1 - loop: 999999999 - loopType: 1 - targetObj: {fileID: 0} - isPlayAudio: 1 - isHaveCloseBtn: 0 - isPlayOnOpen: 1 --- !u!1 &4021192248023384996 GameObject: m_ObjectHideFlags: 0 @@ -101125,9 +101062,9 @@ RectTransform: m_Father: {fileID: 3814890933284291651} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 269.44, y: -53} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5575929133019220475 @@ -101266,7 +101203,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 55, y: -137} - m_SizeDelta: {x: 0, y: 74.5} + m_SizeDelta: {x: 322.44, y: 74.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5535357721351960960 MonoBehaviour: @@ -125968,9 +125905,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -111.479996} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -126248,9 +126185,9 @@ RectTransform: m_Father: {fileID: 1012972711} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 101.75, y: -276.15} m_SizeDelta: {x: 203.5, y: 308.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5423471315474658513 @@ -137649,10 +137586,10 @@ RectTransform: m_Father: {fileID: 708116007} m_RootOrder: 2 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: 69.49} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 355, y: -35} + m_SizeDelta: {x: 52, y: 69.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7203306409298755909 CanvasRenderer: @@ -138638,9 +138575,9 @@ RectTransform: m_Father: {fileID: 3814890933284291651} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 161.22, y: -53} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7914440216826683292 @@ -145614,16 +145551,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8396574590237599826, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7980263994227630839, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} propertyPath: m_IsActive @@ -145644,17 +145571,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4145065454229451357, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} ---- !u!224 &830511510176938944 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - m_PrefabInstance: {fileID: 8971074634032498639} - m_PrefabAsset: {fileID: 0} --- !u!1 &1533186584701823329 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} m_PrefabInstance: {fileID: 8971074634032498639} m_PrefabAsset: {fileID: 0} +--- !u!224 &830511510176938944 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + m_PrefabInstance: {fileID: 8971074634032498639} + m_PrefabAsset: {fileID: 0}