diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 07d4c5d..2e38e04 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -110,6 +110,7 @@ + diff --git a/FlufflParty/Assets/BlenderFiles/Coin.blend b/FlufflParty/Assets/BlenderFiles/Coin.blend index d24cde3..0f6ba04 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 new file mode 100644 index 0000000..5fbec6f Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Coin.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/Coin.blend1.meta b/FlufflParty/Assets/BlenderFiles/Coin.blend1.meta new file mode 100644 index 0000000..a8f9c3c --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Coin.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 19c0714b22deb1041a40205b1d257f8b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend index 855bbb6..e51c5f7 100644 Binary files a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend and b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 new file mode 100644 index 0000000..4922e1e Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1.meta b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1.meta new file mode 100644 index 0000000..42fd5ae --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9216d5f205aa2d40976da7e2f5b32b8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Icon.png b/FlufflParty/Assets/BlenderFiles/Textures/Icon.png index a2aca14..7e506fe 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/Icon.png and b/FlufflParty/Assets/BlenderFiles/Textures/Icon.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Image.png b/FlufflParty/Assets/BlenderFiles/Textures/Image.png index 2fcafbe..17011ed 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/Image.png and b/FlufflParty/Assets/BlenderFiles/Textures/Image.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Logo2.jpg b/FlufflParty/Assets/BlenderFiles/Textures/Logo2.jpg new file mode 100644 index 0000000..0f6595f Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/Logo2.jpg differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Logo2.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Logo2.jpg.meta new file mode 100644 index 0000000..9a8906a --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/Logo2.jpg.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 44d4ee26d5fd6614db3860bbcee0fe3c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index aed1e12..5510918 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -259,6 +259,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} m_PrefabInstance: {fileID: 7452478} m_PrefabAsset: {fileID: 0} +--- !u!1 &34779300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 34779301} + - component: {fileID: 34779303} + - component: {fileID: 34779302} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &34779301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34779300} + 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: 783643750} + 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.4000244, y: -21.200981} + m_SizeDelta: {x: 140.49, y: 1.6266} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &34779302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34779300} + 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: 0.92941177, b: 0.78039217, 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: 0} + 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 &34779303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34779300} + m_CullTransparentMesh: 1 --- !u!1001 &44612885 PrefabInstance: m_ObjectHideFlags: 0 @@ -416,6 +492,16 @@ MonoBehaviour: nextField: {fileID: 1406090859} cam: {fileID: 1328561024} uiHandler: {fileID: 47812149} + playerNameTexts: + - {fileID: 82182832} + - {fileID: 1805722636} + - {fileID: 1728321598} + - {fileID: 1257267488} + playerInfo: + - {fileID: 382358439} + - {fileID: 783643749} + - {fileID: 1624290087} + - {fileID: 1068960911} --- !u!114 &47812149 MonoBehaviour: m_ObjectHideFlags: 0 @@ -429,6 +515,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: layout0: {fileID: 98175701} + layout1: {fileID: 1462787852} --- !u!1001 &55786170 PrefabInstance: m_ObjectHideFlags: 0 @@ -584,6 +671,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4015f6f60de231b43a33843ede469dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &82182830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 82182831} + - component: {fileID: 82182833} + - component: {fileID: 82182832} + m_Layer: 5 + m_Name: 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &82182831 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82182830} + 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: 382358440} + m_RootOrder: 0 + 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.00071192, y: 0.000039101} + m_SizeDelta: {x: 140.49, y: 31.484} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &82182832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82182830} + 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: Player1 + 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: 21.6 + m_fontSizeBase: 21.6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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 &82182833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82182830} + m_CullTransparentMesh: 1 --- !u!1 &98175701 GameObject: m_ObjectHideFlags: 0 @@ -2062,7 +2284,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.y - value: 0.102674134 + value: 0.10267413 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.z @@ -2070,23 +2292,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6733117 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6733117 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.21598937 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.21598937 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -2094,7 +2316,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -35.571 objectReference: {fileID: 0} - target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_Name @@ -2283,7 +2505,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalPosition.y - value: 0.01668171 + value: 0.016681671 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalPosition.z @@ -2291,23 +2513,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6881681 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6881681 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.16255678 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.16255678 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -2315,7 +2537,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -26.581 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} @@ -2560,6 +2782,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 98175702} + - {fileID: 1462787853} m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2653,6 +2876,84 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c3c62c764c10eb143a6d8f0bd9081709, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &382358439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 382358440} + - component: {fileID: 382358442} + - component: {fileID: 382358441} + m_Layer: 5 + m_Name: Player1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &382358440 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382358439} + 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: 82182831} + - {fileID: 1856161157} + m_Father: {fileID: 1462787853} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 93.5, y: -35.6} + m_SizeDelta: {x: 140.48682, y: 31.483902} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &382358441 +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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.92941177, b: 0.78039217, 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: 952a5200c3226fd418c93d8ffb2708a0, 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 &382358442 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382358439} + m_CullTransparentMesh: 1 --- !u!1001 &387308982 PrefabInstance: m_ObjectHideFlags: 0 @@ -3525,6 +3826,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3} m_PrefabInstance: {fileID: 446643741} m_PrefabAsset: {fileID: 0} +--- !u!1 &458134283 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 458134284} + - component: {fileID: 458134286} + - component: {fileID: 458134285} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &458134284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458134283} + 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: 1068960912} + 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.3999473, y: 20.038269} + m_SizeDelta: {x: 140.49, y: 1.6266} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &458134285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458134283} + 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: 0.92941177, b: 0.78039217, 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: 0} + 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 &458134286 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458134283} + m_CullTransparentMesh: 1 --- !u!1001 &468336198 PrefabInstance: m_ObjectHideFlags: 0 @@ -4592,7 +4969,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.y - value: 0.016683618 + value: 0.016683578 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.z @@ -4600,23 +4977,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6876514 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6876514 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.16472894 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.16472894 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -4624,7 +5001,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -26.943 objectReference: {fileID: 0} - target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_Name @@ -4882,7 +5259,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalPosition.y - value: 0.016680757 + value: 0.016680717 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalPosition.z @@ -4890,23 +5267,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6867074 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6867074 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.16862088 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.16862088 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -4914,7 +5291,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -27.592 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} @@ -5123,7 +5500,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.y - value: 0.016680757 + value: 0.016680717 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.z @@ -5131,23 +5508,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6934033 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6934033 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.13853483 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.13853481 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -5155,7 +5532,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -22.597 objectReference: {fileID: 0} - target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_Name @@ -5649,6 +6026,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} m_PrefabInstance: {fileID: 777998029} m_PrefabAsset: {fileID: 0} +--- !u!1 &783643749 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 783643750} + - component: {fileID: 783643752} + - component: {fileID: 783643751} + m_Layer: 5 + m_Name: Player2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &783643750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783643749} + 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: 1805722635} + - {fileID: 34779301} + m_Father: {fileID: 1462787853} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -87.9, y: -35.6} + m_SizeDelta: {x: 140.48682, y: 31.483902} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &783643751 +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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.92941177, b: 0.78039217, 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: 952a5200c3226fd418c93d8ffb2708a0, 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 &783643752 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783643749} + m_CullTransparentMesh: 1 --- !u!1001 &802637674 PrefabInstance: m_ObjectHideFlags: 0 @@ -7243,6 +7698,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} m_PrefabInstance: {fileID: 1067583202} m_PrefabAsset: {fileID: 0} +--- !u!1 &1068960911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1068960912} + - component: {fileID: 1068960914} + - component: {fileID: 1068960913} + m_Layer: 5 + m_Name: Player4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1068960912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068960911} + 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: 1257267487} + - {fileID: 458134284} + m_Father: {fileID: 1462787853} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -87.900024, y: 32.09999} + m_SizeDelta: {x: 140.48682, y: 31.483902} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1068960913 +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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.92941177, b: 0.78039217, 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: 952a5200c3226fd418c93d8ffb2708a0, 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 &1068960914 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068960911} + m_CullTransparentMesh: 1 --- !u!1001 &1073316383 PrefabInstance: m_ObjectHideFlags: 0 @@ -7292,7 +7825,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.y - value: 0.016680757 + value: 0.016680717 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.z @@ -7300,23 +7833,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6897269 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6897269 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.15581036 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.15581036 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -7324,7 +7857,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -25.459 objectReference: {fileID: 0} - target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_Name @@ -8388,6 +8921,141 @@ Transform: m_CorrespondingSourceObject: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3} m_PrefabInstance: {fileID: 1250635223} m_PrefabAsset: {fileID: 0} +--- !u!1 &1257267486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1257267487} + - component: {fileID: 1257267489} + - component: {fileID: 1257267488} + m_Layer: 5 + m_Name: 4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1257267487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257267486} + 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: 1068960912} + m_RootOrder: 0 + 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.00039673, y: 0.000039101} + m_SizeDelta: {x: 140.49, y: 31.484} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1257267488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257267486} + 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: Player4 + 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: 21.6 + m_fontSizeBase: 21.6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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 &1257267489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257267486} + m_CullTransparentMesh: 1 --- !u!1001 &1260274383 PrefabInstance: m_ObjectHideFlags: 0 @@ -8983,7 +9651,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1328561024} m_LocalRotation: {x: 0.1261387, y: 0.8740232, z: -0.4089002, w: 0.23015887} - m_LocalPosition: {x: 90.193, y: 9.63, z: 133.6} + m_LocalPosition: {x: 90.02, y: 9.63, z: 130.73} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9091,7 +9759,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.y - value: 0.01667885 + value: 0.01667881 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.z @@ -9099,23 +9767,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6909331 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6909331 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.15037099 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.150371 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -9123,7 +9791,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -24.556 objectReference: {fileID: 0} - target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_Name @@ -9232,6 +9900,82 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1397027313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1397027314} + - component: {fileID: 1397027316} + - component: {fileID: 1397027315} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1397027314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397027313} + 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: 1624290088} + 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.0006713867, y: 20.038208} + m_SizeDelta: {x: 140.49, y: 1.6266} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1397027315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397027313} + 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: 0.92941177, b: 0.78039217, 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: 0} + 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 &1397027316 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397027313} + m_CullTransparentMesh: 1 --- !u!1001 &1406090857 PrefabInstance: m_ObjectHideFlags: 0 @@ -9544,6 +10288,46 @@ Transform: m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} m_PrefabInstance: {fileID: 1436962420} m_PrefabAsset: {fileID: 0} +--- !u!1 &1462787852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1462787853} + m_Layer: 5 + m_Name: Layout1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1462787853 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1462787852} + 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: 382358440} + - {fileID: 783643750} + - {fileID: 1624290088} + - {fileID: 1068960912} + m_Father: {fileID: 335464105} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.122558594} + m_SizeDelta: {x: 0, y: 0.17001343} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1472923487 PrefabInstance: m_ObjectHideFlags: 0 @@ -10805,6 +11589,84 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1624290087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1624290088} + - component: {fileID: 1624290090} + - component: {fileID: 1624290089} + m_Layer: 5 + m_Name: Player3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1624290088 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624290087} + 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: 1728321597} + - {fileID: 1397027314} + m_Father: {fileID: 1462787853} + 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: 93.5, y: 32.1} + m_SizeDelta: {x: 140.48682, y: 31.483902} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1624290089 +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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.92941177, b: 0.78039217, 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: 952a5200c3226fd418c93d8ffb2708a0, 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 &1624290090 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624290087} + m_CullTransparentMesh: 1 --- !u!1001 &1627250699 PrefabInstance: m_ObjectHideFlags: 0 @@ -11764,7 +12626,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.y - value: 0.016682664 + value: 0.016682625 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.z @@ -11772,23 +12634,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.6666903 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.6666903 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.23563547 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.23563547 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -11796,7 +12658,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -38.931 objectReference: {fileID: 0} - target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_Name @@ -11958,7 +12820,7 @@ PrefabInstance: - target: {fileID: 1966902952594303266, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 1b85210f51f6ab34c900a9781cdc64f5, type: 2} + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_fontAsset value: @@ -12356,6 +13218,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1728321596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1728321597} + - component: {fileID: 1728321599} + - component: {fileID: 1728321598} + m_Layer: 5 + m_Name: 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1728321597 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728321596} + 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: 1624290088} + m_RootOrder: 0 + 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.00070238, y: 0.000039101} + m_SizeDelta: {x: 140.49, y: 31.484} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1728321598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728321596} + 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: Player3 + 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: 21.6 + m_fontSizeBase: 21.6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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 &1728321599 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728321596} + m_CullTransparentMesh: 1 --- !u!1001 &1736008287 PrefabInstance: m_ObjectHideFlags: 0 @@ -12385,7 +13382,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.y - value: 0.016683618 + value: 0.016683578 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalPosition.z @@ -12393,23 +13390,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.70410407 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.70410407 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.065096475 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.065096475 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -12417,7 +13414,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -10.564 objectReference: {fileID: 0} - target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3} propertyPath: m_Name @@ -12532,7 +13529,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.y - value: 0.016676942 + value: 0.016676903 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.z @@ -12540,23 +13537,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.68722904 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.68722904 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.16648199 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.16648199 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -12564,7 +13561,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -27.235 objectReference: {fileID: 0} - target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_Name @@ -12817,6 +13814,141 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1805722634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1805722635} + - component: {fileID: 1805722637} + - component: {fileID: 1805722636} + m_Layer: 5 + m_Name: 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1805722635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805722634} + 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: 783643750} + m_RootOrder: 0 + 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.00039673, y: 0.000039101} + m_SizeDelta: {x: 140.49, y: 31.484} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1805722636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805722634} + 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: Player2 + 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: 21.6 + m_fontSizeBase: 21.6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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 &1805722637 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805722634} + m_CullTransparentMesh: 1 --- !u!1001 &1812332222 PrefabInstance: m_ObjectHideFlags: 0 @@ -13011,6 +14143,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 3718633661091795347, guid: 32834830c53dc024995f18a65060a2ce, type: 3} m_PrefabInstance: {fileID: 1829363381} m_PrefabAsset: {fileID: 0} +--- !u!1 &1856161156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1856161157} + - component: {fileID: 1856161159} + - component: {fileID: 1856161158} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1856161157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856161156} + 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: 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1856161158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856161156} + 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: 0.92941177, b: 0.78039217, 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: 0} + 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 &1856161159 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856161156} + m_CullTransparentMesh: 1 --- !u!1001 &1857892635 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index 80e1ffb..393c072 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -5,6 +5,7 @@ using System.IO; using System.Net.Sockets; using System.Text; using System.Threading; +using TMPro; using UnityEngine; using UnityEngine.SceneManagement; @@ -21,8 +22,16 @@ public class Client : MonoBehaviour [SerializeField] private UIHandler uiHandler; + [SerializeField] private TMP_Text[] playerNameTexts; + [SerializeField] private GameObject[] playerInfo; + private void Start() { + for (int i = 0; i < 4; i++) + { + playerInfo[i].SetActive(false); + } + client = new TcpClient("185.245.96.48", 8051); stream = client.GetStream(); @@ -65,7 +74,7 @@ public class Client : MonoBehaviour else { GameObject player = Instantiate(playerPrefab); - + player.transform.position = new Vector3(job.data[2], job.data[3] + 0.5f, job.data[4]); NoPlayablePlayer script = player.AddComponent(); @@ -74,6 +83,7 @@ public class Client : MonoBehaviour script.dice = dice; script.camera = cam; } + break; //--------------------------------------------------------- //-----Activate a Player @@ -98,7 +108,11 @@ public class Client : MonoBehaviour players[job.data[1]].name = Encoding.ASCII.GetString(name).Replace(" ", ""); players[job.data[1]].Init(); - uiHandler.DeactivateLayout0(); + playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", ""); + + uiHandler.ActivateLayout1(); + + playerInfo[job.data[1]].SetActive(true); break; case 126: diff --git a/FlufflParty/Assets/Scripts/Start/StartHandler.cs b/FlufflParty/Assets/Scripts/Start/StartHandler.cs index accae6d..aab92a9 100644 --- a/FlufflParty/Assets/Scripts/Start/StartHandler.cs +++ b/FlufflParty/Assets/Scripts/Start/StartHandler.cs @@ -69,7 +69,7 @@ public class StartHandler : MonoBehaviour public void ButtonJoin() { - string code = roomCodeEnter.text; + string code = roomCodeEnter.text.ToLower(); roomcode = code; PlayerPrefs.SetString("roomcode", code); PlayerPrefs.Save(); diff --git a/FlufflParty/Assets/Scripts/UIHandler.cs b/FlufflParty/Assets/Scripts/UIHandler.cs index 56a5bb2..20fefba 100644 --- a/FlufflParty/Assets/Scripts/UIHandler.cs +++ b/FlufflParty/Assets/Scripts/UIHandler.cs @@ -5,14 +5,17 @@ using UnityEngine; public class UIHandler : MonoBehaviour { [SerializeField] private GameObject layout0; + [SerializeField] private GameObject layout1; private void Start() { + layout1.SetActive(false); layout0.SetActive(true); } - public void DeactivateLayout0() + public void ActivateLayout1() { layout0.SetActive(false); + layout1.SetActive(true); } } diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index 02669f4..589d29f 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -16,9 +16,9 @@ PlayerSettings: productName: FlufflParty defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 - m_ShowUnitySplashLogo: 1 + m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} + m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 m_SplashScreenLogoStyle: 1 @@ -39,7 +39,9 @@ PlayerSettings: y: 0 width: 1 height: 1 - m_SplashScreenLogos: [] + m_SplashScreenLogos: + - logo: {fileID: 0} + duration: 2 m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 800 @@ -793,9 +795,9 @@ PlayerSettings: ps4IncludedModules: [] ps4attribVROutputEnabled: 0 monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 0} + splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: 44d4ee26d5fd6614db3860bbcee0fe3c, type: 3} splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 + blurSplashScreenBackground: 0 spritePackerPolicy: webGLMemorySize: 16 webGLExceptionSupport: 1 diff --git a/FlufflParty/ProjectSettings/QualitySettings.asset b/FlufflParty/ProjectSettings/QualitySettings.asset index de9172c..e7aa11f 100644 --- a/FlufflParty/ProjectSettings/QualitySettings.asset +++ b/FlufflParty/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 4 + m_CurrentQuality: 2 m_QualitySettings: - serializedVersion: 2 name: Very Low @@ -91,7 +91,7 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 1 - textureQuality: 1 + textureQuality: 0 anisotropicTextures: 0 antiAliasing: 2 softParticles: 0 diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index 14d6805..2bb28f9 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 5604555501510a0955590d74437008441216412e7578276829704a6bb0b66c3a flags: 0 RecentlyUsedSceneGuid-1: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b flags: 0 RecentlyUsedSceneGuid-2: - value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 UnityRemoteDevice: value: 225f4d46245b0d4902070862342649191512 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index d9e2ddc..4167bad 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -1,6 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 2180 + y: 184 + width: 641 + height: 664 + m_ShowMode: 0 + m_Title: Build Settings + m_RootView: {fileID: 4} + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -19,12 +43,62 @@ MonoBehaviour: width: 1920 height: 1117 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 6} + m_Title: Game + m_RootView: {fileID: 9} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &2 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: BuildPlayerWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 641 + height: 664 + m_MinSize: {x: 640, y: 580} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 641 + height: 664 + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 22872 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,8 +111,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 3} + - {fileID: 12} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 @@ -48,8 +122,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 108 ---- !u!114 &3 + controlID: 104 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -68,15 +142,15 @@ MonoBehaviour: y: 0 width: 423 height: 1067 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 20} m_Panes: + - {fileID: 20} - {fileID: 17} - - {fileID: 13} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &4 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -97,12 +171,12 @@ MonoBehaviour: height: 738 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 18} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -123,13 +197,13 @@ MonoBehaviour: height: 329 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 16} - {fileID: 19} + - {fileID: 22} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &6 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -142,9 +216,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 10} + - {fileID: 5} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 @@ -157,7 +231,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &7 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -179,7 +253,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &8 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -200,7 +274,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &9 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -213,8 +287,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 13} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -224,8 +298,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 98 ---- !u!114 &10 + controlID: 94 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -238,8 +312,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 4} - - {fileID: 11} + - {fileID: 7} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -249,8 +323,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 99 ---- !u!114 &11 + controlID: 95 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -260,7 +334,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -271,14 +345,64 @@ MonoBehaviour: height: 738 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 12} - - {fileID: 15} - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 2 ---- !u!114 &12 + - {fileID: 16} + - {fileID: 18} + - {fileID: 23} + m_Selected: 2 + m_LastSelected: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 640, y: 580} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Build Settings + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2180 + y: 184 + width: 641 + height: 643 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -531,14 +655,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 523.8424, y: 406.8085, z: 20.870192} + m_Target: {x: 96.25832, y: 3.0647492, z: 118.732544} speed: 2 - m_Value: {x: 523.8424, y: 406.8085, z: 20.870192} + m_Value: {x: 96.25832, y: 3.0647492, z: 118.732544} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -585,17 +709,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: 0.12401545, y: 0.8428969, z: -0.22000046, w: 0.47514084} speed: 2 - m_Value: {x: 0.00000001182074, y: 0.000000065316215, z: -0.000000028490355, w: 0.9999999} + m_Value: {x: 0.12401458, y: 0.842891, z: -0.21999891, w: 0.4751375} m_Size: - m_Target: 344.98532 + m_Target: 1.1898067 speed: 2 - m_Value: 344.98532 + m_Value: 1.1898067 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -609,14 +733,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.15321961, y: 0.84662426, z: -0.36929002, w: 0.3512817} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &13 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -644,99 +768,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 362 - y: 73 - width: 1172 - height: 818 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1172, y: 797} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -586 - m_HBaseRangeMax: 586 - m_VBaseRangeMin: -398.5 - m_VBaseRangeMax: 398.5 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1172 - height: 797 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 586, y: 398.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -586 - y: -398.5 - width: 1172 - height: 797 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1172, y: 818} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &15 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -817,7 +849,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -870,26 +902,26 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 289} - m_SelectedIDs: ee5d0000 - m_LastClickedID: 24046 - m_ExpandedIDs: 000000009e5d0000a05d0000da5d0000e65d0000fa5d0000a435010000ca9a3b + scrollPos: {x: 0, y: 212} + m_SelectedIDs: 365e0000 + m_LastClickedID: 24118 + m_ExpandedIDs: 00000000c85d0000ca5d0000cc5d0000ce5d000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Stones - m_OriginalName: Stones + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 24596 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 8} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -901,7 +933,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009e5d0000a05d0000a25d0000 + m_ExpandedIDs: 00000000c85d0000ca5d0000cc5d0000ce5d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -945,7 +977,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 8} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -957,7 +989,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -998,7 +1030,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &18 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1031,7 +1063,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: deccfaff2acdfaff5ad2faff78d2faff7ed5faffcad5faff40dcfaff5edcfaff14defaff6ceffaffb8f0faff0af1faff80f7faff9ef7faff48fafaff9cfafaffccfffaffeafffaff2002fbff7802fbffee08fbff0c09fbff541bfbffde30fbff3039fbffc058fbfff263fbff1081fbfff08afbff448bfbff9e91fbffc491fbffd4e0fbff24e1fbff82e7fbfface7fbff12d9fdff50d9fdff1ae0fdff44e0fdff50f1fdff90f1fdff06f7fdff24f7fdffd0a0feff14a1feffa41ffffffc1fffffca25ffff52cbffffa0cbffff3cd1ffff56d1ffff56d4ffffaad4ffff70dbffff96dbffffb6dfffff0ce0ffffd2e6fffff8e6ffff54f3ffff04fbffff14640000a0ab000082c4000066f1000098170100be5201006ccd0100d6cd0100ceeb01000eec010038ec01007aec010084ec01009eec0100a2ec0100acec0100b2ec010058100200d0100200c61702002618020030180200681802009018020096180200aa180200864102009041020006420200f4550200c45b0200ce5b0200445c0200646b02006e6b0200e46b0200 + m_ExpandedIDs: d0cafeff10cbfeff8ed1feffacd1feff48d4feff8ad4feff08dbfeff26dbfeff50ddfeff90ddfeffcce2feffeee2feff90e3feff52eafeffaaeafeffe2effeff00f0feff1a09ffff6009ffff980effffb60efffff018ffff3c19ffffa41fffffd21fffff3024ffff7024ffffd22afffffa2affff7e2effffc02effff2235ffff4a35ffffa043ffffde4affff104effff504effffb254ffffda54fffff85bffff0463ffff4a68ffff8a68ffffec6effff146fffffa07affffe07affff4281ffff6a81ffff3684ffff328bffff728bffffd491fffffc91ffff5098ffff9298fffff49effff1c9fffff48b0fffffeb0ffff5ae0ffff60e0ffffdae2ffffc8ecffff6cf2ffff5cf9ffff06fbffffb25f000022a5000040a5000084a6000094a6000066a70000d0a700007ca80000d0a80000fac100001ec20000a6c3000092c4000026c60000e6c60000569b01004e9d0100e4cd0100f4cd0100c6ce010030cf0100dccf010030d00100823502009a3b0200ce580200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1047,7 +1079,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 4} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1055,7 +1087,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &19 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1083,3 +1115,97 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] +--- !u!114 &23 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 355 + y: 73 + width: 1140 + height: 717 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - F:\Projects\Unity\flufflparty\FlufflParty\Library\PlayModeViewStates\72a4c659805576348ac7e2c392e84e47 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1140, y: 696} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -570 + m_HBaseRangeMax: 570 + m_VBaseRangeMin: -348 + m_VBaseRangeMax: 348 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1140 + height: 696 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 570, y: 348} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -570 + y: -348 + width: 1140 + height: 696 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1140, y: 717} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index 49fff4e..b951ee8 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -77,6 +77,7 @@ +