修改重置按钮功能、过滤功能，退出再进入房间后画面显示Bug

Assets/AgoraVideoAudioManager.cs

@@ -292,7 +292,12 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         //list_ShowView.Clear();
         //list_ShowView = new Dictionary<string, RawImage>();
         mainViewPeerId = "";
-
+        RoomMain.Instance.agoraRawImage.gameObject.SetActive(false);
+        RoomMain.Instance.agoraRawImage.texture = null;
+    
+       
+        DestroyImmediate(RoomMain.Instance.agoraRawImage.GetComponent<UIElementDrag>());
+        DestroyImmediate(RoomMain.Instance.agoraRawImage.GetComponent<VideoSurface>());
     }
 
     public void VuforiaLeaveChannel()
@@ -357,7 +362,7 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         if (isMainView)
             mainViewPeerId = peerId;
 
-        rawImage.gameObject.SetActive(true);
+      //  rawImage.gameObject.SetActive(true);
         rawImage.rectTransform.localEulerAngles = new Vector3(0, 180, 180);
 
         MakeVideoView(dicPeeridAndUid[peerId], rawImage, this._channelName);
@@ -367,7 +372,7 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
     {
         if (dicPeeridAndUid.Count < 2)
             return;
-        rawImage.gameObject.SetActive(true);
+      //  rawImage.gameObject.SetActive(true);
         rawImage.rectTransform.localEulerAngles = new Vector3(0, 180, 180);
         MakeVideoView(dicPeeridAndUid.Values.Skip(1).First(), rawImage, this._channelName);
     }
@@ -379,7 +384,7 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         if (uid == dicPeeridAndUid.Values.Skip(1).First())
         {
 
-            RoomMain.Instance.agoraRawImage.gameObject.SetActive(true);
+          //  RoomMain.Instance.agoraRawImage.gameObject.SetActive(true);
             RoomMain.Instance.agoraRawImage.rectTransform.localEulerAngles = new Vector3(0, 180, 180);
             MakeVideoView(dicPeeridAndUid.Values.Skip(1).First(), RoomMain.Instance.agoraRawImage, this._channelName);
 
@@ -471,6 +476,28 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         {
             if (dicPeeridAndUid[listCustomPeer[i].peerId] == uid)
             {
+                switch (state)
+                {
+                    case REMOTE_VIDEO_STATE.REMOTE_VIDEO_STATE_STOPPED:
+                        // listCustomPeer[i].isVideo = false;
+                        break;
+                    case REMOTE_VIDEO_STATE.REMOTE_VIDEO_STATE_STARTING:
+                        listCustomPeer[i].isVideo = true;
+                        CloseAgoraMainImage(listCustomPeer[i].peerId, true);
+                        break;
+                    case REMOTE_VIDEO_STATE.REMOTE_VIDEO_STATE_DECODING:
+                        listCustomPeer[i].isCloseVideo = false;
+                        CloseAgoraMainImage(listCustomPeer[i].peerId, true);
+                        break;
+                    case REMOTE_VIDEO_STATE.REMOTE_VIDEO_STATE_FROZEN:
+                        break;
+                    case REMOTE_VIDEO_STATE.REMOTE_VIDEO_STATE_FAILED:
+                        //  listCustomPeer[i].isVideo = false;
+                        break;
+                    default:
+                        break;
+                }
+
                 switch (reason)
                 {
                     case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_INTERNAL:
@@ -735,7 +762,8 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         //}
 
         // make the object draggable
-        rawImage.gameObject.AddComponent<UIElementDrag>();
+        if (rawImage.gameObject.GetComponent<UIElementDrag>() == null)
+            rawImage.gameObject.AddComponent<UIElementDrag>();
         //var canvas = GameObject.Find("VideoCanvas");
         //if (canvas != null)
         //{
@@ -750,7 +778,10 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
 
 
         // configure videoSurface
-        var videoSurface = rawImage.gameObject.AddComponent<VideoSurface>();
+
+        if (rawImage.gameObject.GetComponent<VideoSurface>() == null)
+            rawImage.gameObject.AddComponent<VideoSurface>();
+        var videoSurface = rawImage.gameObject.GetComponent<VideoSurface>();
         return videoSurface;
     }
 

Assets/Plugins/Android/AndroidManifest.xml

@@ -1,113 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.nibiru.ar"
-    android:installLocation="auto"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <application
-        android:isGame="true"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-        >
-
-        <meta-data android:name="NibiruVRVersion" android:value="2" />
-
-        <activity
-            android:name="com.nibiru.lib.xr.unity.NibiruXRUnityActivity"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale"
-
-            android:launchMode="singleTask"
-            android:screenOrientation="landscape"
-            android:exported="true">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools">
+    <application>
+        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+                  android:theme="@style/UnityThemeSelector">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
-
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="com.google.intent.category.CARDBOARD" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-                <category android:name="com.nibiru.intent.category.NVR" />
-
-
-
-
-
-
-                <category android:name="com.nibiru.intent.category.STUDIO" />
-
-
-
-
-
-
-
-
             </intent-filter>
-
-            <meta-data
-                android:name="unityplayer.UnityActivity"
-                android:value="true" />
-
-            <meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="false" />
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
         </activity>
-
-        <!-- "VOICE", "6DOF", "GESTURE", "RECORD", "MARKER", "RECOGINIZE" !-->
-        <meta-data android:value="6DOF,RECORD" android:name="NIBIRU_PLUGIN_IDS"/>
-        <meta-data android:value="NxrViewerMain" android:name="NIBIRU_UNITY_VIEWER_NAME"/>
-        <!--0=vr,1=ar-->
-        <meta-data android:value="AR" android:name="HMD_TYPE"/>
-        <!-- SixDofMode: 0=TM2, 1=Qualcomm -->
-        <!-- <meta-data android:value="1" android:name="NIBIRU_SIX_DOF_MODE"/> !-->
-        <!-- SixDofType: 0=内置3DOF+位移, 1=Full 6DOF -->
-        <!-- <meta-data android:value="1" android:name="NIBIRU_SIX_DOF_TYPE"/> !-->
-        <!-- 当前APK为加密版本-->
-        <meta-data android:value="0" android:name="NIBIRU_ENCRYPTION_MODE"/>
-        <!-- APK新加密机制：填写工具声明的密钥 -->
-        <meta-data android:value="pNYNdVJTCCw." android:name="NIBIRU_SDK_KEY"/>
     </application>
-
-
-    <uses-feature android:glEsVersion="0x00030000" android:required="true" />
-    <uses-feature
-        android:name="android.hardware.sensor.accelerometer"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.sensor.gyroscope"
-        android:required="true" />
-
-
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-
-    <!-- VR feature tags. -->
-    <uses-feature
-        android:name="android.software.vr.mode"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.vr.high_performance"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.touchscreen.multitouch"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.touchscreen.multitouch.distinct"
-        android:required="false" />
-    <uses-feature
-        android:name="android.software.leanback"
-        android:required="false" />
-
-</manifest>
+</manifest>

Assets/Remote/PopPublic/ListenDlg.prefab

@@ -29,6 +29,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0073000193}
   m_LocalScale: {x: 0.00013, y: 0.00013, z: 0.00013}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1525368146611445996}
   - {fileID: 1525368146587300417}
@@ -64,11 +65,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: cbec7d18a89d019489777c3af327da4f, type: 2}
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: ef406ac2762ab2446b6ad9dce6b1bc8c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -93,6 +94,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -122,8 +124,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!1 &1525368145403973541
 GameObject:
   m_ObjectHideFlags: 0
@@ -152,6 +152,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: 0.70711, w: -0.7071036}
   m_LocalPosition: {x: 0, y: 0, z: -6.6}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1525368146982221439}
   m_RootOrder: 0
@@ -184,11 +185,11 @@ MonoBehaviour:
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: b60c13d87bc4fea48b85805e42c8b7fa, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -227,6 +228,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: 0.92387867, w: 0.38268548}
   m_LocalPosition: {x: 0, y: 0, z: -6.6}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1525368146748637997}
   m_RootOrder: 0
@@ -259,11 +261,11 @@ MonoBehaviour:
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: b60c13d87bc4fea48b85805e42c8b7fa, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -302,6 +304,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0071000457}
   m_LocalScale: {x: 0.00013, y: 0.00013, z: 0.00013}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2799213986232774073}
   m_RootOrder: 6
@@ -334,11 +337,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 322f1a399a5aa4849bdb35804e072383, type: 2}
   m_Color: {r: 0.47843137, g: 0.4862745, b: 0.5568628, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 2ff6dea5cc4ee8841b6903fc6c5d47f5, type: 3}
     m_FontSize: 55
@@ -381,6 +384,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0071000457}
   m_LocalScale: {x: 0.00013, y: 0.00013, z: 0.00013}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2799213986232774073}
   m_RootOrder: 5
@@ -413,11 +417,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 322f1a399a5aa4849bdb35804e072383, type: 2}
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 2ff6dea5cc4ee8841b6903fc6c5d47f5, type: 3}
     m_FontSize: 80
@@ -460,6 +464,7 @@ RectTransform:
   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: 1525368145179656130}
   m_RootOrder: 1
@@ -492,11 +497,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 096d4768aa5e44841a08a5e26bbb1ea2, type: 2}
   m_Color: {r: 0.28400737, g: 0.29411766, b: 0.375, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: ef406ac2762ab2446b6ad9dce6b1bc8c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -535,6 +540,7 @@ RectTransform:
   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: 1525368145179656130}
   m_RootOrder: 0
@@ -567,11 +573,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 0fa71985001412441b9164c093291a5e, type: 2}
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300006, guid: cea2c9bf87b0c4dfdafb697a3ff00959, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -610,6 +616,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.008300006}
   m_LocalScale: {x: 0.00012, y: 0.00012, z: 0.00012}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2799213986232774073}
   m_RootOrder: 4
@@ -642,11 +649,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 322f1a399a5aa4849bdb35804e072383, type: 2}
   m_Color: {r: 0.9485294, g: 0.9485294, b: 0.9485294, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 2ff6dea5cc4ee8841b6903fc6c5d47f5, type: 3}
     m_FontSize: 70
@@ -690,6 +697,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: 0.000000014901161, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003790021}
   m_LocalScale: {x: 0.00045, y: 0.00045, z: 0.00045}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1525368145634472298}
   m_Father: {fileID: 2799213986232774073}
@@ -723,11 +731,11 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.990566, g: 0.3037113, b: 0.30929548, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: ef406ac2762ab2446b6ad9dce6b1bc8c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -752,6 +760,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -781,8 +790,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!1 &1525368146780870129
 GameObject:
   m_ObjectHideFlags: 0
@@ -811,6 +818,7 @@ RectTransform:
   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: 1525368145179656130}
   m_RootOrder: 2
@@ -843,11 +851,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 8ba3b12496e969e4d8a3a50880c570bf, type: 2}
   m_Color: {r: 0.39359862, g: 0.407055, b: 0.5147059, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: ef406ac2762ab2446b6ad9dce6b1bc8c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -887,6 +895,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: 0.000000014901161, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003790021}
   m_LocalScale: {x: 0.00045, y: 0.00045, z: 0.00045}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1525368145403973540}
   m_Father: {fileID: 2799213986232774073}
@@ -920,11 +929,11 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.043137256, g: 0.70980394, b: 0.50980395, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: ef406ac2762ab2446b6ad9dce6b1bc8c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -949,6 +958,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -978,8 +988,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!1 &2799213986232774072
 GameObject:
   m_ObjectHideFlags: 0
@@ -1010,6 +1018,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.57}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2009882600178400167}
   - {fileID: 2799213986543484529}
@@ -1071,6 +1080,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
 --- !u!114 &2799213986232774074
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1133,6 +1143,7 @@ RectTransform:
   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: 2799213986232774073}
   m_RootOrder: 1
@@ -1165,11 +1176,11 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.47058824}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 6906e47fd20b1e6478ce842840eefa25, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -1208,6 +1219,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0073000193}
   m_LocalScale: {x: 0.00013, y: 0.00013, z: 0.00013}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2799213986232774073}
   m_RootOrder: 2
@@ -1240,11 +1252,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 0fa71985001412441b9164c093291a5e, type: 2}
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Texture: {fileID: 2800000, guid: 668d182a16cba93469cb1aef583229ae, type: 3}
   m_UVRect:
     serializedVersion: 2
@@ -1280,6 +1292,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.0187}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2799213986232774073}
   m_RootOrder: 0
@@ -1312,11 +1325,11 @@ MonoBehaviour:
   m_Material: {fileID: 2100000, guid: 8f8125e4f0a9aa248bccbb3e4c674cb9, type: 2}
   m_Color: {r: 0, g: 0, b: 0, a: 0.8235294}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: a85e0ef996389864d90fc222ee456814, type: 3}
   m_Type: 1
   m_PreserveAspect: 0

Assets/Remote/Scenes/Remote3.0.unity

@@ -299,7 +299,7 @@ PrefabInstance:
     - target: {fileID: 604547952246451193, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
         type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 604547952246451193, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
         type: 3}
@@ -687,6 +687,107 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!1 &760973013
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 760973017}
+  - component: {fileID: 760973016}
+  - component: {fileID: 760973015}
+  - component: {fileID: 760973014}
+  m_Layer: 3
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &760973014
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760973013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &760973015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760973013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!223 &760973016
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760973013}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &760973017
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760973013}
+  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:
+  - {fileID: 1243702795}
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  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.9}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &855958478
 GameObject:
   m_ObjectHideFlags: 0
@@ -718,7 +819,7 @@ Transform:
   m_Children:
   - {fileID: 1877736617}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &855958480
 MonoBehaviour:
@@ -985,7 +1086,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1016915732
 GameObject:
@@ -1021,7 +1122,6 @@ Transform:
   - {fileID: 432748553}
   - {fileID: 1724188192}
   - {fileID: 1106080562}
-  - {fileID: 1243702795}
   m_Father: {fileID: 973110132107938479}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1269,7 +1369,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1243702795}
   - component: {fileID: 1243702796}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: PopPublic
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1288,8 +1388,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1016915733}
-  m_RootOrder: 4
+  m_Father: {fileID: 760973017}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1243702796
 MonoBehaviour:
@@ -1452,7 +1552,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1564295169
 MonoBehaviour:
@@ -1728,11 +1828,11 @@ RectTransform:
   - {fileID: 1016915733}
   - {fileID: 6973250901236105079}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   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_AnchoredPosition: {x: 0, y: 0.9}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &973110132107938480
@@ -1851,7 +1951,7 @@ PrefabInstance:
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8475401995549084109, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}

Assets/Remote/ShowRoom/PeerBigView.cs

@@ -185,49 +185,49 @@ public class PeerBigView : MonoBehaviour,IDragHandler,IEndDragHandler
   
     public void OpenVideo()
     {
-        if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && cPeer.isCloseVideo)
-        {
-            RemoteRtc.Instance.startRev(cPeer.cIdV);
-            cPeer.isCloseVideo = false;
-            // cPeer.setInfo("audio", cPeer.cIdA,true);
-        }
+        //if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && cPeer.isCloseVideo)
+        //{
+        //    RemoteRtc.Instance.startRev(cPeer.cIdV);
+        //    cPeer.isCloseVideo = false;
+        //    // cPeer.setInfo("audio", cPeer.cIdA,true);
+        //}
         AgoraVideoAudioManager.Instance.MuteRemoteVideoStream(cPeer.peerId, true);
-        agoraRawImage.gameObject.SetActive(true);
-        RoomMain.Instance.agoraRawImage.gameObject.SetActive(true);
+        //agoraRawImage.gameObject.SetActive(true);
+      //  RoomMain.Instance.agoraRawImage.gameObject.SetActive(true);
     }
     public void CloseVideo()
     {
-        if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && !cPeer.isCloseVideo)
-        {
-            RemoteRtc.Instance.closeRev(cPeer.cIdV);
-            cPeer.isCloseVideo = true;
-            // cPeer.setInfo("audio", cPeer.cIdA,true);
-        }
+        //if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && !cPeer.isCloseVideo)
+        //{
+        //    RemoteRtc.Instance.closeRev(cPeer.cIdV);
+        //    cPeer.isCloseVideo = true;
+        //    // cPeer.setInfo("audio", cPeer.cIdA,true);
+        //}
         AgoraVideoAudioManager.Instance.MuteRemoteVideoStream(cPeer.peerId, false);
-        agoraRawImage.gameObject.SetActive(false);
-        RoomMain.Instance.agoraRawImage.gameObject.SetActive(false);
+      //  agoraRawImage.gameObject.SetActive(false);
+      //  RoomMain.Instance.agoraRawImage.gameObject.SetActive(false);
     }
 
 
     public void openMic()
     {
-        if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && cPeer.isCloseAudio)
-        {
-            RemoteRtc.Instance.startRev(cPeer.cIdA);
-            cPeer.isCloseAudio = false;
-            // cPeer.setInfo("audio", cPeer.cIdA,true);
-        }
+        //if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && cPeer.isCloseAudio)
+        //{
+        //    RemoteRtc.Instance.startRev(cPeer.cIdA);
+        //    cPeer.isCloseAudio = false;
+        //    // cPeer.setInfo("audio", cPeer.cIdA,true);
+        //}
        // cPeer.isCloseAudio = false;
         AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, true);
     }
     public void closeMic()
     {
-        if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && !cPeer.isCloseAudio)
-        {
-            RemoteRtc.Instance.closeRev(cPeer.cIdA);
-            cPeer.isCloseAudio = true;
-            //  cPeer.setInfo("audio", cPeer.cIdA, false);
-        }
+        //if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && !cPeer.isCloseAudio)
+        //{
+        //    RemoteRtc.Instance.closeRev(cPeer.cIdA);
+        //    cPeer.isCloseAudio = true;
+        //    //  cPeer.setInfo("audio", cPeer.cIdA, false);
+        //}
        // cPeer.isCloseAudio = true;
         AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, false);
     }

Assets/Remote/ShowRoom/PeerSamllView.cs

@@ -312,28 +312,28 @@ public class PeerSamllView : BaseView, IPointerEnterHandler, IPointerExitHandler
 
     public void OpenVideo()
     {
-        if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && cPeer.isCloseVideo)
-        {
-            RemoteRtc.Instance.startRev(cPeer.cIdV);
-            cPeer.isCloseVideo = false;
-            // cPeer.setInfo("audio", cPeer.cIdA,true);
-            //  AgoraVideoAudioManager.Instance.EnableLocalVideo(true);
-        }
+        //if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && cPeer.isCloseVideo)
+        //{
+        //    RemoteRtc.Instance.startRev(cPeer.cIdV);
+        //    cPeer.isCloseVideo = false;
+        //    // cPeer.setInfo("audio", cPeer.cIdA,true);
+        //    //  AgoraVideoAudioManager.Instance.EnableLocalVideo(true);
+        //}
 
         // cPeer.setInfo("audio", cPeer.cIdA,true);
         AgoraVideoAudioManager.Instance.MuteRemoteVideoStream(cPeer.peerId, true);
-        RoomMain.Instance.agoraRawImage.gameObject.SetActive(true);
+    //    RoomMain.Instance.agoraRawImage.gameObject.SetActive(true);
 
     }
     public void CloseVideo()
     {
-        if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && !cPeer.isCloseVideo)
-        {
-            RemoteRtc.Instance.closeRev(cPeer.cIdV);
-            cPeer.isCloseVideo = true;
-            // cPeer.setInfo("audio", cPeer.cIdA,true);
-            //AgoraVideoAudioManager.Instance.EnableLocalVideo(false);
-        }
+        //if (cPeer != null && cPeer.isVideo && cPeer.cIdV != "" && !cPeer.isCloseVideo)
+        //{
+        //    RemoteRtc.Instance.closeRev(cPeer.cIdV);
+        //    cPeer.isCloseVideo = true;
+        //    // cPeer.setInfo("audio", cPeer.cIdA,true);
+        //    //AgoraVideoAudioManager.Instance.EnableLocalVideo(false);
+        //}
 
         // cPeer.setInfo("audio", cPeer.cIdA,true);
         AgoraVideoAudioManager.Instance.MuteRemoteVideoStream(cPeer.peerId, false);
@@ -344,26 +344,26 @@ public class PeerSamllView : BaseView, IPointerEnterHandler, IPointerExitHandler
 
     public void openMic()
     {
-        if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && cPeer.isCloseAudio)
-        {
-            RemoteRtc.Instance.startRev(cPeer.cIdA);
-            cPeer.isCloseAudio = true;
-            // cPeer.setInfo("audio", cPeer.cIdA,true);
-            // AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, true);
-        }
+        //if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && cPeer.isCloseAudio)
+        //{
+        //    RemoteRtc.Instance.startRev(cPeer.cIdA);
+        //    cPeer.isCloseAudio = true;
+        //    // cPeer.setInfo("audio", cPeer.cIdA,true);
+        //    // AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, true);
+        //}
        
         // cPeer.setInfo("audio", cPeer.cIdA,true);
         AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, true);
     }
     public void closeMic()
     {
-        if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && !cPeer.isCloseAudio)
-        {
-            RemoteRtc.Instance.closeRev(cPeer.cIdA);
-            cPeer.isCloseAudio = false;
-            //  cPeer.setInfo("audio", cPeer.cIdA, false);
-            //  AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, false);
-        }
+        //if (cPeer != null && cPeer.isAudio && cPeer.cIdA != "" && !cPeer.isCloseAudio)
+        //{
+        //    RemoteRtc.Instance.closeRev(cPeer.cIdA);
+        //    cPeer.isCloseAudio = false;
+        //    //  cPeer.setInfo("audio", cPeer.cIdA, false);
+        //    //  AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, false);
+        //}
        
         //  cPeer.setInfo("audio", cPeer.cIdA, false);
         AgoraVideoAudioManager.Instance.MuteRemoteAudioStream(cPeer.peerId, false);

Assets/Remote/ShowRoom/RoomInvite/Prefab/InviteDlg.prefab

@@ -701,7 +701,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &2799213986232774074
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1741,7 +1741,6 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 200, y: 200, z: 200}
-  m_ShouldActivateOnSelect: 0
 --- !u!1 &4438569340079416043
 GameObject:
   m_ObjectHideFlags: 0

Assets/Remote/ShowRoom/RoomInvite/Prefab/Mp4Item.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 6466218339796299033}
   - component: {fileID: 6586083700225313882}
   - component: {fileID: 7920329264520199167}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: HideBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -137,7 +137,7 @@ GameObject:
   - component: {fileID: 213015406801580223}
   - component: {fileID: 2638728750074612142}
   - component: {fileID: 7664475438327412785}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: TextTotalTime
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -217,7 +217,7 @@ GameObject:
   - component: {fileID: 2283116017366872121}
   - component: {fileID: 2283116017366872135}
   - component: {fileID: 2283116017366872134}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -293,7 +293,7 @@ GameObject:
   - component: {fileID: 2283116017620325674}
   - component: {fileID: 2283116017620325672}
   - component: {fileID: 2283116017620325675}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: NameText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -376,7 +376,7 @@ GameObject:
   - component: {fileID: 2283116017620586616}
   - component: {fileID: 2283116017620586619}
   - component: {fileID: 3854976310810033704}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Mp4Item
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -442,10 +442,13 @@ MonoBehaviour:
   scaleMinimum: 0.2
   activeScaleMaxRestrict: 0
   scaleMaximum: 2
+  scaleHandleSize: 0.016
   BoundBoxCollider: {fileID: 0}
+  rotationHandleSize: 0.016
   showRotationHandleForX: 0
   showRotationHandleForY: 1
   showRotationHandleForZ: 0
+  axisScaleHandleSize: 0.016
   activeAxis: 36
   RotateStartAudio: 4
   RotateStopAudio: 3
@@ -552,7 +555,7 @@ GameObject:
   - component: {fileID: 2579258343978516615}
   - component: {fileID: 2859089888866311918}
   - component: {fileID: 63609482498729650}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: DeleteImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -626,7 +629,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3304120222688893483}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Icon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -662,7 +665,7 @@ GameObject:
   - component: {fileID: 3304120223395600377}
   - component: {fileID: 8769614437117033041}
   - component: {fileID: 5094390137973352205}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: UIButtonSquareIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -806,7 +809,7 @@ GameObject:
   - component: {fileID: 5004922790156949567}
   - component: {fileID: 3942060849700519476}
   - component: {fileID: 2795984278497288442}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: MainVideo
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1083,7 +1086,7 @@ GameObject:
   - component: {fileID: 9062546506178636511}
   - component: {fileID: 405983295416821311}
   - component: {fileID: 2631174568745984969}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Text (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1163,7 +1166,7 @@ GameObject:
   - component: {fileID: 7296598711735126399}
   - component: {fileID: 7588589351763735967}
   - component: {fileID: 2020005161735476347}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: HideImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1239,7 +1242,7 @@ GameObject:
   - component: {fileID: 9093927649073779217}
   - component: {fileID: 8277491014523973697}
   - component: {fileID: 2207506276946927452}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: CurrentTime
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1320,7 +1323,7 @@ GameObject:
   - component: {fileID: 1549779324380688215}
   - component: {fileID: 4835135013135617026}
   - component: {fileID: 2802108232955433869}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Quad
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1428,7 +1431,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6349363835038450772}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Fill Area
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1467,7 +1470,7 @@ GameObject:
   - component: {fileID: 6349363835951209459}
   - component: {fileID: 6349363835951209457}
   - component: {fileID: 6349363835951209456}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Handle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1543,7 +1546,7 @@ GameObject:
   - component: {fileID: 6349363835981578717}
   - component: {fileID: 6349363835981578715}
   - component: {fileID: 6349363835981578714}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1619,7 +1622,7 @@ GameObject:
   - component: {fileID: 6349363836247241438}
   - component: {fileID: 6349363836247241436}
   - component: {fileID: 6349363836247241439}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Fill
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1695,7 +1698,7 @@ GameObject:
   - component: {fileID: 6349363836296604644}
   - component: {fileID: 6349363836296604642}
   - component: {fileID: 6349363836296604645}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: "\u65F6\u95F4 (1)"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1773,7 +1776,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6349363836849966177}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Handle Slide Area
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1814,7 +1817,7 @@ GameObject:
   - component: {fileID: 6349363836886034459}
   - component: {fileID: 6349363836886034458}
   - component: {fileID: 1712594213334104273}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Slider
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2093,7 +2096,7 @@ GameObject:
   - component: {fileID: 3542131424521555713}
   - component: {fileID: 4335685289320057137}
   - component: {fileID: 616166886907875006}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: DeleteBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2217,7 +2220,7 @@ GameObject:
   - component: {fileID: 6499191176663535467}
   - component: {fileID: 7054420312051908546}
   - component: {fileID: 638677674259138258}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: ChooseKuang
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2296,7 +2299,7 @@ GameObject:
   - component: {fileID: 3005229446408330610}
   - component: {fileID: 8521534527103217112}
   - component: {fileID: 5894201000246833682}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: StopBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Remote/ShowRoom/RoomInvite/Prefab/PngJpgItem.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 3249712615032965929}
   - component: {fileID: 2381243627060770761}
   - component: {fileID: 6076352349819639341}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: HideImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -28,6 +28,7 @@ RectTransform:
   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: 3042023657231314766}
   m_RootOrder: 0
@@ -60,6 +61,7 @@ MonoBehaviour:
   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:
@@ -85,7 +87,7 @@ GameObject:
   - component: {fileID: 2283116017366872121}
   - component: {fileID: 2283116017366872135}
   - component: {fileID: 2283116017366872134}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -102,6 +104,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.1199842, y: 0.1199842, z: 0.1199842}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 3
@@ -134,6 +137,7 @@ MonoBehaviour:
   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:
@@ -159,7 +163,7 @@ GameObject:
   - component: {fileID: 2283116017620325674}
   - component: {fileID: 2283116017620325672}
   - component: {fileID: 2283116017620325675}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: NameText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -176,6 +180,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.000035724504, y: 0.000035724504, z: 0.000035724504}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 1
@@ -208,6 +213,7 @@ MonoBehaviour:
   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:
@@ -240,7 +246,7 @@ GameObject:
   - component: {fileID: 2283116017620586616}
   - component: {fileID: 2283116017620586619}
   - component: {fileID: -4693312241201425186}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: PngJpgItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -257,6 +263,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0.4, y: 0, z: 0.8}
   m_LocalScale: {x: 2.7922, y: 2.7922, z: 2.7922}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7501303589197907794}
   - {fileID: 2283116017620325674}
@@ -300,10 +307,13 @@ MonoBehaviour:
   scaleMinimum: 0.2
   activeScaleMaxRestrict: 0
   scaleMaximum: 2
+  scaleHandleSize: 0.016
   BoundBoxCollider: {fileID: 0}
+  rotationHandleSize: 0.016
   showRotationHandleForX: 0
   showRotationHandleForY: 1
   showRotationHandleForZ: 0
+  axisScaleHandleSize: 0.016
   activeAxis: 36
   RotateStartAudio: 4
   RotateStopAudio: 3
@@ -409,7 +419,7 @@ GameObject:
   - component: {fileID: 2907454102406049617}
   - component: {fileID: 3188408681182982456}
   - component: {fileID: 825279867234388324}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: DeleteImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -426,6 +436,7 @@ RectTransform:
   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: 7378549253663381117}
   m_RootOrder: 0
@@ -458,6 +469,7 @@ MonoBehaviour:
   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:
@@ -483,7 +495,7 @@ GameObject:
   - component: {fileID: 7501303589197907794}
   - component: {fileID: 4772399195672543194}
   - component: {fileID: 7636673134551416101}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: MainImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -500,6 +512,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.00035814047, y: 0.00035814047, z: 0.00035814047}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 0
@@ -532,6 +545,7 @@ MonoBehaviour:
   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:
@@ -556,7 +570,7 @@ GameObject:
   - component: {fileID: 1290117377408790351}
   - component: {fileID: 1386419850930638348}
   - component: {fileID: 2716053453577501097}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: HideBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -573,6 +587,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: -0.005}
   m_LocalScale: {x: 0.12, y: 0.12, z: 0.1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3249712615032965929}
   m_Father: {fileID: 2283116017620586623}
@@ -606,6 +621,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -680,7 +696,7 @@ GameObject:
   - component: {fileID: 4231741069890183383}
   - component: {fileID: 4015369301495670503}
   - component: {fileID: 224924149744132456}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: DeleteBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -697,6 +713,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.005}
   m_LocalScale: {x: 0.12, y: 0.12, z: 0.1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2907454102406049617}
   m_Father: {fileID: 2283116017620586623}
@@ -730,6 +747,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.10980393, g: 0.10980393, b: 0.10980393, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -802,7 +820,7 @@ GameObject:
   - component: {fileID: 2847491637754489257}
   - component: {fileID: 819895079492386796}
   - component: {fileID: 1418299112493805946}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: ChooseKuang
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -819,6 +837,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.1199842, y: 0.1199842, z: 0.1199842}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 2
@@ -851,6 +870,7 @@ MonoBehaviour:
   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:

Assets/Remote/ShowRoom/ShowRoom.cs

@@ -238,7 +238,7 @@ public class ShowRoom : RemoteSingleton<ShowRoom>
         Debug.Log(" pos " + pos);
         HttpsSendLog.Instance.SendLog("Reset" ," Pos " +pos.ToString());
         transform.position = new Vector3(pos.x, OpenXRCamera.Instance.head.position.y, pos.z);
-        transform.eulerAngles = new Vector3(0, -30, 0);
+        transform.eulerAngles = new Vector3(0, -30 + OpenXRCamera.Instance.head.eulerAngles.y, 0);
         ShowMainScreen();
         PopPeerView.CloseView?.Invoke();
         if (RoomFile.Instance)

Assets/TriLib/TriLibCore/Scripts/AssetUnloader.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 namespace TriLibCore
 {
@@ -48,6 +48,20 @@ namespace TriLibCore
         private void Start()
         {
             Register();
+            ChangeLayerRecursively(transform);
+        }
+
+        public void ChangeLayerRecursively(Transform parentTransform)
+        {
+            // 修改父物体的层级
+            parentTransform.gameObject.layer = LayerMask.NameToLayer("Arrow");
+
+            // 遍历所有子物体，并递归调用ChangeLayerRecursively方法
+            for (int i = 0; i < parentTransform.childCount; i++)
+            {
+                Transform childTransform = parentTransform.GetChild(i);
+                ChangeLayerRecursively(childTransform);
+            }
         }
 
         private void OnDestroy()

Assets/XRToolkit/ArtShow/Resources/Container/ModelContainer.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 8966945890872210017}
   - component: {fileID: 7216562458663927216}
   - component: {fileID: 4895520205962565269}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: ProcessLabel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -28,6 +28,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -0.2, z: -0.0266}
   m_LocalScale: {x: 0.03, y: 0.03, z: 0.03}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8813769521014321180}
   m_RootOrder: 1
@@ -43,6 +44,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -104,7 +106,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8813769521014321180}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: DownInfo
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -121,6 +123,7 @@ Transform:
   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:
   - {fileID: 4994529286529523537}
   - {fileID: 8966945890872210017}
@@ -140,7 +143,7 @@ GameObject:
   - component: {fileID: 8167846651000151647}
   - component: {fileID: 8960292228596389999}
   - component: {fileID: 5259984490870202336}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: DeleteBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -157,6 +160,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.028400041}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7185903658820440537}
   m_Father: {fileID: 3955217127918357540}
@@ -263,7 +267,7 @@ GameObject:
   - component: {fileID: 8367030212661217725}
   - component: {fileID: 134817974857888470}
   - component: {fileID: 5040715890315308679}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: ChooseKuang
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -280,6 +284,7 @@ RectTransform:
   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: 3955217127918357540}
   m_RootOrder: 1
@@ -340,7 +345,7 @@ GameObject:
   - component: {fileID: 7861061573497631544}
   - component: {fileID: 8053279119561691771}
   - component: {fileID: 6435132643489834462}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: HideBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -357,6 +362,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: -0.0284}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5901473997965203294}
   m_Father: {fileID: 3955217127918357540}
@@ -462,7 +468,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4994529286529523537}
   - component: {fileID: 3135331731969057509}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: app_icon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -479,6 +485,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.04, y: 0.04, z: 0.04}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8813769521014321180}
   m_RootOrder: 0
@@ -494,6 +501,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -545,7 +553,7 @@ GameObject:
   - component: {fileID: 2514328941397787759}
   - component: {fileID: 7970067416411668148}
   - component: {fileID: 19409617397089322}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: NameText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -562,6 +570,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.1}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3955217127918357540}
   m_RootOrder: 0
@@ -624,7 +633,7 @@ GameObject:
   - component: {fileID: 7185903658820440537}
   - component: {fileID: 7484894179125415856}
   - component: {fileID: 4653297030583531500}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: DeleteImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -641,6 +650,7 @@ RectTransform:
   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: 3280291957776214261}
   m_RootOrder: 0
@@ -704,7 +714,7 @@ GameObject:
   - component: {fileID: 7921608366927118921}
   - component: {fileID: 463633449772349043}
   - component: {fileID: 1783179119547974561}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: ModelContainer
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -721,6 +731,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7921608367376971771}
   - {fileID: 6901466653404652261}
@@ -900,7 +911,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7921608367376971771}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: ModelRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -917,6 +928,7 @@ Transform:
   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: 7921608366927118930}
   m_RootOrder: 0
@@ -932,7 +944,7 @@ GameObject:
   - component: {fileID: 5901473997965203294}
   - component: {fileID: 6770198063472470974}
   - component: {fileID: 2930991742844062298}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: HideImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -949,6 +961,7 @@ RectTransform:
   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: 6253251744958362425}
   m_RootOrder: 0
@@ -1008,7 +1021,7 @@ GameObject:
   - component: {fileID: 8318460399776526520}
   - component: {fileID: 4509915836268377876}
   - component: {fileID: 69972489372268428}
-  m_Layer: 5
+  m_Layer: 3
   m_Name: Canvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1025,6 +1038,7 @@ RectTransform:
   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:
   - {fileID: 2514328941397787759}
   - {fileID: 8367030212661217725}
@@ -1109,7 +1123,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6901466653404652261}
   - component: {fileID: 2187686680123956044}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: ColliderBody
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1126,6 +1140,7 @@ Transform:
   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: 7921608366927118930}
   m_RootOrder: 1

Assets/XRToolkit/ArtShow/Scripts/Container/ModelContainer.cs

@@ -1,4 +1,4 @@
-using DG.Tweening;
+using DG.Tweening;
 using PublicTools.Unity;
 using SC.XR.Unity.Module_InputSystem;
 using ShadowStudio.Tool;
@@ -197,6 +197,7 @@ namespace ShadowStudio.Model
                 //body.localRotation = Quaternion.identity;
                 //body.transform.localScale = Vector3.one;
             }
+          
         }
         //private void Update()
         //{

Assets/XRToolkit/ShadowSDKHelper/Scripts/BoundBox/TransferCell.cs

@@ -1,4 +1,4 @@
-using DG.Tweening;
+using DG.Tweening;
 using SC.XR.Unity.Module_InputSystem;
 using System;
 using System.Collections.Generic;
@@ -200,10 +200,29 @@ namespace ShadowStudio.Tool
                 if (!boundCell)
                 {
                     boundCell = UnityUtil.GetBreadthChild(transform, "XRTool.Util.XBoundingBox");
+                    ChangeLayerRecursively(boundCell.transform);
                 }
                 return boundCell;
             }
         }
+
+        /// <summary>
+        ///  更改层级
+        /// </summary>
+        /// <param name="parentTransform"></param>
+        public void ChangeLayerRecursively(Transform parentTransform)
+        {
+            // 修改父物体的层级
+            parentTransform.gameObject.layer = LayerMask.NameToLayer("Arrow");
+
+            // 遍历所有子物体，并递归调用ChangeLayerRecursively方法
+            for (int i = 0; i < parentTransform.childCount; i++)
+            {
+                Transform childTransform = parentTransform.GetChild(i);
+                ChangeLayerRecursively(childTransform);
+            }
+        }
+
         /// <summary>
         /// 包围盒算法组件
         /// </summary>

GHZMRSupportXR.sln

