Merge remote-tracking branch 'origin/main' into feature/hyeonsu-blackjack-clean

2026-06-16 16:49:27 +09:00
parent 980576f1e5 3f05fd07e1
commit ae9ca05f5d
5 changed files with 8 additions and 9 deletions
--- a/Assets/01_Scenes/MazeRoom.unity
+++ b/Assets/01_Scenes/MazeRoom.unity
--- a/Assets/04_Models/RealPlayer.prefab
+++ b/Assets/04_Models/RealPlayer.prefab
--- a/Assets/07_Data/Rhythm/RhythmSong1.asset.meta
+++ b/Assets/07_Data/Rhythm/RhythmSong1.asset.meta
@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 3572846cef94ee149a9f46f38903a4d2
-NativeFormatImporter:
+guid: 41c70813d73fc9841b804f0495cf56e0
+PrefabImporter:
  externalObjects: {}
-  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/07_Data/Rhythm/RhythmSong1.asset
+++ b/Assets/07_Data/Rhythm/RhythmSong1.asset
--- a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer
+++ b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer
@@ -11,5 +11,5 @@ MonoBehaviour:
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: d7e9a0ba2b7f40ebbb3dad8385aa807b, type: 3}
  m_Name: 
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier: Unity.XR.AndroidOpenXR.Editor::UnityEditor.XR.OpenXR.Features.Android.AndroidXRSettingsInitializer
  isInitialized: 0