Commit 1fb1c974 authored by Karamellchen's avatar Karamellchen
Browse files

woken

parent 0311b503
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerManager
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Schaden
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107392070582213736}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101468479669774046
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Schaden
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102741501950160422}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101471067783407126
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Schaden
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102232933583358294}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102232933583358294
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: nothing
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: aa67ab0b3ca7ec7438a479c0ac8b5fe7, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102741501950160422
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ouch 0
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 38f0ca66c47153144bd6ca0f78901954, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107392070582213736
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102232933583358294}
m_Position: {x: 240, y: 216, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102741501950160422}
m_Position: {x: 264, y: 24, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101468479669774046}
- {fileID: 1101471067783407126}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 48, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102741501950160422}
......@@ -198,7 +198,7 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0.1}
......
......@@ -86,6 +86,11 @@ MonoBehaviour:
cooldownBP: 30
activeBP: 5
WaveSpawner: {fileID: 0}
OnSkillUsed:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &3284113669997825874
Animator:
serializedVersion: 3
......@@ -136,3 +141,4 @@ MonoBehaviour:
Culture=neutral, PublicKeyToken=null
can: {fileID: 0}
animator: {fileID: 3284113669997825874}
cloud: {fileID: 6436782561261852391, guid: 9367bc52ded4be84f9c6ad53f5dba89c, type: 3}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6436782561261852391
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7709511092745166838}
- component: {fileID: 176293700575472296}
m_Layer: 0
m_Name: wolke
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7709511092745166838
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6436782561261852391}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 859.938, y: 569.37683, z: -3.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &176293700575472296
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6436782561261852391}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
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_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 976931349
m_SortingLayer: 2
m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: c9db424bf9835464587019fb167955fe, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2.17, y: 2.58}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
fileFormatVersion: 2
guid: 37bac8b9cd625da4481fd2e9b473cdad
NativeFormatImporter:
guid: 9367bc52ded4be84f9c6ad53f5dba89c
PrefabImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -4025,7 +4025,7 @@ PrefabInstance:
- target: {fileID: 590015861432245817, guid: f298022c356a28441928326d397db49d,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 590015861432245814, guid: f298022c356a28441928326d397db49d,
type: 3}
......@@ -7475,7 +7475,23 @@ PrefabInstance:
propertyPath: noteCurrency
value: 10000
objectReference: {fileID: 0}
m_RemovedComponents: []
- target: {fileID: 5777322062145649916, guid: 3bdf7c845202a7b4aa7f2e2ba6ab0969,
type: 3}
propertyPath: OnDamage.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5777322062145649916, guid: 3bdf7c845202a7b4aa7f2e2ba6ab0969,
type: 3}
propertyPath: OnDamage.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 5777322062145649916, guid: 3bdf7c845202a7b4aa7f2e2ba6ab0969,
type: 3}
propertyPath: animator
value:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 3284113669997825874, guid: 3bdf7c845202a7b4aa7f2e2ba6ab0969, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 3bdf7c845202a7b4aa7f2e2ba6ab0969, type: 3}
--- !u!1001 &981939275
PrefabInstance:
......@@ -7907,73 +7923,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 26526dc1607473749ab409998b098900, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &1063446462
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1063446460}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
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_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
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: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &1063446465
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1063446460}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 37bac8b9cd625da4481fd2e9b473cdad, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1001 &1069784121
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -20663,7 +20612,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
can: {fileID: 1359896535}
animator: {fileID: 0}
cloud: {fileID: 0}
--- !u!4 &1981721998 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 204325368330620922, guid: c1c6ff49351867d4a80be7588ab0ca0f,
......
......@@ -13,7 +13,8 @@ public class Scr_PlayerStats : MonoBehaviour
public Canvas can;
public Animator animator;
public GameObject cloud;
private void Awake()
{
......@@ -46,8 +47,7 @@ public class Scr_PlayerStats : MonoBehaviour
{
Subtract(other.GetComponent<Scr_EnemyStats>().damage);
OnDamage.Invoke();
animator.SetBool("Schaden", true);
animator.SetBool("Schaden", false);
StartCoroutine(spawnCloud());
}
if (playerLife <= 0f)
{
......@@ -68,6 +68,23 @@ public class Scr_PlayerStats : MonoBehaviour
{
playerLife -= damage;
}
private IEnumerator spawnCloud() {
GameObject c = Instantiate(cloud,transform.position,Quaternion.identity);
Vector3 offset = new Vector2(1,3);
Vector3 startPos = c.transform.position;
startPos.z = 0;
float duration = 2;
float eTime = 0;
while(eTime < duration) {
c.transform.position = Vector3.Lerp(startPos,startPos+offset,eTime/duration);
c.transform.localScale = Vector3.Lerp(Vector3.zero,Vector3.one,eTime/duration);
eTime += Time.deltaTime;
yield return null;
}
Destroy(c);
}
}
Supports Markdown
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