fix online + fix penel zones

Assets/Resources/GameObjects/ToggleUser.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 128, y: 40}
+  m_SizeDelta: {x: 140, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8486404261763840553
 MonoBehaviour:
@@ -466,7 +466,7 @@ RectTransform:
   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_SizeDelta: {x: 160, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8386034315019825156
 CanvasRenderer:
@@ -536,7 +536,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9131016040049554531}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 

Assets/Scenes/Player.unity

@@ -3618,7 +3618,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6135,7 +6135,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -6468,7 +6468,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -8230,7 +8230,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8978,7 +8978,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -10682,11 +10682,6 @@ PrefabInstance:
       propertyPath: m_Padding.m_Right
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3179031381718342889, guid: 04e9dfc406038d741b31aeebae5c71cb,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 3381085879931397460, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Text
@@ -10857,11 +10852,6 @@ PrefabInstance:
       propertyPath: m_Text
       value: H
       objectReference: {fileID: 0}
-    - target: {fileID: 4812254381176102215, guid: 04e9dfc406038d741b31aeebae5c71cb,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 5126628607193732931, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Text
@@ -10872,11 +10862,6 @@ PrefabInstance:
       propertyPath: m_CharacterLimit
       value: 59
       objectReference: {fileID: 0}
-    - target: {fileID: 6295689075591143488, guid: 04e9dfc406038d741b31aeebae5c71cb,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 7504885423334008393, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Spacing
@@ -12671,7 +12656,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -15024,7 +15009,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -15319,7 +15304,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -16393,11 +16378,6 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 2709291685771458029, guid: 34bc84621ace51d4392c51f2dab181af,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 2709291686035710041, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16423,11 +16403,6 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 64
       objectReference: {fileID: 0}
-    - target: {fileID: 2709291686035710043, guid: 34bc84621ace51d4392c51f2dab181af,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 2709291686657835521, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16453,16 +16428,6 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 64
       objectReference: {fileID: 0}
-    - target: {fileID: 2709291686657835523, guid: 34bc84621ace51d4392c51f2dab181af,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2709291686739621477, guid: 34bc84621ace51d4392c51f2dab181af,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 2709291686739621483, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16488,16 +16453,6 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 68
       objectReference: {fileID: 0}
-    - target: {fileID: 2709291687545950632, guid: 34bc84621ace51d4392c51f2dab181af,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2709291687718886266, guid: 34bc84621ace51d4392c51f2dab181af,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 4644357375386836452, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_Spacing
@@ -17649,9 +17604,9 @@ RectTransform:
   m_Father: {fileID: 995816063}
   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: 104, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 104, y: -330}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &765671128
@@ -17834,7 +17789,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 3
-  m_Spacing: 2
+  m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -19343,7 +19298,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -19963,7 +19918,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -20811,7 +20766,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -22425,7 +22380,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16, y: 16}
+  m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &966412742
 MonoBehaviour:
@@ -22440,12 +22395,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -23287,9 +23242,9 @@ RectTransform:
   m_Father: {fileID: 100471033}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: -290}
+  m_AnchoredPosition: {x: 105, y: 29}
   m_SizeDelta: {x: 208, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &995816064
@@ -23343,13 +23298,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
+  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: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -23388,6 +23343,7 @@ MonoBehaviour:
   EndMin: {fileID: 465009939}
   EndSec: {fileID: 465009938}
   StartStopButton: {fileID: 2059615924}
+  locationZones: {fileID: 1533652136}
   DropdownMode: {fileID: 139001675}
   ToggleLine: {fileID: 698619042}
   ToggleDisappearance: {fileID: 1847398652}
@@ -24377,7 +24333,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -26368,7 +26324,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -26849,7 +26805,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 18, y: 0}
+  m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &1152481239
 MonoBehaviour:
@@ -26917,7 +26873,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -28974,7 +28930,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -29112,13 +29068,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
+  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: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -29384,13 +29340,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
+  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: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -31790,7 +31746,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16, y: 16}
+  m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1359724832
 MonoBehaviour:
@@ -31805,12 +31761,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -32355,13 +32311,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
+  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: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -35336,12 +35292,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -36550,7 +36506,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -36664,13 +36620,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
+  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: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -36904,7 +36860,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -38241,7 +38197,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 104, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1605365115
@@ -40505,7 +40461,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16, y: 16}
+  m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1656049276
 MonoBehaviour:
@@ -40520,12 +40476,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -41308,7 +41264,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 18}
+  m_SizeDelta: {x: 0, y: 20}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &1688639970
 MonoBehaviour:
@@ -41376,7 +41332,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -41883,7 +41839,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -43688,7 +43644,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -43817,7 +43773,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -44142,7 +44098,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -47923,7 +47879,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -47979,7 +47935,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -15, y: -15}
+  m_AnchoredPosition: {x: -16, y: -16}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1952724477
@@ -48043,7 +47999,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -51204,7 +51160,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -52034,7 +51990,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16, y: 16}
+  m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2095569834
 MonoBehaviour:
@@ -52049,12 +52005,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53115,7 +53071,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53391,7 +53347,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53526,7 +53482,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53764,13 +53720,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
+  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: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53798,7 +53754,7 @@ MonoBehaviour:
     m_Top: 10
     m_Bottom: 10
   m_ChildAlignment: 4
-  m_Spacing: 2
+  m_Spacing: 5
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -53963,7 +53919,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -54117,7 +54073,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -54152,7 +54108,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 160, y: -205}
+  m_AnchoredPosition: {x: 356.5, y: -309}
   m_SizeDelta: {x: 300, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &970171088933971315
@@ -54199,7 +54155,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -54492,7 +54448,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -54621,7 +54577,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -56563,7 +56519,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -57063,7 +57019,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scenes/Player.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c0b38db15ebfc8b4fbd5046c1b62bfd8
+guid: 586f6184d109c0f40ae0375dc29aa491
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/Playerold.unity

@@ -3618,7 +3618,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6135,7 +6135,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -6468,7 +6468,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -8230,7 +8230,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8978,7 +8978,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -10682,6 +10682,11 @@ PrefabInstance:
       propertyPath: m_Padding.m_Right
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3179031381718342889, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 3381085879931397460, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Text
@@ -10852,6 +10857,11 @@ PrefabInstance:
       propertyPath: m_Text
       value: H
       objectReference: {fileID: 0}
+    - target: {fileID: 4812254381176102215, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 5126628607193732931, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Text
@@ -10862,6 +10872,11 @@ PrefabInstance:
       propertyPath: m_CharacterLimit
       value: 59
       objectReference: {fileID: 0}
+    - target: {fileID: 6295689075591143488, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 7504885423334008393, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Spacing
@@ -12656,7 +12671,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -15009,7 +15024,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -15304,7 +15319,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -16378,6 +16393,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291685771458029, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2709291686035710041, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16403,6 +16423,11 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 64
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291686035710043, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2709291686657835521, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16428,6 +16453,16 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 64
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291686657835523, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2709291686739621477, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2709291686739621483, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16453,6 +16488,16 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 68
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291687545950632, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2709291687718886266, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 4644357375386836452, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_Spacing
@@ -17789,7 +17834,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 3
-  m_Spacing: 0
+  m_Spacing: 2
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -19298,7 +19343,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -19918,7 +19963,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -20766,7 +20811,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -22380,7 +22425,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &966412742
 MonoBehaviour:
@@ -22395,12 +22440,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -23242,9 +23287,9 @@ RectTransform:
   m_Father: {fileID: 100471033}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: 29}
+  m_AnchoredPosition: {x: 105, y: -290}
   m_SizeDelta: {x: 208, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &995816064
@@ -23298,13 +23343,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   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_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -23343,7 +23388,6 @@ MonoBehaviour:
   EndMin: {fileID: 465009939}
   EndSec: {fileID: 465009938}
   StartStopButton: {fileID: 2059615924}
-  locationZones: {fileID: 1533652136}
   DropdownMode: {fileID: 139001675}
   ToggleLine: {fileID: 698619042}
   ToggleDisappearance: {fileID: 1847398652}
@@ -24333,7 +24377,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -26324,7 +26368,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -26805,7 +26849,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 0}
+  m_SizeDelta: {x: 18, y: 0}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &1152481239
 MonoBehaviour:
@@ -26873,7 +26917,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -28930,7 +28974,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -29068,13 +29112,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   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_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -29340,13 +29384,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   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_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -31746,7 +31790,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1359724832
 MonoBehaviour:
@@ -31761,12 +31805,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -32311,13 +32355,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   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_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -35292,12 +35336,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -36506,7 +36550,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -36620,13 +36664,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   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_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -36860,7 +36904,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -40461,7 +40505,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1656049276
 MonoBehaviour:
@@ -40476,12 +40520,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -41264,7 +41308,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 20}
+  m_SizeDelta: {x: 0, y: 18}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &1688639970
 MonoBehaviour:
@@ -41332,7 +41376,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -41839,7 +41883,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -43644,7 +43688,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -43773,7 +43817,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -44098,7 +44142,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -47879,7 +47923,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -47935,7 +47979,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -16, y: -16}
+  m_AnchoredPosition: {x: -15, y: -15}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1952724477
@@ -47999,7 +48043,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -51160,7 +51204,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -51990,7 +52034,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2095569834
 MonoBehaviour:
@@ -52005,12 +52049,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53071,7 +53115,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53347,7 +53391,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53482,7 +53526,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53720,13 +53764,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   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_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53754,7 +53798,7 @@ MonoBehaviour:
     m_Top: 10
     m_Bottom: 10
   m_ChildAlignment: 4
-  m_Spacing: 5
+  m_Spacing: 2
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -53919,7 +53963,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -54073,7 +54117,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -54108,7 +54152,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 356.5, y: -309}
+  m_AnchoredPosition: {x: 160, y: -205}
   m_SizeDelta: {x: 300, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &970171088933971315
@@ -54155,7 +54199,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -54448,7 +54492,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -54577,7 +54621,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -56519,7 +56563,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -57019,7 +57063,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scenes/Playerold.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 586f6184d109c0f40ae0375dc29aa491
+guid: c0b38db15ebfc8b4fbd5046c1b62bfd8
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/Components/LocationZones.cs

@@ -49,8 +49,11 @@ public class LocationZones : MonoBehaviour
     /// <param name="id"></param>
     public void DeleteZone(uint id)
     {
-        Destroy(ZoneInfos[id].gameObject);
-        ZoneInfos.Remove(id);
+        if (ZoneInfos.ContainsKey(id))
+        {
+            Destroy(ZoneInfos[id].gameObject);
+            ZoneInfos.Remove(id);
+        }
     }
 
     /// <summary>

Assets/Scripts/Controllers/CompanyController.cs

@@ -133,21 +133,22 @@ public class CompanyController : MonoBehaviour
                     Destroy(z.buttons);
                     LocationZones.DeleteZone(z.id);
                 }
+                
                 load_location_elements.Remove(l.Value.id);
             }
         }
 
         active_company = DropdownCompany.value;
         Client.instance.company_id = (uint)(active_company + 1);       
-        if (player.markers != null)
-            foreach (var m in player.markers)
+        if (player.users != null)
+            foreach (var m in player.users)
             {
                 Destroy(m.Value.marker.gameObject);
                 Destroy(m.Value.marker_line.gameObject);
                 Destroy(m.Value.toggle_user);
             } 
         Client.instance.SendGetUsers();
-        player.markers = new Dictionary<uint, Marker>();
+        player.users = new Dictionary<uint, User>();
         Location.LocationsRequest(0);
     }
 
