Merge branch 'main' of https://github.com/Lucastaa/VR-game

2026-05-05 21:17:25 +07:00
parent dbe738f16e 7e1df53ff1
commit f5bd298bf4
999 changed files with 640060 additions and 59 deletions
--- a/Assets/XR/Loaders/AR
+++ b/Assets/XR/Loaders/AR
@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06042c85f885b4d1886f3ca5a1074eca, type: 3}
+  m_Name: AR Core Loader
+  m_EditorClassIdentifier: 
--- a/Assets/XR/Loaders/AR
+++ b/Assets/XR/Loaders/AR
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bbf1bbcc68185fe41b723ad39ec4d68e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/XR/Loaders/AR
+++ b/Assets/XR/Loaders/AR
@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a18c4d6661b404073b154020b9e2d993, type: 3}
+  m_Name: AR Kit Loader
+  m_EditorClassIdentifier: 
--- a/Assets/XR/Loaders/AR
+++ b/Assets/XR/Loaders/AR
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e83f94cb3ed0e3041b49796e826aabbd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/XR/Loaders/SimulationLoader.asset.meta
+++ b/Assets/XR/Loaders/SimulationLoader.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8be68b0a2b6e4144097d59e8a1c492dc
+guid: b92644a1b70d34c08aaf6c1b37c9675d
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/XR/Resources.meta
+++ b/Assets/XR/Resources.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ccb9a866426847148adb46d1bee27a21
+guid: ea0cc98e7c3f9475aafdfd1b7e07c421
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/XR/Resources/ARCoreRuntimeSettings.asset
+++ b/Assets/XR/Resources/ARCoreRuntimeSettings.asset
@@ -11,7 +11,7 @@ MonoBehaviour:
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 4b7b5809501b54a4192277236edcaf88, type: 3}
  m_Name: ARCoreRuntimeSettings
-  m_EditorClassIdentifier: Unity.XR.ARCore::UnityEngine.XR.ARCore.ARCoreRuntimeSettings
+  m_EditorClassIdentifier: 
  m_EnableCloudAnchors: 0
  m_AuthorizationType: 0
  m_ApiKey: 
--- a/Assets/XR/Resources/ARCoreRuntimeSettings.asset.meta
+++ b/Assets/XR/Resources/ARCoreRuntimeSettings.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7710670dff5858c4887cf95381bae609
+guid: 08fdbb0af7907ad41ac6ab8bf4c5c3f7
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/XR/Resources/XRSimulationRuntimeSettings.asset
+++ b/Assets/XR/Resources/XRSimulationRuntimeSettings.asset
@@ -11,7 +11,7 @@ MonoBehaviour:
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: e2b12afd4d27418a9cfb2823fe2b9ff3, type: 3}
  m_Name: XRSimulationRuntimeSettings
-  m_EditorClassIdentifier: Unity.XR.Simulation::UnityEngine.XR.Simulation.XRSimulationRuntimeSettings
+  m_EditorClassIdentifier: 
  m_EnvironmentLayer: 30
  m_EnvironmentScanParams:
    m_MinimumRescanTime: 0.1
--- a/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta
+++ b/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3570a1634da62714285ea7651b6fb018
+guid: e9b2504bcc65542929413802f7fe8283
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/XR/Settings.meta
+++ b/Assets/XR/Settings.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f46cd8365226cad42aadf71967cb7026
+guid: ebeb6141195584a4a9445a9d14853624
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/XR/Settings/AR
+++ b/Assets/XR/Settings/AR
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9dae4501572e1418791be3e3bf1f7faa, type: 3}
+  m_Name: AR Core Settings
+  m_EditorClassIdentifier: 
+  m_Requirement: 0
+  m_Depth: 0
+  m_IgnoreGradleVersion: 0
--- a/Assets/XR/Settings/AR
+++ b/Assets/XR/Settings/AR
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6ee72d15cf39dd748a13eac57397b9af
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/XR/Settings/AR
+++ b/Assets/XR/Settings/AR
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a3c2811d41034e52a6d6c33ac73a207, type: 3}
+  m_Name: AR Kit Settings
+  m_EditorClassIdentifier: 
+  m_Requirement: 0
+  m_FaceTracking: 0
--- a/Assets/XR/Settings/AR
+++ b/Assets/XR/Settings/AR
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0465d33c6aee55f44b0237db8b0e0259
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/XR/Settings/XRSimulationSettings.asset
+++ b/Assets/XR/Settings/XRSimulationSettings.asset
@@ -11,4 +11,4 @@ MonoBehaviour:
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: e0688bbae6cedcd4a871944e38c19ec0, type: 3}
  m_Name: XRSimulationSettings
-  m_EditorClassIdentifier: Unity.XR.Simulation.Editor::UnityEditor.XR.Simulation.XRSimulationSettings
+  m_EditorClassIdentifier: 
--- a/Assets/XR/Settings/XRSimulationSettings.asset.meta
+++ b/Assets/XR/Settings/XRSimulationSettings.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3eaf1eeccd61be04bb61d0d2623e8b27
+guid: c199e683398494f32b4cde18e73ab731
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/XR/UserSimulationSettings.meta
+++ b/Assets/XR/UserSimulationSettings.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c834324e35a7dba46a79648c05af4bc8
+guid: 27b64f10ec67944d1acecc5478289fd3
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/XR/UserSimulationSettings/Resources.meta
+++ b/Assets/XR/UserSimulationSettings/Resources.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3bc0ab893033c1949955d0af06008316
+guid: fb6b7734f6c6845db82cdd3f86081686
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset
+++ b/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset
@@ -11,9 +11,9 @@ MonoBehaviour:
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: b2f528b98f844ed8b6b2d5fdf90b40e6, type: 3}
  m_Name: XRSimulationPreferences
-  m_EditorClassIdentifier: Unity.XR.Simulation::UnityEngine.XR.Simulation.XRSimulationPreferences
+  m_EditorClassIdentifier: 
  m_HasInputActionUpgrade: 1
-  m_EnvironmentPrefab: {fileID: 0}
+  m_EnvironmentPrefab: {fileID: 7576867131100388943, guid: 262f8d170c5c42f4fa5452a1d9fcac9e, type: 3}
  m_FallbackEnvironmentPrefab: {fileID: 7576867131100388943, guid: c7b92c392902f4043a03a64032c02fe1, type: 3}
  m_UnlockInputActionReference: {fileID: -6503468053843192148, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3}
  m_MoveInputActionReference: {fileID: -8435123576461090514, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3}
--- a/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta
+++ b/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1fbdbfa3b3815e1408e30d48c06d9d0a
+guid: a908ba3cced164fb2b0cef4982fd8d56
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset
+++ b/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset
@@ -11,6 +11,8 @@ MonoBehaviour:
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 378fb4eec0f59ac4c95c0d5b227aa85e, type: 3}
  m_Name: SimulationEnvironmentAssetsManager
-  m_EditorClassIdentifier: Unity.XR.Simulation.Editor::UnityEditor.XR.Simulation.SimulationEnvironmentAssetsManager
-  m_EnvironmentPrefabPaths: []
-  m_FallbackAtEndOfList: 0
+  m_EditorClassIdentifier: 
+  m_EnvironmentPrefabPaths:
+  - Assets/MobileARTemplateAssets/Prefabs/Simulation Environment.prefab
+  - Packages/com.unity.xr.arfoundation/Assets/Prefabs/DefaultSimulationEnvironment.prefab
+  m_FallbackAtEndOfList: 1
--- a/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset.meta
+++ b/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6c37be3dc687c1d4abf9d22a6008df8b
+guid: 5135c822e9b1a427ea0f817d7e0343a7
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/XR/XRGeneralSettings.asset
+++ b/Assets/XR/XRGeneralSettings.asset
@@ -0,0 +1,143 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8133518806003919769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: Android Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
+  m_Loaders:
+  - {fileID: 11400000, guid: bbf1bbcc68185fe41b723ad39ec4d68e, type: 2}
+--- !u!114 &-6011607661423633505
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: iPhone Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
+  m_Loaders:
+  - {fileID: 11400000, guid: e83f94cb3ed0e3041b49796e826aabbd, type: 2}
+--- !u!114 &-5102610910715785812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: VisionOS Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: 2832879997835686426}
+  m_InitManagerOnStart: 1
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
+  m_Name: XRGeneralSettings
+  m_EditorClassIdentifier: 
+  Keys: 01000000070000000400000024000000
+  Values:
+  - {fileID: 6796949849618337366}
+  - {fileID: 7409956309476867576}
+  - {fileID: 8792172334962700932}
+  - {fileID: -5102610910715785812}
+--- !u!114 &2832879997835686426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: VisionOS Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
+  m_Loaders: []
+--- !u!114 &6796949849618337366
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: Standalone Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: 8964278857959479478}
+  m_InitManagerOnStart: 1
+--- !u!114 &7409956309476867576
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: Android Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: -8133518806003919769}
+  m_InitManagerOnStart: 1
+--- !u!114 &8792172334962700932
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: iPhone Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: -6011607661423633505}
+  m_InitManagerOnStart: 1
+--- !u!114 &8964278857959479478
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: Standalone Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
+  m_Loaders:
+  - {fileID: 11400000, guid: b92644a1b70d34c08aaf6c1b37c9675d, type: 2}
--- a/Assets/XR/XRGeneralSettings.asset.meta
+++ b/Assets/XR/XRGeneralSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3fd4fc0127790db4bae83f7b77da8d45
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: