From c8a9ac5ce0903f671a9cf65d93d78598bf83faf0 Mon Sep 17 00:00:00 2001
From: MarcelRyan <marcel.ryan2004@gmail.com>
Date: Wed, 8 May 2024 16:23:16 +0700
Subject: [PATCH] [FEAT] Multislot done (debugging left)
---
Assets/Scenes/MainMenu.unity | 263 +++++++++++++++++-
Assets/Scripts/DataUtils/FileDataHandler.cs | 8 +-
Assets/Scripts/MainMenu/MainMenu.cs | 16 +-
Assets/Scripts/MainMenu/SaveSlotsMenu.cs | 2 +-
.../Managers/DataPersistenceManager.cs | 10 +-
5 files changed, 270 insertions(+), 29 deletions(-)
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index 82e4328..a489c72 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -1556,6 +1556,140 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 385603386}
m_CullTransparentMesh: 0
+--- !u!1 &443545947
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 443545948}
+ - component: {fileID: 443545950}
+ - component: {fileID: 443545949}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &443545948
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 443545947}
+ 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: 716746504}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &443545949
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 443545947}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Button
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 24
+ m_fontSizeBase: 24
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &443545950
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 443545947}
+ m_CullTransparentMesh: 1
--- !u!1 &505442218
GameObject:
m_ObjectHideFlags: 0
@@ -2735,6 +2869,127 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 708576896}
m_CullTransparentMesh: 1
+--- !u!1 &716746500
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 716746504}
+ - component: {fileID: 716746503}
+ - component: {fileID: 716746502}
+ - component: {fileID: 716746501}
+ m_Layer: 5
+ m_Name: Button
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &716746501
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 716746500}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 716746502}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &716746502
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 716746500}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ 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 &716746503
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 716746500}
+ m_CullTransparentMesh: 1
+--- !u!224 &716746504
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 716746500}
+ 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:
+ - {fileID: 443545948}
+ m_Father: {fileID: 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!1 &737616283
GameObject:
m_ObjectHideFlags: 0
@@ -7888,10 +8143,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5487042083318871305, guid: 2242591e5b2a354478f707bfb2e08fad, type: 3}
- propertyPath: m_TargetGraphic
- value:
- objectReference: {fileID: 0}
- target: {fileID: 6304524442119744541, guid: 2242591e5b2a354478f707bfb2e08fad, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
@@ -7924,8 +8175,7 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: Nightmare.SaveSlot, Assembly-CSharp
objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 3431231053936161919, guid: 2242591e5b2a354478f707bfb2e08fad, type: 3}
+ m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
@@ -7955,4 +8205,5 @@ SceneRoots:
- {fileID: 1097292934}
- {fileID: 1460444564}
- {fileID: 309830954}
+ - {fileID: 716746504}
- {fileID: 573993210}
diff --git a/Assets/Scripts/DataUtils/FileDataHandler.cs b/Assets/Scripts/DataUtils/FileDataHandler.cs
index 8687e55..db109ca 100644
--- a/Assets/Scripts/DataUtils/FileDataHandler.cs
+++ b/Assets/Scripts/DataUtils/FileDataHandler.cs
@@ -17,7 +17,7 @@ public class FileDataHandler
public GameData Load(string profileId)
{
- string fullPath = Path.Combine(dataDirPath, dataFileName);
+ string fullPath = Path.Combine(dataDirPath, profileId, dataFileName);
GameData loadedData = null;
@@ -49,9 +49,9 @@ public class FileDataHandler
return loadedData;
}
- public void Delete()
+ public void Delete(string profileId)
{
- string fullPath = Path.Combine(dataDirPath, dataFileName);
+ string fullPath = Path.Combine(dataDirPath, profileId, dataFileName);
if (File.Exists(fullPath))
{
@@ -104,7 +104,7 @@ public class FileDataHandler
public void Save(GameData data, string profileId)
{
- string fullPath = Path.Combine(dataDirPath, dataFileName);
+ string fullPath = Path.Combine(dataDirPath, profileId, dataFileName);
try
{
// create the directory file
diff --git a/Assets/Scripts/MainMenu/MainMenu.cs b/Assets/Scripts/MainMenu/MainMenu.cs
index 59d46cb..0af7f20 100644
--- a/Assets/Scripts/MainMenu/MainMenu.cs
+++ b/Assets/Scripts/MainMenu/MainMenu.cs
@@ -11,14 +11,6 @@ public class MainMenu : MonoBehaviour
[SerializeField] private Button loadButton;
[SerializeField] private SaveSlotsMenu saveSlotsMenu;
- private void Start()
- {
- if (!DataPersistenceManager.instance.HasGameData())
- {
- loadButton.interactable = false;
- }
- }
-
public void OpenSettings(bool open)
{
if(open)
@@ -44,10 +36,6 @@ public class MainMenu : MonoBehaviour
public void PlayGame()
{
- //Debug.Log("On New Game Clicked");
- //DataPersistenceManager.instance.NewGame();
- //LevelManager.Instance.LoadScene();
-
saveSlotsMenu.ActivateMenu(false);
this.DeactivateMenu();
}
@@ -61,9 +49,7 @@ public class MainMenu : MonoBehaviour
public void OnLoadGameClicked()
{
Debug.Log("OnLoadGame clicked");
- //DataPersistenceManager.instance.LoadGame();
- //DataPersistenceManager.instance.LoadGameClicked();
- //LevelManager.Instance.LoadScene();
+ DataPersistenceManager.instance.LoadGameClicked();
saveSlotsMenu.ActivateMenu(true);
this.DeactivateMenu();
}
diff --git a/Assets/Scripts/MainMenu/SaveSlotsMenu.cs b/Assets/Scripts/MainMenu/SaveSlotsMenu.cs
index 0f62ee6..1fd11b5 100644
--- a/Assets/Scripts/MainMenu/SaveSlotsMenu.cs
+++ b/Assets/Scripts/MainMenu/SaveSlotsMenu.cs
@@ -64,7 +64,7 @@ namespace Nightmare
{
DataPersistenceManager.instance.NewGame();
}
-
+
LevelManager.Instance.LoadScene();
}
diff --git a/Assets/Scripts/Managers/DataPersistenceManager.cs b/Assets/Scripts/Managers/DataPersistenceManager.cs
index 20a3767..7390d00 100644
--- a/Assets/Scripts/Managers/DataPersistenceManager.cs
+++ b/Assets/Scripts/Managers/DataPersistenceManager.cs
@@ -46,7 +46,7 @@ public class DataPersistenceManager : MonoBehaviour
{
if (!hasSaved && !loadGame)
{
- this.dataHandler.Delete();
+ this.dataHandler.Delete(this.selectedProfile);
}
else if (loadGame)
{
@@ -62,7 +62,7 @@ public class DataPersistenceManager : MonoBehaviour
Debug.Log("File Mechanism Called");
if (!hasSaved && !loadGame)
{
- this.dataHandler.Delete();
+ this.dataHandler.Delete(this.selectedProfile);
this.gameData = null;
}
else if (loadGame)
@@ -126,6 +126,8 @@ public class DataPersistenceManager : MonoBehaviour
this.newGame = true;
this.loadGame = false;
+ this.dataHandler.Delete(this.selectedProfile);
+
foreach (IDataPersistence dataPersistence in dataPersistenceList)
{
dataPersistence.LoadData(gameData);
@@ -144,10 +146,11 @@ public class DataPersistenceManager : MonoBehaviour
{
this.gameData = dataHandler.Load(this.selectedProfile);
this.loadedGameData = this.gameData;
+ Debug.Log(this.selectedProfile);
}
// if no data can be loaded, dont continue
- if (this.gameData == null || this.gameData.playerHealth <= 0)
+ if (this.gameData == null)
{
Debug.Log("No data was found. A New Game needs to be started before data can be loaded.");
return;
@@ -177,6 +180,7 @@ public class DataPersistenceManager : MonoBehaviour
// TODO - save data to a file
if (saveSafeHouse)
{
+ Debug.Log(this.selectedProfile);
dataHandler.Save(gameData, this.selectedProfile);
saveSafeHouse = false;
hasSaved = true;
--
GitLab