change multiple scene system to dynamic indoor scene

2024-05-27 08:23:54 +03:00
parent e071a29c90
commit 4a59cee5e6
109 changed files with 3740 additions and 83901 deletions
@@ -8,7 +8,7 @@ public abstract class BaseCharacter : MonoBehaviour
 {
    [SerializeField]
    protected NavMeshAgent _navAgent;
-
+    public NavMeshAgent NavAgent => _navAgent;
    protected Animator _animator;
    private const string WALK_VELOCITY = "WalkVelocity";
    private readonly Queue<PlayerTasks> _tasks = new Queue<PlayerTasks>();
@@ -1,7 +1,9 @@
 using UnityEngine;

-public class Door : BaseInteractableObject
+public class DoorController : BaseInteractableObject
 {
+    [SerializeField]
+    public IndoorSO BuildingInfo;
    [SerializeField]
    private string _scene;
    [SerializeField]
@@ -16,7 +18,7 @@ public class Door : BaseInteractableObject

    protected override void InteractAction(RadialMenuActions interactAction)
    {
-        GameManager.Instance.Scene.Change(_scene, _spawnPointInSceneName);
+        GameManager.Instance.BuildingSystem.BuildingInteract(BuildingInfo);
    }
 }

@@ -0,0 +1,46 @@
+using Unity.AI.Navigation;
+using UnityEngine;
+
+public class IndoorController : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        var indoor = GameManager.Instance.BuildingSystem.Indoor;
+        Instantiate(indoor.Prefab, Vector3.zero, Quaternion.identity);
+
+        Player.Instance.NavAgent.Warp(SpawnPlayer(indoor));
+        // If the NavMeshSurface is not assigned in the Inspector, try to find it
+        var navMeshSurface = indoor.Prefab.GetComponentInChildren<NavMeshSurface>();
+        Player.Instance.NavAgent.enabled = true;
+        // Build the NavMesh
+        if (navMeshSurface != null)
+        {
+            navMeshSurface.BuildNavMesh();
+        }
+        else
+        {
+            Debug.LogError("NavMeshSurface is not assigned and not found on the GameObject.");
+        }
+        
+    }
+
+    private Vector3 SpawnPlayer(IndoorSO indoor)
+    {
+        var spawnPoints = GameObject.FindGameObjectsWithTag("Respawn");
+        BaseInteractableObject interactable = null;
+        if (spawnPoints != null)
+        {
+            foreach (var spawn in spawnPoints)
+            {
+                if (spawn.name.ToLower() == indoor.SpawnPointInSceneName.ToLower())
+                {
+                    interactable = spawn.GetComponent<BaseInteractableObject>();
+                    Player.Instance.SetPosition(interactable._interactionPoint);
+                }
+            }
+        }
+        GameManager.Instance.Camera.ResetToPlayerPosition();
+        return (interactable == null) ? Vector3.zero : interactable._interactionPoint.position;
+    }
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d1add187954d66d4594d1b192ce4a248
@@ -0,0 +1,44 @@
+using UnityEngine;
+
+public class BuildingManager : MonoBehaviour
+{
+    public bool IsOpen { get; set; }
+    public bool IsInside { get; set; }
+
+    private string _address;
+    public IndoorSO Indoor;
+
+    public void BuildingInteract(IndoorSO indoor)
+    {
+        IsOpen = CheckIsOpen(indoor.OpenHoursFrom, indoor.OpenHoursTo);
+        if (!IsInside)
+        {
+            EnterBuilding(indoor);
+        }
+        else
+        {
+            ExitBuilding();
+        }
+    }
+
+    private void EnterBuilding(IndoorSO indoor)
+    {
+        if(IsOpen)
+        {
+            Indoor = indoor;
+            IsInside = true;
+            GameManager.Instance.Scene.Change("indoor");
+        }
+    }
+
+    public void ExitBuilding()
+    {
+        GameManager.Instance.Scene.Change("city");
+    }
+
+    private bool CheckIsOpen(int from, int to)
+    {
+        return GameManager.Instance.Time.CurrentTime.Hours >= from 
+            && GameManager.Instance.Time.CurrentTime.Hours <= to;
+    }
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ebdd79e4ca65877429c8e85a1f0a1bf3
@@ -13,7 +13,9 @@ public class GameManager : MonoBehaviour
    private SceneManager _sceneManager;
    private TimeSystem _timeSystem;
    private InGameMouseHandler _gameMouseHandler;
+    private BuildingManager _buildingManager;

+    public BuildingManager BuildingSystem => _buildingManager;
    public InputSystem Input => _inputSystem;
    public SceneManager Scene => _sceneManager;
    public TimeSystem Time => _timeSystem;
@@ -30,6 +32,7 @@ public class GameManager : MonoBehaviour
            Instance = this;
            DontDestroyOnLoad(gameObject);

+            _buildingManager = new BuildingManager();
            _inputSystem = new InputSystem();
            _sceneManager = new SceneManager();
            _timeSystem = new TimeSystem();
@@ -9,10 +9,8 @@ public class SceneManager
        UnityEngine.SceneManagement.SceneManager.sceneLoaded += SceneManager_sceneLoaded;
    }

