Browse Source

修改Canvas 交换和验证码被遮挡的问题

DGJ 1 year ago
parent
commit
28f21e046a

+ 16 - 3
Assets/Remote/Scenes/Remote3.0.unity

@@ -699,6 +699,7 @@ GameObject:
   - component: {fileID: 760973016}
   - component: {fileID: 760973015}
   - component: {fileID: 760973014}
+  - component: {fileID: 760973018}
   m_Layer: 3
   m_Name: Canvas
   m_TagString: Untagged
@@ -785,9 +786,21 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &760973018
+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: 948b9ab040508dc48a294230f85b39e2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &855958478
 GameObject:
   m_ObjectHideFlags: 0
@@ -1832,7 +1845,7 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &973110132107938480
@@ -1951,7 +1964,7 @@ PrefabInstance:
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: -1
       objectReference: {fileID: 0}
     - target: {fileID: 8475401995549084109, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}

+ 7 - 22
Assets/Remote/ShowLogin/LoginDlg.prefab

@@ -1083,15 +1083,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnSubmit:
+  m_OnEndEdit:
     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}
@@ -3238,15 +3235,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnSubmit:
+  m_OnEndEdit:
     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}
@@ -5287,15 +5281,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnSubmit:
+  m_OnEndEdit:
     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}
@@ -10076,15 +10067,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnSubmit:
+  m_OnEndEdit:
     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}
@@ -11196,15 +11184,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnSubmit:
+  m_OnEndEdit:
     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}
@@ -12353,7 +12338,7 @@ MeshRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8812677215090922889}
-  m_Enabled: 1
+  m_Enabled: 0
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
@@ -12533,7 +12518,7 @@ MeshRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8812677215434742131}
-  m_Enabled: 1
+  m_Enabled: 0
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1

+ 6 - 2
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()
@@ -281,6 +281,7 @@ namespace ShadowStudio.UI
                         {
                             isLock = true;
                             NetWorkHeaders.YuLogin(userInputField.text, passwordInputField.text, verifyInputField.text,capID, YuLoginOk, LoginFail);
+                            verifyInputField.text = "";
                         }
                         else
                         {
@@ -473,11 +474,14 @@ namespace ShadowStudio.UI
         string capID;
         private void GetSucess(JsonData data)
         {
+            Debug.Log(" 收到验证码图片====>  ");
             capID = data["data"]["captchaId"].ToString();
-            string[] strs = data["data"]["captcha"].ToString().Split(',');
+            string[] strs = data["data"]["captcha"].ToString().Split(',');          
             byte[] bytes = Convert.FromBase64String(strs[strs.Length - 1]);
+            Debug.Log(bytes.Length);
             Texture2D tex2D = new Texture2D(512, 512);
             tex2D.LoadImage(bytes);
+           
             verifyTexture.texture = tex2D;
         }
 

+ 91 - 3
Assets/Remote/ShowOffice/UserSystem.prefab

@@ -30,6 +30,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0088}
   m_LocalScale: {x: 0.00043, y: 0.00043, z: 0.00043}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1370527061}
   - {fileID: 1983885047}
@@ -190,6 +191,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: 1081926140}
   m_RootOrder: 0
@@ -228,7 +230,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: e48b920555144c6da3ee2ab03f0fda88, type: 3}
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -269,6 +271,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: 1081926140}
   m_RootOrder: 1
@@ -307,7 +310,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: e48b920555144c6da3ee2ab03f0fda88, type: 3}
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -350,6 +353,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.075}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 155414118828893325}
   m_Father: {fileID: 2744153307974017399}
@@ -467,6 +471,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.02}
   m_LocalScale: {x: 0.00191, y: 0.00191, z: 0.00191}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7532427992245236466}
   - {fileID: 7419874316368545098}
@@ -594,6 +599,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.7958001}
   m_LocalScale: {x: 0.2041885, y: 0.2041885, z: 0.2041885}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7419874314690306278}
   m_Father: {fileID: 155414118828893325}
@@ -715,6 +721,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00039, y: 0.00039, z: 0.00039}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 163703203735216451}
   m_Father: {fileID: 2744153307974017399}
@@ -859,6 +866,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -25}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 163703203738778817}
   m_RootOrder: 0
@@ -938,6 +946,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -25}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 163703203165620773}
   m_RootOrder: 0
@@ -1018,6 +1027,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00039, y: 0.00039, z: 0.00039}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 163703203648908371}
   m_Father: {fileID: 2744153307974017399}
@@ -1163,6 +1173,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -1.2041836}
   m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 135185225828609540}
   - {fileID: 8450322539061956642}
@@ -1312,6 +1323,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: 5106651615108816712}
   m_RootOrder: 0
@@ -1413,6 +1425,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0216}
   m_LocalScale: {x: 0.00191, y: 0.00191, z: 0.00191}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4299014346833639615}
   m_Father: {fileID: 2744153307974017399}
@@ -1489,6 +1502,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.59684455, y: 0.0016352746, z: 0}
   m_LocalScale: {x: 63.725727, y: 7.259893, z: 5.303331}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2993098422094271443}
   m_RootOrder: 0
@@ -1512,6 +1526,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -1570,6 +1585,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.000038079914}
   m_LocalScale: {x: 0.8898, y: 0.8898, z: 0.8898}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8458566183616050339}
   m_Father: {fileID: 6814780052196986123}
@@ -1645,6 +1661,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: 2744153307974017399}
   - {fileID: 6814780051963775055}
@@ -1708,6 +1725,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: 2744153307974017399}
   m_RootOrder: 0
@@ -1783,6 +1801,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00032, y: 0.00032, z: 0.00032}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307974017399}
   m_RootOrder: 1
@@ -1862,6 +1881,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.00999999}
   m_LocalScale: {x: 0.00018999999, y: 0.00018999999, z: 0.00018999999}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307974017399}
   m_RootOrder: 6
@@ -1941,6 +1961,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -25}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153306608092803}
   m_RootOrder: 0
@@ -2021,6 +2042,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.00999999}
   m_LocalScale: {x: 0.00039, y: 0.00039, z: 0.00039}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2744153307222686046}
   m_Father: {fileID: 2744153307974017399}
@@ -2142,6 +2164,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00039, y: 0.00039, z: 0.00039}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2744153307080973713}
   m_Father: {fileID: 2744153307974017399}
@@ -2275,6 +2298,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.00999999}
   m_LocalScale: {x: 0.00039, y: 0.00039, z: 0.00039}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2744153306542752966}
   m_Father: {fileID: 2744153307974017399}
@@ -2407,6 +2431,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.00018999999, y: 0.00018999998, z: 0.00018999998}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307519211115}
   m_RootOrder: 1
@@ -2486,6 +2511,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.00999999}
   m_LocalScale: {x: 0.00018999999, y: 0.00018999999, z: 0.00018999999}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307974017399}
   m_RootOrder: 8
@@ -2565,6 +2591,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -25}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153306578410567}
   m_RootOrder: 0
@@ -2644,6 +2671,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -25}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153306554867758}
   m_RootOrder: 0
@@ -2721,6 +2749,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.01349999, z: -0.01}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2744153307588880638}
   - {fileID: 2744153306707683621}
@@ -2756,6 +2785,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00026, y: 0.00026, z: 0.00026}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307974017399}
   m_RootOrder: 2
@@ -2884,6 +2914,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.00018999999, y: 0.00018999998, z: 0.00018999998}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307519211115}
   m_RootOrder: 0
@@ -2964,6 +2995,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.746}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2744153306072830071}
   - {fileID: 2744153306375983583}
@@ -3033,7 +3065,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &2744153307974017398
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3079,6 +3111,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.000038079914}
   m_LocalScale: {x: 0.8898, y: 0.8898, z: 0.8898}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 309637816372172212}
   m_Father: {fileID: 6814780050491984664}
@@ -3155,6 +3188,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 6.073304}
   m_LocalScale: {x: 0.09947645, y: 0.09947645, z: 0.09947645}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4299014346833639615}
   m_RootOrder: 0
@@ -3234,6 +3268,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: 6814780051963775055}
   m_RootOrder: 0
@@ -3309,6 +3344,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8898001, y: 0.8898001, z: 0.8898001}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6814780051696579157}
   m_Father: {fileID: 6814780052474941232}
@@ -3385,6 +3421,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8898001, y: 0.8898001, z: 0.8898001}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4198026002995509104}
   m_Father: {fileID: 6814780050491984664}
@@ -3461,6 +3498,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00032, y: 0.00032, z: 0.00032}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6814780051963775055}
   m_RootOrder: 1
@@ -3540,6 +3578,7 @@ Transform:
   m_LocalRotation: {x: 0.27059802, y: -0.6532815, z: -0.6532815, w: 0.27059802}
   m_LocalPosition: {x: 0.10255, y: -4.6, z: 1.3}
   m_LocalScale: {x: 570.4295, y: 446.62473, z: 570.42755}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4198026003282381890}
   m_RootOrder: 0
@@ -3563,6 +3602,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 0
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -3621,6 +3661,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -25}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4198026003463780497}
   m_RootOrder: 0
@@ -3700,6 +3741,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8898001, y: 0.8898001, z: 0.8898001}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4198026003475054107}
   m_Father: {fileID: 6814780052196986123}
@@ -3776,6 +3818,7 @@ Transform:
   m_LocalRotation: {x: 0.27059802, y: -0.6532815, z: -0.6532815, w: 0.27059802}
   m_LocalPosition: {x: 0.10255, y: -4.6, z: 1.3}
   m_LocalScale: {x: 570.4295, y: 446.62473, z: 570.42755}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4198026001976487116}
   m_RootOrder: 0
@@ -3799,6 +3842,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 0
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -3857,6 +3901,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8898001, y: 0.8898001, z: 0.8898001}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4198026002496750732}
   m_Father: {fileID: 6814780051982931332}
@@ -3934,6 +3979,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00039, y: 0.00039, z: 0.00039}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4198026002562498898}
   m_Father: {fileID: 6814780051963775055}
@@ -4066,6 +4112,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.6, y: 0, z: 0}
   m_LocalScale: {x: 63.72572, y: 7.2598915, z: 5.3033295}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4198026002899456766}
   m_RootOrder: 0
@@ -4089,6 +4136,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -4148,6 +4196,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: 4299014346833639615}
   m_RootOrder: 1
@@ -4279,6 +4328,7 @@ Transform:
   m_LocalRotation: {x: 0.27059802, y: -0.6532815, z: -0.6532815, w: 0.27059802}
   m_LocalPosition: {x: 0.099390075, y: -4.598353, z: 1.3000975}
   m_LocalScale: {x: 570.4298, y: 446.6248, z: 570.42773}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9108115102565476932}
   m_RootOrder: 0
@@ -4302,6 +4352,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 0
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -4360,6 +4411,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.00043, y: 0.00043, z: 0.00043}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7973634096070600719}
   m_Father: {fileID: 2744153307974017399}
@@ -4441,6 +4493,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: 5106651615108816712}
   m_Father: {fileID: 4299014346833639615}
@@ -4547,6 +4600,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.000038079914}
   m_LocalScale: {x: 0.8898, y: 0.8898, z: 0.8898}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 831288498197707525}
   m_Father: {fileID: 6814780052474941232}
@@ -4624,6 +4678,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: 5617757485567700271}
   m_Father: {fileID: 5332000100146111574}
@@ -4713,6 +4768,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: 4844201253102807643}
   m_RootOrder: 0
@@ -4792,6 +4848,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.00879997}
   m_LocalScale: {x: 0.00043, y: 0.00043, z: 0.00043}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307974017399}
   m_RootOrder: 11
@@ -4871,6 +4928,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: 155414118828893325}
   m_RootOrder: 0
@@ -4946,6 +5004,7 @@ Transform:
   m_LocalRotation: {x: 0.27059802, y: -0.6532815, z: -0.6532815, w: 0.27059802}
   m_LocalPosition: {x: 0.099390075, y: -4.598357, z: 1.3000975}
   m_LocalScale: {x: 570.4298, y: 446.6248, z: 570.42773}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8258784857849239705}
   m_RootOrder: 0
@@ -4969,6 +5028,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 0
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -5027,6 +5087,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.2105263, y: 1.2105263, z: 0.631579}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8258784857849239705}
   - {fileID: 4198026001976487116}
@@ -5104,6 +5165,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.00004901698}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6814780052114218472}
   m_RootOrder: 1
@@ -5183,6 +5245,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.00004901698}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6814780052114218472}
   m_RootOrder: 0
@@ -5262,6 +5325,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.6, y: 0, z: 0}
   m_LocalScale: {x: 63.72572, y: 7.2598915, z: 5.3033295}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4198026001949118236}
   m_RootOrder: 0
@@ -5285,6 +5349,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -5343,6 +5408,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00018999999, y: 0.00018999999, z: 0.00018999999}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6814780051963775055}
   m_RootOrder: 6
@@ -5422,6 +5488,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00018999999, y: 0.00018999999, z: 0.00018999999}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6814780051963775055}
   m_RootOrder: 3
@@ -5503,6 +5570,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.746}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4198026001545748840}
   - {fileID: 4198026002069461021}
@@ -5634,6 +5702,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: 0.0000006407499, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00077, y: 0.00054, z: 0.00054}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6814780051963775055}
   m_RootOrder: 2
@@ -5709,6 +5778,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.2105263, y: 1.2105263, z: 0.631579}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9108115102565476932}
   - {fileID: 4198026003282381890}
@@ -5786,6 +5856,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.01}
   m_LocalScale: {x: 0.00018999999, y: 0.00018999999, z: 0.00018999999}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6814780051636452759}
   - {fileID: 6814780050546956586}
@@ -5871,6 +5942,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.2105263, y: 1.2105263, z: 0.631579}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4198026002899456766}
   - {fileID: 2993098422094271443}
@@ -5948,6 +6020,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.2105263, y: 1.2105263, z: 0.631579}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4198026001949118236}
   - {fileID: 5863785027798415818}
@@ -6025,6 +6098,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: 6469640435574167763}
   - {fileID: 433047067328961673}
@@ -6103,6 +6177,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: 4844201253102807643}
   m_RootOrder: 1
@@ -6182,6 +6257,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -6.9999847}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 155414119422654827}
   m_RootOrder: 0
@@ -6261,6 +6337,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -2.0000148}
   m_LocalScale: {x: 0.09947645, y: 0.09947644, z: 0.09947644}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7419874315842255637}
   m_Father: {fileID: 155414118828893325}
@@ -6341,6 +6418,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 64.427185, y: 64.42719, z: 64.42719}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7419874314750238654}
   m_RootOrder: 0
@@ -6415,6 +6493,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 8.5, z: -4.2}
   m_LocalScale: {x: 12.72775, y: 11.34555, z: 11.34555}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 155414118828893325}
   m_RootOrder: 3
@@ -6430,6 +6509,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -6498,6 +6578,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -6.9999847}
   m_LocalScale: {x: 0.4900006, y: 0.4900006, z: 0.4900006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7419874316101896075}
   m_RootOrder: 0
@@ -6578,6 +6659,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.7958001}
   m_LocalScale: {x: 0.2041885, y: 0.2041885, z: 0.2041885}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7419874315975086537}
   m_Father: {fileID: 155414118828893325}
@@ -6698,6 +6780,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.73298115}
   m_LocalScale: {x: 0.15975916, y: 0.15975916, z: 0.15975916}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 155414118828893325}
   m_RootOrder: 1
@@ -6777,6 +6860,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0049}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2744153307974017399}
   m_RootOrder: 9
@@ -6852,6 +6936,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.59684455, y: 0.0016496897, z: 0}
   m_LocalScale: {x: 63.725727, y: 7.259893, z: 5.303331}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5863785027798415818}
   m_RootOrder: 0
@@ -6875,6 +6960,7 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -6933,6 +7019,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: 2742189612720949452}
   m_RootOrder: 0
@@ -7008,6 +7095,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.000038079914}
   m_LocalScale: {x: 0.8898, y: 0.8898, z: 0.8898}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8962998639529425690}
   m_Father: {fileID: 6814780051982931332}

+ 3 - 2
Assets/Remote/ShowRoom/ShowRoom.cs

@@ -94,7 +94,7 @@ public class ShowRoom : RemoteSingleton<ShowRoom>
         }
         showMainScreenBtn.gameObject.SetActive(false);
 
-
+       
     }
 
     public void HideMainScreen()
@@ -221,6 +221,7 @@ public class ShowRoom : RemoteSingleton<ShowRoom>
         {
             GameStart.Instance.systemMenu.Init();
         }
+        Reset();
     }
 
     public void Reset()
@@ -236,7 +237,7 @@ public class ShowRoom : RemoteSingleton<ShowRoom>
         }
         Vector3 pos = OpenXRCamera.Instance.head.position + new Vector3(-0.2f, 0.9f, 0);
         Debug.Log(" pos " + pos);
-        HttpsSendLog.Instance.SendLog("Reset" ," Pos " +pos.ToString());
+      //  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 + OpenXRCamera.Instance.head.eulerAngles.y, 0);
         ShowMainScreen();

+ 30 - 30
UserSettings/Layouts/default-2021.dwlt

@@ -100,7 +100,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 200}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 54
+  controlID: 89
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -146,7 +146,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 65
+  controlID: 67
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -164,7 +164,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 905
     y: 0
-    width: 398
+    width: 295
     height: 947
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
@@ -188,9 +188,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1303
+    x: 1200
     y: 0
-    width: 265
+    width: 388
     height: 947
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -214,9 +214,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1568
+    x: 1588
     y: 0
-    width: 352
+    width: 332
     height: 947
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
@@ -244,8 +244,8 @@ MonoBehaviour:
     y: 0
     width: 905
     height: 486
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -270,8 +270,8 @@ MonoBehaviour:
     y: 486
     width: 905
     height: 461
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -300,7 +300,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 905
     y: 73
-    width: 396
+    width: 293
     height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -311,7 +311,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 1e7cffff6c7cffff9e9fffffe0faffffaa9f0100f6a1010046a9010032ab010074b20100
+      m_ExpandedIDs: 706afcffc06afcfff28dfcff40dffcffc2e0fcff3209fdff5809fdffb40afdff442afdff942afdffc64dfdff3868fdff4473fdffce73fdff3ce1fdff42e1fdff482cfeff6838feffee38fefff438feff8839feffd63cfefff83cfeff943dfefffc3efeff183ffeff323ffeff363ffeff403ffeff983ffeff4e4ffeff544ffeff6851feffa651feffee51fefff451feffca6dfeff506efeff566efeff048afeffa08afeff428cfeff4c8cfeff640affff6c0affff7c0affff840affffcc0affff680bffff0a0dffff140dffff2ca1ffff40a1ffff48a1ffff58a1ffff60a1ffffa8a1ffff44a2ffffe6a3fffff0a3ffffc8a5ffffeea5ffff1ca6ffff4aa7ffff2afbffff2cfbfffff4ffffffa67f0000bc7f0000e47f000000800000068000001880000006ab03001cab030038af03009cb10300d0b303001cb5030072b5030018b6030016bd0300
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -327,7 +327,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -356,9 +356,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1568
+    x: 1588
     y: 73
-    width: 351
+    width: 331
     height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -371,7 +371,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 495
+  m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
@@ -398,9 +398,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1303
+    x: 1200
     y: 73
-    width: 263
+    width: 386
     height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -433,7 +433,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 58}
     m_SelectedIDs: ae000200
     m_LastClickedID: 131246
-    m_ExpandedIDs: 00000000d0db0000d2db0000d4db0000d6db0000d8db0000dadb0000dcdb0000dedb0000e0db0000e2db0000e4db0000e6db0000e8db0000eadb0000ecdb0000
+    m_ExpandedIDs: 00000000d8d60000dad60000dcd60000ded60000e0d60000e2d60000e4d60000e6d60000e8d60000ead60000ecd60000eed60000f0d60000f2d60000f4d60000f6d60000f8d60000fad60000fcd60000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -458,10 +458,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 260}
+    scrollPos: {x: 0, y: 2160}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000d0db0000d2db0000d4db0000d6db0000d8db0000dadb0000dcdb0000dedb0000e0db0000e2db0000e4db0000e6db0000e8db0000eadb0000ecdb0000e0e40000cae50000
+    m_ExpandedIDs: 240dfefff20ffeffffffffff00000000d8d60000dad60000dcd60000ded60000e0d60000e2d60000e4d60000e6d60000e8d60000ead60000ecd60000eed60000f0d60000f2d60000f4d60000f6d60000f8d60000fcd6000064d7000066d7000024d80000240b0100460b0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -488,7 +488,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 88020000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -513,7 +513,7 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 360}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 224
@@ -869,9 +869,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -5.7941246, y: -15.339608, z: 12.241134}
+    m_Target: {x: -0.33564946, y: -0.08942305, z: 0.64121574}
     speed: 2
-    m_Value: {x: -5.7941246, y: -15.339608, z: 12.241134}
+    m_Value: {x: -0.33564946, y: -0.08942305, z: 0.64121574}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -918,13 +918,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.41250196, y: 0.2131286, z: -0.0999151, w: -0.8800746}
+    m_Target: {x: -0.087261334, y: 0.1789305, z: -0.015900113, w: -0.97991776}
     speed: 2
-    m_Value: {x: -0.41248214, y: 0.21311836, z: -0.099910304, w: -0.88003236}
+    m_Value: {x: -0.087256, y: 0.17891957, z: -0.01589914, w: -0.97985786}
   m_Size:
-    m_Target: 10
+    m_Target: 0.39018494
     speed: 2
-    m_Value: 10
+    m_Value: 0.39018494
   m_Ortho:
     m_Target: 0
     speed: 2