diff --git a/bumblebar/Assets/Player.cs b/bumblebar/Assets/Player.cs index 435d1f3..61b2689 100644 --- a/bumblebar/Assets/Player.cs +++ b/bumblebar/Assets/Player.cs @@ -5,13 +5,19 @@ using UnityEngine.UI; public class Player : MonoBehaviour { + [SerializeField] string _initials; + [SerializeField] int _playerNumber; + + bool _active = false; + + Rigidbody2D _rigidbody; Cabinet _activeCabinet; Dictionary _xp = new Dictionary(); Dictionary _personalHighScore = new Dictionary(); [SerializeField] Text _text; - [SerializeField] string _initials; - int _quarters = 3; + int _quarters = 25; + [SerializeField] GameObject _spriteGO; public enum State @@ -25,17 +31,73 @@ public class Player : MonoBehaviour public string Initials { get => _initials; set => _initials = value; } public int Quarters { get => _quarters; set => _quarters = value; } - + // Start is called before the first frame update void Start() { _rigidbody = GetComponent(); HideText(); + _spriteGO.SetActive(false); + } + + void Activate() + { + _active = true; + _spriteGO.SetActive(true); + SetText(Initials); + ShowText(); + Invoke("HideText", 2f); + } + + void Deactivate() + { + _active = false; + } + + + void CheckForActivations() + { + if (Input.GetKeyDown(KeyCode.Alpha1)) + { + if (_playerNumber == 1) + Activate(); + else + Deactivate(); + } + + if (Input.GetKeyDown(KeyCode.Alpha2)) + { + if (_playerNumber == 2) + Activate(); + else + Deactivate(); + } + + if (Input.GetKeyDown(KeyCode.Alpha3)) + { + if (_playerNumber == 3) + Activate(); + else + Deactivate(); + } + + if (Input.GetKeyDown(KeyCode.Alpha4)) + { + if (_playerNumber == 4) + Activate(); + else + Deactivate(); + } } // Update is called once per frame void Update() { + CheckForActivations(); + + if (_active == false) + return; + if (Input.GetKeyDown(KeyCode.Space)) { if (_state == State.CHILLIN && _activeCabinet != null) @@ -47,10 +109,15 @@ public class Player : MonoBehaviour StopPlaying(); } } + + } void FixedUpdate() { + if (_active == false) + return; + const float SPEED = 140f; if (Input.GetKey(KeyCode.W)){ _rigidbody.velocity += SPEED * Vector2.up; @@ -196,6 +263,13 @@ public class Player : MonoBehaviour InitDictionaries(); cabinet.ShowInfo(this, _personalHighScore[_activeCabinet.Title], _xp[_activeCabinet.Title]); } + + Player player = collision.gameObject.GetComponent(); + if (player) + { + SetText("Hey " + player.Initials + "! What's up?\n\nPress button to chat."); + ShowText(); + } } private void OnCollisionExit2D(Collision2D collision) @@ -207,5 +281,10 @@ public class Player : MonoBehaviour StopPlaying(); } + Player player = collision.gameObject.GetComponent(); + if (player) + { + HideText(); + } } } diff --git a/bumblebar/Assets/Prefabs/Player Prefab.prefab b/bumblebar/Assets/Prefabs/Player Prefab.prefab index 3096b1a..9fc6b3d 100644 --- a/bumblebar/Assets/Prefabs/Player Prefab.prefab +++ b/bumblebar/Assets/Prefabs/Player Prefab.prefab @@ -114,10 +114,10 @@ RectTransform: m_Father: {fileID: 46201286693169008} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 118, y: -22.5} + m_SizeDelta: {x: 216, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &46201285928800776 CanvasRenderer: @@ -234,8 +234,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80d15c13ebbb0404cb0696d95c984135, type: 3} m_Name: m_EditorClassIdentifier: - _text: {fileID: 46201285928800777} _initials: ABC + _playerNumber: 0 + _text: {fileID: 46201285928800777} + _spriteGO: {fileID: 46201285452922098} --- !u!50 &46201286009465933 Rigidbody2D: serializedVersion: 4 @@ -276,7 +278,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &46201286693169008 RectTransform: m_ObjectHideFlags: 0 @@ -295,7 +297,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 145, y: 254} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 236, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &46201286693169020 MonoBehaviour: diff --git a/bumblebar/Assets/Scenes/SampleScene.unity b/bumblebar/Assets/Scenes/SampleScene.unity index dbf2751..0ef473a 100644 --- a/bumblebar/Assets/Scenes/SampleScene.unity +++ b/bumblebar/Assets/Scenes/SampleScene.unity @@ -1077,7 +1077,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.46226418, g: 0.39902994, b: 0.44437423, a: 0} + m_BackGroundColor: {r: 0.03450599, g: 0.06230516, b: 0.24299999, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -1172,6 +1172,234 @@ Transform: m_Father: {fileID: 2019994126} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &629032116 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 694176601} + m_Modifications: + - target: {fileID: 46201285452922109, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 84424c00b1236a54a8638cbbddfd476b, type: 3} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465920, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Name + value: player3 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465922, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Offset.x + value: 95.6 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465922, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Offset.y + value: 12.41 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -667 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 384 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _initials + value: MBA + objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _playerNumber + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 46201286693169008, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286693169008, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} +--- !u!4 &629032117 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + m_PrefabInstance: {fileID: 629032116} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &657478383 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 694176601} + m_Modifications: + - target: {fileID: 46201285452922109, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4dcd09b0ba0798348b5c77e3791b5e31, type: 3} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465920, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Name + value: player2 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465922, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Offset.x + value: 105.52 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465922, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Offset.y + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -460 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _initials + value: KC + objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _playerNumber + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 46201286693169008, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286693169008, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} +--- !u!4 &657478384 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + m_PrefabInstance: {fileID: 657478383} + m_PrefabAsset: {fileID: 0} --- !u!1 &694176600 GameObject: m_ObjectHideFlags: 0 @@ -1200,6 +1428,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2004020054} + - {fileID: 657478384} + - {fileID: 629032117} + - {fileID: 1514432512} m_Father: {fileID: 2019994126} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2376,6 +2607,120 @@ Transform: m_CorrespondingSourceObject: {fileID: 3815373649782646736, guid: f6cc11404cac3f743903f5905fdbbfd5, type: 3} m_PrefabInstance: {fileID: 1448519932} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1514432511 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 694176601} + m_Modifications: + - target: {fileID: 46201285452922109, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4805adaffad1f6741827437d6fc354f6, type: 3} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201285928800782, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465920, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Name + value: player4 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465922, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Offset.x + value: 95.6 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465922, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_Offset.y + value: 12.41 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -495 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 519 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _initials + value: XK9 + objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _playerNumber + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 46201286693169008, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 46201286693169008, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} +--- !u!4 &1514432512 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 46201286009465923, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + m_PrefabInstance: {fileID: 1514432511} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1514981254 PrefabInstance: m_ObjectHideFlags: 0 @@ -3493,6 +3838,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _initials + value: JLD + objectReference: {fileID: 0} + - target: {fileID: 46201286009465932, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} + propertyPath: _playerNumber + value: 1 + objectReference: {fileID: 0} - target: {fileID: 46201286693169008, guid: 4d309b6eab1a07d4e8d1481596b22f6c, type: 3} propertyPath: m_SizeDelta.x value: 0 diff --git a/bumblebar/Assets/Sprites/dudes/dude_b.png b/bumblebar/Assets/Sprites/dudes/dude_b.png index 1eae973..83b7f96 100644 Binary files a/bumblebar/Assets/Sprites/dudes/dude_b.png and b/bumblebar/Assets/Sprites/dudes/dude_b.png differ diff --git a/bumblebar/Packages/manifest.json b/bumblebar/Packages/manifest.json index 89ebb8f..c8bb333 100644 --- a/bumblebar/Packages/manifest.json +++ b/bumblebar/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.12", "com.unity.ide.vscode": "1.2.4", + "com.unity.postprocessing": "3.2.2", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", diff --git a/bumblebar/Packages/packages-lock.json b/bumblebar/Packages/packages-lock.json index 9c31022..88b4796 100644 --- a/bumblebar/Packages/packages-lock.json +++ b/bumblebar/Packages/packages-lock.json @@ -128,6 +128,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.postprocessing": { + "version": "3.2.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.services.core": { "version": "1.0.1", "depth": 1, diff --git a/bumblebar/ProjectSettings/ProjectSettings.asset b/bumblebar/ProjectSettings/ProjectSettings.asset index ac76054..9dafbd6 100644 --- a/bumblebar/ProjectSettings/ProjectSettings.asset +++ b/bumblebar/ProjectSettings/ProjectSettings.asset @@ -559,7 +559,20 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + 1: UNITY_POST_PROCESSING_STACK_V2 + 7: UNITY_POST_PROCESSING_STACK_V2 + 13: UNITY_POST_PROCESSING_STACK_V2 + 14: UNITY_POST_PROCESSING_STACK_V2 + 19: UNITY_POST_PROCESSING_STACK_V2 + 21: UNITY_POST_PROCESSING_STACK_V2 + 25: UNITY_POST_PROCESSING_STACK_V2 + 27: UNITY_POST_PROCESSING_STACK_V2 + 28: UNITY_POST_PROCESSING_STACK_V2 + 29: UNITY_POST_PROCESSING_STACK_V2 + 30: UNITY_POST_PROCESSING_STACK_V2 + 32: UNITY_POST_PROCESSING_STACK_V2 + 33: UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {}