From 94b81d0fddb54f8e129c06cc4354823b2947d64f Mon Sep 17 00:00:00 2001 From: Jamie Leveridge Date: Mon, 8 Nov 2021 15:19:36 +0000 Subject: [PATCH] Tweaking layer values for leaderboard --- .../Game Over Screen/Leaderboard.anim | 126 ++++++++--------- .../Assets/Examples/Defender/Defender.unity | 132 +++++++++++++++--- 2 files changed, 175 insertions(+), 83 deletions(-) diff --git a/Unity-Files/Assets/Animations/Game Over Screen/Leaderboard.anim b/Unity-Files/Assets/Animations/Game Over Screen/Leaderboard.anim index 681dc2c..131fafd 100644 --- a/Unity-Files/Assets/Animations/Game Over Screen/Leaderboard.anim +++ b/Unity-Files/Assets/Animations/Game Over Screen/Leaderboard.anim @@ -185,34 +185,6 @@ AnimationClip: path: LeaderboardPanel/ScoreText (5) classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.5 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Return Button (1) - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -269,6 +241,34 @@ AnimationClip: path: GameOverLabel/ScoreSubmitPanel classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 4.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: LeaderboardPanel/Return Button (1) + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -319,13 +319,6 @@ AnimationClip: typeID: 114 customType: 24 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3053600709 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3660318455 attribute: 2086281974 @@ -340,6 +333,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2245661666 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -530,34 +530,6 @@ AnimationClip: path: LeaderboardPanel/ScoreText (5) classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.5 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Return Button (1) - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -614,6 +586,34 @@ AnimationClip: path: GameOverLabel/ScoreSubmitPanel classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 4.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: LeaderboardPanel/Return Button (1) + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 164e909..2338aaa 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -124,6 +124,85 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &111415487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 111415488} + - component: {fileID: 111415490} + - component: {fileID: 111415489} + m_Layer: 5 + m_Name: PausedText (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &111415488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111415487} + 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: 345114455} + 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: -0.000015259, y: -215} + m_SizeDelta: {x: 499.35, y: 212.81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &111415489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111415487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Press esc to unpause. +--- !u!222 &111415490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111415487} + m_CullTransparentMesh: 1 --- !u!1 &127769136 GameObject: m_ObjectHideFlags: 0 @@ -311,7 +390,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -125} - m_SizeDelta: {x: 1000, y: 50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &204554430 CanvasRenderer: @@ -438,7 +517,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -430} - m_SizeDelta: {x: 1000, y: 80} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &222835919 MonoBehaviour: @@ -699,7 +778,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -50} - m_SizeDelta: {x: 1000, y: 100} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &289906080 MonoBehaviour: @@ -778,7 +857,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -510} - m_SizeDelta: {x: 1000, y: 80} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &303121901 MonoBehaviour: @@ -934,6 +1013,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1394015180} + - {fileID: 111415488} m_Father: {fileID: 1911403295} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1467,7 +1547,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -350} - m_SizeDelta: {x: 1000, y: 80} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &615826098 MonoBehaviour: @@ -2354,6 +2434,7 @@ RectTransform: - {fileID: 615826097} - {fileID: 222835918} - {fileID: 303121900} + - {fileID: 1066252772} m_Father: {fileID: 1911386533} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2381,7 +2462,7 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 0 - m_ChildForceExpandWidth: 1 + m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 m_ChildControlHeight: 0 @@ -2505,6 +2586,7 @@ GameObject: - component: {fileID: 1066252775} - component: {fileID: 1066252774} - component: {fileID: 1066252773} + - component: {fileID: 1066252777} m_Layer: 0 m_Name: Return Button (1) m_TagString: Untagged @@ -2524,13 +2606,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1835608784} - m_Father: {fileID: 1911386533} - m_RootOrder: 2 + m_Father: {fileID: 1059183747} + m_RootOrder: 7 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: -262} - m_SizeDelta: {x: 300.976, y: 86.8201} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 500, y: -593.41003} + m_SizeDelta: {x: 260, y: 86.8201} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1066252773 Animator: @@ -2645,6 +2727,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1066252771} m_CullTransparentMesh: 1 +--- !u!210 &1066252777 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066252771} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1083330061 GameObject: m_ObjectHideFlags: 0 @@ -2794,7 +2887,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2802,10 +2895,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3} m_FontSize: 100 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 m_MaxSize: 100 m_Alignment: 4 @@ -2814,7 +2907,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: paused + m_Text: Paused --- !u!222 &1394015182 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2858,7 +2951,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -190} - m_SizeDelta: {x: 1000, y: 80} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1433312461 MonoBehaviour: @@ -4299,7 +4392,6 @@ RectTransform: m_Children: - {fileID: 1911360419} - {fileID: 1059183747} - - {fileID: 1066252772} m_Father: {fileID: 1911403295} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4437,7 +4529,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_TargetDisplay: 0 --- !u!222 &1911509197 CanvasRenderer: @@ -4579,7 +4671,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 500, y: -270} - m_SizeDelta: {x: 1000, y: 80} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2084735052 MonoBehaviour: