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

# Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 16:07:54 +09:00
parent 264b169006 1aacaa854c
commit 789f9d5de7
226 changed files with 660 additions and 663 deletions
--- a/Assets/01_Scenes/Festival_Test.unity
+++ b/Assets/01_Scenes/Festival_Test.unity
--- a/Assets/01_Scenes/Festival_Test.unity.meta
+++ b/Assets/01_Scenes/Festival_Test.unity.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 97c1255fdab46174c9c470cd4448548e
+guid: a5e8d179d7c90664ca03e28f3e240456
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/01_Scenes/Festival_Test/Festival_Test
+++ b/Assets/01_Scenes/Festival_Test/Festival_Test
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 34f5d474d3a774448b7b3efd4b870af2
+guid: 45ba9b4879d2c8849b6e6ebaa0a35cc8
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: