Make the game build
1425
Assets/Canvas.prefab
Normal file
@ -1,6 +1,6 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 7a0db1a0fdab8d34d8c2abb01027dd07
|
guid: 549b615a975c47546b02439c22f08821
|
||||||
DefaultImporter:
|
PrefabImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
@ -116,6 +116,15 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
""processors"": """",
|
""processors"": """",
|
||||||
""interactions"": """",
|
""interactions"": """",
|
||||||
""initialStateCheck"": false
|
""initialStateCheck"": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""name"": ""Pause"",
|
||||||
|
""type"": ""Button"",
|
||||||
|
""id"": ""f130e6cf-9ecc-46b1-b37d-bf452dae29f0"",
|
||||||
|
""expectedControlType"": ""Button"",
|
||||||
|
""processors"": """",
|
||||||
|
""interactions"": """",
|
||||||
|
""initialStateCheck"": false
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
""bindings"": [
|
""bindings"": [
|
||||||
@ -272,6 +281,17 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
""action"": ""Eat"",
|
""action"": ""Eat"",
|
||||||
""isComposite"": false,
|
""isComposite"": false,
|
||||||
""isPartOfComposite"": false
|
""isPartOfComposite"": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""name"": """",
|
||||||
|
""id"": ""81322c8b-dcdc-41da-a2af-8a9eb451461c"",
|
||||||
|
""path"": ""<Keyboard>/escape"",
|
||||||
|
""interactions"": """",
|
||||||
|
""processors"": """",
|
||||||
|
""groups"": """",
|
||||||
|
""action"": ""Pause"",
|
||||||
|
""isComposite"": false,
|
||||||
|
""isPartOfComposite"": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -290,6 +310,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
m_Movement_Interact = m_Movement.FindAction("Interact", throwIfNotFound: true);
|
m_Movement_Interact = m_Movement.FindAction("Interact", throwIfNotFound: true);
|
||||||
m_Movement_Mouse_Pos = m_Movement.FindAction("Mouse_Pos", throwIfNotFound: true);
|
m_Movement_Mouse_Pos = m_Movement.FindAction("Mouse_Pos", throwIfNotFound: true);
|
||||||
m_Movement_Eat = m_Movement.FindAction("Eat", throwIfNotFound: true);
|
m_Movement_Eat = m_Movement.FindAction("Eat", throwIfNotFound: true);
|
||||||
|
m_Movement_Pause = m_Movement.FindAction("Pause", throwIfNotFound: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
@ -359,6 +380,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
private readonly InputAction m_Movement_Interact;
|
private readonly InputAction m_Movement_Interact;
|
||||||
private readonly InputAction m_Movement_Mouse_Pos;
|
private readonly InputAction m_Movement_Mouse_Pos;
|
||||||
private readonly InputAction m_Movement_Eat;
|
private readonly InputAction m_Movement_Eat;
|
||||||
|
private readonly InputAction m_Movement_Pause;
|
||||||
public struct MovementActions
|
public struct MovementActions
|
||||||
{
|
{
|
||||||
private @Inputs m_Wrapper;
|
private @Inputs m_Wrapper;
|
||||||
@ -373,6 +395,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
public InputAction @Interact => m_Wrapper.m_Movement_Interact;
|
public InputAction @Interact => m_Wrapper.m_Movement_Interact;
|
||||||
public InputAction @Mouse_Pos => m_Wrapper.m_Movement_Mouse_Pos;
|
public InputAction @Mouse_Pos => m_Wrapper.m_Movement_Mouse_Pos;
|
||||||
public InputAction @Eat => m_Wrapper.m_Movement_Eat;
|
public InputAction @Eat => m_Wrapper.m_Movement_Eat;
|
||||||
|
public InputAction @Pause => m_Wrapper.m_Movement_Pause;
|
||||||
public InputActionMap Get() { return m_Wrapper.m_Movement; }
|
public InputActionMap Get() { return m_Wrapper.m_Movement; }
|
||||||
public void Enable() { Get().Enable(); }
|
public void Enable() { Get().Enable(); }
|
||||||
public void Disable() { Get().Disable(); }
|
public void Disable() { Get().Disable(); }
|
||||||
@ -412,6 +435,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
@Eat.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
|
@Eat.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
|
||||||
@Eat.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
|
@Eat.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
|
||||||
@Eat.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
|
@Eat.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
|
||||||
|
@Pause.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnPause;
|
||||||
|
@Pause.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnPause;
|
||||||
|
@Pause.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnPause;
|
||||||
}
|
}
|
||||||
m_Wrapper.m_MovementActionsCallbackInterface = instance;
|
m_Wrapper.m_MovementActionsCallbackInterface = instance;
|
||||||
if (instance != null)
|
if (instance != null)
|
||||||
@ -446,6 +472,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
@Eat.started += instance.OnEat;
|
@Eat.started += instance.OnEat;
|
||||||
@Eat.performed += instance.OnEat;
|
@Eat.performed += instance.OnEat;
|
||||||
@Eat.canceled += instance.OnEat;
|
@Eat.canceled += instance.OnEat;
|
||||||
|
@Pause.started += instance.OnPause;
|
||||||
|
@Pause.performed += instance.OnPause;
|
||||||
|
@Pause.canceled += instance.OnPause;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -462,5 +491,6 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
|
|||||||
void OnInteract(InputAction.CallbackContext context);
|
void OnInteract(InputAction.CallbackContext context);
|
||||||
void OnMouse_Pos(InputAction.CallbackContext context);
|
void OnMouse_Pos(InputAction.CallbackContext context);
|
||||||
void OnEat(InputAction.CallbackContext context);
|
void OnEat(InputAction.CallbackContext context);
|
||||||
|
void OnPause(InputAction.CallbackContext context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -94,6 +94,15 @@
|
|||||||
"processors": "",
|
"processors": "",
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"initialStateCheck": false
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Pause",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "f130e6cf-9ecc-46b1-b37d-bf452dae29f0",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"bindings": [
|
"bindings": [
|
||||||
@ -250,6 +259,17 @@
|
|||||||
"action": "Eat",
|
"action": "Eat",
|
||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "81322c8b-dcdc-41da-a2af-8a9eb451461c",
|
||||||
|
"path": "<Keyboard>/escape",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "",
|
||||||
|
"action": "Pause",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 200 B After Width: | Height: | Size: 200 B |
@ -113,6 +113,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
@ -101,6 +101,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites:
|
sprites:
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
@ -101,6 +101,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites:
|
sprites:
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.0 KiB |
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
@ -113,6 +113,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
Before Width: | Height: | Size: 306 B After Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 123 B After Width: | Height: | Size: 123 B |
Before Width: | Height: | Size: 83 B After Width: | Height: | Size: 83 B |
@ -101,6 +101,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 180 B After Width: | Height: | Size: 180 B |
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 211 B |
Before Width: | Height: | Size: 801 B After Width: | Height: | Size: 801 B |
@ -101,6 +101,18 @@ TextureImporter:
|
|||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites:
|
sprites:
|
Before Width: | Height: | Size: 283 B After Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 111 B After Width: | Height: | Size: 111 B |
Before Width: | Height: | Size: 163 B After Width: | Height: | Size: 163 B |
@ -10,15 +10,25 @@ public class PauseMenu : MonoBehaviour
|
|||||||
|
|
||||||
public GameObject homeObj;
|
public GameObject homeObj;
|
||||||
public PlayerMovement mov;
|
public PlayerMovement mov;
|
||||||
|
private Inputs Input;
|
||||||
|
private InputAction pause;
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
if (Input.GetKeyDown(KeyCode.Escape))
|
pause.performed += _ => ToggleActive();
|
||||||
{
|
}
|
||||||
paused = !paused;
|
private void Awake()
|
||||||
}
|
{
|
||||||
ToggleActive();
|
Input = new Inputs();
|
||||||
|
}
|
||||||
|
private void OnEnable()
|
||||||
|
{
|
||||||
|
pause = Input.Movement.Pause;
|
||||||
|
pause.Enable();
|
||||||
|
}
|
||||||
|
private void OnDisable()
|
||||||
|
{
|
||||||
|
pause.Disable();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ResumeGame()
|
public void ResumeGame()
|
||||||
{
|
{
|
||||||
paused = false;
|
paused = false;
|
||||||
@ -40,5 +50,6 @@ public class PauseMenu : MonoBehaviour
|
|||||||
pauseMenu.SetActive(false);
|
pauseMenu.SetActive(false);
|
||||||
Time.timeScale = 1;
|
Time.timeScale = 1;
|
||||||
}
|
}
|
||||||
|
paused = !paused;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -236,7 +236,7 @@ MonoBehaviour:
|
|||||||
m_FallbackScreenDPI: 96
|
m_FallbackScreenDPI: 96
|
||||||
m_DefaultSpriteDPI: 96
|
m_DefaultSpriteDPI: 96
|
||||||
m_DynamicPixelsPerUnit: 4
|
m_DynamicPixelsPerUnit: 4
|
||||||
m_PresetInfoIsWorld: 1
|
m_PresetInfoIsWorld: 0
|
||||||
--- !u!114 &2387553255586204954
|
--- !u!114 &2387553255586204954
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|