Explorar el Código

fix users markers create

Виктор Шейко hace 4 años
padre
commit
54b16345c5

+ 51 - 359
Assets/Scenes/Player.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
+  m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -857,11 +857,11 @@ RectTransform:
   - {fileID: 1952287653}
   - {fileID: 634035831}
   m_Father: {fileID: 1379126277}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104, y: -73}
+  m_AnchoredPosition: {x: 104, y: -51}
   m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &58493516
@@ -2351,6 +2351,7 @@ RectTransform:
   - {fileID: 970171088642886948}
   - {fileID: 3538187245544653789}
   - {fileID: 1248872933}
+  - {fileID: 1488763877}
   - {fileID: 995816063}
   - {fileID: 1533652135}
   - {fileID: 1259139723}
@@ -2366,7 +2367,7 @@ RectTransform:
   - {fileID: 1186343482}
   m_Father: {fileID: 0}
   m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
@@ -3538,7 +3539,7 @@ RectTransform:
   - {fileID: 1420891852}
   - {fileID: 370124750}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -11098,7 +11099,7 @@ RectTransform:
   - {fileID: 1364176688}
   - {fileID: 1464841760}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -11117,7 +11118,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a76955693d64e6249b62f8353c43b2a6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Cursor: {fileID: 8002323671399922969}
+  Cursor: {fileID: 1761650666}
   Rounding: 1
   Mouse: {fileID: 988350253}
   Hammer: {fileID: 1878095458}
@@ -12728,6 +12729,7 @@ MonoBehaviour:
   ButtonCameraCenter: {fileID: 1186343484}
   target: {fileID: 0}
   location: {fileID: 0}
+  Toggle_projection: {fileID: 1655639762}
   lookSpeedH: 2
   lookSpeedV: 2
   zoomSpeed: 25
@@ -13818,7 +13820,7 @@ RectTransform:
   - {fileID: 300705892}
   - {fileID: 1865002073}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -14140,7 +14142,7 @@ RectTransform:
   - {fileID: 1783852231}
   - {fileID: 1369070962}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -17921,7 +17923,7 @@ RectTransform:
   - {fileID: 1204930128}
   - {fileID: 1978426077}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -19561,80 +19563,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 844898976}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &848120880
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 848120881}
-  - component: {fileID: 848120883}
-  - component: {fileID: 848120882}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &848120881
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 848120880}
-  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: 2127596149}
-  m_Father: {fileID: 2062404953}
-  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 &848120882
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 848120880}
-  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 &848120883
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 848120880}
-  m_CullTransparentMesh: 0
 --- !u!1 &849102045
 GameObject:
   m_ObjectHideFlags: 0
@@ -21865,7 +21793,7 @@ RectTransform:
   - {fileID: 1242184359}
   - {fileID: 1857692568}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -23552,18 +23480,16 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1488763877}
   - {fileID: 1605365114}
-  - {fileID: 2062404953}
   - {fileID: 765671127}
   - {fileID: 139001674}
   - {fileID: 2059615925}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: -288}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 105, y: 57}
   m_SizeDelta: {x: 208, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &995816064
@@ -23667,7 +23593,6 @@ MonoBehaviour:
   ToggleLine: {fileID: 698619042}
   ToggleDisappearance: {fileID: 1847398652}
   DatePicker: {fileID: 698074366}
-  projection: {fileID: 2062404954}
   UserInfo: {fileID: 1986755448}
   Editor: {fileID: 1379126276}
   broadcast: 0
@@ -27852,11 +27777,11 @@ RectTransform:
   m_Children:
   - {fileID: 1170208991}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -50, y: -16}
+  m_AnchoredPosition: {x: -45, y: -16}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1186343484
@@ -29425,12 +29350,13 @@ RectTransform:
   m_Children:
   - {fileID: 1812257526}
   - {fileID: 1806286238}
+  - {fileID: 1655639761}
   m_Father: {fileID: 100471033}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: -36}
+  m_AnchoredPosition: {x: 105, y: -46}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1248872934
@@ -29460,6 +29386,8 @@ MonoBehaviour:
   load_location: 0
   locations_index: 
   LocationZones: {fileID: 1533652136}
