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

Compare commits

base: yulong:79b6304635e5ebd2fb35a4a2ffddf465aba54df6
Branches Tags
yulong:master
...
compare: yulong:446def51227f4c39908d2d05179aba04aafae912
Branches Tags
yulong:master

2 Commits
79b6304635 ... 446def5122

Author SHA1 Message Date
YangHua 446def5122 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-18 16:50:47 +08:00
YangHua b5a888998c re 2024-01-18 16:50:37 +08:00
2 changed files with 5 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

@ -133,7 +133,8 @@ 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()); if (gameObject.GetComponent<UnmannedAerialVehicleManage>())
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);

6
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
View File

@ -450,9 +450,9 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
} }
///根据风得速度改变无人机得速度 ///根据风得速度改变无人机得速度
FireSpeed = float.Parse(maximumFlyingSpeed) / int.Parse(currentSceneInfo.EnvWindSpeed); FireSpeed = float.Parse(maximumFlyingSpeed) / float.Parse(currentSceneInfo.EnvWindSpeed);
///如果风速大于6级，无人机停止飞行 /////如果风速大于6级，无人机停止飞行
if (int.Parse(currentSceneInfo.EnvWindSpeed) > 6) if (float.Parse(currentSceneInfo.EnvWindSpeed) * 10 > 6)
{ {
FireSpeed = 0; FireSpeed = 0;
} }