@@ -157,11 +158,11 @@ public class CompanyController : MonoBehaviour
     {
         Debug.Log("PlayerController locations count " + locations.Count + " active " + active_location);
         if (active_location >= 0)
-            locations[locations_index[active_location]].LocationActive(false);   
+            locations[locations_index[active_location]].LocationActive(false, LocationZones);   
 
         active_location = DropdownLocation.value;
         var l = locations[locations_index[active_location]];
-        l.LocationActive(true);
+        l.LocationActive(true, LocationZones);
 
         if (!l.texture_url.Equals("")) StartCoroutine(SendingFormController.LoadImage(l.texture_url, l.plane, l.plane.transform.position, l.plane.transform.localScale));
 

Assets/Scripts/Controllers/PlayerController.cs

@@ -44,7 +44,7 @@ public class PlayerController : MonoBehaviour
 
     public uint? user_broadcast = null;
     public bool broadcast = false;
-    public Dictionary<uint, Marker> markers;
+    public Dictionary<uint, User> users;
     public enum Mode { RealTime = 0, History = 1, Stop = 2 };
     public static Mode active_mode = Mode.Stop;
     int mode = 0;
@@ -62,7 +62,7 @@ public class PlayerController : MonoBehaviour
     const float INTERPOLATION_PERIOD = 0.1f;
     //float time_realtime = 0;
     float time_draw = 0;
-    public List<User> users = new List<User>();
+    //public List<User> users = new List<User>();
     public bool users_load = false;
     public bool beacons_load = false;
 
@@ -82,8 +82,7 @@ public class PlayerController : MonoBehaviour
         company = CompanyController.instance;
         editor = Editor.GetComponent<EditorController>();
         camera = Camera.main;
-        markers = new Dictionary<uint, Marker>();
-
+        users = new Dictionary<uint, User>();
 
         Date = DatePicker.GetComponent<DateTimePicker>();
         //locations.Add(new Location { id = 1, name = "1 Братск" });
@@ -137,16 +136,16 @@ public class PlayerController : MonoBehaviour
 
         if (ToggleLine.isOn)
         {
-            foreach (var m in markers)
-                m.Value.marker_line.gameObject.SetActive(true);
+            foreach (var u in users)
+                u.Value.marker_line.gameObject.SetActive(true);
             ToggleDisappearance.interactable = true;
         }
         else
         {
-            foreach (var m in markers)
+            foreach (var u in users)
             {
-                m.Value.marker_line.gameObject.SetActive(false);
-                m.Value.marker_line.positionCount = 0;
+                u.Value.marker_line.gameObject.SetActive(false);
+                u.Value.marker_line.positionCount = 0;
             }
             ToggleDisappearance.interactable = false;
         }
@@ -163,11 +162,14 @@ public class PlayerController : MonoBehaviour
         if (users_load)
         {
             users_load = false;
-            foreach (var u in users.OrderBy(u => u.id))
+            foreach (var u in users.OrderBy(u => u.Value.id))
             {
-                WorkerMarker(u, Color.green);
-                if(DropdownMode.value == 0) markers[u.id].toggle_user.SetActive(u.online);
-                else markers[u.id].toggle_user.SetActive(true);
+                //u.Value.WorkerMarker(u.Value, Color.green, WorkersList, BroadcastStart);
+                //u.Value.toggle_user.transform.SetParent(WorkersList.transform);
+                u.Value.SetParam(WorkersList, BroadcastStart);
+
+                if (DropdownMode.value == 0) u.Value.toggle_user.SetActive(u.Value.online);
+                else u.Value.toggle_user.SetActive(true);
             }
         }
 
@@ -182,39 +184,7 @@ public class PlayerController : MonoBehaviour
         //}
     }
 
-    /// <summary>
-    /// Создание маркера для сотрудника
-    /// </summary>
-    /// <param name="acc_id"></param>
-    void WorkerMarker(User user, Color color)
-    {
-        var toggle_user = Instantiate(Resources.Load("GameObjects/ToggleUser", typeof(GameObject))) as GameObject;
-        toggle_user.name = $"{user.id}";
-        var toggle = toggle_user.transform.GetChild(0).GetComponent<Toggle>();
-        toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{user.id} {user.name}";
-        toggle_user.transform.SetParent(WorkersList.transform);
-        toggle.isOn = false;
-        var camera_button = toggle_user.transform.GetChild(1).GetComponent<Button>();
-        camera_button.onClick.AddListener(() => BroadcastStart(user.id));
-
-
-        var marker = 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);
-        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 = 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);
-
-        markers[user.id] =new Marker { acc_id = user.id, marker = marker, toggle = toggle, marker_line = marker_line, toggle_user = toggle_user };
-    }
+  
 
     /// <summary>
     /// Смена положения маркера
@@ -222,27 +192,27 @@ public class PlayerController : MonoBehaviour
     /// <param name="step">Шаг до нового положения</param>
     /// <param name="start_pos">Начальное положение</param>
     /// <param name="end_pos">Финальное положение</param>
