Browse Source

修改RTC Bug 100 ,进入房间后看不见视频

DGJ 1 year ago
parent
commit
a933b8ab65

+ 3 - 2
Assets/AgoraVideoAudioManager.cs

@@ -178,7 +178,7 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         EnableLoacalAudio(CustomInfo.isSendAudio);
         EnableLocalVideo(CustomInfo.isSendVideo);
         isSendVideo = CustomInfo.isSendVideo;
-        StartCoroutine(RenderTexturesScreenCapture());
+          StartCoroutine(RenderTexturesScreenCapture());
     }
 
     public void OpenAgoraAudio()
@@ -413,7 +413,8 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         int msg = RtcEngine.MuteLocalVideoStream(!isVideo);
         //RtcEngine.EnableVideo();
         //int msg = RtcEngine.EnableLocalVideo(isVideo);
-       
+        //if(isVideo)
+        //    RemoteRtc.Instance.InitCamera();
         switch (msg)
         {
             case 0:

+ 5 - 2
Assets/MediaSoup/NetWorkHeadersConfig.cs

@@ -21,6 +21,9 @@ public class NetWorkHeadersConfig
     //public const string Remote_SocketRtc_url = "wss://cloud-assistant.shadowcreator.com/room?";
 
     public const string Remote_Net_url = "https://support.ghz-tech.com:8843/api/";
-    public const string Remote_SocketHall_url = "wss://api-cs.ghz-tech.com/remote-lobby/?";
-    public const string Remote_SocketRtc_url = "wss://api-cs.ghz-tech.com/remote-room/?";
+    //public const string Remote_SocketHall_url = "wss://api-cs.ghz-tech.com/remote-lobby/?";
+    //public const string Remote_SocketRtc_url = "wss://api-cs.ghz-tech.com/remote-room/?";
+    public const string Remote_SocketHall_url = "wss://support.ghz-tech.com:8843/lobby/?";
+    public const string Remote_SocketRtc_url = "wss://support.ghz-tech.com:8843/room/?";
+
 }

+ 13 - 3
Assets/MediaSoup/RemoteRtc.cs

@@ -30,6 +30,12 @@ public class RemoteRtc : SCRtcManager
         WSHandler.Rtc.onRtcState += onRtcState;
         DontDestroyOnLoad(this.gameObject);
         Instance = this;
+
+        InitCamera();
+    }
+
+    public void InitCamera()
+    {
         switch (DeviceType.type)
         {
             case "A01":
@@ -41,17 +47,21 @@ public class RemoteRtc : SCRtcManager
                 meshRender.material.mainTexture = RGBCamTexture.GetTexture();
                 RGBCamTexture.Play();
 #endif
-                meshRender.transform.localEulerAngles = new Vector3(180,0,0);
+                meshRender.transform.localEulerAngles = new Vector3(180, 0, 0);
 
                 break;
             case "DreamGlass":
                 StartCoroutine(CallCamera());
                 break;
             case "Rhinox":
+#if !UNITY_EDITOR
                 StartCoroutine(CallCamera(2));
+#elif UNITY_EDITOR
+                StartCoroutine(CallCamera());
+#endif
+
                 break;
         }
-       
     }
     void onRtcState(string state)
     {
@@ -130,7 +140,7 @@ public class RemoteRtc : SCRtcManager
 
     public void stopCamera()
     {
-        meshRender.gameObject.SetActive(false);
+      //  meshRender.gameObject.SetActive(false);
         //SCRtcFactory.Instance.mSCRtcHandle.stopCamera();
     }
 

+ 1 - 1
Assets/MediaSoup/Scripts/ItemUserView.cs

@@ -298,7 +298,7 @@ public class ItemUserView : MonoBehaviour
             if (RemoteRtc.Instance.me.cIdV != "")
             {
                 WSHandler.Rtc.closeProducer(RemoteRtc.Instance.me.cIdV);
-                RemoteRtc.Instance.stopCamera();
+              //  RemoteRtc.Instance.stopCamera();
                 RemoteRtc.Instance.sendVideo(false);
                 closeVideoEffect();
             }

+ 6 - 1
Assets/Remote/Scenes/Remote3.0.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1775,6 +1775,11 @@ PrefabInstance:
       propertyPath: DebugInEditor
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4181028404793140007, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 511
+      objectReference: {fileID: 0}
     - target: {fileID: 5121918160867592627, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_CullingMask.m_Bits

+ 1 - 1
Assets/Remote/ShowLogin/TestMVC/LoginDlg.cs

@@ -245,7 +245,7 @@ namespace ShadowStudio.UI
             //passwordInputField.text = "abc12345";
 
 #if UNITY_EDITOR
-           userInputField.text = "test05";
+           userInputField.text = "test06";
             passwordInputField.text = "123456Aa";
 #endif
 

+ 2 - 1
Assets/Remote/ShowRoom/RoomMain.cs

@@ -158,7 +158,8 @@ public class RoomMain : RemoteSingleton<RoomMain>
         }
         else
         {
-            RemoteRtc.Instance.meshRender.gameObject.SetActive(false);
+            RemoteRtc.Instance.startCamera();
+            // RemoteRtc.Instance.meshRender.gameObject.SetActive(false);
         }
         //if(isCloseView)
         //{

+ 15 - 0
Assets/XR/Loaders/Ximmerse XR Loader.asset

@@ -0,0 +1,15 @@
+%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: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 44820cf310472441e952b611b9f17c14, type: 3}
+  m_Name: Ximmerse XR Loader
+  m_EditorClassIdentifier: 
+  settings: {fileID: 11400000, guid: a059e51dfed9d514bbd8eef2e5dc70f1, type: 2}

+ 8 - 0
Assets/XR/Loaders/Ximmerse XR Loader.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ea6b4fa5606b423479ad49b5a843cefe
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 23 - 0
Assets/XR/Settings/Ximmerse XR Settings.asset

@@ -0,0 +1,23 @@
+%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: 8f9643084e7b84786a72ba40c223a7fd, type: 3}
+  m_Name: Ximmerse XR Settings
+  m_EditorClassIdentifier: 
+  displayReticle: 1
+  reticleTexture: {fileID: 0}
+  defaultTrackingProfile: {fileID: 11400000, guid: c641667a0d27d3b4484c44ccba14b111,
+    type: 2}
+  defaultGroundPlaneLayoutConfig: {fileID: 11400000, guid: 6f7a3e78cb3c0364fab924de8d67d3a7,
+    type: 2}
+  DrawTrackedMarkerGizmos: 0
+  DrawDetailTrackedInfo: 0
+  HandTracking: 0

+ 8 - 0
Assets/XR/Settings/Ximmerse XR Settings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a059e51dfed9d514bbd8eef2e5dc70f1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/XRI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 950cb3893f2abb3408e15b4eea9f01fb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/XRI/Settings.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bb95d9395c075e849ac35d07df2c97e9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/XRI/Settings/Resources.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 176f210449a06ce4fbcff8c34e61c190
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 47 - 0
Assets/XRI/Settings/Resources/InteractionLayerSettings.asset

@@ -0,0 +1,47 @@
+%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: 191492db6e452eb468b95433ec162164, type: 3}
+  m_Name: InteractionLayerSettings
+  m_EditorClassIdentifier: 
+  m_LayerNames:
+  - Default
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 

+ 8 - 0
Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 56b8ae4291bff3844aa8b88026df8151
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 16 - 0
Assets/XRI/Settings/XRInteractionEditorSettings.asset

@@ -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: 2d38fb1463c5c804b8847c20e8873623, type: 3}
+  m_Name: XRInteractionEditorSettings
+  m_EditorClassIdentifier: 
+  m_InteractionLayerUpdaterShown: 1
+  m_ShowOldInteractionLayerMaskInInspector: 0

+ 8 - 0
Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e73f2dc09e64dd24f86d685b3ca26d4f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 23 - 11
GHZMRSupportXR.sln

