Скрытие элементов

Assets/Scenes/Location.unity

@@ -723,8 +723,10 @@ MonoBehaviour:
   WorkersList: {fileID: 1434671174}
   DropdownLocation: {fileID: 1806286239}
   DropdownData: {fileID: 1917842946}
-  inputField_date: {fileID: 872770027}
+  inputField_date: {fileID: 872770023}
   inputField_location: {fileID: 1769440376}
+  TimeStart: {fileID: 1248881267}
+  TimeEnd: {fileID: 1905530447}
   StartHour: {fileID: 1491054892}
   StartMin: {fileID: 2123853274}
   StartSec: {fileID: 2044812574}
@@ -1876,6 +1878,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: TimePicker_end
       objectReference: {fileID: 0}
+    - target: {fileID: 4133634577050315814, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1939,17 +1946,17 @@ PrefabInstance:
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -357
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 160
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 40
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -1959,7 +1966,7 @@ PrefabInstance:
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -1969,7 +1976,7 @@ PrefabInstance:
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -1984,52 +1991,52 @@ PrefabInstance:
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 80
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -20
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 154
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 25
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 4377047606790204160, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -2039,22 +2046,22 @@ PrefabInstance:
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 77
       objectReference: {fileID: 0}
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 686639443809622278, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -2064,22 +2071,22 @@ PrefabInstance:
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 129
       objectReference: {fileID: 0}
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 4203760795421392805, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -4206,7 +4213,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: dd.MM.YY
+  m_Text: yyyy.MM.dd
 --- !u!222 &794755795
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4473,12 +4480,12 @@ GameObject:
   - component: {fileID: 872770025}
   - component: {fileID: 872770027}
   m_Layer: 5
-  m_Name: InputField
+  m_Name: InputField_date
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &872770024
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4495,9 +4502,9 @@ RectTransform:
   m_Father: {fileID: 995816063}
   m_RootOrder: 5
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 85, y: -278}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &872770025
@@ -5413,9 +5420,9 @@ RectTransform:
   m_Father: {fileID: 100471033}
   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: 90, y: -210}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 90, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &995816064
@@ -7024,6 +7031,12 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_IsOn: 1
+--- !u!1 &1248881267 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4133634577050315814, guid: 04e9dfc406038d741b31aeebae5c71cb,
+    type: 3}
+  m_PrefabInstance: {fileID: 4133634576226011003}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1263077295
 GameObject:
   m_ObjectHideFlags: 0
@@ -11034,6 +11047,12 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1895674856}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1905530447 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4133634577050315814, guid: 04e9dfc406038d741b31aeebae5c71cb,
+    type: 3}
+  m_PrefabInstance: {fileID: 315985607}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1909013752
 GameObject:
   m_ObjectHideFlags: 0
@@ -13014,6 +13033,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: TimePicker_start
       objectReference: {fileID: 0}