@@ -1,15 +1,32 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 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}") = "AVProVideo.Runtime", "AVProVideo.Runtime.csproj", "{47E16D9C-8ED0-BD0A-301A-34D021675C41}"
 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}") = "AVProVideo.Demos", "AVProVideo.Demos.csproj", "{E992AB15-531B-26BB-6BA2-07F2EECE0F13}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.Timeline", "AVProVideo.Extensions.Timeline.csproj", "{2A6024BA-58BE-89A9-AE35-A34BFB89A947}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.UnityUI", "AVProVideo.Extensions.UnityUI.csproj", "{40970D1D-C9C7-531B-C75E-EC7EABEF947B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.VisualEffectGraph", "AVProVideo.Extensions.VisualEffectGraph.csproj", "{94808C2F-0A97-A755-8E19-38B0E079AB7B}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Editor", "AVProVideo.Editor.csproj", "{C37AE3D2-A06E-5EDF-634B-BE39388BD855}"
 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}") = "Demos.StandardShader.Inspectors", "Demos.StandardShader.Inspectors.csproj", "{0105670B-211E-72A6-4A0A-81D14515DB44}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.UnityUI.Editor", "AVProVideo.Extensions.UnityUI.Editor.csproj", "{B1E9EB4C-AF30-3EF1-89E7-9DA5337693A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,14 +37,42 @@ Global
 		{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
 		{47E16D9C-8ED0-BD0A-301A-34D021675C41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47E16D9C-8ED0-BD0A-301A-34D021675C41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47E16D9C-8ED0-BD0A-301A-34D021675C41}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47E16D9C-8ED0-BD0A-301A-34D021675C41}.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
+		{E992AB15-531B-26BB-6BA2-07F2EECE0F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E992AB15-531B-26BB-6BA2-07F2EECE0F13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E992AB15-531B-26BB-6BA2-07F2EECE0F13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E992AB15-531B-26BB-6BA2-07F2EECE0F13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A6024BA-58BE-89A9-AE35-A34BFB89A947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A6024BA-58BE-89A9-AE35-A34BFB89A947}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A6024BA-58BE-89A9-AE35-A34BFB89A947}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A6024BA-58BE-89A9-AE35-A34BFB89A947}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40970D1D-C9C7-531B-C75E-EC7EABEF947B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40970D1D-C9C7-531B-C75E-EC7EABEF947B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40970D1D-C9C7-531B-C75E-EC7EABEF947B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40970D1D-C9C7-531B-C75E-EC7EABEF947B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94808C2F-0A97-A755-8E19-38B0E079AB7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94808C2F-0A97-A755-8E19-38B0E079AB7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94808C2F-0A97-A755-8E19-38B0E079AB7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94808C2F-0A97-A755-8E19-38B0E079AB7B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C37AE3D2-A06E-5EDF-634B-BE39388BD855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C37AE3D2-A06E-5EDF-634B-BE39388BD855}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C37AE3D2-A06E-5EDF-634B-BE39388BD855}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C37AE3D2-A06E-5EDF-634B-BE39388BD855}.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
@@ -36,6 +81,10 @@ Global
 		{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
+		{B1E9EB4C-AF30-3EF1-89E7-9DA5337693A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1E9EB4C-AF30-3EF1-89E7-9DA5337693A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1E9EB4C-AF30-3EF1-89E7-9DA5337693A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1E9EB4C-AF30-3EF1-89E7-9DA5337693A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Packages/manifest.json

@@ -11,7 +11,7 @@
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.7.8",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.xr.engine": "file:G:/GUnityProject/XRSDK/package",
+    "com.ximmerse.xr": "file:G:/GUnityProject/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

@@ -134,6 +134,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,
@@ -168,14 +202,17 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "jh.xr.engine": {
+    "com.ximmerse.xr": {
       "version": "file:G:/GUnityProject/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": {

ProjectSettings/ProjectSettings.asset

@@ -146,8 +146,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 2.5.0
-  preloadedAssets:
-  - {fileID: 1707767742241832562, guid: 1a1d14ff6628c11499dfd78d30397967, type: 2}
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -260,7 +259,7 @@ PlayerSettings:
   useCustomBaseGradleTemplate: 1
   useCustomGradlePropertiesTemplate: 1
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 2
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}

ProjectSettings/TimelineSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  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: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60

UserSettings/Layouts/default-2021.dwlt

@@ -1,78 +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: 7
-    y: 504
-    width: 1182
-    height: 481
-  m_ShowMode: 0
-  m_Title: Console
-  m_RootView: {fileID: 6}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  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: 345
-    y: 315
-    width: 1086
-    height: 489
-  m_ShowMode: 0
-  m_Title: Project Settings
-  m_RootView: {fileID: 8}
-  m_MinSize: {x: 310, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &3
-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: 621
-    y: 360
-    width: 640
-    height: 601
-  m_ShowMode: 0
-  m_Title: Build Settings
-  m_RootView: {fileID: 10}
-  m_MinSize: {x: 640, y: 601}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -92,161 +20,11 @@ MonoBehaviour:
     height: 997
   m_ShowMode: 4
   m_Title: Hierarchy
-  m_RootView: {fileID: 11}
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1182
-    height: 481
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 21}
-  m_Panes:
-  - {fileID: 21}
-  m_Selected: 0
-  m_LastSelected: 0
---- !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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 5}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1182
-    height: 481
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 3365
---- !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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectSettingsWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1086
-    height: 489
-  m_MinSize: {x: 310, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 22}
-  m_Panes:
-  - {fileID: 22}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &8
-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: 7}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1086
-    height: 489
-  m_MinSize: {x: 310, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 2669
---- !u!114 &9
-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: BuildPlayerWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 640
-    height: 601
-  m_MinSize: {x: 640, y: 601}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 23}
-  m_Panes:
-  - {fileID: 23}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &10
-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: 9}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 640
-    height: 601
-  m_MinSize: {x: 640, y: 601}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 1770
---- !u!114 &11
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -259,9 +37,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 3}
+  - {fileID: 4}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -274,7 +52,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &12
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -296,7 +74,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &13
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -309,10 +87,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 15}
-  - {fileID: 16}
-  - {fileID: 17}
-  - {fileID: 18}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -322,8 +100,8 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 200}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 43
---- !u!114 &14
+  controlID: 94
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -344,7 +122,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &15
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -357,8 +135,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 19}
-  - {fileID: 20}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -368,8 +146,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 75
---- !u!114 &16
+  controlID: 122
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -390,12 +168,12 @@ MonoBehaviour:
     height: 947
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 24}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &17
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -416,12 +194,12 @@ MonoBehaviour:
     height: 947
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 26}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 26}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &18
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -440,14 +218,14 @@ MonoBehaviour:
     y: 0
     width: 352
     height: 947
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 25}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 25}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &19
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -468,12 +246,12 @@ MonoBehaviour:
     height: 486
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 28}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 28}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &20
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -494,147 +272,12 @@ MonoBehaviour:
     height: 461
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 27}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 27}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &21
-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: 7
-    y: 504
-    width: 1182
-    height: 460
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
---- !u!114 &22
-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: 13854, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 310, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Project Settings
-    m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000,
-      type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 345
-    y: 315
-    width: 1086
-    height: 468
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-  m_PosLeft: {x: 0, y: 0}
-  m_PosRight: {x: 0, y: 1320}
-  m_Scope: 1
-  m_SplitterFlex: 0.2
-  m_SearchText: 
-  m_TreeViewState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 4dcf9b58
-    m_LastClickedID: 1486606157
-    m_ExpandedIDs: a01a5fa6000000004f0a7f2ec53aba5a
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 0
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
---- !u!114 &23
-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: 12043, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 640, y: 580}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Build Settings
-    m_Image: {fileID: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 621
-    y: 360
-    width: 640
-    height: 580
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-  m_TreeViewState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: 
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 0
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
---- !u!114 &24
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -666,9 +309,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 904e0300
-      m_LastClickedID: 216720
-      m_ExpandedIDs: 8481feffd481feffe09ffeff2c28ffff7c28ffffee4effff5054ffffa054ffff127bffffc6c7ffff901d0200102002003c290200
+      m_SelectedIDs: 9e62ffff
+      m_LastClickedID: -40290
+      m_ExpandedIDs: 8471ffff9671ffff24fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -684,7 +327,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 16}
+        m_ClientGUIView: {fileID: 11}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -692,7 +335,7 @@ MonoBehaviour:
       m_IsLocked: 1
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 778e2db4ff4064e43a38f9013e962716
---- !u!114 &25
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -734,7 +377,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &26
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -790,7 +433,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 58}
     m_SelectedIDs: ae000200
     m_LastClickedID: 131246
