From 9641a62c952570e063bdfab70abc1942931daeb1 Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Tue, 24 Apr 2018 03:10:41 +0200 Subject: [PATCH] Spider WIP --- .../{spiderweb.prefab => WebBullet.prefab} | 79 +++++++++++++++---- ...rweb.prefab.meta => WebBullet.prefab.meta} | 2 +- Assets/Scripts/Bullet.cs | 4 +- Assets/Scripts/Entities/Spider.cs | 4 +- .../Entities/Enemies/spiderweb.png.meta | 2 +- 5 files changed, 69 insertions(+), 22 deletions(-) rename Assets/Prefabs/{spiderweb.prefab => WebBullet.prefab} (55%) rename Assets/Prefabs/{spiderweb.prefab.meta => WebBullet.prefab.meta} (79%) diff --git a/Assets/Prefabs/spiderweb.prefab b/Assets/Prefabs/WebBullet.prefab similarity index 55% rename from Assets/Prefabs/spiderweb.prefab rename to Assets/Prefabs/WebBullet.prefab index 859b520..4c0f388 100644 --- a/Assets/Prefabs/spiderweb.prefab +++ b/Assets/Prefabs/WebBullet.prefab @@ -9,44 +9,91 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1071733769888632} + m_RootGameObject: {fileID: 1082629833145846} m_IsPrefabParent: 1 ---- !u!1 &1071733769888632 +--- !u!1 &1082629833145846 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4718675304647300} - - component: {fileID: 212046872801749452} - - component: {fileID: 114442232749503566} - m_Layer: 0 - m_Name: spiderweb + - component: {fileID: 4022666660043440} + - component: {fileID: 212072416703762110} + - component: {fileID: 114512416576946102} + - component: {fileID: 61247279955336720} + - component: {fileID: 50567941736155414} + m_Layer: 10 + m_Name: WebBullet m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4718675304647300 +--- !u!4 &4022666660043440 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071733769888632} + m_GameObject: {fileID: 1082629833145846} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.679168, y: -1.868959, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114442232749503566 +--- !u!50 &50567941736155414 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1082629833145846} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 1 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 2 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!61 &61247279955336720 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1082629833145846} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0035692453, y: 0.022604823} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.172, y: 0.172} + newSize: {x: 10, y: 10} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.12197816, y: 0.23143363} + m_EdgeRadius: 0 +--- !u!114 &114512416576946102 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071733769888632} + m_GameObject: {fileID: 1082629833145846} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cfff064e4589e34cb5b415dcc016dc1, type: 3} @@ -55,12 +102,12 @@ MonoBehaviour: speed: 2 damage: 0 start: 0 ---- !u!212 &212046872801749452 +--- !u!212 &212072416703762110 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1071733769888632} + m_GameObject: {fileID: 1082629833145846} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -95,7 +142,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.172, y: 0.172} + m_Size: {x: 10, y: 10} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Prefabs/spiderweb.prefab.meta b/Assets/Prefabs/WebBullet.prefab.meta similarity index 79% rename from Assets/Prefabs/spiderweb.prefab.meta rename to Assets/Prefabs/WebBullet.prefab.meta index 9208fc4..d01af96 100644 --- a/Assets/Prefabs/spiderweb.prefab.meta +++ b/Assets/Prefabs/WebBullet.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a600b107772b43cd91ac8af14c9a9f1 +guid: 034397877b290c9448b855c57cecc1ab NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index 5527478..b8be59d 100644 --- a/Assets/Scripts/Bullet.cs +++ b/Assets/Scripts/Bullet.cs @@ -41,7 +41,7 @@ public class Bullet : MonoBehaviour { void OnTriggerEnter2D(Collider2D collider) { if ( ownertag == null ) return; - + if ( collider.gameObject.tag != ownertag ) { Mob m = collider.gameObject.GetComponent(typeof(Mob)) as Mob; if (m != null) { @@ -49,6 +49,6 @@ public class Bullet : MonoBehaviour { } Destroy(gameObject); } - + } } diff --git a/Assets/Scripts/Entities/Spider.cs b/Assets/Scripts/Entities/Spider.cs index 10575a3..f490a7b 100644 --- a/Assets/Scripts/Entities/Spider.cs +++ b/Assets/Scripts/Entities/Spider.cs @@ -4,7 +4,7 @@ using UnityEngine; using Assets.Scripts.Entities.Attack; namespace Assets.Scripts.Entities -{ +{ public class Spider : Enemy { [SerializeField] @@ -12,7 +12,7 @@ namespace Assets.Scripts.Entities [SerializeField] private GameObject bullet; - public Spider() : base(45) + public Spider() : base(25) { } diff --git a/Assets/graphics/textures/Entities/Enemies/spiderweb.png.meta b/Assets/graphics/textures/Entities/Enemies/spiderweb.png.meta index ffb94bf..4aa8a4f 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: 1000 + spritePixelsToUnits: 2000 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1