added high score menu

This commit is contained in:
naomi-rc 2022-05-15 17:03:16 -04:00
parent 0451c5c6fe
commit 1cb1663c55
12 changed files with 5841 additions and 2756 deletions

BIN
Assets/Art/cursor.png.meta (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1100cff5e3f9afc42875a0bb14f21a95
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,455 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.059585262, g: 0.122641504, b: 0.122641504, a: 1}
m_FogMode: 3
m_FogDensity: 0.03
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 2100000, guid: 369b9ebe3a62b904dbc19bd332b44086, type: 2}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.010482521, g: 0.0529591, b: 0.1531336, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &410087039
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 410087041}
- component: {fileID: 410087040}
- component: {fileID: 410087042}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!108 &410087040
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410087039}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 2
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 5000
m_UseColorTemperature: 1
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &410087041
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410087039}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &410087042
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410087039}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 1
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
--- !u!1 &777505481
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 777505485}
- component: {fileID: 777505484}
- component: {fileID: 777505483}
- component: {fileID: 777505482}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &777505482
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 777505481}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 1
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!81 &777505483
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 777505481}
m_Enabled: 1
--- !u!20 &777505484
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 777505481}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 2147483647
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &777505485
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 777505481}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &683329436419417410
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 683329437278479238, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_Name
value: HighScoresCanvas
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 683329437278479239, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1100cff5e3f9afc42875a0bb14f21a95, type: 3}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8acc03cd74188954bbc9a8aa1a5ff0cc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9,12 +9,18 @@ public class GameManager : MonoBehaviour
[SerializeField] private CannonScript[] cannonList;
[SerializeField] private UIController uiController;
[SerializeField] private WorldSwitcher worldSwitcher;
[SerializeField] private HighScoreManager highScoreManager;
[SerializeField] GameManager gameManager;
[SerializeField] TimeController timeController;
[Header("Game Variables")]
[SerializeField, ReadOnly] private GameState state;
[SerializeField, ReadOnly] private float points;
[SerializeField, ReadOnly] private float maxPoints;
[field: SerializeField, ReadOnly] public int CurrentDimensionID { get; private set; }
[SerializeField] private int[] IDLayerList;
public static GameManager Instance { get; private set; }
@ -60,7 +66,7 @@ public class GameManager : MonoBehaviour
private void TriggerGameOver(int dimensionID)
{
if (state == GameState.Loss) return;
SaveScoreTime();
// Stop controls
controls.SwitchCurrentActionMap("UI");
@ -113,6 +119,12 @@ public class GameManager : MonoBehaviour
{
points = nPoints;
uiController.UpdatePointsText(points);
if (points > maxPoints)
{
maxPoints = points;
uiController.UpdateMaxPointsText(points);
}
}
public void SpendPoints(float amount)
@ -140,6 +152,11 @@ public class GameManager : MonoBehaviour
return IDLayerList[CurrentDimensionID];
}
public void SaveScoreTime()
{
highScoreManager.AddHighScoreEntry((int)maxPoints, timeController.GetTime());
}
}
public enum GameState

View File

@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class HighScoreManager : MonoBehaviour
{
@ -15,24 +16,34 @@ public class HighScoreManager : MonoBehaviour
//To add new score: AddHighScoreEntry(10000, "60");
private void Awake()
{
if (SceneManager.GetActiveScene().name.Equals("HighScores"))
{
LoadScores();
}
}
private void LoadScores()
{
entryContainer = transform.Find("EntryContainer");
entryTemplate = entryContainer.Find("EntryTemplate");
entryTemplate.gameObject.SetActive(false);
string jsonString = PlayerPrefs.GetString("highscoreTable");
HighScores highScores = JsonUtility.FromJson<HighScores>(jsonString);
highScoreEntryList = highScores.highscoreEntryList;
highScoreEntryList.Sort((s2, s1) => s1.score.CompareTo(s2.score));
highScoreEntryList.Sort((s2, s1) => s1.score.CompareTo(s2.score));
highScoreEntryList = highScoreEntryList.GetRange(0, Mathf.Min(highScores.highscoreEntryList.Count, 10));
highScoreEntryTransformList = new List<Transform>();
foreach(HighScoreEntry highScoreEntry in highScoreEntryList)
foreach (HighScoreEntry highScoreEntry in highScoreEntryList)
{
CreateHighScoreEntryTransform(highScoreEntry, entryContainer, highScoreEntryTransformList);
}
}
}
private void CreateHighScoreEntryTransform(HighScoreEntry entry, Transform container, List<Transform> transformList)
{
float templateHeight = 50f;
@ -48,7 +59,7 @@ public class HighScoreManager : MonoBehaviour
transformList.Add(entryTransform);
}
private void AddHighScoreEntry(int score, string time)
public void AddHighScoreEntry(int score, string time)
{
HighScoreEntry highScoreEntry = new HighScoreEntry { score = score, time = time };
string jsonString = PlayerPrefs.GetString("highscoreTable");
@ -70,13 +81,7 @@ public class HighScoreManager : MonoBehaviour
{
public int score;
public string time;
}
public void TempGameOver()
{
AddHighScoreEntry((int)gameManager.GetPoints(), timeController.GetTime());
Debug.Log("Added entry");
}
}
}

View File

@ -14,7 +14,7 @@ public class TimeController : MonoBehaviour
startTime = Time.time;
timeCounter.color = Color.white;
finishedGame = false;
timeCounter.text = "Time 00.00.00";
timeCounter.text = "00.00.00";
}
void Update()
@ -26,7 +26,7 @@ public class TimeController : MonoBehaviour
string minutes = minutesValue < 10 ? $"0{minutesValue}" : minutesValue.ToString();
float secondsValue = (time % 60);
string seconds = (secondsValue < 10) ? $"0{secondsValue.ToString("f2")}" : secondsValue.ToString("f2");
timeCounter.text = "Time " + minutes + "." + seconds;
timeCounter.text = $"{minutes}.{seconds}";
}
public string GetTime()

View File

@ -7,6 +7,7 @@ using TMPro;
public class UIController : MonoBehaviour
{
[SerializeField] private TMP_Text pointsTxt;
[SerializeField] private Text maxPointsTxt;
[SerializeField] private HealthBar mainHealthBar;
[SerializeField] private HealthBar[] verticalHealthBars;
@ -41,4 +42,9 @@ public class UIController : MonoBehaviour
mainHealthBar.SetFillingAmount(hpFillingAmount);
}
}
public void UpdateMaxPointsText(float points)
{
maxPointsTxt.text = points.ToString("0");
}
}