Better Coin Animation

This commit is contained in:
brausjonas
2023-02-05 22:07:41 +01:00
parent b0ddf261f4
commit 2abea8e99e
45 changed files with 1259 additions and 355 deletions
+3 -2
View File
@@ -21,6 +21,7 @@
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/AnimationHandler.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/PlayerInfoElements.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
@@ -48,7 +49,7 @@
}</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild\FlufflParty.exe" />
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild/FlufflParty.exe" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="C:\Users\braus\OneDrive\Desktop\FlufflPartyTestBuild" />
<option name="PASS_PARENT_ENVS" value="1" />
@@ -117,7 +118,7 @@
<workItem from="1675280447181" duration="87000" />
<workItem from="1675368491529" duration="860000" />
<workItem from="1675541927675" duration="3056000" />
<workItem from="1675598313139" duration="4672000" />
<workItem from="1675598313139" duration="8363000" />
</task>
<servers />
</component>
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-1786347421162277443
--- !u!1101 &-8121166724312489392
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -10,33 +10,33 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: value
m_EventTreshold: 1
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1559872244723510632}
m_DstState: {fileID: -3974452117109266942}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6666667
m_TransitionDuration: 0
m_TransitionOffset: 0.003223739
m_ExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-1559872244723510632
--- !u!1102 &-3974452117109266942
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Scene
m_Name: CoinDown
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 5754373063964587239}
- {fileID: 4012126362886050619}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -46,12 +46,37 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -623603649343465320, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
m_Motion: {fileID: -8800838248204228948, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-724036225730276578
AnimatorStateMachine:
serializedVersion: 6
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: 4034863061730624503}
m_Position: {x: 150, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: -3974452117109266942}
m_Position: {x: 430, y: 220, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
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: -3974452117109266942}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -70,7 +95,7 @@ AnimatorController:
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 2271972115755258590}
m_StateMachine: {fileID: -724036225730276578}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
@@ -80,18 +105,43 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &752325545480386492
--- !u!1101 &4012126362886050619
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: 4034863061730624503}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.99999994
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &4034863061730624503
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Name: CoinUp
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1786347421162277443}
- {fileID: -8121166724312489392}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -101,56 +151,9 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -8800838248204228948, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
m_Motion: {fileID: -623603649343465320, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &2271972115755258590
AnimatorStateMachine:
serializedVersion: 6
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: -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: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
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: 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
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: eb57d2c386db1fd458c249ce2620f698
guid: f2f77a1f959da1044b07ed06d554a69b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
Binary file not shown.
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 10c0b02d3c316f64ea20c50005ad497d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
Binary file not shown.
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 19c0714b22deb1041a40205b1d257f8b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
@@ -2,10 +2,7 @@ fileFormatVersion: 2
guid: bbd5093a72be95c4893d4945fc77fb63
ModelImporter:
serializedVersion: 21300
internalIDToNameTable:
- first:
74: -623603649343465320
second: Scene
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
@@ -36,11 +33,11 @@ ModelImporter:
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Scene
name: CoinUp
takeName: Scene
internalID: -623603649343465320
firstFrame: 1
lastFrame: 16
lastFrame: 21
wrapMode: 0
orientationOffsetY: 0
level: 0
@@ -65,7 +62,7 @@ ModelImporter:
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: Idle
name: CoinDown
takeName: Scene
internalID: -8800838248204228948
firstFrame: 22
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 67a709e8dfe590d46b9eef7c26ae0689
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 32afa9befef106b438afa8110d076a57
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 39d4746f5448474479e852d264b5aff2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 97 KiB

@@ -39,10 +39,10 @@ TextureImporter:
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -53,7 +53,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,13 +125,25 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
Binary file not shown.
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: c2843e6a57d30c346ac8b22283889193
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+80
View File
@@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Coin
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
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: 0}
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_Ints: []
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: 0.7764677, b: 0.1372549, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 2fcda215c14274544a25e139e2240851
DefaultImporter:
guid: 3d2b933e86fdc184e8ee87726f2bda78
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
+16 -16
View File
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &126790903690218959
--- !u!1 &316154254698611626
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,46 +8,46 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 759317280592271221}
- component: {fileID: 4406341907233085648}
- component: {fileID: 1928261746223180826}
- component: {fileID: 1092373813158107408}
- component: {fileID: 4073294375566005941}
- component: {fileID: 2261872365269262975}
m_Layer: 0
m_Name: Coin
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &759317280592271221
--- !u!4 &1092373813158107408
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 126790903690218959}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
m_LocalPosition: {x: -46.16, y: 38.707916, z: -4.31}
m_LocalScale: {x: 0.16350788, y: 0.16350786, z: 0.02207658}
m_GameObject: {fileID: 316154254698611626}
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 90.81929, y: 1.0786587, z: 123.39003}
m_LocalScale: {x: 0.4050721, y: 0.4050721, z: 0.4050721}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4406341907233085648
--- !u!33 &4073294375566005941
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 126790903690218959}
m_Mesh: {fileID: -7387706064836869012, guid: 387e66df71e1e2f469913713334125c7, type: 3}
--- !u!23 &1928261746223180826
m_GameObject: {fileID: 316154254698611626}
m_Mesh: {fileID: -2124705421725058983, guid: 387e66df71e1e2f469913713334125c7, type: 3}
--- !u!23 &2261872365269262975
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 126790903690218959}
m_GameObject: {fileID: 316154254698611626}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -61,7 +61,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: -6478536213147159724, guid: 387e66df71e1e2f469913713334125c7, type: 3}
- {fileID: 2100000, guid: 3d2b933e86fdc184e8ee87726f2bda78, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
+19 -19
View File
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &233725172093225813
--- !u!1 &7188096243511822184
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 609546581277889007}
- component: {fileID: 4601078993734622794}
- component: {fileID: 1747018141948488320}
- component: {fileID: 1152695141134382598}
- component: {fileID: 7533097070461705682}
- component: {fileID: 6855943503821197943}
- component: {fileID: 8701450373572339389}
- component: {fileID: 7998488195783899707}
m_Layer: 0
m_Name: CoinAnimated
m_TagString: Untagged
@@ -19,36 +19,36 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &609546581277889007
--- !u!4 &7533097070461705682
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_GameObject: {fileID: 7188096243511822184}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 91.16926, y: 1.0071398, z: 123.2441}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4601078993734622794
--- !u!33 &6855943503821197943
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
m_GameObject: {fileID: 7188096243511822184}
m_Mesh: {fileID: -2124705421725058983, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
--- !u!23 &8701450373572339389
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 233725172093225813}
m_GameObject: {fileID: 7188096243511822184}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: -6478536213147159724, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3}
- {fileID: 2100000, guid: 3d2b933e86fdc184e8ee87726f2bda78, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -84,17 +84,17 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!95 &1152695141134382598
--- !u!95 &7998488195783899707
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 233725172093225813}
m_GameObject: {fileID: 7188096243511822184}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: eb57d2c386db1fd458c249ce2620f698, type: 2}
m_Controller: {fileID: 9100000, guid: f2f77a1f959da1044b07ed06d554a69b, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
+33 -33
View File
@@ -32,7 +32,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7779146846865786779}
- {fileID: 3369005062980114072}
- {fileID: 2889587859636715284}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -271,88 +271,88 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_renderer: {fileID: 7187540252645105935}
m_maskType: 0
--- !u!1001 &2789020248285857655
--- !u!1001 &4653079362198479558
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 711685448941949416}
m_Modifications:
- target: {fileID: 233725172093225813, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7188096243511822184, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_Name
value: CoinAnimated
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalPosition.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9227947
value: 1
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalRotation.x
value: 0.000000022767765
value: 0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalRotation.y
value: -0.38529217
value: -0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalRotation.z
value: 0.0000000146466315
value: -0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
- target: {fileID: 7533097070461705682, 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
--- !u!1 &2545150022150596014 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 233725172093225813, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
m_PrefabInstance: {fileID: 2789020248285857655}
m_CorrespondingSourceObject: {fileID: 7188096243511822184, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
m_PrefabInstance: {fileID: 4653079362198479558}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3741718828922494843
--- !u!114 &432164987253948138
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2705199848023149602}
m_GameObject: {fileID: 2545150022150596014}
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
anim: {fileID: 3428182303314024701}
--- !u!4 &2889587859636715284 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 609546581277889007, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
m_PrefabInstance: {fileID: 2789020248285857655}
m_CorrespondingSourceObject: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
m_PrefabInstance: {fileID: 4653079362198479558}
m_PrefabAsset: {fileID: 0}
--- !u!95 &3428182303314024701 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 7998488195783899707, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3}
m_PrefabInstance: {fileID: 4653079362198479558}
m_PrefabAsset: {fileID: 0}
File diff suppressed because it is too large Load Diff
+16 -4
View File
@@ -24,8 +24,7 @@ public class Client : MonoBehaviour
[SerializeField] private TMP_Text[] playerNameTexts;
[SerializeField] private GameObject[] playerInfo;
[SerializeField] private TMP_Text fpsText;
private PlayerInfoElements[] playerInfoElements = new PlayerInfoElements[4];
private void Start()
{
@@ -45,14 +44,17 @@ public class Client : MonoBehaviour
stream.Write(Encoding.ASCII.GetBytes(roomCode), 0, 10);
string name = PlayerPrefs.GetString("name");
stream.Write(Encoding.ASCII.GetBytes(name), 0, 10);
for (int i = 0; i < playerInfo.Length; i++)
{
playerInfoElements[i] = playerInfo[i].GetComponent<PlayerInfoElements>();
}
new Thread(Read).Start();
}
private void Update()
{
fpsText.text = (int)(Time.frameCount / Time.time) + " FPS";
if (jobs.Count > 0)
{
Job job = jobs.Dequeue();
@@ -112,6 +114,7 @@ public class Client : MonoBehaviour
players[job.data[1]].name = Encoding.ASCII.GetString(name).Replace(" ", "");
players[job.data[1]].index = job.data[1];
players[job.data[1]].textCoinsInfo = playerInfoElements[job.data[1]].textCoinInfo;
players[job.data[1]].Init();
playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", "");
@@ -121,6 +124,10 @@ public class Client : MonoBehaviour
playerInfo[job.data[1]].SetActive(true);
break;
case 6:
((NoPlayablePlayer)players[job.data[1]]).CoinFieldAction(job.data[2]);
break;
case 126:
stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 10);
break;
@@ -186,4 +193,9 @@ public class Client : MonoBehaviour
{
stream.Write(new byte[]{5, 0, 0, 0, 0, 0, 0, 0, 0, 0});
}
public void SendCoinFieldAction(int action)
{
stream.Write(new byte[]{6, (byte)action, 0, 0, 0, 0, 0, 0, 0, 0});
}
}
@@ -7,9 +7,14 @@ public class AnimationHandler : MonoBehaviour
{
[SerializeField] private Animator anim;
public void StartAnimation()
public void StartAnimation(Player.AnimationType type)
{
anim.SetInteger("value", 1);
switch (type)
{
case Player.AnimationType.Coin:
anim.SetInteger("value", 1);
break;
}
Invoke("Stop", 0.6f);
}
@@ -30,6 +30,18 @@ public class NoPlayablePlayer : Player
diceScript = dice.GetComponent<Dice>();
}
public void CoinFieldAction(int action)
{
if (action == 0)
{
AddCoins(3);
}
else
{
AddCoins(-3);
}
}
public void Wurfeln(int wurfelZahl)
{
wurfelt = true;
@@ -101,7 +101,12 @@ public class PlayablePlayer : Player
switch (fieldReturnStatus)
{
case 0:
PlayAnimation(AnimationType.Coin);
client.SendCoinFieldAction(0);
AddCoins(3);
break;
case 1:
client.SendCoinFieldAction(1);
AddCoins(-3);
break;
}
+10 -6
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public abstract class Player : MonoBehaviour
@@ -15,6 +16,7 @@ public abstract class Player : MonoBehaviour
protected Vector3 cameraOffset = new Vector3(-2.81f, 8.13f, 5.6f);
public int index;
public int coins = 0;
public TMP_Text textCoinsInfo;
//for coin animation
private AnimationHandler animationHandler;
@@ -41,16 +43,18 @@ public abstract class Player : MonoBehaviour
public void PlayAnimation(AnimationType animationType)
{
switch (animationType)
{
case AnimationType.Coin:
animationHandler.StartAnimation();
break;
}
animationHandler.StartAnimation(animationType);
}
public enum AnimationType
{
Coin
}
protected void AddCoins(int amount)
{
coins += amount;
textCoinsInfo.text = coins + "";
PlayAnimation(AnimationType.Coin);
}
}
@@ -0,0 +1,9 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class PlayerInfoElements : MonoBehaviour
{
public TMP_Text textCoinInfo;
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2b65775f940b73c46b505f5402bf704b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -137,9 +137,7 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.1
preloadedAssets:
- {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
- {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
@@ -12,10 +12,10 @@ EditorUserSettings:
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
flags: 0
RecentlyUsedSceneGuid-2:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
flags: 0
RecentlyUsedSceneGuid-3:
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512