From c473d58817fa7c0cdd6d6f488cf6c8b9ffd5c52e Mon Sep 17 00:00:00 2001 From: Stedd Date: Sun, 8 Oct 2023 14:54:33 +0200 Subject: [PATCH] Changed namespaces --- CoreSystems.asmdef | 6 ++---- Interfaces/IBuildable.cs | 2 +- Interfaces/IDamageable.cs | 2 +- Interfaces/IPowerSystem.cs | 2 +- Interfaces/ITargetable.cs | 2 +- Interfaces/IWeapon.cs | 2 +- ScriptableObjects.meta | 8 ++++++++ ScriptableObjects/SRuntimeSet.cs | 20 +++++++++++++++++++ ScriptableObjects/SRuntimeSet.cs.meta | 11 ++++++++++ ScriptableObjects/SoDamageableRuntimeSet.cs | 10 ++++++++++ .../SoDamageableRuntimeSet.cs.meta | 11 ++++++++++ ScriptableObjects/SoTargetableRuntimeSet.cs | 9 +++++++++ .../SoTargetableRuntimeSet.cs.meta | 11 ++++++++++ Scripts/Damageable.cs | 2 +- Scripts/Targetable.cs | 2 +- 15 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 ScriptableObjects.meta create mode 100644 ScriptableObjects/SRuntimeSet.cs create mode 100644 ScriptableObjects/SRuntimeSet.cs.meta create mode 100644 ScriptableObjects/SoDamageableRuntimeSet.cs create mode 100644 ScriptableObjects/SoDamageableRuntimeSet.cs.meta create mode 100644 ScriptableObjects/SoTargetableRuntimeSet.cs create mode 100644 ScriptableObjects/SoTargetableRuntimeSet.cs.meta diff --git a/CoreSystems.asmdef b/CoreSystems.asmdef index e5dfda9..9fe1f88 100644 --- a/CoreSystems.asmdef +++ b/CoreSystems.asmdef @@ -1,9 +1,7 @@ { "name": "CoreSystems", - "rootNamespace": "AsteroidGame", - "references": [ - "GUID:eb3099ff524d60545a136315a154d67b" - ], + "rootNamespace": "GameDev", + "references": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, diff --git a/Interfaces/IBuildable.cs b/Interfaces/IBuildable.cs index 28359ac..8b2c1d1 100644 --- a/Interfaces/IBuildable.cs +++ b/Interfaces/IBuildable.cs @@ -1,4 +1,4 @@ -namespace AsteroidGame.CoreSystems +namespace GameDev.CoreSystems { public interface IBuildable { diff --git a/Interfaces/IDamageable.cs b/Interfaces/IDamageable.cs index 1be36af..67b595d 100644 --- a/Interfaces/IDamageable.cs +++ b/Interfaces/IDamageable.cs @@ -1,4 +1,4 @@ -namespace AsteroidGame.CoreSystems +namespace GameDev.CoreSystems { public interface IDamageable { diff --git a/Interfaces/IPowerSystem.cs b/Interfaces/IPowerSystem.cs index 2430d36..0c058cb 100644 --- a/Interfaces/IPowerSystem.cs +++ b/Interfaces/IPowerSystem.cs @@ -1,4 +1,4 @@ -namespace AsteroidGame.CoreSystems +namespace GameDev.CoreSystems { public interface IPowerSystem { diff --git a/Interfaces/ITargetable.cs b/Interfaces/ITargetable.cs index c7880e4..fbddbc7 100644 --- a/Interfaces/ITargetable.cs +++ b/Interfaces/ITargetable.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace AsteroidGame.CoreSystems +namespace GameDev.CoreSystems { public interface ITargetable { diff --git a/Interfaces/IWeapon.cs b/Interfaces/IWeapon.cs index 2903ddd..8fc0d8f 100644 --- a/Interfaces/IWeapon.cs +++ b/Interfaces/IWeapon.cs @@ -1,4 +1,4 @@ -namespace AsteroidGame.CoreSystems +namespace GameDev.CoreSystems { public interface IWeapon { diff --git a/ScriptableObjects.meta b/ScriptableObjects.meta new file mode 100644 index 0000000..9f2f993 --- /dev/null +++ b/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69fd32df12e214d4f92a17dbbe677a7d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ScriptableObjects/SRuntimeSet.cs b/ScriptableObjects/SRuntimeSet.cs new file mode 100644 index 0000000..362d267 --- /dev/null +++ b/ScriptableObjects/SRuntimeSet.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace GameDev.CoreSystems +{ + public abstract class SRuntimeSet : ScriptableObject + { + public List _list; + + public void Add(T component) + { + _list.Add(component); + } + + public void Remove(T component) + { + _list.Remove(component); + } + } +} \ No newline at end of file diff --git a/ScriptableObjects/SRuntimeSet.cs.meta b/ScriptableObjects/SRuntimeSet.cs.meta new file mode 100644 index 0000000..483e99a --- /dev/null +++ b/ScriptableObjects/SRuntimeSet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1e81b384c7f010b4fa3c1b8f293a4c42 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ScriptableObjects/SoDamageableRuntimeSet.cs b/ScriptableObjects/SoDamageableRuntimeSet.cs new file mode 100644 index 0000000..31a2506 --- /dev/null +++ b/ScriptableObjects/SoDamageableRuntimeSet.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace GameDev.CoreSystems +{ + [CreateAssetMenu(fileName = "newDamageableRuntimeSet", menuName = "RuntimeSet/Damageable")] + public class SoDamageableRuntimeSet : SRuntimeSet + { + //asdf + } +} \ No newline at end of file diff --git a/ScriptableObjects/SoDamageableRuntimeSet.cs.meta b/ScriptableObjects/SoDamageableRuntimeSet.cs.meta new file mode 100644 index 0000000..9ed2144 --- /dev/null +++ b/ScriptableObjects/SoDamageableRuntimeSet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9d4c8ce856b06db4c9a892b981e516e7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ScriptableObjects/SoTargetableRuntimeSet.cs b/ScriptableObjects/SoTargetableRuntimeSet.cs new file mode 100644 index 0000000..37ec13c --- /dev/null +++ b/ScriptableObjects/SoTargetableRuntimeSet.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace GameDev.CoreSystems +{ + [CreateAssetMenu(fileName = "newDamageableRuntimeSet", menuName = "RuntimeSet/Damageable")] + public class SoTargetableRuntimeSet : SRuntimeSet + { + } +} \ No newline at end of file diff --git a/ScriptableObjects/SoTargetableRuntimeSet.cs.meta b/ScriptableObjects/SoTargetableRuntimeSet.cs.meta new file mode 100644 index 0000000..5834934 --- /dev/null +++ b/ScriptableObjects/SoTargetableRuntimeSet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d76ef79c960c1845a914468e30d036b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Scripts/Damageable.cs b/Scripts/Damageable.cs index 7e22afe..a43a1a3 100644 --- a/Scripts/Damageable.cs +++ b/Scripts/Damageable.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace AsteroidGame.CoreSystems +namespace GameDev.CoreSystems { public class Damageable : MonoBehaviour, IDamageable { diff --git a/Scripts/Targetable.cs b/Scripts/Targetable.cs index 9bd6924..d7ef5de 100644 --- a/Scripts/Targetable.cs +++ b/Scripts/Targetable.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace AsteroidGame.CoreSystems +namespace GameDev.CoreSystems { public class Targetable : MonoBehaviour, ITargetable {