summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assets/Scenes/MainMenu.unity4
-rw-r--r--Assets/Scenes/SampleScene.unity84
-rw-r--r--ProjectSettings/ProjectSettings.asset1
3 files changed, 22 insertions, 67 deletions
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index ab6e009..758d91d 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -424,8 +424,8 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "Welcome to Project Sandbox! \nPlease note that this game is in early development
and things aren't always working.\n\nIf you're experiencing some issues. Email
- support@alee-productions.xyz.\n\nControls:\n\nEscape: Quitting the game\nF1:
- Unlocking mouse\nWASD: Moving\nSpace: Jumping"
+ support@alee-productions.xyz.\n\nControls:\n\nEscape: Pause\nWASD: Moving\nSpace:
+ Jumping"
--- !u!222 &458945989
CanvasRenderer:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index 7f0a58e..f255136 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -227,17 +227,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 138210409}
- 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:
- {fileID: 1603614688}
- m_Father: {fileID: 1343977746}
- m_RootOrder: 3
+ m_Father: {fileID: 832029364}
+ m_RootOrder: 1
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: 241, y: -30.405}
+ m_AnchoredPosition: {x: 0, y: -164.6}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &138210411
@@ -383,7 +383,7 @@ RectTransform:
- {fileID: 557179452}
- {fileID: 1986888938}
m_Father: {fileID: 1343977746}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -553,7 +553,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &519581756
MonoBehaviour:
@@ -932,7 +932,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &832029363
GameObject:
@@ -964,14 +964,15 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1361389540}
+ - {fileID: 138210410}
- {fileID: 895538663}
m_Father: {fileID: 1343977746}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 1.2999878, y: 1.1000061}
- m_SizeDelta: {x: -0.8123779, y: -5.2874146}
+ m_AnchoredPosition: {x: 0.4468994, y: 1.8718872}
+ m_SizeDelta: {x: 0.89385986, y: -3.7437134}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &832029365
MonoBehaviour:
@@ -1152,7 +1153,7 @@ RectTransform:
m_Children:
- {fileID: 73638134}
m_Father: {fileID: 832029364}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1284,51 +1285,7 @@ Transform:
- {fileID: 1180920473}
- {fileID: 701464660}
m_Father: {fileID: 0}
- m_RootOrder: 7
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1010888048
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1010888050}
- - component: {fileID: 1010888049}
- m_Layer: 0
- m_Name: CursorUnlocked
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1010888049
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1010888048}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d447635ba689deb97b1b5141635f8738, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- lockCursor: 1
---- !u!4 &1010888050
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1010888048}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 417.8942, y: 377.206, z: -232.20137}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 0
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1133956157
GameObject:
@@ -1497,7 +1454,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1724,7 +1681,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1343977746}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1836,13 +1793,12 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1133956158}
+ - {fileID: 2143030780}
- {fileID: 832029364}
- {fileID: 192977405}
- - {fileID: 138210410}
- - {fileID: 2143030780}
- {fileID: 1302777225}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1984,7 +1940,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1603614687
GameObject:
@@ -2351,7 +2307,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1343977746}
- m_RootOrder: 4
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &423103507109781297
MeshRenderer:
@@ -2726,7 +2682,7 @@ PrefabInstance:
- target: {fileID: 8450095133606623982, guid: 8489462a89be80c6e91509d42a08b050,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8450095133606623982, guid: 8489462a89be80c6e91509d42a08b050,
type: 3}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 20e5b09..5e9d0b5 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -127,7 +127,6 @@ PlayerSettings:
bundleVersion: 0.0.1
preloadedAssets:
- {fileID: 0}
- - {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1