|
|
@@ -1,4 +1,5 @@
|
|
|
-using System;
|
|
|
+using Assets.Scripts.Models;
|
|
|
+using System;
|
|
|
using System.Collections;
|
|
|
using System.Collections.Generic;
|
|
|
using System.Linq;
|
|
|
@@ -10,10 +11,7 @@ using UnityEngine.UI;
|
|
|
public class WorkerController : MonoBehaviour
|
|
|
{
|
|
|
public static Dictionary<uint, List<Structure>> Workers = new Dictionary<uint, List<Structure>>();
|
|
|
- List<Structure> structures = new List<Structure>();
|
|
|
public static List<Structure> TestStructures = new List<Structure>();
|
|
|
- List<DateTime> dates = new List<DateTime>();
|
|
|
- List<uint> locations = new List<uint>();
|
|
|
|
|
|
public GameObject WorkersList; // scroll content
|
|
|
public Dropdown DropdownLocation;
|
|
|
@@ -29,25 +27,29 @@ public class WorkerController : MonoBehaviour
|
|
|
public GameObject EndMin;
|
|
|
public GameObject EndSec;
|
|
|
public GameObject StartStopButton;
|
|
|
- static GameObject sStartStopButton;
|
|
|
public GameObject ErrorDialog;
|
|
|
public GameObject ButtonPlay;
|
|
|
public Dropdown DropdownMode;
|
|
|
+ public Toggle ToggleLine;
|
|
|
|
|
|
InputField inputField_date_text;
|
|
|
|
|
|
- enum Mode { RealTime = 0, History = 1 };
|
|
|
+ enum Mode { RealTime = 0, History = 1, Stop = 2 };
|
|
|
+ Mode active_mode = Mode.Stop;
|
|
|
int mode = 0;
|
|
|
//public GameObject Time;
|
|
|
|
|
|
static Client client = new Client();
|
|
|
|
|
|
public List<GameObject> maps;
|
|
|
- static List<bool> starting = new List<bool>(); // для остановок
|
|
|
- public static Dictionary<uint, bool> end_send = new Dictionary<uint, bool>(); // определение завершения загрузки
|
|
|
- bool real_time = false;
|
|
|
- int interval = 1;
|
|
|
- float nextTime = 0;
|
|
|
+ static List<bool> starting = new List<bool>(); // флаги остановок
|
|
|
+ public static Dictionary<uint, bool> end_send = new Dictionary<uint, bool>(); // флаги завершения загрузки
|
|
|
+ Dictionary<uint, MarkerMoving> moving = new Dictionary<uint, MarkerMoving>(); // флаги начала движения
|
|
|
+ //bool real_time = false;
|
|
|
+ //bool history_start = false;
|
|
|
+ float interpolationPeriod = 0.1f;
|
|
|
+ float next_time = 0;
|
|
|
+ float time = 0;
|
|
|
|
|
|
//List<bool> StartStop = new List<bool>();
|
|
|
|
|
|
@@ -59,7 +61,6 @@ public class WorkerController : MonoBehaviour
|
|
|
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())
|
|
|
@@ -84,23 +85,22 @@ public class WorkerController : MonoBehaviour
|
|
|
// Update is called once per frame
|
|
|
void Update()
|
|
|
{
|
|
|
-
|
|
|
if (DropdownMode.value != mode)
|
|
|
{
|
|
|
- if(starting.Any()) starting[starting.Count - 1] = false;
|
|
|
- StartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
|
|
|
+ StopProgress();
|
|
|
|
|
|
+ active_mode = Mode.Stop;
|
|
|
mode = DropdownMode.value;
|
|
|
switch (DropdownMode.value)
|
|
|
{
|
|
|
case 0:
|
|
|
- history_start = false;
|
|
|
+ //history_start = false;
|
|
|
inputField_date.gameObject.SetActive(false);
|
|
|
TimeStart.SetActive(false);
|
|
|
TimeEnd.SetActive(false);
|
|
|
break;
|
|
|
case 1:
|
|
|
- real_time = false;
|
|
|
+ //real_time = false;
|
|
|
inputField_date.gameObject.SetActive(true);
|
|
|
TimeStart.SetActive(true);
|
|
|
TimeEnd.SetActive(true);
|
|
|
@@ -124,20 +124,29 @@ public class WorkerController : MonoBehaviour
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
foreach (var m in markers)
|
|
|
{
|
|
|
m.marker.SetActive(m.toggle.isOn);
|
|
|
if (m.toggle.isOn && Workers.ContainsKey(m.acc_id) && starting.Last() && end_send[m.acc_id])
|
|
|
{
|
|
|
- end_send[m.acc_id] = false;
|
|
|
- StartingAccPositiong(m);
|
|
|
- }
|
|
|
- }
|
|
|
+ //end_send[m.value.acc_id] = false;
|
|
|
+ // moving.Add(true);
|
|
|
|
|
|
+ //if (markers.Count - 1 == m.i)
|
|
|
+ time += Time.deltaTime;
|
|
|
+ if (time >= interpolationPeriod)
|
|
|
+ {
|
|
|
+ time -= interpolationPeriod;
|
|
|
+
|
|
|
+ StartingAccPositiong(m);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
- if (real_time && !inputField_location.text.Equals("") && Time.time >= nextTime)
|
|
|
+ if (active_mode == Mode.RealTime && !inputField_location.text.Equals("") && Time.time >= next_time)
|
|
|
{
|
|
|
//var dateNow = DateTime.UtcNow.AddHours(3);
|
|
|
//Time.GetComponent<Text>().text = dateNow.ToString();
|
|
|
@@ -150,39 +159,52 @@ public class WorkerController : MonoBehaviour
|
|
|
client.CoordinatesRequest(0, 0, 1, location_id, m.acc_id);
|
|
|
|
|
|
//history_start = true;
|
|
|
- //end_send[m.acc_id] = false;
|
|
|
+ end_send[m.acc_id] = false;
|
|
|
}
|
|
|
}
|
|
|
- nextTime += interval;
|
|
|
+ next_time++;
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- public static List<Marker> markers = new List<Marker>();
|
|
|
- public class Marker
|
|
|
- {
|
|
|
- public Toggle toggle { get; set; }
|
|
|
- public GameObject marker { get; set; }
|
|
|
- public uint acc_id { get; set; }
|
|
|
+
|
|
|
+
|
|
|
+ if (ToggleLine.isOn)
|
|
|
+ {
|
|
|
+ foreach (var m in markers)
|
|
|
+ m.marker_line.gameObject.SetActive(true);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ foreach (var m in markers)
|
|
|
+ m.marker_line.gameObject.SetActive(false);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+ public static List<Marker> markers = new List<Marker>();
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// Создание маркера для сотрудника
|
|
|
/// </summary>
|
|
|
/// <param name="acc_id"></param>
|
|
|
void WorkerMarker(uint acc_id, Color color)
|
|
|
{
|
|
|
- var worker_toggle = Instantiate(Resources.Load("GameObjects/Toggle", typeof(Toggle))) as Toggle;
|
|
|
- worker_toggle.name = acc_id.ToString();
|
|
|
- worker_toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = acc_id.ToString();
|
|
|
- worker_toggle.transform.SetParent(WorkersList.transform);
|
|
|
+ var toggle = Instantiate(Resources.Load("GameObjects/Toggle", typeof(Toggle))) as Toggle;
|
|
|
+ toggle.name = acc_id.ToString();
|
|
|
+ toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = acc_id.ToString();
|
|
|
+ toggle.transform.SetParent(WorkersList.transform);
|
|
|
+
|
|
|
+ var marker = Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
|
|
|
+ marker.name = "marker_" + acc_id.ToString();
|
|
|
+ marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{acc_id}";
|
|
|
|
|
|
- var worker_marker = Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
|
|
|
- worker_marker.name = "marker_" + acc_id.ToString();
|
|
|
- worker_marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{acc_id}";
|
|
|
+ marker.GetComponent<Renderer>().material.color = color; // UnityEngine.Random.ColorHSV(0f, 1f, 1f, 1f, 0.5f, 1f);
|
|
|
|
|
|
- worker_marker.GetComponent<Renderer>().material.color = color; // 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_" + acc_id.ToString();
|
|
|
+ marker_line.startColor = color;
|
|
|
+ marker_line.endColor = Color.white;
|
|
|
+ marker_line.material.color = color;
|
|
|
|
|
|
- markers.Add(new Marker { acc_id = acc_id, marker = worker_marker, toggle = worker_toggle });
|
|
|
+ markers.Add(new Marker { acc_id = acc_id, marker = marker, toggle = toggle, marker_line = marker_line });
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -198,36 +220,41 @@ public class WorkerController : MonoBehaviour
|
|
|
/// <param name="progress">Номер записи из БД</param>
|
|
|
/// <param name="all">Всего записей из БД</param>
|
|
|
/// <returns></returns>
|
|
|
- static IEnumerator MarkerPostion(float pause, float step, Vector3 start_pos, Vector3 end_pos, GameObject worker_marker, Toggle toggle, Structure w, int count, int progress, int all)
|
|
|
+ //static IEnumerator MarkerPostion(float pause, float step, Vector3 start_pos, Vector3 end_pos, GameObject worker_marker, Toggle toggle, Structure w, int count, int progress, int all)
|
|
|
+ //{
|
|
|
+ // yield return new WaitForSeconds(pause);
|
|
|
+ // if (worker_marker.activeSelf == true && history_start && starting[count])
|
|
|
+ // {
|
|
|
+ // 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}");
|
|
|
+ // worker_marker.transform.position = new Vector3(x_position, 0.5f, y_position);
|
|
|
+ // worker_marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{w.acc_id} x={end_pos.x} y={end_pos.z}";
|
|
|
+ // toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{w.acc_id} {w.ts:hh:mm:ss}\n{progress + 1} из {all}";
|
|
|
+ // if (progress + 1 == all)
|
|
|
+ // {
|
|
|
+ // sStartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
|
|
|
+ // starting[count] = false;
|
|
|
+ // history_start = false;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+
|
|
|
+ void Position(float step, Vector3 start_pos, Vector3 end_pos, Marker marker, Structure w, int count, string progress)
|
|
|
{
|
|
|
- yield return new WaitForSeconds(pause);
|
|
|
- if (worker_marker.activeSelf == true && history_start && starting[count])
|
|
|
+ if (marker.marker.activeSelf == true && starting[count])
|
|
|
{
|
|
|
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}");
|
|
|
- worker_marker.transform.position = new Vector3(x_position, 0.5f, y_position);
|
|
|
- worker_marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{w.acc_id} x={end_pos.x} y={end_pos.z}";
|
|
|
- toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{w.acc_id} {w.ts.ToString("hh:mm:ss")} {progress + 1} из {all}";
|
|
|
- if (progress + 1 == all)
|
|
|
+ var new_position = new Vector3(x_position, 0.5f, y_position);
|
|
|
+ if (marker.marker.transform.position != new_position)
|
|
|
{
|
|
|
- sStartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
|
|
|
- starting[count] = false;
|
|
|
- history_start = false;
|
|
|
+ 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));
|
|
|
}
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- void Position(float step, Vector3 start_pos, Vector3 end_pos, GameObject worker_marker, Toggle toggle, Structure w, int 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);
|
|
|
- //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}");
|
|
|
- worker_marker.transform.position = new Vector3(x_position, 0.5f, y_position);
|
|
|
- worker_marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{w.acc_id} x={end_pos.x} y={end_pos.z}";
|
|
|
- toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{w.acc_id} {w.ts.ToString("hh:mm:ss")}";
|
|
|
+ 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.ToString("hh:mm:ss")}{progress}";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -239,7 +266,7 @@ public class WorkerController : MonoBehaviour
|
|
|
// Debug.Log(t);
|
|
|
//}
|
|
|
|
|
|
- static bool history_start = false;
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// Запуск отрисовки
|
|
|
/// </summary>
|
|
|
@@ -249,14 +276,23 @@ public class WorkerController : MonoBehaviour
|
|
|
switch (DropdownMode.value)
|
|
|
{
|
|
|
case 0:
|
|
|
- real_time = !real_time;
|
|
|
- if (real_time) button_text.GetComponent<Text>().text = "Остановить";
|
|
|
- else button_text.GetComponent<Text>().text = "Отобразить";
|
|
|
+ //real_time = !real_time;
|
|
|
+ if (active_mode == Mode.Stop/*real_time*/) {
|
|
|
+ active_mode = Mode.RealTime;
|
|
|
+ button_text.GetComponent<Text>().text = "Остановить";
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ active_mode = Mode.Stop;
|
|
|
+ button_text.GetComponent<Text>().text = "Отобразить";
|
|
|
+ }
|
|
|
break;
|
|
|
case 1:
|
|
|
if (int.Parse(StartHour.GetComponent<InputField>().text) == 99) SceneManager.LoadScene("Editor");
|
|
|
- else history_start = !history_start;
|
|
|
- if (history_start)
|
|
|
+ else {
|
|
|
+ if (active_mode == Mode.Stop/*real_time*/) active_mode = Mode.History;
|
|
|
+ else active_mode = Mode.Stop;
|
|
|
+ }//history_start = !history_start;
|
|
|
+ if (active_mode == Mode.History/*history_start*/)
|
|
|
{
|
|
|
starting.Add(true);
|
|
|
var date = DateTime.Now; var error_date = false;
|
|
|
@@ -269,7 +305,8 @@ public class WorkerController : MonoBehaviour
|
|
|
ErrorDialog.SetActive(true);
|
|
|
error_date = true;
|
|
|
var text = ErrorDialog.transform.GetChild(0).GetComponent<Text>().text = "Некорректный формат даты";
|
|
|
- history_start = false;
|
|
|
+ //history_start = false;
|
|
|
+ active_mode = Mode.Stop;
|
|
|
}
|
|
|
|
|
|
var time_start = date; //new DateTime(dates.ElementAt(DropdownData.value).Ticks);
|
|
|
@@ -297,7 +334,7 @@ public class WorkerController : MonoBehaviour
|
|
|
if (m.toggle.isOn)
|
|
|
{
|
|
|
client.CoordinatesRequest(time_start.Ticks, time_end.Ticks, 1, location_id, m.acc_id);
|
|
|
- //end_send[m.acc_id] = false;
|
|
|
+ end_send[m.acc_id] = false;
|
|
|
}
|
|
|
}
|
|
|
button_text.GetComponent<Text>().text = "Остановить";
|
|
|
@@ -306,7 +343,8 @@ public class WorkerController : MonoBehaviour
|
|
|
{
|
|
|
ErrorDialog.SetActive(true);
|
|
|
ErrorDialog.transform.GetChild(0).GetComponent<Text>().text = "Введите идентификатор локации";
|
|
|
- history_start = false;
|
|
|
+ //history_start = false;
|
|
|
+ active_mode = Mode.Stop;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -318,8 +356,7 @@ public class WorkerController : MonoBehaviour
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- button_text.GetComponent<Text>().text = "Отобразить";
|
|
|
- starting[starting.Count - 1] = false;
|
|
|
+ StopProgress();
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
@@ -331,33 +368,86 @@ public class WorkerController : MonoBehaviour
|
|
|
ErrorDialog.SetActive(false);
|
|
|
}
|
|
|
|
|
|
+ void StopProgress()
|
|
|
+ {
|
|
|
+ if (starting.Any()) starting[starting.Count - 1] = false;
|
|
|
+ StartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
|
|
|
+
|
|
|
+ foreach (var m in markers)
|
|
|
+ {
|
|
|
+ end_send[m.acc_id] = false;
|
|
|
+ moving.Remove(m.acc_id);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //void StartingAccPositiong(Marker m, float time)
|
|
|
+ //{
|
|
|
+ // var worker = Workers[m.acc_id].OrderBy(wr => wr.ts).ToList();
|
|
|
+ // if (worker.Any())
|
|
|
+ // {
|
|
|
+ // var offset = 0.1f;
|
|
|
+ // for (int i = 0; i < worker.Count; i++)
|
|
|
+ // {
|
|
|
+ // var w = worker.ElementAt(i);
|
|
|
+ // var start_pos = m.marker.transform.position;
|
|
|
+ // if (i != 0) start_pos = new Vector3(worker.ElementAt(i - 1).coord_x / 100f, 0.5f, worker.ElementAt(i - 1).coord_y / 100f);
|
|
|
+
|
|
|
+ // var end_pos = new Vector3(w.coord_x / 100f, 0.5f, w.coord_y / 100f);
|
|
|
+
|
|
|
+ // //if (real_time)
|
|
|
+ // Position(time, start_pos, end_pos, m, w, starting.Count - 1, "");
|
|
|
+ // //if (history_start)
|
|
|
+ // //{
|
|
|
+ // // for (float j = 0; j <= 1.1f; j += 0.1f) // 1.1f из-за округления float
|
|
|
+ // // {
|
|
|
+
|
|
|
+ // // StartCoroutine(MarkerPostion(i + offset + j, j, start_pos, end_pos, m.marker, m.toggle, w, starting.Count - 1, i, worker.Count));
|
|
|
+ // // }
|
|
|
+ // // offset += 0.1f;
|
|
|
+ // //}
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+
|
|
|
void StartingAccPositiong(Marker m)
|
|
|
{
|
|
|
- var worker = Workers[m.acc_id].OrderBy(wr => wr.ts).ToList();
|
|
|
- if (worker.Any())
|
|
|
- {
|
|
|
- var offset = 0.1f;
|
|
|
- for (int i = 0; i < worker.Count; i++)
|
|
|
+ int i = 0;
|
|
|
+ float step = 0.1f;
|
|
|
+ if (moving.ContainsKey(m.acc_id))
|
|
|
+ {
|
|
|
+ if (moving[m.acc_id].index < Workers[m.acc_id].Count) i = moving[m.acc_id].index;
|
|
|
{
|
|
|
- var w = worker.ElementAt(i);
|
|
|
- var start_pos = m.marker.transform.position;
|
|
|
- if (i != 0) start_pos = new Vector3(worker.ElementAt(i-1).coord_x /100f, 0.5f, worker.ElementAt(i-1).coord_y/100f);
|
|
|
-
|
|
|
- var end_pos = new Vector3(w.coord_x / 100f, 0.5f, w.coord_y / 100f);
|
|
|
- for (float j = 0; j <= 1.1f; j += 0.1f) // 1.1f из-за округления float
|
|
|
- {
|
|
|
- if(real_time) Position(j, start_pos, end_pos, m.marker, m.toggle, w, starting.Count - 1);
|
|
|
- else
|
|
|
- StartCoroutine(MarkerPostion(i + offset + j, j, start_pos, end_pos, m.marker, m.toggle, w, starting.Count - 1, i, worker.Count));
|
|
|
- }
|
|
|
- offset += 0.1f;
|
|
|
+ if (moving[m.acc_id].step <= 1.1f) step = moving[m.acc_id].step;
|
|
|
}
|
|
|
}
|
|
|
+ else moving[m.acc_id] = new MarkerMoving();
|
|
|
+
|
|
|
+ var worker = Workers[m.acc_id].OrderBy(wr => wr.ts).ToList();
|
|
|
+ if (worker.Any())
|
|
|
+ {
|
|
|
+ var w = worker.ElementAt(i);
|
|
|
+ var start_pos = m.marker.transform.position;
|
|
|
+ if (i != 0) start_pos = new Vector3(worker.ElementAt(i - 1).coord_x / 100f, 0.5f, worker.ElementAt(i - 1).coord_y / 100f);
|
|
|
+ if (active_mode == Mode.History && i == 0) start_pos = new Vector3(w.coord_x / 100f, 0.5f, w.coord_y / 100f);
|
|
|
+
|
|
|
+ var end_pos = new Vector3(w.coord_x / 100f, 0.5f, w.coord_y / 100f);
|
|
|
+
|
|
|
+ //if (history_start)
|
|
|
+ Position(step, start_pos, end_pos, m, w, starting.Count - 1, $"\n{i+1} из {Workers[m.acc_id].Count}");
|
|
|
+ // StartingAccPositiong(m.value, time_step);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ if (step >= 1) i++;
|
|
|
+ step += 0.1f;
|
|
|
+ moving[m.acc_id].index = i;
|
|
|
+ moving[m.acc_id].step = step;
|
|
|
}
|
|
|
|
|
|
void OnGUI()
|
|
|
{
|
|
|
- DebugHelper.DrawConsole();
|
|
|
+ //if (Input.GetKeyDown(KeyCode.BackQuote))
|
|
|
+ DebugHelper.DrawConsole();
|
|
|
}
|
|
|
}
|
|
|
|
