Commit 72070423 authored by 潘梓豪's avatar 潘梓豪

Merge branch 'master' of git@gitlab.sd-zeus.com:yangzeyu/SCVerificationPipelineDT.git

parents 07b62f01 cc1168d8
...@@ -3,6 +3,8 @@ using System.Collections.Generic; ...@@ -3,6 +3,8 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using Zeus.DTC; using Zeus.DTC;
using TMPro; using TMPro;
using Zeus.DTComponent;
using DTAGVManager = Zeus.DTC.DTAGVManager;
public class AGVDemoV2 : MonoBehaviour public class AGVDemoV2 : MonoBehaviour
{ {
...@@ -19,10 +21,25 @@ public class AGVDemoV2 : MonoBehaviour ...@@ -19,10 +21,25 @@ public class AGVDemoV2 : MonoBehaviour
public List<string> IsHasError; public List<string> IsHasError;
public Animator animator; public Animator animator;
IEnumerator WaitForDataAndCreatePoints()
{
while (!manager.IsDataLoaded)
{
yield return null;
}
AGVManager._getOrCreateAGV(AGVName).transform.position = AGVManager.Map.TransformPointToWorld(new Vector3(manager.position.x, manager.position.y, 0));
AGVManager._getOrCreateAGV(AGVName).transform.eulerAngles = new Vector3(0, AGVManager.Map.TransformAngle(manager.angle), 0);
StartCoroutine(UpdatePosition());
}
private void Start() private void Start()
{ {
IsHasError = new List<string>(); IsHasError = new List<string>();
StartCoroutine(UpdatePosition());
StartCoroutine(WaitForDataAndCreatePoints());
//StartCoroutine(UpdatePosition());
StartCoroutine(UpdateErrorReporting()); StartCoroutine(UpdateErrorReporting());
// 递归查找名字为"机械臂"的子物体 // 递归查找名字为"机械臂"的子物体
......
...@@ -35,6 +35,7 @@ public class LoginManager : MonoBehaviour ...@@ -35,6 +35,7 @@ public class LoginManager : MonoBehaviour
private InputFieldData inputFieldData; private InputFieldData inputFieldData;
private JsonData line_jd = new JsonData(); private JsonData line_jd = new JsonData();
public GameObject _parent; public GameObject _parent;
public bool IsDataLoaded = false;
private void Awake() private void Awake()
{ {
...@@ -108,6 +109,7 @@ public class LoginManager : MonoBehaviour ...@@ -108,6 +109,7 @@ public class LoginManager : MonoBehaviour
// 使用 JsonUtility 解析 JSON 数据 // 使用 JsonUtility 解析 JSON 数据
positionData = JsonUtility.FromJson<RobotPositionData>(responseJson); positionData = JsonUtility.FromJson<RobotPositionData>(responseJson);
OnReceiveMsg.Invoke(positionData, "RobotPositionData"); OnReceiveMsg.Invoke(positionData, "RobotPositionData");
IsDataLoaded = true;
} }
} }
......
...@@ -23312,6 +23312,7 @@ MonoBehaviour: ...@@ -23312,6 +23312,7 @@ MonoBehaviour:
IsLine1: 0 IsLine1: 0
path: URL.json path: URL.json
_parent: {fileID: 1692847786} _parent: {fileID: 1692847786}
IsDataLoaded: 0
--- !u!114 &346303892 --- !u!114 &346303892
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -32471,6 +32472,7 @@ MonoBehaviour: ...@@ -32471,6 +32472,7 @@ MonoBehaviour:
IsLine1: 1 IsLine1: 1
path: URL.json path: URL.json
_parent: {fileID: 396184908} _parent: {fileID: 396184908}
IsDataLoaded: 0
--- !u!114 &560685329 --- !u!114 &560685329
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment