gjcampbell/ICDBWTMAG2020
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a score and score title that display at the end of the game and fixed a few UI bugs that resulted from the game over status or restarting

Browse Source
This commit is contained in:
Gregory Campbell
2020-06-08 23:18:18 -04:00
parent 8ab5c5ade8
commit b4e7f7080c
6 changed files with 284 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Main Scene.unity
+168 -6
View File
@@ -200,7 +200,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &519420028
GameObject:
@@ -283,7 +283,88 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &610814838
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 610814840}
- component: {fileID: 610814839}
m_Layer: 0
m_Name: ScoreTitle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!212 &610814839
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 610814838}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
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_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -125711741
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: dd10188e951816c49a522652187e56cc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 5.12, y: 2.56}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &610814840
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 610814838}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &838031008
GameObject:
@@ -508,7 +589,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1664203755
GameObject:
@@ -542,7 +623,9 @@ MonoBehaviour:
Object: {fileID: 317481903}
Dirt: {fileID: 5810670192936853663, guid: 6c319566e78e59d4b848e83cbf6cb8c5, type: 3}
Restart: {fileID: 2120053446}
ScoreTitle: {fileID: 610814838}
Countdown: {fileID: 838031010}
Score: {fileID: 1804874296}
ObjectSprites:
- {fileID: 21300000, guid: f86f46202b4377743b719984d5bb8396, type: 3}
- {fileID: 21300000, guid: bf9a4d7870709424d95eaad944a6363b, type: 3}
@@ -563,7 +646,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1739945069
GameObject:
@@ -646,7 +729,7 @@ Transform:
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &1739945072
PolygonCollider2D:
@@ -849,6 +932,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 838031009}
- {fileID: 1804874295}
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -857,6 +941,84 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1804874294
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1804874295}
- component: {fileID: 1804874297}
- component: {fileID: 1804874296}
m_Layer: 5
m_Name: ScoreText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1804874295
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804874294}
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: 1769056510}
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: 300, y: 150}
m_SizeDelta: {x: 400, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1804874296
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804874294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: a32081f970984024b87f4cac03c0c93f, type: 2}
m_FontSize: 0
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 0
--- !u!222 &1804874297
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804874294}
m_CullTransparentMesh: 0
--- !u!1 &1885377150
GameObject:
m_ObjectHideFlags: 0
@@ -938,7 +1100,7 @@ Transform:
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &1885377153
PolygonCollider2D:
Assets/Scripts/GameScript.cs
+17 -4
View File
@@ -9,7 +9,9 @@ public class GameScript : MonoBehaviour
public GameObject Object;
public GameObject Dirt;
public GameObject Restart;
public GameObject ScoreTitle;
public Text Countdown;
public Text Score;
public Sprite[] ObjectSprites;
private bool clicked = false;
@@ -64,9 +66,9 @@ public class GameScript : MonoBehaviour
if(pickedUpItem.name == "Rag")
{
pickedUpItem.transform.position = new Vector2(7.25f, 2.5f);
pickedUpItem.transform.position = new Vector2(7.25f, 2f);
} else if (pickedUpItem.name == "SprayBottle"){
pickedUpItem.transform.position = new Vector2(7.25f, -2.5f);
pickedUpItem.transform.position = new Vector2(7.25f, -2f);
}
pickedUpItem.transform.rotation = Quaternion.identity;
@@ -109,13 +111,16 @@ public class GameScript : MonoBehaviour
if(pickedUpItem != null && pickedUpItem.name == "Rag")
{
pickedUpItem.transform.position = new Vector2(7.25f, 2.5f);
pickedUpItem.transform.position = new Vector2(7.25f, 2f);
pickedUpItem.transform.rotation = Quaternion.identity;
} else if (pickedUpItem != null && pickedUpItem.name == "SprayBottle"){
pickedUpItem.transform.position = new Vector2(7.25f, -2.5f);
pickedUpItem.transform.position = new Vector2(7.25f, -2f);
pickedUpItem.transform.rotation = Quaternion.identity;
}
Score.text = objectsPolished.ToString();
ScoreTitle.SetActive(true);
Object.SetActive(false);
//Destorys all dirt and spray gameobjects left over that player didn't clean
@@ -134,11 +139,19 @@ public class GameScript : MonoBehaviour
//Debug.Log("GameOver");
}
if(gameOver)
{
Countdown.text = "0";
}
}
void Setup()
{
Score.text = null;
ScoreTitle.SetActive(false);
Object.transform.localScale = new Vector3(1, 1, 1);
Object.GetComponent<SpriteRenderer>().sprite = null;
Destroy(Object.GetComponent<PolygonCollider2D>());
Assets/Textures/Score.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

Assets/Textures/Score.png.meta
+92
View File
@@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: dd10188e951816c49a522652187e56cc
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
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: 100
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
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:
Assets/Textures/Score.xcf
BIN
View File
Binary file not shown.
Assets/Textures/Score.xcf.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bbf60cb349bd80b40b558b8fdf06ea23
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: