From 1b14b6c633ec00d7e9fb1da914c1737b00ed7690 Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Tue, 24 Apr 2018 03:45:59 +0200 Subject: [PATCH] Spider works now --- Assets/Prefabs/Spider.prefab | 2 +- Assets/Prefabs/WebBullet.prefab | 4 ++-- Assets/Scenes/CodeDEV.unity | 2 +- Assets/Scripts/Entities/Spider.cs | 3 +-- Assets/Scripts/Generation/DungeonGenerator.cs | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Assets/Prefabs/Spider.prefab b/Assets/Prefabs/Spider.prefab index d4cc097..1e70bd9 100644 --- a/Assets/Prefabs/Spider.prefab +++ b/Assets/Prefabs/Spider.prefab @@ -215,7 +215,7 @@ MonoBehaviour: victim: {fileID: 0} body: {fileID: 50694460188451534} bulletSpawn: {fileID: 4211621010230988} - bullet: {fileID: 1340970730445882, guid: 5b046158ce568b14285b9d75961bfcce, type: 2} + bullet: {fileID: 1263621144626828, guid: 034397877b290c9448b855c57cecc1ab, type: 2} --- !u!114 &114987943571538998 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/WebBullet.prefab b/Assets/Prefabs/WebBullet.prefab index 8af4025..9735e8e 100644 --- a/Assets/Prefabs/WebBullet.prefab +++ b/Assets/Prefabs/WebBullet.prefab @@ -38,7 +38,7 @@ Transform: 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} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -99,7 +99,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cfff064e4589e34cb5b415dcc016dc1, type: 3} m_Name: m_EditorClassIdentifier: - speed: 8 + speed: 3 damage: 0 start: 0 --- !u!212 &212451968521997376 diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 3cdd015..11d5854 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -1543,7 +1543,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 39.433407 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} diff --git a/Assets/Scripts/Entities/Spider.cs b/Assets/Scripts/Entities/Spider.cs index 7cb3146..ae738a5 100644 --- a/Assets/Scripts/Entities/Spider.cs +++ b/Assets/Scripts/Entities/Spider.cs @@ -17,8 +17,7 @@ namespace Assets.Scripts.Entities { protected override void Start() { base.Start(); - SingleShot s = new SingleShot(this.gameObject); - s.SetCooldown(5); + SingleShot s = new SingleShot(this.gameObject, 25, 4, 2); s.SetPrefab(bullet); s.SetSpawn(bulletSpawn); SetAttack(s); diff --git a/Assets/Scripts/Generation/DungeonGenerator.cs b/Assets/Scripts/Generation/DungeonGenerator.cs index 37ffd88..d781a1f 100644 --- a/Assets/Scripts/Generation/DungeonGenerator.cs +++ b/Assets/Scripts/Generation/DungeonGenerator.cs @@ -453,7 +453,7 @@ public class DungeonGenerator { Objective o = null; int rand = UnityEngine.Random.Range(0, 7); - switch (rand) { + switch (6) { case 0: case 1: { // Scorpion Attack!!!!: