Browse Source

select all users for view, view name user

Виктор Шейко 4 years ago
parent
commit
0cf8998c2d

+ 2 - 2
Assets/Resources/GameObjects/Capsule.prefab

@@ -112,7 +112,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 42, y: -9.5}
   m_AnchoredPosition: {x: 42, y: -9.5}
-  m_SizeDelta: {x: 80, y: 15}
+  m_SizeDelta: {x: 120, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6645171239019881875
 --- !u!222 &6645171239019881875
 CanvasRenderer:
 CanvasRenderer:
@@ -144,7 +144,7 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 74d3785fa719d15429525fe4a1584744, type: 3}
     m_Font: {fileID: 12800000, guid: 74d3785fa719d15429525fe4a1584744, type: 3}
     m_FontSize: 10
     m_FontSize: 10
     m_FontStyle: 0
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
     m_Alignment: 4
     m_Alignment: 4

+ 326 - 10
Assets/Scenes/Player.unity

@@ -3539,7 +3539,7 @@ RectTransform:
   - {fileID: 1420891852}
   - {fileID: 1420891852}
   - {fileID: 370124750}
   - {fileID: 370124750}
   m_Father: {fileID: 995816063}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -16719,6 +16719,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       propertyPath: m_IsActive
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291685819189421, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 10
+      objectReference: {fileID: 0}
     - target: {fileID: 2709291686035710041, guid: 34bc84621ace51d4392c51f2dab181af,
     - target: {fileID: 2709291686035710041, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
         type: 3}
       propertyPath: m_AnchorMin.y
       propertyPath: m_AnchorMin.y
@@ -18199,7 +18204,7 @@ RectTransform:
   - {fileID: 1204930128}
   - {fileID: 1204930128}
   - {fileID: 1978426077}
   - {fileID: 1978426077}
   m_Father: {fileID: 995816063}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -23740,6 +23745,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   m_Children:
+  - {fileID: 1070599365}
   - {fileID: 1605365114}
   - {fileID: 1605365114}
   - {fileID: 765671127}
   - {fileID: 765671127}
   - {fileID: 139001674}
   - {fileID: 139001674}
@@ -23749,7 +23755,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 105, y: 157}
+  m_AnchoredPosition: {x: 105, y: 168}
   m_SizeDelta: {x: 208, y: 0}
   m_SizeDelta: {x: 208, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &995816064
 --- !u!114 &995816064
@@ -23783,7 +23789,7 @@ MonoBehaviour:
     m_Right: 4
     m_Right: 4
     m_Top: 4
     m_Top: 4
     m_Bottom: 4
     m_Bottom: 4
-  m_ChildAlignment: 4
+  m_ChildAlignment: 3
   m_Spacing: 2
   m_Spacing: 2
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
   m_ChildForceExpandHeight: 0
@@ -23850,6 +23856,7 @@ MonoBehaviour:
   StartStopButton: {fileID: 2059615924}
   StartStopButton: {fileID: 2059615924}
   locationZones: {fileID: 1533652136}
   locationZones: {fileID: 1533652136}
   DropdownMode: {fileID: 139001675}
   DropdownMode: {fileID: 139001675}
+  ToggleAllUsers: {fileID: 0}
   ToggleLine: {fileID: 698619042}
   ToggleLine: {fileID: 698619042}
   ToggleDisappearance: {fileID: 1847398652}
   ToggleDisappearance: {fileID: 1847398652}
   DatePicker: {fileID: 698074366}
   DatePicker: {fileID: 698074366}
@@ -25682,6 +25689,91 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1070058814}
   m_GameObject: {fileID: 1070058814}
   m_CullTransparentMesh: 0
   m_CullTransparentMesh: 0
+--- !u!1 &1070599364
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1070599365}
+  - component: {fileID: 1070599366}
+  m_Layer: 5
+  m_Name: ToggleAllUsers
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1070599365
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070599364}
+  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: 1379955689}
+  - {fileID: 1752429719}
+  m_Father: {fileID: 995816063}
+  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: 160, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1070599366
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070599364}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1379955690}
+  toggleTransition: 1
+  graphic: {fileID: 1689338615}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 0
 --- !u!1 &1082451618
 --- !u!1 &1082451618
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -33054,6 +33146,80 @@ Transform:
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1379955688
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1379955689}
+  - component: {fileID: 1379955691}
+  - component: {fileID: 1379955690}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1379955689
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1379955688}
+  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: 1689338614}
+  m_Father: {fileID: 1070599365}
+  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: 10, y: -10}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1379955690
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1379955688}
+  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: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, 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 &1379955691
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1379955688}
+  m_CullTransparentMesh: 0
 --- !u!1 &1383199203
 --- !u!1 &1383199203
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -36099,8 +36265,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: 61}
-  m_SizeDelta: {x: 208, y: -302}
+  m_AnchoredPosition: {x: 105, y: 72.00002}
+  m_SizeDelta: {x: 208, y: -323.99997}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1488763878
 --- !u!114 &1488763878
 MonoBehaviour:
 MonoBehaviour:
@@ -39021,7 +39187,7 @@ RectTransform:
   - {fileID: 698619041}
   - {fileID: 698619041}
   - {fileID: 1847398651}
   - {fileID: 1847398651}
   m_Father: {fileID: 995816063}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -42393,6 +42559,79 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1689148330}
   m_GameObject: {fileID: 1689148330}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1689338613
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1689338614}
+  - component: {fileID: 1689338616}
+  - component: {fileID: 1689338615}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1689338614
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1689338613}
+  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: 1379955689}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1689338615
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1689338613}
+  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: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  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 &1689338616
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1689338613}
+  m_CullTransparentMesh: 0
 --- !u!1 &1691252668
 --- !u!1 &1691252668
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -43540,6 +43779,83 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ChildScaleHeight: 0
+--- !u!1 &1752429718
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1752429719}
+  - component: {fileID: 1752429721}
+  - component: {fileID: 1752429720}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1752429719
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1752429718}
+  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: 1070599365}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 9, y: -0.5}
+  m_SizeDelta: {x: -28, y: -3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1752429720
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1752429718}
+  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: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u0412\u0441\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0438"
+--- !u!222 &1752429721
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1752429718}
+  m_CullTransparentMesh: 0
 --- !u!1 &1753594913
 --- !u!1 &1753594913
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -52133,7 +52449,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 1575394144}
   - {fileID: 1575394144}
   m_Father: {fileID: 995816063}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -57667,7 +57983,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 508.3534}
   m_Pivot: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &7150456488086696777
 --- !u!114 &7150456488086696777
 MonoBehaviour:
 MonoBehaviour:
@@ -61096,7 +61412,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &7150456489557922002
 --- !u!114 &7150456489557922002
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 3 - 9
Assets/Scripts/Controllers/FileBrowserController.cs

@@ -14,11 +14,7 @@ using System.Text.RegularExpressions;
 
 
 public class FileBrowserController : MonoBehaviour, IPointerDownHandler
 public class FileBrowserController : MonoBehaviour, IPointerDownHandler
 {
 {
-    //public enum Extensions { Image, VuforiaDB }; //".png, .jpg"".xml, .dat"
-    //public Extensions extensions = Extensions.Image;
     public InputField inputField;
     public InputField inputField;
-    //public Button OpenVuforiaXML;
-    //public Button OpenImage;
     // Warning: paths returned by FileBrowser dialogs do not contain a trailing '\' character
     // Warning: paths returned by FileBrowser dialogs do not contain a trailing '\' character
     // Warning: FileBrowser can only show 1 dialog at a time
     // Warning: FileBrowser can only show 1 dialog at a time
 
 
@@ -46,8 +42,6 @@ public class FileBrowserController : MonoBehaviour, IPointerDownHandler
 
 
     void Start()
     void Start()
     {
     {
-        //    OpenVuforiaXML.onClick.AddListener(() => { ShowLoadDialogCoroutine($"Выбор объекта", new ExtensionFilter("Vuforia Files", "xml", "dat")); });
-        //    OpenImage.onClick.AddListener(() => { ShowLoadDialogCoroutine($"Выбор изображения", new ExtensionFilter("Image Files", "png", "jpg", "jpeg")); });
         var button =GetComponent<Button>();
         var button =GetComponent<Button>();
         button.onClick.AddListener(OnClick);
         button.onClick.AddListener(OnClick);
     }
     }
@@ -79,7 +73,7 @@ public class FileBrowserController : MonoBehaviour, IPointerDownHandler
     /// <returns></returns>
     /// <returns></returns>
     IEnumerator UpLoadUserData(string url)
     IEnumerator UpLoadUserData(string url)
     {
     {
-        Debug.Log(url);
+       // Debug.Log(url);
         WWWForm form = new WWWForm();
         WWWForm form = new WWWForm();
         UnityWebRequest www;
         UnityWebRequest www;
         string file_name;
         string file_name;
@@ -118,13 +112,13 @@ public class FileBrowserController : MonoBehaviour, IPointerDownHandler
             Debug.Log("Uploaded");
             Debug.Log("Uploaded");
             inputField.text = $"{Application.streamingAssetsPath}/{file_name}";
             inputField.text = $"{Application.streamingAssetsPath}/{file_name}";
             EditorController.instance.UpdatePanel();
             EditorController.instance.UpdatePanel();
+            Debug.Log(www.downloadHandler.text);
         }
         }
-        Debug.Log(www.downloadHandler.text);
+      
     }
     }
 
 
     class urls
     class urls
     {
     {
-        public string url { get; set; }
         public string file_name { get; set; }
         public string file_name { get; set; }
         public string base64 { get; set; }
         public string base64 { get; set; }
     }
     }

+ 1 - 2
Assets/Scripts/Controllers/LabelObjectScript.cs

@@ -14,6 +14,7 @@ public class LabelObjectScript : MonoBehaviour
     public bool TrackMarker = true;
     public bool TrackMarker = true;
 
 
     public uint UserId;
     public uint UserId;
+    //public string NameUser;
 
 
     // Start is called before the first frame update
     // Start is called before the first frame update
     void Start()
     void Start()
@@ -52,8 +53,6 @@ public class LabelObjectScript : MonoBehaviour
         //if(TrackMarker) text.transform.localPosition = canvasPos;
         //if(TrackMarker) text.transform.localPosition = canvasPos;
         //else 
         //else 
             text.transform.parent.transform.localPosition = canvasPos;
             text.transform.parent.transform.localPosition = canvasPos;
-        
-
     }
     }
 
 
     CameraController cameraController;
     CameraController cameraController;

+ 8 - 1
Assets/Scripts/Controllers/PlayerController.cs

@@ -27,6 +27,7 @@ public class PlayerController : MonoBehaviour
     public GameObject StartStopButton;
     public GameObject StartStopButton;
     public LocationZones locationZones;
     public LocationZones locationZones;
     public Dropdown DropdownMode;
     public Dropdown DropdownMode;
+    public Toggle ToggleAllUsers; // отображение всех маркеров пользователей
     public Toggle ToggleLine;
     public Toggle ToggleLine;
     public Toggle ToggleDisappearance;
     public Toggle ToggleDisappearance;
 
 
@@ -81,6 +82,12 @@ public class PlayerController : MonoBehaviour
 
 
         var broadcast_stop = UserInfo.transform.GetChild(1).GetChild(1).GetComponent<Button>();
         var broadcast_stop = UserInfo.transform.GetChild(1).GetChild(1).GetComponent<Button>();
         broadcast_stop.onClick.AddListener(() => BroadcastStop());
         broadcast_stop.onClick.AddListener(() => BroadcastStop());
+
+        ToggleAllUsers = GameObject.Find("ToggleAllUsers").GetComponent<Toggle>();
+        ToggleAllUsers.onValueChanged.AddListener(delegate {
+            foreach (var u in users.Values)
+                u.toggle.isOn = ToggleAllUsers.isOn;
+        });
     }
     }
 
 
     // Update is called once per frame
     // Update is called once per frame
@@ -125,7 +132,7 @@ public class PlayerController : MonoBehaviour
                     else u.Value.toggle_user.SetActive(true);
                     else u.Value.toggle_user.SetActive(true);
                 }
                 }
             }
             }
-        }
+        }        
     }  
     }  
 
 
     /// <summary>
     /// <summary>

+ 2 - 2
Assets/Scripts/Models/User.cs

@@ -15,7 +15,7 @@ public class User
     public bool online { get; set; }
     public bool online { get; set; }
 
 
     public Toggle toggle { get; set; }
     public Toggle toggle { get; set; }
-    public GameObject toggle_user { get; set; }
+    public GameObject toggle_user { get; set; } //вся панель с toggle и кнопкой камеры
     public GameObject marker { get; set; }
     public GameObject marker { get; set; }
     public LineRenderer marker_line { get; set; }
     public LineRenderer marker_line { get; set; }
     //public uint acc_id { get; set; }
     //public uint acc_id { get; set; }
@@ -150,7 +150,7 @@ public class User
 
 
         var marker = UnityEngine.Object.Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
         var marker = UnityEngine.Object.Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
         marker.name = $"marker_{user.id}";
         marker.name = $"marker_{user.id}";
-        marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{user.id}";
+        marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"<{user.id}>\n{user.name_user}"; // панель с именем над маркером 
 
 
          var mode = ModeController.instance;
          var mode = ModeController.instance;
         marker.transform.SetParent(mode.Markers.transform);
         marker.transform.SetParent(mode.Markers.transform);

+ 0 - 7
Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib

@@ -49,7 +49,6 @@ var StandaloneFileBrowserWebGLPlugin = {
                     base64data = reader.result;
                     base64data = reader.result;
                     console.log(base64data); 
                     console.log(base64data); 
                     urls.push({
                     urls.push({
-                        "url": url,
                         "file_name": f_name,
                         "file_name": f_name,
                         "base64":  base64data
                         "base64":  base64data
                     });  
                     });  
@@ -60,12 +59,6 @@ var StandaloneFileBrowserWebGLPlugin = {
                     console.log('Error: ', error);
                     console.log('Error: ', error);
                     //base64data= error;
                     //base64data= error;
                   };
                   };
-              
-                     /*urls.push({
-                        "url": URL.createObjectURL(event.target.files[i]),
-                        "file_name": event.target.files[i].name,
-                        "base64":  base64data
-                    });         */ 
                 }
                 }
             // File selected
             // File selected
             //SendMessage(gameObjectName, methodName, JSON.stringify(urls));
             //SendMessage(gameObjectName, methodName, JSON.stringify(urls));