Commit 9aab748f authored by JEthan's avatar JEthan
Browse files

Merge branch 'master' into Jonas-Ethan

parents 231b92fc 02d92f97
......@@ -15,7 +15,7 @@ MonoBehaviour:
isIdle: 0
alertDistance: 10
backToIdleDistance: 15
speed: 3
speed: 1
whatIsGround:
serializedVersion: 2
m_Bits: 256
......@@ -186,7 +186,7 @@ MonoBehaviour:
isIdle: 1
alertDistance: 10
backToIdleDistance: 15
speed: 1
speed: 0.5
whatIsGround:
serializedVersion: 2
m_Bits: 256
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WindLeaves
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _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: 6ccd9b58969a2e34a98ec5ae79a43467, 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:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: ecdb4f8d3a4e35a4eb03def0cb3fb04b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 382294967272604786}
- component: {fileID: 382294967272604789}
- component: {fileID: 7926794471850828057}
- component: {fileID: -111158171268748557}
m_Layer: 0
m_Name: Crawler
m_TagString: Untagged
......@@ -126,3 +127,19 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &-111158171268748557
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 382294967272604784}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 881bc08784fef3a4eb8ed70cbdc48ea5, type: 3}
m_Name:
m_EditorClassIdentifier:
deathParticlePrefab: {fileID: 3659447474157512490, guid: 855f44ca275592447969fa22a87ae0ba,
type: 3}
healthPoints: 1
stoneLayer: 8
......@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 8955553666151367596}
- component: {fileID: 8955553666151367597}
- component: {fileID: 8955553666151367587}
- component: {fileID: -3949400525136398494}
m_Layer: 13
m_Name: Giant Mushroom
m_TagString: Untagged
......@@ -126,3 +127,19 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &-3949400525136398494
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8955553666151367599}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 881bc08784fef3a4eb8ed70cbdc48ea5, type: 3}
m_Name:
m_EditorClassIdentifier:
deathParticlePrefab: {fileID: 3659447474157512490, guid: 855f44ca275592447969fa22a87ae0ba,
type: 3}
healthPoints: 1
stoneLayer: 8
......@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 258479075904060254}
- component: {fileID: 258479075904060253}
- component: {fileID: 2498483169841620389}
- component: {fileID: 7109203871868091221}
m_Layer: 31
m_Name: Shroombie
m_TagString: Untagged
......@@ -126,3 +127,19 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &7109203871868091221
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 258479075904060248}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 881bc08784fef3a4eb8ed70cbdc48ea5, type: 3}
m_Name:
m_EditorClassIdentifier:
deathParticlePrefab: {fileID: 3659447474157512490, guid: 855f44ca275592447969fa22a87ae0ba,
type: 3}
healthPoints: 1
stoneLayer: 8
......@@ -84,7 +84,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 1
colliderOffset: 0.75
colliderOffset: 0.5
explodeEffect: {fileID: 3659447474157512490, guid: 855f44ca275592447969fa22a87ae0ba,
type: 3}
col: {fileID: 8974120070741763070}
......@@ -95,6 +95,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 6389316715626442151}
m_Modifications:
- target: {fileID: 3263777385268462403, guid: 9405edd316cdebe48bde78575e3aaad0,
type: 3}
propertyPath: m_Name
value: Particle System
objectReference: {fileID: 0}
- target: {fileID: 3263777385268462403, guid: 9405edd316cdebe48bde78575e3aaad0,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 811835358767482360, guid: 9405edd316cdebe48bde78575e3aaad0,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -150,16 +160,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3263777385268462403, guid: 9405edd316cdebe48bde78575e3aaad0,
type: 3}
propertyPath: m_Name
value: Particle System
objectReference: {fileID: 0}
- target: {fileID: 3263777385268462403, guid: 9405edd316cdebe48bde78575e3aaad0,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 3063613809859767357, guid: 9405edd316cdebe48bde78575e3aaad0,
type: 3}
propertyPath: CollisionModule.enabled
......
......@@ -3747,7 +3747,7 @@ ParticleSystem:
m_RotationOrder: 4
minKillSpeed: 0
maxKillSpeed: 10000
radiusScale: 1
radiusScale: 0.5
collidesWith:
serializedVersion: 2
m_Bits: 256
......
......@@ -552,7 +552,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275695134}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 430293728}
......@@ -811,9 +811,9 @@ ParticleSystem:
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
minScalar: 0.8
maxCurve:
serializedVersion: 2
m_Curve:
......@@ -864,7 +864,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeY:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
......@@ -917,7 +917,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
......@@ -1889,36 +1889,36 @@ ParticleSystem:
m_NumAlphaKeys: 2
UVModule:
serializedVersion: 2
enabled: 0
enabled: 1
mode: 0
timeMode: 0
fps: 30
frameOverTime:
serializedVersion: 2
minMaxState: 1
minMaxState: 3
scalar: 0.9999
minScalar: 0.9999
minScalar: 0
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
inSlope: 1
outSlope: 1
tangentMode: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 0
tangentMode: 0
outSlope: 1
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
......@@ -2000,7 +2000,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
speedRange: {x: 0, y: 1}
tilesX: 1
tilesX: 11
tilesY: 1
animationType: 0
rowIndex: 0
......@@ -3588,7 +3588,7 @@ ParticleSystem:
rotationAmount:
serializedVersion: 2
minMaxState: 0
scalar: 200
scalar: 800
minScalar: 0
maxCurve:
serializedVersion: 2
......@@ -5238,7 +5238,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: ecdb4f8d3a4e35a4eb03def0cb3fb04b, type: 2}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
......@@ -5293,8 +5293,8 @@ GameObject:
- component: {fileID: 1611726988538008503}
- component: {fileID: 1611726988538008501}
- component: {fileID: 1611726988538008500}
m_Layer: 0
m_Name: Wind Zone
m_Layer: 17
m_Name: WindZone
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......
......@@ -151,7 +151,7 @@ Transform:
- {fileID: 671354061}
- {fileID: 1652412121}
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &225743466
GameObject:
......@@ -565,7 +565,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &382514593
Animator:
......@@ -586,6 +586,85 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1001 &413952538
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2410282298153064044, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_Name
value: TestStone
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalPosition.x
value: 17
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalPosition.y
value: -3.5
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 504d671a4858dbe4cb1f3c567bb881b4, type: 3}
--- !u!1 &445195221
GameObject:
m_ObjectHideFlags: 0
......@@ -1625,6 +1704,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3724751736021467387, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.05
objectReference: {fileID: 0}
- target: {fileID: 3724751736021467387, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.15
objectReference: {fileID: 0}
- target: {fileID: 264577551908436831, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Name
......@@ -2594,7 +2683,7 @@ Transform:
- {fileID: 1761456133}
- {fileID: 754269808}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1761456133 stripped
Transform:
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class EnemyHealth : MonoBehaviour
{
//Partikel, die beim Tod erscheinen
public GameObject deathParticlePrefab;
//Leben der Gegner
public int healthPoints;
public int stoneLayer;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
if(healthPoints <= 0)
{
Instantiate(deathParticlePrefab, transform.position, Quaternion.identity);
Destroy(gameObject);
}
}
private void OnCollisionEnter2D(Collision2D other)
{
//wenn Stein von oben auf den Gegner fällt, dann Schaden machen
if (other.gameObject.layer == stoneLayer && other.gameObject.transform.position.y - transform.position.y > 1)
{
healthPoints--;
}
}
}
fileFormatVersion: 2
guid: 881bc08784fef3a4eb8ed70cbdc48ea5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -23,7 +23,7 @@ TagManager:
-
-
-
-
- Trigger
-
-
-
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment