添加无人机型号同步

Assets/Zion/Scripts/Adam/DragController.cs

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

Assets/Zion/Scripts/Adam/GameManager.cs

@@ -372,6 +372,9 @@ public class GameManager : MonoSingleton<GameManager>
 
         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]));
+        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>().FillInTheData(data.list_para);
     }

Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs

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