Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet

# Conflicts:
#	Assets/My project/fishhook scene.meta
#	Assets/My project/fishhook scene.unity.meta
#	Assets/My project/fishhook scene/NavMesh-Terrain.asset.meta
#	Assets/XR/AndroidXR/AndroidXRSettingsInitializer.meta

.vscode/settings.json

@@ -60,13 +60,13 @@
         "*.asset": "yaml",
         "*.meta": "yaml",
         "*.prefab": "yaml",
-        "*.unity": "yaml",
+        "*.unity": "yaml"
     },
     "explorer.fileNesting.enabled": true,
     "explorer.fileNesting.patterns": {
         "*.sln": "*.csproj",
         "*.slnx": "*.csproj"
     },
-    "dotnet.defaultSolution": "WhaleAdventure_VR.slnx",
+    "dotnet.defaultSolution": "WhaleAdventure_VR_Diet.slnx",
     "dotnet.enableWorkspaceBasedDevelopment": false
 }