ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/menus' into main

This commit is contained in:
Cat Flynn 2021-05-18 22:12:04 +01:00
parent fe6a1e4595 f49e14545a
commit 96f0fd8fff
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
game/Assets/Scenes/MainMenu.unity
View File

@ -207,7 +207,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 103.7, y: 8} m_SizeDelta: {x: 87.18, y: 8}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!114 &252918448 --- !u!114 &252918448
MonoBehaviour: MonoBehaviour:
@ -757,7 +757,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: Beta Build m_text: Final Ascent
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2} m_fontAsset: {fileID: 11400000, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2}
m_sharedMaterial: {fileID: 8676679976202632858, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2} m_sharedMaterial: {fileID: 8676679976202632858, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2}
@ -1104,26 +1104,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: '<b>Programming</b> m_text: "<b>- Programming -</b>\nCat Flynn \nCinder Foster-Smith\nDale Field\nStamatios
Stellas\n\n\n<b>- Voice Acting -</b>\nBecky Vicars\nDan Daniel Australia"
Cat Flynn
Cinder Foster-Smith
Dale
Field
Stamatios Stellas
<b>Audio</b>
Cai Jones
'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2} m_fontAsset: {fileID: 11400000, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2}
m_sharedMaterial: {fileID: 8676679976202632858, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2} m_sharedMaterial: {fileID: 8676679976202632858, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2}
@ -1312,6 +1294,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4965922347830716765, guid: f5eb8065324d13246b9599875b38f78e, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f5eb8065324d13246b9599875b38f78e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f5eb8065324d13246b9599875b38f78e, type: 3}
--- !u!1001 &1163968772 --- !u!1001 &1163968772
@ -1722,8 +1708,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: '<b>Art</b> m_text: '<b>- Art -</b>
Charlie Tinley Charlie Tinley
@ -1733,15 +1718,19 @@ MonoBehaviour:
Tran Tran
<b>Special Thanks</b> <b>- Audio -</b>
Cai Jones
Chris Windmill <b>- Special Thanks -</b>
Chris
Windmill
Ben Thomas Ben Thomas
Panos Panos Stellas'
Stellas'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2} m_fontAsset: {fileID: 11400000, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2}
m_sharedMaterial: {fileID: 8676679976202632858, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2} m_sharedMaterial: {fileID: 8676679976202632858, guid: 276417976e541874dad8e5bb1f30fd1e, type: 2}
@ -2541,7 +2530,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 103.7, y: 8} m_SizeDelta: {x: 87.18, y: 8}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1892687921 --- !u!114 &1892687921
MonoBehaviour: MonoBehaviour:
@ -2764,7 +2753,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -675, y: -485} m_AnchoredPosition: {x: -675, y: -485}
m_SizeDelta: {x: 1000, y: 625} m_SizeDelta: {x: 900, y: 660}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1914762249 --- !u!114 &1914762249
MonoBehaviour: MonoBehaviour: