Browse Source

Editor: view size

Виктор Шейко 4 years ago
parent
commit
9a334a55be

+ 114 - 117
Assets/Resources/GameObjects/Capsule.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2700516839453434380
+--- !u!1 &814368165201010587
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,87 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6549199972583528069}
-  - component: {fileID: 8977576758871526051}
-  - component: {fileID: 8719141511710383705}
-  - component: {fileID: 978312353891330276}
+  - component: {fileID: 6641817515841021218}
+  - component: {fileID: 6645171239019881875}
+  - component: {fileID: 8840880703258392233}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6641817515841021218
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 814368165201010587}
+  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_Children: []
+  m_Father: {fileID: 580799061589659549}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 80, y: 15}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6645171239019881875
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 814368165201010587}
+  m_CullTransparentMesh: 0
+--- !u!114 &8840880703258392233
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 814368165201010587}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 74d3785fa719d15429525fe4a1584744, type: 3}
+    m_FontSize: 10
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &2769879451585008547
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5873275319289875318}
+  - component: {fileID: 5778327769624969747}
+  - component: {fileID: 1801665817084094958}
+  - component: {fileID: 167871433722374510}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -19,33 +96,33 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6549199972583528069
+--- !u!224 &5873275319289875318
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2700516839453434380}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 2769879451585008547}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2.5, z: 2}
   m_Children:
-  - {fileID: 6444486061976389459}
+  - {fileID: 580799061589659549}
   m_Father: {fileID: 7336634080090794197}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 961, y: 722.5}
+  m_SizeDelta: {x: 961, y: 579}
   m_Pivot: {x: 0, y: 0}
---- !u!223 &8977576758871526051
+--- !u!223 &5778327769624969747
 Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2700516839453434380}
+  m_GameObject: {fileID: 2769879451585008547}
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 0
@@ -60,13 +137,13 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
---- !u!114 &8719141511710383705
+--- !u!114 &1801665817084094958
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2700516839453434380}
+  m_GameObject: {fileID: 2769879451585008547}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
@@ -82,13 +159,13 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
---- !u!114 &978312353891330276
+--- !u!114 &167871433722374510
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2700516839453434380}
+  m_GameObject: {fileID: 2769879451585008547}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
@@ -99,7 +176,7 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
---- !u!1 &4256510489289657951
+--- !u!1 &7567893345184978865
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -107,11 +184,11 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6444486061976389459}
-  - component: {fileID: 9149779142902895953}
-  - component: {fileID: 36997454618085921}
-  - component: {fileID: 6651475330134841908}
-  - component: {fileID: 7514368743923241720}
+  - component: {fileID: 580799061589659549}
+  - component: {fileID: 775263694455415374}
+  - component: {fileID: 609339159332858440}
+  - component: {fileID: 3696934685613471095}
+  - component: {fileID: 5467535272897241602}
   m_Layer: 5
   m_Name: Panel
   m_TagString: Untagged
@@ -119,19 +196,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6444486061976389459
+--- !u!224 &580799061589659549
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4256510489289657951}
+  m_GameObject: {fileID: 7567893345184978865}
   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_Children:
-  - {fileID: 5134505729223801669}
-  m_Father: {fileID: 6549199972583528069}
+  - {fileID: 6641817515841021218}
+  m_Father: {fileID: 5873275319289875318}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -139,21 +216,21 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9149779142902895953
+--- !u!222 &775263694455415374
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4256510489289657951}
+  m_GameObject: {fileID: 7567893345184978865}
   m_CullTransparentMesh: 0
---- !u!114 &36997454618085921
+--- !u!114 &609339159332858440
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4256510489289657951}
+  m_GameObject: {fileID: 7567893345184978865}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -175,13 +252,13 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &6651475330134841908
+--- !u!114 &3696934685613471095
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4256510489289657951}
+  m_GameObject: {fileID: 7567893345184978865}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
@@ -200,13 +277,13 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
---- !u!114 &7514368743923241720
+--- !u!114 &5467535272897241602
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4256510489289657951}
+  m_GameObject: {fileID: 7567893345184978865}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
@@ -214,83 +291,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 2
---- !u!1 &8071801597284133446
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5134505729223801669}
-  - component: {fileID: 1234907663675064962}
-  - component: {fileID: 7179245634800983932}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5134505729223801669
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8071801597284133446}
-  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_Children: []
-  m_Father: {fileID: 6444486061976389459}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 80, y: 15}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1234907663675064962
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8071801597284133446}
-  m_CullTransparentMesh: 0
---- !u!114 &7179245634800983932
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8071801597284133446}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 74d3785fa719d15429525fe4a1584744, type: 3}
-    m_FontSize: 10
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: New Text
 --- !u!1 &8932573520704893167
 GameObject:
   m_ObjectHideFlags: 0
@@ -322,7 +322,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0.5, z: 0}
   m_LocalScale: {x: 0.5, y: 0.4, z: 0.5}
   m_Children:
-  - {fileID: 6549199972583528069}
+  - {fileID: 5873275319289875318}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -399,7 +399,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1c326e463ba46454989a233481ddeb0b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  target: {fileID: 8932573520704893167}
-  canvasRect: {fileID: 6549199972583528069}
-  text: {fileID: 4256510489289657951}
   TrackMarker: 1

+ 446 - 281
Assets/Scenes/Player.unity

@@ -935,6 +935,121 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 90903535}
   m_CullTransparentMesh: 0
+--- !u!1 &94551586
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 94551587}
+  - component: {fileID: 94551591}
+  - component: {fileID: 94551590}
+  - component: {fileID: 94551589}
+  - component: {fileID: 94551588}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &94551587
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94551586}
+  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_Children:
+  - {fileID: 1823331001}
+  m_Father: {fileID: 1402315712}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -294.4375, y: 141.88751}
+  m_SizeDelta: {x: -588.875, y: -283.77502}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &94551588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94551586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!114 &94551589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94551586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 2
+    m_Right: 2
+    m_Top: 2
+    m_Bottom: 2
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+--- !u!114 &94551590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94551586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &94551591
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94551586}
+  m_CullTransparentMesh: 0
 --- !u!1 &96316430
 GameObject:
   m_ObjectHideFlags: 0
@@ -1995,12 +2110,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 165224743}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &177383989 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8223603302249887214, guid: e543b1d2c87544e46805ba2ec177c265,
-    type: 3}
-  m_PrefabInstance: {fileID: 584689070}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &178012968
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2908,7 +3017,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 1
+  m_IsOn: 0
 --- !u!1 &275826143
 GameObject:
   m_ObjectHideFlags: 0
@@ -4625,7 +4734,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1379126282}
         m_MethodName: AddBeacon
         m_Mode: 1
         m_Arguments:
@@ -4729,7 +4838,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a76955693d64e6249b62f8353c43b2a6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Cursor: {fileID: 1761650665}
+  Cursor: {fileID: 8002323671399922969}
   Rounding: 1
 --- !u!114 &472823651
 MonoBehaviour:
@@ -6268,75 +6377,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 584502439}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &584689070
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8223603302249887214, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_Name
-      value: LineX
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e543b1d2c87544e46805ba2ec177c265, type: 3}
 --- !u!1 &619490526
 GameObject:
   m_ObjectHideFlags: 0
@@ -7657,75 +7697,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 797219992}
   m_CullTransparentMesh: 0
---- !u!1001 &798734466
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 11
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5491774164907957226, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8223603302249887214, guid: e543b1d2c87544e46805ba2ec177c265,
-        type: 3}
-      propertyPath: m_Name
-      value: LineY
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e543b1d2c87544e46805ba2ec177c265, type: 3}
 --- !u!1 &818246388
 GameObject:
   m_ObjectHideFlags: 0
@@ -14422,12 +14393,12 @@ PrefabInstance:
     - target: {fileID: -2201474753284171297, guid: fabd656133c8923448d1644772c5402b,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 30
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: -2201474753284171297, guid: fabd656133c8923448d1644772c5402b,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 30
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: -2201474753284171297, guid: fabd656133c8923448d1644772c5402b,
         type: 3}
@@ -15299,7 +15270,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1401298434}
   m_CullTransparentMesh: 0
---- !u!1 &1403398548
+--- !u!1 &1402315711
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -15307,47 +15278,146 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1403398549}
-  m_Layer: 0
-  m_Name: Markers
+  - component: {fileID: 1402315712}
+  - component: {fileID: 1402315715}
+  - component: {fileID: 1402315714}
+  - component: {fileID: 1402315713}
+  m_Layer: 5
+  m_Name: Canvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1403398549
-Transform:
+  m_IsActive: 0
+--- !u!224 &1402315712
+RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1403398548}
+  m_GameObject: {fileID: 1402315711}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.3990898, y: 3.1468787, z: 0.41158712}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 94551587}
+  m_Father: {fileID: 8002323671399922981}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1413667701
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1413667703}
-  - component: {fileID: 1413667702}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &1413667702
-Light:
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &1402315713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1402315711}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1402315714
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1402315711}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &1402315715
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1402315711}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!1 &1403398548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1403398549}
+  m_Layer: 0
+  m_Name: Markers
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1403398549
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1403398548}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.3990898, y: 3.1468787, z: 0.41158712}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1413667701
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1413667703}
+  - component: {fileID: 1413667702}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &1413667702
+Light:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -16384,12 +16454,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 4133634576226011003}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1505611547 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8223603302249887214, guid: e543b1d2c87544e46805ba2ec177c265,
-    type: 3}
-  m_PrefabInstance: {fileID: 798734466}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1508240611
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16455,11 +16519,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22400000, guid: 2a64d06e5dd8e0d4da614eb7a3e4fda7, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 30
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 22400000, guid: 2a64d06e5dd8e0d4da614eb7a3e4fda7, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 30
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 22400000, guid: 2a64d06e5dd8e0d4da614eb7a3e4fda7, type: 3}
       propertyPath: m_AnchorMin.x
@@ -19426,7 +19490,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1749655163
 PrefabInstance:
@@ -19530,7 +19594,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1749655164}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0febc06224d0d394db577c9bc070104a, type: 3}
   m_Name: 
@@ -19551,98 +19615,13 @@ MonoBehaviour:
   horizontalSpeed: 1
   verticalSpeed: 1
   panel: {fileID: 1749655164}
---- !u!1001 &1761650664
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 9
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192845, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192881, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_Name
-      value: WallCursor
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192881, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8002323672054192883, guid: 27ba4092a3bd3ad4289295813867c580,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: e49a45522a3765f41a3a6a57591ee8fb, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 27ba4092a3bd3ad4289295813867c580, type: 3}
---- !u!1 &1761650665 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8002323672054192881, guid: 27ba4092a3bd3ad4289295813867c580,
-    type: 3}
-  m_PrefabInstance: {fileID: 1761650664}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1761650666
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1761650665}
+  m_GameObject: {fileID: 8002323671399922969}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3e845f46ea55e1e479654a3213fd5cf9, type: 3}
@@ -20478,6 +20457,83 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_AlphaFadeSpeed: 0.15
+--- !u!1 &1823331000
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1823331001}
+  - component: {fileID: 1823331003}
+  - component: {fileID: 1823331002}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1823331001
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1823331000}
+  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_Children: []
+  m_Father: {fileID: 94551587}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 62, y: -39.5}
+  m_SizeDelta: {x: 80, y: 15}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1823331002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1823331000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 74d3785fa719d15429525fe4a1584744, type: 3}
+    m_FontSize: 10
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!222 &1823331003
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1823331000}
+  m_CullTransparentMesh: 0
 --- !u!1 &1829604687
 GameObject:
   m_ObjectHideFlags: 0
@@ -22378,8 +22434,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -25, y: -25}
-  m_SizeDelta: {x: 40, y: 40}
+  m_AnchoredPosition: {x: -20, y: -20}
+  m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1952724477
 MonoBehaviour:
@@ -22478,8 +22534,8 @@ MonoBehaviour:
   EditorTools: {fileID: 472823648}
   Plane: {fileID: 1749655164}
   Grid: {fileID: 1140473727}
-  LineX: {fileID: 177383989}
-  LineY: {fileID: 1505611547}
+  LineX: {fileID: 0}
+  LineY: {fileID: 0}
   Markers: {fileID: 1403398548}
   Beacons: {fileID: 143457022}
   Walls: {fileID: 1740594263}
@@ -28789,6 +28845,115 @@ RectTransform:
   m_AnchoredPosition: {x: 100, y: -20}
   m_SizeDelta: {x: 194, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!65 &8002323671399922968
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002323671399922969}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &8002323671399922969
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8002323671399922981}
+  - component: {fileID: 8002323671399922970}
+  - component: {fileID: 8002323671399922971}
+  - component: {fileID: 8002323671399922968}
+  - component: {fileID: 1761650666}
+  - component: {fileID: 8002323671399922972}
+  m_Layer: 0
+  m_Name: WallCursor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!33 &8002323671399922970
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002323671399922969}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8002323671399922971
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002323671399922969}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: e49a45522a3765f41a3a6a57591ee8fb, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!114 &8002323671399922972
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002323671399922969}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1c326e463ba46454989a233481ddeb0b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TrackMarker: 0
+--- !u!4 &8002323671399922981
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002323671399922969}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.5, z: 0}
+  m_LocalScale: {x: 0.1, y: 1, z: 0.1}
+  m_Children:
+  - {fileID: 1402315712}
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8590993574490300139
 GameObject:
   m_ObjectHideFlags: 0

+ 31 - 17
Assets/Scripts/Components/WallCreate.cs

@@ -3,9 +3,10 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 public class WallCreate : MonoBehaviour
-{
+{    
     public float WallHeight = 1f;
     public float WallThickness = 0.05f;
     public int Rounding = 1;
@@ -25,6 +26,8 @@ public class WallCreate : MonoBehaviour
     private Vector3 start_pos;
     Vector3 Point;
 
+    GameObject canvas;
+    Text text;
 
     // Start is called before the first frame update
     void Start()
@@ -32,6 +35,8 @@ public class WallCreate : MonoBehaviour
        // gameObject.GetComponent<BoxCollider>().enabled = BoxColliderEnabled;
         //cursor_end = transform.GetChild(6).gameObject; 
         Point = Camera.main.WorldToScreenPoint(gameObject.transform.position);
+        canvas = transform.GetChild(0).gameObject;
+        text = transform.GetChild(0).GetChild(0).GetChild(0).GetComponent<Text>();
     }
    
     // Update is called once per frame
@@ -39,10 +44,8 @@ public class WallCreate : MonoBehaviour
     {
         // if (gameObject.GetComponent<BoxCollider>().enabled != BoxColliderEnabled) gameObject.GetComponent<BoxCollider>().enabled = BoxColliderEnabled;
         if (!Input.GetMouseButtonDown(0))
-        {
-           
+        {           
             transform.position = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, Point.z));
-            Debug.Log($"transform.position={transform.position}");
         }
     }
 
@@ -55,7 +58,6 @@ public class WallCreate : MonoBehaviour
             screenPoint = Camera.main.WorldToScreenPoint(gameObject.transform.position);
             //s_point = Camera.main.WorldToScreenPoint(gameObject.transform.position);
             start_pos = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z));
-            Debug.Log($"start_pos = {start_pos}");
             offset = gameObject.transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z));
 
             switch (mode)
@@ -68,13 +70,16 @@ public class WallCreate : MonoBehaviour
                     break;
             }
         }
+
+        canvas.SetActive(true);       
     }
 
     float scale_x;
     float scale_z;
     void OnMouseDrag()
     {
-        if (!EventSystem.current.IsPointerOverGameObject()) {
+        if (!EventSystem.current.IsPointerOverGameObject())
+        {
             curScreenPoint = new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z);
             // e_point = Camera.main.WorldToScreenPoint(gameObject.transform.position);
             curPosition = Camera.main.ScreenToWorldPoint(curScreenPoint) + offset;
@@ -83,31 +88,38 @@ public class WallCreate : MonoBehaviour
 
             scale_x = (float)Math.Round(end_pos.x - start_pos.x, Rounding);
             scale_z = (float)Math.Round(end_pos.z - start_pos.z, Rounding);
-
+            text.text = $"x={scale_x} y={scale_z}";           
+           
             switch (mode)
             {
                 case Mode.Wall:
-                    if (scale_x > scale_z/* && x_mod >= 0.4f*/)
+                    if (Math.Abs(scale_x) > Math.Abs(scale_z)/* && x_mod >= 0.4f*/)
                     {
                         wall.transform.localScale = new Vector3(scale_x, WallHeight, WallThickness);
                         wall.transform.position = new Vector3(scale_x / 2 + start_pos.x, WallHeight / 2, start_pos.z);
                     }
-                    if (scale_z > scale_x/* && z_mod >= 0.4f*/)
+                    if (Math.Abs(scale_z) > Math.Abs(scale_x)/* && z_mod >= 0.4f*/)
                     {
-                   
+
                         wall.transform.localScale = new Vector3(WallThickness, WallHeight, scale_z);
-                        wall.transform.position = new Vector3(start_pos.x, WallHeight/2, scale_z/2+start_pos.z);
-                    }                    
+                        wall.transform.position = new Vector3(start_pos.x, WallHeight / 2, scale_z / 2 + start_pos.z);
+                    }
 
                     break;
                 case Mode.Room:
-                    /*if (scale_x > 0 && scale_z > 0) */LocationController.Cube(wall, new Vector3(scale_x, scale_z, WallHeight), 
-                                                            new Vector2((float)Math.Round(start_pos.x,Rounding), (float)Math.Round(start_pos.z,Rounding)), WallThickness);
+                    /*if (scale_x > 0 && scale_z > 0) */
+                    LocationController.Cube(wall, new Vector3(scale_x, scale_z, WallHeight),
+                                                            new Vector2((float)Math.Round(start_pos.x, Rounding), (float)Math.Round(start_pos.z, Rounding)), WallThickness);
                     break;
-                //case Mode.Pole:
-                //    AddWall(pos);
-                //    break;
+                    //case Mode.Pole:
+                    //    AddWall(pos);
+                    //    break;
             }
+
+            float offsetPosY = transform.position.y + 1.5f;
+
+            // Final position of marker above GO in world space
+            canvas.transform.GetChild(0).transform.position = new Vector3(Input.mousePosition.x, Input.mousePosition.y+20, screenPoint.z);
         }
     }
 
@@ -117,6 +129,8 @@ public class WallCreate : MonoBehaviour
         Debug.Log($"end_pos = {end_pos}");
 
         if (mode == Mode.Room) Rooms.Add(new Wall { start_width = start_pos.x, start_height = start_pos.z, end_width = scale_x, end_height = scale_z });
+
+        canvas.SetActive(false);
     }
 
     GameObject AddWall(Vector3 pos)

+ 4 - 5
Assets/Scripts/Controllers/CameraController.cs

@@ -128,9 +128,7 @@ public class CameraController : MonoBehaviour
                 transform.position = curPosition;
                 break;
         }
-    }
-
-    
+    }    
 
     void TrackMarker()
     {
@@ -155,7 +153,8 @@ public class CameraController : MonoBehaviour
             Camera.main.orthographicSize++;
         }
         var marker_offset = new Vector3(target.position.x, targetPosition.y, target.position.z);
-        transform.position = Vector3.Lerp(transform.position, /*targetPosition + target.position - */marker_offset, (1.0f - smoothness));
-        if (Input.GetMouseButton(1)) axes = RotationAxes.Mouse;
+        targetPosition =Vector3.Lerp(transform.position, /*targetPosition + target.position - */marker_offset, (1.0f - smoothness));
+        transform.position = targetPosition;
+        if (Input.GetMouseButton(1)) axes = RotationAxes.Mouse;        
     }
 }

+ 10 - 8
Assets/Scripts/Controllers/LabelObjectScript.cs

@@ -8,16 +8,17 @@ using UnityEngine.UI;
 /// </summary>
 public class LabelObjectScript : MonoBehaviour
 {
-    Camera camera;
-    public GameObject target;
-    public RectTransform canvasRect;
-    public GameObject text;
+    //public GameObject target;
+    RectTransform canvasRect;
+    GameObject text;
     public bool TrackMarker = true;
     // Start is called before the first frame update
     void Start()
     {
         //text = Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
         cameraController = Camera.main.GetComponent<CameraController>();
+        canvasRect = transform.GetChild(0).GetComponent<RectTransform>();
+        text = transform.GetChild(0).GetChild(0).GetChild(0).gameObject;
     }
 
     // Update is called once per frame
@@ -25,10 +26,10 @@ public class LabelObjectScript : MonoBehaviour
     {
 
         // Offset position above object bbox (in world space)
-        float offsetPosY = target.transform.position.y + 1.5f;
+        float offsetPosY = transform.position.y + 1.5f;
 
         // Final position of marker above GO in world space
-        Vector3 offsetPos = new Vector3(target.transform.position.x, offsetPosY, target.transform.position.z);
+        Vector3 offsetPos = new Vector3(transform.position.x, offsetPosY, transform.position.z);
 
         // Calculate *screen* position (note, not a canvas/recttransform position)
         Vector2 canvasPos;
@@ -39,8 +40,9 @@ public class LabelObjectScript : MonoBehaviour
 
         // Set
         //markerRtra.localPosition = canvasPos;
-        if(TrackMarker) text.transform.localPosition = canvasPos;
-        else text.transform.parent.transform.localPosition = canvasPos;
+        //if(TrackMarker) text.transform.localPosition = canvasPos;
+        //else 
+            text.transform.parent.transform.localPosition = canvasPos;
         
 
     }

+ 9 - 1
Assets/Scripts/Controllers/ModeController.cs

@@ -21,6 +21,7 @@ public class ModeController : MonoBehaviour
 
     // Editor
     //Client client = new Client();
+    PlayerController player;
 
     public bool editor = false;
     Button button;
@@ -28,13 +29,18 @@ public class ModeController : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
+        player = GameObject.Find("Player").GetComponent<PlayerController>();
         button = gameObject.GetComponent<Button>();
         button.onClick.AddListener(() => {
             editor = !editor;
             transform.GetChild(0).gameObject.SetActive(!editor);
             transform.GetChild(1).gameObject.SetActive(editor);
 
-            if (editor) EditorMode();
+            if (editor)
+            {
+                player.StopProgress(); 
+                EditorMode();
+            }
             else PlayerMode();
         });
     }
@@ -57,6 +63,8 @@ public class ModeController : MonoBehaviour
         Grid.SetActive(false);
         Walls.SetActive(false);
 
+        Destroy(GameObject.Find("SizeX"));
+        Destroy(GameObject.Find("SizeY"));
         //PlayerController.markers = new List<Marker>();
         //client.SendGetUsers((uint)PlayerController.active_company + 1);
 

+ 3 - 3
Assets/Scripts/Controllers/PlayerController.cs

@@ -38,8 +38,8 @@ public class PlayerController : MonoBehaviour
     public Camera camera;
     public Toggle projection;
 
-    enum Mode { RealTime = 0, History = 1, Stop = 2 };
-    Mode active_mode = Mode.Stop;
+    public enum Mode { RealTime = 0, History = 1, Stop = 2 };
+    public static Mode active_mode = Mode.Stop;
     int mode = 0;
     //public GameObject Time;
 
@@ -362,7 +362,7 @@ public class PlayerController : MonoBehaviour
         ErrorDialog.SetActive(false);
     }
 
-    void StopProgress()
+    public void StopProgress()
     {
         starting = false;
         StartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";

+ 1 - 0
Assets/Scripts/Controllers/RoomController.cs

@@ -6,6 +6,7 @@ using UnityEngine;
 
 /// <summary>
 /// Создание комнаты в редакторе 
+/// не используется
 /// </summary>
 public class RoomController : MonoBehaviour
 {