diff --git a/Assets/Scripts/Building/Building.cs b/Assets/Scripts/Building/Building.cs index 4e43350..504b843 100644 --- a/Assets/Scripts/Building/Building.cs +++ b/Assets/Scripts/Building/Building.cs @@ -4,9 +4,7 @@ using UnityEngine; public abstract class Building : MonoBehaviour { - - public abstract string GetTitle(); - public abstract string GetDescription(); - + public string title = "New Building"; + public string description = "A cool new building"; } diff --git a/Assets/Scripts/Building/House/HouseBuildingScript.cs b/Assets/Scripts/Building/House/HouseBuildingScript.cs index c22b939..9902331 100644 --- a/Assets/Scripts/Building/House/HouseBuildingScript.cs +++ b/Assets/Scripts/Building/House/HouseBuildingScript.cs @@ -3,17 +3,11 @@ using System.Collections.Generic; using UnityEngine; public class HouseBuildingScript : Building -{ - - [SerializeField] private string title = "House"; - [SerializeField] private string description = "A place for people to live in."; +{ + private void Start() + { + title = "House"; + description = "A place to live in"; + } - public override string GetTitle() - { - return title; - } - public override string GetDescription() - { - return description; - } } diff --git a/Assets/Scripts/Building/InfoSign.cs b/Assets/Scripts/Building/InfoSign.cs index 23075ef..50dbacf 100644 --- a/Assets/Scripts/Building/InfoSign.cs +++ b/Assets/Scripts/Building/InfoSign.cs @@ -19,8 +19,6 @@ public class InfoSign : Interactable public override void Interact() { - Debug.Log(parentBuilding.GetTitle()); - Debug.Log("interact"); } } diff --git a/Assets/Scripts/Building/Types.meta b/Assets/Scripts/Building/Types.meta new file mode 100644 index 0000000..432b404 --- /dev/null +++ b/Assets/Scripts/Building/Types.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: efcc2aca90f2a2b4eb81b54c475f3df4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/Types/StorageBuilding.cs b/Assets/Scripts/Building/Types/StorageBuilding.cs new file mode 100644 index 0000000..be9ecca --- /dev/null +++ b/Assets/Scripts/Building/Types/StorageBuilding.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class StorageBuilding : Building +{ + +} diff --git a/Assets/Scripts/Building/Types/StorageBuilding.cs.meta b/Assets/Scripts/Building/Types/StorageBuilding.cs.meta new file mode 100644 index 0000000..cb3acbd --- /dev/null +++ b/Assets/Scripts/Building/Types/StorageBuilding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9cd3101a861849b4f97e2f4f499d7d46 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 395e7d7..f83d9a4 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,12 @@ { "dependencies": { "com.unity.collab-proxy": "1.9.0", - "com.unity.ide.rider": "2.0.7", + "com.unity.ide.rider": "3.0.7", "com.unity.ide.visualstudio": "2.0.11", - "com.unity.ide.vscode": "1.2.3", + "com.unity.ide.vscode": "1.2.4", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", + "com.unity.timeline": "1.5.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f25244e..316e621 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,11 +15,11 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, @@ -33,7 +33,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -60,7 +60,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.8", + "version": "1.5.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 5650251..fe1188f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.18f1 -m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c) +m_EditorVersion: 2021.1.22f1 +m_EditorVersionWithRevision: 2021.1.22f1 (a137e5fb0427)