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

Cleared off nullable warnings

Browse Source
This commit is contained in:
Jason Durand 01 2022-04-03 16:02:01 -04:00
parent 179a3f7d22
commit da9eefa00e
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/Entity.cs
View File

@ -36,9 +36,9 @@ public class Entity : MonoBehaviour {
public Transform target; public Transform target;
public EntityFlag entityType { get; protected set; } public EntityFlag entityType { get; protected set; }
public Vector3 direction { get; set; } public Vector3 direction { get; set; }
public Rigidbody2D rb { get; private set; } public Rigidbody2D rb { get; private set; } = null!;
public Collider2D collider { get; private set; } public new Collider2D collider { get; private set; } = null!;
[field: SerializeField]public SpriteRenderer renderer { get; private set; } [field: SerializeField]public new SpriteRenderer renderer { get; private set; }
[SerializeField] GameObject halo; [SerializeField] GameObject halo;
[SerializeField] protected Color deadColor = Color.red; [SerializeField] protected Color deadColor = Color.red;
[SerializeField] protected Color emptyColor = Color.grey; [SerializeField] protected Color emptyColor = Color.grey;

7
Assets/Scripts/GameFlowManager.cs
View File

@ -37,10 +37,11 @@ public class GameFlowManager : MonoBehaviour {
float fadeStep = 0.02f; float fadeStep = 0.02f;
float fadingTimer; float fadingTimer;
bool fadingIn = false; bool fadingIn = false;
[field: SerializeField] TMP_Text startTxt;
[field: SerializeField] TMP_Text endTxt; [field: SerializeField] TMP_Text startTxt = null!;
[field: SerializeField] TMP_Text endTxt = null!;
public event Action<BaseState> stateChanged; public event Action<BaseState>? stateChanged;
#region Unity Messages #region Unity Messages

11
Assets/Scripts/MinionThrower.cs
View File

@ -11,14 +11,15 @@ public class MinionThrower : MonoBehaviour {
[SerializeField] [Required] [SerializeField] [Required]
PlayerStats playerStats = null!; PlayerStats playerStats = null!;
public Entity[] minionPrefabs; public Entity[] minionPrefabs = null!;
public GameObject aimArrow; public GameObject aimArrow = null!;
bool isInThrowMode; bool isInThrowMode;
Vector2 throwDirection; Vector2 throwDirection;
MinionBar minionBar; MinionBar minionBar = null!;
VampireEntity vampireEntity; VampireEntity vampireEntity = null!;
PlayerMovement movement; PlayerMovement movement = null!;
float currentCooldownTimer; float currentCooldownTimer;
float currentInitialCooldown; float currentInitialCooldown;

6
Assets/Scripts/PlayerMovement.cs
View File

@ -10,7 +10,7 @@ public class PlayerMovement : MonoBehaviour {
[SerializeField] [field: Required] [SerializeField] [field: Required]
PlayerStats stats = null!; PlayerStats stats = null!;
[SerializeField] GameObject globalCamera; [SerializeField] GameObject globalCamera = null!;
[field: Required] [field: Required]
Rigidbody2D rb = null!; Rigidbody2D rb = null!;
@ -18,8 +18,8 @@ public class PlayerMovement : MonoBehaviour {
Vector2 moveDirection; Vector2 moveDirection;
BaseState currentState = null!; BaseState currentState = null!;
SafeZone? safeZone; SafeZone? safeZone;
VampireEntity vampireEntity; VampireEntity vampireEntity = null!;
Animator animator; Animator animator = null!;
public bool facingRight { get; private set; } = true; public bool facingRight { get; private set; } = true;
bool lastJumpButton; bool lastJumpButton;