diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index d03b41c..bad43f7 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -17,6 +17,7 @@
+
@@ -111,7 +112,7 @@
-
+
diff --git a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller
index 87aecf3..e6545a6 100644
--- a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller
+++ b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller
@@ -1,6 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-5454848988904016368
+--- !u!1101 &-1786347421162277443
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 6
+ m_ConditionEvent: value
+ m_EventTreshold: 1
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1559872244723510632}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.6666667
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-1559872244723510632
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
@@ -10,7 +35,8 @@ AnimatorState:
m_Name: Scene
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: 5754373063964587239}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -34,11 +60,17 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: CoinAnimated
serializedVersion: 5
- m_AnimatorParameters: []
+ m_AnimatorParameters:
+ - m_Name: value
+ m_Type: 3
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
- m_StateMachine: {fileID: 2595009610461881608}
+ m_StateMachine: {fileID: 2271972115755258590}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
@@ -48,7 +80,34 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1107 &2595009610461881608
+--- !u!1102 &752325545480386492
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Idle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -1786347421162277443}
+ 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: -8800838248204228948, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &2271972115755258590
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
@@ -58,8 +117,11 @@ AnimatorStateMachine:
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
- m_State: {fileID: -5454848988904016368}
- m_Position: {x: 380, y: 140, z: 0}
+ m_State: {fileID: -1559872244723510632}
+ m_Position: {x: 400, y: 80, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 752325545480386492}
+ m_Position: {x: 318.49902, y: -55.87381, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -69,4 +131,26 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
- m_DefaultState: {fileID: -5454848988904016368}
+ m_DefaultState: {fileID: 752325545480386492}
+--- !u!1101 &5754373063964587239
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 752325545480386492}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.16919196
+ m_TransitionOffset: 0.26397324
+ m_ExitTime: 0.93757564
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
diff --git a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta
index 6c99e7d..ed782a8 100644
--- a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta
+++ b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 95bf48ec95818a24f99ffbd7739ed7e6
+guid: eb57d2c386db1fd458c249ce2620f698
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend
index e51c5f7..05fe3ef 100644
Binary files a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend and b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend differ
diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta
index f82b491..397624d 100644
--- a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta
+++ b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta
@@ -34,7 +34,65 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
- clipAnimations: []
+ clipAnimations:
+ - serializedVersion: 16
+ name: Scene
+ takeName: Scene
+ internalID: -623603649343465320
+ firstFrame: 1
+ lastFrame: 16
+ wrapMode: 0
+ orientationOffsetY: 0
+ level: 0
+ cycleOffset: 0
+ loop: 0
+ hasAdditiveReferencePose: 0
+ loopTime: 0
+ loopBlend: 0
+ loopBlendOrientation: 0
+ loopBlendPositionY: 0
+ loopBlendPositionXZ: 0
+ keepOriginalOrientation: 0
+ keepOriginalPositionY: 1
+ keepOriginalPositionXZ: 0
+ heightFromFeet: 0
+ mirror: 0
+ bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+ curves: []
+ events: []
+ transformMask: []
+ maskType: 3
+ maskSource: {instanceID: 0}
+ additiveReferencePoseFrame: 1
+ - serializedVersion: 16
+ name: Idle
+ takeName: Scene
+ internalID: -8800838248204228948
+ firstFrame: 22
+ lastFrame: 40
+ wrapMode: 0
+ orientationOffsetY: 0
+ level: 0
+ cycleOffset: 0
+ loop: 0
+ hasAdditiveReferencePose: 0
+ loopTime: 0
+ loopBlend: 0
+ loopBlendOrientation: 0
+ loopBlendPositionY: 0
+ loopBlendPositionXZ: 0
+ keepOriginalOrientation: 0
+ keepOriginalPositionY: 1
+ keepOriginalPositionXZ: 0
+ heightFromFeet: 0
+ mirror: 0
+ bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+ curves: []
+ events: []
+ transformMask: []
+ maskType: 3
+ maskSource: {instanceID: 0}
+ additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []
diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1
index 4922e1e..7e25cd7 100644
Binary files a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 and b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 differ
diff --git a/FlufflParty/Assets/Prefabs/CoinAnimated.prefab b/FlufflParty/Assets/Prefabs/CoinAnimated.prefab
new file mode 100644
index 0000000..4d6a0f8
--- /dev/null
+++ b/FlufflParty/Assets/Prefabs/CoinAnimated.prefab
@@ -0,0 +1,106 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &233725172093225813
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 609546581277889007}
+ - component: {fileID: 4601078993734622794}
+ - component: {fileID: 1747018141948488320}
+ - component: {fileID: 1152695141134382598}
+ m_Layer: 0
+ m_Name: CoinAnimated
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &609546581277889007
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 233725172093225813}
+ m_LocalRotation: {x: 0.000000022767765, y: -0.38529217, z: 0.0000000146466315, w: 0.9227947}
+ m_LocalPosition: {x: 94.16465, y: 1.4171416, z: 124.28583}
+ m_LocalScale: {x: 0.40999997, y: 0.40999997, z: 0.055}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4601078993734622794
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 233725172093225813}
+ m_Mesh: {fileID: 3163171260390484736, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
+--- !u!23 &1747018141948488320
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 233725172093225813}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -6478536213147159724, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
+ 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: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!95 &1152695141134382598
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 233725172093225813}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: eb57d2c386db1fd458c249ce2620f698, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
diff --git a/FlufflParty/Assets/Prefabs/CoinAnimated.prefab.meta b/FlufflParty/Assets/Prefabs/CoinAnimated.prefab.meta
new file mode 100644
index 0000000..3a1f5a5
--- /dev/null
+++ b/FlufflParty/Assets/Prefabs/CoinAnimated.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7a8ef933fd6c53841a03ec09e8f7d327
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/FlufflParty/Assets/Prefabs/Player.prefab b/FlufflParty/Assets/Prefabs/Player.prefab
index f403deb..6eeac23 100644
--- a/FlufflParty/Assets/Prefabs/Player.prefab
+++ b/FlufflParty/Assets/Prefabs/Player.prefab
@@ -32,6 +32,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7779146846865786779}
+ - {fileID: 3369005062980114072}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -270,3 +271,88 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_renderer: {fileID: 7187540252645105935}
m_maskType: 0
+--- !u!1001 &2789020248285857655
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 711685448941949416}
+ m_Modifications:
+ - target: {fileID: 233725172093225813, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_Name
+ value: CoinAnimated
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9227947
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.000000022767765
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.38529217
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.0000000146466315
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+--- !u!1 &2705199848023149602 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 233725172093225813, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ m_PrefabInstance: {fileID: 2789020248285857655}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &3741718828922494843
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2705199848023149602}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 787dbc4f3dfef2342a9cc6b5a6b706e2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ anim: {fileID: 2975653656861438321}
+--- !u!95 &2975653656861438321 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 1152695141134382598, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ m_PrefabInstance: {fileID: 2789020248285857655}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &3369005062980114072 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
+ m_PrefabInstance: {fileID: 2789020248285857655}
+ m_PrefabAsset: {fileID: 0}
diff --git a/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs b/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs
new file mode 100644
index 0000000..0adf1fa
--- /dev/null
+++ b/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs
@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AnimationHandler : MonoBehaviour
+{
+ [SerializeField] private Animator anim;
+
+ public void StartAnimation()
+ {
+ anim.SetInteger("value", 1);
+ Invoke("Stop", 0.6f);
+ }
+
+ private void Stop()
+ {
+ anim.SetInteger("value", 0);
+ }
+}
diff --git a/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs.meta b/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs.meta
new file mode 100644
index 0000000..b8d3c2f
--- /dev/null
+++ b/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 787dbc4f3dfef2342a9cc6b5a6b706e2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index fdde47a..12e50a7 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -43,7 +43,7 @@ public class PlayablePlayer : Player
if ((Input.GetMouseButtonDown(0)) && wurfelZahl == 0 && !wurfelt)
{
wurfelt = true;
- wurfelZahl = Random.Range(1, 7);
+ wurfelZahl = Random.Range(3, 4);
client.SendWurfeln(wurfelZahl);
@@ -96,7 +96,15 @@ public class PlayablePlayer : Player
//TODO: temp spieler finsihed erst, wenn field action ausgeführt wurde
if (wurfelt)
{
- currentField.Action(index);
+ int fieldReturnStatus = currentField.Action(index);
+
+ switch (fieldReturnStatus)
+ {
+ case 0:
+ PlayAnimation(AnimationType.Coin);
+ break;
+ }
+
Invoke("Finish", 2);
activated = false;
}
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index 782c438..ffb8141 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -15,6 +16,14 @@ public abstract class Player : MonoBehaviour
public int index;
public int coins = 0;
+ //for coin animation
+ private AnimationHandler animationHandler;
+
+ private void Start()
+ {
+ animationHandler = GetComponentInChildren();
+ }
+
//Aktiviert den Player
public void Activate()
{
@@ -29,4 +38,19 @@ public abstract class Player : MonoBehaviour
}
public abstract void Init();
+
+ public void PlayAnimation(AnimationType animationType)
+ {
+ switch (animationType)
+ {
+ case AnimationType.Coin:
+ animationHandler.StartAnimation();
+ break;
+ }
+ }
+
+ public enum AnimationType
+ {
+ Coin
+ }
}
diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset
index 589d29f..d5c0a83 100644
--- a/FlufflParty/ProjectSettings/ProjectSettings.asset
+++ b/FlufflParty/ProjectSettings/ProjectSettings.asset
@@ -840,7 +840,7 @@ PlayerSettings:
allowUnsafeCode: 0
useDeterministicCompilation: 1
enableRoslynAnalyzers: 1
- selectedPlatform: 0
+ selectedPlatform: 2
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 1
diff --git a/FlufflParty/ProjectSettings/QualitySettings.asset b/FlufflParty/ProjectSettings/QualitySettings.asset
index e7aa11f..e825db5 100644
--- a/FlufflParty/ProjectSettings/QualitySettings.asset
+++ b/FlufflParty/ProjectSettings/QualitySettings.asset
@@ -4,7 +4,7 @@
QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
- m_CurrentQuality: 2
+ m_CurrentQuality: 3
m_QualitySettings:
- serializedVersion: 2
name: Very Low
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index b3f0a9f..40577f2 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -78,7 +78,7 @@
-
+