diff --git a/theProject/Assets/Prefabs/Managers.meta b/theProject/Assets/Prefabs/Managers.meta new file mode 100644 index 00000000..54b6bac2 --- /dev/null +++ b/theProject/Assets/Prefabs/Managers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06da55108ff6ac84984842ede70a6019 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/theProject/Assets/Prefabs/Managers/SquadManager.prefab b/theProject/Assets/Prefabs/Managers/SquadManager.prefab new file mode 100644 index 00000000..dee9a432 --- /dev/null +++ b/theProject/Assets/Prefabs/Managers/SquadManager.prefab @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1831389151964757021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1831389151964757027} + - component: {fileID: 1831389151964757020} + m_Layer: 0 + m_Name: SquadManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1831389151964757027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1831389151964757021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.9636345, y: 6.377094, z: 3.499856} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1831389151964757020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1831389151964757021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a470f948c2458f4994fe0cf5f226c52, type: 3} + m_Name: + m_EditorClassIdentifier: + squadPrefab: {fileID: 6141901885681798073, guid: e79038bbfa9535f45be1d0f0ae0626ce, + type: 3} diff --git a/theProject/Assets/Prefabs/Managers/SquadManager.prefab.meta b/theProject/Assets/Prefabs/Managers/SquadManager.prefab.meta new file mode 100644 index 00000000..5f5e1498 --- /dev/null +++ b/theProject/Assets/Prefabs/Managers/SquadManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3f72f88ef966ae34288fa03b7fff7884 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/theProject/Assets/Prefabs/Squad.prefab b/theProject/Assets/Prefabs/Squad.prefab new file mode 100644 index 00000000..2adfd4d8 --- /dev/null +++ b/theProject/Assets/Prefabs/Squad.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6141901885681798073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6141901885681798079} + - component: {fileID: 6141901885681798078} + m_Layer: 0 + m_Name: Squad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6141901885681798079 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6141901885681798073} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.4048395, y: -4.749419, z: 13.353434} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6141901885681798078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6141901885681798073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eeef7310a48872043b4089979ec88b42, type: 3} + m_Name: + m_EditorClassIdentifier: + soldiers: [] diff --git a/theProject/Assets/Prefabs/Squad.prefab.meta b/theProject/Assets/Prefabs/Squad.prefab.meta new file mode 100644 index 00000000..e697b73d --- /dev/null +++ b/theProject/Assets/Prefabs/Squad.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e79038bbfa9535f45be1d0f0ae0626ce +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/theProject/Assets/Scenes/SpartaqS.unity.meta b/theProject/Assets/Scenes/SpartaqS.unity.meta index c9c10848..ef7c9167 100644 --- a/theProject/Assets/Scenes/SpartaqS.unity.meta +++ b/theProject/Assets/Scenes/SpartaqS.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c8976c4733dc9814ca33c36b50beadf4 +guid: 049060bf353f41b4fb0d3675a00a1832 DefaultImporter: externalObjects: {} userData: diff --git a/theProject/Assets/Scripts/Managers/TempSquadManager.cs b/theProject/Assets/Scripts/Managers/SquadManager.cs similarity index 62% rename from theProject/Assets/Scripts/Managers/TempSquadManager.cs rename to theProject/Assets/Scripts/Managers/SquadManager.cs index 03644cb7..ffbf2a79 100644 --- a/theProject/Assets/Scripts/Managers/TempSquadManager.cs +++ b/theProject/Assets/Scripts/Managers/SquadManager.cs @@ -3,12 +3,19 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class TempSquadManager : MonoBehaviour +public class SquadManager : MonoBehaviour { + [SerializeField] GameObject squadPrefab; Squad playerSquad; + Squad enemySquad; private void Awake() { - playerSquad = FindObjectOfType(); + playerSquad = Instantiate(squadPrefab).GetComponent(); + playerSquad.gameObject.name = "Player Squad"; + + enemySquad = Instantiate(squadPrefab).GetComponent(); + enemySquad.gameObject.name = "Enemy Squad"; + } // Update is called once per frame void Update() diff --git a/theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta b/theProject/Assets/Scripts/Managers/SquadManager.cs.meta similarity index 100% rename from theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta rename to theProject/Assets/Scripts/Managers/SquadManager.cs.meta