diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 0af83aee..9cbd2fa6 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -189,16 +189,16 @@ public class GameManager : MonoSingleton } break; case "无人机List": - SpawnDevice(wrjDrag.prefabItem, data[7]); + SpawnDevice(wrjDrag.prefabItem, data); break; case "地面无线电干扰": - SpawnDevice(wxdDrag.prefabItem, data[7]); + SpawnDevice(wxdDrag.prefabItem, data); break; case "探测雷达": - SpawnDevice(ldDrag.prefabItem, data[7]); + SpawnDevice(ldDrag.prefabItem, data); break; case "激光火控平台": - SpawnDevice(hpDrag.prefabItem, data[7]); + SpawnDevice(hpDrag.prefabItem, data); break; case "Stop": GlobalFlag.isStartRehearsing = false; @@ -234,16 +234,16 @@ public class GameManager : MonoSingleton /// /// /// - public async void SpawnDevice(GameObject devicePrefab = null, string deviceID = null) + public async void SpawnDevice(GameObject devicePrefab = null, string[] deviceInfo = null) { DeviceData deviceData = await AsyncWebReq.Get("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=querypracticedevicedetail&PracticeId=" + GlobalFlag.roomID + "&PracticeSubjectId=" + GlobalFlag.practiceSubjectID); - if (devicePrefab != null && deviceID != null) + if (devicePrefab != null && deviceInfo != null) { for (int i = 0; i < deviceData.data.Count; i++) { - if (deviceData.data[i].id == deviceID) + if (deviceData.data[i].id == deviceInfo[7]) { - SpawnDevice(devicePrefab, deviceData.data[i]); + SpawnDevice(devicePrefab, deviceData.data[i],deviceInfo); } } } @@ -271,9 +271,14 @@ public class GameManager : MonoSingleton } - public void SpawnDevice(GameObject obj, AdamThinkDevicesData.DataItem data) + public void SpawnDevice(GameObject obj, AdamThinkDevicesData.DataItem data,string[] tran = null ) { GameObject device = Instantiate(obj); + if(tran != null) + { + device.transform.position = new Vector3(float.Parse(tran[1]), float.Parse(tran[2]), float.Parse(tran[3])); + device.transform.eulerAngles = new Vector3(float.Parse(tran[4]), float.Parse(tran[5]), float.Parse(tran[6])); + } device.GetComponent().deviceID = data.id; device.GetComponent().FillInTheData(data.list_para); }