diff --git a/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth 2.mat b/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth 2.mat index ab175377..ef096f8e 100644 --- a/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth 2.mat +++ b/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth 2.mat @@ -47,7 +47,7 @@ Material: - _MainTex: m_Texture: {fileID: 2800000, guid: 21eaf55ddaa3f874f8a025251d4443cd, type: 3} m_Scale: {x: -50, y: -50} - m_Offset: {x: -23.863695, y: 0} + m_Offset: {x: -39.32197, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat b/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat index 1be60b2d..2cd492e8 100644 --- a/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat +++ b/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat @@ -47,7 +47,7 @@ Material: - _MainTex: m_Texture: {fileID: 2800000, guid: 21eaf55ddaa3f874f8a025251d4443cd, type: 3} m_Scale: {x: -10, y: -10} - m_Offset: {x: 0, y: 47.7299} + m_Offset: {x: 0, y: 78.648224} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto Vacio.png b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto Vacio.png new file mode 100644 index 00000000..7c9f0d1b Binary files /dev/null and b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto Vacio.png differ diff --git a/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto Vacio.png.meta b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto Vacio.png.meta new file mode 100644 index 00000000..a7c36825 --- /dev/null +++ b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto Vacio.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 8defcf16cd4deb248a615b6dc1c696a5 +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto.png b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto.png new file mode 100644 index 00000000..d8f1a89e Binary files /dev/null and b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto.png differ diff --git a/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto.png.meta b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto.png.meta new file mode 100644 index 00000000..460c5e4a --- /dev/null +++ b/Assets/ART/Textures/Gameplay/Score/Puntaje Egypto.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 5704d2b9007d13345b082c4780b3a42e +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 805d1cc9..a4ddab59 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -1836,6 +1836,7 @@ MonoBehaviour: m_EditorClassIdentifier: gameObjects: - {fileID: 747330076} + - {fileID: 979432248} skyBox: {fileID: 2100000, guid: 7be5f699110fad74a865615d838737a1, type: 2} --- !u!1001 &369379435 PrefabInstance: @@ -2628,6 +2629,7 @@ RectTransform: m_LocalScale: {x: 0.82322, y: 0.82322, z: 0.82322} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 979432249} - {fileID: 264623811} - {fileID: 2108346322} - {fileID: 1415314594} @@ -2653,10 +2655,12 @@ MonoBehaviour: playerStats: {fileID: 11400000, guid: 3b0d911bf7ddf6b4f91f7798a73b6989, type: 2} playerCollision: {fileID: 4874120583695425628} scoreObjectsParents: + - {fileID: 979432248} - {fileID: 264623810} - {fileID: 1415314593} - {fileID: 2108346321} scoreObjects: + - {fileID: 1497294948} - {fileID: 417697684} - {fileID: 1300590013} - {fileID: 764390511} @@ -2664,6 +2668,7 @@ MonoBehaviour: - 0.06 - 0.095 - 0.06 + - 0.09 gameManager: {fileID: 26147096} portalAnimator: {fileID: 267273064} portalBoolPhasesFinishedName: arePhasesFinished @@ -5275,6 +5280,42 @@ MonoBehaviour: valueGuidInternal: WwiseObjectReference: {fileID: 11400000, guid: 77cedc27f7e89814592ab7d26832ac97, type: 2} ip: {fileID: 0} +--- !u!1 &979432248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 979432249} + m_Layer: 5 + m_Name: Egyptian Sprites + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &979432249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979432248} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9024592, y: 1.1503, z: 1.1503} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1497294949} + m_Father: {fileID: 474561857} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 43.677, y: -44} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 1} --- !u!1 &988545843 GameObject: m_ObjectHideFlags: 0 @@ -13911,6 +13952,96 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1642843760390861595, guid: 623b1a25e7cacf1438028b15670331ff, type: 3} m_PrefabInstance: {fileID: 1465394699} m_PrefabAsset: {fileID: 0} +--- !u!1 &1497294948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1497294949} + - component: {fileID: 1497294952} + - component: {fileID: 1497294951} + - component: {fileID: 1497294950} + m_Layer: 5 + m_Name: Egyptian Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1497294949 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497294948} + 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: 979432249} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0.00004386902, y: 32} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1497294950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497294948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4854061d129a62143a109f0b9f5c8cfb, type: 3} + m_Name: + m_EditorClassIdentifier: + baseSprite: {fileID: 21300000, guid: 8defcf16cd4deb248a615b6dc1c696a5, type: 3} + filledSprite: {fileID: 21300000, guid: 5704d2b9007d13345b082c4780b3a42e, type: 3} +--- !u!114 &1497294951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497294948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8defcf16cd4deb248a615b6dc1c696a5, 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 &1497294952 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497294948} + m_CullTransparentMesh: 1 --- !u!1 &1498465520 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/CheckColision.cs b/Assets/Scripts/Player/CheckColision.cs index 8703a9dc..6320eddf 100644 --- a/Assets/Scripts/Player/CheckColision.cs +++ b/Assets/Scripts/Player/CheckColision.cs @@ -79,14 +79,14 @@ void Update() } else if (hitInfo.collider.CompareTag(egyptCoinTag)) { - playerStats.collectedObjectsNoir += 1; + playerStats.collectedObjectsEgypt += 1; objectCollected?.Invoke(); Destroy(hitInfo.collider.gameObject); soundItems.Post(gameObject); } else if (hitInfo.collider.CompareTag(infectedEgyptCoinTag)) { - playerStats.collectedObjectsNoir -= 1; + playerStats.collectedObjectsEgypt -= 1; infectedObjectCollected?.Invoke(); Destroy(hitInfo.collider.gameObject); soundItems.Post(gameObject); diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs index 25b21c39..d56dcf07 100644 --- a/Assets/Scripts/UI/UIManager.cs +++ b/Assets/Scripts/UI/UIManager.cs @@ -110,6 +110,7 @@ private void CallPortal() private void CalculateScoreTexts() { + noirScoreText.text = playerStats.collectedObjectsEgypt.ToString() + " X "; noirScoreText.text = playerStats.collectedObjectsNoir.ToString() + " X "; synthwaveScoreText.text = playerStats.collectedObjectsSynthwave.ToString() + " X "; spaceScoreText.text = playerStats.collectedObjectsSpace.ToString() + " X ";