gjcampbell/Magical-Jumping-Bean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mouse pointer disappearing in menus bug as well as added controller support for the main menu

Browse Source
This commit is contained in:
Gregory Campbell
2020-01-26 23:03:41 -05:00
parent 4061ebc8d7
commit bb13bb930e
10 changed files with 1054 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Floor Level.unity
+16 -16
View File
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 680319583}
m_IndirectSpecularColor: {r: 0.5518341, g: 0.55590534, b: 0.5908708, a: 1}
m_IndirectSpecularColor: {r: 0.63570493, g: 0.6013978, b: 0.5769485, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -313,7 +313,7 @@ RectTransform:
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.000061035, y: 103}
m_AnchoredPosition: {x: 0.000061035, y: 66.100006}
m_SizeDelta: {x: 381.6, y: 93.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &223326613
@@ -442,7 +442,7 @@ RectTransform:
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: -27.7}
m_AnchoredPosition: {x: 0, y: -64.59999}
m_SizeDelta: {x: 515.5, y: 111.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &377938485
@@ -2045,7 +2045,7 @@ RectTransform:
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.000061035, y: -155.2}
m_AnchoredPosition: {x: 0.000061035, y: -192.09999}
m_SizeDelta: {x: 265.9, y: 95.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1584704080
@@ -2174,7 +2174,7 @@ RectTransform:
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: -281.1}
m_AnchoredPosition: {x: -0, y: -318}
m_SizeDelta: {x: 212.4, y: 90.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1643871633
@@ -2556,7 +2556,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2066072971
--- !u!1 &2032483823
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2564,9 +2564,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2066072974}
- component: {fileID: 2066072973}
- component: {fileID: 2066072972}
- component: {fileID: 2032483826}
- component: {fileID: 2032483825}
- component: {fileID: 2032483824}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
@@ -2574,13 +2574,13 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2066072972
--- !u!114 &2032483824
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2066072971}
m_GameObject: {fileID: 2032483823}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
@@ -2593,28 +2593,28 @@ MonoBehaviour:
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &2066072973
--- !u!114 &2032483825
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2066072971}
m_GameObject: {fileID: 2032483823}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_FirstSelected: {fileID: 223326611}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &2066072974
--- !u!4 &2032483826
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2066072971}
m_GameObject: {fileID: 2032483823}
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}
Assets/Scenes/Hub World.unity
+904 -935
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Main Menu.unity
+1 -1
View File
@@ -3545,7 +3545,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_FirstSelected: {fileID: 1417856269}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &985624425
Assets/Scenes/Waypoint Race.unity
+71 -71
View File
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1084448987}
m_IndirectSpecularColor: {r: 0.5518341, g: 0.55590534, b: 0.5908708, a: 1}
m_IndirectSpecularColor: {r: 0.63570493, g: 0.6013978, b: 0.5769485, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -262,7 +262,7 @@ RectTransform:
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: -29.1}
m_AnchoredPosition: {x: 0, y: -68.1}
m_SizeDelta: {x: 520.2, y: 93.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &88922121
@@ -391,7 +391,7 @@ RectTransform:
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: -285.2}
m_AnchoredPosition: {x: 0, y: -324.2}
m_SizeDelta: {x: 216.1, y: 91.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &332295496
@@ -734,72 +734,6 @@ RectTransform:
m_AnchoredPosition: {x: -761.85, y: 478.62}
m_SizeDelta: {x: 396.3, y: 124.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &488143136
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 488143139}
- component: {fileID: 488143138}
- component: {fileID: 488143137}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &488143137
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 488143136}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Jump
m_CancelButton: Pause
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &488143138
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 488143136}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &488143139
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 488143136}
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: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &677662897
GameObject:
m_ObjectHideFlags: 0
@@ -1297,7 +1231,7 @@ RectTransform:
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.000061035, y: 103}
m_AnchoredPosition: {x: 0.000061035, y: 64}
m_SizeDelta: {x: 388.5, y: 80.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1040909059
@@ -2104,6 +2038,72 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1486058019}
m_CullTransparentMesh: 0
--- !u!1 &1539074417
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1539074420}
- component: {fileID: 1539074419}
- component: {fileID: 1539074418}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1539074418
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1539074417}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Jump
m_CancelButton: Pause
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &1539074419
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1539074417}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 1040909057}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1539074420
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1539074417}
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: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1579256708
GameObject:
m_ObjectHideFlags: 0
@@ -2376,7 +2376,7 @@ RectTransform:
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.000061035, y: -158}
m_AnchoredPosition: {x: 0.000061035, y: -197}
m_SizeDelta: {x: 286.2, y: 82.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1952506482