yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: yulong:a2728310dbb563e77cd06897fbef82823bd8e0e5
Branches Tags
yulong:master
..
compare: yulong:443139d78545628b2b4960f743826bd248b50bbb
Branches Tags
yulong:master

No commits in common. "a2728310dbb563e77cd06897fbef82823bd8e0e5" and "443139d78545628b2b4960f743826bd248b50bbb" have entirely different histories.
a2728310db ... 443139d785

3 changed files with 9 additions and 13 deletions
Show Stats Expand all files Collapse all files

5
Assets/Zion/Scripts/Adam/DragController.cs
View File

@ -51,12 +51,13 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
{ {
if (!isThinck) if (!isThinck)
{ {
model.GetComponent<EquipmentCommon>().isPlayer = true; model.GetComponent<EquipmentCommon>().isPlayer = true;
model.GetComponent<EquipmentCommon>().isStartRehearsing = GlobalFlag.isStartRehearsing; model.GetComponent<EquipmentCommon>().isStartRehearsing = GlobalFlag.isStartRehearsing;
if (model.GetComponent<UnmannedAerialVehicleManage>())
model.GetComponent<UnmannedAerialVehicleManage>().wrjModel = wrjModel;
List<List_paraItem> temp = UIBootstrap.Instance.GetListParaItemById(deviceID); List<List_paraItem> temp = UIBootstrap.Instance.GetListParaItemById(deviceID);
model.GetComponent<EquipmentCommon>().FillInTheData(temp); model.GetComponent<EquipmentCommon>().FillInTheData(temp);
if (model.GetComponent<UnmannedAerialVehicleManage>())
model.GetComponent<UnmannedAerialVehicleManage>().wrjModel = wrjModel;
if (!isDragWRJ) if (!isDragWRJ)
{ {
transform.SetAsLastSibling(); transform.SetAsLastSibling();

3
Assets/Zion/Scripts/Adam/GameManager.cs
View File

@ -372,9 +372,6 @@ public class GameManager : MonoSingleton<GameManager>
device.transform.position = new Vector3(float.Parse(deviceTran[0]), float.Parse(deviceTran[1]), float.Parse(deviceTran[2])); device.transform.position = new Vector3(float.Parse(deviceTran[0]), float.Parse(deviceTran[1]), float.Parse(deviceTran[2]));
device.transform.eulerAngles = new Vector3(float.Parse(deviceTran[3]), float.Parse(deviceTran[4]), float.Parse(deviceTran[5])); device.transform.eulerAngles = new Vector3(float.Parse(deviceTran[3]), float.Parse(deviceTran[4]), float.Parse(deviceTran[5]));
int wrjModelCount = int.Parse(data.r2);
if (device.GetComponent<UnmannedAerialVehicleManage>())
device.GetComponent<UnmannedAerialVehicleManage>().wrjModel = (WRJModel)wrjModelCount;
device.GetComponent<EquipmentCommon>().deviceID = data.id; device.GetComponent<EquipmentCommon>().deviceID = data.id;
device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para); device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para);
} }

12
Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
View File

@ -109,7 +109,7 @@ public class EquipmentCommon : MonoBehaviour
spectrumdetection.isStartRehearsing = isStartRehearsing; spectrumdetection.isStartRehearsing = isStartRehearsing;
break; break;
case "微波武器": case "微波武器":
Microwaveweapon microwaveweapon = GetComponent<Microwaveweapon>(); Microwaveweapon microwaveweapon= GetComponent<Microwaveweapon>();
microwaveweapon.isStartRehearsing = isStartRehearsing; microwaveweapon.isStartRehearsing = isStartRehearsing;
break; break;
default: default:
@ -133,7 +133,6 @@ public class EquipmentCommon : MonoBehaviour
replaceInfoDic.Add("device_name", equipmentCommon.equipmentType); replaceInfoDic.Add("device_name", equipmentCommon.equipmentType);
replaceInfoDic.Add("para_list", paraListJson); replaceInfoDic.Add("para_list", paraListJson);
replaceInfoDic.Add("r1", $"{transform.position.x},{transform.position.y},{transform.position.z},{transform.eulerAngles.x},{transform.eulerAngles.y},{transform.eulerAngles.z}"); replaceInfoDic.Add("r1", $"{transform.position.x},{transform.position.y},{transform.position.z},{transform.eulerAngles.x},{transform.eulerAngles.y},{transform.eulerAngles.z}");
replaceInfoDic.Add("r2", ((int)gameObject.GetComponent<UnmannedAerialVehicleManage>().wrjModel).ToString());
StartCoroutine(AsyncWebReq.PostData2(Url_AddDeviceAndGetDeviceId, replaceInfoDic, ResultsInfo => StartCoroutine(AsyncWebReq.PostData2(Url_AddDeviceAndGetDeviceId, replaceInfoDic, ResultsInfo =>
{ {
ReturnDeviceID returnID = JsonConvert.DeserializeObject<ReturnDeviceID>(ResultsInfo); ReturnDeviceID returnID = JsonConvert.DeserializeObject<ReturnDeviceID>(ResultsInfo);
@ -190,15 +189,14 @@ public class EquipmentCommon : MonoBehaviour
UploadLogMain uploadLogMain = new UploadLogMain(); UploadLogMain uploadLogMain = new UploadLogMain();
uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID; uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID;
uploadLogMain.ThinkId = GlobalFlag.currentThinkId; uploadLogMain.ThinkId = GlobalFlag.currentThinkId;
string log = currentTime + " " + equipmentType + "(" + deviceID + ")" + "生成 "; string log = currentTime + " " + equipmentType + "(" + deviceID + ")"+"生成 ";
uploadLogMain.log = log; uploadLogMain.log = log;
uploadLogMains.Add(uploadLogMain); uploadLogMains.Add(uploadLogMain);
string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains); string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains);
WWWForm wWWForm = new WWWForm(); WWWForm wWWForm = new WWWForm();
wWWForm.AddField("data", uploadLogMainJson); wWWForm.AddField("data", uploadLogMainJson);
Debug.Log(uploadLogMainJson); Debug.Log(uploadLogMainJson);
StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => {
{
Debug.Log(data); Debug.Log(data);
})); }));
} }
@ -282,7 +280,7 @@ public class EquipmentCommon : MonoBehaviour
} }
break; break;
case "Planedata": case "Planedata":
UnmannedAerialVehicleManage unmannedAerialVehicleManage1 = GetComponent<UnmannedAerialVehicleManage>(); UnmannedAerialVehicleManage unmannedAerialVehicleManage1=GetComponent<UnmannedAerialVehicleManage>();
if (unmannedAerialVehicleManage1) if (unmannedAerialVehicleManage1)
{ {
UnmannedAerialVehicle unmannedAerialVehicle = unmannedAerialVehicleManage1.unmannedAerialVehicles.Find(x => x.serialNumber == data[2]); UnmannedAerialVehicle unmannedAerialVehicle = unmannedAerialVehicleManage1.unmannedAerialVehicles.Find(x => x.serialNumber == data[2]);
@ -291,7 +289,7 @@ public class EquipmentCommon : MonoBehaviour
unmannedAerialVehicle.AddBao(false); unmannedAerialVehicle.AddBao(false);
} }
} }
break; break;
case "SetToBeDestroyed"://设备被销毁 case "SetToBeDestroyed"://设备被销毁
GameObject Bao = Instantiate(explodePrefab, transform); GameObject Bao = Instantiate(explodePrefab, transform);
Bao.transform.localPosition = Vector3.zero; Bao.transform.localPosition = Vector3.zero;