summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs25
-rw-r--r--AlienSurvival/Assets/Scripts/Test/TestMirror.cs4
-rw-r--r--AlienSurvival/Assets/Scripts/Test/TestSeperator.cs8
-rw-r--r--AlienSurvival/Assets/WorkArt/Effect/Free Pixel Effects Pack/Free Pixel Effects Pack.unity365
-rw-r--r--AlienSurvival/ProjectSettings/TagManager.asset1
5 files changed, 141 insertions, 262 deletions
diff --git a/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs b/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs
index d5d0476..17d0005 100644
--- a/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs
+++ b/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs
@@ -15,7 +15,10 @@ public class TestBeamBullet : MonoBehaviour
void Dead()
{
- GameObject.Destroy(this.gameObject);
+ if (this.gameObject)
+ {
+ GameObject.Destroy(this.gameObject);
+ }
}
// Update is called once per frame
@@ -28,25 +31,21 @@ public class TestBeamBullet : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
- GameObject go = collision.attachedRigidbody.gameObject;
+ GameObject go = collision.gameObject;
- if(go.CompareTag("device"))
+ if (!go.CompareTag("enemy"))
{
return;
}
+
+ GameObject.Destroy( collision.gameObject);
- if(go.CompareTag("bullet"))
+ //this.gameObject.SetActive(false);
+
+ if (this.gameObject)
{
- return;
+ GameObject.Destroy(this.gameObject);
}
-
- //Debug.Log("hit");
-
- GameObject.Destroy( collision.attachedRigidbody.gameObject);
-
- this.gameObject.SetActive(false);
-
- GameObject.Destroy(this.gameObject);
}
}
diff --git a/AlienSurvival/Assets/Scripts/Test/TestMirror.cs b/AlienSurvival/Assets/Scripts/Test/TestMirror.cs
index 25ea3db..832c785 100644
--- a/AlienSurvival/Assets/Scripts/Test/TestMirror.cs
+++ b/AlienSurvival/Assets/Scripts/Test/TestMirror.cs
@@ -8,7 +8,7 @@ public class TestMirror : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
- GameObject go = collision.attachedRigidbody.gameObject;
+ GameObject go = collision.gameObject;
if (go && go.CompareTag("bullet") && !m_Mirrored.Contains(go))
{
//Debug.Log("mirror");
@@ -21,7 +21,7 @@ public class TestMirror : MonoBehaviour
private void OnTriggerExit2D(Collider2D collision)
{
- GameObject go = collision.attachedRigidbody.gameObject;
+ GameObject go = collision.gameObject;
if (go && go.CompareTag("bullet") && m_Mirrored.Contains(go))
{
m_Mirrored.Remove(go);
diff --git a/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs b/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs
index 4f96379..d1819c0 100644
--- a/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs
+++ b/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs
@@ -8,16 +8,20 @@ public class TestSeperator : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
- GameObject go = collision.attachedRigidbody.gameObject;
+ GameObject go = collision.gameObject;
if (go && go.CompareTag("bullet") && !m_Seperated.Contains(go))
{
//Debug.Log("seperate");
TestBeamBullet bullet1 = TestBeamBullet.Instantiate(go.GetComponent<TestBeamBullet>());
bullet1.direction = Quaternion.Euler(0,0, 30) * bullet1.direction;
+ bullet1.enabled = true;
+ bullet1.gameObject.SetActive(true);
TestBeamBullet bullet2 = TestBeamBullet.Instantiate(go.GetComponent<TestBeamBullet>());
bullet2.direction = Quaternion.Euler(0, 0, -30) * bullet2.direction;
+ bullet2.enabled = true;
+ bullet2.gameObject.SetActive(true);
m_Seperated.Add(go);
m_Seperated.Add(bullet1.gameObject);
@@ -27,7 +31,7 @@ public class TestSeperator : MonoBehaviour
private void OnTriggerExit2D(Collider2D collision)
{
- GameObject go = collision.attachedRigidbody.gameObject;
+ GameObject go = collision.gameObject;
if (go.CompareTag("bullet") && m_Seperated.Contains(go))
{
m_Seperated.Remove(go);
diff --git a/AlienSurvival/Assets/WorkArt/Effect/Free Pixel Effects Pack/Free Pixel Effects Pack.unity b/AlienSurvival/Assets/WorkArt/Effect/Free Pixel Effects Pack/Free Pixel Effects Pack.unity
index 80d16f5..d30f47b 100644
--- a/AlienSurvival/Assets/WorkArt/Effect/Free Pixel Effects Pack/Free Pixel Effects Pack.unity
+++ b/AlienSurvival/Assets/WorkArt/Effect/Free Pixel Effects Pack/Free Pixel Effects Pack.unity
@@ -139,7 +139,7 @@ GameObject:
- component: {fileID: 11165155}
m_Layer: 0
m_Name: ghost_0 (17)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -421,7 +421,7 @@ GameObject:
- component: {fileID: 75672330}
m_Layer: 0
m_Name: ghost_0 (24)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -576,7 +576,7 @@ GameObject:
- component: {fileID: 77015424}
m_Layer: 0
m_Name: ghost_0 (35)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -801,7 +801,7 @@ GameObject:
- component: {fileID: 84783792}
m_Layer: 0
m_Name: ghost_0 (32)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -1122,7 +1122,7 @@ Transform:
m_LocalScale: {x: 2.1694756, y: 2.1694756, z: 2.1694756}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &235571242
GameObject:
@@ -1242,7 +1242,7 @@ GameObject:
- component: {fileID: 341190812}
m_Layer: 0
m_Name: ghost_0 (34)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -1397,7 +1397,7 @@ GameObject:
- component: {fileID: 398982079}
m_Layer: 0
m_Name: ghost_0 (4)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -1550,7 +1550,7 @@ GameObject:
- component: {fileID: 403465539}
m_Layer: 0
m_Name: mirror (1)
- m_TagString: Untagged
+ m_TagString: device
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -1651,12 +1651,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 403465538}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.5572045, y: -0.33, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 22
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &412476816
GameObject:
@@ -1738,7 +1738,7 @@ Transform:
m_LocalScale: {x: 2.1720412, y: 2.1720412, z: 2.1720412}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &427029621
GameObject:
@@ -1892,7 +1892,7 @@ GameObject:
- component: {fileID: 453426458}
m_Layer: 0
m_Name: ghost_0 (22)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2156,12 +2156,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 456852435}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.085, y: -0.612, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 18
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &519420028
GameObject:
@@ -2398,7 +2398,7 @@ GameObject:
- component: {fileID: 546030741}
m_Layer: 0
m_Name: ghost_0 (25)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2689,7 +2689,7 @@ GameObject:
- component: {fileID: 587821939}
m_Layer: 0
m_Name: ghost_0 (37)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2844,7 +2844,7 @@ GameObject:
- component: {fileID: 624536592}
m_Layer: 0
m_Name: ghost_0 (39)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -3096,12 +3096,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 639606222}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.703, y: 0.065, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 17
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &639606226
MonoBehaviour:
@@ -3299,6 +3299,45 @@ Transform:
m_Father: {fileID: 35232772}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &678828981
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 678828982}
+ m_Layer: 0
+ m_Name: Devices
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &678828982
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 678828981}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 639606225}
+ - {fileID: 456852439}
+ - {fileID: 1592177849}
+ - {fileID: 902267588}
+ - {fileID: 2096865677}
+ - {fileID: 403465542}
+ - {fileID: 2091712802}
+ - {fileID: 772608447}
+ - {fileID: 1072077281}
+ m_Father: {fileID: 0}
+ m_RootOrder: 13
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &716704685
GameObject:
m_ObjectHideFlags: 0
@@ -3315,7 +3354,7 @@ GameObject:
- component: {fileID: 716704687}
m_Layer: 0
m_Name: ghost_0 (30)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -3469,7 +3508,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &768547865
Transform:
m_ObjectHideFlags: 0
@@ -3496,7 +3535,7 @@ GameObject:
- component: {fileID: 772608446}
- component: {fileID: 772608445}
m_Layer: 0
- m_Name: beamgun
+ m_Name: Beamgun
m_TagString: device
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -3575,14 +3614,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 772608444}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.086, y: 0.63, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 768547865}
- {fileID: 1756638756}
- m_Father: {fileID: 0}
- m_RootOrder: 16
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &781416430
GameObject:
@@ -3600,7 +3639,7 @@ GameObject:
- component: {fileID: 781416432}
m_Layer: 0
m_Name: ghost_0 (13)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -3755,7 +3794,7 @@ GameObject:
- component: {fileID: 794219539}
m_Layer: 0
m_Name: ghost_0 (1)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -3910,7 +3949,7 @@ GameObject:
- component: {fileID: 794814490}
m_Layer: 0
m_Name: ghost_0 (26)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -4065,7 +4104,7 @@ GameObject:
- component: {fileID: 797557395}
m_Layer: 0
m_Name: ghost_0 (9)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -4220,7 +4259,7 @@ GameObject:
- component: {fileID: 800534035}
m_Layer: 0
m_Name: ghost_0 (33)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -4375,7 +4414,7 @@ GameObject:
- component: {fileID: 820385629}
m_Layer: 0
m_Name: ghost_0 (31)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -4530,7 +4569,7 @@ GameObject:
- component: {fileID: 854903942}
m_Layer: 0
m_Name: ghost_0 (7)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -4896,12 +4935,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 902267584}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.063, y: 0.69, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 20
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &937365270
GameObject:
@@ -4919,7 +4958,7 @@ GameObject:
- component: {fileID: 937365272}
m_Layer: 0
m_Name: ghost_0 (29)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5074,7 +5113,7 @@ GameObject:
- component: {fileID: 960975849}
m_Layer: 0
m_Name: ghost_0 (27)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5229,7 +5268,7 @@ GameObject:
- component: {fileID: 982947859}
m_Layer: 0
m_Name: ghost_0 (21)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5486,7 +5525,7 @@ GameObject:
- component: {fileID: 1001940807}
m_Layer: 0
m_Name: ghost_0 (6)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5641,7 +5680,7 @@ GameObject:
- component: {fileID: 1018099986}
m_Layer: 0
m_Name: ghost_0 (5)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5898,7 +5937,7 @@ GameObject:
- component: {fileID: 1057210768}
m_Layer: 0
m_Name: ghost_0 (12)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -6198,14 +6237,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1072077279}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.15, y: -0.191, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2092713402}
- {fileID: 578060770}
- m_Father: {fileID: 0}
- m_RootOrder: 13
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!58 &1072077282
CircleCollider2D:
@@ -6286,7 +6325,7 @@ GameObject:
- component: {fileID: 1088296192}
m_Layer: 0
m_Name: ghost_0 (15)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -6441,7 +6480,7 @@ GameObject:
- component: {fileID: 1157203631}
m_Layer: 0
m_Name: ghost_0 (14)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -6610,7 +6649,7 @@ Transform:
- {fileID: 427029623}
- {fileID: 81146440}
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1158159094
GameObject:
@@ -6719,7 +6758,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1238302289
GameObject:
@@ -6839,7 +6878,7 @@ GameObject:
- component: {fileID: 1253960367}
m_Layer: 0
m_Name: ghost_0 (11)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -7010,7 +7049,7 @@ Transform:
- {fileID: 1698379817}
- {fileID: 651426478}
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1255085888
BoxCollider2D:
@@ -7156,7 +7195,7 @@ GameObject:
- component: {fileID: 1281790526}
m_Layer: 0
m_Name: ghost_0 (18)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -7393,7 +7432,7 @@ GameObject:
- component: {fileID: 1389661577}
m_Layer: 0
m_Name: ghost_0 (23)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -7752,7 +7791,7 @@ GameObject:
- component: {fileID: 1574212811}
m_Layer: 0
m_Name: ghost_0 (28)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -8016,12 +8055,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1592177845}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.063, y: 0.057, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 19
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1598236263
GameObject:
@@ -8141,7 +8180,7 @@ GameObject:
- component: {fileID: 1613187176}
m_Layer: 0
m_Name: ghost_0 (36)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -8296,7 +8335,7 @@ GameObject:
- component: {fileID: 1614048787}
m_Layer: 0
m_Name: ghost_0 (20)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -8615,7 +8654,7 @@ GameObject:
- component: {fileID: 1721530138}
m_Layer: 0
m_Name: ghost_0 (10)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -8770,7 +8809,7 @@ GameObject:
- component: {fileID: 1725520100}
m_Layer: 0
m_Name: ghost_0 (19)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -9227,7 +9266,7 @@ Transform:
m_LocalScale: {x: 2.1704, y: 2.1704, z: 2.1704}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1810337056
GameObject:
@@ -9245,7 +9284,7 @@ GameObject:
- component: {fileID: 1810337062}
m_Layer: 0
m_Name: ghost_0 (2)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -9600,7 +9639,7 @@ Transform:
m_LocalScale: {x: 2.1721861, y: 2.1721861, z: 2.1721861}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!1 &1867850036
GameObject:
@@ -9618,7 +9657,7 @@ GameObject:
- component: {fileID: 1867850038}
m_Layer: 0
m_Name: ghost_0 (38)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -9859,88 +9898,6 @@ Transform:
m_Father: {fileID: 35232772}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1897553750
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1897553752}
- - component: {fileID: 1897553751}
- m_Layer: 0
- m_Name: teleglitch
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!212 &1897553751
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1897553750}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- 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: -119
- m_Sprite: {fileID: 21300000, guid: 46946497a246d474c852333efd5eb244, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 19.2, y: 10.8}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!4 &1897553752
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1897553750}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.503, y: -0.0671, z: 0}
- m_LocalScale: {x: 0.6677, y: 0.6677, z: 0.6677}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1904226949
GameObject:
m_ObjectHideFlags: 0
@@ -10043,88 +10000,6 @@ Transform:
m_Father: {fileID: 35232772}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1910869949
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1910869951}
- - component: {fileID: 1910869950}
- m_Layer: 0
- m_Name: teleglitch2
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!212 &1910869950
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1910869949}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- 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: 21300000, guid: c1f7a7c11b29b9249bf5dff70f10cc7b, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 6.39, y: 3.61}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!4 &1910869951
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1910869949}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.1, y: 0.25, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 6
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2034437644
GameObject:
m_ObjectHideFlags: 0
@@ -10156,7 +10031,7 @@ Transform:
- {fileID: 1680793117}
- {fileID: 2117150069}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2083261652
GameObject:
@@ -10174,7 +10049,7 @@ GameObject:
- component: {fileID: 2083261654}
m_Layer: 0
m_Name: ghost_0 (8)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -10329,7 +10204,7 @@ GameObject:
- component: {fileID: 2091186795}
m_Layer: 0
m_Name: ghost_0
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -10482,7 +10357,7 @@ GameObject:
- component: {fileID: 2091712799}
m_Layer: 0
m_Name: mirror (2)
- m_TagString: Untagged
+ m_TagString: device
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -10583,12 +10458,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2091712798}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.5572045, y: 0.691, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 23
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2092713401
GameObject:
@@ -10605,7 +10480,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &2092713402
Transform:
m_ObjectHideFlags: 0
@@ -10634,7 +10509,7 @@ GameObject:
- component: {fileID: 2096865678}
m_Layer: 0
m_Name: mirror
- m_TagString: Untagged
+ m_TagString: device
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -10723,12 +10598,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2096865674}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.5572045, y: -1.303, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 21
+ m_Father: {fileID: 678828982}
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2096865678
MonoBehaviour:
@@ -10840,7 +10715,7 @@ GameObject:
- component: {fileID: 2123741954}
m_Layer: 0
m_Name: ghost_0 (3)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -10995,7 +10870,7 @@ GameObject:
- component: {fileID: 2127247710}
m_Layer: 0
m_Name: ghost_0 (16)
- m_TagString: Untagged
+ m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
diff --git a/AlienSurvival/ProjectSettings/TagManager.asset b/AlienSurvival/ProjectSettings/TagManager.asset
index 03959ee..b01453e 100644
--- a/AlienSurvival/ProjectSettings/TagManager.asset
+++ b/AlienSurvival/ProjectSettings/TagManager.asset
@@ -6,6 +6,7 @@ TagManager:
tags:
- bullet
- device
+ - enemy
layers:
- Default
- TransparentFX
generated by cgit v1.1-26-g67d0 at 2025-05-22 10:52:21 +0000