@@ -1,13 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDK", "NRSDK.csproj", "{F02347B3-2269-A684-9708-361DFE4FC0C4}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{722685E3-B096-A44B-899D-3B822B46073F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ximmerse.XR", "Ximmerse.XR.csproj", "{2E9D4BA6-C6FC-FE1C-7E62-1C23575E93E3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ximmerse.XR.Tests", "Ximmerse.XR.Tests.csproj", "{71B662A2-DE4F-23FF-DD39-C278B87690BD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ximmerse.XR.Editor", "Ximmerse.XR.Editor.csproj", "{D02A6DE5-AE29-B53A-F802-40BBEEA11250}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDKEditor", "NRSDKEditor.csproj", "{C9251CA3-AD97-0E18-DAF7-6AB911F84650}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demos.StandardShader.Inspectors", "Demos.StandardShader.Inspectors.csproj", "{0105670B-211E-72A6-4A0A-81D14515DB44}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,22 +19,30 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F02347B3-2269-A684-9708-361DFE4FC0C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F02347B3-2269-A684-9708-361DFE4FC0C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F02347B3-2269-A684-9708-361DFE4FC0C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F02347B3-2269-A684-9708-361DFE4FC0C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{722685E3-B096-A44B-899D-3B822B46073F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{722685E3-B096-A44B-899D-3B822B46073F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{722685E3-B096-A44B-899D-3B822B46073F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{722685E3-B096-A44B-899D-3B822B46073F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E9D4BA6-C6FC-FE1C-7E62-1C23575E93E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E9D4BA6-C6FC-FE1C-7E62-1C23575E93E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E9D4BA6-C6FC-FE1C-7E62-1C23575E93E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E9D4BA6-C6FC-FE1C-7E62-1C23575E93E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71B662A2-DE4F-23FF-DD39-C278B87690BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71B662A2-DE4F-23FF-DD39-C278B87690BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71B662A2-DE4F-23FF-DD39-C278B87690BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71B662A2-DE4F-23FF-DD39-C278B87690BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Release|Any CPU.Build.0 = Release|Any CPU
 		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9251CA3-AD97-0E18-DAF7-6AB911F84650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9251CA3-AD97-0E18-DAF7-6AB911F84650}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9251CA3-AD97-0E18-DAF7-6AB911F84650}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9251CA3-AD97-0E18-DAF7-6AB911F84650}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 1 - 1
Packages/manifest.json

@@ -10,7 +10,7 @@
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.7.8",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.xr.engine": "file:D:/JiHe/XRSDK/package",
+    "com.ximmerse.xr": "file:C:/Unity/Blue/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 42 - 5
Packages/packages-lock.json

@@ -128,6 +128,40 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.xr.arsubsystems": {
+      "version": "4.2.7",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.subsystemregistration": "1.1.0",
+        "com.unity.xr.management": "4.0.1"
+      },
+      "url": "https://packages.unity.cn"
+    },
+    "com.unity.xr.core-utils": {
+      "version": "2.0.0",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.xr": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
+    "com.unity.xr.interaction.toolkit": {
+      "version": "2.0.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.inputsystem": "1.3.0",
+        "com.unity.ugui": "1.0.0",
+        "com.unity.xr.core-utils": "2.0.0",
+        "com.unity.xr.legacyinputhelpers": "2.1.8",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.physics": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.xr.legacyinputhelpers": {
       "version": "2.1.10",
       "depth": 1,
@@ -162,14 +196,17 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "jh.xr.engine": {
-      "version": "file:D:/JiHe/XRSDK/package",
+    "com.ximmerse.xr": {
+      "version": "file:C:/Unity/Blue/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.xr.management": "4.0.1",
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.2"
+        "com.unity.xr.management": "3.2.9",
+        "com.unity.xr.legacyinputhelpers": "2.1.4",
+        "com.unity.xr.arsubsystems": "4.1.9",
+        "com.unity.xr.interaction.toolkit": "2.0.0",
+        "com.unity.inputsystem": "1.3.0",
+        "com.unity.xr.openxr": "1.5.3"
       }
     },
     "com.unity.modules.ai": {

+ 1 - 0
ProjectSettings/InputManager.asset

@@ -805,3 +805,4 @@ InputManager:
     type: 2
     axis: 1
     joyNum: 0
+  m_UsePhysicalKeys: 0

+ 7 - 0
UserSettings/EditorUserSettings.asset

@@ -5,6 +5,9 @@ EditorUserSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 4
   m_ConfigSettings:
+    RecentlyUsedSceneGuid-0:
+      value: 0007520751565d0a0c5b5b7616730c44404e417d287a7636752f1f62b0b23039
+      flags: 0
     RecentlyUsedScenePath-0:
       value: 224247031146466908030336156c6c1313191d39631a233d223d1860acb07a2decee22f0
       flags: 0
@@ -16,9 +19,13 @@ EditorUserSettings:
   m_VCDebugCmd: 0
   m_VCDebugOut: 0
   m_SemanticMergeMode: 2
+  m_DesiredImportWorkerCount: 4
+  m_StandbyImportWorkerCount: 2
+  m_IdleImportWorkerShutdownDelay: 60000
   m_VCShowFailedCheckout: 1
   m_VCOverwriteFailedCheckoutAssets: 1
   m_VCProjectOverlayIcons: 1
   m_VCHierarchyOverlayIcons: 1
   m_VCOtherOverlayIcons: 1
   m_VCAllowAsyncUpdate: 0
+  m_ArtifactGarbageCollection: 1

+ 117 - 324
UserSettings/Layouts/default-2021.dwlt

@@ -1,54 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &1
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 341.33334
-    y: 128.66667
-    width: 800
-    height: 469.33334
-  m_ShowMode: 0
-  m_Title: Package Manager
-  m_RootView: {fileID: 5}
-  m_MinSize: {x: 800, y: 273}
-  m_MaxSize: {x: 4000, y: 4023}
-  m_Maximized: 0
---- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 194
-    y: 478
-    width: 1111.3334
-    height: 406
-  m_ShowMode: 0
-  m_Title: Console
-  m_RootView: {fileID: 7}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -62,117 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 1706.6666
-    y: 43
-    width: 1920
-    height: 989
+    x: 0
+    y: 43.2
+    width: 1536
+    height: 790.4
   m_ShowMode: 4
   m_Title: Hierarchy
-  m_RootView: {fileID: 8}
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &4
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: PackageManagerWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 800
-    height: 469.33334
-  m_MinSize: {x: 800, y: 250}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
-  m_Panes:
-  - {fileID: 18}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &5
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 800
-    height: 469.33334
-  m_MinSize: {x: 800, y: 273}
-  m_MaxSize: {x: 4000, y: 4023}
-  vertical: 0
-  controlID: 650
---- !u!114 &6
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1111.3334
-    height: 406
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
-  m_Panes:
-  - {fileID: 19}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &7
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 6}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1111.3334
-    height: 406
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 15
---- !u!114 &8
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -185,22 +37,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 3}
+  - {fileID: 4}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920
-    height: 989
+    width: 1536
+    height: 790.4
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &9
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -217,12 +69,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920
+    width: 1536
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &10
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -235,21 +87,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
-  - {fileID: 15}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920
-    height: 939
+    width: 1536
+    height: 740.4
   m_MinSize: {x: 400, y: 200}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 58
---- !u!114 &11
+  controlID: 21
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -265,12 +117,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 969
-    width: 1920
+    y: 770.4
+    width: 1536
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &12
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -283,19 +135,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 16}
-  - {fileID: 17}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 906
-    height: 939
+    width: 724.8
+    height: 740.4
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 227
---- !u!114 &13
+  controlID: 102
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -310,18 +162,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 906
+    x: 724.8
     y: 0
-    width: 224
-    height: 939
+    width: 179.20001
+    height: 740.4
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -336,18 +188,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1130
+    x: 904
     y: 0
-    width: 354
-    height: 939
+    width: 283.19995
+    height: 740.4
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -362,18 +214,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1484
+    x: 1187.2
     y: 0
-    width: 436
-    height: 939
+    width: 348.80005
+    height: 740.4
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &16
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -390,16 +242,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 906
-    height: 481
+    width: 724.8
+    height: 379.2
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 24}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &17
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -415,75 +267,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 481
-    width: 906
-    height: 458
+    y: 379.2
+    width: 724.8
+    height: 361.2
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 23}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &18
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 13953, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 800, y: 250}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Package Manager
-    m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000,
-      type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 341.33334
-    y: 128.66667
-    width: 800
-    height: 448.33334
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
---- !u!114 &19
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000,
-      type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 194
-    y: 478
-    width: 1111.3334
-    height: 385
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
---- !u!114 &20
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -499,15 +293,15 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2612.6665
-    y: 73
-    width: 222
-    height: 918
+    x: 724.8
+    y: 73.6
+    width: 177.20001
+    height: 719.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -515,9 +309,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 9a840300
-      m_LastClickedID: 230554
-      m_ExpandedIDs: 923bfffff03bffff085bffff345dffff925dffffea7effff3aa4ffffa4c0ffff76e1ffff
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: e4a1ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -533,7 +327,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 13}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -541,7 +335,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 778e2db4ff4064e43a38f9013e962716
---- !u!114 &21
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -557,15 +351,15 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 3190.6665
-    y: 73
-    width: 435
-    height: 918
+    x: 1187.2001
+    y: 73.6
+    width: 347.80005
+    height: 719.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -583,7 +377,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &22
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -599,15 +393,15 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2836.6665
-    y: 73
-    width: 352
-    height: 918
+    x: 904
+    y: 73.6
+    width: 281.19995
+    height: 719.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -624,23 +418,22 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders:
-    - Packages/jh.xr.engine/Runtime/Android
+    m_Folders: []
     m_Globs: []
     m_OriginalText: 