+  UsersView: {fileID: 1488763876}
+  Cursor: {fileID: 1761650666}
 --- !u!114 &1248872935
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -29725,11 +29653,11 @@ RectTransform:
   - {fileID: 1188171345579349254}
   - {fileID: 465009937}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: -556}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 312, y: 51}
   m_SizeDelta: {x: 208, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1259139725
@@ -32693,15 +32621,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2136051337}
-  - {fileID: 1655639761}
   - {fileID: 58493515}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: -115}
-  m_SizeDelta: {x: 208, y: 92}
+  m_AnchoredPosition: {x: 105, y: -125}
+  m_SizeDelta: {x: 208, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1379126278
 MonoBehaviour:
@@ -32800,7 +32727,6 @@ MonoBehaviour:
   ButtonMode: {fileID: 1952724475}
   EditorTools: {fileID: 472823648}
   ToggleScalePanel: {fileID: 272699088}
-  projection: {fileID: 1655639762}
   DropdownLocation: {fileID: 1806286239}
   Locations: {fileID: 1977324417}
   ButtonAddBeacon: {fileID: 453444205}
@@ -35714,13 +35640,13 @@ RectTransform:
   - {fileID: 1607657809}
   - {fileID: 1526369939}
   - {fileID: 1043834001}
-  m_Father: {fileID: 995816063}
-  m_RootOrder: 0
+  m_Father: {fileID: 100471033}
+  m_RootOrder: 3
   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: 200, y: 300}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 105, y: 11.5}
+  m_SizeDelta: {x: 208, y: -203}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1488763878
 MonoBehaviour:
@@ -37002,7 +36928,7 @@ RectTransform:
   - {fileID: 1688639969}
   - {fileID: 1152481238}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -38636,7 +38562,7 @@ RectTransform:
   - {fileID: 698619041}
   - {fileID: 1847398651}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -40814,12 +40740,12 @@ RectTransform:
   m_Children:
   - {fileID: 1243251507}
   - {fileID: 851095389}
-  m_Father: {fileID: 1379126277}
-  m_RootOrder: 1
+  m_Father: {fileID: 1248872933}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104, y: -46}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1655639762
@@ -40868,7 +40794,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 1
+  m_IsOn: 0
 --- !u!1 &1656049274
 GameObject:
   m_ObjectHideFlags: 0
@@ -42232,83 +42158,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1697936246}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &1699516033
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1699516034}
-  - component: {fileID: 1699516036}
-  - component: {fileID: 1699516035}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1699516034
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1699516033}
-  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: 2062404953}
-  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 &1699516035
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1699516033}
-  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: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u041F\u043B\u043E\u0441\u043A\u0438\u0439 \u0432\u0438\u0434"
---- !u!222 &1699516036
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1699516033}
-  m_CullTransparentMesh: 0
 --- !u!1001 &1700117614
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -43224,6 +43073,7 @@ MonoBehaviour:
   Player: {fileID: 995816062}
   redo: {fileID: 942212489}
   undo: {fileID: 307553992}
+  mode: 4
 --- !u!1 &1765107640
 GameObject:
   m_ObjectHideFlags: 0
@@ -48569,7 +48419,7 @@ RectTransform:
   - {fileID: 1147813427}
   - {fileID: 1854895722}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -49989,7 +49839,7 @@ RectTransform:
   - {fileID: 202966933}
   - {fileID: 1508915151}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -50991,7 +50841,7 @@ RectTransform:
   - {fileID: 1581405530}
   - {fileID: 1259410721}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -51719,7 +51569,7 @@ RectTransform:
   m_Children:
   - {fileID: 1575394144}
   m_Father: {fileID: 995816063}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -51909,91 +51759,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2060390902}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &2062404952
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2062404953}
-  - component: {fileID: 2062404954}
-  m_Layer: 5
-  m_Name: Toggle_view
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2062404953
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2062404952}
-  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: 848120881}
-  - {fileID: 1699516034}
-  m_Father: {fileID: 995816063}
-  m_RootOrder: 2
-  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: 200, y: 20}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2062404954
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2062404952}
-  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: Highlighted
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 848120882}
-  toggleTransition: 1
-  graphic: {fileID: 2127596150}
-  m_Group: {fileID: 0}
-  onValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_IsOn: 0
 --- !u!1 &2066203821
 GameObject:
   m_ObjectHideFlags: 0
@@ -52698,7 +52463,7 @@ RectTransform:
   m_Children:
   - {fileID: 1663974293}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -53479,79 +53244,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2127335467}
   m_CullTransparentMesh: 0
---- !u!1 &2127596148
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2127596149}
-  - component: {fileID: 2127596151}
-  - component: {fileID: 2127596150}
-  m_Layer: 5
-  m_Name: Checkmark
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2127596149
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2127596148}
-  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: 848120881}
-  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 &2127596150
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2127596148}
-  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 &2127596151
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2127596148}
-  m_CullTransparentMesh: 0
 --- !u!1 &2128498571
 GameObject:
   m_ObjectHideFlags: 0
@@ -57422,7 +57114,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 418.09766}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &7150456488086696777
 MonoBehaviour:
@@ -60851,7 +60543,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &7150456489557922002
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 4 - 6
Assets/Scripts/Components/WallCreate.cs

@@ -24,7 +24,7 @@ public class WallCreate : MonoBehaviour
     public List<History> histories = new List<History>();
 
     public enum Mode { Wall, Room, Zone, Pole, Cursor };
-    public static Mode mode = Mode.Cursor;
+    public Mode mode = Mode.Cursor;
     GameObject wall;
     Wall currentWall;
     //public Dictionary<uint, GameObject> WallObjects = new Dictionary<uint, GameObject>();
@@ -100,9 +100,7 @@ public class WallCreate : MonoBehaviour
                     var location_id = company.locations_index[company.active_location];
                     EventHistory(0, wall, Zones[location_id].Last().buttons);
                     break;
-            }
-
-           
+            }           
         }
 
         canvas.SetActive(true);       
@@ -213,7 +211,7 @@ public class WallCreate : MonoBehaviour
         }                
     }
 
-    public static GameObject AddWall(CompanyController company, Vector3 pos, Vector3 scale = default)
+    public GameObject AddWall(CompanyController company, Vector3 pos, Vector3 scale = default)
     {
         var wall = Instantiate(Resources.Load("GameObjects/Wall", typeof(GameObject))) as GameObject;
         wall.transform.position = pos;
@@ -239,7 +237,7 @@ public class WallCreate : MonoBehaviour
     }
 
     static int last_zone;
-    public static GameObject AddZone(Dialog Dialog, CompanyController company, GameObject ZonesScroll, Zone z = null)
+    public GameObject AddZone(Dialog Dialog, CompanyController company, GameObject ZonesScroll, Zone z = null)
     {        
         var location = company.locations[company.locations_index[company.active_location]].location;
         var location_id = company.locations_index[company.active_location];        

+ 3 - 2
Assets/Scripts/Controllers/CompanyController.cs

@@ -26,6 +26,7 @@ public class CompanyController : MonoBehaviour
                                        //public List<Marker> markers;
     public LocationZones LocationZones;
     public GameObject UsersView;
+    public WallCreate Cursor;
 
     PlayerController player;
     EditorController editor;
@@ -201,7 +202,7 @@ public class CompanyController : MonoBehaviour
                 var walls = location.location.transform.GetChild(1);
                 foreach (var w in location.walls)
                 {
-                    var wall = WallCreate.AddWall(this, 
+                    var wall = Cursor.AddWall(this, 
                         new Vector3(w.start_width, WallCreate.WallHeight / 2, w.start_height), 
                         new Vector3(Mathf.Abs(w.end_width), WallCreate.WallHeight, Mathf.Abs(w.end_height)));
                     wall.transform.SetParent(walls.transform);
@@ -233,7 +234,7 @@ public class CompanyController : MonoBehaviour
 
                
                 foreach (var z in location.zones)
-                    z.go = WallCreate.AddZone(Dialog, this, ZonesScroll, z);
+                    z.go = Cursor.AddZone(Dialog, this, ZonesScroll, z);
             }
         }
     }

+ 5 - 2
Assets/Scripts/Controllers/EditorController.cs

@@ -102,8 +102,11 @@ public class EditorController : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        var l = company.locations[company.locations_index[company.active_location]];
-        l.plane.GetComponent<TouchScript>().Resize = ToggleScalePanel.isOn;
+        if (company.active_location >= 0)
+        {
+            var l = company.locations[company.locations_index[company.active_location]];
+            l.plane.GetComponent<TouchScript>().Resize = ToggleScalePanel.isOn;
+        }
     }
 
     string texture_url = "";

+ 15 - 5
Assets/Scripts/Controllers/ModeController.cs

@@ -8,6 +8,7 @@ public class ModeController : MonoBehaviour
 {
     //public enum Mode { Player, Editor};
     //public Mode mode = Mode.Player;
+    public static ModeController instance;
     public GameObject Company;
     public GameObject Player;
     public GameObject Editor;
@@ -29,6 +30,11 @@ public class ModeController : MonoBehaviour
 
     Dropdown.OptionData item;
 
+    private void Awake()
+    {
+        instance = this;
+    }
+
     // Start is called before the first frame update
     void Start()
     {
@@ -103,9 +109,10 @@ public class ModeController : MonoBehaviour
         //}
 
         WallCursor.SetActive(false);
+        var wl = WallCursor.GetComponent<WallCreate>();
 
         GameObject old_button = null;
-        switch (WallCreate.mode)
+        switch (wl.mode)
         {
             case WallCreate.Mode.Cursor:
                 old_button =EditorTools.transform.GetChild(0).gameObject;
@@ -134,14 +141,17 @@ public class ModeController : MonoBehaviour
         Markers.SetActive(false);
         //Beacons.SetActive(false);
         Editor.SetActive(true);
-        EditorTools.SetActive(true); 
+        EditorTools.SetActive(true);
         Building.SetActive(true);
         BuildingMode.SetActive(true);
 
         var company = Company.GetComponent<CompanyController>();
-        var l = company.locations[company.locations_index[company.active_location]];
-        foreach (var b in l.beacons)
-            b.beacon.GetComponent<BeaconController>().mode = BeaconController.Mode.Editor;
+        if (company.active_location >= 0)
+        {
+            var l = company.locations[company.locations_index[company.active_location]];
+            foreach (var b in l.beacons)
+                b.beacon.GetComponent<BeaconController>().mode = BeaconController.Mode.Editor;
+        }
         company.LocationZones.gameObject.SetActive(false);
         company.UsersView.SetActive(false);
         //l.plane.GetComponent<TouchScript>().Resize = false;

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

@@ -157,7 +157,7 @@ public class PlayerController : MonoBehaviour
             {
                 //u.Value.WorkerMarker(u.Value, Color.green, WorkersList, BroadcastStart);
                 //u.Value.toggle_user.transform.SetParent(WorkersList.transform);
-                u.Value.SetParam(WorkersList, BroadcastStart);
+                u.Value.SetParam(BroadcastStart);
 
                 if (DropdownMode.value == 0) u.Value.toggle_user.SetActive(u.Value.online);
                 else u.Value.toggle_user.SetActive(true);

+ 10 - 10
Assets/Scripts/Controllers/ToolsController.cs

@@ -9,7 +9,7 @@ using SimpleFileBrowser;
 
 public class ToolsController : MonoBehaviour
 {
-    public GameObject Cursor;
+    public WallCreate Cursor;
     public int Rounding = 1;
 
     public Button Mouse;
@@ -48,22 +48,22 @@ public class ToolsController : MonoBehaviour
     {
         if (EventSystem.current.IsPointerOverGameObject())
         {
-            if (cursor_active) Cursor.SetActive(!cursor_active);
+            if (cursor_active) Cursor.gameObject.SetActive(!cursor_active);
         }
-        else if (cursor_active) Cursor.SetActive(cursor_active);
+        else if (cursor_active) Cursor.gameObject.SetActive(cursor_active);
         if (ground_active != GroundSettings.activeSelf) GroundSettings.SetActive(ground_active);
     }
 
     public void CursorOff()
     {
         cursor_active=false;
-        WallCreate.mode = WallCreate.Mode.Cursor;
+        Cursor.mode = WallCreate.Mode.Cursor;
     }
 
     public void WallEdit()
     {
         cursor_active = true;
-        WallCreate.mode = WallCreate.Mode.Wall;
+        Cursor.mode = WallCreate.Mode.Wall;
         ground_active = false;
     }
 
@@ -71,7 +71,7 @@ public class ToolsController : MonoBehaviour
     public void RoomEdit()
     {
         cursor_active = true;
-        WallCreate.mode = WallCreate.Mode.Room;
+        Cursor.mode = WallCreate.Mode.Room;
         ground_active = false;
     }
 
@@ -88,7 +88,7 @@ public class ToolsController : MonoBehaviour
     {
         if (cursor_active)
         {
-            Cursor.SetActive(false);
+            Cursor.gameObject.SetActive(false);
             cursor_active = false;
         }
         ground_active = true;
@@ -98,7 +98,7 @@ public class ToolsController : MonoBehaviour
     {
         cursor_active = true;
         SelectButton(ButtonZone, old_btn_build);
-        WallCreate.mode = WallCreate.Mode.Zone;
+        Cursor.mode = WallCreate.Mode.Zone;
         if (old_panel != null) old_panel.SetActive(false);
         ZonesScroll.SetActive(true);
         old_panel = ZonesScroll;
@@ -110,7 +110,7 @@ public class ToolsController : MonoBehaviour
     {
         if (cursor_active)
         {
-            Cursor.SetActive(false);
+            Cursor.gameObject.SetActive(false);
             cursor_active = false;
         }
 
@@ -140,7 +140,7 @@ public class ToolsController : MonoBehaviour
     public void SelectButton(GameObject button)
     {
         GameObject old_button = null;
-        switch (WallCreate.mode)
+        switch (Cursor.mode)
         {
             case WallCreate.Mode.Cursor:
                 old_button = transform.GetChild(0).gameObject;

+ 10 - 6
Assets/Scripts/Models/User.cs

@@ -148,27 +148,31 @@ public class User
         var marker = UnityEngine.Object.Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
         marker.name = $"marker_{user.id}";
         marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{user.id}";
-        marker.transform.SetParent(GameObject.Find("Markers").transform);
+
+         var mode = ModeController.instance;
+        marker.transform.SetParent(mode.Markers.transform);
+
         marker.GetComponent<Renderer>().material.color = color; // UnityEngine.Random.ColorHSV(0f, 1f, 1f, 1f, 0.5f, 1f);
         marker.GetComponent<LabelObjectScript>().UserId = user.id;
-
         var color_line = UnityEngine.Random.ColorHSV(0f, 1f, 1f, 1f, 0.5f, 1f);
         var marker_line = UnityEngine.Object.Instantiate(Resources.Load("GameObjects/Line", typeof(LineRenderer))) as LineRenderer;
         marker_line.name = $"marker_line_{user.id}";
         marker_line.startColor = color_line;
         marker_line.endColor = Color.white;
         marker_line.material.color = color_line;
-        marker_line.transform.SetParent(GameObject.Find("Markers").transform);
+        marker_line.transform.SetParent(mode.Markers.transform);
 
         user.marker = marker;
         user.toggle = toggle;
         user.marker_line = marker_line;
         user.toggle_user = toggle_user;
+
+        var player = PlayerController.instance;
+        toggle_user.transform.SetParent(player.WorkersList.transform);
     }
 
-    public void SetParam(GameObject WorkersList, Action<uint> BroadcastStart)
-    {
-        toggle_user.transform.SetParent(WorkersList.transform);
+    public void SetParam(Action<uint> BroadcastStart)
+    {        
         var camera_button = toggle_user.transform.GetChild(1).GetComponent<Button>();
         camera_button.onClick.AddListener(() => BroadcastStart(id));
     }