Conjure/ludumdare50
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request #3: Jason

Browse Source 
Merge in CEGJ/ludumdare50 from jason to dev

* commit '1112e06d471ef8a67c209a2bfa28b0ef34d5e781':
  Added Press Start to start (without prompt though)
  Added rough paused state
  Added Entity.beingPushed() state without actually using it
  Added NaughtyAttributes
This commit is contained in:
Jason Durand 01 2022-04-02 16:57:25 +00:00
commit 5c4be70437
15 changed files with 320 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
Assets/GameFlowManager.cs Normal file
View File

@ -0,0 +1,91 @@
using UnityEngine;
using UnityEngine.InputSystem;
//Could be a singleton
public class GameFlowManager : MonoBehaviour {
[field: SerializeField]
public bool Paused { get; private set; } = true;
public BaseState CurrentState { get; private set; } = null!;
bool lastStartButton;
#region Unity Messages
void Awake() => CurrentState = new StartFlowState(this);
void Start() => CurrentState.EnterState();
#endregion
void SetPause(bool value) {
Paused = value;
Time.timeScale = value ? 0f : 1f;
}
#region Inputs
public void OnStart(InputAction.CallbackContext ctx) {
//feels pretty redundant ^^'
bool newValue = ctx.ReadValueAsButton();
bool wasJustPressed = !lastStartButton && newValue;
lastStartButton = newValue;
if (!wasJustPressed)
return;
if (CurrentState is StartFlowState)
SwitchState(new GameplayFlowState(this));
}
#endregion
#region States
void SwitchState(BaseState newState) {
CurrentState.LeaveState();
CurrentState = newState;
newState.EnterState();
}
abstract class GameFlowState : BaseState {
readonly protected GameFlowManager gameFlowManager;
protected GameFlowState(GameFlowManager gameFlowManager) {
this.gameFlowManager = gameFlowManager;
}
}
class StartFlowState : GameFlowState {
public StartFlowState(GameFlowManager gameFlowManager) : base(gameFlowManager) {}
public override void EnterState() {
base.EnterState();
Debug.Log("Press Start to start...!");
gameFlowManager.SetPause(true);
}
public override void LeaveState() {
Debug.Log("Let the games begin!!");
}
}
class GameplayFlowState : GameFlowState {
public GameplayFlowState(GameFlowManager gameFlowManager) : base(gameFlowManager) {}
public override void EnterState() {
base.EnterState();
gameFlowManager.SetPause(false);
}
}
class PauseMenuFlowState : GameFlowState {
public PauseMenuFlowState(GameFlowManager gameFlowManager) : base(gameFlowManager) {}
public override void EnterState() {
base.EnterState();
gameFlowManager.SetPause(true);
}
}
class DeadFlowState : GameFlowState {
public DeadFlowState(GameFlowManager gameFlowManager) : base(gameFlowManager) {}
public override void EnterState() {
base.EnterState();
gameFlowManager.SetPause(true);
}
}
#endregion
}

11
Assets/GameFlowManager.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e3fecdc4a8b2cb4419ef9d03180d130d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Prefabs/Arena.prefab
View File

@ -246,7 +246,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 63e66d66543b37e419694ac22a2941fd, type: 3}
m_Name:
m_EditorClassIdentifier:
stats: {fileID: 11400000, guid: 188711c0b201b1a45ad601ee20233b20, type: 2}
<Stats>k__BackingField: {fileID: 11400000, guid: 188711c0b201b1a45ad601ee20233b20, type: 2}
moatCollider: {fileID: 9196727423716235687}
--- !u!1 &9196727423754814335
GameObject:
@ -1752,6 +1752,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3}
m_Name:
m_EditorClassIdentifier:
gameFlowManager: {fileID: 0}
spawners:
- {x: -10, y: 10, z: 0}
- {x: 10, y: 10, z: 0}

68
Assets/Scenes/SampleScene.unity
View File

@ -200,6 +200,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
propertyPath: gameFlowManager
value:
objectReference: {fileID: 1359990806}
- target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
propertyPath: m_RootOrder
value: 2
@ -250,6 +254,24 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
--- !u!1 &1359990805 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9196727425507610131, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
m_PrefabInstance: {fileID: 1359990804}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1359990806
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1359990805}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3}
m_Name:
m_EditorClassIdentifier:
<Paused>k__BackingField: 1
--- !u!114 &1464970062 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1878107874314509256, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
@ -386,44 +408,84 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.size
value: 14
value: 15
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_ActionId
value: d0405457-c534-4103-a0b6-cf113432b467
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_ActionId
value: 01a06960-a379-49e3-9d58-9b7c8effcb3d
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_ActionName
value: Player/SwitchMinion[/Keyboard/q,/Keyboard/e,/XInputControllerWindows/leftShoulder,/XInputControllerWindows/rightShoulder]
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_ActionName
value: Player/Start[/XInputControllerWindows/start,/Keyboard/enter]
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1551362087}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1359990806}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ChangeSelectedIcon
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnStart
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: MinionBar, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameFlowManager, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: gameFlowManager
value:
objectReference: {fileID: 1359990806}
- target: {fileID: 1214567908930553593, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_Name
value: Vampire
@ -480,6 +542,10 @@ PrefabInstance:
propertyPath: healthBar
value:
objectReference: {fileID: 1464970062}
- target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: gameFlowManager
value:
objectReference: {fileID: 1359990806}
- target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: <Health>k__BackingField
value: 100

18
Assets/Scripts/Arena.cs
View File

@ -1,12 +1,20 @@
#nullable enable
using System.Collections;
using NaughtyAttributes;
using UnityEngine;
public class Arena : MonoBehaviour {
[SerializeField] [Required]
GameFlowManager gameFlowManager = null!;
//TODO probably add initial direction too
[SerializeField] Vector3[] spawners = null!;
[SerializeField] ArenaStats stats = null!;
[SerializeField] GameObject monsterPrefab = null!;
//TODO Add some kind of "MinLength(1)" attribute
[SerializeField]
Vector3[] spawners = null!;
[SerializeField] [Required]
ArenaStats stats = null!;
[SerializeField] [Required]
GameObject monsterPrefab = null!;
SafeZone safeZone = null!;
@ -15,6 +23,9 @@ public class Arena : MonoBehaviour {
void Start() => StartCoroutine(SpawnEnemies());
void SpawnEnemy(int spawnerIndex) {
if (gameFlowManager.Paused)
return;
var monster = Instantiate(monsterPrefab, spawners[spawnerIndex], Quaternion.identity).GetComponent<Monster>();
//TODO Replace hardcoded target with entity discovery
monster.SetTarget(FindObjectOfType<PlayerMovement>().transform);
@ -25,7 +36,6 @@ public class Arena : MonoBehaviour {
int currentSpawner = 0;
//TODO Stop when pause/end game
while (true) {
SpawnEnemy(currentSpawner);
currentSpawner = Random.Range(0, spawners.Length);

30
Assets/Scripts/Entity.cs
View File

@ -1,17 +1,23 @@
using System.Collections;
using System.Collections.Generic;
using NaughtyAttributes;
using UnityEngine;
[RequireComponent(typeof(Rigidbody2D))]
public class Entity : MonoBehaviour
{
[SerializeField] [Required]
GameFlowManager gameFlowManager = null!;
[field: SerializeField] [field: Required]
protected EntityStats stats { get; private set; }
[field: SerializeField]protected float Health {get; private set; }
bool isAlive = true;
[SerializeField]public float movementSpeed{get; private set; }
[SerializeField]public float rotSpeed {get; private set; }
[field: SerializeField]public float movementSpeed{get; private set; }
[field: SerializeField]public float rotSpeed {get; private set; }
[SerializeField]private float fov;
[SerializeField]private float attackRange;
[SerializeField]public float attackDmg {get; private set; }
[field: SerializeField]public float attackDmg {get; private set; }
[SerializeField]protected float attackCooldown;
protected float attackTimer;
[SerializeField]private Transform target;
@ -19,6 +25,7 @@ public class Entity : MonoBehaviour
private Collider atkCollider;
public Vector3 direction {get; set; }
public Rigidbody2D rb {get; private set;}
bool beingPushed;
void Awake() => rb = GetComponent<Rigidbody2D>();
@ -27,6 +34,14 @@ public class Entity : MonoBehaviour
attackTimer = attackCooldown;
}
protected virtual void FixedUpdate() {
//TODO sqrMagnitude?
if (beingPushed && rb.velocity.magnitude < stats.MinVelocityWhenPushed) {
rb.velocity = Vector2.zero;
beingPushed = false;
}
}
protected virtual void Attack(){
}
@ -35,9 +50,9 @@ public class Entity : MonoBehaviour
}
protected virtual void MoveToTarget(float deltaTime){
protected virtual void MoveToTarget(){
direction = Vector3.RotateTowards(direction, (target.position - transform.position), rotSpeed*deltaTime, 0.0f);
direction = Vector3.RotateTowards(direction, (target.position - transform.position), rotSpeed*Time.fixedDeltaTime, 0.0f);
if(!IsInAttackRange()){
rb.MovePosition(transform.position + direction * movementSpeed * deltaTime);
}
@ -74,4 +89,9 @@ public class Entity : MonoBehaviour
public bool IsAlive(){
return isAlive;
}
protected void AddImpulse(Vector3 impulse) {
beingPushed = true;
rb.AddForce(impulse, ForceMode2D.Impulse);
}
}

6
Assets/Scripts/EntityStats.cs Normal file
View File

@ -0,0 +1,6 @@
using UnityEngine;
public class EntityStats {
[field: SerializeField] [field: Min(0f)]
public float MinVelocityWhenPushed { get; private set; } = 5f;
}

3
Assets/Scripts/EntityStats.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: f3b49b8d7dbc43dfbd074996aa811570
timeCreated: 1648908811

6
Assets/Scripts/Monster.cs
View File

@ -12,7 +12,11 @@ public class Monster : AIEntity
base.ennemyName = "Gladiator";
}
void FixedUpdate() => MoveToTarget(Time.fixedDeltaTime);
protected override void FixedUpdate() {
base.FixedUpdate();
MoveToTarget();
}
// Update is called once per frame
void Update()

55
Assets/Scripts/PlayerMovement.cs
View File

@ -1,10 +1,17 @@
#nullable enable
using NaughtyAttributes;
using UnityEngine;
using UnityEngine.InputSystem;
[RequireComponent(typeof(PlayerInput), typeof(Rigidbody2D))]
public class PlayerMovement : MonoBehaviour {
[SerializeField] PlayerStats stats = null!;
[SerializeField] [Required]
GameFlowManager gameFlowManager = null!;
[SerializeField] [field: Required]
PlayerStats stats = null!;
[field: Required]
Rigidbody2D rb = null!;
Vector2 moveDirection;
@ -13,6 +20,7 @@ public class PlayerMovement : MonoBehaviour {
bool lastJumpButton;
#region Unity Messages
void Awake(){
rb = GetComponent<Rigidbody2D>();
currentState = new ImmobileMovementState(this);
@ -21,17 +29,27 @@ public class PlayerMovement : MonoBehaviour {
void Start() => currentState.EnterState();
void Update() {
if (gameFlowManager.Paused)
return;
if (currentState.UpdateState() is {} newState)
SwitchState(newState);
}
void FixedUpdate() {
if (gameFlowManager.Paused)
return;
if (currentState.FixedUpdateState() is {} newState)
SwitchState(newState);
}
void OnDrawGizmos() => currentState?.OnDrawGizmos();
#endregion
#region Inputs
public void OnMove(InputAction.CallbackContext ctx) {
moveDirection = ctx.ReadValue<Vector2>();
if (moveDirection.sqrMagnitude > 1.0f)
@ -51,17 +69,15 @@ public class PlayerMovement : MonoBehaviour {
return;
if (safeZone.IsInSafeZone) {
if (moveDirection.magnitude >= safeZone.stats.MinJumpJoystickValue)
if (moveDirection.magnitude >= safeZone.Stats.MinJumpJoystickValue)
SwitchState(new ExitSafeZoneMovementState(this, safeZone, moveDirection));
} else //TODO if (AngleBetween(moveDirection, toSafeZone) < 90)
SwitchState(new EnterSafeZoneMovementState(this, safeZone));
}
void SwitchState(BaseState newState) {
currentState.LeaveState();
currentState = newState;
newState.EnterState();
}
#endregion
#region Rigidbody
void OnTriggerEnter2D(Collider2D other) {
if (other.GetComponent<SafeZone>() is {} triggeredSafeZone)
@ -85,7 +101,17 @@ public class PlayerMovement : MonoBehaviour {
rb.isKinematic = !enabled;
}
abstract class BaseStatePlayerMovement : BaseState{
#endregion
#region States
void SwitchState(BaseState newState) {
currentState.LeaveState();
currentState = newState;
newState.EnterState();
}
abstract class BaseStatePlayerMovement : BaseState {
protected PlayerMovement playerMovement;
public BaseStatePlayerMovement(PlayerMovement playerMovement){
this.playerMovement = playerMovement;
@ -96,6 +122,7 @@ public class PlayerMovement : MonoBehaviour {
public NormalMovementState(PlayerMovement playerMovement) : base(playerMovement){
}
public override BaseState? FixedUpdateState() {
playerMovement.rb.velocity = (Vector3)playerMovement.moveDirection * playerMovement.stats.movementSpeed;
@ -140,7 +167,7 @@ public class PlayerMovement : MonoBehaviour {
class EnterSafeZoneMovementState : JumpingMovementState {
readonly SafeZone safeZone;
public EnterSafeZoneMovementState(PlayerMovement playerMovement, SafeZone safeZone) : base(playerMovement, safeZone.stats.JumpDuration, safeZone.transform.position) {
public EnterSafeZoneMovementState(PlayerMovement playerMovement, SafeZone safeZone) : base(playerMovement, safeZone.Stats.JumpDuration, safeZone.transform.position) {
this.safeZone = safeZone;
}
@ -153,12 +180,12 @@ public class PlayerMovement : MonoBehaviour {
protected override BaseState Transition() => new ImmobileMovementState(playerMovement);
protected override float ModifyLerpTime(float t) => safeZone.stats.JumpSpeedCurve.Evaluate(t);
protected override float ModifyLerpTime(float t) => safeZone.Stats.JumpSpeedCurve.Evaluate(t);
}
class ExitSafeZoneMovementState : JumpingMovementState {
readonly SafeZone safeZone;
public ExitSafeZoneMovementState(PlayerMovement playerMovement, SafeZone safeZone, Vector2 direction) : base(playerMovement, safeZone.stats.JumpDuration, safeZone.GetOutsidePosition(direction)) {
public ExitSafeZoneMovementState(PlayerMovement playerMovement, SafeZone safeZone, Vector2 direction) : base(playerMovement, safeZone.Stats.JumpDuration, safeZone.GetOutsidePosition(direction)) {
this.safeZone = safeZone;
}
@ -169,7 +196,7 @@ public class PlayerMovement : MonoBehaviour {
playerMovement.SetRigidbodyEnabled(true);
}
protected override float ModifyLerpTime(float t) => safeZone.stats.JumpSpeedCurve.Evaluate(t);
protected override float ModifyLerpTime(float t) => safeZone.Stats.JumpSpeedCurve.Evaluate(t);
}
class ImmobileMovementState : BaseStatePlayerMovement {
@ -188,7 +215,7 @@ public class PlayerMovement : MonoBehaviour {
return;
Vector3 dropPosition = playerMovement.safeZone.GetOutsidePosition(playerMovement.moveDirection);
bool canJump = playerMovement.moveDirection.magnitude >= playerMovement.safeZone.stats.MinJumpJoystickValue;
bool canJump = playerMovement.moveDirection.magnitude >= playerMovement.safeZone.Stats.MinJumpJoystickValue;
Gizmos.color = canJump ? Color.green : Color.red;
Gizmos.DrawLine(playerMovement.transform.position, dropPosition);
if (canJump)
@ -198,4 +225,6 @@ public class PlayerMovement : MonoBehaviour {
}
#endif
}
#endregion
}

7
Assets/Scripts/SafeZone.cs
View File

@ -1,7 +1,10 @@
using NaughtyAttributes;
using UnityEngine;
public class SafeZone : MonoBehaviour {
public SafeZoneStats stats;
[field: SerializeField] [field: Required]
public SafeZoneStats Stats { get; private set; }
[SerializeField] CircleCollider2D moatCollider;
public bool IsInSafeZone { get; private set; } = true;
@ -14,6 +17,6 @@ public class SafeZone : MonoBehaviour {
}
public Vector3 GetOutsidePosition(Vector2 direction) {
return transform.position + (moatCollider.radius + stats.JumpOffset) * (Vector3)direction;
return transform.position + (moatCollider.radius + Stats.JumpOffset) * (Vector3)direction;
}
}

7
Assets/Scripts/VampireEntity.cs
View File

@ -1,9 +1,10 @@
//TODO Replace with Damageable?
using NaughtyAttributes;
using UnityEngine;
public class VampireEntity : Entity {
[SerializeField] HealthBar healthBar;
[SerializeField] [Required]
HealthBar healthBar;
[Min(10f)]
float initialHealth;
protected override void Start() {

31
Assets/Settings/ConjureLudumDare50.inputactions
View File

@ -40,6 +40,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Start",
"type": "Button",
"id": "01a06960-a379-49e3-9d58-9b7c8effcb3d",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@ -284,6 +293,28 @@
"action": "SwitchMinion",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "4715f838-717a-4f10-a668-05a6d761a7bc",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Start",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "025fe243-6da7-4b27-9c02-f353d7a121df",
"path": "<Keyboard>/enter",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Start",
"isComposite": false,
"isPartOfComposite": false
}
]
},

1
Packages/manifest.json
View File

@ -1,5 +1,6 @@
{
"dependencies": {
"com.dbrizov.naughtyattributes": "https://github.com/dbrizov/NaughtyAttributes.git#upm",
"com.unity.2d.animation": "5.1.1",
"com.unity.2d.pixel-perfect": "4.0.1",
"com.unity.2d.psdimporter": "4.2.0",

7
Packages/packages-lock.json
View File

@ -1,5 +1,12 @@
{
"dependencies": {
"com.dbrizov.naughtyattributes": {
"version": "https://github.com/dbrizov/NaughtyAttributes.git#upm",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "8a8fa5a9659a6d63f196391c71e06c4286c8acd7"
},
"com.unity.2d.animation": {
"version": "5.1.1",
"depth": 0,