diff --git a/Definitions.txt b/Definitions.txt index d3b4686..8bdb55d 100644 --- a/Definitions.txt +++ b/Definitions.txt @@ -54,6 +54,12 @@ Game Run Definitions (Room Server): Server -> Client [5, playerID, name.8.] + CoinFieldAction: + Client -> Server + [6, 0/1, ...] 0=get 1=loose + Server -> Client + [6, playerID, 0/1, ...] + \ No newline at end of file diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index f8a8ca2..e97bad1 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -21,6 +21,7 @@ + - diff --git a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller index e6545a6..58943e2 100644 --- a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller +++ b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller @@ -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 diff --git a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta index ed782a8..708a751 100644 --- a/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta +++ b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb57d2c386db1fd458c249ce2620f698 +guid: f2f77a1f959da1044b07ed06d554a69b NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1 b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1 deleted file mode 100644 index 686f338..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1.meta b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1.meta deleted file mode 100644 index fc85aa3..0000000 --- a/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 10c0b02d3c316f64ea20c50005ad497d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Coin.blend b/FlufflParty/Assets/BlenderFiles/Coin.blend index 0f6ba04..64c155b 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Coin.blend and b/FlufflParty/Assets/BlenderFiles/Coin.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Coin.blend1 b/FlufflParty/Assets/BlenderFiles/Coin.blend1 deleted file mode 100644 index 5fbec6f..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/Coin.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/Coin.blend1.meta b/FlufflParty/Assets/BlenderFiles/Coin.blend1.meta deleted file mode 100644 index a8f9c3c..0000000 --- a/FlufflParty/Assets/BlenderFiles/Coin.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 19c0714b22deb1041a40205b1d257f8b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend index 05fe3ef..d1d699e 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 397624d..b786b6e 100644 --- a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta +++ b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta @@ -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 diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 index 7e25cd7..4531e66 100644 Binary files a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 and b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/Dice.blend1 b/FlufflParty/Assets/BlenderFiles/Dice.blend1 deleted file mode 100644 index f5c5ba8..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/Dice.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/DiceIcon.blend1 b/FlufflParty/Assets/BlenderFiles/DiceIcon.blend1 deleted file mode 100644 index 17ad41e..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/DiceIcon.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/DiceIcon.blend1.meta b/FlufflParty/Assets/BlenderFiles/DiceIcon.blend1.meta deleted file mode 100644 index df01eb2..0000000 --- a/FlufflParty/Assets/BlenderFiles/DiceIcon.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 67a709e8dfe590d46b9eef7c26ae0689 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 deleted file mode 100644 index 15bb7cb..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta deleted file mode 100644 index dc21226..0000000 --- a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 32afa9befef106b438afa8110d076a57 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 deleted file mode 100644 index 1412ebf..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta deleted file mode 100644 index 890001b..0000000 --- a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 39d4746f5448474479e852d264b5aff2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png index 3e54667..68cbb42 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png and b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta index ddca9ac..845d8d2 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta @@ -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: diff --git a/FlufflParty/Assets/BlenderFiles/TilesFloor_1.blend1 b/FlufflParty/Assets/BlenderFiles/TilesFloor_1.blend1 deleted file mode 100644 index 327e448..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/TilesFloor_1.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/TilesFloor_1.blend1.meta b/FlufflParty/Assets/BlenderFiles/TilesFloor_1.blend1.meta deleted file mode 100644 index d27bdd6..0000000 --- a/FlufflParty/Assets/BlenderFiles/TilesFloor_1.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c2843e6a57d30c346ac8b22283889193 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/Coin.mat b/FlufflParty/Assets/Materials/Coin.mat new file mode 100644 index 0000000..71dc805 --- /dev/null +++ b/FlufflParty/Assets/Materials/Coin.mat @@ -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: [] diff --git a/FlufflParty/Assets/BlenderFiles/Dice.blend1.meta b/FlufflParty/Assets/Materials/Coin.mat.meta similarity index 52% rename from FlufflParty/Assets/BlenderFiles/Dice.blend1.meta rename to FlufflParty/Assets/Materials/Coin.mat.meta index 2737600..a5e9978 100644 --- a/FlufflParty/Assets/BlenderFiles/Dice.blend1.meta +++ b/FlufflParty/Assets/Materials/Coin.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 2fcda215c14274544a25e139e2240851 -DefaultImporter: +guid: 3d2b933e86fdc184e8ee87726f2bda78 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/Coin.prefab b/FlufflParty/Assets/Prefabs/Coin.prefab index be05f11..a557880 100644 --- a/FlufflParty/Assets/Prefabs/Coin.prefab +++ b/FlufflParty/Assets/Prefabs/Coin.prefab @@ -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 diff --git a/FlufflParty/Assets/Prefabs/CoinAnimated.prefab b/FlufflParty/Assets/Prefabs/CoinAnimated.prefab index 4d6a0f8..a3d3abe 100644 --- a/FlufflParty/Assets/Prefabs/CoinAnimated.prefab +++ b/FlufflParty/Assets/Prefabs/CoinAnimated.prefab @@ -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 diff --git a/FlufflParty/Assets/Prefabs/Player.prefab b/FlufflParty/Assets/Prefabs/Player.prefab index 6eeac23..1fc23fe 100644 --- a/FlufflParty/Assets/Prefabs/Player.prefab +++ b/FlufflParty/Assets/Prefabs/Player.prefab @@ -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} diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 957c8cd..9357e54 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 0.806 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.40539163, g: 0.45012015, b: 0.51654625, a: 0.806} + m_IndirectSpecularColor: {r: 0.40423408, g: 0.44936222, b: 0.5189086, a: 0.806} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -296,7 +296,6 @@ MonoBehaviour: - {fileID: 783643749} - {fileID: 1624290087} - {fileID: 1068960911} - fpsText: {fileID: 1674816447} --- !u!114 &47812149 MonoBehaviour: m_ObjectHideFlags: 0 @@ -403,7 +402,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3} propertyPath: m_LocalScale.x @@ -1059,7 +1058,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} propertyPath: m_LocalPosition.x @@ -1404,7 +1403,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} propertyPath: m_LocalPosition.x @@ -1466,7 +1465,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3} propertyPath: m_LocalScale.x @@ -1882,6 +1881,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c3c62c764c10eb143a6d8f0bd9081709, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &370380619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 370380620} + - component: {fileID: 370380622} + - component: {fileID: 370380621} + m_Layer: 5 + m_Name: CoinsInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &370380620 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370380619} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1086516036} + m_Father: {fileID: 1068960912} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -15.633, y: 51.525} + m_SizeDelta: {x: 31.26941, y: 30.831497} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &370380621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370380619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dd49c33817e9e540be187ce6b1678c5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &370380622 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370380619} + m_CullTransparentMesh: 1 --- !u!1 &382358439 GameObject: m_ObjectHideFlags: 0 @@ -1893,6 +1969,7 @@ GameObject: - component: {fileID: 382358440} - component: {fileID: 382358442} - component: {fileID: 382358441} + - component: {fileID: 382358443} m_Layer: 5 m_Name: Player1 m_TagString: Untagged @@ -1914,6 +1991,7 @@ RectTransform: m_Children: - {fileID: 82182831} - {fileID: 1856161157} + - {fileID: 895359047} m_Father: {fileID: 1462787853} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1960,6 +2038,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382358439} m_CullTransparentMesh: 1 +--- !u!114 &382358443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382358439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b65775f940b73c46b505f5402bf704b, type: 3} + m_Name: + m_EditorClassIdentifier: + textCoinInfo: {fileID: 1267775369} --- !u!1001 &387308982 PrefabInstance: m_ObjectHideFlags: 0 @@ -2283,6 +2374,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62ea731c79e81374aa55c0f0bf8183c2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &531419859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 531419860} + - component: {fileID: 531419862} + - component: {fileID: 531419861} + m_Layer: 5 + m_Name: CoinsInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &531419860 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 531419859} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1099173336} + m_Father: {fileID: 783643750} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15.150002, y: -53.172} + m_SizeDelta: {x: 31.26941, y: 30.831497} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &531419861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 531419859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dd49c33817e9e540be187ce6b1678c5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &531419862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 531419859} + m_CullTransparentMesh: 1 --- !u!1001 &582840967 PrefabInstance: m_ObjectHideFlags: 0 @@ -2879,6 +3047,143 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 38.695, y: 160.112, z: 104.625} +--- !u!1 &718151938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 718151939} + - component: {fileID: 718151941} + - component: {fileID: 718151940} + m_Layer: 5 + m_Name: CoinsText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &718151939 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718151938} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1723744550} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 65.933136, y: -0.0000066757} + m_SizeDelta: {x: 69.4892, y: 25.6334} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &718151940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718151938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '0 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20.53 + m_fontSizeBase: 20.53 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &718151941 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718151938} + m_CullTransparentMesh: 1 --- !u!1001 &739770340 PrefabInstance: m_ObjectHideFlags: 0 @@ -3058,6 +3363,7 @@ GameObject: - component: {fileID: 783643750} - component: {fileID: 783643752} - component: {fileID: 783643751} + - component: {fileID: 783643753} m_Layer: 5 m_Name: Player2 m_TagString: Untagged @@ -3079,6 +3385,7 @@ RectTransform: m_Children: - {fileID: 1805722635} - {fileID: 34779301} + - {fileID: 531419860} m_Father: {fileID: 1462787853} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3125,6 +3432,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 783643749} m_CullTransparentMesh: 1 +--- !u!114 &783643753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783643749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b65775f940b73c46b505f5402bf704b, type: 3} + m_Name: + m_EditorClassIdentifier: + textCoinInfo: {fileID: 1099173337} +--- !u!1 &895359046 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 895359047} + - component: {fileID: 895359049} + - component: {fileID: 895359048} + m_Layer: 5 + m_Name: CoinsInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &895359047 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895359046} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1267775368} + m_Father: {fileID: 382358440} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15.389, y: -53.43} + m_SizeDelta: {x: 31.269402, y: 30.831497} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &895359048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895359046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dd49c33817e9e540be187ce6b1678c5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &895359049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895359046} + m_CullTransparentMesh: 1 --- !u!1001 &909837799 PrefabInstance: m_ObjectHideFlags: 0 @@ -3633,6 +4030,7 @@ GameObject: - component: {fileID: 1068960912} - component: {fileID: 1068960914} - component: {fileID: 1068960913} + - component: {fileID: 1068960915} m_Layer: 5 m_Name: Player4 m_TagString: Untagged @@ -3654,6 +4052,7 @@ RectTransform: m_Children: - {fileID: 1257267487} - {fileID: 458134284} + - {fileID: 370380620} m_Father: {fileID: 1462787853} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3700,6 +4099,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1068960911} m_CullTransparentMesh: 1 +--- !u!114 &1068960915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068960911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b65775f940b73c46b505f5402bf704b, type: 3} + m_Name: + m_EditorClassIdentifier: + textCoinInfo: {fileID: 1086516037} --- !u!1001 &1073316383 PrefabInstance: m_ObjectHideFlags: 0 @@ -3890,6 +4302,280 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1086516035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1086516036} + - component: {fileID: 1086516038} + - component: {fileID: 1086516037} + m_Layer: 5 + m_Name: CoinsText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1086516036 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086516035} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 370380620} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -65.744995, y: -0.0000066757} + m_SizeDelta: {x: 69.4892, y: 25.6334} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1086516037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086516035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '0 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20.53 + m_fontSizeBase: 20.53 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1086516038 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086516035} + m_CullTransparentMesh: 1 +--- !u!1 &1099173335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1099173336} + - component: {fileID: 1099173338} + - component: {fileID: 1099173337} + m_Layer: 5 + m_Name: CoinsText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1099173336 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099173335} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 531419860} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -65.744995, y: -0.0000066757} + m_SizeDelta: {x: 69.4892, y: 25.6334} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1099173337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099173335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '0 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20.53 + m_fontSizeBase: 20.53 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1099173338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099173335} + m_CullTransparentMesh: 1 --- !u!1 &1107924850 GameObject: m_ObjectHideFlags: 0 @@ -4412,6 +5098,143 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1267775367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1267775368} + - component: {fileID: 1267775370} + - component: {fileID: 1267775369} + m_Layer: 5 + m_Name: CoinsText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1267775368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267775367} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 895359047} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 65.933136, y: -0.0000066757} + m_SizeDelta: {x: 69.4892, y: 25.6334} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1267775369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267775367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '0 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20.53 + m_fontSizeBase: 20.53 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1267775370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267775367} + m_CullTransparentMesh: 1 --- !u!1001 &1293309486 PrefabInstance: m_ObjectHideFlags: 0 @@ -4421,7 +5244,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3} propertyPath: m_LocalScale.y @@ -5089,7 +5912,6 @@ RectTransform: - {fileID: 783643750} - {fileID: 1624290088} - {fileID: 1068960912} - - {fileID: 1674816446} m_Father: {fileID: 335464105} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5115,7 +5937,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} propertyPath: m_LocalScale.x @@ -5651,6 +6473,7 @@ GameObject: - component: {fileID: 1624290088} - component: {fileID: 1624290090} - component: {fileID: 1624290089} + - component: {fileID: 1624290091} m_Layer: 5 m_Name: Player3 m_TagString: Untagged @@ -5672,6 +6495,7 @@ RectTransform: m_Children: - {fileID: 1728321597} - {fileID: 1397027314} + - {fileID: 1723744550} m_Father: {fileID: 1462787853} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5718,6 +6542,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1624290087} m_CullTransparentMesh: 1 +--- !u!114 &1624290091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624290087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b65775f940b73c46b505f5402bf704b, type: 3} + m_Name: + m_EditorClassIdentifier: + textCoinInfo: {fileID: 718151940} --- !u!1001 &1647488792 PrefabInstance: m_ObjectHideFlags: 0 @@ -6228,141 +7065,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2882f6630fed2a4cb698b1595edd42c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1674816445 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1674816446} - - component: {fileID: 1674816448} - - component: {fileID: 1674816447} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1674816446 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674816445} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1462787853} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 263.74, y: -87.8} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1674816447 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674816445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1674816448 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674816445} - m_CullTransparentMesh: 1 --- !u!1001 &1676575017 PrefabInstance: m_ObjectHideFlags: 0 @@ -6501,7 +7203,7 @@ PrefabInstance: - target: {fileID: 1966902952594303266, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + objectReference: {fileID: 2100000, guid: 3d2b933e86fdc184e8ee87726f2bda78, type: 2} - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_fontAsset value: @@ -6767,6 +7469,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1723744549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1723744550} + - component: {fileID: 1723744552} + - component: {fileID: 1723744551} + m_Layer: 5 + m_Name: CoinsInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1723744550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1723744549} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 718151939} + m_Father: {fileID: 1624290088} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 15.632, y: 51.525} + m_SizeDelta: {x: 31.269402, y: 30.831497} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1723744551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1723744549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dd49c33817e9e540be187ce6b1678c5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1723744552 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1723744549} + m_CullTransparentMesh: 1 --- !u!1 &1728321596 GameObject: m_ObjectHideFlags: 0 @@ -7469,10 +8248,10 @@ RectTransform: m_Father: {fileID: 382358440} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0007143, y: -21.200981} - m_SizeDelta: {x: 140.49, y: 1.6266} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 69.99928, y: -37.20098} + m_SizeDelta: {x: 140.49, y: 1.6266003} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1856161158 MonoBehaviour: diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index c9d78a4..85fe462 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -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(); + } 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}); + } } \ No newline at end of file diff --git a/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs b/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs index 5145c66..1e50e36 100644 --- a/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs +++ b/FlufflParty/Assets/Scripts/Players/AnimationHandler.cs @@ -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); } diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs index aafcc87..f0de9e3 100644 --- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs @@ -30,6 +30,18 @@ public class NoPlayablePlayer : Player diceScript = dice.GetComponent(); } + public void CoinFieldAction(int action) + { + if (action == 0) + { + AddCoins(3); + } + else + { + AddCoins(-3); + } + } + public void Wurfeln(int wurfelZahl) { wurfelt = true; diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index a00caf7..d8c5a83 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -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; } diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs index ffb8141..02707fa 100644 --- a/FlufflParty/Assets/Scripts/Players/Player.cs +++ b/FlufflParty/Assets/Scripts/Players/Player.cs @@ -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); + } } diff --git a/FlufflParty/Assets/Scripts/Players/PlayerInfoElements.cs b/FlufflParty/Assets/Scripts/Players/PlayerInfoElements.cs new file mode 100644 index 0000000..70af96a --- /dev/null +++ b/FlufflParty/Assets/Scripts/Players/PlayerInfoElements.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +public class PlayerInfoElements : MonoBehaviour +{ + public TMP_Text textCoinInfo; +} diff --git a/FlufflParty/Assets/Scripts/Players/PlayerInfoElements.cs.meta b/FlufflParty/Assets/Scripts/Players/PlayerInfoElements.cs.meta new file mode 100644 index 0000000..dda953e --- /dev/null +++ b/FlufflParty/Assets/Scripts/Players/PlayerInfoElements.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b65775f940b73c46b505f5402bf704b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index ea8b420..5e4cf02 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -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 diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index 299540d..bac6747 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -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 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index 40b5c6c..ff4a1cf 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -82,6 +82,7 @@ + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index a8a1785..d266680 100644 Binary files a/Server/out/artifacts/Server_jar/Server.jar and b/Server/out/artifacts/Server_jar/Server.jar differ diff --git a/Server/out/production/Server/Room$2.class b/Server/out/production/Server/Room$2.class index 1deb515..9323c16 100644 Binary files a/Server/out/production/Server/Room$2.class and b/Server/out/production/Server/Room$2.class differ diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index 7bfe3f9..0e60314 100644 Binary files a/Server/out/production/Server/Room.class and b/Server/out/production/Server/Room.class differ diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index afe581b..3bd2f6c 100644 Binary files a/Server/out/production/Server/Server$1.class and b/Server/out/production/Server/Server$1.class differ diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index 29cd289..dc4654e 100644 Binary files a/Server/out/production/Server/Server.class and b/Server/out/production/Server/Server.class differ diff --git a/Server/src/Room.java b/Server/src/Room.java index 7e3299c..ebc8ed1 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -157,6 +157,16 @@ public class Room players[i].output.write(new byte[]{2, (byte) currentPlayer, 0, 0, 0, 0, 0, 0, 0, 0}); } break; + + case 6: + for (int i = 0; i < players.length; i++) + { + if (i != player) + { + players[i].output.write(new byte[]{6, (byte)player, readData[1], 0, 0, 0, 0, 0, 0, 0}); + } + } + break; case 126: players[player].lastTimeSendTimeOutCheck = System.currentTimeMillis(); break;