diff --git a/Assets/Materials/FluffParticleMaterial.mat b/Assets/Materials/FluffParticleMaterial.mat
index be5ef5c8dbc1750a0a8ea7989330e221f9fc2722..0bcc3724397f6f00a54722ac146affcefab8434c 100644
--- a/Assets/Materials/FluffParticleMaterial.mat
+++ b/Assets/Materials/FluffParticleMaterial.mat
@@ -4,156 +4,81 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
m_Name: FluffParticleMaterial
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords: _ALPHABLEND_ON
- m_LightmapFlags: 5
+ m_ShaderKeywords: _ALPHABLEND_ON _EMISSION
+ m_LightmapFlags: 1
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
+ disabledShaderPasses: []
m_SavedProperties:
- serializedVersion: 2
+ serializedVersion: 3
m_TexEnvs:
- data:
- first:
- name: _MainTex
- second:
- m_Texture: {fileID: 2800000, guid: acdb41fd591a7434a9f285ba714869c9, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _BumpMap
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _DetailNormalMap
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _ParallaxMap
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _OcclusionMap
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _EmissionMap
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _DetailMask
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _DetailAlbedoMap
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- data:
- first:
- name: _MetallicGlossMap
- second:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: acdb41fd591a7434a9f285ba714869c9, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
m_Floats:
- data:
- first:
- name: _SrcBlend
- second: 5
- data:
- first:
- name: _DstBlend
- second: 10
- data:
- first:
- name: _Cutoff
- second: 0.5
- data:
- first:
- name: _Parallax
- second: 0.02
- data:
- first:
- name: _ZWrite
- second: 0
- data:
- first:
- name: _Glossiness
- second: 1
- data:
- first:
- name: _BumpScale
- second: 1
- data:
- first:
- name: _OcclusionStrength
- second: 1
- data:
- first:
- name: _DetailNormalMapScale
- second: 1
- data:
- first:
- name: _UVSec
- second: 0
- data:
- first:
- name: _Mode
- second: 2
- data:
- first:
- name: _EmissionScaleUI
- second: 0
- data:
- first:
- name: _Metallic
- second: 0
- data:
- first:
- name: _InvFade
- second: 0.01
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 10
+ - _EmissionScaleUI: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 1
+ - _GlossyReflections: 1
+ - _InvFade: 0.01
+ - _Metallic: 0
+ - _Mode: 2
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 5
+ - _UVSec: 0
+ - _ZWrite: 0
m_Colors:
- data:
- first:
- name: _EmissionColor
- second: {r: 0, g: 0, b: 0, a: 0}
- data:
- first:
- name: _Color
- second: {r: 0.7883904, g: 0.7850346, b: 0.88235295, a: 1}
- data:
- first:
- name: _EmissionColorUI
- second: {r: 1, g: 1, b: 1, a: 1}
- data:
- first:
- name: _TintColor
- second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- data:
- first:
- name: _EmisColor
- second: {r: 0.2, g: 0.2, b: 0.2, a: 0}
+ - _Color: {r: 0.7883904, g: 0.7850346, b: 0.88235295, a: 1}
+ - _EmisColor: {r: 0.2, g: 0.2, b: 0.2, a: 0}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
+ - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
+ - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+ m_BuildTextureStacks: []
diff --git a/Assets/Prefabs/SkeletonSpawnPoint (1).prefab b/Assets/Prefabs/SkeletonSpawnPoint (1).prefab
new file mode 100644
index 0000000000000000000000000000000000000000..794d1b515d743c4c2627da907a725cd0bfb42d52
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint (1).prefab
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8745574277898036912
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8745574277898036913}
+ m_Layer: 0
+ m_Name: SkeletonSpawnPoint (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &8745574277898036913
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8745574277898036912}
+ m_LocalRotation: {x: 0, y: 0.9063079, z: 0, w: 0.42261827}
+ m_LocalPosition: {x: -13.5, y: -0.0000009536743, z: -2.09}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
diff --git a/Assets/Prefabs/SkeletonSpawnPoint (1).prefab.meta b/Assets/Prefabs/SkeletonSpawnPoint (1).prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1dfd88ad1dd6a1f8f1c87913ce2a7a1be2e8f2a5
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint (1).prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 77bfae8c18f59cc4c8595c4d1fc6aeae
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/SkeletonSpawnPoint (2).prefab b/Assets/Prefabs/SkeletonSpawnPoint (2).prefab
new file mode 100644
index 0000000000000000000000000000000000000000..a7f21daad60e8492338c1f6f3719a7a2778cdde2
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint (2).prefab
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2031830206958591937
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2031830206958591936}
+ m_Layer: 0
+ m_Name: SkeletonSpawnPoint (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2031830206958591936
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2031830206958591937}
+ m_LocalRotation: {x: 0, y: 0.9063079, z: 0, w: 0.42261827}
+ m_LocalPosition: {x: 5.24, y: -0.0000009536743, z: 13.14}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
diff --git a/Assets/Prefabs/SkeletonSpawnPoint (2).prefab.meta b/Assets/Prefabs/SkeletonSpawnPoint (2).prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..6a2e3b4cf2bd3c1bf4dafd8707b027f69d42498e
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint (2).prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 732806fb505e83241b25495a44933b44
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/SkeletonSpawnPoint (3).prefab b/Assets/Prefabs/SkeletonSpawnPoint (3).prefab
new file mode 100644
index 0000000000000000000000000000000000000000..89e1ccb956678ecfe91e2f0cbcdc7c4aae4cd846
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint (3).prefab
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5205759176033704917
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5205759176033704916}
+ m_Layer: 0
+ m_Name: SkeletonSpawnPoint (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5205759176033704916
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5205759176033704917}
+ m_LocalRotation: {x: 0, y: 0.9063079, z: 0, w: 0.42261827}
+ m_LocalPosition: {x: 20.33, y: -0.0000009536743, z: 9.48}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
diff --git a/Assets/Prefabs/SkeletonSpawnPoint (3).prefab.meta b/Assets/Prefabs/SkeletonSpawnPoint (3).prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fb29148b53460352e2d9907899b354cfac291893
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint (3).prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a6a4f30a0352ada42a3201059411c5a6
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/SkeletonSpawnPoint.prefab b/Assets/Prefabs/SkeletonSpawnPoint.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..4f3744da4510fde71756b958456f35f9aa676d57
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint.prefab
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4858701510180920918
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4858701510180920919}
+ m_Layer: 0
+ m_Name: SkeletonSpawnPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4858701510180920919
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4858701510180920918}
+ m_LocalRotation: {x: 0, y: 0.9063079, z: 0, w: 0.42261827}
+ m_LocalPosition: {x: 8.83, y: -0.0000009536743, z: -6.64}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
diff --git a/Assets/Prefabs/SkeletonSpawnPoint.prefab.meta b/Assets/Prefabs/SkeletonSpawnPoint.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..3f9120cc703ea99a9fed0ed81b05cab39d7e71c1
--- /dev/null
+++ b/Assets/Prefabs/SkeletonSpawnPoint.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0d46d90751153e9458c6fedaacdee88f
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Wave_Mode.unity b/Assets/Scenes/Wave_Mode.unity
index d0963ffd3baeaa31b09f0ee6b2f9635e02f05824..718be0699c07665647a4dabdcedec4641be1e072 100644
--- a/Assets/Scenes/Wave_Mode.unity
+++ b/Assets/Scenes/Wave_Mode.unity
@@ -280,7 +280,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 18
+ m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &23015897
GameObject:
@@ -422,14 +422,30 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 100002, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 100006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 100078, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
+ - target: {fileID: 100078, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 100078, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
+ - target: {fileID: 100080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 400002, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalPosition.x
value: 0.28490838
@@ -496,7 +512,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalPosition.x
@@ -891,7 +907,7 @@ RectTransform:
- {fileID: 103497943}
- {fileID: 23015898}
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1064,67 +1080,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 103497942}
m_CullTransparentMesh: 1
---- !u!1001 &123787894
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 2022850296, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_Name
- value: Zombunny
- objectReference: {fileID: 0}
- - target: {fileID: 2022850296, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_RootOrder
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalPosition.x
- value: 9.344728
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.23123455
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalPosition.z
- value: -26.362396
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2022850303, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 73871ddf5c8d02442be00d9671a9d510, type: 3}
--- !u!850595691 &169772681
LightingSettings:
m_ObjectHideFlags: 0
@@ -7409,7 +7364,7 @@ Transform:
m_Children:
- {fileID: 412623261}
m_Father: {fileID: 0}
- m_RootOrder: 16
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &909533615
GameObject:
@@ -7722,7 +7677,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
--- !u!114 &1054830883
MonoBehaviour:
@@ -8230,7 +8185,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 17
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1284949277
GameObject:
@@ -8350,7 +8305,7 @@ Transform:
m_LocalScale: {x: 100, y: 100, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1001 &1317521692
PrefabInstance:
@@ -8365,7 +8320,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 495562, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 495562, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3}
propertyPath: m_LocalPosition.x
@@ -8454,7 +8409,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 19
+ m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1401845282
GameObject:
@@ -9079,6 +9034,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 558395406, guid: bb73b02f2e4db184a9ad78088763dd54, type: 3}
+ propertyPath: rateOfFire
+ value: 1.5
+ objectReference: {fileID: 0}
- target: {fileID: 1479999323261652659, guid: bb73b02f2e4db184a9ad78088763dd54,
type: 3}
propertyPath: m_RootOrder
@@ -9139,6 +9098,11 @@ PrefabInstance:
propertyPath: m_Name
value: Skeleton
objectReference: {fileID: 0}
+ - target: {fileID: 1485438858115186663, guid: bb73b02f2e4db184a9ad78088763dd54,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bb73b02f2e4db184a9ad78088763dd54, type: 3}
--- !u!1 &1642071082
@@ -9256,7 +9220,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 409160, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 409160, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3}
propertyPath: m_LocalPosition.x
@@ -9517,7 +9481,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1804513748
GameObject:
@@ -9859,7 +9823,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2029744892
GameObject:
@@ -10338,6 +10302,11 @@ MonoBehaviour:
- {fileID: 9083842937541373870, guid: 6bbf9ef8fcce5114482d813a9b680d17, type: 3}
- {fileID: 304385461253102273, guid: c88f58001921a7a4a9a51563d60192e6, type: 3}
- {fileID: 6813828724793316333, guid: c0c22a60c7b049f41b6bed6dd108a447, type: 3}
+ skeletonSpawnPoints:
+ - {fileID: 8745574277898036913, guid: 77bfae8c18f59cc4c8595c4d1fc6aeae, type: 3}
+ - {fileID: 2031830206958591936, guid: 732806fb505e83241b25495a44933b44, type: 3}
+ - {fileID: 5205759176033704916, guid: a6a4f30a0352ada42a3201059411c5a6, type: 3}
+ - {fileID: 4858701510180920919, guid: 0d46d90751153e9458c6fedaacdee88f, type: 3}
weaponUpgrade: {fileID: 900876093}
timeBetweenWaves: 1
--- !u!4 &2093855849
@@ -10352,7 +10321,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2134093996
GameObject:
@@ -10446,7 +10415,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400100, guid: f2a03eaf53eec964aa81784732592d2e, type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 400100, guid: f2a03eaf53eec964aa81784732592d2e, type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Scripts/Enemy/Projectile.cs b/Assets/Scripts/Enemy/Projectile.cs
index bf9ba0da516dd6b7baaa6a9f95edfbfb222c17fe..df72d157aca8e7a89169a2f2a52f60d2eaadaf75 100644
--- a/Assets/Scripts/Enemy/Projectile.cs
+++ b/Assets/Scripts/Enemy/Projectile.cs
@@ -12,27 +12,26 @@ public class Projectile : MonoBehaviour
private Rigidbody rb;
Animator anim;
PlayerHealth playerHealth;
- EnemyHealth enemyHealth;
+ //EnemyHealth enemyHealth;
float timer;
GameObject player;
+
+ CapsuleCollider capsuleCollider;
bool isSinking;
bool playerInRange;
- int floorMask;
private void Start()
{
//Mencari game object dengan tag "Player"
- player = GameObject.FindGameObjectWithTag("Player");
+ player = GameObject.FindGameObjectWithTag("Player");
anim = GetComponent<Animator>();
//mendapatkan komponen player health
playerHealth = player.GetComponent<PlayerHealth>();
rb = GetComponent<Rigidbody>();
- floorMask = LayerMask.GetMask("Floor");
-
Impulse();
-
+
}
// Update is called once per frame
@@ -44,8 +43,8 @@ public class Projectile : MonoBehaviour
void Attack()
{
- //Reset timer
- timer = 0f;
+ //Reset timer
+ timer = 0f;
//Taking Damage
if (playerHealth.currentHealth > 0)
@@ -75,37 +74,36 @@ public class Projectile : MonoBehaviour
}
- void Update()
- {
- timer += Time.deltaTime;
+ //void Update()
+ //{
+ // timer += Time.deltaTime;
+
+ // if (/*timer >= timeBetweenAttacks &&*/ playerInRange /*&& enemyHealth.currentHealth > 0*/)
+ // {
+ // Attack();
+ // Destroy(gameObject);
+ // }
+ // else
+ // {
+ // transform.Translate(-Vector3.up * sinkSpeed * Time.deltaTime);
+ // Destroy(gameObject, 0.8f);
+ // }
- if (timer >= timeBetweenAttacks && playerInRange /*&& enemyHealth.currentHealth > 0*/)
+ //}
+
+ private void OnCollisionEnter(Collision collision)
+ {
+ // Debug.Log(collision.collider.tag);
+ if (collision.collider.tag == "Player")
{
- bool Hit = Physics.Raycast(transform.position, transform.forward, 13f, LayerMask.GetMask("Floor"));
- if (Hit)
- {
- Attack();
- Destroy(gameObject);
- }
+ Attack();
+ Destroy(gameObject);
}
else
{
transform.Translate(-Vector3.up * sinkSpeed * Time.deltaTime);
- Destroy(gameObject,0.8f);
+ Destroy(gameObject, 0.8f);
}
-
-
}
- //private void FixedUpdate()
- //{
- // if (playerInRange)
- // {
- // Debug.Log("Fixed update kepanggil");
- // rb.velocity = Vector3.zero;
- // }
- //}
-
}
-
-
diff --git a/Assets/Scripts/WaveMode/WaveSpawner.cs b/Assets/Scripts/WaveMode/WaveSpawner.cs
index 751ec1da571daf879ccc8c4ac3614cfd184850f1..ec2b0866cd4a3e8014cea52491e98d11d0be81a5 100644
--- a/Assets/Scripts/WaveMode/WaveSpawner.cs
+++ b/Assets/Scripts/WaveMode/WaveSpawner.cs
@@ -27,6 +27,12 @@ public class WaveSpawner : MonoBehaviour
// random spawn point
public Transform[] spawnPoints;
+ // boss spawn point
+ //public Transform bossSpawnPoint;
+
+ // skeleton spawn point (tengah?)
+ public Transform[] skeletonSpawnPoints;
+
// weapon upgrade
public WeaponUpgradeUI weaponUpgrade;
@@ -172,9 +178,17 @@ public class WaveSpawner : MonoBehaviour
// spawn enemy
Debug.Log("Spawning Enemy: " + _enemy.name);
- // TODO setiap enemy ada spawn point masing2?
- Transform _sp = spawnPoints[Random.Range(0, spawnPoints.Length)];
- Instantiate(_enemy, _sp.position, _sp.rotation);
+ // enemy spawn points
+ if (string.Equals(_enemy.name, "Skeleton"))
+ {
+ Debug.Log("Spawn Skeleton");
+ Transform _sp = skeletonSpawnPoints[Random.Range(0, skeletonSpawnPoints.Length)];
+ Instantiate(_enemy, _sp.position, _sp.rotation);
+ } else
+ {
+ Transform _sp = spawnPoints[Random.Range(0, spawnPoints.Length)];
+ Instantiate(_enemy, _sp.position, _sp.rotation);
+ }
}
Transform RandomizeEnemy (Wave _wave)
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 28389e808b6465eeaf773601027d13e076f1d60b..7b84c207e67bf8a056598ab73a8ea895eb3a2b0e 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -15,7 +15,7 @@ TagManager:
-
- Water
- UI
- -
+ - Player
-
- PostProcessing
- Floor