From 2f69a2b0464d5bf9a83361c242703da84815fa64 Mon Sep 17 00:00:00 2001 From: Vova Date: Mon, 10 Apr 2023 18:01:16 +0300 Subject: [PATCH] player can work now --- Assets/Prefabs/UI/TimeSliderPrefabUI.prefab | 6 +- Assets/Scenes/House.unity | 154 +++++++++++++++++- Assets/Scripts/Helpers/Enums.cs | 2 +- .../BaseInteractableObject.cs | 4 +- Assets/Scripts/InteractableObjects/Bed.cs | 3 +- .../InteractableObjects/CashierDesk.cs | 102 ++++++++---- Assets/Scripts/InteractableObjects/Door.cs | 2 +- Assets/Scripts/InteractableObjects/Fridge.cs | 5 +- .../InteractableObjects/OfficeTable.cs | 11 +- .../InteractableObjects/ShopingBasket.cs | 1 + .../InteractableObjects/StoreContainer.cs | 1 + Assets/Scripts/Player/Player.cs | 8 + Assets/Scripts/Player/PlayerStats.cs | 6 +- Assets/Scripts/UIElements/JobSelectorUI.cs | 5 +- Assets/Scripts/UIElements/TimeSliderUI.cs | 7 +- Assets/Scripts/UIElements/UIManager.cs | 2 +- Packages/manifest.json | 4 +- Packages/packages-lock.json | 4 +- ProjectSettings/ProjectVersion.txt | 4 +- 19 files changed, 267 insertions(+), 64 deletions(-) diff --git a/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab b/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab index a6da5841..fa6e78e2 100644 --- a/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab +++ b/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab @@ -1137,10 +1137,10 @@ MonoBehaviour: m_FillRect: {fileID: 4052679398454499807} m_HandleRect: {fileID: 1262496910311591056} m_Direction: 0 - m_MinValue: 3600 - m_MaxValue: 86399 + m_MinValue: 1 + m_MaxValue: 12 m_WholeNumbers: 1 - m_Value: 23210 + m_Value: 3 m_OnValueChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scenes/House.unity b/Assets/Scenes/House.unity index 2eccef73..75264ab1 100644 --- a/Assets/Scenes/House.unity +++ b/Assets/Scenes/House.unity @@ -1836,7 +1836,7 @@ PrefabInstance: - target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.x - value: 250 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -3376,7 +3376,46 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _interactionPoint: {fileID: 916166178} - _jobPositionsSO: {fileID: 0} + _jobPositionsSO: {fileID: 11400000, guid: f0d3baaabf19f9a4a80e227316362d84, type: 2} +--- !u!1 &1494404565 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5577632863133830020, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + m_PrefabInstance: {fileID: 1808427170} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1494404566 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494404565} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 2.5, y: 1, z: 1} + m_Center: {x: 0, y: 0.5, z: -0.2} +--- !u!114 &1494404567 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 738253190946143797, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + m_PrefabInstance: {fileID: 1808427170} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494404565} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b3df7729a1cd4e479add673fa0f9b76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1504187454 GameObject: m_ObjectHideFlags: 0 @@ -4211,6 +4250,111 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1785568351} m_Mesh: {fileID: 882776928807334550, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} +--- !u!1001 &1808427170 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 738253190946143797, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: _jobInfo + value: + objectReference: {fileID: 11400000, guid: 9dd346cdfec57ee47ad1c06a925769bb, + type: 2} + - target: {fileID: 2369538501029799684, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: _selectedObject + value: + objectReference: {fileID: 1494404567} + - target: {fileID: 2369538501029799684, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: visualGameObjectArray.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2369538501029799684, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: visualGameObjectArray.Array.data[0] + value: + objectReference: {fileID: 2064609441} + - target: {fileID: 3240935378234643255, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5577632863133830020, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_Name + value: CashierDesk + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.32 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.064 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.75 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5281299890643327518, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3} + - {fileID: 6310266293964722079, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5577632863133830020, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1494404566} + m_SourcePrefab: {fileID: 100100000, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3} --- !u!1 &1856998489 GameObject: m_ObjectHideFlags: 0 @@ -4559,6 +4703,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2139173963} m_PrefabAsset: {fileID: 0} +--- !u!1 &2064609441 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3240935378234643255, guid: 88fcb1c95eeeabc479f95a580dea8152, + type: 3} + m_PrefabInstance: {fileID: 1808427170} + m_PrefabAsset: {fileID: 0} --- !u!1 &2106647847 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Helpers/Enums.cs b/Assets/Scripts/Helpers/Enums.cs index c5235f15..8c7770f3 100644 --- a/Assets/Scripts/Helpers/Enums.cs +++ b/Assets/Scripts/Helpers/Enums.cs @@ -1,7 +1,7 @@ using System.Runtime.Serialization; public enum JobPositions { Unemployed, Clerk, ManagerAssistaint, Manager }; -public enum PlayerStates { Awake, Sleeping, Eating } +public enum PlayerStates { Awake, Sleeping, Eating,Working } public enum StatsId { Money, RentAccount, Food, Energy, BankAccount, Job, } public enum Tasks { Move, Interact, Rotate }; public enum TaskStatus { Waiting, InProgress, Complete }; diff --git a/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs b/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs index 23c3c621..2d3dbe3d 100644 --- a/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs +++ b/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs @@ -1,12 +1,14 @@ using UnityEngine; +using static UnityEditor.Experimental.GraphView.GraphView; public class BaseInteractableObject : MonoBehaviour { [SerializeField] public Transform _interactionPoint; + protected Player _player; public virtual void Interact(Player player) { - Debug.Log("Interact with some object"); + _player=player; } } diff --git a/Assets/Scripts/InteractableObjects/Bed.cs b/Assets/Scripts/InteractableObjects/Bed.cs index c3a2534c..15ac926c 100644 --- a/Assets/Scripts/InteractableObjects/Bed.cs +++ b/Assets/Scripts/InteractableObjects/Bed.cs @@ -2,11 +2,10 @@ using System; public class Bed : BaseInteractableObject { - private Player _player; public override void Interact(Player player) { - _player = player; + base.Interact(player); _player.SetPlayerAnimation(AnimationStates.Sitting, OnAnimationFinished); } diff --git a/Assets/Scripts/InteractableObjects/CashierDesk.cs b/Assets/Scripts/InteractableObjects/CashierDesk.cs index 6764949c..a4c185bf 100644 --- a/Assets/Scripts/InteractableObjects/CashierDesk.cs +++ b/Assets/Scripts/InteractableObjects/CashierDesk.cs @@ -1,52 +1,88 @@ +using System; using UnityEngine; public class CashierDesk : BaseInteractableObject { [SerializeField] private ContainerSO _containerSO; + [SerializeField] + private JobInfoSO _jobInfo; - //_optionsList.Add("Hamburgers - 83$", new Eat(6, 10, 83)); - //_optionsList.Add("Cheesburger - 94$", new Eat(6, 1, 94)); - //_optionsList.Add("Astro chicken - 131$", new Eat(6, 1, 131)); - //_optionsList.Add("Fries - 68$", new Eat(6, 1, 68)); - //_optionsList.Add("Shakes - 108$", new Eat(6, 1, 108)); - //_optionsList.Add("Colas - 73$", new Eat(6, 1, 73)); public override void Interact(Player player) { + base.Interact(player); if (player.IsHoldContainerItem()) { - var playerContainer = player.GetContainerItem(); - if (playerContainer.IsSalebleItems()) + BuyItems(); + } + else + { + // if player work here + if (player.JobPosition == _jobInfo.JobPosition) { - var playerItemsList = playerContainer.GetItems(); - player.ClearContainerItem(); - float finalPrice = 0; - foreach (SellableItemSO item in playerItemsList) - { - finalPrice += item.Price; - } - - var transform = Instantiate(_containerSO.prefab, _interactionPoint); - var containerItem = transform.GetComponent(); - if (containerItem == null) - { - Debug.LogError("Container Item is null"); - return; - } - player.Pay(finalPrice); - foreach (var item in playerContainer.GetItems()) - { - - var foodItemSO = ScriptableObject.CreateInstance(); - foodItemSO.ItemName = item.ItemName; - foodItemSO.Energy = 0; - containerItem.AddItem(foodItemSO); - } - player.SetContainerItem(containerItem); + UIManager.Instance.ShowTimeSliderDialog($"Work", $"Work as {_jobInfo.Description}", OnCancel, OnConfirm); + + } + else + { + print("You don't work here"); } } } + private void BuyItems() + { + var playerContainer = _player.GetContainerItem(); + if (playerContainer.IsSalebleItems()) + { + var playerItemsList = playerContainer.GetItems(); + _player.ClearContainerItem(); + float finalPrice = 0; + foreach (SellableItemSO item in playerItemsList) + { + finalPrice += item.Price; + } + + var transform = Instantiate(_containerSO.prefab, _interactionPoint); + var containerItem = transform.GetComponent(); + if (containerItem == null) + { + Debug.LogError("Container Item is null"); + return; + } + _player.Pay(finalPrice); + foreach (var item in playerContainer.GetItems()) + { + + var foodItemSO = ScriptableObject.CreateInstance(); + foodItemSO.ItemName = item.ItemName; + foodItemSO.Energy = 0; + containerItem.AddItem(foodItemSO); + } + _player.SetContainerItem(containerItem); + } + } + + private void OnCancel() + { + OnFastForwardEnd(); + } + + float _totalSalary; + private void OnConfirm(TimeSpan time) + { + _totalSalary = (float)(time.TotalHours * _jobInfo.Salary); + _player.SetPlayerActing(PlayerStates.Working); + TimeManager.Instance.FastForward(time); + TimeManager.Instance.OnFastForwardEnd += OnFastForwardEnd; + } + + private void OnFastForwardEnd() + { + _player.AddMoney(_totalSalary); + _player.SetPlayerActing(PlayerStates.Awake); + TimeManager.Instance.OnFastForwardEnd -= OnFastForwardEnd; + } } diff --git a/Assets/Scripts/InteractableObjects/Door.cs b/Assets/Scripts/InteractableObjects/Door.cs index 20455774..51ea2286 100644 --- a/Assets/Scripts/InteractableObjects/Door.cs +++ b/Assets/Scripts/InteractableObjects/Door.cs @@ -18,7 +18,7 @@ public class Door : BaseInteractableObject public override void Interact(Player player) { - print($"Player go to {_scene}"); + base.Interact(player); if (!string.IsNullOrEmpty(_exitName)) { PlayerPrefs.SetString("lastExitName", _exitName.ToLower()); diff --git a/Assets/Scripts/InteractableObjects/Fridge.cs b/Assets/Scripts/InteractableObjects/Fridge.cs index 2f54042f..a838a106 100644 --- a/Assets/Scripts/InteractableObjects/Fridge.cs +++ b/Assets/Scripts/InteractableObjects/Fridge.cs @@ -9,13 +9,12 @@ public class Fridge : BaseInteractableObject private ContainerSO _containerSO; [SerializeField] //private ItemActionsUI _actionsMenu; - - private Player _player; + private List _foodObjects = new List(); public override void Interact(Player player) { - _player = player; + base.Interact(player); if (player.IsHoldContainerItem()) { var playerContainer = player.GetContainerItem(); diff --git a/Assets/Scripts/InteractableObjects/OfficeTable.cs b/Assets/Scripts/InteractableObjects/OfficeTable.cs index d35474c9..8f202193 100644 --- a/Assets/Scripts/InteractableObjects/OfficeTable.cs +++ b/Assets/Scripts/InteractableObjects/OfficeTable.cs @@ -1,15 +1,20 @@ +using System; using UnityEngine; +using static UnityEditor.Experimental.GraphView.GraphView; public class OfficeTable : BaseInteractableObject { [SerializeField] private JobsListSO _jobPositionsSO; - public override void Interact(Player player) { - UIManager.Instance.ShowJobSelectionDialog("Job agency", "job offers", null, null); + base.Interact(player); + UIManager.Instance.ShowJobSelectionDialog("Job agency", "job offers", null, OnConfirm); } - + private void OnConfirm() + { + _player.JobPosition = JobPositions.Clerk; + } } diff --git a/Assets/Scripts/InteractableObjects/ShopingBasket.cs b/Assets/Scripts/InteractableObjects/ShopingBasket.cs index 634f7449..a4aab49c 100644 --- a/Assets/Scripts/InteractableObjects/ShopingBasket.cs +++ b/Assets/Scripts/InteractableObjects/ShopingBasket.cs @@ -9,6 +9,7 @@ public class ShopingContainer : BaseInteractableObject public override void Interact(Player player) { + base.Interact(player); if (!player.IsHoldContainerItem()) { var transform = Instantiate(_containerSO.prefab, _interactionPoint); diff --git a/Assets/Scripts/InteractableObjects/StoreContainer.cs b/Assets/Scripts/InteractableObjects/StoreContainer.cs index 69102bf5..3eb94c64 100644 --- a/Assets/Scripts/InteractableObjects/StoreContainer.cs +++ b/Assets/Scripts/InteractableObjects/StoreContainer.cs @@ -8,6 +8,7 @@ public class StoreContainer : BaseInteractableObject public override void Interact(Player player) { + base.Interact(player); if (player.IsHoldContainerItem()) { var clone = Instantiate(_sellableItemSO); diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index b4730b80..66095c76 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -22,6 +22,7 @@ public class Player : MonoBehaviour private AnimationStates _currentAnimation; public Dictionary Stats; + public JobPositions JobPosition { get; set; } private readonly Queue _tasks = new Queue(); private PlayerTasks _currentTask; @@ -43,6 +44,8 @@ public class Player : MonoBehaviour PlayerPrefs.SetString("lastExitName", string.Empty); Instance = this; Stats = PlayerStats.CreateInitialStats(); + JobPosition = JobPositions.Unemployed; + DontDestroyOnLoad(gameObject); } @@ -227,6 +230,11 @@ public class Player : MonoBehaviour Stats[StatsId.Money].deduct(amount); } + public void AddMoney(float amount) + { + Stats[StatsId.Money].increase(amount); + } + public void SetContainerItem(ContainerItem containerItem) { containerItem.transform.parent = _holdPoint; diff --git a/Assets/Scripts/Player/PlayerStats.cs b/Assets/Scripts/Player/PlayerStats.cs index 3823198d..d3a28f19 100644 --- a/Assets/Scripts/Player/PlayerStats.cs +++ b/Assets/Scripts/Player/PlayerStats.cs @@ -10,11 +10,11 @@ public class PlayerStats {StatsId.Money, new Stat("Money", 100.0f,10000000f)}, {StatsId.RentAccount, new Stat("Rent Account", 0,10f)}, {StatsId.Food, new Stat("Food Energy", 50f,100f) }, - {StatsId.Energy,new Stat("Energy", 50f,100f) }, - //{StatsId.BankAccount,new Stat("Bank Account", 0) }, - {StatsId.Job, new Stat("Unemployed", 0, 100f) }, + {StatsId.Energy,new Stat("Energy", 50f,100f) }, }; } + + //// Knowledge for University Jobs //public Stat literatureKnowledge = new Stat("LiteratureKnowledge", 0); //public Stat mathematicsKnowledge = new Stat("MathematicsKnowledge", 0); diff --git a/Assets/Scripts/UIElements/JobSelectorUI.cs b/Assets/Scripts/UIElements/JobSelectorUI.cs index 3c030863..557250ed 100644 --- a/Assets/Scripts/UIElements/JobSelectorUI.cs +++ b/Assets/Scripts/UIElements/JobSelectorUI.cs @@ -23,7 +23,7 @@ public class JobSelectorUI : MonoBehaviour [SerializeField] private JobsListSO _jobs; - public void ShowJobSelectionDialog(string title, string description, Action onCancel, Action onConfirm) + public void ShowJobSelectionDialog(string title, string description, Action onCancel, Action onConfirm) { UIManager.Instance.Freeze(); @@ -42,10 +42,10 @@ public class JobSelectorUI : MonoBehaviour { onCancel?.Invoke(); Hide(); - CloseDialog(); }); _btnOk.onClick.AddListener(() => { + onConfirm?.Invoke(); Hide(); }); } @@ -58,6 +58,7 @@ public class JobSelectorUI : MonoBehaviour private void Hide() { gameObject.SetActive(false); + CloseDialog(); } } diff --git a/Assets/Scripts/UIElements/TimeSliderUI.cs b/Assets/Scripts/UIElements/TimeSliderUI.cs index 4d04699b..d444331a 100644 --- a/Assets/Scripts/UIElements/TimeSliderUI.cs +++ b/Assets/Scripts/UIElements/TimeSliderUI.cs @@ -16,6 +16,7 @@ public class TimeSliderUI : MonoBehaviour [SerializeField] private Slider _slider; + private TimeSpan _time; public void ShowTimeSliderDialog(string title, string description, Action onCancel, Action onConfirm) { TimeManager.Instance.OnFastForwardEnd += CloseDialog; @@ -34,7 +35,7 @@ public class TimeSliderUI : MonoBehaviour }); _btnOk.onClick.AddListener(() => { - onConfirm?.Invoke(TimeSpan.FromSeconds(_slider.value)); + onConfirm?.Invoke(_time); Hide(); }); @@ -52,9 +53,9 @@ public class TimeSliderUI : MonoBehaviour private void Update() { - var time = TimeSpan.FromSeconds(_slider.value); + _time = TimeSpan.FromHours(_slider.value); - _description.text = $"{time.Hours} hours {time.Minutes} minutes"; + _description.text = $"{_time.Hours} hours"; } private void Hide() diff --git a/Assets/Scripts/UIElements/UIManager.cs b/Assets/Scripts/UIElements/UIManager.cs index d74aca15..4ccc058c 100644 --- a/Assets/Scripts/UIElements/UIManager.cs +++ b/Assets/Scripts/UIElements/UIManager.cs @@ -32,7 +32,7 @@ public class UIManager : MonoBehaviour timeSlider.ShowTimeSliderDialog(title, description, onCancel, onConfirm); } - public void ShowJobSelectionDialog(string title, string description, Action onCancel, Action onConfirm) + public void ShowJobSelectionDialog(string title, string description, Action onCancel, Action onConfirm) { var jobSelector = Instantiate(_jobSelectorPrefab, transform); jobSelector.ShowJobSelectionDialog(title, description, onCancel, onConfirm); diff --git a/Packages/manifest.json b/Packages/manifest.json index e7587777..72a35583 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,7 +3,7 @@ "com.unity.ai.navigation": "1.1.1", "com.unity.animation.rigging": "1.2.1", "com.unity.cinemachine": "2.9.5", - "com.unity.collab-proxy": "2.0.0", + "com.unity.collab-proxy": "2.0.1", "com.unity.formats.fbx": "4.2.1", "com.unity.ide.rider": "3.0.18", "com.unity.ide.visualstudio": "2.0.17", @@ -11,7 +11,7 @@ "com.unity.render-pipelines.universal": "14.0.6", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.3", + "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f7316786..90bca6cc 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -45,7 +45,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.0", + "version": "2.0.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -159,7 +159,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.3", + "version": "1.7.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f9b67dac..2c156e26 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.2.11f1 -m_EditorVersionWithRevision: 2022.2.11f1 (621cd60d08fd) +m_EditorVersion: 2022.2.13f1 +m_EditorVersionWithRevision: 2022.2.13f1 (5f5de2657605)