diff --git a/Assets/Prefabs/Spider.prefab b/Assets/Prefabs/Spider.prefab index f181d87..d4cc097 100644 --- a/Assets/Prefabs/Spider.prefab +++ b/Assets/Prefabs/Spider.prefab @@ -128,7 +128,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1427119512090924} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.847257, y: -1.1228662, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4630971220485204} @@ -175,7 +175,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 + m_Mass: 100 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 @@ -215,7 +215,7 @@ MonoBehaviour: victim: {fileID: 0} body: {fileID: 50694460188451534} bulletSpawn: {fileID: 4211621010230988} - bullet: {fileID: 1071733769888632, guid: 5a600b107772b43cd91ac8af14c9a9f1, type: 2} + bullet: {fileID: 1340970730445882, guid: 5b046158ce568b14285b9d75961bfcce, type: 2} --- !u!114 &114987943571538998 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/WebBullet.prefab b/Assets/Prefabs/WebBullet.prefab index 4c0f388..8af4025 100644 --- a/Assets/Prefabs/WebBullet.prefab +++ b/Assets/Prefabs/WebBullet.prefab @@ -9,20 +9,20 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1082629833145846} + m_RootGameObject: {fileID: 1263621144626828} m_IsPrefabParent: 1 ---- !u!1 &1082629833145846 +--- !u!1 &1263621144626828 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4022666660043440} - - component: {fileID: 212072416703762110} - - component: {fileID: 114512416576946102} - - component: {fileID: 61247279955336720} - - component: {fileID: 50567941736155414} + - component: {fileID: 4239300485283568} + - component: {fileID: 212451968521997376} + - component: {fileID: 114445497828671536} + - component: {fileID: 61950764595116984} + - component: {fileID: 50877600831589236} m_Layer: 10 m_Name: WebBullet m_TagString: Untagged @@ -30,12 +30,12 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4022666660043440 +--- !u!4 &4239300485283568 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1082629833145846} + m_GameObject: {fileID: 1263621144626828} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15, y: 0.15, z: 1} @@ -43,13 +43,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &50567941736155414 +--- !u!50 &50877600831589236 Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1082629833145846} + m_GameObject: {fileID: 1263621144626828} m_BodyType: 1 m_Simulated: 1 m_UseFullKinematicContacts: 1 @@ -63,12 +63,12 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 0 ---- !u!61 &61247279955336720 +--- !u!61 &61950764595116984 BoxCollider2D: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1082629833145846} + m_GameObject: {fileID: 1263621144626828} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -88,26 +88,26 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.12197816, y: 0.23143363} m_EdgeRadius: 0 ---- !u!114 &114512416576946102 +--- !u!114 &114445497828671536 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1082629833145846} + m_GameObject: {fileID: 1263621144626828} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cfff064e4589e34cb5b415dcc016dc1, type: 3} m_Name: m_EditorClassIdentifier: - speed: 2 + speed: 8 damage: 0 start: 0 ---- !u!212 &212072416703762110 +--- !u!212 &212451968521997376 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1082629833145846} + m_GameObject: {fileID: 1263621144626828} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 diff --git a/Assets/Scripts/Entities/Spider.cs b/Assets/Scripts/Entities/Spider.cs index f490a7b..7cb3146 100644 --- a/Assets/Scripts/Entities/Spider.cs +++ b/Assets/Scripts/Entities/Spider.cs @@ -1,24 +1,21 @@ -using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; using Assets.Scripts.Entities.Attack; -namespace Assets.Scripts.Entities -{ - public class Spider : Enemy - { +namespace Assets.Scripts.Entities { + + public class Spider : Enemy { [SerializeField] private Transform bulletSpawn; [SerializeField] private GameObject bullet; - public Spider() : base(25) - { + public Spider() : base(25) { } - protected override void Start() - { + protected override void Start() { base.Start(); SingleShot s = new SingleShot(this.gameObject); s.SetCooldown(5); diff --git a/Assets/graphics/textures/Entities/Enemies/spiderweb.png.meta b/Assets/graphics/textures/Entities/Enemies/spiderweb.png.meta index 4aa8a4f..ffb94bf 100644 --- a/Assets/graphics/textures/Entities/Enemies/spiderweb.png.meta +++ b/Assets/graphics/textures/Entities/Enemies/spiderweb.png.meta @@ -43,7 +43,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2000 + spritePixelsToUnits: 1000 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1