diff --git a/Assets/Prefab/Player.prefab b/Assets/Prefab/Player.prefab index 1e77e4b..c054121 100644 --- a/Assets/Prefab/Player.prefab +++ b/Assets/Prefab/Player.prefab @@ -10,8 +10,8 @@ GameObject: m_Component: - component: {fileID: 1401925065402265156} - component: {fileID: 1401925065402265157} - - component: {fileID: 1401925065402265154} - component: {fileID: 1401925065402265155} + - component: {fileID: 1401925064809260275} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 1401925065402265152} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.46, y: -2.02, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 0.21908382, y: 0.21920231, z: 0.1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -73,7 +73,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 54b9d01f2dc7958489f795dd40a179e6, type: 3} + m_Sprite: {fileID: 21300000, guid: ebfe1595074284e4ba3c93b799b775cd, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -84,22 +84,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!58 &1401925065402265154 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1401925065402265152} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 5 --- !u!50 &1401925065402265155 Rigidbody2D: serializedVersion: 4 @@ -121,3 +105,109 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!60 &1401925064809260275 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401925065402265152} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 5.86, y: 4.46} + newSize: {x: 17.7, y: 17.7} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.81, y: -2.1599998} + - {x: 2.08, y: -2.06} + - {x: 2.1599998, y: -2.02} + - {x: 2.3999999, y: -1.8499999} + - {x: 2.57, y: -1.68} + - {x: 2.6699998, y: -1.54} + - {x: 2.73, y: -1.4399999} + - {x: 2.82, y: -1.28} + - {x: 2.86, y: -1.18} + - {x: 2.9099998, y: -0.95} + - {x: 2.9299998, y: -0.83} + - {x: 2.9299998, y: 0.82} + - {x: 2.8899999, y: 1.04} + - {x: 2.81, y: 1.3} + - {x: 2.73, y: 1.4499999} + - {x: 2.6299999, y: 1.5999999} + - {x: 2.53, y: 1.7099999} + - {x: 2.45, y: 1.79} + - {x: 2.26, y: 1.9599999} + - {x: 2.08, y: 2.06} + - {x: 1.75, y: 2.1699998} + - {x: 1.65, y: 2.19} + - {x: 1.53, y: 2.21} + - {x: 1.38, y: 2.23} + - {x: -1.37, y: 2.23} + - {x: -1.41, y: 2.22} + - {x: -1.53, y: 2.21} + - {x: -1.65, y: 2.19} + - {x: -1.9399999, y: 2.12} + - {x: -2.04, y: 2.07} + - {x: -2.25, y: 1.9499999} + - {x: -2.4199998, y: 1.8399999} + - {x: -2.5, y: 1.76} + - {x: -2.6299999, y: 1.5999999} + - {x: -2.71, y: 1.48} + - {x: -2.75, y: 1.4} + - {x: -2.85, y: 1.17} + - {x: -2.9099998, y: 0.95} + - {x: -2.9299998, y: 0.82} + - {x: -2.9299998, y: -0.83} + - {x: -2.9099998, y: -0.95} + - {x: -2.85, y: -1.17} + - {x: -2.76, y: -1.41} + - {x: -2.6, y: -1.65} + - {x: -2.46, y: -1.79} + - {x: -2.26, y: -1.9499999} + - {x: -2.1599998, y: -2.02} + - {x: -1.8199999, y: -2.1599998} + - {x: -1.65, y: -2.2} + - {x: -1.53, y: -2.21} + - {x: -1.38, y: -2.23} + - {x: 1.42, y: -2.23} + - {x: 1.53, y: -2.22} + - {x: 1.66, y: -2.2} + - - {x: -1.52, y: -1.17} + - {x: -1.74, y: -1.05} + - {x: -1.86, y: -0.81} + - {x: -1.88, y: -0.62} + - {x: -1.9, y: -0.62} + - {x: -1.9, y: 0.64} + - {x: -1.88, y: 0.65999997} + - {x: -1.74, y: 1.04} + - {x: -1.52, y: 1.17} + - {x: -1.3, y: 1.2099999} + - {x: -1.28, y: 1.24} + - {x: 1.26, y: 1.24} + - {x: 1.27, y: 1.23} + - {x: 1.31, y: 1.22} + - {x: 1.62, y: 1.14} + - {x: 1.76, y: 1.02} + - {x: 1.86, y: 0.79999995} + - {x: 1.88, y: 0.65} + - {x: 1.9, y: 0.63} + - {x: 1.89, y: -0.63} + - {x: 1.88, y: -0.66999996} + - {x: 1.8, y: -0.96999997} + - {x: 1.63, y: -1.14} + - {x: 1.27, y: -1.23} + - {x: 1.26, y: -1.24} + - {x: -1.28, y: -1.24} + - {x: -1.27, y: -1.22} diff --git a/Assets/Scenes/Levels/Level0.unity b/Assets/Scenes/Levels/Level0.unity index bdbc7ea..d926d05 100644 --- a/Assets/Scenes/Levels/Level0.unity +++ b/Assets/Scenes/Levels/Level0.unity @@ -1941,11 +1941,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.x - value: -0.46 + value: -0.1111 objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.y - value: -2.02 + value: -1.7542 objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index e3d5089..9689789 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -12,7 +12,7 @@ public class GameManager : MonoBehaviour public static GameManager instance { get; private set; } - public Sprite normalFace, sadFace, pogFace; + // public Sprite normalFace, sadFace, pogFace; public Text timerTxt; @@ -80,13 +80,13 @@ public class GameManager : MonoBehaviour instance.gameOverPanel.SetActive(true); instance.gameStarted = false; - instance.player.GetComponent().sprite = instance.sadFace; + // instance.player.GetComponent().sprite = instance.sadFace; } public static void GameWon(){ instance.gameStarted = false; instance.gameWonPanel.SetActive(true); - instance.player.GetComponent().sprite = instance.pogFace; + // instance.player.GetComponent().sprite = instance.pogFace; instance.gameWon(); } diff --git a/Assets/Sprites/token.png b/Assets/Sprites/token.png new file mode 100644 index 0000000..9a12fe4 Binary files /dev/null and b/Assets/Sprites/token.png differ diff --git a/Assets/Sprites/token.png.meta b/Assets/Sprites/token.png.meta new file mode 100644 index 0000000..4e2d157 --- /dev/null +++ b/Assets/Sprites/token.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: ebfe1595074284e4ba3c93b799b775cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: