From 02675d5283a699ef4dc32b6be783df3ea7f3ed5b Mon Sep 17 00:00:00 2001 From: jasoncramer Date: Mon, 4 May 2020 23:50:56 -0400 Subject: [PATCH] finalize game and add score update texts --- .../Resources/Environment/Images/neg50.png | 3 + .../Environment/Images/neg50.png.meta | 110 ++++++++++ .../Resources/Pickups/MinusFifty.prefab | 81 ++++++++ .../Resources/Pickups/MinusFifty.prefab.meta | 7 + .../Pickups/ScoreModifierCanvas.prefab | 194 ++++++++++++++++++ .../Pickups/ScoreModifierCanvas.prefab.meta | 7 + .../Assets/Resources/Pickups/ScoreText.prefab | 95 +++++++++ .../Resources/Pickups/ScoreText.prefab.meta | 7 + Sidescroller/Assets/Scenes/Level.unity | 2 + Sidescroller/Assets/Scenes/Menu.unity | 139 ++++++++++++- Sidescroller/Assets/Scripts/Gameflow.cs | 30 +++ .../ProjectSettings/EditorBuildSettings.asset | 3 - 12 files changed, 667 insertions(+), 11 deletions(-) create mode 100644 Sidescroller/Assets/Resources/Environment/Images/neg50.png create mode 100644 Sidescroller/Assets/Resources/Environment/Images/neg50.png.meta create mode 100644 Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab create mode 100644 Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab.meta create mode 100644 Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab create mode 100644 Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab.meta create mode 100644 Sidescroller/Assets/Resources/Pickups/ScoreText.prefab create mode 100644 Sidescroller/Assets/Resources/Pickups/ScoreText.prefab.meta diff --git a/Sidescroller/Assets/Resources/Environment/Images/neg50.png b/Sidescroller/Assets/Resources/Environment/Images/neg50.png new file mode 100644 index 0000000..5200bca --- /dev/null +++ b/Sidescroller/Assets/Resources/Environment/Images/neg50.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b6d6e6bf6c580f05390063cadd352f2a740d916089d22e59d5c4ba387a2ae95 +size 2951 diff --git a/Sidescroller/Assets/Resources/Environment/Images/neg50.png.meta b/Sidescroller/Assets/Resources/Environment/Images/neg50.png.meta new file mode 100644 index 0000000..5d75c0b --- /dev/null +++ b/Sidescroller/Assets/Resources/Environment/Images/neg50.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 0243b5fe405c20e4f91b234921b86a29 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + 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: 128 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3442b04b867c15b478036e8e43c6b78e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab b/Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab new file mode 100644 index 0000000..c1643b2 --- /dev/null +++ b/Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4684248563533891967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6500415804563281847} + - component: {fileID: 306489235670443536} + m_Layer: 0 + m_Name: MinusFifty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6500415804563281847 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4684248563533891967} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &306489235670443536 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4684248563533891967} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0243b5fe405c20e4f91b234921b86a29, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab.meta b/Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab.meta new file mode 100644 index 0000000..90087b2 --- /dev/null +++ b/Sidescroller/Assets/Resources/Pickups/MinusFifty.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 001e53e47727d61408a4e5b5399d3b1b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab b/Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab new file mode 100644 index 0000000..ef7c3a3 --- /dev/null +++ b/Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab @@ -0,0 +1,194 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7885945125379827450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7885945125379827430} + - component: {fileID: 7885945125379827429} + - component: {fileID: 7885945125379827428} + - component: {fileID: 7885945125379827451} + m_Layer: 5 + m_Name: ScoreModifierCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7885945125379827430 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7885945125379827450} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 712233216997920945} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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, y: 0} +--- !u!223 &7885945125379827429 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7885945125379827450} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &7885945125379827428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7885945125379827450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &7885945125379827451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7885945125379827450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &9025345504640220159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 712233216997920945} + - component: {fileID: 6589302016447446112} + - component: {fileID: 6778950865164823545} + - component: {fileID: 1329481289373644693} + m_Layer: 5 + m_Name: ScoreText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &712233216997920945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9025345504640220159} + 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_Children: [] + m_Father: {fileID: 7885945125379827430} + 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, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6589302016447446112 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9025345504640220159} + m_CullTransparentMesh: 0 +--- !u!114 &6778950865164823545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9025345504640220159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 60 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: -50 +--- !u!114 &1329481289373644693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9025345504640220159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.6627451} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 diff --git a/Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab.meta b/Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab.meta new file mode 100644 index 0000000..b36ab23 --- /dev/null +++ b/Sidescroller/Assets/Resources/Pickups/ScoreModifierCanvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04be9033fa423f24d97065ba33bbf939 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Sidescroller/Assets/Resources/Pickups/ScoreText.prefab b/Sidescroller/Assets/Resources/Pickups/ScoreText.prefab new file mode 100644 index 0000000..e9b870a --- /dev/null +++ b/Sidescroller/Assets/Resources/Pickups/ScoreText.prefab @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &98192732350220562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8502499744807395932} + - component: {fileID: 2841007666541645453} + - component: {fileID: 2454186691972618516} + - component: {fileID: 7957836482446214520} + m_Layer: 5 + m_Name: ScoreText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8502499744807395932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98192732350220562} + 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_Children: [] + m_Father: {fileID: 0} + 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, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2841007666541645453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98192732350220562} + m_CullTransparentMesh: 0 +--- !u!114 &2454186691972618516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98192732350220562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 60 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: -50 +--- !u!114 &7957836482446214520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98192732350220562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.6627451} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 diff --git a/Sidescroller/Assets/Resources/Pickups/ScoreText.prefab.meta b/Sidescroller/Assets/Resources/Pickups/ScoreText.prefab.meta new file mode 100644 index 0000000..77c959a --- /dev/null +++ b/Sidescroller/Assets/Resources/Pickups/ScoreText.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0fed59229626af34fb954a315d4d60af +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Sidescroller/Assets/Scenes/Level.unity b/Sidescroller/Assets/Scenes/Level.unity index 72b37a1..f8026c2 100644 --- a/Sidescroller/Assets/Scenes/Level.unity +++ b/Sidescroller/Assets/Scenes/Level.unity @@ -6641,6 +6641,8 @@ MonoBehaviour: timeKeeper: {fileID: 519420030} pauseGame: {fileID: 0} jumpSound: {fileID: 1566885121} + scoreModifierText: {fileID: 7885945125379827450, guid: 04be9033fa423f24d97065ba33bbf939, + type: 3} isPaused: 0 gruntHasWon: 0 wallInPlace: 0 diff --git a/Sidescroller/Assets/Scenes/Menu.unity b/Sidescroller/Assets/Scenes/Menu.unity index a89da72..3fa0884 100644 --- a/Sidescroller/Assets/Scenes/Menu.unity +++ b/Sidescroller/Assets/Scenes/Menu.unity @@ -2823,8 +2823,9 @@ MonoBehaviour: --- !u!1 &1072633115 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3422174769252054759, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + m_PrefabInstance: {fileID: 3422174768428590076} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: @@ -2841,8 +2842,9 @@ GameObject: --- !u!224 &1072633116 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + m_PrefabInstance: {fileID: 3422174768428590076} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1072633115} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -2860,8 +2862,9 @@ RectTransform: --- !u!114 &1072633117 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3422174769252054753, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + m_PrefabInstance: {fileID: 3422174768428590076} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1072633115} m_Enabled: 1 @@ -2892,8 +2895,9 @@ MonoBehaviour: --- !u!222 &1072633118 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3422174769252054754, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + m_PrefabInstance: {fileID: 3422174768428590076} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1072633115} m_CullTransparentMesh: 0 @@ -4665,3 +4669,122 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2045853143} m_CullTransparentMesh: 0 +--- !u!1001 &3422174768428590076 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1388383661} + m_Modifications: + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -103 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_SizeDelta.x + value: 458.1 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_SizeDelta.y + value: 99.20001 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054752, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3422174769252054759, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, + type: 3} + propertyPath: m_Name + value: Text + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fefa4c5d58ef50a4d87a4a16c4ec4752, type: 3} diff --git a/Sidescroller/Assets/Scripts/Gameflow.cs b/Sidescroller/Assets/Scripts/Gameflow.cs index 4d9ed02..f2db7d0 100644 --- a/Sidescroller/Assets/Scripts/Gameflow.cs +++ b/Sidescroller/Assets/Scripts/Gameflow.cs @@ -20,6 +20,7 @@ public class Gameflow : MonoBehaviour public TimeKeeper timeKeeper; public PauseGame pauseGame; public AudioSource jumpSound; + public GameObject scoreModifierText; [HideInInspector] public bool isPaused = false; [HideInInspector] public bool gruntHasWon = false; [HideInInspector] public bool wallInPlace = false; @@ -86,6 +87,22 @@ public class Gameflow : MonoBehaviour score = 0; } scoreText.text = "Score: " + score; + // instantiates a score update text on the screen (technically a canvas) + GameObject scoreUpdate = Instantiate(scoreModifierText); + Text scrText = scoreUpdate.GetComponentInChildren(); + // if the score added is positive, set it green and give it a plus, else red and a minus + if (amt >= 0) + { + scrText.text = "+" + amt; + scrText.color = new Color(0f, 1f, 0f); + } + else + { + // no minus needed bcause it is included in the number + scrText.text = "" + amt; + scrText.color = new Color(1f, 0f, 0f); + } + StartCoroutine(FadeTo(scrText, scoreUpdate, 0f, 1f)); // fade it out } public void AddDeath() @@ -95,6 +112,19 @@ public class Gameflow : MonoBehaviour AddScore(-50); } + // Fade out a text's alpha value + IEnumerator FadeTo(Text renderer, GameObject canvas, float aValue, float aTime) + { + float alpha = renderer.color.a; + for (float t = 0.0f; t < 1.0f; t += Time.deltaTime / aTime) + { + Color newColor = new Color(renderer.color.r, renderer.color.g, renderer.color.b, Mathf.Lerp(alpha, aValue, t)); + renderer.color = newColor; + yield return null; + } + Destroy(canvas); // destroy the prefab after it has faded out + } + // Change from the current incarnation to the next public void ChangePlayer() { diff --git a/Sidescroller/ProjectSettings/EditorBuildSettings.asset b/Sidescroller/ProjectSettings/EditorBuildSettings.asset index 579ba4d..ed492c4 100644 --- a/Sidescroller/ProjectSettings/EditorBuildSettings.asset +++ b/Sidescroller/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,4 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Level.unity guid: f5f934eb2f88f6842af88228e7a00aa0 - - enabled: 1 - path: Assets/Scenes/Credits.unity - guid: a5ddd79431a62e84bba598a660d42d34 m_configObjects: {}