-    m_ExpandedIDs: 0000000076500100785001007a5001007c5001007e50010080500100825001008450010086500100885001008a5001008c5001008e50010090500100925001009450010096500100985001009a5001009c5001009e500100a0500100a2500100a4500100a6500100a8500100aa500100ac500100ae500100b0500100b2500100b4500100b6500100b8500100ba500100bc500100be500100c0500100c2500100c4500100c6500100c8500100ca500100cc500100ce500100d0500100d2500100d4500100d6500100d8500100da500100dc500100de500100e0500100e2500100e4500100e6500100e8500100ea500100ec500100ee500100f0500100f2500100f4500100f6500100f8500100fa500100fc500100fe50010000510100025101000451010006510100085101000a5101000c5101000e51010010510100125101001451010016510100185101001a5101001c5101001e510100
+    m_ExpandedIDs: 00000000a87b0000aa7b0000ac7b0000ae7b0000b07b0000b27b0000b47b0000b67b0000b87b0000ba7b0000bc7b0000be7b0000c07b0000c27b0000c47b0000c67b0000c87b0000ca7b0000cc7b0000ce7b0000d07b0000d27b0000d47b0000d67b0000d87b0000da7b0000dc7b0000de7b0000e07b0000e27b0000e47b0000e67b0000e87b0000ea7b0000ec7b0000ee7b0000f07b0000f27b0000f47b0000f67b0000f87b0000fa7b0000fc7b0000fe7b0000007c0000027c0000047c0000067c0000087c00000a7c00000c7c00000e7c0000107c0000127c0000147c0000167c0000187c00001a7c00001c7c00001e7c0000207c0000227c0000247c0000267c0000287c00002a7c00002c7c00002e7c0000307c0000327c0000347c0000367c0000387c00003a7c00003c7c00003e7c0000407c0000427c0000447c0000467c0000487c00004a7c00004c7c00004e7c0000507c0000527c0000547c0000567c0000587c00005a7c00005c7c00005e7c0000607c0000627c0000647c0000667c0000687c00006a7c00006c7c00006e7c0000707c0000727c0000747c0000767c0000787c00007a7c00007c7c00007e7c0000807c0000827c0000847c0000867c0000887c00008a7c00008c7c00008e7c0000907c0000927c0000947c0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -806,7 +449,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 17}
+      m_ClientGUIView: {fileID: 8}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -815,10 +458,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 1568}
+    scrollPos: {x: 0, y: 1312}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff0000000076500100785001007a5001007c5001007e50010080500100825001008450010086500100885001008a5001008c5001008e50010090500100925001009450010096500100985001009a5001009c5001009e500100a0500100a2500100a4500100a6500100a8500100aa500100ac500100ae500100b0500100b2500100b4500100b6500100b8500100ba500100bc500100be500100c0500100c2500100c4500100c6500100c8500100ca500100cc500100ce500100d0500100d2500100d4500100d6500100d8500100da500100dc500100de500100e0500100e2500100e4500100e6500100e8500100ea500100ec500100ee500100f0500100f2500100f4500100f6500100f8500100fa500100fc500100fe50010000510100025101000451010006510100085101000a5101000c5101000e51010010510100125101001451010016510100185101001a5101001c5101001e5101005458010058580100c0ba020078ca0200ccd10200
+    m_ExpandedIDs: ffffffff00000000a87b0000aa7b0000ac7b0000ae7b0000b07b0000b27b0000b47b0000b67b0000b87b0000ba7b0000bc7b0000be7b0000c07b0000c27b0000c47b0000c67b0000c87b0000ca7b0000cc7b0000ce7b0000d07b0000d27b0000d47b0000d67b0000d87b0000da7b0000dc7b0000de7b0000e07b0000e27b0000e47b0000e87b0000ea7b0000ec7b0000ee7b0000f07b0000f27b0000f47b0000f67b0000f87b0000fa7b0000fc7b0000fe7b0000007c0000027c0000047c0000067c0000087c00000a7c00000c7c00000e7c0000107c0000127c0000147c0000167c0000187c00001a7c00001c7c00001e7c0000207c0000227c0000247c0000267c0000287c00002a7c00002c7c00002e7c0000307c0000327c0000347c0000367c0000387c00003a7c00003c7c00003e7c0000407c0000427c0000447c0000467c0000487c00004a7c00004c7c00004e7c0000507c0000527c0000547c0000567c0000587c00005c7c00005e7c0000607c0000627c0000647c0000667c0000687c00006a7c00006c7c00006e7c0000707c0000727c0000747c0000767c0000787c00007a7c00007c7c00007e7c0000807c0000827c0000847c0000867c0000887c00008a7c00008c7c00008e7c0000907c0000927c0000947c0000347d0000008800001ebf0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -834,7 +477,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 17}
+      m_ClientGUIView: {fileID: 8}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -862,7 +505,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -874,7 +517,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 224
---- !u!114 &27
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -967,7 +610,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 00000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &28
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1226,9 +869,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.49599642, y: -0.32864225, z: 0.9375734}
+    m_Target: {x: -0.013835797, y: 0.05943975, z: 1.1096544}
     speed: 2
-    m_Value: {x: -0.49599642, y: -0.32864225, z: 0.9375734}
+    m_Value: {x: -0.013835797, y: 0.05943975, z: 1.1096544}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1275,13 +918,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.01582492, y: 0.7586889, z: -0.018451953, w: -0.6510587}
+    m_Target: {x: -0.1773058, y: 0.14759645, z: -0.02694977, w: -0.9726966}
     speed: 2
-    m_Value: {x: -0.01582431, y: 0.7586597, z: -0.018451244, w: -0.6510336}
+    m_Value: {x: -0.17729808, y: 0.14759003, z: -0.026948597, w: -0.9726543}
   m_Size:
-    m_Target: 0.034721896
+    m_Target: 0.059402104
     speed: 2
-    m_Value: 0.034721896
+    m_Value: 0.059402104
   m_Ortho:
     m_Target: 0
     speed: 2