From 90c0e3b4314587fb3ea7b24264eabc6242d782a1 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Tue, 22 Feb 2022 00:04:15 +0300 Subject: [PATCH 1/5] IPausable added to BasicEnemies --- Assets/Scripts/AI/BasicPatrollingEnemyAI.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs b/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs index 96ab67b..93b5f92 100644 --- a/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs +++ b/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs @@ -1,9 +1,10 @@ using Movement; +using Pausable; using UnityEngine; namespace AI { - public class BasicPatrollingEnemyAI : MonoBehaviour + public class BasicPatrollingEnemyAI : MonoBehaviour, IPausable { [SerializeField] protected bool isMovingRight = false; @@ -14,6 +15,12 @@ namespace AI protected CollisionChecker leftGroundChecker = null; protected CollisionChecker rightGroundChecker = null; + #region IPausable + public bool IsPaused { get; protected set; } = false; + public virtual void Pause() => IsPaused = true; + public virtual void Resume() => IsPaused = false; + #endregion + // If moving Right, and either there's no more ground to move into or there is a wall at the Right side of the enemy OR // If moving Left, and either there's no more ground to move into or there is a wall at the Left side of the enemy @@ -33,6 +40,9 @@ namespace AI protected virtual void FixedUpdate() { + if (IsPaused) + return; + if (ShouldChangeDirection) isMovingRight = !isMovingRight; From 34d6cdb205062b9113db9e20b0ea3b6b9e3c399e Mon Sep 17 00:00:00 2001 From: Syntriax Date: Tue, 22 Feb 2022 00:07:04 +0300 Subject: [PATCH 2/5] Moved Enemies to Subfolder --- Assets/Prefabs/Enemies.meta | 8 ++++++++ .../Basic Ground Patrolling Enemy Variant.prefab | 0 .../Basic Ground Patrolling Enemy Variant.prefab.meta | 0 .../{ => Enemies}/Basic Patrolling Enemy Base.prefab | 0 .../{ => Enemies}/Basic Patrolling Enemy Base.prefab.meta | 0 .../Basic Wall Patrollling Enemy Variant.prefab | 0 .../Basic Wall Patrollling Enemy Variant.prefab.meta | 0 7 files changed, 8 insertions(+) create mode 100644 Assets/Prefabs/Enemies.meta rename Assets/Prefabs/{ => Enemies}/Basic Ground Patrolling Enemy Variant.prefab (100%) rename Assets/Prefabs/{ => Enemies}/Basic Ground Patrolling Enemy Variant.prefab.meta (100%) rename Assets/Prefabs/{ => Enemies}/Basic Patrolling Enemy Base.prefab (100%) rename Assets/Prefabs/{ => Enemies}/Basic Patrolling Enemy Base.prefab.meta (100%) rename Assets/Prefabs/{ => Enemies}/Basic Wall Patrollling Enemy Variant.prefab (100%) rename Assets/Prefabs/{ => Enemies}/Basic Wall Patrollling Enemy Variant.prefab.meta (100%) diff --git a/Assets/Prefabs/Enemies.meta b/Assets/Prefabs/Enemies.meta new file mode 100644 index 0000000..ceb891e --- /dev/null +++ b/Assets/Prefabs/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 943250fcce00b5f4cad86ca057f0728e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Basic Ground Patrolling Enemy Variant.prefab b/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab similarity index 100% rename from Assets/Prefabs/Basic Ground Patrolling Enemy Variant.prefab rename to Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab diff --git a/Assets/Prefabs/Basic Ground Patrolling Enemy Variant.prefab.meta b/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/Basic Ground Patrolling Enemy Variant.prefab.meta rename to Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab.meta diff --git a/Assets/Prefabs/Basic Patrolling Enemy Base.prefab b/Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab similarity index 100% rename from Assets/Prefabs/Basic Patrolling Enemy Base.prefab rename to Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab diff --git a/Assets/Prefabs/Basic Patrolling Enemy Base.prefab.meta b/Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab.meta similarity index 100% rename from Assets/Prefabs/Basic Patrolling Enemy Base.prefab.meta rename to Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab.meta diff --git a/Assets/Prefabs/Basic Wall Patrollling Enemy Variant.prefab b/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab similarity index 100% rename from Assets/Prefabs/Basic Wall Patrollling Enemy Variant.prefab rename to Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab diff --git a/Assets/Prefabs/Basic Wall Patrollling Enemy Variant.prefab.meta b/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/Basic Wall Patrollling Enemy Variant.prefab.meta rename to Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab.meta From cbcb05b845d6a2ca7ae0c96df3aeff6670672178 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Tue, 22 Feb 2022 00:07:56 +0300 Subject: [PATCH 3/5] Scene Update --- Assets/Scenes/SyntriaxDevScene.unity | 236 ++++++++++++++++++++++++--- 1 file changed, 209 insertions(+), 27 deletions(-) diff --git a/Assets/Scenes/SyntriaxDevScene.unity b/Assets/Scenes/SyntriaxDevScene.unity index 8ddb132..8f53919 100644 --- a/Assets/Scenes/SyntriaxDevScene.unity +++ b/Assets/Scenes/SyntriaxDevScene.unity @@ -338,7 +338,140 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &357674433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 357674437} + - component: {fileID: 357674436} + - component: {fileID: 357674435} + - component: {fileID: 357674434} + m_Layer: 0 + m_Name: Square (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!50 &357674434 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357674433} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &357674435 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357674433} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &357674436 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357674433} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.122641504, g: 0.122641504, b: 0.122641504, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &357674437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357674433} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.87, y: 0.13, z: 0} + m_LocalScale: {x: 1.474375, y: 6.8624997, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1050669381 GameObject: @@ -471,70 +604,119 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &7535556967068246786 +--- !u!1001 &460717883556177900 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalPosition.x - value: 2.52 + value: -5.25 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalPosition.y value: 0.684 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7155506815360630270, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.y - value: -0.85 - objectReference: {fileID: 0} - - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 6987122029433902684, guid: 10633caf39c49d94c9f68742db900612, type: 3} propertyPath: m_Name - value: BasicPatrollingEnemy - objectReference: {fileID: 0} - - target: {fileID: 8757415820976640968, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.y - value: -0.85 + value: Basic Wall Patrollling Enemy objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 10633caf39c49d94c9f68742db900612, type: 3} +--- !u!1001 &4326196685719399157 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3605663502554574831, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_Name + value: Basic Ground Patrolling Enemy + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalPosition.x + value: 2.52 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalPosition.y + value: 0.684 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} From 6e7a90fd86709afecc260cdc11b8448db2e4c8a5 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Tue, 22 Feb 2022 00:47:26 +0300 Subject: [PATCH 4/5] Merged Wall and Ground Enemies into One --- ...sic Ground Patrolling Enemy Variant.prefab | 76 ------------- ...round Patrolling Enemy Variant.prefab.meta | 7 -- ...e.prefab => Basic Patrolling Enemy.prefab} | 18 ++- ...eta => Basic Patrolling Enemy.prefab.meta} | 0 ...asic Wall Patrollling Enemy Variant.prefab | 104 ------------------ ...Wall Patrollling Enemy Variant.prefab.meta | 7 -- Assets/Scripts/AI/BasicPatrollingEnemyAI.cs | 2 +- Assets/Scripts/Movement/EnemyMovement.cs | 14 ++- .../Scripts/Movement/EnemyVerticalMovement.cs | 29 ----- .../Movement/EnemyVerticalMovement.cs.meta | 11 -- Assets/Scripts/Player/PlayerController.cs | 6 +- UserSettings/EditorUserSettings.asset | 4 +- 12 files changed, 32 insertions(+), 246 deletions(-) delete mode 100644 Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab delete mode 100644 Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab.meta rename Assets/Prefabs/Enemies/{Basic Patrolling Enemy Base.prefab => Basic Patrolling Enemy.prefab} (96%) rename Assets/Prefabs/Enemies/{Basic Patrolling Enemy Base.prefab.meta => Basic Patrolling Enemy.prefab.meta} (100%) delete mode 100644 Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab delete mode 100644 Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab.meta delete mode 100644 Assets/Scripts/Movement/EnemyVerticalMovement.cs delete mode 100644 Assets/Scripts/Movement/EnemyVerticalMovement.cs.meta diff --git a/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab b/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab deleted file mode 100644 index 13e377b..0000000 --- a/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab +++ /dev/null @@ -1,76 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6096204647932119543 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.x - value: 2.52 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.y - value: 0.684 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_Name - value: Basic Ground Patrolling Enemy - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} ---- !u!1 &3605663502554574831 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - m_PrefabInstance: {fileID: 6096204647932119543} - m_PrefabAsset: {fileID: 0} ---- !u!114 &7978713 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3605663502554574831} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ae10931055aaa44d8c518e9efa3d034, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab.meta b/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab.meta deleted file mode 100644 index 5d5cd66..0000000 --- a/Assets/Prefabs/Enemies/Basic Ground Patrolling Enemy Variant.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1bf2cdb83af1d714ab363c6c4d1d140e -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab b/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab similarity index 96% rename from Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab rename to Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab index bdcf32f..4daa3c0 100644 --- a/Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab +++ b/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab @@ -79,6 +79,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} m_Name: m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294967103 --- !u!1 &5991452379241120368 GameObject: m_ObjectHideFlags: 0 @@ -123,6 +126,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} m_Name: m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294967103 --- !u!1 &7391517555913877016 GameObject: m_ObjectHideFlags: 0 @@ -137,7 +143,7 @@ GameObject: - component: {fileID: 1030411162175245191} - component: {fileID: 8503951513957676288} m_Layer: 7 - m_Name: Basic Patrolling Enemy Base + m_Name: Basic Patrolling Enemy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -297,7 +303,7 @@ Transform: m_GameObject: {fileID: 7883981671222168568} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.75, z: 1} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 334282908223700766} @@ -315,6 +321,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} m_Name: m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294967231 --- !u!1 &7984300476647789986 GameObject: m_ObjectHideFlags: 0 @@ -341,7 +350,7 @@ Transform: m_GameObject: {fileID: 7984300476647789986} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.75, z: 1} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 334282908223700766} @@ -359,3 +368,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} m_Name: m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294967231 diff --git a/Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab.meta b/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab.meta similarity index 100% rename from Assets/Prefabs/Enemies/Basic Patrolling Enemy Base.prefab.meta rename to Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab.meta diff --git a/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab b/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab deleted file mode 100644 index a6dae08..0000000 --- a/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab +++ /dev/null @@ -1,104 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &460717884008149060 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 334282908223700766, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 334282908223700766, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 334282908223700766, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3171748321895642525, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalScale.x - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 3171748321895642525, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.x - value: -5.25 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.y - value: 0.684 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_Name - value: Basic Wall Patrollling Enemy - objectReference: {fileID: 0} - - target: {fileID: 7648712865646313035, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalScale.x - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 7648712865646313035, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} ---- !u!1 &6987122029433902684 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - m_PrefabInstance: {fileID: 460717884008149060} - m_PrefabAsset: {fileID: 0} ---- !u!114 &286786288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6987122029433902684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adfb41bcf8c09e94ea1e95e22a4c7533, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab.meta b/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab.meta deleted file mode 100644 index 801155f..0000000 --- a/Assets/Prefabs/Enemies/Basic Wall Patrollling Enemy Variant.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 10633caf39c49d94c9f68742db900612 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs b/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs index 93b5f92..6339552 100644 --- a/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs +++ b/Assets/Scripts/AI/BasicPatrollingEnemyAI.cs @@ -31,7 +31,7 @@ namespace AI protected virtual void Awake() { - movement = gameObject.GetComponent(); + movement = gameObject.AddComponent(); leftWallChecker = GetCollisionCheckerOnChild("Collision Checkers/Left Wall"); rightWallChecker = GetCollisionCheckerOnChild("Collision Checkers/Right Wall"); leftGroundChecker = GetCollisionCheckerOnChild("Collision Checkers/Left Ground"); diff --git a/Assets/Scripts/Movement/EnemyMovement.cs b/Assets/Scripts/Movement/EnemyMovement.cs index 0390d9a..b2adcef 100644 --- a/Assets/Scripts/Movement/EnemyMovement.cs +++ b/Assets/Scripts/Movement/EnemyMovement.cs @@ -6,6 +6,7 @@ namespace Movement public class EnemyMovement : MonoBehaviour, IMovement { protected Rigidbody2D _rigidbody2D = null; + protected Vector2 gravityForce = Vector2.down; protected bool _isPaused = false; protected float moveValue = 0f; @@ -13,16 +14,23 @@ namespace Movement public bool IsPaused => _isPaused; protected virtual void Awake() - => _rigidbody2D = GetComponent(); + { + _rigidbody2D = GetComponent(); + + _rigidbody2D.gravityScale = 0f; + gravityForce *= -Physics2D.gravity.y * _rigidbody2D.mass; + } protected virtual void FixedUpdate() { + _rigidbody2D.AddRelativeForce(gravityForce); + if (IsPaused) return; - Vector2 velocity = _rigidbody2D.velocity; + Vector2 velocity = transform.InverseTransformDirection(_rigidbody2D.velocity); velocity.x = moveValue; - _rigidbody2D.velocity = velocity; + _rigidbody2D.velocity = transform.TransformDirection(velocity); } public void Move(float value) diff --git a/Assets/Scripts/Movement/EnemyVerticalMovement.cs b/Assets/Scripts/Movement/EnemyVerticalMovement.cs deleted file mode 100644 index 2b9c65c..0000000 --- a/Assets/Scripts/Movement/EnemyVerticalMovement.cs +++ /dev/null @@ -1,29 +0,0 @@ -using UnityEngine; - -namespace Movement -{ - public class EnemyVerticalMovement : EnemyMovement - { - protected Vector2 gravityForce = Vector2.right; - - protected override void Awake() - { - base.Awake(); - - _rigidbody2D.gravityScale = 0f; - gravityForce *= -Physics2D.gravity.y * _rigidbody2D.mass; - } - - protected override void FixedUpdate() - { - _rigidbody2D.AddRelativeForce(gravityForce); - - if (IsPaused) - return; - - Vector2 velocity = _rigidbody2D.velocity; - velocity.y = moveValue; - _rigidbody2D.velocity = velocity; - } - } -} diff --git a/Assets/Scripts/Movement/EnemyVerticalMovement.cs.meta b/Assets/Scripts/Movement/EnemyVerticalMovement.cs.meta deleted file mode 100644 index f7128ca..0000000 --- a/Assets/Scripts/Movement/EnemyVerticalMovement.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: adfb41bcf8c09e94ea1e95e22a4c7533 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index f2d3ba6..060b27e 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -7,10 +7,10 @@ namespace Player { public class PlayerController : MonoBehaviour, IMovement, Input.PlayerInput.IPlayerControlActions { - private const float DefaultJumpForce = 1200.0f; + private const float DefaultJumpForce = 784.0f; private const float DefaultMass = 80.0f; private const float DefaultSpeed = 500.0f; - private const float GravityScale = 3.0f; + private const float GravityScale = 1.0f; private Input.PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; @@ -139,4 +139,4 @@ namespace Player } } } -} \ No newline at end of file +} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index daa06bb..16ee60a 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-1: - value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e + value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d flags: 0 RecentlyUsedSceneGuid-2: - value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e flags: 0 vcSharedLogLevel: value: 0d5e400f0650 From 860847e11a0c84a9d8ea34f5f0048aa1929f850a Mon Sep 17 00:00:00 2001 From: Syntriax Date: Tue, 22 Feb 2022 00:48:10 +0300 Subject: [PATCH 5/5] Scene Update --- Assets/Scenes/SyntriaxDevScene.unity | 377 +++++++++++++++++++++++---- 1 file changed, 331 insertions(+), 46 deletions(-) diff --git a/Assets/Scenes/SyntriaxDevScene.unity b/Assets/Scenes/SyntriaxDevScene.unity index 8f53919..31e5249 100644 --- a/Assets/Scenes/SyntriaxDevScene.unity +++ b/Assets/Scenes/SyntriaxDevScene.unity @@ -207,6 +207,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &91900792 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: 6.56 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} --- !u!1 &94080043 GameObject: m_ObjectHideFlags: 0 @@ -338,7 +395,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &357674433 GameObject: @@ -471,8 +528,122 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &483478934 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -1.76 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 1.47 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710784 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: -0.70710576 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} +--- !u!1001 &754719513 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: 5.78 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: -2.9 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} --- !u!1 &1050669381 GameObject: m_ObjectHideFlags: 0 @@ -604,119 +775,233 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &460717883556177900 +--- !u!1001 &1225960477 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.x - value: -5.25 + value: 2.25 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.y - value: 0.684 + value: 0.34 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6987122029433902684, guid: 10633caf39c49d94c9f68742db900612, type: 3} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_Name - value: Basic Wall Patrollling Enemy + value: Basic Patrolling Enemy objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 10633caf39c49d94c9f68742db900612, type: 3} ---- !u!1001 &4326196685719399157 + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} +--- !u!1001 &1257112108 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3605663502554574831, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_Name - value: Basic Ground Patrolling Enemy - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_RootOrder - value: 1 + value: 10 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.x - value: 2.52 + value: -1.76 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.y - value: 0.684 + value: -1.03 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.70710784 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0.70710576 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (6) objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} +--- !u!1001 &1672397638 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: 9.49 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 0.17 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710784 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: -0.70710576 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} +--- !u!1001 &1824607853 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -5.85 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 0.22 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3}