Merge branch 'main' of http://172.16.1.12/xuguocheng/AnimalSimulation

# Conflicts:
#	Assets/Scripts/DisplayServer.cs
#	UserSettings/Layouts/default-2021.dwlt

Assets/Scripts/DisplayServer.cs

@@ -3,6 +3,7 @@ using System.Net.Sockets;
 using System.Net;
 using System.Text;
 using System.Threading;
+using System.Collections.Generic;
 
 public class DisplayServer : MonoBehaviour
 {
@@ -10,9 +11,14 @@ public class DisplayServer : MonoBehaviour
     private Thread listenThread;
     private bool isRunning = true;
 
+    public Transform background;
+    private string latestMsg = "";//最新信息
+
+    public Animator modelAnimator;//模型动画
 
     void Start()
     {
+        Screen.SetResolution(3328, 1352, false);
 
         listener = new TcpListener(IPAddress.Any, 8888);
         listener.Start();
@@ -21,9 +27,11 @@ public class DisplayServer : MonoBehaviour
         listenThread.Start();
 
         Debug.Log("显示端服务器已启动，等待触摸端连接...");
+
+        ShowPage("首页");
     }
 
-    private void ListenForClients()
+    private void ListenForClients()//连接触摸控制端
     {
         while (isRunning)
         {
@@ -35,7 +43,7 @@ public class DisplayServer : MonoBehaviour
         }
     }
 
-    private void HandleClientComm(object clientObj)
+    private void HandleClientComm(object clientObj)//处理触摸端发送的信息
     {
         TcpClient tcpClient = (TcpClient)clientObj;
         NetworkStream clientStream = tcpClient.GetStream();
@@ -59,11 +67,56 @@ public class DisplayServer : MonoBehaviour
 
             string data = Encoding.UTF8.GetString(message, 0, bytesRead);
             Debug.Log("收到指令: " + data); 
-
+            latestMsg = data;
-            
         }
     }
 
+    private void Update()
+    {
+        if (!string.IsNullOrEmpty(latestMsg))
+        {
+            if (latestMsg.StartsWith("Page:"))
+            {
+                string pageName = latestMsg.Replace("Page:", "");
+                ShowPage(pageName);
+            }
+            else if (latestMsg.StartsWith("Anim:"))
+            {
+                string animName = latestMsg.Replace("Anim:", "");
+                PlayAnimation(animName);
+            }
+
+            latestMsg = "";
+        }
+    }
+
+    private void ShowPage(string pageName)//
+    {
+        if (background == null)
+        {
+            Debug.LogError($"BG未绑定！");
+            return;
+        }
+
+        foreach (Transform child in background)
+        {
+            child.gameObject.SetActive(child.name == pageName);
+        }
+        Debug.Log($"显示端切换页面：{pageName}");
+    }
+
+    private void PlayAnimation(string animName)
+    {
+        if (modelAnimator == null)
+        {
+            Debug.LogError("未绑定 Animator！");
+            return;
+        }
+
+        modelAnimator.Play(animName);  // 播放指定动画
+        Debug.Log($"显示端播放动画：{animName}");
+    }
+
     private void OnApplicationQuit()
     {
         isRunning = false;

UserSettings/Layouts/default-2021.dwlt

@@ -15,42 +15,16 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 42.666668
+    y: 43.2
-    width: 2560
+    width: 1536
-    height: 1357.3334
+    height: 772.8
   m_ShowMode: 4
-  m_Title: Scene
+  m_Title: Project
-  m_RootView: {fileID: 3}
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 331.33334
-    height: 1307.3334
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
-  m_Panes:
-  - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,22 +37,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 3}
   - {fileID: 4}
   - {fileID: 5}
-  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
+    width: 1536
-    height: 1357.3334
+    height: 772.8
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &4
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -95,12 +69,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
+    width: 1536
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &5
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -113,21 +87,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
+  - {fileID: 6}
   - {fileID: 7}
-  - {fileID: 9}
   - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2560
+    width: 1536
-    height: 1307.3334
+    height: 722.8
-  m_MinSize: {x: 400, y: 100}
+  m_MinSize: {x: 300, y: 200}
-  m_MaxSize: {x: 32384, y: 8096}
+  m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 20
+  controlID: 52
---- !u!114 &6
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -143,12 +116,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1337.3334
+    y: 752.8
-    width: 2560
+    width: 1536
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -158,23 +131,48 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 331.33334
+    x: 0
     y: 0
-    width: 1590.6666
+    width: 854.4
-    height: 1307.3334
+    height: 722.8
-  m_MinSize: {x: 202, y: 221}
+  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 15}
-  m_Selected: 0
+  m_Selected: 1
-  m_LastSelected: 1
+  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: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 9}
+  - {fileID: 10}
+  m_Position:
+    serializedVersion: 2
+    x: 854.4
+    y: 0
+    width: 327.19995
+    height: 722.8
+  m_MinSize: {x: 100, y: 200}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 58
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -190,15 +188,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2230
+    x: 1181.6
     y: 0
-    width: 330
+    width: 354.40002
-    height: 1307.3334
+    height: 722.8
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 10}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &9
@@ -216,18 +214,44 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1922
+    x: 0
     y: 0
-    width: 308
+    width: 327.19995
-    height: 1307.3334
+    height: 318.4
-  m_MinSize: {x: 232, y: 271}
+  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 10002, y: 10021}
+  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &10
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 318.4
+    width: 327.19995
+    height: 404.4
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
+  m_ActualView: {fileID: 12}
+  m_Panes:
+  - {fileID: 12}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -247,10 +271,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2230
+    x: 1181.6
-    y: 72.66667
+    y: 73.6
-    width: 329
+    width: 353.40002
-    height: 1286.3334
+    height: 701.8
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -259,7 +283,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: -160
+    m_CachedPref: 151
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -269,7 +293,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &11
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -289,10 +313,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1922
+    x: 854.4
-    y: 72.66667
+    y: 392
-    width: 306
+    width: 325.19995
-    height: 1286.3334
+    height: 383.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -308,7 +332,8 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders: []
+    m_Folders:
+    - Assets/Scripts
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
@@ -316,14 +341,14 @@ MonoBehaviour:
   m_StartGridSize: 64
   m_LastFolders: []
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: "E:\\shengtao\\2025\\\u4E09\u6A21\u6001\u4EFF\u771F\u591A\u5A92\u4F53\\AnimalSimulation"
+  m_LastProjectPath: D:\GItClone\AnimalSimulation
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 7c780000
     m_LastClickedID: 30844
-    m_ExpandedIDs: 
+    m_ExpandedIDs: 00000000da460100dc460100de460100e0460100e2460100e4460100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -348,10 +373,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
+    scrollPos: {x: 0, y: 58.600006}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffffb8670100d8670100
+    m_ExpandedIDs: ffffffff00000000da460100dc460100de460100e0460100e2460100e4460100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -367,7 +392,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 9}
+      m_ClientGUIView: {fileID: 10}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -407,7 +432,7 @@ MonoBehaviour:
     m_GridSize: 64
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 115
---- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -427,10 +452,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 331.33334
+    x: 0
-    y: 72.66667
+    y: 73.6
-    width: 1588.6666
+    width: 853.4
-    height: 1286.3334
+    height: 701.8
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -440,8 +465,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: -100, y: -25.599976}
-      snapOffsetDelta: {x: -98.666626, y: -26}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -462,7 +487,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 24.8}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-scene-view-toolbar
@@ -668,7 +693,7 @@ MonoBehaviour:
       layout: 4
     m_OverlaysVisible: 1
   m_WindowGUID: 022a24e19bf7483478e9abec90b4a986
-  m_Gizmos: 0
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -677,9 +702,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.14174296, y: 0.6027924, z: -0.4748262}
+    m_Target: {x: -32.778976, y: -9.8186455, z: 49.312233}
     speed: 2
-    m_Value: {x: -0.14174296, y: 0.6027924, z: -0.4748262}
+    m_Value: {x: -32.778976, y: -9.8186455, z: 49.312233}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -726,17 +751,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.045624923, y: 0.95119816, z: -0.16847414, w: -0.25539193}
+    m_Target: {x: 0.33473206, y: 0.41149613, z: -0.16586047, w: 0.8314923}
     speed: 2
-    m_Value: {x: -0.04561425, y: 0.9509756, z: -0.16843472, w: -0.25533217}
+    m_Value: {x: 0.33468792, y: 0.4114419, z: -0.16583861, w: 0.8313827}
   m_Size:
-    m_Target: 1.9629054
+    m_Target: 65.2069
     speed: 2
-    m_Value: 1.9629054
+    m_Value: 65.2069
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 0.8259
     m_SpeedNormalized: 0.41
@@ -750,14 +775,14 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: 0.18868902, y: 0.077132195, z: -0.014793283, w: 0.9789739}
+  m_LastSceneViewRotation: {x: -0.015598819, y: -0.0035844787, z: -0.00010052163, w: 0.99997914}
   m_LastSceneViewOrtho: 1
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -777,10 +802,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
+    x: 854.4
-    y: 72.66667
+    y: 73.6
-    width: 330.33334
+    width: 325.19995
-    height: 1286.3334
+    height: 297.4
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -789,9 +814,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: ae490000
       m_LastClickedID: 0
-      m_ExpandedIDs: a68bfdff368cfdff3a8cfdffb28ffdff4698fdffbe99fdffee9bfdff329efdffaaa0fdff76a1fdff0aa4fdffb2a8fdff1eb4fdff1ae3fdff1ee3fdffdee7fdff66eefdff7aeafeff
+      m_ExpandedIDs: 34fbfffff257000024580000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -807,7 +832,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 2}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -815,7 +840,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 733c28ef5d2030949b73c3d6246d5565
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -835,10 +860,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 331.33334
+    x: 0
-    y: 72.66667
+    y: 73.6
-    width: 1090.6666
+    width: 853.4
-    height: 1286.3334
+    height: 701.8
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -852,7 +877,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1920, y: 1080}
+  m_TargetSize: {x: 3328, y: 1352}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -861,16 +886,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 03000000000000000000000006000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -640
+    m_HBaseRangeMin: -1331.2001
-    m_HBaseRangeMax: 640
+    m_HBaseRangeMax: 1331.2001
-    m_VBaseRangeMin: -360
+    m_VBaseRangeMin: -540.8
-    m_VBaseRangeMax: 360
+    m_VBaseRangeMax: 540.8
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -888,23 +913,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1090.6666
+      width: 853.4
-      height: 1265.3334
+      height: 680.8
-    m_Scale: {x: 0.8520833, y: 0.8520833}
+    m_Scale: {x: 0.32053787, y: 0.32053787}
-    m_Translation: {x: 545.3333, y: 632.6667}
+    m_Translation: {x: 426.70004, y: 340.4}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -640
+      x: -1331.2001
-      y: -742.4939
+      y: -1061.965
-      width: 1280
+      width: 2662.4001
-      height: 1484.9878
+      height: 2123.93
     m_MinimalGUI: 1
-  m_defaultScale: 0.8520833
+  m_defaultScale: 0.32053787
-  m_LastWindowPixelSize: {x: 1636, y: 1929.5}
+  m_LastWindowPixelSize: {x: 1066.75, y: 877.25}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000000000000000000