From 40dfa80f14f6e1cfe4d13350d8105e4bc94a4643 Mon Sep 17 00:00:00 2001 From: Gabriel Ksawery Skowron-Rodriguez Date: Mon, 23 May 2022 12:41:33 +0200 Subject: [PATCH 1/5] SquadManager progress + added prfab for squad manager + now squads are spawned dynamically by squad manager --- theProject/Assets/Prefabs/Managers.meta | 8 ++++ .../Prefabs/Managers/SquadManager.prefab | 48 +++++++++++++++++++ .../Prefabs/Managers/SquadManager.prefab.meta | 7 +++ theProject/Assets/Prefabs/Squad.prefab | 47 ++++++++++++++++++ theProject/Assets/Prefabs/Squad.prefab.meta | 7 +++ theProject/Assets/Scenes/SpartaqS.unity.meta | 2 +- .../{TempSquadManager.cs => SquadManager.cs} | 11 ++++- ...adManager.cs.meta => SquadManager.cs.meta} | 0 8 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 theProject/Assets/Prefabs/Managers.meta create mode 100644 theProject/Assets/Prefabs/Managers/SquadManager.prefab create mode 100644 theProject/Assets/Prefabs/Managers/SquadManager.prefab.meta create mode 100644 theProject/Assets/Prefabs/Squad.prefab create mode 100644 theProject/Assets/Prefabs/Squad.prefab.meta rename theProject/Assets/Scripts/Managers/{TempSquadManager.cs => SquadManager.cs} (62%) rename theProject/Assets/Scripts/Managers/{TempSquadManager.cs.meta => SquadManager.cs.meta} (100%) 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 From 65899a25e58176ae29ad0bd2b82b834fb5ee2712 Mon Sep 17 00:00:00 2001 From: Gabriel Ksawery Skowron-Rodriguez Date: Mon, 23 May 2022 12:57:50 +0200 Subject: [PATCH 2/5] WIP, before tilemap manager changes --- theProject/Assets/Scenes/SpartaqS.unity | 1959 ++++++++++++++--- theProject/Assets/Scenes/SpartaqS.unity.meta | 2 +- .../Assets/Scripts/Managers/SquadManager.cs | 6 +- theProject/Assets/Scripts/Soldier.cs | 2 +- 4 files changed, 1599 insertions(+), 370 deletions(-) diff --git a/theProject/Assets/Scenes/SpartaqS.unity b/theProject/Assets/Scenes/SpartaqS.unity index 47e45982..edf6d631 100644 --- a/theProject/Assets/Scenes/SpartaqS.unity +++ b/theProject/Assets/Scenes/SpartaqS.unity @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &62685114 +--- !u!1 &282616947 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,211 +131,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 62685116} - - component: {fileID: 62685115} - - component: {fileID: 62685117} + - component: {fileID: 282616949} + - component: {fileID: 282616948} m_Layer: 0 - m_Name: Directional Light + m_Name: TilemapManagers m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &62685115 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 62685114} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &62685116 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 62685114} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &62685117 +--- !u!114 &282616948 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 62685114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 1 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} ---- !u!1 &274649401 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 274649403} - - component: {fileID: 274649402} - m_Layer: 0 - m_Name: Grid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!156049354 &274649402 -Grid: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 274649401} - m_Enabled: 1 - m_CellSize: {x: 1, y: 1, z: 0} - m_CellGap: {x: 0, y: 0, z: 0} - m_CellLayout: 0 - m_CellSwizzle: 1 ---- !u!4 &274649403 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 274649401} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2046204563} - - {fileID: 1175827543} - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &406016162 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 406016164} - - component: {fileID: 406016163} - m_Layer: 0 - m_Name: Managers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &406016163 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 406016162} + m_GameObject: {fileID: 282616947} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2c5c3a8b933d60d48a4d66bd1e0d3489, type: 3} m_Name: m_EditorClassIdentifier: - mapSize: {x: 10, y: 5} + mapSize: {x: 10, y: 10} WORLD_SPACE_OFFSET: {x: 0.5, y: 1, z: 0.5} - soldierStartingPositions: [] - enemyStartingPositions: [] - tilemap: {fileID: 2046204565} + soldierStartingPositions: + - {x: 0, y: 0} + - {x: 1, y: 2} + enemyStartingPositions: + - {x: 2, y: 0} + - {x: 9, y: 5} + tilemap: {fileID: 1853262998} soldierPrefab: {fileID: 403095692180922766, guid: a87b1aa46b0ed3e0fba621e11dd4f1e2, type: 3} ---- !u!4 &406016164 +--- !u!4 &282616949 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 406016162} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.9636345, y: 6.377094, z: 3.499856} + m_GameObject: {fileID: 282616947} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 1773236753} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &574213518 +--- !u!1 &453924353 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -343,10 +186,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 574213521} - - component: {fileID: 574213520} - - component: {fileID: 574213519} - - component: {fileID: 574213522} + - component: {fileID: 453924356} + - component: {fileID: 453924355} + - component: {fileID: 453924354} + - component: {fileID: 453924357} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -354,21 +197,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &574213519 +--- !u!81 &453924354 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574213518} + m_GameObject: {fileID: 453924353} m_Enabled: 1 ---- !u!20 &574213520 +--- !u!20 &453924355 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574213518} + m_GameObject: {fileID: 453924353} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -405,28 +248,28 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &574213521 +--- !u!4 &453924356 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574213518} - m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} - m_LocalPosition: {x: 0, y: 5, z: -5} + m_GameObject: {fileID: 453924353} + m_LocalRotation: {x: 0.22221683, y: -0, z: -0, w: 0.9749973} + m_LocalPosition: {x: 5.37, y: 5.93, z: -5.08} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} ---- !u!114 &574213522 + m_LocalEulerAnglesHint: {x: 25.679, y: 0, z: 0} +--- !u!114 &453924357 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574213518} + m_GameObject: {fileID: 453924353} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} @@ -453,7 +296,7 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 ---- !u!1 &816363136 +--- !u!1 &484241835 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -461,8 +304,67 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 816363138} - - component: {fileID: 816363137} + - component: {fileID: 484241837} + - component: {fileID: 484241836} + - component: {fileID: 484241838} + m_Layer: 0 + m_Name: TempSquad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &484241836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484241835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eeef7310a48872043b4089979ec88b42, type: 3} + m_Name: + m_EditorClassIdentifier: + soldiers: [] +--- !u!4 &484241837 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484241835} + 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: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &484241838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484241835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a470f948c2458f4994fe0cf5f226c52, type: 3} + m_Name: + m_EditorClassIdentifier: + squadPrefab: {fileID: 0} +--- !u!1 &905024696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 905024698} + - component: {fileID: 905024697} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -470,35 +372,307 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &816363137 +--- !u!114 &905024697 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 816363136} + m_GameObject: {fileID: 905024696} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6be2da178228f6e4790d99beae504bba, type: 3} m_Name: m_EditorClassIdentifier: tilemapManager: {fileID: 0} ---- !u!4 &816363138 +--- !u!4 &905024698 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 816363136} + m_GameObject: {fileID: 905024696} + 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: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1067482839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1067482841} + - component: {fileID: 1067482840} + m_Layer: 0 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &1067482840 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067482839} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 1 +--- !u!4 &1067482841 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067482839} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1853262996} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1129778410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1129778411} + - component: {fileID: 1129778414} + - component: {fileID: 1129778413} + - component: {fileID: 1129778412} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1129778411 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129778410} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.99, y: -0.3, z: 5.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1853262996} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1129778412 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129778410} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1129778413 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129778410} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1129778414 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129778410} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1242078932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1242078933} + m_Layer: 0 + m_Name: ------- Other + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1242078933 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1242078932} 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: 8 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1051848805 +--- !u!1 &1398576803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1398576807} + - component: {fileID: 1398576806} + - component: {fileID: 1398576805} + - component: {fileID: 1398576804} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!64 &1398576804 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398576803} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1398576805 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398576803} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1398576806 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398576803} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1398576807 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398576803} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: 0, z: 5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1415951278 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -508,7 +682,7 @@ PrefabInstance: - target: {fileID: 8737336274644796262, guid: 519502c6f18d5e44eb800aefd848a6e6, type: 3} propertyPath: m_RootOrder - value: 2 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8737336274644796262, guid: 519502c6f18d5e44eb800aefd848a6e6, type: 3} @@ -565,14 +739,9 @@ PrefabInstance: propertyPath: m_Name value: TickSystem objectReference: {fileID: 0} - - target: {fileID: 8737336274644796263, guid: 519502c6f18d5e44eb800aefd848a6e6, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 519502c6f18d5e44eb800aefd848a6e6, type: 3} ---- !u!1 &1175827542 +--- !u!1 &1460622992 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -580,142 +749,189 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1175827543} - - component: {fileID: 1175827546} - - component: {fileID: 1175827545} - - component: {fileID: 1175827544} + - component: {fileID: 1460622994} + - component: {fileID: 1460622993} + - component: {fileID: 1460622995} m_Layer: 0 - m_Name: Plane + m_Name: Directional Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1175827543 -Transform: +--- !u!108 &1460622993 +Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175827542} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 274649403} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &1175827544 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175827542} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 1460622992} m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1175827545 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175827542} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1175827546 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175827542} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1440849007 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1440849008} - - component: {fileID: 1440849009} - m_Layer: 0 - m_Name: SquadObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1440849008 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1460622994 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1440849007} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_GameObject: {fileID: 1460622992} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1440849009 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &1460622995 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1440849007} + m_GameObject: {fileID: 1460622992} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eeef7310a48872043b4089979ec88b42, type: 3} + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - soldiers: [] ---- !u!1 &1834673983 + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!1001 &1763762951 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1773236753} + m_Modifications: + - target: {fileID: 1831389151964757021, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_Name + value: SquadManager + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.9636345 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalPosition.y + value: 6.377094 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalPosition.z + value: 3.499856 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3f72f88ef966ae34288fa03b7fff7884, type: 3} +--- !u!4 &1763762952 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1831389151964757027, guid: 3f72f88ef966ae34288fa03b7fff7884, + type: 3} + m_PrefabInstance: {fileID: 1763762951} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1773236752 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -723,30 +939,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1834673984} + - component: {fileID: 1773236753} m_Layer: 0 - m_Name: ------- Other + m_Name: ------- Managers m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1834673984 +--- !u!4 &1773236753 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1834673983} + m_GameObject: {fileID: 1773236752} 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_Children: + - {fileID: 282616949} + - {fileID: 1763762952} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2046204562 +--- !u!1 &1853262995 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -754,9 +972,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2046204563} - - component: {fileID: 2046204565} - - component: {fileID: 2046204564} + - component: {fileID: 1853262996} + - component: {fileID: 1853262998} + - component: {fileID: 1853262997} + - component: {fileID: 1853262999} m_Layer: 0 m_Name: Soldier Map m_TagString: Untagged @@ -764,28 +983,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2046204563 +--- !u!4 &1853262996 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2046204562} + m_GameObject: {fileID: 1853262995} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 274649403} + m_Children: + - {fileID: 1129778411} + m_Father: {fileID: 1067482841} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!483693784 &2046204564 +--- !u!483693784 &1853262997 TilemapRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2046204562} + m_GameObject: {fileID: 1853262995} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -828,27 +1048,1051 @@ TilemapRenderer: m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!1839735485 &2046204565 +--- !u!1839735485 &1853262998 Tilemap: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2046204562} + m_GameObject: {fileID: 1853262995} m_Enabled: 1 - m_Tiles: {} + m_Tiles: + - first: {x: 0, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} - m_TileAssetArray: [] - m_TileSpriteArray: [] - m_TileMatrixArray: [] - m_TileColorArray: [] + m_TileAssetArray: + - m_RefCount: 100 + m_Data: {fileID: 11400000, guid: f4810e428eeabd34aaf98dcfc2940217, type: 2} + m_TileSpriteArray: + - m_RefCount: 100 + m_Data: {fileID: 21300000, guid: a7b952d977797de4a8405409c2d1eac4, type: 3} + m_TileMatrixArray: + - m_RefCount: 100 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 100 + m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 1} + m_Size: {x: 10, y: 10, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} - m_TileOrientation: 0 + m_TileOrientation: 1 m_TileOrientationMatrix: e00: 1 e01: 0 @@ -866,34 +2110,17 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &2114096516 -GameObject: +--- !u!64 &1853262999 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2114096517} - m_Layer: 0 - m_Name: ------- Managers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2114096517 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2114096516} - 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: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1853262995} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} diff --git a/theProject/Assets/Scenes/SpartaqS.unity.meta b/theProject/Assets/Scenes/SpartaqS.unity.meta index ef7c9167..6e85bc22 100644 --- a/theProject/Assets/Scenes/SpartaqS.unity.meta +++ b/theProject/Assets/Scenes/SpartaqS.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 049060bf353f41b4fb0d3675a00a1832 +guid: ab3f3b9b28d59aa48a9da7d926f1e0cd DefaultImporter: externalObjects: {} userData: diff --git a/theProject/Assets/Scripts/Managers/SquadManager.cs b/theProject/Assets/Scripts/Managers/SquadManager.cs index ffbf2a79..b9c070c6 100644 --- a/theProject/Assets/Scripts/Managers/SquadManager.cs +++ b/theProject/Assets/Scripts/Managers/SquadManager.cs @@ -12,20 +12,22 @@ public class SquadManager : MonoBehaviour { playerSquad = Instantiate(squadPrefab).GetComponent(); playerSquad.gameObject.name = "Player Squad"; + playerSquad.transform.SetParent(transform); enemySquad = Instantiate(squadPrefab).GetComponent(); enemySquad.gameObject.name = "Enemy Squad"; + enemySquad.transform.SetParent(transform); } // Update is called once per frame void Update() { - Debug.Log("Added initial soldeirs to squad"); + Debug.Log("Added initial soldiers to squad"); // add all ally soldiers to squad var soldiers = FindObjectsOfType(); foreach(var soldier in soldiers) { - if(soldier.TempGetOwnType() == Soldier.SoldierType.Ally) + if(soldier.GetOwnType() == Soldier.SoldierType.Ally) { playerSquad.TempAddSoldierToSquad(soldier); } diff --git a/theProject/Assets/Scripts/Soldier.cs b/theProject/Assets/Scripts/Soldier.cs index d611ae63..29deb367 100644 --- a/theProject/Assets/Scripts/Soldier.cs +++ b/theProject/Assets/Scripts/Soldier.cs @@ -60,7 +60,7 @@ public class Soldier : MonoBehaviour [SerializeField] private Vector2Int movementDestination = Vector2Int.zero; - public SoldierType TempGetOwnType() + public SoldierType GetOwnType() { return ourType; } From a4f64abb6675b73656757536d10638c0ae07e696 Mon Sep 17 00:00:00 2001 From: Gabriel Ksawery Skowron-Rodriguez Date: Mon, 23 May 2022 13:20:08 +0200 Subject: [PATCH 3/5] cleaned up OnDestroy() --- theProject/Assets/Scenes/SpartaqS.unity | 4 ++++ theProject/Assets/Scripts/Soldier.cs | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/theProject/Assets/Scenes/SpartaqS.unity b/theProject/Assets/Scenes/SpartaqS.unity index edf6d631..3f417989 100644 --- a/theProject/Assets/Scenes/SpartaqS.unity +++ b/theProject/Assets/Scenes/SpartaqS.unity @@ -154,15 +154,19 @@ MonoBehaviour: m_EditorClassIdentifier: mapSize: {x: 10, y: 10} WORLD_SPACE_OFFSET: {x: 0.5, y: 1, z: 0.5} + allyBaseCoord: {x: 0, y: 0} soldierStartingPositions: - {x: 0, y: 0} - {x: 1, y: 2} + enemyBaseCoord: {x: 0, y: 0} enemyStartingPositions: - {x: 2, y: 0} - {x: 9, y: 5} tilemap: {fileID: 1853262998} soldierPrefab: {fileID: 403095692180922766, guid: a87b1aa46b0ed3e0fba621e11dd4f1e2, type: 3} + basePrefab: {fileID: 6141901885681798073, guid: e79038bbfa9535f45be1d0f0ae0626ce, + type: 3} --- !u!4 &282616949 Transform: m_ObjectHideFlags: 0 diff --git a/theProject/Assets/Scripts/Soldier.cs b/theProject/Assets/Scripts/Soldier.cs index 284fc1eb..9808289d 100644 --- a/theProject/Assets/Scripts/Soldier.cs +++ b/theProject/Assets/Scripts/Soldier.cs @@ -67,7 +67,7 @@ public class Soldier : MonoBehaviour // variables not visible in inspector - [HideInInspector] public UnityEvent onDeath = new UnityEvent(); + [HideInInspector] public UnityEvent onDeath = new UnityEvent(); public SoldierType GetOwnType() { @@ -115,11 +115,15 @@ public class Soldier : MonoBehaviour TickSystem.OnTick += HandleTick; } + private void Die() + { + TickSystem.OnTick -= HandleTick; + onDeath.Invoke(this); + Destroy(gameObject); + } + private void OnDestroy() { - TickSystem.OnTick -= HandleTick; - onDeath.Invoke(); - Debug.Log("Soldier: " + ourType.ToString() + " has died", gameObject); } @@ -203,7 +207,7 @@ public class Soldier : MonoBehaviour healthPoints -= damage; if (healthPoints <= 0) - Destroy(gameObject); + Die(); UpdateHPDisplay(); Debug.Log("I took damage, oh my HP is now: " + healthPoints + " noooo!!!!", gameObject); From 42452e6e64d8f2ca0a3486f5a406add46db07dbf Mon Sep 17 00:00:00 2001 From: Gabriel Ksawery Skowron-Rodriguez Date: Mon, 23 May 2022 14:04:53 +0200 Subject: [PATCH 4/5] Cleanup Soldiers and Bases (make Entity base class) --- theProject/Assets/Prefabs/Soldier.prefab | 32 +- theProject/Assets/Scenes/SpartaqS.unity | 5 +- theProject/Assets/Scripts/Entities.meta | 8 + theProject/Assets/Scripts/Entities/Base.cs | 9 + .../Scripts/{ => Entities}/Base.cs.meta | 0 .../Scripts/{Base.cs => Entities/Entity.cs} | 159 +++++---- .../Assets/Scripts/Entities/Entity.cs.meta | 11 + .../Assets/Scripts/{ => Entities}/Soldier.cs | 328 +++++++++--------- .../Scripts/{ => Entities}/Soldier.cs.meta | 0 .../Assets/Scripts/Managers/SquadManager.cs | 2 +- .../Assets/Scripts/Managers/TilemapManager.cs | 45 +-- 11 files changed, 306 insertions(+), 293 deletions(-) create mode 100644 theProject/Assets/Scripts/Entities.meta create mode 100644 theProject/Assets/Scripts/Entities/Base.cs rename theProject/Assets/Scripts/{ => Entities}/Base.cs.meta (100%) rename theProject/Assets/Scripts/{Base.cs => Entities/Entity.cs} (51%) create mode 100644 theProject/Assets/Scripts/Entities/Entity.cs.meta rename theProject/Assets/Scripts/{ => Entities}/Soldier.cs (73%) rename theProject/Assets/Scripts/{ => Entities}/Soldier.cs.meta (100%) diff --git a/theProject/Assets/Prefabs/Soldier.prefab b/theProject/Assets/Prefabs/Soldier.prefab index 4fdf4327..60fe757a 100644 --- a/theProject/Assets/Prefabs/Soldier.prefab +++ b/theProject/Assets/Prefabs/Soldier.prefab @@ -78,22 +78,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d34caf35d0ce610f8bc87cf815ba1915, type: 3} m_Name: m_EditorClassIdentifier: + myTeam: 0 maxHealthPoints: 100 healthPoints: 100 - rangeAttack: 3 - rangeView: 1 - damageAttack: 1 - speedAttack: 2 - lastAttackTick: -1 nameText: {fileID: 6838251604148675782} healthPointsText: {fileID: 8012357605284019061} - target: {fileID: 0} - enemyType: 0 - ourType: 0 - movementDestination: {x: 0, y: 0} - onDeath: + OnDeath: m_PersistentCalls: m_Calls: [] + rangeAttack: 3 + rangeView: 1 + damageAttack: 25 + speedAttack: 2 + lastAttackTick: -1 + target: {fileID: 0} + enemyType: 0 + movementDestination: {x: 0, y: 0} --- !u!1 &1997457243244158843 GameObject: m_ObjectHideFlags: 0 @@ -358,12 +358,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1498494949006888735} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1498494949006888735} + m_maskType: 0 --- !u!1 &2062275012809416088 GameObject: m_ObjectHideFlags: 0 @@ -530,9 +530,9 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 4083783489867894370} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4083783489867894370} + m_maskType: 0 diff --git a/theProject/Assets/Scenes/SpartaqS.unity b/theProject/Assets/Scenes/SpartaqS.unity index 3f417989..b0858a39 100644 --- a/theProject/Assets/Scenes/SpartaqS.unity +++ b/theProject/Assets/Scenes/SpartaqS.unity @@ -156,16 +156,15 @@ MonoBehaviour: WORLD_SPACE_OFFSET: {x: 0.5, y: 1, z: 0.5} allyBaseCoord: {x: 0, y: 0} soldierStartingPositions: - - {x: 0, y: 0} + - {x: 1, y: 0} - {x: 1, y: 2} enemyBaseCoord: {x: 0, y: 0} enemyStartingPositions: - {x: 2, y: 0} - - {x: 9, y: 5} tilemap: {fileID: 1853262998} soldierPrefab: {fileID: 403095692180922766, guid: a87b1aa46b0ed3e0fba621e11dd4f1e2, type: 3} - basePrefab: {fileID: 6141901885681798073, guid: e79038bbfa9535f45be1d0f0ae0626ce, + basePrefab: {fileID: 403095692180922766, guid: cff761b70fcb1dc55bfd414849823b2e, type: 3} --- !u!4 &282616949 Transform: diff --git a/theProject/Assets/Scripts/Entities.meta b/theProject/Assets/Scripts/Entities.meta new file mode 100644 index 00000000..c364ba69 --- /dev/null +++ b/theProject/Assets/Scripts/Entities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e5f405b6facc6e47a0297f2be93eae4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/theProject/Assets/Scripts/Entities/Base.cs b/theProject/Assets/Scripts/Entities/Base.cs new file mode 100644 index 00000000..1dbc47c3 --- /dev/null +++ b/theProject/Assets/Scripts/Entities/Base.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +public class Base : Entity +{ + +} diff --git a/theProject/Assets/Scripts/Base.cs.meta b/theProject/Assets/Scripts/Entities/Base.cs.meta similarity index 100% rename from theProject/Assets/Scripts/Base.cs.meta rename to theProject/Assets/Scripts/Entities/Base.cs.meta diff --git a/theProject/Assets/Scripts/Base.cs b/theProject/Assets/Scripts/Entities/Entity.cs similarity index 51% rename from theProject/Assets/Scripts/Base.cs rename to theProject/Assets/Scripts/Entities/Entity.cs index 3b3c9365..74e64ec5 100644 --- a/theProject/Assets/Scripts/Base.cs +++ b/theProject/Assets/Scripts/Entities/Entity.cs @@ -1,73 +1,86 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; - -public class Base : MonoBehaviour -{ - public enum SoldierType - { - Ally, - Enemy - } - [SerializeField] protected SoldierType ourType; - [SerializeField] private float maxHealthPoints = 100; - [SerializeField] private float healthPoints = 100; - - [SerializeField] private TMP_Text nameText = null; - [SerializeField] private TMP_Text healthPointsText = null; - - public SoldierType TempGetOwnType() - { - return ourType; - } - - // Start is called before the first frame update - protected void Start(){ - healthPoints = maxHealthPoints; // initialize health - UpdateHPDisplay(); - - Debug.Log("Base: " + ourType.ToString() + " has appeared", gameObject); - - switch (ourType) - { - case SoldierType.Ally: - nameText.text = "Ally"; - nameText.color = Color.blue; - break; - case SoldierType.Enemy: - nameText.text = "Enemy"; - nameText.color = Color.red; - break; - default: - nameText.text = "how did we get here (forever)"; - nameText.color = new Color(255, 192, 203); - break; - } - } - - public void setOwnTag(SoldierType type) - { - ourType = type; - } - - protected void OnDestroy() - { - Debug.Log("Soldier: " + ourType.ToString() + " has died", gameObject); - } - protected void ReduceHP(float damage) - { - healthPoints -= damage; - - if (healthPoints <= 0) - Destroy(gameObject); - - UpdateHPDisplay(); - Debug.Log("I took damage, my HP is now: " + healthPoints + " noooo!!!!", gameObject); - } - - protected void UpdateHPDisplay() - { - healthPointsText.text = healthPoints.ToString() + "/" + maxHealthPoints.ToString(); - } -} +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.Events; + +public class Entity : MonoBehaviour +{ + public enum Team + { + Ally, + Enemy + } + [Header("Values")] + [SerializeField] protected Team myTeam; + [SerializeField] protected float maxHealthPoints = 100; + [SerializeField] protected float healthPoints = 100; + + [SerializeField] protected TMP_Text nameText = null; + [SerializeField] protected TMP_Text healthPointsText = null; + + [HideInInspector] public UnityEvent OnDeath = new UnityEvent(); + + + public Team GetOwnTeam() + { + return myTeam; + } + + // Start is called before the first frame update + protected virtual void Start(){ + healthPoints = maxHealthPoints; // initialize health + UpdateHPDisplay(); + + Debug.Log("Entity: " + myTeam.ToString() + " has appeared", gameObject); + + switch (myTeam) + { + case Team.Ally: + nameText.text = "Ally"; + nameText.color = Color.blue; + break; + case Team.Enemy: + nameText.text = "Enemy"; + nameText.color = Color.red; + break; + default: + nameText.text = "how did we get here (forever)"; + nameText.color = new Color(255, 192, 203); + break; + } + } + + public void SetOwnTeam(Team type) + { + myTeam = type; + } + + public void ReduceHP(float damage) + { + healthPoints -= damage; + + if (healthPoints <= 0) + Destroy(gameObject); + + UpdateHPDisplay(); + Debug.Log("I took damage, my HP is now: " + healthPoints + " noooo!!!!", gameObject); + } + + protected virtual void Die() + { + OnDeath.Invoke(this); + Destroy(gameObject); + } + + private void OnDestroy() + { + Debug.Log("Soldier: " + myTeam.ToString() + " has died", gameObject); + } + + + protected void UpdateHPDisplay() + { + healthPointsText.text = healthPoints.ToString() + "/" + maxHealthPoints.ToString(); + } +} diff --git a/theProject/Assets/Scripts/Entities/Entity.cs.meta b/theProject/Assets/Scripts/Entities/Entity.cs.meta new file mode 100644 index 00000000..03b03e8f --- /dev/null +++ b/theProject/Assets/Scripts/Entities/Entity.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d77d5669fae0f57499970c2aed5af02b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/theProject/Assets/Scripts/Soldier.cs b/theProject/Assets/Scripts/Entities/Soldier.cs similarity index 73% rename from theProject/Assets/Scripts/Soldier.cs rename to theProject/Assets/Scripts/Entities/Soldier.cs index 5c5e4cf4..d609d74c 100644 --- a/theProject/Assets/Scripts/Soldier.cs +++ b/theProject/Assets/Scripts/Entities/Soldier.cs @@ -1,171 +1,157 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; -using UnityEngine.Events; - -public class Soldier : Base -{ - private Queue actions = new Queue(); - private Queue interrupts = new Queue(); - #region Action Queue Items - abstract class Action // action "template" - { - public virtual void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs) { } // called by Soldier when action is supposed to be done - } - - private class Movement : Action - { - public override void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs) - {//TO DO: CALL PROPER FUNCTION TO MOVE - throw new System.NotImplementedException($"(tick: {tickEventArgs.tickNumber}) Trying to teleport to {soldier.movementDestination}"); - //??tileMap.Teleport(movementDestination) - } - } - private class TryAttack : Action - { - public override void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs) - { - //Debug.LogWarning($"(tick: {tickEventArgs.tickNumber}) Looking for enemy in range"); - if(soldier.TryAttackEnemy()) - soldier.lastAttackTick = tickEventArgs.tickNumber; - } - } - #endregion - - #region Handling Incoming Orders (Interrupts) - public void HandleMovementOrder(Vector2Int destination) - { - movementDestination = destination; - interrupts.Enqueue(new Movement()); // force soldier to find path to the new destination - } - #endregion - - [Header("Values")] - [SerializeField] private float rangeAttack = 100; - [SerializeField] private float rangeView = 1; - [SerializeField] private float damageAttack = 1; - [SerializeField] private int speedAttack = 1; // ticks between attacks - [SerializeField] private int lastAttackTick = -1; - [Header("References")] - [Header("Do-not-change-in-game values")] - [SerializeField] private Soldier target; - [SerializeField] private SoldierType enemyType; - - [SerializeField] private Vector2Int movementDestination = Vector2Int.zero; - - - - // variables not visible in inspector - - [HideInInspector] public UnityEvent onDeath = new UnityEvent(); - - public SoldierType GetOwnType() - { - return ourType; - } - - // Start is called before the first frame update - void Start(){ - base.Start(); - setEnemyTag(); - } - - public void setEnemyTag() - { - if(ourType == SoldierType.Ally) enemyType = SoldierType.Enemy; - else enemyType = SoldierType.Ally; - } - - void Awake() - { - TickSystem.OnTick += HandleTick; - } - - private void Die() - { - TickSystem.OnTick -= HandleTick; - onDeath.Invoke(this); - Destroy(gameObject); - } - - private void OnDestroy() - { - Debug.Log("Soldier: " + ourType.ToString() + " has died", gameObject); - } - - private void HandleTick(TickSystem.OnTickEventArgs tickEventArgs) - { - ref Queue queueToHandle = ref interrupts; - if (interrupts.Count < 1) // if no interrupt actions to do, handle regular queue - queueToHandle = actions; - - if(queueToHandle.Count > 0) - queueToHandle.Dequeue().Execute(this, tickEventArgs); - else - { - if(lastAttackTick + speedAttack <= tickEventArgs.tickNumber) - { - queueToHandle.Enqueue(new TryAttack()); - queueToHandle.Dequeue().Execute(this, tickEventArgs); - } - } - } - - bool TryAttackEnemy () //returns true if an enemy was attacked - { - // Enemies are the game objects tagged with the "Enemy" - //GameObject[] enemies = GameObject.FindGameObjectsWithTag(enemyType); - Soldier[] soldiers = GameObject.FindObjectsOfType(); - - List enemiesList = new List(); - - foreach (Soldier obj in soldiers) - { - if (obj.ourType == enemyType) - enemiesList.Add(obj); - } - - Soldier[] enemies = enemiesList.ToArray(); - - // We have not found enemy yet so the distance to enemy is "infinite" - float shortestDistance = Mathf.Infinity; - Soldier nearestEnemy = null; - foreach ( Soldier enemy in enemies) - { - // Go through each enemy existing - // Calculate distance to this enemy - float distanceToEnemy = Vector3.Distance(transform.position, enemy.transform.position); - if (distanceToEnemy < shortestDistance) - { - shortestDistance = distanceToEnemy; - nearestEnemy = enemy; - } - } - - if (nearestEnemy != null && shortestDistance <= rangeAttack) - { - target = nearestEnemy; - } - else - target = null; - - if (target != null) - target.ReduceHP(damageAttack); - - return target != null; - } - - // Update is called once per frame - void Update() - { - //if (target == null) return; - } - - /* https://www.youtube.com/watch?v=QKhn2kl9_8I 08:54 Soldier attack - void OnDrawGizmosSelected () - { - - } - */ -} +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.Events; + +public class Soldier : Entity +{ + private Queue actions = new Queue(); + private Queue interrupts = new Queue(); + #region Action Queue Items + abstract class Action // action "template" + { + public virtual void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs) { } // called by Soldier when action is supposed to be done + } + + private class Movement : Action + { + public override void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs) + {//TO DO: CALL PROPER FUNCTION TO MOVE + throw new System.NotImplementedException($"(tick: {tickEventArgs.tickNumber}) Trying to teleport to {soldier.movementDestination}"); + //??tileMap.Teleport(movementDestination) + } + } + private class TryAttack : Action + { + public override void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs) + { + //Debug.LogWarning($"(tick: {tickEventArgs.tickNumber}) Looking for enemy in range"); + if(soldier.TryAttackEnemy()) + soldier.lastAttackTick = tickEventArgs.tickNumber; + } + } + #endregion + + #region Handling Incoming Orders (Interrupts) + public void HandleMovementOrder(Vector2Int destination) + { + movementDestination = destination; + interrupts.Enqueue(new Movement()); // force soldier to find path to the new destination + } + #endregion + + [Header("Soldier Values")] + [SerializeField] private float rangeAttack = 100; + [SerializeField] private float rangeView = 1; + [SerializeField] private float damageAttack = 1; + [SerializeField] private int speedAttack = 1; // ticks between attacks + [SerializeField] private int lastAttackTick = -1; + [Header("References")] + [Header("Do-not-change-in-game values")] + [SerializeField] private Entity target; + [SerializeField] private Team enemyType; + + [SerializeField] private Vector2Int movementDestination = Vector2Int.zero; + + // Start is called before the first frame update + protected override void Start(){ + base.Start(); + SetEnemyTag(); + } + + public void SetEnemyTag() + { + if(myTeam == Team.Ally) enemyType = Team.Enemy; + else enemyType = Team.Ally; + } + + void Awake() + { + TickSystem.OnTick += HandleTick; + } + + protected override void Die() + { + TickSystem.OnTick -= HandleTick; + base.Die(); + } + + private void HandleTick(TickSystem.OnTickEventArgs tickEventArgs) + { + ref Queue queueToHandle = ref interrupts; + if (interrupts.Count < 1) // if no interrupt actions to do, handle regular queue + queueToHandle = actions; + + if(queueToHandle.Count > 0) + queueToHandle.Dequeue().Execute(this, tickEventArgs); + else + { + if(lastAttackTick + speedAttack <= tickEventArgs.tickNumber) + { + queueToHandle.Enqueue(new TryAttack()); + queueToHandle.Dequeue().Execute(this, tickEventArgs); + } + } + } + + bool TryAttackEnemy () //returns true if an enemy was attacked + { + // Enemies are the game objects tagged with the "Enemy" + //GameObject[] enemies = GameObject.FindGameObjectsWithTag(enemyType); + Entity[] soldiers = GameObject.FindObjectsOfType(); + + List enemiesList = new List(); + + foreach (Entity obj in soldiers) + { + if (obj.GetOwnTeam() == enemyType) + enemiesList.Add(obj); + } + + Debug.Log(soldiers.Length); + Debug.Log(enemiesList.Count); + Entity[] enemies = enemiesList.ToArray(); + + // We have not found enemy yet so the distance to enemy is "infinite" + float shortestDistance = Mathf.Infinity; + Entity nearestEnemy = null; + foreach (Entity enemy in enemies) + { + // Go through each enemy existing + // Calculate distance to this enemy + float distanceToEnemy = Vector3.Distance(transform.position, + enemy.transform.position); + if (distanceToEnemy < shortestDistance) + { + shortestDistance = distanceToEnemy; + nearestEnemy = enemy; + } + } + + if (nearestEnemy != null && shortestDistance <= rangeAttack) + { + target = nearestEnemy; + } + else + target = null; + + if (target != null) + target.ReduceHP(damageAttack); + + return target != null; + } + + // Update is called once per frame + void Update() + { + //if (target == null) return; + } + + /* https://www.youtube.com/watch?v=QKhn2kl9_8I 08:54 Soldier attack + void OnDrawGizmosSelected () + { + + } + */ +} diff --git a/theProject/Assets/Scripts/Soldier.cs.meta b/theProject/Assets/Scripts/Entities/Soldier.cs.meta similarity index 100% rename from theProject/Assets/Scripts/Soldier.cs.meta rename to theProject/Assets/Scripts/Entities/Soldier.cs.meta diff --git a/theProject/Assets/Scripts/Managers/SquadManager.cs b/theProject/Assets/Scripts/Managers/SquadManager.cs index b9c070c6..5235c370 100644 --- a/theProject/Assets/Scripts/Managers/SquadManager.cs +++ b/theProject/Assets/Scripts/Managers/SquadManager.cs @@ -27,7 +27,7 @@ public class SquadManager : MonoBehaviour var soldiers = FindObjectsOfType(); foreach(var soldier in soldiers) { - if(soldier.GetOwnType() == Soldier.SoldierType.Ally) + if(soldier.GetOwnTeam() == Soldier.Team.Ally) { playerSquad.TempAddSoldierToSquad(soldier); } diff --git a/theProject/Assets/Scripts/Managers/TilemapManager.cs b/theProject/Assets/Scripts/Managers/TilemapManager.cs index bdd22ae9..1b8b9988 100644 --- a/theProject/Assets/Scripts/Managers/TilemapManager.cs +++ b/theProject/Assets/Scripts/Managers/TilemapManager.cs @@ -14,7 +14,7 @@ public class TilemapManager : MonoBehaviour public struct Tile { - public Soldier standingSoldier; + public Entity standingEntity; } [Header("Common Values")] @@ -99,16 +99,16 @@ public class TilemapManager : MonoBehaviour return false; if (isBase) - tiles[x, y].standingSoldier = Instantiate(basePrefab, tilemap.CellToWorld(new Vector3Int(x, y, 0)) + WORLD_SPACE_OFFSET, Quaternion.identity).GetComponent(); - if (isBase) - tiles[x, y].standingSoldier = Instantiate(soldierPrefab, tilemap.CellToWorld(new Vector3Int(x, y, 0)) + WORLD_SPACE_OFFSET, Quaternion.identity).GetComponent(); + tiles[x, y].standingEntity = Instantiate(basePrefab, tilemap.CellToWorld(new Vector3Int(x, y, 0)) + WORLD_SPACE_OFFSET, Quaternion.identity).GetComponent(); + else + tiles[x, y].standingEntity = Instantiate(soldierPrefab, tilemap.CellToWorld(new Vector3Int(x, y, 0)) + WORLD_SPACE_OFFSET, Quaternion.identity).GetComponent(); if (isAlly) - tiles[x, y].standingSoldier.setOwnTag(Soldier.SoldierType.Ally); + tiles[x, y].standingEntity.SetOwnTeam(Base.Team.Ally); else - tiles[x, y].standingSoldier.setOwnTag(Soldier.SoldierType.Enemy); + tiles[x, y].standingEntity.SetOwnTeam(Base.Team.Enemy); - if (tiles[x, y].standingSoldier != null) + if (tiles[x, y].standingEntity != null) return true; return false; @@ -119,42 +119,29 @@ public class TilemapManager : MonoBehaviour if (GetTileState(x, y) != TileState.taken) return false; - Destroy(tiles[x, y].standingSoldier.gameObject); - tiles[x, y].standingSoldier = null; + Destroy(tiles[x, y].standingEntity.gameObject); + tiles[x, y].standingEntity = null; Debug.Log("Despaned a soldier"); return true; } - public Soldier GetSoldier(int x, int y) + public Entity GetSoldier(int x, int y) { if (GetTileState(x, y) != TileState.taken) return null; - return tiles[x,y].standingSoldier; + return tiles[x,y].standingEntity; } - public Soldier[] GetAllSoldiers() - { - List list = new List(); - - foreach (Tile obj in tiles) - { - if (obj.standingSoldier != null) - list.Add(obj.standingSoldier); - } - - return list.ToArray(); - } - - public bool MoveSoldier(int x1, int y1, int x2, int y2) + public bool MoveEntity(int x1, int y1, int x2, int y2) // old MoveSoldier { if (GetTileState(x1, y1) == TileState.taken && GetTileState(x2, y2) == TileState.free) { - tiles[x2, y2].standingSoldier = tiles[x1, y1].standingSoldier; - tiles[x1, y1].standingSoldier = null; + tiles[x2, y2].standingEntity = tiles[x1, y1].standingEntity; + tiles[x1, y1].standingEntity = null; - tiles[x2, y2].standingSoldier.transform.position = tilemap.CellToWorld(new Vector3Int(x2, y2, 0)); + tiles[x2, y2].standingEntity.transform.position = tilemap.CellToWorld(new Vector3Int(x2, y2, 0)) + WORLD_SPACE_OFFSET; return true; } @@ -169,7 +156,7 @@ public class TilemapManager : MonoBehaviour if (x < 0 || y < 0 || x >= mapSize.x || y >= mapSize.y) return TileState.outOfBounds; - if (tiles[x, y].standingSoldier == null) + if (tiles[x, y].standingEntity == null) return TileState.free; return TileState.taken; From 28f7e76c0b79b019edb8591cdd86757c686e9140 Mon Sep 17 00:00:00 2001 From: Gabriel Ksawery Skowron-Rodriguez Date: Mon, 23 May 2022 14:15:06 +0200 Subject: [PATCH 5/5] sort of fix --- theProject/Assets/Scripts/Entities/Entity.cs | 24 +++++++++++++------ theProject/Assets/Scripts/Entities/Soldier.cs | 13 ++-------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/theProject/Assets/Scripts/Entities/Entity.cs b/theProject/Assets/Scripts/Entities/Entity.cs index 74e64ec5..2441bf8c 100644 --- a/theProject/Assets/Scripts/Entities/Entity.cs +++ b/theProject/Assets/Scripts/Entities/Entity.cs @@ -21,7 +21,6 @@ public class Entity : MonoBehaviour [HideInInspector] public UnityEvent OnDeath = new UnityEvent(); - public Team GetOwnTeam() { return myTeam; @@ -51,6 +50,18 @@ public class Entity : MonoBehaviour } } + protected virtual void Awake() + { + TickSystem.OnTick += HandleTick; + } + + protected virtual void Die() + { + TickSystem.OnTick -= HandleTick; + OnDeath.Invoke(this); + Destroy(gameObject); + } + public void SetOwnTeam(Team type) { myTeam = type; @@ -61,17 +72,16 @@ public class Entity : MonoBehaviour healthPoints -= damage; if (healthPoints <= 0) - Destroy(gameObject); + Die(); UpdateHPDisplay(); Debug.Log("I took damage, my HP is now: " + healthPoints + " noooo!!!!", gameObject); } - protected virtual void Die() - { - OnDeath.Invoke(this); - Destroy(gameObject); - } + protected virtual void HandleTick(TickSystem.OnTickEventArgs tickEventArgs) + { + + } private void OnDestroy() { diff --git a/theProject/Assets/Scripts/Entities/Soldier.cs b/theProject/Assets/Scripts/Entities/Soldier.cs index d609d74c..b43c7af4 100644 --- a/theProject/Assets/Scripts/Entities/Soldier.cs +++ b/theProject/Assets/Scripts/Entities/Soldier.cs @@ -66,19 +66,10 @@ public class Soldier : Entity else enemyType = Team.Ally; } - void Awake() - { - TickSystem.OnTick += HandleTick; - } - - protected override void Die() + protected override void HandleTick(TickSystem.OnTickEventArgs tickEventArgs) { - TickSystem.OnTick -= HandleTick; - base.Die(); - } + // base.HandleTick(tickEventArgs); - private void HandleTick(TickSystem.OnTickEventArgs tickEventArgs) - { ref Queue queueToHandle = ref interrupts; if (interrupts.Count < 1) // if no interrupt actions to do, handle regular queue queueToHandle = actions;