From 8ba92556d1e557e84228295eb903fe7f33c2081b Mon Sep 17 00:00:00 2001 From: Thorbjoern Date: Mon, 30 Jun 2025 13:21:14 +0200 Subject: [PATCH] Made It Work Various improvements in scripts and working with the old loding mechanism --- Assets/_Materials/LoadingScreen.mat | 141 ++++ Assets/_Materials/LoadingScreen.mat.meta | 8 + Assets/_Scenes/CQB/Room 1.unity | 148 ---- Assets/_Scenes/CQB/Room 2.unity | 143 ---- Assets/_Scenes/CQB/Room 3.unity | 148 ---- Assets/_Scenes/TestSceneMeta Offline.unity | 737 ++++++++++++++++-- .../GhostSystem/GhostRecorderBatch.cs | 23 +- .../_Scripts/GhostSystem/SupabaseManager.cs | 2 +- Assets/_Scripts/Utility/FlushAndLoad.cs | 47 ++ Assets/_Scripts/Utility/FlushAndLoad.cs.meta | 2 + ProjectSettings/ProjectSettings.asset | 6 +- 11 files changed, 876 insertions(+), 529 deletions(-) create mode 100644 Assets/_Materials/LoadingScreen.mat create mode 100644 Assets/_Materials/LoadingScreen.mat.meta create mode 100644 Assets/_Scripts/Utility/FlushAndLoad.cs create mode 100644 Assets/_Scripts/Utility/FlushAndLoad.cs.meta diff --git a/Assets/_Materials/LoadingScreen.mat b/Assets/_Materials/LoadingScreen.mat new file mode 100644 index 0000000..5f21be5 --- /dev/null +++ b/Assets/_Materials/LoadingScreen.mat @@ -0,0 +1,141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LoadingScreen + m_Shader: {fileID: 4800000, guid: fadb727869e4c4392bda563f077b98ed, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _PassthroughMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _PassthroughAmount: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3928478412198296256 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/_Materials/LoadingScreen.mat.meta b/Assets/_Materials/LoadingScreen.mat.meta new file mode 100644 index 0000000..92d5c6f --- /dev/null +++ b/Assets/_Materials/LoadingScreen.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f20dcae15527e6f4b934431270c0c2d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/CQB/Room 1.unity b/Assets/_Scenes/CQB/Room 1.unity index d2bbe3a..9549bd3 100644 --- a/Assets/_Scenes/CQB/Room 1.unity +++ b/Assets/_Scenes/CQB/Room 1.unity @@ -207,84 +207,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 7.5, y: 2.5, z: 0.19999999} m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &485255361 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1664132754732668553, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_Name - value: NetworkedPlayerRig - objectReference: {fileID: 0} - - target: {fileID: 4352324108762111020, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: GlobalObjectIdHash - value: 72478981 - objectReference: {fileID: 0} - - target: {fileID: 4352324108762111020, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 3825524928 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.x - value: 21 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.z - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3142c30d660087344b257296a1412929, type: 3} --- !u!65 &563569589 BoxCollider: m_ObjectHideFlags: 0 @@ -3464,74 +3386,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2026381709} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1991249892353065692 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.x - value: 26.444 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.25 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.z - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2486706865656569863, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_Name - value: StopRecordingTrigger - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6d44dcda549a09d4aaf3a704a9844120, type: 3} --- !u!1001 &2158675441087684419 PrefabInstance: m_ObjectHideFlags: 0 @@ -3649,5 +3503,3 @@ SceneRoots: - {fileID: 2158675441087684419} - {fileID: 1140437916} - {fileID: 1663606563} - - {fileID: 485255361} - - {fileID: 1991249892353065692} diff --git a/Assets/_Scenes/CQB/Room 2.unity b/Assets/_Scenes/CQB/Room 2.unity index 58381e2..2eca878 100644 --- a/Assets/_Scenes/CQB/Room 2.unity +++ b/Assets/_Scenes/CQB/Room 2.unity @@ -496,74 +496,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.19999999, y: 2.5, z: 7.5} m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &633961685 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.x - value: 26.444 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.25 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.z - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2486706865656569863, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_Name - value: StopRecordingTrigger - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6d44dcda549a09d4aaf3a704a9844120, type: 3} --- !u!1001 &653672957 PrefabInstance: m_ObjectHideFlags: 0 @@ -3815,79 +3747,6 @@ MonoBehaviour: furnitures: [] portals: [] enemies: [] ---- !u!1001 &1781447975 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1664132754732668553, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_Name - value: NetworkedPlayerRig - objectReference: {fileID: 0} - - target: {fileID: 4352324108762111020, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: GlobalObjectIdHash - value: 680097651 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.x - value: 21 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.z - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3142c30d660087344b257296a1412929, type: 3} --- !u!1 &1819203976 stripped GameObject: m_CorrespondingSourceObject: {fileID: -6201606404599197734, guid: 805f7bec56abd4043a2a57eb410ef0d8, @@ -4321,5 +4180,3 @@ SceneRoots: - {fileID: 2095016855} - {fileID: 1639219909} - {fileID: 866051886} - - {fileID: 1781447975} - - {fileID: 633961685} diff --git a/Assets/_Scenes/CQB/Room 3.unity b/Assets/_Scenes/CQB/Room 3.unity index e4d2d69..f03157b 100644 --- a/Assets/_Scenes/CQB/Room 3.unity +++ b/Assets/_Scenes/CQB/Room 3.unity @@ -164,84 +164,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6634587245713331646, guid: 805f7bec56abd4043a2a57eb410ef0d8, type: 3} ---- !u!1001 &53148433 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 881367954479211324, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1664132754732668553, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_Name - value: NetworkedPlayerRig - objectReference: {fileID: 0} - - target: {fileID: 4352324108762111020, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: GlobalObjectIdHash - value: 163693087 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.x - value: 21 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalPosition.z - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3142c30d660087344b257296a1412929, type: 3} --- !u!1001 &62188987 PrefabInstance: m_ObjectHideFlags: 0 @@ -518,74 +440,6 @@ MonoBehaviour: furnitures: [] portals: [] enemies: [] ---- !u!1001 &184112593 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.x - value: 26.444 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.25 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalPosition.z - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1328209794631443702, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2486706865656569863, guid: 6d44dcda549a09d4aaf3a704a9844120, - type: 3} - propertyPath: m_Name - value: StopRecordingTrigger - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6d44dcda549a09d4aaf3a704a9844120, type: 3} --- !u!1001 &192788614 PrefabInstance: m_ObjectHideFlags: 0 @@ -6052,5 +5906,3 @@ SceneRoots: - {fileID: 1325781568} - {fileID: 137594283} - {fileID: 574765951} - - {fileID: 53148433} - - {fileID: 184112593} diff --git a/Assets/_Scenes/TestSceneMeta Offline.unity b/Assets/_Scenes/TestSceneMeta Offline.unity index 6b12caf..e688064 100644 --- a/Assets/_Scenes/TestSceneMeta Offline.unity +++ b/Assets/_Scenes/TestSceneMeta Offline.unity @@ -936,7 +936,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8983945cca89adc46aab1638d1823d76, type: 3} m_Name: m_EditorClassIdentifier: - textbox: {fileID: 2145881150} + textbox: {fileID: 1864973021} --- !u!4 &80522956 Transform: m_ObjectHideFlags: 0 @@ -1237,7 +1237,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &132541271 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1559,12 +1559,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3af7ca4916d35ee4ba154acde45dd813, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &177755780 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2982427928418993513, guid: 114dd0e59d4d3744d995722c429f5f25, - type: 3} - m_PrefabInstance: {fileID: 656166928} - m_PrefabAsset: {fileID: 0} --- !u!1 &210711552 GameObject: m_ObjectHideFlags: 0 @@ -1986,6 +1980,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1007172833528313422, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3167532973326127718, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3933276148784755229, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4094252763031089028, guid: eea4685c3d0950b43b296cae5bc70053, type: 3} propertyPath: m_AnchorMax.x @@ -1996,6 +2005,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4137696318583964402, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5060173001439130205, guid: eea4685c3d0950b43b296cae5bc70053, type: 3} propertyPath: m_AnchorMax.x @@ -2006,6 +2020,16 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5060173001439130205, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5210633124611224855, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + propertyPath: m_Text + value: "\nDr\xFCcke den rechten Trigger, um den n\xE4chsten Raum zu laden." + objectReference: {fileID: 0} - target: {fileID: 5381105996475625901, guid: eea4685c3d0950b43b296cae5bc70053, type: 3} propertyPath: m_AnchorMax.y @@ -2059,7 +2083,7 @@ PrefabInstance: - target: {fileID: 7512671986383540632, guid: eea4685c3d0950b43b296cae5bc70053, type: 3} propertyPath: m_LocalPosition.x - value: -3 + value: 21 objectReference: {fileID: 0} - target: {fileID: 7512671986383540632, guid: eea4685c3d0950b43b296cae5bc70053, type: 3} @@ -2108,9 +2132,33 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7512671986383540632, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + insertIndex: 0 + addedObject: {fileID: 1419059281} + - targetCorrespondingSourceObject: {fileID: 186710618678607447, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + insertIndex: 0 + addedObject: {fileID: 1864973020} + - targetCorrespondingSourceObject: {fileID: 186710618678607447, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + insertIndex: 1 + addedObject: {fileID: 1797910564} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eea4685c3d0950b43b296cae5bc70053, type: 3} +--- !u!4 &304632834 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7512671986383540632, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + m_PrefabInstance: {fileID: 304632833} + m_PrefabAsset: {fileID: 0} +--- !u!1 &304632835 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3933276148784755229, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + m_PrefabInstance: {fileID: 304632833} + m_PrefabAsset: {fileID: 0} --- !u!1 &315816741 GameObject: m_ObjectHideFlags: 0 @@ -2429,12 +2477,6 @@ Transform: m_Children: [] m_Father: {fileID: 1704555133} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &426030643 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2982427928419042489, guid: 114dd0e59d4d3744d995722c429f5f25, - type: 3} - m_PrefabInstance: {fileID: 656166928} - m_PrefabAsset: {fileID: 0} --- !u!1 &428579520 stripped GameObject: m_CorrespondingSourceObject: {fileID: -9049517329008597096, guid: 805f7bec56abd4043a2a57eb410ef0d8, @@ -2514,7 +2556,7 @@ PrefabInstance: type: 3} propertyPath: OnObjectTransportedToHere.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 2089505613} + objectReference: {fileID: 0} - target: {fileID: 7698898345407554876, guid: 80f01f07be8048f4582821772419a545, type: 3} propertyPath: OnObjectTransportedToHere.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -2931,7 +2973,7 @@ PrefabInstance: type: 3} propertyPath: OnObjectTransportedAwayFromHere.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 2089505613} + objectReference: {fileID: 0} - target: {fileID: 7698898345407554876, guid: 80f01f07be8048f4582821772419a545, type: 3} propertyPath: OnObjectTransportedAwayFromHere.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -3140,7 +3182,7 @@ PrefabInstance: - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, type: 3} propertyPath: m_LocalPosition.x - value: -3 + value: 21 objectReference: {fileID: 0} - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, type: 3} @@ -3225,6 +3267,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7681181393728380462, guid: 3142c30d660087344b257296a1412929, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1815111295} - targetCorrespondingSourceObject: {fileID: 3509663029993079967, guid: 3142c30d660087344b257296a1412929, type: 3} insertIndex: -1 @@ -3415,7 +3461,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &565737827 ReflectionProbe: m_ObjectHideFlags: 0 @@ -4062,18 +4108,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 656166934} m_SourcePrefab: {fileID: 100100000, guid: 114dd0e59d4d3744d995722c429f5f25, type: 3} ---- !u!4 &656166929 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5148115956637781214, guid: 114dd0e59d4d3744d995722c429f5f25, - type: 3} - m_PrefabInstance: {fileID: 656166928} - m_PrefabAsset: {fileID: 0} ---- !u!4 &656166930 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1625766942154703340, guid: 114dd0e59d4d3744d995722c429f5f25, - type: 3} - m_PrefabInstance: {fileID: 656166928} - m_PrefabAsset: {fileID: 0} --- !u!1 &656166931 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2982427928418703689, guid: 114dd0e59d4d3744d995722c429f5f25, @@ -5383,7 +5417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &840136486 ReflectionProbe: m_ObjectHideFlags: 0 @@ -6751,7 +6785,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 805f7bec56abd4043a2a57eb410ef0d8, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1801066844746760468, guid: 805f7bec56abd4043a2a57eb410ef0d8, type: 3} @@ -7287,12 +7321,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 3.5, y: 2.5, z: 0.19999999} m_Center: {x: 0, y: 0, z: 0} ---- !u!4 &1141936317 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2982427928419053757, guid: 114dd0e59d4d3744d995722c429f5f25, - type: 3} - m_PrefabInstance: {fileID: 656166928} - m_PrefabAsset: {fileID: 0} --- !u!1 &1146579961 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1801066844746760468, guid: 805f7bec56abd4043a2a57eb410ef0d8, @@ -8232,7 +8260,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &1272757396 ReflectionProbe: m_ObjectHideFlags: 0 @@ -8281,12 +8309,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1277379687 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9111366574888076514, guid: 114dd0e59d4d3744d995722c429f5f25, - type: 3} - m_PrefabInstance: {fileID: 656166928} - m_PrefabAsset: {fileID: 0} --- !u!1 &1322807969 GameObject: m_ObjectHideFlags: 0 @@ -9250,6 +9272,206 @@ Transform: m_Children: [] m_Father: {fileID: 210711553} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1419059276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1419059281} + - component: {fileID: 1419059280} + - component: {fileID: 1419059279} + - component: {fileID: 1419059278} + - component: {fileID: 1419059277} + m_Layer: 0 + m_Name: Trigger Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1419059277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419059276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18162507865d8bd4cbbb5287aca5410c, type: 3} + m_Name: + m_EditorClassIdentifier: + tagFilter: Player + onTriggerEnter: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 304632835} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1661010654} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 2089505615} + m_TargetAssemblyTypeName: GhostSystem.GhostRecorderBatch, Assembly-CSharp + m_MethodName: StopRecording + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + onTriggerExit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 304632835} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1661010654} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2089505615} + m_TargetAssemblyTypeName: GhostSystem.GhostRecorderBatch, Assembly-CSharp + m_MethodName: StartRecording + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!65 &1419059278 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419059276} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1419059279 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419059276} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1419059280 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419059276} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1419059281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419059276} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.892, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 304632834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1438259456 GameObject: m_ObjectHideFlags: 0 @@ -9571,7 +9793,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &1521882906 ReflectionProbe: m_ObjectHideFlags: 0 @@ -10293,7 +10515,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &1627494173 ReflectionProbe: m_ObjectHideFlags: 0 @@ -10358,7 +10580,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &1650413715 ReflectionProbe: m_ObjectHideFlags: 0 @@ -10418,6 +10640,7 @@ GameObject: - component: {fileID: 1661010652} - component: {fileID: 1661010651} - component: {fileID: 1661010653} + - component: {fileID: 1661010654} m_Layer: 0 m_Name: SceneManager m_TagString: Untagged @@ -10432,7 +10655,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661010650} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c2de113212d736e4398276cda5347f35, type: 3} m_Name: @@ -10461,12 +10684,28 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661010650} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e580ea451ce98a24b81fd7e238ac6393, type: 3} m_Name: m_EditorClassIdentifier: startScene: 0 +--- !u!114 &1661010654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1661010650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 787110b1243e93c4cbeda18e1c084baf, type: 3} + m_Name: + m_EditorClassIdentifier: + output: {fileID: 1797910565} + recorder: {fileID: 2089505615} + loadingScreen: {fileID: 1815111294} + canvas: {fileID: 304632835} --- !u!1 &1663766863 GameObject: m_ObjectHideFlags: 0 @@ -11022,7 +11261,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &1787202038 ReflectionProbe: m_ObjectHideFlags: 0 @@ -11211,6 +11450,142 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1797910563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1797910564} + - component: {fileID: 1797910566} + - component: {fileID: 1797910565} + m_Layer: 5 + m_Name: Debug Flush + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1797910564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797910563} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2045408655} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1797910565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797910563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1797910566 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797910563} + m_CullTransparentMesh: 1 --- !u!1 &1799873817 GameObject: m_ObjectHideFlags: 0 @@ -11280,7 +11655,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &1803869867 ReflectionProbe: m_ObjectHideFlags: 0 @@ -11434,6 +11809,92 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 _emitOnFirstUpdate: 0 +--- !u!1 &1815111294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815111295} + - component: {fileID: 1815111297} + - component: {fileID: 1815111296} + m_Layer: 0 + m_Name: LoadingScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1815111295 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815111294} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 518047935} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1815111296 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815111294} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f20dcae15527e6f4b934431270c0c2d2, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1815111297 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815111294} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1843636611 GameObject: m_ObjectHideFlags: 0 @@ -11566,6 +12027,142 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b942c16a6d6a4edaad7c18c7d5762cdf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1864973019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1864973020} + - component: {fileID: 1864973022} + - component: {fileID: 1864973021} + m_Layer: 5 + m_Name: Debug Supabase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1864973020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864973019} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2045408655} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1864973021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864973019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1864973022 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864973019} + m_CullTransparentMesh: 1 --- !u!1 &1879757116 GameObject: m_ObjectHideFlags: 0 @@ -12230,6 +12827,12 @@ Transform: m_Children: [] m_Father: {fileID: 1078295316} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &2045408655 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 186710618678607447, guid: eea4685c3d0950b43b296cae5bc70053, + type: 3} + m_PrefabInstance: {fileID: 304632833} + m_PrefabAsset: {fileID: 0} --- !u!1 &2089505612 GameObject: m_ObjectHideFlags: 0 @@ -12239,7 +12842,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2089505614} - - component: {fileID: 2089505613} - component: {fileID: 2089505615} m_Layer: 0 m_Name: GhostRecorder(Supabase) @@ -12248,29 +12850,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2089505613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089505612} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: acfd4230ec07a824b980e2dd17ca8031, type: 3} - m_Name: - m_EditorClassIdentifier: - SceneId: - SampleRate: 0.05 - BatchSize: 10 - FlushInterval: 2 - TrackedObjects: - - {fileID: 1277379687} - - {fileID: 177755780} - - {fileID: 656166930} - - {fileID: 656166929} - - {fileID: 426030643} - - {fileID: 1141936317} --- !u!4 &2089505614 Transform: m_ObjectHideFlags: 0 @@ -12379,7 +12958,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &2142215748 ReflectionProbe: m_ObjectHideFlags: 0 diff --git a/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs b/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs index 153d65b..452436e 100644 --- a/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs +++ b/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs @@ -32,24 +32,25 @@ namespace GhostSystem public static event Action OnRecord; public static event Action OnStopRecord; + public static event Action OnUploadFinished; - private void Awake() + /*private void Awake() { DontDestroyOnLoad(this); - } + }*/ private void OnEnable() { SupabaseManager.OnSuperbaseReady += HandleSupabaseReady; RoomManager.OnSceneIdReady += HandleSceneIdReady; - StopRecordingTrigger.OnRecordStop += HandleRecordStop; + //StopRecordingTrigger.OnRecordStop += HandleRecordStop; } private void OnDisable() { SupabaseManager.OnSuperbaseReady -= HandleSupabaseReady; RoomManager.OnSceneIdReady -= HandleSceneIdReady; - StopRecordingTrigger.OnRecordStop -= HandleRecordStop; + //StopRecordingTrigger.OnRecordStop -= HandleRecordStop; } private void Start() @@ -82,14 +83,14 @@ namespace GhostSystem doorCount++; } } - StartRecording(); + //StartRecording(); } } - private void HandleRecordStop() + /*private void HandleRecordStop() { StopRecording(); - } + }*/ private void Update() { @@ -135,12 +136,14 @@ namespace GhostSystem { Debug.LogWarning($"Batch insert failed: {response.ResponseMessage.StatusCode}, fallback to offline."); await FallbackToOfflineAsync(batch); + OnUploadFinished?.Invoke(); } } catch (Exception ex) { Debug.LogWarning($"Insert failed, fallback to offline: {ex.Message}"); await FallbackToOfflineAsync(batch); + OnUploadFinished?.Invoke(); } } @@ -183,6 +186,12 @@ namespace GhostSystem doorCount = 0; } + + public void Flush() + { + _flushTimer = 0f; + _ = FlushBatchAsync(); // Fire and forget + } } } diff --git a/Assets/_Scripts/GhostSystem/SupabaseManager.cs b/Assets/_Scripts/GhostSystem/SupabaseManager.cs index 9b4029e..585d431 100644 --- a/Assets/_Scripts/GhostSystem/SupabaseManager.cs +++ b/Assets/_Scripts/GhostSystem/SupabaseManager.cs @@ -117,7 +117,7 @@ namespace GhostSystem } catch (Exception ex) { - textbox.text += $"\n\rAuthentication failed: {ex}"; + textbox.text += "\n\rAuthentication failed"; Debug.LogError($"❌ Authentication failed: {ex}"); } } diff --git a/Assets/_Scripts/Utility/FlushAndLoad.cs b/Assets/_Scripts/Utility/FlushAndLoad.cs new file mode 100644 index 0000000..555c272 --- /dev/null +++ b/Assets/_Scripts/Utility/FlushAndLoad.cs @@ -0,0 +1,47 @@ +using GhostSystem; +using UnityEngine; +using UnityEngine.SceneManagement; +using TMPro; + +public class FlushAndLoad : MonoBehaviour +{ + public TMP_Text output; + public GhostRecorderBatch recorder; + public GameObject loadingScreen; + public GameObject canvas; + + private void OnEnable() + { + GhostRecorderBatch.OnUploadFinished += HandleUploadFinished; + } + + private void OnDisable() + { + GhostRecorderBatch.OnUploadFinished -= HandleUploadFinished; + } + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (OVRInput.GetDown(OVRInput.Button.SecondaryIndexTrigger)) + { + output.text = "Flush...\n\r" + output.text; + loadingScreen.SetActive(true); + canvas.SetActive(false); + + recorder.Flush(); + GetComponent().NewRoom(); + } + } + + private void HandleUploadFinished() + { + loadingScreen.SetActive(false); + } +} diff --git a/Assets/_Scripts/Utility/FlushAndLoad.cs.meta b/Assets/_Scripts/Utility/FlushAndLoad.cs.meta new file mode 100644 index 0000000..2a63134 --- /dev/null +++ b/Assets/_Scripts/Utility/FlushAndLoad.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 787110b1243e93c4cbeda18e1c084baf \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8dd16e2..0a2cf61 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: TH - productName: PassThroughScene + productName: RoomAware VR (noPortals) defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -167,7 +167,7 @@ PlayerSettings: androidMaxAspectRatio: 2.4 androidMinAspectRatio: 1 applicationIdentifier: - Android: com.TH.PassThroughScene + Android: com.TH.RoomAwareVRnoPortals Standalone: com.DefaultCompany.VR-Multiplayer iPhone: com.Unity-Technologies.com.unity.template.urp-blank buildNumber: @@ -555,7 +555,7 @@ PlayerSettings: m_APIs: 15000000 m_Automatic: 0 - m_BuildTarget: WindowsStandaloneSupport - m_APIs: 1500000002000000 + m_APIs: 0200000015000000 m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16