-    public void Change(string sceneName,string spawnLocationName)
+    public void Change(string sceneName)
    {
-        _spawnLocationName = spawnLocationName;
-       
        UnityEngine.SceneManagement.SceneManager.LoadScene(sceneName);
    }

@@ -1,6 +1,6 @@
 using UnityEngine;

-[CreateAssetMenu()]
+[CreateAssetMenu(menuName ="LifeJourney/Container")]
 public class ContainerSO : ScriptableObject
 {
    public string Name;
@@ -2,7 +2,7 @@ using Assets.Scripts.Interfaces;
 using System.Collections.Generic;
 using UnityEngine;

-[CreateAssetMenu()]
+[CreateAssetMenu(menuName = "LifeJourney/Dialog Category")]
 public class DialogCategorySO : ScriptableObject
 {
    public string Title;
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 02d9b906f6d4b6b4ba6f5bbe19e3c78d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 050d5c1f23823194b8c24759c2dc67d1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,18 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5e5ea608dd4175941b878e8e1a585970, type: 3}
-  m_Name: Cashier
-  m_EditorClassIdentifier: 
-  Description: Cashier
-  Salary: 5
-  Icon: {fileID: 21300000, guid: 4dfead30e6ab1cb458b7476ad0dedeb7, type: 3}
-  JobPosition: 1
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c7452dc6dfb2cc040a6d0e543db6b671
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5e5ea608dd4175941b878e8e1a585970, type: 3}
-  m_Name: Clerk
-  m_EditorClassIdentifier: 
-  Icon: {fileID: 0}
-  Description: Clerk
-  Salary: 5
-  JobPosition: 0
-  MinimumEducationSkill: 0
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9dd346cdfec57ee47ad1c06a925769bb
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bf7ee1c503cbe524b8a52dc86566b3b6, type: 3}
-  m_Name: JobAgency
-  m_EditorClassIdentifier: 
-  Title: Job Agency
-  UITemplate: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f,
-    type: 3}
-  CategoriesSO:
-  - {fileID: 11400000, guid: 137a0a77aa02f614ead909f23a670e95, type: 2}
-  - {fileID: 11400000, guid: f0d3baaabf19f9a4a80e227316362d84, type: 2}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8c330d22202c025408b0fcf250a57d15
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5e5ea608dd4175941b878e8e1a585970, type: 3}
-  m_Name: Manager
-  m_EditorClassIdentifier: 
-  Icon: {fileID: 0}
-  Description: Manager
-  Salary: 9
-  JobPosition: 4
-  MinimumEducationSkill: 2
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 36ad6fbffd0cc574aaf7d76308d965a1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5e5ea608dd4175941b878e8e1a585970, type: 3}
-  m_Name: ManagerAssistant
-  m_EditorClassIdentifier: 
-  Icon: {fileID: 0}
-  Description: Manager assistaint
-  Salary: 6
-  JobPosition: 3
-  MinimumEducationSkill: 1
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4381db145ac80514c957374e20392b3b
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f667daa0686227b49a9ca2ebd6326a98, type: 3}
-  m_Name: Minimarket
-  m_EditorClassIdentifier: 
-  Title: Mini market
-  Icon: {fileID: 21300000, guid: c5e761867408abd48bdbfcc36c949f44, type: 3}
-  OptionsList:
-  - {fileID: 11400000, guid: c7452dc6dfb2cc040a6d0e543db6b671, type: 2}
-  - {fileID: 11400000, guid: 4381db145ac80514c957374e20392b3b, type: 2}
-  - {fileID: 11400000, guid: 36ad6fbffd0cc574aaf7d76308d965a1, type: 2}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 137a0a77aa02f614ead909f23a670e95
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f667daa0686227b49a9ca2ebd6326a98, type: 3}
-  m_Name: Office
-  m_EditorClassIdentifier: 
-  Title: Office
-  Icon: {fileID: 21300000, guid: c5e761867408abd48bdbfcc36c949f44, type: 3}
-  OptionsList:
-  - {fileID: 11400000, guid: 9dd346cdfec57ee47ad1c06a925769bb, type: 2}
-  - {fileID: 11400000, guid: 4381db145ac80514c957374e20392b3b, type: 2}
-  - {fileID: 11400000, guid: 36ad6fbffd0cc574aaf7d76308d965a1, type: 2}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f0d3baaabf19f9a4a80e227316362d84
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: edc1273ddc4c788449fe69fe20d2c07f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f667daa0686227b49a9ca2ebd6326a98, type: 3}
-  m_Name: HighSchool
-  m_EditorClassIdentifier: 
-  Title: Hight School
-  Icon: {fileID: 21300000, guid: aef64b4574ccbc74897f2d9cd98cdf12, type: 3}
-  OptionsList:
-  - {fileID: 11400000, guid: b2f41f944cd1f3f4f82130491c97d5da, type: 2}
-  - {fileID: 11400000, guid: e6b1a370027e47b4baf047386f663e02, type: 2}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f4995fdc1159dde4f89ae0a1b1be42f8
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3ba71c02cddb93d408c7c1b2f9846099, type: 3}
-  m_Name: Literarure
-  m_EditorClassIdentifier: 
-  Icon: {fileID: 21300000, guid: 03db7f2d5bccf674c95ce74426db7fbb, type: 3}
-  Description: 'Literature '
-  Duration: 5
-  EnrollPrice: 10
-  Skill: 0
-  PlayerProgress: 0
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b2f41f944cd1f3f4f82130491c97d5da
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3ba71c02cddb93d408c7c1b2f9846099, type: 3}
-  m_Name: Mathematics
-  m_EditorClassIdentifier: 
-  Icon: {fileID: 21300000, guid: 03db7f2d5bccf674c95ce74426db7fbb, type: 3}
-  Description: 'Mathematics '
-  Duration: 5
-  EnrollPrice: 10
-  Skill: 0
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e6b1a370027e47b4baf047386f663e02
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bf7ee1c503cbe524b8a52dc86566b3b6, type: 3}
-  m_Name: School
-  m_EditorClassIdentifier: 
-  Title: School
-  UITemplate: {fileID: 9018781955098760075, guid: 4c9d1546155d57e45a5dc96e1772cad4,
-    type: 3}
-  CategoriesSO:
-  - {fileID: 11400000, guid: f4995fdc1159dde4f89ae0a1b1be42f8, type: 2}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 40d509fd76291394285fd38512792c46
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -2,7 +2,7 @@ using Assets.Scripts.Interfaces;
 using System.Collections.Generic;
 using UnityEngine;

