diff --git a/Double Trouble/.vs/Double Trouble/v16/.suo b/Double Trouble/.vs/Double Trouble/v16/.suo
index 5f03bd2a39ba9609e416c036ea360546bb36cc52..3610cccb35414c184112b908eabe7cd885b0a8e7 100644
Binary files a/Double Trouble/.vs/Double Trouble/v16/.suo and b/Double Trouble/.vs/Double Trouble/v16/.suo differ
diff --git a/Double Trouble/Assets/Prefabs/Enemy.prefab b/Double Trouble/Assets/Prefabs/Enemy.prefab
index a35ad088c5016700f36479870a4a97cb144f9c0a..58f5e5aecd4dd9c6054f38583c8dc74d428d36ce 100644
--- a/Double Trouble/Assets/Prefabs/Enemy.prefab
+++ b/Double Trouble/Assets/Prefabs/Enemy.prefab
@@ -490,7 +490,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_movementSpeed: 1
_rotationSpeed: 100
- _maxHealth: 15
+ _maxHealth: 1
_currentHealth: 0
_killValue: 10
_interpolationOffset: {x: 4, y: 0, z: 0}
diff --git a/Double Trouble/Assets/Scenes/SinglePlayerScene.unity b/Double Trouble/Assets/Scenes/SinglePlayerScene.unity
index a41ec269de98eb66229551ae47ea55a63012ac95..f3323a3d352caa1ac811bd0c6f13542b27661a24 100644
--- a/Double Trouble/Assets/Scenes/SinglePlayerScene.unity
+++ b/Double Trouble/Assets/Scenes/SinglePlayerScene.unity
@@ -341,6 +341,10 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1750381220}
+ - {fileID: 1097382801}
+ - {fileID: 916255580}
+ - {fileID: 340292017}
+ - {fileID: 336384287}
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -575,6 +579,164 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 292316634}
m_CullTransparentMesh: 0
+--- !u!1 &336384286
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 336384287}
+ - component: {fileID: 336384289}
+ - component: {fileID: 336384288}
+ m_Layer: 5
+ m_Name: Win_condition_Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &336384287
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 336384286}
+ 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: 110739071}
+ m_RootOrder: 4
+ 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: -30}
+ m_SizeDelta: {x: 900, y: 200}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &336384288
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 336384286}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.051833343, g: 0.8584906, b: 0.056838524, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "YOU WON! \nPress 'R' to restart or 'Q' to quit to main menu"
+--- !u!222 &336384289
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 336384286}
+ m_CullTransparentMesh: 0
+--- !u!1 &340292016
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 340292017}
+ - component: {fileID: 340292019}
+ - component: {fileID: 340292018}
+ m_Layer: 5
+ m_Name: Death_condition_Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &340292017
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 340292016}
+ 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: 110739071}
+ m_RootOrder: 3
+ 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: -30}
+ m_SizeDelta: {x: 900, y: 200}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &340292018
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 340292016}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.051847916, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "YOU DIED! \nPress 'R' to restart or 'Q' to quit to main menu"
+--- !u!222 &340292019
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 340292016}
+ m_CullTransparentMesh: 0
--- !u!1001 &447859682
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1108,6 +1270,85 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &916255579
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 916255580}
+ - component: {fileID: 916255582}
+ - component: {fileID: 916255581}
+ m_Layer: 5
+ m_Name: GameOver_Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &916255580
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 916255579}
+ 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: 110739071}
+ m_RootOrder: 2
+ 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: 70}
+ m_SizeDelta: {x: 600, y: 200}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &916255581
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 916255579}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 1
+ m_MinSize: 10
+ m_MaxSize: 90
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: GAME OVER
+--- !u!222 &916255582
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 916255579}
+ m_CullTransparentMesh: 0
--- !u!4 &950737216 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2001434117033790436, guid: 29f786e14fa0b9346adcfb0e5433d503,
@@ -1147,6 +1388,85 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1097382800
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1097382801}
+ - component: {fileID: 1097382803}
+ - component: {fileID: 1097382802}
+ m_Layer: 5
+ m_Name: Score_Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1097382801
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097382800}
+ 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: 110739071}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -150, y: -70}
+ m_SizeDelta: {x: 300, y: 60}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1097382802
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097382800}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 1
+ m_BestFit: 1
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: 'Score: 0'
+--- !u!222 &1097382803
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097382800}
+ m_CullTransparentMesh: 0
--- !u!1 &1120392450 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3776706177733800884, guid: d208cb0cc114de44e835407657f46114,
@@ -1509,6 +1829,49 @@ MonoBehaviour:
m_NumColorKeys: 3
m_NumAlphaKeys: 2
_fill: {fileID: 462289811}
+--- !u!1 &2080890706
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2080890708}
+ - component: {fileID: 2080890707}
+ m_Layer: 0
+ m_Name: Game_Manager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &2080890707
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2080890706}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7b47577852ad0e543a373cf3b2e282d3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &2080890708
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2080890706}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 525.8447, y: 342.74786, z: -25.61791}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 10
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2092169885
GameObject:
m_ObjectHideFlags: 0
@@ -1573,6 +1936,31 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 367120068, guid: 903a58324f5afba49822982e7d1d9e1b, type: 3}
+ propertyPath: MaxDistance
+ value: 1.000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 1974407676, guid: 903a58324f5afba49822982e7d1d9e1b, type: 3}
+ propertyPath: _damageTextPrefab
+ value:
+ objectReference: {fileID: 1722222100237967747, guid: fc6d296d0e36569428da7bc87c27b462,
+ type: 3}
+ - target: {fileID: 1974407676, guid: 903a58324f5afba49822982e7d1d9e1b, type: 3}
+ propertyPath: _scoreText
+ value:
+ objectReference: {fileID: 1097382802}
+ - target: {fileID: 1974407676, guid: 903a58324f5afba49822982e7d1d9e1b, type: 3}
+ propertyPath: _gameOverText
+ value:
+ objectReference: {fileID: 916255581}
+ - target: {fileID: 1974407676, guid: 903a58324f5afba49822982e7d1d9e1b, type: 3}
+ propertyPath: _deathConditionText
+ value:
+ objectReference: {fileID: 340292018}
+ - target: {fileID: 1974407676, guid: 903a58324f5afba49822982e7d1d9e1b, type: 3}
+ propertyPath: _winConditionText
+ value:
+ objectReference: {fileID: 336384288}
- target: {fileID: 4426548708431230720, guid: 903a58324f5afba49822982e7d1d9e1b,
type: 3}
propertyPath: _healthbar
@@ -1586,7 +1974,12 @@ PrefabInstance:
- target: {fileID: 4426548708431230720, guid: 903a58324f5afba49822982e7d1d9e1b,
type: 3}
propertyPath: _maxHealth
- value: 1000
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 4426548708431230720, guid: 903a58324f5afba49822982e7d1d9e1b,
+ type: 3}
+ propertyPath: _scoreToWin
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: 4426548708431230750, guid: 903a58324f5afba49822982e7d1d9e1b,
type: 3}
diff --git a/Double Trouble/Assets/Scripts/GameManager.cs b/Double Trouble/Assets/Scripts/GameManager.cs
index bc2277d99f975ac28820f68e180c05e38b175985..14cb60cb6be6d17e1f8e881852e0d23fd2dffe2a 100644
--- a/Double Trouble/Assets/Scripts/GameManager.cs
+++ b/Double Trouble/Assets/Scripts/GameManager.cs
@@ -1,8 +1,29 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.SceneManagement;
public class GameManager : MonoBehaviour
{
+ private bool _gameOver = false;
+ private void Update()
+ {
+ if (_gameOver)
+ {
+ if (Input.GetKey(KeyCode.R))
+ {
+ SceneManager.LoadScene(1); // Load in the Game scene
+ }
+ else if (Input.GetKey(KeyCode.Q))
+ {
+ SceneManager.LoadScene(0); // Load in the Main menu scene
+ }
+ }
+ }
+
+ public void GameOver()
+ {
+ _gameOver = true;
+ }
}
diff --git a/Double Trouble/Assets/Scripts/Player/PlayerControler.cs b/Double Trouble/Assets/Scripts/Player/PlayerControler.cs
index 569a8e89192beccd1a2872acc70c55dc3a525c7d..c2bafb293e1932228c594ab4d6f3e04e120fb6cc 100644
--- a/Double Trouble/Assets/Scripts/Player/PlayerControler.cs
+++ b/Double Trouble/Assets/Scripts/Player/PlayerControler.cs
@@ -8,6 +8,7 @@ public class PlayerControler : MonoBehaviour
[SerializeField] private float _movementSpeed = 10f;
[SerializeField] private float _jumpForce = 10f;
[SerializeField] private int _score;
+ [SerializeField] private int _scoreToWin = 50;
[SerializeField] private int _maxHealth = 20;
[SerializeField] private int _currentHealth;
[SerializeField] private Healthbar _healthbar;
@@ -27,6 +28,7 @@ public class PlayerControler : MonoBehaviour
[SerializeField] private float _gravity = 0.3f;
[SerializeField] private bool _isRunning = false;
private bool _isAlive = true;
+ private bool _gameOver = false;
private void Start()
{
@@ -63,7 +65,7 @@ public class PlayerControler : MonoBehaviour
private void Update()
{
- if(_isAlive)
+ if(_isAlive && !_gameOver)
{
/// The _controller.isGrounded gives unstable returns because of the asset animation of the player
/// so I store the true value when ever isGrounded is true.
@@ -202,6 +204,7 @@ public class PlayerControler : MonoBehaviour
_animator.SetBool("isDead", true);
TakeKnockback(knockback);
_audio.PlayDeathScream();
+ _UI.EndGameSequence("Death");
}
private void PlayerIsKilled()
@@ -212,6 +215,12 @@ public class PlayerControler : MonoBehaviour
public void GivePlayerPoints(int points)
{
_score += points;
+ _UI.UpdateScoreText(_score.ToString());
+ if(_score >= _scoreToWin)
+ {
+ _gameOver = true;
+ _UI.EndGameSequence("Win");
+ }
}
IEnumerator KnockBackRoutine(Vector3 knockback)
@@ -239,6 +248,5 @@ public class PlayerControler : MonoBehaviour
_animator.SetBool(attackType, false);
_canAttack = true;
}
-
}
diff --git a/Double Trouble/Assets/Scripts/UI/PlayerUI.cs b/Double Trouble/Assets/Scripts/UI/PlayerUI.cs
index aa25fd098fd675d75c2ed03ca497807923eff540..bc5a9b69ad64f99ac63b1ecc6d07060aa30bbcba 100644
--- a/Double Trouble/Assets/Scripts/UI/PlayerUI.cs
+++ b/Double Trouble/Assets/Scripts/UI/PlayerUI.cs
@@ -1,14 +1,55 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.UI;
public class PlayerUI : MonoBehaviour
{
[SerializeField] private GameObject _damageTextContainer;
- [SerializeField] private GameObject _damageText;
+ [SerializeField] private GameObject _damageTextPrefab;
+ [SerializeField] private Text _scoreText;
+ [SerializeField] private Text _gameOverText;
+ [SerializeField] private Text _deathConditionText;
+ [SerializeField] private Text _winConditionText;
+ private GameManager _gameManager;
+
+ private void Start()
+ {
+ _gameOverText.gameObject.SetActive(false);
+ _deathConditionText.gameObject.SetActive(false);
+ _winConditionText.gameObject.SetActive(false);
+
+ _gameManager = GameObject.Find("Game_Manager").GetComponent<GameManager>();
+ if (_gameManager == null)
+ Debug.LogError("(PlayerUI)Start: The Game Manager is NULL");
+ }
public void AddChildDamageText(string damage)
{
- GameObject text = Instantiate(_damageText, transform.position, Quaternion.identity, _damageTextContainer.transform);
+ GameObject text = Instantiate(_damageTextPrefab, transform.position, Quaternion.identity, _damageTextContainer.transform);
text.GetComponent<DamageText>().SetDamageText(damage);
}
+
+ public void UpdateScoreText(string score)
+ {
+ _scoreText.text = "Score: " + score;
+ }
+
+ public void EndGameSequence(string condition)
+ {
+ _gameOverText.gameObject.SetActive(true);
+ Debug.Log(condition);
+ switch (condition)
+ {
+ case "Death":
+ _deathConditionText.gameObject.SetActive(true);
+ break;
+ case "Win":
+ _winConditionText.gameObject.SetActive(true);
+ break;
+ default:
+ break;
+ }
+
+ _gameManager.GameOver();
+ }
}
diff --git a/Double Trouble/Library/ArtifactDB b/Double Trouble/Library/ArtifactDB
index c67f737b4d27b29d822023a957e655265810f879..7dcb23e07d243ce9efd36ee743c1f8d29d56e64b 100644
Binary files a/Double Trouble/Library/ArtifactDB and b/Double Trouble/Library/ArtifactDB differ
diff --git a/Double Trouble/Library/CurrentLayout-default.dwlt b/Double Trouble/Library/CurrentLayout-default.dwlt
index f1bc99a9cb7c28ff77682515d9404d03f62484f3..d7f2254a835b7e059d90bb778049f6c61cf68abc 100644
--- a/Double Trouble/Library/CurrentLayout-default.dwlt
+++ b/Double Trouble/Library/CurrentLayout-default.dwlt
@@ -19,9 +19,9 @@ MonoBehaviour:
width: 1419.2001
height: 778.4
m_ShowMode: 4
- m_Title: Project
+ m_Title: Game
m_RootView: {fileID: 4}
- m_MinSize: {x: 875, y: 300}
+ m_MinSize: {x: 875, y: 542}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@@ -41,10 +41,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 320.8
- width: 789.6
- height: 407.60004
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
+ width: 788.8
+ height: 407.2
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
@@ -69,12 +69,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 789.6
- height: 728.4
+ width: 788.8
+ height: 728
m_MinSize: {x: 201, y: 442}
m_MaxSize: {x: 4001, y: 8042}
vertical: 1
- controlID: 1441
+ controlID: 86
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -95,8 +95,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1419.2001
- height: 778.4
+ width: 1419
+ height: 778
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -120,14 +120,14 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1419.2001
+ width: 1419
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
m_LoadedToolbars:
- {fileID: 18}
m_MainToolbar: {fileID: 18}
- m_LastLoadedLayoutName: Professional Layout
+ m_LastLoadedLayoutName:
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -148,12 +148,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
- width: 1419.2001
- height: 728.4
+ width: 1419
+ height: 728
m_MinSize: {x: 709, y: 492}
m_MaxSize: {x: 18004, y: 14042}
vertical: 0
- controlID: 1373
+ controlID: 81
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -170,8 +170,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 758.4
- width: 1419.2001
+ y: 758
+ width: 1419
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -192,7 +192,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 789.6
+ width: 788.8
height: 320.8
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
@@ -218,14 +218,14 @@ MonoBehaviour:
- {fileID: 12}
m_Position:
serializedVersion: 2
- x: 789.6
+ x: 788.8
y: 0
- width: 285.6
- height: 728.4
+ width: 289.6
+ height: 728
m_MinSize: {x: 232, y: 492}
m_MaxSize: {x: 10002, y: 14042}
vertical: 1
- controlID: 1374
+ controlID: 107
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -241,12 +241,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1075.2
+ x: 1078.4
y: 0
- width: 344.00012
- height: 728.4
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
+ width: 340.59998
+ height: 728
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -269,10 +269,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 285.6
+ width: 289.6
height: 320.8
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 202, y: 221}
+ m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
@@ -295,8 +295,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 320.8
- width: 285.6
- height: 407.60004
+ width: 289.6
+ height: 407.2
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_ActualView: {fileID: 14}
@@ -325,10 +325,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 1149.6
+ x: 1152.8
y: 116
- width: 343.00012
- height: 707.4
+ width: 338.59998
+ height: 707
m_ViewDataDictionary: {fileID: 0}
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
@@ -364,10 +364,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 864
+ x: 863.2
y: 436.80002
- width: 283.6
- height: 386.60004
+ width: 287.6
+ height: 386.2
m_ViewDataDictionary: {fileID: 0}
m_SearchFilter:
m_NameFilter:
@@ -382,7 +382,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets
+ - Assets/Prefabs
m_Globs: []
m_ViewMode: 0
m_StartGridSize: 64
@@ -395,7 +395,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: c23c0000
m_LastClickedID: 15554
- m_ExpandedIDs: ffffffff00000000ee400000f0400000f2400000f4400000f6400000f8400000fa400000fc400000fe40000000410000024100000441000006410000084100000a4100000c41000000ca9a3b
+ m_ExpandedIDs: 000000009a8900009c8900009e890000a0890000a2890000a4890000a6890000a8890000aa890000ac890000ae890000b0890000b2890000b4890000b6890000b8890000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -420,10 +420,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
- scrollPos: {x: 0, y: 0}
+ scrollPos: {x: 0, y: 56}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: ffffffff00000000ee400000f0400000f2400000f4400000f6400000f8400000fa400000fc400000fe40000000410000024100000441000006410000084100000a4100000c41000000ca9a3b
+ m_ExpandedIDs: 0a04ffffffffffff000000009a8900009c8900009e890000a0890000a2890000a4890000a6890000a8890000aa890000ac890000ae890000b0890000b2890000b4890000b6890000b8890000e0890000e2890000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -502,8 +502,8 @@ MonoBehaviour:
serializedVersion: 2
x: 74.4
y: 436.80002
- width: 788.6
- height: 386.60004
+ width: 787.8
+ height: 386.2
m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: []
m_SerializedViewValues: []
@@ -511,7 +511,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 812, y: 457.00006}
+ m_TargetSize: {x: 812, y: 456.5}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -528,8 +528,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0
m_HBaseRangeMin: -324.80002
m_HBaseRangeMax: 324.80002
- m_VBaseRangeMin: -182.80003
- m_VBaseRangeMax: 182.80003
+ m_VBaseRangeMin: -182.6
+ m_VBaseRangeMax: 182.6
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -547,23 +547,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 788.6
- height: 365.60004
- m_Scale: {x: 0.99999994, y: 0.99999994}
- m_Translation: {x: 394.3, y: 182.80002}
+ width: 787.8
+ height: 365.2
+ m_Scale: {x: 1, y: 1}
+ m_Translation: {x: 393.9, y: 182.6}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -394.30002
- y: -182.80003
- width: 788.60004
- height: 365.60007
+ x: -393.9
+ y: -182.6
+ width: 787.8
+ height: 365.2
m_MinimalGUI: 1
- m_defaultScale: 0.99999994
- m_LastWindowPixelSize: {x: 985.75, y: 483.25006}
+ m_defaultScale: 1
+ m_LastWindowPixelSize: {x: 984.75, y: 482.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000
@@ -592,7 +592,7 @@ MonoBehaviour:
serializedVersion: 2
x: 74.4
y: 116
- width: 788.6
+ width: 787.8
height: 299.8
m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0
@@ -601,14 +601,14 @@ MonoBehaviour:
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
- m_2DMode: 0
+ m_2DMode: 1
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: -0.14233977, y: 1.1808622, z: 18.616224}
+ m_Target: {x: 383.21338, y: 244.97562, z: -27.758724}
speed: 2
- m_Value: {x: -0.14233977, y: 1.1808622, z: 18.616224}
+ m_Value: {x: 383.21338, y: 244.97562, z: -27.758724}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -637,17 +637,17 @@ MonoBehaviour:
m_Size: {x: 0, y: 0}
yGrid:
m_Fade:
- m_Target: 1
+ m_Target: 0
speed: 2
- m_Value: 1
+ m_Value: 0
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
zGrid:
m_Fade:
- m_Target: 0
+ m_Target: 1
speed: 2
- m_Value: 0
+ m_Value: 1
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
@@ -655,17 +655,17 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
- m_Target: {x: -0.054881655, y: 0.0059560244, z: -0.00033406392, w: -0.9985075}
+ m_Target: {x: 0, y: 0, z: 0, w: 1}
speed: 2
- m_Value: {x: -0.05487988, y: 0.005955832, z: -0.00033405313, w: -0.99847525}
+ m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
- m_Target: 13.936571
+ m_Target: 175.99837
speed: 2
- m_Value: 13.936571
+ m_Value: 175.99837
m_Ortho:
- m_Target: 0
+ m_Target: 1
speed: 2
- m_Value: 0
+ m_Value: 1
m_CameraSettings:
m_Speed: 1
m_SpeedNormalized: 0.5
@@ -679,7 +679,7 @@ MonoBehaviour:
m_FarClip: 10000
m_DynamicClip: 1
m_OcclusionCulling: 0
- m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+ m_LastSceneViewRotation: {x: -0.07882877, y: 0.0029555575, z: -0.00024046696, w: -0.99691635}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
@@ -707,17 +707,17 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 864
+ x: 863.2
y: 116
- width: 283.6
+ width: 287.6
height: 299.8
m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: ee400000
+ m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 5afbffff
+ m_ExpandedIDs: ecdafeff3c6cffffba6cffff30860000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -733,7 +733,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 0}
+ m_ClientGUIView: {fileID: 11}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
diff --git a/Double Trouble/Library/InspectorExpandedItems.asset b/Double Trouble/Library/InspectorExpandedItems.asset
index 35834d27aeae6247e8aa705cb9219bbc89156e6b..e8d01288f4545db9106f76e9d4e89d0608eb1f85 100644
Binary files a/Double Trouble/Library/InspectorExpandedItems.asset and b/Double Trouble/Library/InspectorExpandedItems.asset differ
diff --git a/Double Trouble/Library/SceneVisibilityState.asset b/Double Trouble/Library/SceneVisibilityState.asset
index 2544530cb14129c3b6d3a10466134618dd7aad29..8ad5e1bcefbad10d86b4d7037b8d0b91edbc0305 100644
Binary files a/Double Trouble/Library/SceneVisibilityState.asset and b/Double Trouble/Library/SceneVisibilityState.asset differ
diff --git a/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.dll b/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.dll
index 95a4742692042ecec044413e047720c6e5f655b1..e5e3a2d3d3c9935a4f75c142e25acbf7f552c435 100644
Binary files a/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.pdb
index 7e157ad715fbe499cdfee0a9c2c6edd5ff6641a8..a549a1a609096dd222c72e77997b2e6d82178256 100644
Binary files a/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Double Trouble/Library/ScriptAssemblies/Assembly-CSharp.pdb differ
diff --git a/Double Trouble/Library/ShaderCache/EditorEncounteredVariants b/Double Trouble/Library/ShaderCache/EditorEncounteredVariants
index c6df5bcf0cb852c666b7e21adc00af7e7181cc4e..c42be8082f9053b37c444acb1158281118007bf4 100644
Binary files a/Double Trouble/Library/ShaderCache/EditorEncounteredVariants and b/Double Trouble/Library/ShaderCache/EditorEncounteredVariants differ
diff --git a/Double Trouble/Library/SourceAssetDB b/Double Trouble/Library/SourceAssetDB
index ea0e5244c7f377f9b11f94993f5eaa582143e6d1..908362c9a179a69a6eac431e3e867b9acaeb2f72 100644
Binary files a/Double Trouble/Library/SourceAssetDB and b/Double Trouble/Library/SourceAssetDB differ
diff --git a/Double Trouble/Library/expandedItems b/Double Trouble/Library/expandedItems
index 79649ec6a37e6b6e5740855a91dc4acf5fefad85..affa9ee933fa005cbcb58fbab4c962d425cb89c1 100644
Binary files a/Double Trouble/Library/expandedItems and b/Double Trouble/Library/expandedItems differ
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log
index 4389ce32b3b767bca085d81328a3e182f5cbd0f2..1aeab3c1483411397d20878c67644fd785e67c22 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -28,3 +28,7 @@ Cmd: preprocess
insize=7914 outsize=2554 pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR dkw=UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING ok=1
Cmd: preprocess
insize=2468 outsize=1177 pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR dkw=UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING ok=1
+Cmd: compileSnippet
+ api=4 type=0 insize=2355 outsize=790 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR dkw=SOFTPARTICLES_ON UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING ok=1
+Cmd: compileSnippet
+ api=4 type=1 insize=2355 outsize=402 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR dkw=SOFTPARTICLES_ON UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING ok=1
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe1.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe1.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43d265040e30f83e59c720b8925381ea1ec83248 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe1.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe1.log
@@ -0,0 +1,2 @@
+Base path: 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data', plugins path 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe2.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe2.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43d265040e30f83e59c720b8925381ea1ec83248 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe2.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe2.log
@@ -0,0 +1,2 @@
+Base path: 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data', plugins path 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe3.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe3.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43d265040e30f83e59c720b8925381ea1ec83248 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe3.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe3.log
@@ -0,0 +1,2 @@
+Base path: 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data', plugins path 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe4.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe4.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43d265040e30f83e59c720b8925381ea1ec83248 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe4.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe4.log
@@ -0,0 +1,2 @@
+Base path: 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data', plugins path 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe5.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe5.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43d265040e30f83e59c720b8925381ea1ec83248 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe5.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe5.log
@@ -0,0 +1,2 @@
+Base path: 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data', plugins path 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe6.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe6.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43d265040e30f83e59c720b8925381ea1ec83248 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe6.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe6.log
@@ -0,0 +1,2 @@
+Base path: 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data', plugins path 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
diff --git a/Double Trouble/ProjectSettings/EditorBuildSettings.asset b/Double Trouble/ProjectSettings/EditorBuildSettings.asset
index 3250fe50d746de54493ee21299e3578c4326ad44..50b2e3876ead7ea9227cc063851e570664e3da88 100644
--- a/Double Trouble/ProjectSettings/EditorBuildSettings.asset
+++ b/Double Trouble/ProjectSettings/EditorBuildSettings.asset
@@ -5,6 +5,9 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
+ - enabled: 1
+ path: Assets/Scenes/MainMenuScene.unity
+ guid: 0cea51bdfa24cc04788ff91e0edcd922
- enabled: 1
path: Assets/Scenes/SinglePlayerScene.unity
guid: 6191219a0603cae40a995532c47b57d2