fixed some menus

team-nullptr · Mar 7, 2022 · e5017bd · e5017bd
1 parent 94dc4f6
commit e5017bd
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 33 deletions.
diff --git a/Assets/Resources/Prefabs/ScoreboardUI.prefab b/Assets/Resources/Prefabs/ScoreboardUI.prefab
@@ -1,5 +1,70 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4062906459399764753
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 117402207243016130}
+  - component: {fileID: 5829524964014193199}
+  m_Layer: 5
+  m_Name: GeneralUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &117402207243016130
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4062906459399764753}
+  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: 7285619471405880302}
+  - {fileID: 2008432877184803067}
+  - {fileID: 7285619471223153550}
+  m_Father: {fileID: 7285619470209417366}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5829524964014193199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4062906459399764753}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 150
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &7285619469710161191
 GameObject:
   m_ObjectHideFlags: 0
@@ -201,10 +266,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
-  - {fileID: 7285619471405880302}
-  - {fileID: 2008432877184803067}
+  - {fileID: 117402207243016130}
   - {fileID: 7285619470843390565}
-  - {fileID: 7285619471223153550}
   - {fileID: 7601786997317013242}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -307,7 +370,7 @@ RectTransform:
   m_Children:
   - {fileID: 7285619471473666960}
   m_Father: {fileID: 7285619470209417366}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -438,13 +501,13 @@ RectTransform:
   m_Children:
   - {fileID: 7285619469710161188}
   - {fileID: 7285619469820916992}
-  m_Father: {fileID: 7285619470209417366}
-  m_RootOrder: 3
+  m_Father: {fileID: 117402207243016130}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 15}
-  m_SizeDelta: {x: 0, y: 100}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 2460, y: 100}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &7285619471223153551
 MonoBehaviour:
@@ -497,16 +560,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7285619471405880297}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 7285619470209417366}
+  m_Father: {fileID: 117402207243016130}
   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, y: -250}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 500, y: 200}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7285619471405880300
@@ -659,7 +722,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7285619470209417366}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1273558886309726141
 MonoBehaviour:
@@ -674,15 +737,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   currentMenu: {fileID: 0}
-  easyLevels: []
-  mediumLevels: []
-  hardLevels: []
 --- !u!1001 &7285619469788819211
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 7285619470209417366}
+    m_TransformParent: {fileID: 117402207243016130}
     m_Modifications:
     - target: {fileID: 9134667016470098165, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_AnchorMax.y
@@ -874,19 +934,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_SizeDelta.x
@@ -914,23 +974,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -150
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

diff --git a/Assets/Scenes/WinMenuWithoutSavingScore.unity b/Assets/Scenes/WinMenuWithoutSavingScore.unity
@@ -155,6 +155,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_MoveRepeatDelay: 0.5
   m_MoveRepeatRate: 0.1
+  m_XRTrackingOrigin: {fileID: 0}
   m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
   m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
   m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
@@ -326,7 +327,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.30980393, g: 0.42401236, b: 0.77254903, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0

diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -21,19 +21,19 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7315001214396305293438251860adcd3b3cf7eb33bacb3f29393557a1290a371526
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c6819183a1d243966333e243d04
+      value: 22424703114646680e0b0227036c7315001214396305293438251862adc5352bfba81aecf13f336d7717e1351027
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c6819183a1d24391f2f2425260827d1e12231ece005eae8283a722c0ce6281d
+      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c6819183a1d243905293438251860acf53a31f6fe
+      value: 22424703114646680e0b0227036c6819183a1d243966333e243d04
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c7315001214396305293438251862adc5352bfba81aecf13f336d7717e1351027
+      value: 22424703114646680e0b0227036c6819183a1d243905293438251860acf53a31f6fe
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+      value: 22424703114646680e0b0227036c6819183a1d24391f2f2425260827d1e12231ece005eae8283a722c0ce6281d
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650