-    /// <param name="marker">Маркер сотрудника</param>
+    /// <param name="user">Маркер сотрудника</param>
     /// <param name="w">Данные из БД</param>
     /// <param name="progress">Номер записи из БД</param>
     /// <returns></returns>
-    void Position(float step, Vector3 start_pos, Vector3 end_pos, Marker marker, Structure w, string progress)
+    void Position(float step, Vector3 start_pos, Vector3 end_pos, User user, Structure w, string progress)
     {
-        Debug.LogWarning($"move user {marker.acc_id} {end_pos} {w.ts} {w.zone_id}");
-        if (marker.marker.activeSelf == true)
+        Debug.LogWarning($"move user {user.id} {end_pos} {w.ts} {w.zone_id}");
+        if (user.marker.activeSelf == true)
         {
             var x_position = Mathf.Lerp(start_pos.x, end_pos.x, step);
             var y_position = Mathf.Lerp(start_pos.z, end_pos.z, step);
             //Debug.Log($"marker name={worker_marker.name} time={pause} step={step} sec x={x_position} y={y_position} x0={start_pos.x} y0={start_pos.z} x1={end_pos.x} y1={end_pos.z}");
             var new_position = new Vector3(x_position, 0.5f, y_position);
-            if (marker.marker.transform.position != new_position)
+            if (user.marker.transform.position != new_position)
             {
-                marker.marker.transform.position = new Vector3(x_position, 0.5f, y_position);
-                marker.marker_line.SetPosition(marker.marker_line.positionCount++, new Vector3(x_position, 0, y_position));
-                if (ToggleDisappearance.isOn) marker.marker_line = LineDisappearance(marker.marker_line);
+                user.marker.transform.position = new Vector3(x_position, 0.5f, y_position);
+                user.marker_line.SetPosition(user.marker_line.positionCount++, new Vector3(x_position, 0, y_position));
+                if (ToggleDisappearance.isOn) user.marker_line = LineDisappearance(user.marker_line);
             }
-            marker.marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{w.acc_id} x={end_pos.x} y={end_pos.z}";
-            marker.toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{w.acc_id} {w.ts:HH:mm:ss}{progress}";
+            user.marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{w.acc_id} x={end_pos.x} y={end_pos.z}";
+            user.toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{w.acc_id} {w.ts:HH:mm:ss}{progress}";
         }
     }
 
@@ -254,8 +224,8 @@ public class PlayerController : MonoBehaviour
     public void ButtonStart()
     {
         if (active_mode == Mode.Stop)
-            foreach (var m in markers)
-                m.Value.marker_line.positionCount = 0;
+            foreach (var u in users)
+                u.Value.marker_line.positionCount = 0;
 
         var button_text = StartStopButton.transform.GetChild(0);
         switch (DropdownMode.value)
@@ -290,13 +260,13 @@ public class PlayerController : MonoBehaviour
                     time_end = time_end.AddHours(int.Parse(EndHour.GetComponent<InputField>().text));
                     time_end = time_end.AddMinutes(int.Parse(EndMin.GetComponent<InputField>().text));
                     time_end = time_end.AddSeconds(int.Parse(EndSec.GetComponent<InputField>().text));
-                    foreach (var m in markers)
+                    foreach (var u in users)
                     {
-                        if (m.Value.toggle.isOn)
+                        if (u.Value.toggle.isOn)
                         {
 
-                            client.CoordinatesRequest(time_start.Ticks, time_end.Ticks, 1, company.locations_index[company.active_location], m.Value.acc_id);
-                            end_send[m.Value.acc_id] = false;
+                            client.CoordinatesRequest(time_start.Ticks, time_end.Ticks, 1, company.locations_index[company.active_location], u.Value.id);
+                            end_send[u.Value.id] = false;
                         }
                     }
                     button_text.GetComponent<Text>().text = "Остановить";
@@ -315,10 +285,10 @@ public class PlayerController : MonoBehaviour
     {
         StartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
         active_mode = Mode.Stop;
-        foreach (var m in markers)
+        foreach (var u in users)
         {
-            end_send[m.Value.acc_id] = false;
-            moving.Remove(m.Value.acc_id);
+            end_send[u.Value.id] = false;
+            moving.Remove(u.Value.id);
         }
     }
 
@@ -346,64 +316,63 @@ public class PlayerController : MonoBehaviour
     /// Смена положения по интервалу
     /// Шаги для плавного перемещения
     /// </summary>
-    /// <param name="m">Данные о маркере</param>
-    void StartingAccPositiong(Marker m)
+    /// <param name="u">Данные о маркере</param>
+    void StartingAccPositiong(User u)
     {
         int i = 0;
         float step = 0.1f;
-        if (moving.ContainsKey(m.acc_id))
+        if (moving.ContainsKey(u.id))
         {
-            if (moving[m.acc_id].index < Workers[m.acc_id].Count) i = moving[m.acc_id].index;
-            if (moving[m.acc_id].step < 1.1f) step = moving[m.acc_id].step;
+            if (moving[u.id].index < Workers[u.id].Count) i = moving[u.id].index;
+            if (moving[u.id].step < 1.1f) step = moving[u.id].step;
         }
-        else moving[m.acc_id] = new MarkerMoving();
+        else moving[u.id] = new MarkerMoving();
 
-        var worker = Workers[m.acc_id];
-        Debug.LogWarning($"worker coord count {m.acc_id} {worker.Count}");      
+        var worker = Workers[u.id];
+        Debug.LogWarning($"worker coord count {u.id} {worker.Count}");      
 
         if (active_mode == Mode.RealTime) worker = worker.OrderBy(wr => wr.ts).ToList();
         if (worker.Any())
         {
             var w = worker[i];
+           
+            locationZones.UserPosition(u, w);           
 
-            var user = users.Single(u => u.id == m.acc_id);
-            locationZones.UserPosition(user, w);           
-
-            var start_pos = m.marker.transform.position;
+            var start_pos = u.marker.transform.position;
             if (i != 0) start_pos = new Vector3(worker[i - 1].coord_x, 0.5f, worker[i - 1].coord_y);
             if (active_mode == Mode.History && i == 0) start_pos = new Vector3(w.coord_x, 0.5f, w.coord_y);
 
             var end_pos = new Vector3(w.coord_x, 0.5f, w.coord_y);
 
             var progress = "";
-            if (active_mode == Mode.History) progress = $"\n{i + 1} из {Workers[m.acc_id].Count}";
+            if (active_mode == Mode.History) progress = $"\n{i + 1} из {Workers[u.id].Count}";
             //if (starting) 
-            Position(step, start_pos, end_pos, m, w, progress);
+            Position(step, start_pos, end_pos, u, w, progress);
             // StartingAccPositiong(m.value, time_step);
 
         }
 
         step += INTERPOLATION_PERIOD; // 0.1f;        
-        moving[m.acc_id].step = step;
+        moving[u.id].step = step;
         if (Math.Round(step, 1) > 1)
         {
             Debug.Log($"step:{step}");
             i++;
-            moving[m.acc_id].index = i;
+            moving[u.id].index = i;
         }
 
         if (active_mode == Mode.RealTime)
             if (Math.Round(step, 1) > 1)
             {
                 Debug.Log($"Mode.RealTime step:{step}");
-                Workers.Remove(m.acc_id);
-                Debug.LogWarning($"clear coord user {m.acc_id}");
+                Workers.Remove(u.id);
+                Debug.LogWarning($"clear coord user {u.id}");
             }
         if (active_mode == Mode.History)
-            if (i == Workers[m.acc_id].Count)
+            if (i == Workers[u.id].Count)
             {
                 //StopProgress();
-                Workers.Remove(m.acc_id);
+                Workers.Remove(u.id);
             }
     }
 
@@ -443,12 +412,12 @@ public class PlayerController : MonoBehaviour
             case 0:
                 DateTimePanel.SetActive(false);
                 foreach(var u in users)
-                    markers[u.id].toggle_user.SetActive(u.online);
+                    u.Value.toggle_user.SetActive(u.Value.online);
                 break;
             case 1:
                 DateTimePanel.SetActive(true);
                 foreach (var u in users)
-                    markers[u.id].toggle_user.SetActive(true);
+                    u.Value.toggle_user.SetActive(true);
                 break;
         }
     }
@@ -458,22 +427,22 @@ public class PlayerController : MonoBehaviour
     /// </summary>
     public void MarkerMove()
     {
-        foreach (var m in markers)
+        foreach (var u in users)
         {
-            if (m.Value.marker.activeSelf != m.Value.toggle.isOn) m.Value.marker.SetActive(m.Value.toggle.isOn);
+            if (u.Value.marker.activeSelf != u.Value.toggle.isOn) u.Value.marker.SetActive(u.Value.toggle.isOn);
 
-            if (active_mode == Mode.RealTime && m.Value.toggle.isOn && !Workers.ContainsKey(m.Value.acc_id))
+            if (active_mode == Mode.RealTime && u.Value.toggle.isOn && !Workers.ContainsKey(u.Value.id))
             {
-                Debug.LogWarning($"send coord user {m.Value.acc_id}");                
+                Debug.LogWarning($"send coord user {u.Value.id}");                
                 var index = company.locations_index[company.active_location];
-                client.CoordinatesRequest(0, 0, 1, company.locations[index].id, m.Value.acc_id);
+                client.CoordinatesRequest(0, 0, 1, company.locations[index].id, u.Value.id);
 
-                m.Value.toggle_user.SetActive(users.Single(u => u.id ==m.Value.acc_id).online);
+                u.Value.toggle_user.SetActive(u.Value.online);
             }
 
-            if (m.Value.toggle.isOn && Workers.ContainsKey(m.Value.acc_id) && active_mode != Mode.Stop/*&& starting*/ /*&& end_send[m.value.acc_id]*/)
+            if (u.Value.toggle.isOn && Workers.ContainsKey(u.Value.id) && active_mode != Mode.Stop/*&& starting*/ /*&& end_send[m.value.acc_id]*/)
             {              
-                StartingAccPositiong(m.Value);
+                StartingAccPositiong(u.Value);
 
                 if (active_mode == Mode.History && !Workers.Any())
                 {
@@ -509,7 +478,7 @@ public class PlayerController : MonoBehaviour
         if (user_broadcast.HasValue)
         {
             client.ImageStreamStopSend(user_broadcast.Value);
-            var camera_button = markers[user_broadcast.Value].toggle_user.transform.GetChild(1).GetComponent<Button>();
+            var camera_button = users[user_broadcast.Value].toggle_user.transform.GetChild(1).GetComponent<Button>();
             camera_button.GetComponent<Image>().color = Color.white;
             broadcast = false;
         }
@@ -518,10 +487,10 @@ public class PlayerController : MonoBehaviour
             client.ImageStreamStartSend(id);
             user_broadcast = id;
             var name = UserInfo.transform.GetChild(1).GetChild(0).GetComponent<Text>();
-            name.text = $"{id} {users.Single(u => u.id == id).name}";
+            name.text = $"{id} {users[id].name}";
             name.GetComponent<RectTransform>().sizeDelta = new Vector2(name.preferredWidth, 30);
 
-            var camera_button = markers[id].toggle_user.transform.GetChild(1).GetComponent<Button>();
+            var camera_button = users[id].toggle_user.transform.GetChild(1).GetComponent<Button>();
             camera_button.GetComponent<Image>().color = Color.green;
 
             UserInfo.SetActive(false);
@@ -540,7 +509,7 @@ public class PlayerController : MonoBehaviour
         if (user_broadcast.HasValue)
         {
             client.ImageStreamStopSend(user_broadcast.Value);
-            var camera_button = markers[user_broadcast.Value].toggle_user.transform.GetChild(1).GetComponent<Button>();
+            var camera_button = users[user_broadcast.Value].toggle_user.transform.GetChild(1).GetComponent<Button>();
             camera_button.GetComponent<Image>().color = Color.white;
         }
         broadcast = false;

Assets/Scripts/Models/Location.cs

@@ -140,7 +140,7 @@ public class Location
         company.load_location = true;
     }
 
-    public void LocationActive(bool active)
+    public void LocationActive(bool active, LocationZones lzs)
     {
         location.SetActive(active);
         if (beacons != null)
@@ -150,7 +150,12 @@ public class Location
         if (zones != null)
             foreach (var z in zones)
                 if (z.buttons != null)
+                {
                     z.buttons.SetActive(active);
+
+                    var lz = lzs.ZoneInfos[z.id];
+                    lz.gameObject.SetActive(active);
+                }
     }
 }
 

Assets/Scripts/Models/Marker.cs

@@ -8,11 +8,6 @@ using UnityEngine.UI;
 
 public class Marker
 {
-    public Toggle toggle { get; set; }
-    public GameObject toggle_user { get; set; }
-    public GameObject marker { get; set; }
-    public LineRenderer marker_line { get; set; }
-    public uint acc_id { get; set; }
-    public bool starting { get; set; }
+  
 }
 

Assets/Scripts/Models/User.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UnityEngine.UI;
 
 public class User
 {
@@ -11,11 +12,19 @@ public class User
     public string name { get; set; }
     public bool online { get; set; }
 
+    public Toggle toggle { get; set; }
+    public GameObject toggle_user { get; set; }
+    public GameObject marker { get; set; }
+    public LineRenderer marker_line { get; set; }
+    //public uint acc_id { get; set; }
+    public bool starting { get; set; }
+
+
     public static void UsersReceive(byte[] bytedata)
     {
         Debug.Log("UsersReceive");
         var player = PlayerController.instance;
-        player.users = new List<User>();
+        player.users = new Dictionary<uint, User>();
         int read = 5;
         while (read < bytedata.Length)
         {
@@ -25,7 +34,8 @@ public class User
             var name = Encoding.UTF8.GetString(bytedata, read + 6, lenname);
             read += 6 + lenname;
             Debug.Log($"user received id {id} lenname {lenname} name {name} online {online}");
-            player.users.Add(new User { id = id, name = name, online = online!=0 });
+            player.users.Add(id, new User { id = id, name = name, online = online!=0 });
+            WorkerMarker(player.users[id], Color.green);
         }
         player.users_load = true;
     }
@@ -34,6 +44,14 @@ public class User
     {
         var accid = BitConverter.ToUInt32(bytedata, 1);
         var cmd = bytedata[5];
+
+        var player = PlayerController.instance;
+        var u = player.users[accid];
+
+        var b = cmd != 0;
+        u.toggle_user.SetActive(b);
+        u.marker.SetActive(b);
+
         Debug.Log($"LogInOut accid {accid} cmd {cmd}");
     }
 
@@ -71,4 +89,48 @@ public class User
         player.Workers[accid] = worker.OrderBy(w => w.ts).ToList();
         player.end_send[accid] = true;
     }
+
+    /// <summary>
+    /// Создание маркера для сотрудника
+    /// </summary>
+    /// <param name="acc_id"></param>
+    public static void WorkerMarker(User user, Color color/*, GameObject WorkersList, Action<uint> BroadcastStart*/)
+    {
+        var toggle_user = UnityEngine.Object.Instantiate(Resources.Load("GameObjects/ToggleUser", typeof(GameObject))) as GameObject;
+        toggle_user.name = $"{user.id}";
+        var toggle = toggle_user.transform.GetChild(0).GetComponent<Toggle>();
+        toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{user.id} {user.name}";
+        //toggle_user.transform.SetParent(WorkersList.transform);
+        toggle.isOn = false;
+        //var camera_button = toggle_user.transform.GetChild(1).GetComponent<Button>();
+        //camera_button.onClick.AddListener(() => BroadcastStart(user.id));
+
+
+        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);
+        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);
+
+        user.marker = marker;
+        user.toggle = toggle;
+        user.marker_line = marker_line;
+        user.toggle_user = toggle_user;
+    }
+
+    public void SetParam(GameObject WorkersList, Action<uint> BroadcastStart)
+    {
+        toggle_user.transform.SetParent(WorkersList.transform);
+        var camera_button = toggle_user.transform.GetChild(1).GetComponent<Button>();
+        camera_button.onClick.AddListener(() => BroadcastStart(id));
+    }
 }

ProjectSettings/EditorBuildSettings.asset

@@ -6,9 +6,9 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 0
-    path: Assets/Scenes/Player.unity
+    path: Assets/Scenes/Playernew.unity
     guid: c0b38db15ebfc8b4fbd5046c1b62bfd8
   - enabled: 1
-    path: Assets/Scenes/Playerold.unity
+    path: Assets/Scenes/Player.unity
     guid: 586f6184d109c0f40ae0375dc29aa491
   m_configObjects: {}