diff --git a/Assets/External-Assets/packages/LudoTurns.meta b/Assets/External-Assets/packages/LudoTurns.meta new file mode 100644 index 0000000..ae9b5c7 --- /dev/null +++ b/Assets/External-Assets/packages/LudoTurns.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3ea4819072614c93a0c99d87489e004 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External-Assets/packages/LudoTurns/blue-turn-icon.png b/Assets/External-Assets/packages/LudoTurns/blue-turn-icon.png new file mode 100644 index 0000000..59ca1e3 Binary files /dev/null and b/Assets/External-Assets/packages/LudoTurns/blue-turn-icon.png differ diff --git a/Assets/External-Assets/packages/LudoTurns/blue-turn-icon.png.meta b/Assets/External-Assets/packages/LudoTurns/blue-turn-icon.png.meta new file mode 100644 index 0000000..378146f --- /dev/null +++ b/Assets/External-Assets/packages/LudoTurns/blue-turn-icon.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 918d44d1d3507495ebe9a63f04ddfa19 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + 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: 1 + 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: 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 + - 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 + 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/Assets/External-Assets/packages/LudoTurns/green-turn-icon.png b/Assets/External-Assets/packages/LudoTurns/green-turn-icon.png new file mode 100644 index 0000000..e3bb935 Binary files /dev/null and b/Assets/External-Assets/packages/LudoTurns/green-turn-icon.png differ diff --git a/Assets/External-Assets/packages/LudoTurns/green-turn-icon.png.meta b/Assets/External-Assets/packages/LudoTurns/green-turn-icon.png.meta new file mode 100644 index 0000000..1edbbc3 --- /dev/null +++ b/Assets/External-Assets/packages/LudoTurns/green-turn-icon.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 253fef382e0d74d448ee879e2fc3b43c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + 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: 1 + 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: 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 + - 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 + 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/Assets/External-Assets/packages/LudoTurns/grey-turn-icon.png b/Assets/External-Assets/packages/LudoTurns/grey-turn-icon.png new file mode 100644 index 0000000..f6c5814 Binary files /dev/null and b/Assets/External-Assets/packages/LudoTurns/grey-turn-icon.png differ diff --git a/Assets/External-Assets/packages/LudoTurns/grey-turn-icon.png.meta b/Assets/External-Assets/packages/LudoTurns/grey-turn-icon.png.meta new file mode 100644 index 0000000..dc46bdd --- /dev/null +++ b/Assets/External-Assets/packages/LudoTurns/grey-turn-icon.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: c93232af737064b1f93496ea5cdac531 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + 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: 1 + 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: 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 + - 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 + 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/Assets/External-Assets/packages/LudoTurns/red-turn-icon.png b/Assets/External-Assets/packages/LudoTurns/red-turn-icon.png new file mode 100644 index 0000000..0b584a5 Binary files /dev/null and b/Assets/External-Assets/packages/LudoTurns/red-turn-icon.png differ diff --git a/Assets/External-Assets/packages/LudoTurns/red-turn-icon.png.meta b/Assets/External-Assets/packages/LudoTurns/red-turn-icon.png.meta new file mode 100644 index 0000000..95b0b2c --- /dev/null +++ b/Assets/External-Assets/packages/LudoTurns/red-turn-icon.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 92ec6ff26880b4457ad1a37e1901816f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + 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: 1 + 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: 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 + - 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 + 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/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index f50d2c3..9da61e5 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -15554,6 +15554,82 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be69a8cfb3b2940308cbac570565e629, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1489264325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1489264326} + - component: {fileID: 1489264328} + - component: {fileID: 1489264327} + m_Layer: 5 + m_Name: TurnIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1489264326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1489264325} + 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: 1 + m_Children: [] + m_Father: {fileID: 5608193482405246780} + 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: -115, y: 150} + m_SizeDelta: {x: 150, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1489264327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1489264325} + 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: 0.96862745, g: 0.78039217, b: 0.37254903, 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: 92ec6ff26880b4457ad1a37e1901816f, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1489264328 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1489264325} + m_CullTransparentMesh: 1 --- !u!1001 &1497117899 PrefabInstance: m_ObjectHideFlags: 0 @@ -18082,7 +18158,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1882416428171655664, guid: 94fc731c540da43c9ab09386da3501df, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1882416428171655664, guid: 94fc731c540da43c9ab09386da3501df, type: 3} propertyPath: m_AnchorMax.x @@ -18138,7 +18214,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1882416428171655664, guid: 94fc731c540da43c9ab09386da3501df, type: 3} propertyPath: m_AnchoredPosition.x - value: 100 + value: 110 objectReference: {fileID: 0} - target: {fileID: 1882416428171655664, guid: 94fc731c540da43c9ab09386da3501df, type: 3} propertyPath: m_AnchoredPosition.y @@ -19109,8 +19185,8 @@ RectTransform: m_Father: {fileID: 5608193482973815123} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.16352095, y: 0.11800001} + m_AnchorMin: {x: 0.00047905743, y: 0.019000001} + m_AnchorMax: {x: 0.164, y: 0.13700001} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -23257,10 +23333,10 @@ RectTransform: m_Father: {fileID: 5608193482000915565} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 628.68896, y: -55.449844} - m_SizeDelta: {x: 249, y: 76} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5608193481682591349 GameObject: @@ -23793,10 +23869,10 @@ RectTransform: m_Father: {fileID: 5608193482000915565} 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: 359.68896, y: -55.449844} - m_SizeDelta: {x: 249, y: 76} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5608193482091674333 GameObject: @@ -23906,9 +23982,9 @@ RectTransform: m_Father: {fileID: 5608193481540211365} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 559.0071, y: -131.80347} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5608193482123643061 @@ -24203,6 +24279,7 @@ RectTransform: - {fileID: 5608193482794695410} - {fileID: 5608193482610168847} - {fileID: 5608193483164820607} + - {fileID: 1489264326} - {fileID: 1763545632} m_Father: {fileID: 5608193482973815123} m_RootOrder: 0 @@ -24243,10 +24320,16 @@ MonoBehaviour: m_EditorClassIdentifier: screenType: 5 shouldFade: 0 + playerTurnIcon: {fileID: 1489264327} diceBtn: {fileID: 2076464264} pauseBtn: {fileID: 5608193482794695415} diceCountText: {fileID: 5608193483164820606} playerTurnText: {fileID: 5608193482610168846} + turnSprites: + - {fileID: 21300000, guid: 92ec6ff26880b4457ad1a37e1901816f, type: 3} + - {fileID: 21300000, guid: 918d44d1d3507495ebe9a63f04ddfa19, type: 3} + - {fileID: 21300000, guid: c93232af737064b1f93496ea5cdac531, type: 3} + - {fileID: 21300000, guid: 253fef382e0d74d448ee879e2fc3b43c, type: 3} --- !u!224 &5608193482405325761 RectTransform: m_ObjectHideFlags: 0 @@ -24305,7 +24388,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!223 &5608193482405325790 Canvas: m_ObjectHideFlags: 0 @@ -25169,9 +25252,9 @@ RectTransform: m_Father: {fileID: 5608193481540211365} 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: 186.3357, y: -131.80347} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5608193482885172033 diff --git a/Assets/Scripts/Gameplay/GameplayManager.cs b/Assets/Scripts/Gameplay/GameplayManager.cs index e487239..15424f3 100644 --- a/Assets/Scripts/Gameplay/GameplayManager.cs +++ b/Assets/Scripts/Gameplay/GameplayManager.cs @@ -266,6 +266,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader { currentPlayerTurnTimer?.KillTimer(); uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn); + uIManager.UpdatePlayerTurnIcon(currentPlayerTypeTurn); return; } } @@ -273,6 +274,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader // SetCanRollDiceForUser(true); // TODO :: Need to change uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn, currentPlayerMaxTime); + uIManager.UpdatePlayerTurnIcon(currentPlayerTypeTurn); if (currentPlayerTurnTimer == null) currentPlayerTurnTimer = new TimerSystem(); @@ -1026,7 +1028,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader else { SetCanRollDiceForUser(false); - currentPlayerTurnTimer.KillTimer(); + currentPlayerTurnTimer?.KillTimer(); Invoke(nameof(UpdateDiceViewForBot), diceRollDelayForBot); } @@ -1386,7 +1388,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader ResetGameRestartData(); - currentPlayerTurnTimer.KillTimer(); + currentPlayerTurnTimer?.KillTimer(); currentPlayerTurnTimer = null; OnGameResumed = null; playerDatas = null; diff --git a/Assets/Scripts/UI/Managers/UIManager.cs b/Assets/Scripts/UI/Managers/UIManager.cs index 106ba38..391c7a3 100644 --- a/Assets/Scripts/UI/Managers/UIManager.cs +++ b/Assets/Scripts/UI/Managers/UIManager.cs @@ -54,6 +54,11 @@ public class UIManager : MonoBehaviour, IBase, IBootLoader, IDataLoader screenManager.GetScreen(ScreenType.InGameHUDScreen).UpdateBotTurnText(type); } + public void UpdatePlayerTurnIcon(PlayerType type) + { + screenManager.GetScreen(ScreenType.InGameHUDScreen).UpdatePlayerTurnIcon(type); + } + public void OnGameOver() { screenManager.HideAllScreens(); diff --git a/Assets/Scripts/UI/Pages/Screens/GameHUDScreen.cs b/Assets/Scripts/UI/Pages/Screens/GameHUDScreen.cs index 289d0f1..601e7c1 100644 --- a/Assets/Scripts/UI/Pages/Screens/GameHUDScreen.cs +++ b/Assets/Scripts/UI/Pages/Screens/GameHUDScreen.cs @@ -1,9 +1,11 @@ +using TMPro; using UnityEngine; using UnityEngine.UI; -using TMPro; public class GameHUDScreen : ScreenBase { + [SerializeField] private Image playerTurnIcon; + [Header("Buttons")] [SerializeField] private Button diceBtn; [SerializeField] private Button pauseBtn; @@ -12,6 +14,8 @@ public class GameHUDScreen : ScreenBase [SerializeField] private TMP_Text diceCountText; [SerializeField] private TMP_Text playerTurnText; + [SerializeField] private Sprite[] turnSprites; + private SoundManager soundManager; private UIManager uiManager; @@ -64,4 +68,9 @@ public class GameHUDScreen : ScreenBase Debug.Log($"UpdateTurnText: Bot Turn :: {(PlayerColorType)((int)playerType)}"); playerTurnText.text = $"Turn : {(PlayerColorType)((int)playerType)}"; } + + public void UpdatePlayerTurnIcon(PlayerType playerType) + { + playerTurnIcon.sprite = turnSprites[(int)playerType]; + } }