Added slight changes to loading in the game

2022-06-03 10:34:31 +02:00 · 2022-06-03 10:34:31 +02:00 · bcfe2bf2e6
commit bcfe2bf2e6
parent 20d24c5973
8 changed files with 92 additions and 40 deletions
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@ -660,94 +660,94 @@
 <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Animation.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.InternalAPIEngineBridge.001">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
 </Reference>
 <Reference Include="Unity.VSCode.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.PixelPerfect">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Tilemap.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
 </Reference>
 <Reference Include="PsdPlugin">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
 </Reference>
 <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.Timeline">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
 </Reference>
 <Reference Include="Unity.TextMeshPro">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.IK.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Sprite.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Psdimporter.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Path.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.InternalAPIEditorBridge.001">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
 </Reference>
 <Reference Include="UnityEditor.UI">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
 </Reference>
 <Reference Include="Unity.PlasticSCM.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.Rider.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
 </Reference>
 <Reference Include="UnityEngine.UI">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
 </Reference>
 <Reference Include="Unity.Mathematics">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.IK.Runtime">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Animation.Triangle.Runtime">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Animation.Runtime">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.PixelPerfect.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.Timeline.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.Mathematics.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Common.Runtime">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.SpriteShape.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.Common.Editor">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
 </Reference>
 <Reference Include="Unity.2D.SpriteShape.Runtime">
- <HintPath>C:/Users/alicj/Desktop/AnotherSaveAttempt/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
 </Reference>
  </ItemGroup>
  <ItemGroup>
--- a/Assets/NewGame.cs
+++ b/Assets/NewGame.cs
@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class NewGame : MonoBehaviour
+{
+    public void ResetSettings()
+    {
+        int rock = 1;
+        PlayerPrefs.SetInt("rock", rock);
+        string pickaxe1 = "create";
+        PlayerPrefs.SetString("pickaxe1", pickaxe1);
+        string name = "none";
+        PlayerPrefs.SetString("name", name);
+    }
+}
--- a/Assets/NewGame.cs.meta
+++ b/Assets/NewGame.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e6b43804df63af347866e3fbd09a6e25
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ParticleDisable.cs
+++ b/Assets/ParticleDisable.cs
@ -7,7 +7,7 @@ public class ParticleDisable : MonoBehaviour
    public int loadedInt;
    void Update()
    {
-        loadedInt = PlayerPrefs.GetInt("particles");
+        loadedInt = PlayerPrefs.GetInt("rock");
        StartCoroutine(Destroy(loadedInt));
    }

--- a/Assets/PlayerName.cs
+++ b/Assets/PlayerName.cs
@ -14,7 +14,7 @@ public class PlayerName : MonoBehaviour

    void Start()
    {
-        nameOfPlayer = PlayerPrefs.GetString("name");
+        nameOfPlayer = PlayerPrefs.GetString("name", "none");
        loadedName.text = nameOfPlayer;
    }

--- a/Assets/Scenes/Main
+++ b/Assets/Scenes/Main
@ -759,6 +759,7 @@ GameObject:
  - component: {fileID: 680041737}
  - component: {fileID: 680041736}
  - component: {fileID: 680041739}
+  - component: {fileID: 680041740}
  m_Layer: 5
  m_Name: NewGameButton
  m_TagString: Untagged
@ -842,6 +843,18 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
+      - m_Target: {fileID: 680041740}
+        m_TargetAssemblyTypeName: NewGame, Assembly-CSharp
+        m_MethodName: ResetSettings
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &680041737
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -892,6 +905,18 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 48a2ec1fec857c946ae3ae8e69b29562, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &680041740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 680041734}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e6b43804df63af347866e3fbd09a6e25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &724438447
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/breakable.cs
+++ b/Assets/breakable.cs
@ -22,7 +22,7 @@ public class breakable : MonoBehaviour
        {
            availableSprites.Add(i);
        }
-        int rock = PlayerPrefs.GetInt("particles");
+        int rock = PlayerPrefs.GetInt("rock");
        if(rock == 0)
        {
            Destroy(gameObject);
@ -32,7 +32,7 @@ public class breakable : MonoBehaviour
    IEnumerator Timer()
    {
        if (timeToBreak == true){
-            PlayerPrefs.SetInt("particles", 0);
+            PlayerPrefs.SetInt("rock", 0);
            Destroy(gameObject);
        }
        yield return new WaitForSeconds(1);
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -18,20 +18,20 @@ EditorUserSettings:
      value: 22424703114646680e0b0227036c72111f19352f223d667d6d051c3de5f5353fe7a923e7ee2e26
      flags: 0
    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a1532f0e1372ce7f518e8ea3f7129370bfb25
-      flags: 0
-    RecentlyUsedScenePath-5:
      value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1827f6e93a3ff1a923e7ee2e26
      flags: 0
-    RecentlyUsedScenePath-6:
+    RecentlyUsedScenePath-5:
      value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1226ece42776f7e93ffdfe
      flags: 0
-    RecentlyUsedScenePath-7:
+    RecentlyUsedScenePath-6:
      value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
      flags: 0
-    RecentlyUsedScenePath-8:
+    RecentlyUsedScenePath-7:
      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
      flags: 0
+    RecentlyUsedScenePath-8:
+      value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a1532f0e1372ce7f518e8ea3f7129370bfb25
+      flags: 0
    RecentlyUsedScenePath-9:
      value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
      flags: 0