修改标记RawImage和RTCmeshRender旋转

Assets/AVideoSlide.cs

@@ -0,0 +1,49 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class AVideoSlide : PointerHandler
+{
+    public AVProVideoPlayer aVdieoPlayer;
+    public Slider slider;
+    bool isDown = false;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        //if (slider && vidoPlayer && isDown == false)
+        //{
+        //    slider.value = float.Parse(vidoPlayer.frame.ToString()) / float.Parse(vidoPlayer.frameCount.ToString());
+        //}
+    }
+
+    void sliderChanged(float per)
+    {
+        if (slider && aVdieoPlayer)
+        {
+            aVdieoPlayer.SetSeek(aVdieoPlayer.GetMaxTimer() * per);
+            //float targetFrame = vidoPlayer.frameCount * per;
+            //vidoPlayer.frame = (long)targetFrame;
+        }
+    }
+
+    public override void OnPointerDown(PointerEventData eventData)
+    {
+        base.OnPointerDown(eventData);
+        isDown = true;
+    }
+
+    public override void OnPointerUp(PointerEventData eventData)
+    {
+        base.OnPointerUp(eventData);
+        sliderChanged(slider.value);
+        isDown = false;
+    }
+}

Assets/AVideoSlide.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2ae75351a6c6b084d82feee8f1843e08
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HttpsSendLog.cs

@@ -0,0 +1,110 @@
+using LitJson;
+using SC.XR.Unity;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+using UnityEngine.Networking;
+
+public class HttpsSendLog : MonoBehaviour
+{
+    private static HttpsSendLog instance;
+
+    public static HttpsSendLog Instance
+    {
+        get
+        {
+            return instance;
+
+        }
+    }
+
+     
+    private HttpsSendLog()
+    {
+
+    }
+
+    private Queue<string> qSendLog;
+    private float times;
+    Dictionary<string, string> requestHeader = new Dictionary<string, string>();  //  header
+    void Awake()
+    {
+        instance = GetComponent<HttpsSendLog>();
+        //http header 的内容
+        requestHeader.Add("Content-Type", "application/json");
+
+    }
+
+    private void Start()
+    {
+        qSendLog = new Queue<string>();
+        times = 0;
+
+      //  SendLog("Error", "ceshi 11111111111");
+      
+    }
+    public void SendLog(string tag,string message)
+    {
+        SendHttpsWriteLog sendHLog = new SendHttpsWriteLog();
+        sendHLog.level = tag;
+        sendHLog.tag = Application.productName;
+        sendHLog.message = message;
+
+        string json = JsonMapper.ToJson(sendHLog);
+        qSendLog.Enqueue(json);
+       
+    }
+
+    private void Update()
+    {
+        times += Time.deltaTime;
+        if(times>1&&qSendLog.Count>0)
+        {
+            PostTest("", qSendLog.Dequeue());
+        }
+    }
+
+    public void PostTest(string methodName, string jsonString)
+    {
+        StartCoroutine(PostRequestTest(methodName, jsonString));
+    }
+    private IEnumerator PostRequestTest(string methodName, string jsonString)
+    {
+        string url = "https://fat2.qulivr.com/mr-navigator/v1/unity/log";
+        Debug.Log(url + jsonString);
+
+        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
+        {
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
+            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
+
+            foreach (var v in requestHeader)
+            {
+                webRequest.SetRequestHeader(v.Key, v.Value);
+            }
+
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.error!=null)
+            {
+                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + methodName);
+                //GameManager.Instance.text2.text = webRequest.error;
+            }
+            else
+            {
+                Debug.Log(webRequest.downloadHandler.text);
+
+            }
+        }
+    }
+}
+
+public class SendHttpsWriteLog
+{
+    public string level { get; set; }
+    public string tag { get; set; }
+    public string message { get; set; }
+
+}

Assets/HttpsSendLog.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: da9784d47d249a24aa52b50c9461c991
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MediaSoup/RemoteRtc.cs

@@ -40,14 +40,16 @@ public class RemoteRtc : SCRtcManager
         {
             case "A01":
                 StartCoroutine(CallCamera());
+                meshRender.transform.localEulerAngles = new Vector3(0, 0, 0);
                 break;
             case "Nreal":
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR                      // 打非Nreal包的时候这段代码注释
                 //NRKernal.NRRGBCamTexture RGBCamTexture = new NRKernal.NRRGBCamTexture();
+                //meshRender.transform.localEulerAngles = new Vector3(180, 0, 0);
                 //meshRender.material.mainTexture = RGBCamTexture.GetTexture();
                 //RGBCamTexture.Play();
 #endif
-                meshRender.transform.localEulerAngles = new Vector3(180, 0, 0);
+
 
                 break;
             case "DreamGlass":
@@ -56,7 +58,7 @@ public class RemoteRtc : SCRtcManager
             case "Rhinox":
 #if !UNITY_EDITOR
                 StartCoroutine(CallCamera(2));
-                 meshRender.transform.localEulerAngles = new Vector3(180, 0, 0);
+                 meshRender.transform.localEulerAngles = new Vector3(0, 0, 0);
 #elif UNITY_EDITOR
                 StartCoroutine(CallCamera());
 #endif

Assets/Plugins/Android/AndroidManifest.xml

@@ -1,16 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" xmlns:tools="http://schemas.android.com/tools" android:installLocation="preferExternal">
-  <uses-sdk tools:overrideLibrary="com.nreal.glasses_sdk" />
-  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-  <application android:theme="@style/UnityThemeSelector" android:icon="@mipmap/app_icon" android:label="@string/app_name">
-    <activity android:name="com.unity3d.player.UnityPlayerActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <meta-data android:name="nreal_sdk" android:value="true" />
-    <meta-data android:name="com.nreal.supportDevices" android:value="NrealLight|NrealAir" />
-  </application>
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-</manifest>
+<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">
+            <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" />
+        </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>

Assets/Plugins/Android/AndroidManifest.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 566ba4759951c094895e11e15b2ae8a3
+guid: 2f65125bd68617446a27b8ff4af12a2a
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Remote/Scenes/Remote3.0.unity

@@ -195,14 +195,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 13884479}
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 707069332}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
@@ -264,11 +264,21 @@ PrefabInstance:
     - target: {fileID: 604547950963967446, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
         type: 3}
       propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 604547950963967446, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
+        type: 3}
+      propertyPath: m_LocalRotation.y
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 604547950963967446, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 604547950963967446, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
       value: 180
       objectReference: {fileID: 0}
     - target: {fileID: 604547952246451192, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
@@ -346,6 +356,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: RTC
       objectReference: {fileID: 0}
+    - target: {fileID: 604547952892512393, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
+        type: 3}
+      propertyPath: m_TargetDisplay
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 604547952892512393, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
         type: 3}
       propertyPath: m_CullingMask.m_Bits
@@ -404,7 +419,7 @@ Camera:
     m_Bits: 256
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: 2515c6a63a25f954f87089e5f3fc4a59, type: 2}
-  m_TargetDisplay: 0
+  m_TargetDisplay: 2
   m_TargetEye: 3
   m_HDR: 1
   m_AllowMSAA: 1
@@ -1235,7 +1250,7 @@ Camera:
     m_Bits: 1024
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: b01e94f8329a5ee429717fa81c4d12a0, type: 2}
-  m_TargetDisplay: 0
+  m_TargetDisplay: 2
   m_TargetEye: 3
   m_HDR: 1
   m_AllowMSAA: 1
@@ -1404,6 +1419,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1564295168}
   - component: {fileID: 1564295167}
+  - component: {fileID: 1564295169}
   m_Layer: 0
   m_Name: Log
   m_TagString: Untagged
@@ -1438,6 +1454,18 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1564295169
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1564295166}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: da9784d47d249a24aa52b50c9461c991, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1724188191
 GameObject:
   m_ObjectHideFlags: 0
@@ -1785,6 +1813,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2775557577792744613, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 57
+      objectReference: {fileID: 0}
     - target: {fileID: 2834678857674975723, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: DebugInEditor
@@ -1818,7 +1851,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/ShowLogin/LoginDlg.prefab

@@ -1083,12 +1083,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -3235,12 +3238,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -5281,12 +5287,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -10067,12 +10076,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -11184,12 +11196,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -12064,7 +12079,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8812677214765768467
 Transform:
   m_ObjectHideFlags: 0

Assets/Remote/ShowLogin/LoginInit.prefab

@@ -170,7 +170,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &4214644006012593620
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -741,7 +741,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4214644006996485829}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0.01}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Remote/ShowLogin/TestMVC/LoginDlg.cs

@@ -77,7 +77,7 @@ namespace ShadowStudio.UI
         private void OnEnable()
         {
 #if UNITY_EDITOR
-            Invoke("OnClickLogin", 1f);
+          //  Invoke("OnClickLogin", 1f);
 #endif
         }
         private void ClickOnphoneNumLogin()

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

@@ -701,7 +701,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &2799213986232774074
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1587,8 +1587,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 4768907183153452936}
   m_HandleRect: {fileID: 6447022622035197344}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0.99998474
+  m_Value: 0
+  m_Size: 0.9999607
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2094,7 +2094,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.016941736, y: -0.00010154267}
+  m_AnchoredPosition: {x: -0.016941736, y: 0.005763486}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &4382298216484784175

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

@@ -1813,7 +1813,7 @@ GameObject:
   - component: {fileID: 6349363836886034461}
   - component: {fileID: 6349363836886034459}
   - component: {fileID: 6349363836886034458}
-  - component: {fileID: 6349363836886034456}
+  - component: {fileID: 1712594213334104273}
   m_Layer: 5
   m_Name: Slider
   m_TagString: Untagged
@@ -1829,7 +1829,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6349363836886034463}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.0073}
+  m_LocalPosition: {x: 0, y: 0, z: -0.004}
   m_LocalScale: {x: 0.00007749998, y: 0.00007749998, z: 0.00007749998}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2048,7 +2048,7 @@ MonoBehaviour:
   PointerDrag:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &6349363836886034456
+--- !u!114 &1712594213334104273
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2057,7 +2057,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 6349363836886034463}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7aa806234647a09429b8ff48c925bdbc, type: 3}
+  m_Script: {fileID: 11500000, guid: 2ae75351a6c6b084d82feee8f1843e08, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   PointerEnter:
@@ -2078,7 +2078,7 @@ MonoBehaviour:
   PointerDrag:
     m_PersistentCalls:
       m_Calls: []
-  aVideoPlayer: {fileID: 2795984278497288442}
+  aVdieoPlayer: {fileID: 2795984278497288442}
   slider: {fileID: 6349363836886034461}
 --- !u!1 &6887656132263376784
 GameObject:

Assets/Remote/ShowRoom/ShowRoom.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using LitJson;
 using SC.XR.Unity;
@@ -19,6 +19,7 @@ public class ShowRoom : RemoteSingleton<ShowRoom>
         {
             showMainScreenBtn = showMainScreenBtnObj.transform.GetComponent<SCButton>();
         }
+       
     }
 
     private void Start()
@@ -233,7 +234,10 @@ public class ShowRoom : RemoteSingleton<ShowRoom>
         {
             PrintscreenList.Instance.DeleteAll();
         }
-        transform.position = new Vector3(-0.2f, 0.9f, 0);
+        Vector3 pos = OpenXRCamera.Instance.head.position + new Vector3(-0.2f, 0.9f, 0);
+        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);
         ShowMainScreen();
         PopPeerView.CloseView?.Invoke();
@@ -257,6 +261,9 @@ public class ShowRoom : RemoteSingleton<ShowRoom>
         // 第一次获取SDKSystem与视频面板的位置，并记录，点击重置按钮设置位置
         Vector3 vSDKSystem = Camera.main.transform.position;
         vSDKSystem.y -= 1; // 遂光比较特殊，其他版本不需要
+        //Vector3 vSDKSystem = OpenXRCamera.Instance.head.position;
+        //if(DeviceType.type == "Rhinox")
+        //vSDKSystem.y -= 1; // 遂光比较特殊，其他版本不需要
         transform.position= new Vector3(vSDKSystem.x+ ResetVideoPanal.DifferencePosition.x, vSDKSystem.y+ ResetVideoPanal.DifferencePosition.y, vSDKSystem.z+ ResetVideoPanal.DifferencePosition.z);
     }
 }

Assets/Remote/Z_Blend/SystemFollow.cs

@@ -1,4 +1,4 @@
-using SC.XR.Unity;
+using SC.XR.Unity;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -61,17 +61,21 @@ public class SystemFollow : MonoBehaviour {
 
     public void ToResetSlam()
     {
-        /*
+		/*
         API_GSXR_Slam.GSXR_Reset_Slam();
 		if (ShowRoom.Instance.gameObject.activeSelf)
 		{
 			ShowRoom.Instance.Reset();
         }
 		*/
-        if (ShowRoom.Instance.gameObject.activeSelf)
-        {
-            ShowRoom.Instance.ResetPosition();
-        }
+		if (ShowRoom.Instance.gameObject.activeSelf)
+		{
+			ShowRoom.Instance.Reset();
+		}
+		//if (ShowRoom.Instance.gameObject.activeSelf)
+  //      {
+  //          ShowRoom.Instance.ResetPosition();
+  //      }
     }
 
 	public void Swith3DOf()

Assets/远程协助UI/materials/ButtonEdge.mat

@@ -0,0 +1,187 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ButtonEdge
+  m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+  m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DISABLE_ALBEDO_MAP _LIGHTMAPPING_REALTIME
+    _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _SPECULAR_HIGHLIGHTS
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ChannelMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IridescentSpectrumMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlbedoAlphaMode: 1
+    - _AlbedoAssignedAtRuntime: 0
+    - _BlendOp: 0
+    - _BlendedClippingWidth: 1
+    - _BorderLight: 0
+    - _BorderLightOpaque: 0
+    - _BorderLightOpaqueAlpha: 1
+    - _BorderLightReplacesAlbedo: 0
+    - _BorderLightUsesHoverColor: 1
+    - _BorderMinValue: 0.1
+    - _BorderWidth: 0.1
+    - _BumpScale: 1
+    - _ClippingBorder: 0
+    - _ClippingBorderWidth: 0.025
+    - _ClippingBox: 0
+    - _ClippingPlane: 0
+    - _ClippingPlaneBorder: 0
+    - _ClippingPlaneBorderWidth: 0.025
+    - _ClippingSphere: 0
+    - _ColorWriteMask: 15
+    - _CullMode: 2
+    - _CustomMode: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DirectionalLight: 0
+    - _DstBlend: 0
+    - _EdgeSmoothingValue: 0.002
+    - _EmissionScaleUI: 0
+    - _EnableChannelMap: 0
+    - _EnableEmission: 0
+    - _EnableHoverColorOpaqueOverride: 0
+    - _EnableHoverColorOverride: 0
+    - _EnableLocalSpaceTriplanarMapping: 0
+    - _EnableNormalMap: 0
+    - _EnableProximityLightColorOverride: 0
+    - _EnableTriplanarMapping: 0
+    - _EnvironmentColorIntensity: 0.5
+    - _EnvironmentColorThreshold: 1.5
+    - _EnvironmentColoring: 0
+    - _FadeBeginDistance: 0.85
+    - _FadeCompleteDistance: 0.5
+    - _FadeMinValue: 0
+    - _FluentLightIntensity: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _HoverLight: 0
+    - _HoverLightOpaque: 0
+    - _IgnoreZScale: 0
+    - _IndependentCorners: 0
+    - _InnerGlow: 0
+    - _InnerGlowPower: 4
+    - _InstancedColor: 0
+    - _Iridescence: 0
+    - _IridescenceAngle: -0.78
+    - _IridescenceIntensity: 0.5
+    - _IridescenceThreshold: 0.05
+    - _Lightmapping: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _NearLightFade: 0
+    - _NearPlaneFade: 0
+    - _NormalMapScale: 1
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _ProximityLight: 0
+    - _ProximityLightSubtractive: 0
+    - _ProximityLightTwoSided: 0
+    - _Reflections: 0
+    - _Refraction: 0
+    - _RefractiveIndex: 1.1
+    - _RenderQueueOverride: -1
+    - _RimLight: 0
+    - _RimPower: 0.25
+    - _RoundCornerMargin: 0
+    - _RoundCornerRadius: 0.25
+    - _RoundCorners: 0
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SphericalHarmonics: 0
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComparison: 0
+    - _StencilOperation: 0
+    - _StencilReference: 0
+    - _TriplanarMappingBlendSharpness: 4
+    - _UVSec: 0
+    - _VertexColors: 0
+    - _VertexExtrusion: 0
+    - _VertexExtrusionSmoothNormals: 0
+    - _VertexExtrusionValue: 0
+    - _ZOffsetFactor: 0
+    - _ZOffsetUnits: 0
+    - _ZTest: 4
+    - _ZWrite: 1
+    m_Colors:
+    - _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
+    - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+    - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
+    - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
+    - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
+    - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
+    - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
+    - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
+    - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
+    - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
+    - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
+    - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

Assets/远程协助UI/materials/ButtonEdge.mat.meta

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

GHZMRSupportXR.sln

@@ -1,19 +1,14 @@
-
-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}") = "Ximmerse.XR.Tests", "Ximmerse.XR.Tests.csproj", "{71B662A2-DE4F-23FF-DD39-C278B87690BD}"
-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.Editor", "Ximmerse.XR.Editor.csproj", "{D02A6DE5-AE29-B53A-F802-40BBEEA11250}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Editor", "AVProVideo.Editor.csproj", "{C37AE3D2-A06E-5EDF-634B-BE39388BD855}"
 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}") = "AVProVideo.Editor", "AVProVideo.Editor.csproj", "{C37AE3D2-A06E-5EDF-634B-BE39388BD855}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demos.StandardShader.Inspectors", "Demos.StandardShader.Inspectors.csproj", "{0105670B-211E-72A6-4A0A-81D14515DB44}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,30 +20,22 @@ 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
-		{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
 		{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
-		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D02A6DE5-AE29-B53A-F802-40BBEEA11250}.Release|Any CPU.Build.0 = Release|Any CPU
-		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{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
+		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{736ECCAF-2531-9FBD-9F84-A835CA4E04DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0105670B-211E-72A6-4A0A-81D14515DB44}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NibiruSDKKey.bin

@@ -0,0 +1 @@
+15B3YESHWbQs6xiaETRLLi3pnWia1n95FQydcHepSChz6V00GeT_AmKL6DNO2TkMDQxG0Cln0lOO0BK5qwWDog..

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",
-    "com.ximmerse.xr": "file:G:/GUnityProject/XRSDK/package",
+    "jh.xr.engine": "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,40 +134,6 @@
       },
       "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,
@@ -202,17 +168,14 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.ximmerse.xr": {
+    "jh.xr.engine": {
       "version": "file:G:/GUnityProject/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "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.xr.management": "4.0.1",
+        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.inputsystem": "1.4.2"
       }
     },
     "com.unity.modules.ai": {

ProjectSettings/ProjectSettings.asset

@@ -147,7 +147,6 @@ PlayerSettings:
     Others: 1
   bundleVersion: 2.5.0
   preloadedAssets:
-  - {fileID: 799516907108274431, guid: bc82c4904d3145f42acc37a970fdc037, type: 2}
   - {fileID: 1707767742241832562, guid: 1a1d14ff6628c11499dfd78d30397967, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -178,7 +177,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 20220121
-  AndroidMinSdkVersion: 28
+  AndroidMinSdkVersion: 26
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -254,14 +253,14 @@ PlayerSettings:
   clonedFromGUID: 00000000000000000000000000000000
   templatePackageId: 
   templateDefaultScene: 
-  useCustomMainManifest: 0
+  useCustomMainManifest: 1
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0
   useCustomBaseGradleTemplate: 0
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 2
+  AndroidTargetArchitectures: 1
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -435,7 +434,7 @@ PlayerSettings:
     m_GraphicsJobMode: -1005666880
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
-    m_APIs: 0b000000
+    m_APIs: 08000000
     m_Automatic: 0
   - m_BuildTarget: iOSSupport
     m_APIs: 10000000
@@ -771,14 +770,15 @@ PlayerSettings:
   scriptingDefineSymbols:
     0: NIBIRU_AR
     7: NIBIRU_AR;UNITY_CCU;CURVEDUI_TMP
-    Android: NIBIRU_AR;UNITY_CCU;CURVEDUI_TMP
+    Android: NIBIRU_NONE;UNITY_CCU;CURVEDUI_TMP;ANDROID_REMOTE_NRR
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend:
     Android: 1
     Standalone: 0
   il2cppCompilerConfiguration: {}
-  managedStrippingLevel: {}
+  managedStrippingLevel:
+    Android: 1
   incrementalIl2cppBuild: {}
   suppressCommonWarnings: 1
   allowUnsafeCode: 1

ProjectSettings/QualitySettings.asset

@@ -82,7 +82,7 @@ QualitySettings:
     name: Medium
     pixelLightCount: 1
     shadows: 0
-    shadowResolution: 1
+    shadowResolution: 2
     shadowProjection: 0
     shadowCascades: 1
     shadowDistance: 20
@@ -93,7 +93,7 @@ QualitySettings:
     skinWeights: 2
     textureQuality: 0
     anisotropicTextures: 2
-    antiAliasing: 4
+    antiAliasing: 0
     softParticles: 0
     softVegetation: 0
     realtimeReflectionProbes: 0
@@ -223,7 +223,7 @@ QualitySettings:
     customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   m_PerPlatformDefaultQuality:
-    Android: 5
+    Android: 3
     Nintendo 3DS: 5
     Nintendo Switch: 5
     PS4: 5

UserSettings/Layouts/default-2021.dwlt

@@ -1,6 +1,54 @@
 %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: 969
+    y: 305
+    width: 640
+    height: 601
+  m_ShowMode: 0
+  m_Title: Build Settings
+  m_RootView: {fileID: 5}
+  m_MinSize: {x: 640, y: 601}
+  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: 664
+    y: 90
+    width: 321
+    height: 573
+  m_ShowMode: 0
+  m_Title: Nxr.Internal.NxrPluginEditor
+  m_RootView: {fileID: 7}
+  m_MinSize: {x: 320, y: 321}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -19,12 +67,112 @@ MonoBehaviour:
     width: 1920
     height: 997
   m_ShowMode: 4
-  m_Title: Project
-  m_RootView: {fileID: 2}
+  m_Title: Inspector
+  m_RootView: {fileID: 8}
   m_MinSize: {x: 875, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 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: 18}
+  m_Panes:
+  - {fileID: 18}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &5
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 4}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 640
+    height: 601
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 7626
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: NxrPluginEditor
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 321
+    height: 573
+  m_MinSize: {x: 320, y: 321}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 19}
+  m_Panes:
+  - {fileID: 19}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &7
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 6}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 321
+    height: 573
+  m_MinSize: {x: 320, y: 321}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 7478
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,9 +185,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
-  - {fileID: 4}
-  - {fileID: 5}
+  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -52,7 +200,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -74,7 +222,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,10 +235,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 7}
-  - {fileID: 8}
-  - {fileID: 9}
+  - {fileID: 12}
+  - {fileID: 13}
+  - {fileID: 14}
+  - {fileID: 15}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -100,8 +248,8 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 200}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 97
---- !u!114 &5
+  controlID: 16
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -122,7 +270,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -135,19 +283,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 16}
+  - {fileID: 17}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 906
+    width: 905
     height: 947
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 129
---- !u!114 &7
+  controlID: 48
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -162,18 +310,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 906
+    x: 905
     y: 0
-    width: 224
+    width: 398
     height: 947
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -188,18 +336,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1130
+    x: 1303
     y: 0
-    width: 353
+    width: 265
     height: 947
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -214,18 +362,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1483
+    x: 1568
     y: 0
-    width: 437
+    width: 352
     height: 947
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -242,16 +390,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 906
+    width: 905
     height: 486
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -268,16 +416,96 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 486
-    width: 906
+    width: 905
     height: 461
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &18
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 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: 969
+    y: 305
+    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 &19
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfb5a639d1c0c2944a6bf54bda2ba497, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 320, y: 300}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Nxr.Internal.NxrPluginEditor
+    m_Image: {fileID: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 664
+    y: 90
+    width: 321
+    height: 552
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+  useRecord: 1
+  useMarker: 0
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -298,9 +526,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 906
+    x: 905
     y: 73
-    width: 222
+    width: 396
     height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -309,9 +537,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: c8d60000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 92b8feffd2d4feff0c0bffff0e0bffff1211ffff0633ffff1833ffffae56ffff3261ffff9ca2ffff9ca3ffff08a7ffff1cddffffa8ddffffeaddffff28fbfffff4ffffff16d4010032d401005ad40100aaf30100
+      m_ExpandedIDs: 52b6fdffa4b6fdffe8d9fdffbedcfdff0eddfdff40f9fdff74fbfdffc4fbfdfff617feff4c19feff9c19feffe63cfeff3641feff8841feffd264feff666bfeffb66bfeff008ffeffaae8feffba0cffff0a0dffffbc22ffff4427ffff9427fffffc38ffff4c3bffff9c3bffff4e51ffff2cfbffffb2b40100d2b8010092d901004a7a04003a8004000081040060880400
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -327,7 +555,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 7}
+        m_ClientGUIView: {fileID: 13}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -335,7 +563,7 @@ MonoBehaviour:
       m_IsLocked: 1
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 778e2db4ff4064e43a38f9013e962716
---- !u!114 &13
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -356,9 +584,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1483
+    x: 1568
     y: 73
-    width: 436
+    width: 351
     height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -377,7 +605,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &14
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -398,9 +626,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1130
+    x: 1303
     y: 73
-    width: 351
+    width: 263
     height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -419,7 +647,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/AVProVideo
+    - Packages/jh.xr.engine/Runtime
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 0
@@ -434,7 +662,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 58}
     m_SelectedIDs: ae000200
     m_LastClickedID: 131246
-    m_ExpandedIDs: 0000000038d600003ad600003cd600003ed6000040d6000042d6000044d6000046d6000048d600004ad600004cd600004ed6000050d6000052d6000054d6000056d6000058d600005ad600005cd600005ed6000060d6000062d6000064d6000066d6000068d600006ad600006cd600006ed6000070d6000072d6000074d6000076d6000078d600007ad600007cd600007ed6000080d6000082d6000084d6000086d6000088d600008ad600008cd600008ed60000
+    m_ExpandedIDs: 0000000014c0000016c0000018c000001ac000001cc000001ec0000020c0000022c0000024c0000026c0000028c000002ac000002cc000002ec0000030c0000032c0000034c0000036c0000038c000003ac000003cc000003ec0000040c0000042c0000044c0000046c0000048c000004ac000004cc000004ec0000050c0000052c0000054c0000056c0000058c000005ac000005cc000005ec0000060c0000062c0000064c0000066c0000068c000006ac000006cc000006ec0000070c0000072c0000074c0000076c0000078c000007ac000007cc000007ec0000080c0000082c0000084c0000086c0000088c000008ac000008cc000008ec0000090c0000092c0000094c0000096c0000098c000009ac000009cc000009ec00000a0c00000a2c00000a4c00000a6c00000a8c00000aac00000acc00000aec00000b0c00000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -450,7 +678,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 14}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -459,10 +687,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
+    scrollPos: {x: 0, y: 660}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff0000000038d600003ad600003cd600003ed6000040d6000042d6000044d6000046d6000048d600004ad600004cd6000050d6000052d6000056d6000058d600005ad600005cd600005ed6000060d6000062d6000066d6000068d600006cd600006ed6000070d6000072d6000074d6000078d600007ad600007cd600007ed6000080d6000082d6000084d6000086d6000088d600008ad600008cd600008ed60000c8d60000dcd70000d8e10000e6ef0000
+    m_ExpandedIDs: ffffffff0000000014c0000016c0000018c000001ac000001cc000001ec0000020c0000024c0000026c0000028c000002ac000002ec0000032c0000034c0000036c0000038c000003ac000003cc000003ec0000040c0000044c0000046c0000048c000004ac000004cc000004ec0000050c0000052c0000054c0000056c0000058c000005ac000005cc000005ec0000060c0000062c0000064c0000066c0000068c000006ac000006cc000006ec0000070c0000072c0000074c0000076c0000078c000007ac000007cc000007ec0000080c0000082c0000086c0000088c000008ac000008cc000008ec0000090c0000092c0000094c0000096c0000098c000009ac000009cc000009ec00000a0c00000a2c00000a4c00000a6c00000aac00000acc00000aec00000b0c0000036c900006ec9000072c9000070ca0000eee00100f2e0010030450200f8460200a04e0200e24e0200de520200ffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -478,7 +706,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 14}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -518,7 +746,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 224
---- !u!114 &15
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -541,7 +769,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 559
-    width: 905
+    width: 904
     height: 440
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -553,7 +781,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 905, y: 419}
+  m_TargetSize: {x: 904, y: 419}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -568,8 +796,8 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -452.5
-    m_HBaseRangeMax: 452.5
+    m_HBaseRangeMin: -452
+    m_HBaseRangeMax: 452
     m_VBaseRangeMin: -209.5
     m_VBaseRangeMax: 209.5
     m_HAllowExceedBaseRangeMin: 1