-  m_ViewMode: 1
+  m_ViewMode: 0
   m_StartGridSize: 16
   m_LastFolders:
-  - Packages/jh.xr.engine/Runtime/Android
+  - Assets/Samples/Rhinox XR Plugin/1.7.2/SDK/Common/Plugins
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\JiHe\GHZMRSupportXR
+  m_LastProjectPath: C:\UnityProjects\GHZMRSupportXR
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 80ec0000
-    m_LastClickedID: 60544
-    m_ExpandedIDs: 00000000b0dc0000b2dc0000b4dc0000b6dc0000b8dc0000badc0000bcdc0000bedc0000c0dc0000c2dc0000c4dc0000c6dc0000c8dc000022ec000042ec000068ec000078ec000080ec000000ca9a3bffffff7f
+    m_SelectedIDs: 38fc0100
+    m_LastClickedID: 130104
+    m_ExpandedIDs: 000000006a06010080060100e2f90100d8fe0100fa0202006403020000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -656,7 +449,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 8}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -665,10 +458,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
+    scrollPos: {x: 0, y: 62.599976}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b0dc0000b2dc0000b4dc0000b6dc0000b8dc0000badc0000bcdc0000bedc0000c0dc0000c2dc0000c4dc0000c6dc0000c8dc0000
+    m_ExpandedIDs: ffffffff6a06010080060100c4f50100e2f9010038fc0100cafc0100d0fc0100d8fe0100fa02020064030200d8030200220402004e070200
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -724,7 +517,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 224
---- !u!114 &23
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -740,15 +533,15 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1706.6666
-    y: 554
-    width: 905
-    height: 437
+    x: 0
+    y: 452.80002
+    width: 723.8
+    height: 340.2
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -759,7 +552,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 905, y: 416}
+  m_TargetSize: {x: 904.75, y: 399}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -774,10 +567,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -452.5
-    m_HBaseRangeMax: 452.5
-    m_VBaseRangeMin: -208
-    m_VBaseRangeMax: 208
+    m_HBaseRangeMin: -361.9
+    m_HBaseRangeMax: 361.9
+    m_VBaseRangeMin: -159.6
+    m_VBaseRangeMax: 159.6
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -795,29 +588,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 905
-      height: 416
+      width: 723.8
+      height: 319.2
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 452.5, y: 208}
+    m_Translation: {x: 361.9, y: 159.6}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -452.5
-      y: -208
-      width: 905
-      height: 416
+      x: -361.9
+      y: -159.6
+      width: 723.8
+      height: 319.2
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 905, y: 437}
+  m_LastWindowPixelSize: {x: 904.75, y: 425.25}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &24
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -833,15 +626,15 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1706.6666
-    y: 73
-    width: 905
-    height: 460
+    x: 0
+    y: 73.6
+    width: 723.8
+    height: 358.2
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -1127,7 +920,7 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: -0.1655457, y: 0.6978228, z: -0.17099783, w: -0.67557335}
     speed: 2
-    m_Value: {x: -0.16554557, y: 0.6978222, z: -0.17099768, w: -0.6755728}
+    m_Value: {x: -0.1655457, y: 0.6978228, z: -0.17099783, w: -0.67557335}
   m_Size:
     m_Target: 1.0741985
     speed: 2