-[CreateAssetMenu()]
+[CreateAssetMenu(menuName = "LifeJourney/Dialog")]
 public class DialogSO : ScriptableObject
 {
    public string Title;
@@ -1,7 +1,7 @@
 using Assets.Scripts.Interfaces;
 using UnityEngine;

-[CreateAssetMenu()]
+[CreateAssetMenu(menuName = "LifeJourney/Education Info")]
 public class EducationInfoSO : IDialogOption
 {
    public string Description;
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d811debf0350f784eb44673d9ae94d21
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,18 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: aec77d0318a147746a02df3c98dc1b76, type: 3}
-  m_Name: Cola
-  m_EditorClassIdentifier: 
-  Prefab: {fileID: 0}
-  ItemName: Cola
-  Price: 10
-  Icon: {fileID: 21300000, guid: 61282d9e9f6bd4d43aa75f43bbe7ab6c, type: 3}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a4db4c329bb512349bf5373c80e7b84a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -0,0 +1,12 @@
+using UnityEngine;
+
+[CreateAssetMenu(menuName = "LifeJourney/Indor object")]
+public class IndoorSO : ScriptableObject
+{
+    public string BuidingName;
+    public string Address;
+    public string SpawnPointInSceneName;
+    public GameObject Prefab;
+    public int OpenHoursFrom;
+    public int OpenHoursTo;
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5fd44e1aaa501ac4c8f210861aa1b08c
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f3bef990ef30fbd40a8f93fee2c03c7a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 570c5458f6b5110448188e51cb5becbb, type: 3}
-  m_Name: CheapFridge
-  m_EditorClassIdentifier: 
-  Name: Modern Firdge
-  MaxCapacity: 10
-  CurrentItemsCount: 0
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7ff251e01529c104686fbca083bbc312
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 570c5458f6b5110448188e51cb5becbb, type: 3}
-  m_Name: ModernFridge
-  m_EditorClassIdentifier: 
-  Name: Modern Firdge
-  MaxCapacity: 15
-  prefab: {fileID: 0}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b8fcf00b76085f54baafb32a2e47c70e
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 570c5458f6b5110448188e51cb5becbb, type: 3}
-  m_Name: PlasticBag
-  m_EditorClassIdentifier: 
-  Name: Plastic bag
-  MaxCapacity: 5
-  prefab: {fileID: 1702364597089646122, guid: dac0081f9dadb1d4f9eacc9bcf9a06d0, type: 3}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e3d520733a0700b4f8ec3baae6be6e76
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 570c5458f6b5110448188e51cb5becbb, type: 3}
-  m_Name: ShopingBasket
-  m_EditorClassIdentifier: 
-  Name: Shoping basket
-  MaxCapacity: 5
-  prefab: {fileID: 4771105611132447618, guid: cbfa04a0e789cc44a908f6953ea6e6a9, type: 3}
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d901709f604b5a14db9f4c906051b367
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,7 +1,7 @@
 using UnityEngine;
 using Assets.Scripts.Interfaces;

-[CreateAssetMenu()]
+[CreateAssetMenu(menuName = "LifeJourney/Job info")]
 public class JobInfoSO : IDialogOption
 {
    public string Description;
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2b38883be6b7fe74986201d6ade1f808
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 844a7de838b26b349aac023a7c8057d6, type: 3}
-  m_Name: Buy
-  m_EditorClassIdentifier: 
-  ActionName: Buy
-  Action: 7
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c9ce62334c9d8334d813197661a59227
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 844a7de838b26b349aac023a7c8057d6, type: 3}
-  m_Name: Cancel
-  m_EditorClassIdentifier: 
-  ActionName: Cancel
-  Action: 0
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 37a5860278daf904b976c61632085b3d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 844a7de838b26b349aac023a7c8057d6, type: 3}
-  m_Name: Sleep
-  m_EditorClassIdentifier: 
-  ActionName: Sleep
-  Action: 1
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a45b050119410f149b0a257098cdaec5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 844a7de838b26b349aac023a7c8057d6, type: 3}
-  m_Name: Talk
-  m_EditorClassIdentifier: 
-  ActionName: Talk
-  Action: 6
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 82dbb912f2c862b40b39813703894e50
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 844a7de838b26b349aac023a7c8057d6, type: 3}
-  m_Name: Work
-  m_EditorClassIdentifier: 
-  ActionName: Work
-  Action: 5
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 71be1340ac987bc40bd4b01367b3abf5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,6 +1,6 @@
 using UnityEngine;

-[CreateAssetMenu()]
+[CreateAssetMenu(menuName = "LifeJourney/Sellable item")]
 public class SellableItemSO : BaseItemSO
 {
    public Transform Prefab;
@@ -5,6 +5,6 @@ public class StartUp : MonoBehaviour
    // Start is called before the first frame update
    void Start()
    {
-        GameManager.Instance.Scene.Change("City",string.Empty);
+        GameManager.Instance.Scene.Change("City");
    }
 }