Merge remote-tracking branch 'origin/main' into main

MuseumGame/Assets/Scripts/GameManager.cs

@@ -37,7 +37,7 @@ public class GameManager : MonoBehaviour
             Destroy(gameObject);
             Destroy(canvas);
             Destroy(events);
-            DontDestroyOnLoad(player);
+            Destroy(player);
         }
     }
     // Start is called before the first frame update

MuseumGame/UserSettings/EditorUserSettings.asset

@@ -7,15 +7,18 @@ EditorUserSettings:
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedd43b2fe7f578fce9332b25
       flags: 0
     RecentlyUsedScenePath-1:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e52637edea78fce9332b25
       flags: 0
     RecentlyUsedScenePath-2:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
       flags: 0
     RecentlyUsedScenePath-3:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
+      value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0
       flags: 0
     RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
@@ -31,6 +34,7 @@ EditorUserSettings:
       flags: 0
     RecentlyUsedScenePath-8:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
       flags: 0
     RecentlyUsedScenePath-9:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0