@@ -589,29 +817,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 905
+      width: 904
       height: 419
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 452.5, y: 209.5}
+    m_Translation: {x: 452, y: 209.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -452.5
+      x: -452
       y: -209.5
-      width: 905
+      width: 904
       height: 419
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 905, y: 440}
+  m_LastWindowPixelSize: {x: 904, y: 440}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &16
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -634,7 +862,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 905
+    width: 904
     height: 465
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -689,7 +917,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -870,9 +1098,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.57973886, y: 0.21881074, z: 0.7717199}
+    m_Target: {x: -0.25342828, y: 0.045402434, z: 0.9743448}
     speed: 2
-    m_Value: {x: 0.57973886, y: 0.21881074, z: 0.7717199}
+    m_Value: {x: -0.25342828, y: 0.045402434, z: 0.9743448}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -919,13 +1147,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.048926953, y: -0.6091178, z: 0.037708376, w: -0.79069453}
+    m_Target: {x: 0.06426859, y: 0.5068031, z: 0.037924238, w: -0.8588676}
     speed: 2
-    m_Value: {x: -0.04892602, y: -0.6091062, z: 0.037707657, w: -0.79067945}
+    m_Value: {x: 0.064266294, y: 0.506785, z: 0.03792288, w: -0.8588369}
   m_Size:
-    m_Target: 0.11178602
+    m_Target: 0.015230708
     speed: 2
-    m_Value: 0.11178602
+    m_Value: 0.015230708
   m_Ortho:
     m_Target: 0
     speed: 2