diff --git a/Assets/Scenes/CheapHouse.unity b/Assets/Scenes/CheapHouse.unity index 7b30234d..6c21962f 100644 --- a/Assets/Scenes/CheapHouse.unity +++ b/Assets/Scenes/CheapHouse.unity @@ -1863,7 +1863,7 @@ PrefabInstance: - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -1888,7 +1888,7 @@ PrefabInstance: - target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 182.005 objectReference: {fileID: 0} - target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -2013,22 +2013,22 @@ PrefabInstance: - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 250 objectReference: {fileID: 0} - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 4537241548631189332, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -2123,7 +2123,7 @@ PrefabInstance: - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 182.005 objectReference: {fileID: 0} - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -2248,7 +2248,7 @@ PrefabInstance: - target: {fileID: 7883991513978601488, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 182.005 objectReference: {fileID: 0} - target: {fileID: 7883991513978601488, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -2268,12 +2268,12 @@ PrefabInstance: - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 364.01 objectReference: {fileID: 0} - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 182.005 objectReference: {fileID: 0} - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} diff --git a/Assets/Scripts/Actions.meta b/Assets/Scripts/Actions.meta deleted file mode 100644 index c86661fa..00000000 --- a/Assets/Scripts/Actions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2e8ace0e753f18d41ae7374b31260efd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Actions/BaseAction.cs b/Assets/Scripts/Actions/BaseAction.cs deleted file mode 100644 index 03001cac..00000000 --- a/Assets/Scripts/Actions/BaseAction.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace Assets.Scripts.Actions -{ - public abstract class BaseAction - { - protected int DurationInTicks { get; } - protected int ElapsedTicks { get; } - - protected BaseAction(int durationTicks) - { - DurationInTicks = durationTicks; - } - - public abstract void ApplyAction(Player playerController); - - } -} \ No newline at end of file diff --git a/Assets/Scripts/Actions/BaseAction.cs.meta b/Assets/Scripts/Actions/BaseAction.cs.meta deleted file mode 100644 index d82790a5..00000000 --- a/Assets/Scripts/Actions/BaseAction.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e13454be9a4755a4cb902ce4492c0d47 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Actions/Eat.cs b/Assets/Scripts/Actions/Eat.cs deleted file mode 100644 index 65d56325..00000000 --- a/Assets/Scripts/Actions/Eat.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Assets.Scripts.Actions.Interfaces; - -namespace Assets.Scripts.Actions -{ - public class Eat : IPlayerAction, ISellable - { - public decimal Price { get; private set; } - - public string Name { get; private set; } - - public string Description => $"{Name} - {Price}$"; - private int _energy; - - public Eat(string name, int energy, decimal price) - { - Name = name; - Price = price; - _energy = energy; - } - - - public void ApplyAction(Player playerController) - { - playerController.Stats[StatsId.Food].increase(_energy); - } - } -} diff --git a/Assets/Scripts/Actions/Eat.cs.meta b/Assets/Scripts/Actions/Eat.cs.meta deleted file mode 100644 index 8a4fdb80..00000000 --- a/Assets/Scripts/Actions/Eat.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 88b69afebf64e464981dc504941a0887 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Actions/Interfaces.meta b/Assets/Scripts/Actions/Interfaces.meta deleted file mode 100644 index 8cedf4d1..00000000 --- a/Assets/Scripts/Actions/Interfaces.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 75ecd68a88c4c904393604b692b01a43 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Actions/Interfaces/Interfaces.cs b/Assets/Scripts/Actions/Interfaces/Interfaces.cs deleted file mode 100644 index 21b09c4f..00000000 --- a/Assets/Scripts/Actions/Interfaces/Interfaces.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Assets.Scripts.Actions.Interfaces -{ - public enum JobId { Unemployed, HotDogs }; - public interface IPlayerAction - { - public string Description { get; } - public void ApplyAction(Player player); - } - - public interface ISellable - { - public decimal Price { get; } - } - - public interface IWorkPlace - { - public JobId JobID { get; } - public decimal Sallary { get; } - } -} diff --git a/Assets/Scripts/Actions/Interfaces/Interfaces.cs.meta b/Assets/Scripts/Actions/Interfaces/Interfaces.cs.meta deleted file mode 100644 index 7ad994f4..00000000 --- a/Assets/Scripts/Actions/Interfaces/Interfaces.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5b7ba6deb189bc44ca6f628a799c8667 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Actions/JobPosition.cs b/Assets/Scripts/Actions/JobPosition.cs deleted file mode 100644 index bd748258..00000000 --- a/Assets/Scripts/Actions/JobPosition.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Assets.Scripts.Actions.Interfaces; - -namespace Assets.Scripts.Actions -{ - public class JobPosition : IPlayerAction, IWorkPlace - { - public string Description => $"{_position} - {Sallary}$ per hour"; - public decimal Sallary { get; private set; } - public JobId JobID { get; private set; } - - - private string _position; - - public JobPosition(string position, decimal sallary, JobId jobId) - { - _position = position; - Sallary = sallary; - } - public void ApplyAction(Player playerController) - { - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Actions/JobPosition.cs.meta b/Assets/Scripts/Actions/JobPosition.cs.meta deleted file mode 100644 index a54fd82c..00000000 --- a/Assets/Scripts/Actions/JobPosition.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 80cfc634ca94f1e4fa1726ca19eab626 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Actions/Jobs.meta b/Assets/Scripts/Actions/Jobs.meta deleted file mode 100644 index eb6d5cc0..00000000 --- a/Assets/Scripts/Actions/Jobs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 46382eb4a7b5812458ddf7287b5a65ff -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Buildings.meta b/Assets/Scripts/Buildings.meta deleted file mode 100644 index bcb7a3e2..00000000 --- a/Assets/Scripts/Buildings.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cdd8a9c61eebf384796c7c94453d3255 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Buildings/Building.cs b/Assets/Scripts/Buildings/Building.cs deleted file mode 100644 index 12fa29d5..00000000 --- a/Assets/Scripts/Buildings/Building.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Assets.Scripts.Actions.Interfaces; -using System.Collections.Generic; -using UnityEngine; - -namespace Assets.Scripts.Buildings -{ - public abstract class BaseCell : MonoBehaviour - { - protected string _name; - protected List _optionsList; - [SerializeField] - private ConversationController _conversationController; - // Start is called before the first frame update - void Start() - { - _optionsList = new List(); - Initialize(); - BuildOptionsList(); - } - - // Update is called once per frame - void Update() - { - - - } - protected abstract void Initialize(); - protected abstract void BuildOptionsList(); - - void OnTriggerEnter(Collider other) - { - _conversationController.Change(_name, _optionsList); - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Buildings/Building.cs.meta b/Assets/Scripts/Buildings/Building.cs.meta deleted file mode 100644 index 5ff2f9e9..00000000 --- a/Assets/Scripts/Buildings/Building.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8087167db9f5271408218993b0473a69 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Buildings/Burger.cs b/Assets/Scripts/Buildings/Burger.cs deleted file mode 100644 index 38d75287..00000000 --- a/Assets/Scripts/Buildings/Burger.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Assets.Scripts.Buildings -{ - public class Burger : BaseCell - { - protected override void Initialize() - { - _name = "Monolith burger"; - } - - protected override void BuildOptionsList() - { - //_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)); - } - - } -} diff --git a/Assets/Scripts/Buildings/Burger.cs.meta b/Assets/Scripts/Buildings/Burger.cs.meta deleted file mode 100644 index 43435d87..00000000 --- a/Assets/Scripts/Buildings/Burger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 61bf941dbcbd36f48bdd8f30b1b6c1f0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Buildings/HotDogs.cs b/Assets/Scripts/Buildings/HotDogs.cs deleted file mode 100644 index f707a3e2..00000000 --- a/Assets/Scripts/Buildings/HotDogs.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Assets.Scripts.Actions; - -namespace Assets.Scripts.Buildings -{ - public class HotDogs : BaseCell - { - protected override void Initialize() - { - _name = "Hot dogs"; - } - - protected override void BuildOptionsList() - { - _optionsList.Add(new Eat("Hot Dog", 15, 20)); - _optionsList.Add(new Eat("Cola", 10, 10)); - } - - } -} diff --git a/Assets/Scripts/Buildings/HotDogs.cs.meta b/Assets/Scripts/Buildings/HotDogs.cs.meta deleted file mode 100644 index b63e98c6..00000000 --- a/Assets/Scripts/Buildings/HotDogs.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 60f522567c8014c40a76002f2dc8e2e4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Buildings/House.cs b/Assets/Scripts/Buildings/House.cs deleted file mode 100644 index 3f8a955a..00000000 --- a/Assets/Scripts/Buildings/House.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Assets.Scripts.Buildings -{ - public class House : BaseCell - { - protected override void BuildOptionsList() - { - //_optionsList.Add(new Relax("Rest", 6, 1)); - } - - protected override void Initialize() - { - throw new System.NotImplementedException(); - } - } -} diff --git a/Assets/Scripts/Buildings/House.cs.meta b/Assets/Scripts/Buildings/House.cs.meta deleted file mode 100644 index 243ffab9..00000000 --- a/Assets/Scripts/Buildings/House.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a4df4c0f11d1a043b36f4ea6a31e4d7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Buildings/JobAgency.cs b/Assets/Scripts/Buildings/JobAgency.cs deleted file mode 100644 index 95e0a033..00000000 --- a/Assets/Scripts/Buildings/JobAgency.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Assets.Scripts.Actions; -using Assets.Scripts.Actions.Interfaces; - -namespace Assets.Scripts.Buildings -{ - public class JobAgency : BaseCell - { - protected override void Initialize() - { - _name = "Job Agency"; - } - - protected override void BuildOptionsList() - { - _optionsList.Add(new JobPosition("Hot Dogs sailer ", 20, JobId.HotDogs)); - } - - } -} diff --git a/Assets/Scripts/Buildings/JobAgency.cs.meta b/Assets/Scripts/Buildings/JobAgency.cs.meta deleted file mode 100644 index 36fa763d..00000000 --- a/Assets/Scripts/Buildings/JobAgency.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 16925e4f4154a004dadcfa7300af1bbe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/DialogueSystem/ChoiceController.cs b/Assets/Scripts/DialogueSystem/ChoiceController.cs index 2a4bd6de..0be2ad91 100644 --- a/Assets/Scripts/DialogueSystem/ChoiceController.cs +++ b/Assets/Scripts/DialogueSystem/ChoiceController.cs @@ -1,45 +1,44 @@ -using Assets.Scripts.Actions.Interfaces; -using TMPro; -using UnityEngine; -using UnityEngine.Events; -using UnityEngine.UI; +//using TMPro; +//using UnityEngine; +//using UnityEngine.Events; +//using UnityEngine.UI; -[System.Serializable] -public class ConversationChangeEvent : UnityEvent { } +//[System.Serializable] +//public class ConversationChangeEvent : UnityEvent { } -public class ChoiceController : MonoBehaviour -{ - public IPlayerAction _option; - public ConversationChangeEvent conversationChangeEvent; - // Update is called once per frame - public static ChoiceController AddChoiceButton(Button choiceButtonTemplate, IPlayerAction option, int index) - { - int buttonSpacing = -50; +//public class ChoiceController : MonoBehaviour +//{ +// public IPlayerAction _option; +// public ConversationChangeEvent conversationChangeEvent; +// // Update is called once per frame +// public static ChoiceController AddChoiceButton(Button choiceButtonTemplate, IPlayerAction option, int index) +// { +// int buttonSpacing = -50; - Button button = Instantiate(choiceButtonTemplate); +// Button button = Instantiate(choiceButtonTemplate); - button.transform.SetParent(choiceButtonTemplate.transform.parent); - button.transform.localScale = Vector3.one; - button.transform.localPosition = choiceButtonTemplate.transform.localPosition + new Vector3(0, index * buttonSpacing, 0); - button.name = option.Description; - button.gameObject.SetActive(true); - ChoiceController choiceController = button.GetComponent(); - choiceController._option = option; - return choiceController; - } +// button.transform.SetParent(choiceButtonTemplate.transform.parent); +// button.transform.localScale = Vector3.one; +// button.transform.localPosition = choiceButtonTemplate.transform.localPosition + new Vector3(0, index * buttonSpacing, 0); +// button.name = option.Description; +// button.gameObject.SetActive(true); +// ChoiceController choiceController = button.GetComponent(); +// choiceController._option = option; +// return choiceController; +// } - private void Start() - { - if (conversationChangeEvent == null) - conversationChangeEvent = new ConversationChangeEvent(); - var btn = GetComponent