+    - target: {fileID: 4133634577050315814, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -13077,17 +13101,17 @@ PrefabInstance:
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -315
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 160
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 40
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -13097,7 +13121,7 @@ PrefabInstance:
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -13107,7 +13131,7 @@ PrefabInstance:
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4133634577050315813, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -13122,52 +13146,52 @@ PrefabInstance:
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 80
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -20
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 154
       objectReference: {fileID: 0}
     - target: {fileID: 2426266749451007314, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 25
       objectReference: {fileID: 0}
     - target: {fileID: 8836947678447347864, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 4377047606790204160, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -13177,22 +13201,22 @@ PrefabInstance:
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 77
       objectReference: {fileID: 0}
     - target: {fileID: 8027513229679440442, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 686639443809622278, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
@@ -13202,22 +13226,22 @@ PrefabInstance:
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 129
       objectReference: {fileID: 0}
     - target: {fileID: 7760424270510573549, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -15
       objectReference: {fileID: 0}
     - target: {fileID: 4203760795421392805, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}

Assets/Scripts/Controllers/WorkerController.cs

@@ -18,8 +18,10 @@ public class WorkerController : MonoBehaviour
     public GameObject WorkersList; // scroll content
     public Dropdown DropdownLocation;
     public Dropdown DropdownData;
-    public InputField inputField_date;
+    public GameObject inputField_date;
     public InputField inputField_location;
+    public GameObject TimeStart;
+    public GameObject TimeEnd;
     public GameObject StartHour;
     public GameObject StartMin;
     public GameObject StartSec;
@@ -32,6 +34,8 @@ public class WorkerController : MonoBehaviour
     public GameObject ButtonPlay;
     public Dropdown DropdownMode;
 
+    InputField inputField_date_text;
+
     enum Mode { RealTime = 0, History = 1  };
     int mode = 0;
     //public GameObject Time;
@@ -52,11 +56,11 @@ public class WorkerController : MonoBehaviour
     {
         DebugHelper.ActivateConsole();
 
-
         WorkerMarker(4, Color.red);
         WorkerMarker(356, Color.green);
 
         sStartStopButton = StartStopButton;
+        inputField_date_text = inputField_date.transform.GetComponent<InputField>();
 
         //foreach (var s in structures.Select(s => s.acc_id).Distinct())
         //    WorkerMarker(s, UnityEngine.Random.ColorHSV(0f, 1f, 1f, 1f, 0.5f, 1f));
@@ -72,7 +76,7 @@ public class WorkerController : MonoBehaviour
         //    locations.Add(s);
         DropdownLocation.options.Add(new Dropdown.OptionData("22 Офис Ижевск"));
         DropdownLocation.options.Add(new Dropdown.OptionData("25"));
-        inputField_date.text = DateTime.Now.ToString("yyyy.MM.dd");
+        inputField_date_text.text = DateTime.Now.ToString("yyyy.MM.dd");
         //}
     }
 
@@ -83,7 +87,7 @@ public class WorkerController : MonoBehaviour
 
         if (DropdownMode.value != mode)
         {
-            starting[starting.Count - 1] = false;
+            if(starting.Any()) starting[starting.Count - 1] = false;
             StartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
 
             mode = DropdownMode.value;
@@ -91,9 +95,15 @@ public class WorkerController : MonoBehaviour
             {
                 case 0:
                     history_start = false;
+                    inputField_date.gameObject.SetActive(false);
+                    TimeStart.SetActive(false);
+                    TimeEnd.SetActive(false);
                     break;
                 case 1:
                     real_time = false;
+                    inputField_date.gameObject.SetActive(true);
+                    TimeStart.SetActive(true);
+                    TimeEnd.SetActive(true);
                     break;
             }
         }
@@ -137,9 +147,9 @@ public class WorkerController : MonoBehaviour
             {
                 if (m.toggle.isOn)
                 {
-                    client.CoordinatesRequest(-2, 0, 1, location_id, m.acc_id);
+                    client.CoordinatesRequest(0, 0, 1, location_id, m.acc_id);
 
-                    history_start = true;
+                    //history_start = true;
                     //end_send[m.acc_id] = false;
                 }
             }
@@ -210,7 +220,7 @@ public class WorkerController : MonoBehaviour
 
     void Position(float step, Vector3 start_pos, Vector3 end_pos, GameObject worker_marker, Toggle toggle, Structure w, int count)
     {
-        if (worker_marker.activeSelf == true && history_start && starting[count])
+        if (worker_marker.activeSelf == true && starting[count])
         {
             var x_position = Mathf.Lerp(start_pos.x, end_pos.x, Time.time - interval);
             var y_position = Mathf.Lerp(start_pos.z, end_pos.z, Time.time - interval);
@@ -252,7 +262,7 @@ public class WorkerController : MonoBehaviour
                     var date = DateTime.Now; var error_date = false;
                     try
                     {
-                        date = DateTime.Parse(inputField_date.text);
+                        date = DateTime.Parse(inputField_date_text.text);
                     }
                     catch (Exception e)
                     {