stash

BamdaXP · Jun 2, 2018 · f161098 · f161098
1 parent 4551b28
commit f161098
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/Assets/Prefab/Burst.prefab b/Assets/Prefab/Burst.prefab
@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 199829437167648494}
   m_Layer: 0
   m_Name: Burst
-  m_TagString: Untagged
+  m_TagString: Finish
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3468,7 +3468,7 @@ ParticleSystemRenderer:
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
   m_Materials:
-  - {fileID: 2100000, guid: 6a0b8ceea79f4bc4eb609e0d2faad0e7, type: 2}
+  - {fileID: 2100000, guid: fa414bd2ed9660243abf3a6bd17278d5, type: 2}
   - {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0}
   m_StaticBatchInfo:
     firstSubMesh: 0

diff --git a/Assets/Prefab/bolt1.prefab b/Assets/Prefab/bolt1.prefab
@@ -99,7 +99,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 71641d0ab42bd8549a1afafd80115e56, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: 2
+  speed: 5
   bolt: {fileID: 1792286213549994}
 --- !u!212 &212247936395739292
 SpriteRenderer:

diff --git a/Assets/Prefab/bolt2.prefab b/Assets/Prefab/bolt2.prefab
@@ -99,7 +99,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe1343e84d751ff4c97f9a35ea752de5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: 2
+  speed: 5
   bolt: {fileID: 1117568571980576}
   followed: {fileID: 1008808217579820, guid: a95c4d2709ff1cf46a29884aa8bafa9e, type: 2}
   followrate: 2

diff --git a/Assets/Prefab/enermy1.prefab b/Assets/Prefab/enermy1.prefab
@@ -25,7 +25,7 @@ GameObject:
   - component: {fileID: 114791651332885758}
   m_Layer: 0
   m_Name: enermy1
-  m_TagString: Untagged
+  m_TagString: Enermy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -79,7 +79,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.28, y: 1.28}
+    oldSize: {x: 1.1, y: 1.21}
     newSize: {x: 1.28, y: 1.28}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -99,12 +99,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4402e9e24e8454a47a1450be9f350210, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  startPos: {x: 0, y: 0}
   enermy: {fileID: 1855769699100266}
   speed: 1
+  Rb: {fileID: 0}
   bolt: {fileID: 1792286213549994, guid: aad31f3d8d720af44a64216ef0d0acb5, type: 2}
   shotWait: 3
   hasfire: 0
+  mat: {fileID: 1102606688194386, guid: 10147b3af3101424686d45f9768f95a9, type: 2}
 --- !u!212 &212039222355661708
 SpriteRenderer:
   m_ObjectHideFlags: 1
@@ -139,7 +140,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 28b41fef228d6814f90e541deaf9f262, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d67b273a46d77a84f88216691fdd5545, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

diff --git a/Assets/Prefab/enermy2.prefab b/Assets/Prefab/enermy2.prefab
@@ -79,7 +79,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.28, y: 1.28}
+    oldSize: {x: 1.1, y: 1.21}
     newSize: {x: 1.28, y: 1.28}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -99,12 +99,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4402e9e24e8454a47a1450be9f350210, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  startPos: {x: 0, y: 0}
   enermy: {fileID: 1127135953884376}
   speed: 1
+  Rb: {fileID: 0}
   bolt: {fileID: 1792286213549994, guid: aad31f3d8d720af44a64216ef0d0acb5, type: 2}
   shotWait: 3
   hasfire: 1
+  mat: {fileID: 1102606688194386, guid: 10147b3af3101424686d45f9768f95a9, type: 2}
 --- !u!212 &212144794223677294
 SpriteRenderer:
   m_ObjectHideFlags: 1
@@ -139,7 +140,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 28b41fef228d6814f90e541deaf9f262, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d67b273a46d77a84f88216691fdd5545, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

diff --git a/Assets/Prefab/enermy3.prefab b/Assets/Prefab/enermy3.prefab
@@ -79,7 +79,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.28, y: 1.28}
+    oldSize: {x: 1.1, y: 1.21}
     newSize: {x: 1.28, y: 1.28}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -99,12 +99,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4402e9e24e8454a47a1450be9f350210, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  startPos: {x: 0, y: 0}
   enermy: {fileID: 1155679713599444}
   speed: 1
+  Rb: {fileID: 0}
   bolt: {fileID: 1117568571980576, guid: e99ae206008d6a84383320e707ba114c, type: 2}
   shotWait: 3
   hasfire: 1
+  mat: {fileID: 1102606688194386, guid: 10147b3af3101424686d45f9768f95a9, type: 2}
 --- !u!212 &212036462010338612
 SpriteRenderer:
   m_ObjectHideFlags: 1
@@ -139,7 +140,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 28b41fef228d6814f90e541deaf9f262, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d67b273a46d77a84f88216691fdd5545, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

diff --git a/Assets/Scripts/enermyController.cs b/Assets/Scripts/enermyController.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class enermyController : MonoBehaviour {
+public class enemyController : MonoBehaviour {
     //public Vector2 startPos;
-    public GameObject enermy;
+    public GameObject enemy;
     public float speed;
     Rigidbody2D Rb;
     public GameObject bolt;
@@ -13,7 +13,7 @@ public class enermyController : MonoBehaviour {
     public GameObject mat;
     // Use this for initialization
     void Start () {
-        Rb = enermy.GetComponent<Rigidbody2D>();
+        Rb = enemy.GetComponent<Rigidbody2D>();
         //Rb.position = startPos;
         Rb.velocity = speed*new Vector2(0,-1);
         if(hasfire==1)StartCoroutine(Fire());