Commit e4cc23e7 authored by Gerard Gascón's avatar Gerard Gascón
Browse files

Some things

parent 6ba30e43

Assets/Input/PlayerInput.cs

+30 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
                    ""processors"": """",

                    ""interactions"": """",

                    ""initialStateCheck"": false

                },

                {

                    ""name"": ""Cancel"",

                    ""type"": ""Button"",

                    ""id"": ""88e9386c-ef99-4f78-9de3-590a2e376247"",

                    ""expectedControlType"": ""Button"",

                    ""processors"": """",

                    ""interactions"": """",

                    ""initialStateCheck"": false

                }

            ],

            ""bindings"": [
@@ -143,6 +152,17 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
                    ""action"": ""Fire"",

                    ""isComposite"": false,

                    ""isPartOfComposite"": false

                },

                {

                    ""name"": """",

                    ""id"": ""dd21b9b6-829a-411c-b6a2-bf29d8cf70c1"",

                    ""path"": ""<Keyboard>/escape"",

                    ""interactions"": """",

                    ""processors"": """",

                    ""groups"": """",

                    ""action"": ""Cancel"",

                    ""isComposite"": false,

                    ""isPartOfComposite"": false

                }

            ]

        }
@@ -154,6 +174,7 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
        m_Gameplay_Horizontal = m_Gameplay.FindAction("Horizontal", throwIfNotFound: true);

        m_Gameplay_Jump = m_Gameplay.FindAction("Jump", throwIfNotFound: true);

        m_Gameplay_Fire = m_Gameplay.FindAction("Fire", throwIfNotFound: true);

        m_Gameplay_Cancel = m_Gameplay.FindAction("Cancel", throwIfNotFound: true);

    }



    public void Dispose()
@@ -216,6 +237,7 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
    private readonly InputAction m_Gameplay_Horizontal;

    private readonly InputAction m_Gameplay_Jump;

    private readonly InputAction m_Gameplay_Fire;

    private readonly InputAction m_Gameplay_Cancel;

    public struct GameplayActions

    {

        private @PlayerInput m_Wrapper;
@@ -223,6 +245,7 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
        public InputAction @Horizontal => m_Wrapper.m_Gameplay_Horizontal;

        public InputAction @Jump => m_Wrapper.m_Gameplay_Jump;

        public InputAction @Fire => m_Wrapper.m_Gameplay_Fire;

        public InputAction @Cancel => m_Wrapper.m_Gameplay_Cancel;

        public InputActionMap Get() { return m_Wrapper.m_Gameplay; }

        public void Enable() { Get().Enable(); }

        public void Disable() { Get().Disable(); }
@@ -241,6 +264,9 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
                @Fire.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnFire;

                @Fire.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnFire;

                @Fire.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnFire;

                @Cancel.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnCancel;

                @Cancel.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnCancel;

                @Cancel.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnCancel;

            }

            m_Wrapper.m_GameplayActionsCallbackInterface = instance;

            if (instance != null)
@@ -254,6 +280,9 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
                @Fire.started += instance.OnFire;

                @Fire.performed += instance.OnFire;

                @Fire.canceled += instance.OnFire;

                @Cancel.started += instance.OnCancel;

                @Cancel.performed += instance.OnCancel;

                @Cancel.canceled += instance.OnCancel;

            }

        }

    }
@@ -263,5 +292,6 @@ public partial class @PlayerInput : IInputActionCollection2, IDisposable 
        void OnHorizontal(InputAction.CallbackContext context);

        void OnJump(InputAction.CallbackContext context);

        void OnFire(InputAction.CallbackContext context);

        void OnCancel(InputAction.CallbackContext context);

    }

}

Assets/Input/PlayerInput.inputactions

+20 −0
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ 
                    "processors": "",

                    "interactions": "",

                    "initialStateCheck": false

                },

                {

                    "name": "Cancel",

                    "type": "Button",

                    "id": "88e9386c-ef99-4f78-9de3-590a2e376247",

                    "expectedControlType": "Button",

                    "processors": "",

                    "interactions": "",

                    "initialStateCheck": false

                }

            ],

            "bindings": [
@@ -121,6 +130,17 @@ 
                    "action": "Fire",

                    "isComposite": false,

                    "isPartOfComposite": false

                },

                {

                    "name": "",

                    "id": "dd21b9b6-829a-411c-b6a2-bf29d8cf70c1",

                    "path": "<Keyboard>/escape",

                    "interactions": "",

                    "processors": "",

                    "groups": "",

                    "action": "Cancel",

                    "isComposite": false,

                    "isPartOfComposite": false

                }

            ]

        }

Assets/Prefabs/Balance.prefab

0 → 100644
+4445 −0

File added.

Preview size limit exceeded, changes collapsed.

Assets/Prefabs/Balance.prefab.meta

0 → 100644
+7 −0
Original line number Diff line number Diff line 
fileFormatVersion: 2

guid: e1b31acf627e1a04b82c71cda128d2a0

PrefabImporter:

  externalObjects: {}

  userData: 

  assetBundleName: 

  assetBundleVariant:

Assets/Settings/Scenes.meta→Assets/Prefabs/Level 1.meta

+1 −1
Original line number Diff line number Diff line 
fileFormatVersion: 2

guid: d574b2fb4661c408f80aa76c0182931f

guid: 9bc393207b3a2af4a8947f9cd3c9d9db

folderAsset: yes

DefaultImporter:

  externalObjects: {}