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

Compare commits

base: yulong:30f13a8e8e605b059166ad26f81af4781821b2e6
Branches Tags
yulong:master
..
compare: yulong:e2fcd7b6a75bd6d200d895497bd29991021e357b
Branches Tags
yulong:master

No commits in common. "30f13a8e8e605b059166ad26f81af4781821b2e6" and "e2fcd7b6a75bd6d200d895497bd29991021e357b" have entirely different histories.
30f13a8e8e ... e2fcd7b6a7

3 changed files with 29 additions and 35 deletions
Show Stats Expand all files Collapse all files

2
Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
View File

@ -403,7 +403,7 @@ Camera:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7326748669528570608} m_GameObject: {fileID: 7326748669528570608}
m_Enabled: 0 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 1 m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}

18
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs
View File

@ -71,7 +71,7 @@ public class UnmannedAerialVehicle : MonoBehaviour
/// </summary> /// </summary>
public GameObject explodePrefab; public GameObject explodePrefab;
public Transform attackTarget;
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
if (unmannedAerialVehicleManage.equipmentCommon.isPlayer && other.tag == "AttackTarget") if (unmannedAerialVehicleManage.equipmentCommon.isPlayer && other.tag == "AttackTarget")
@ -170,8 +170,7 @@ public class UnmannedAerialVehicle : MonoBehaviour
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);
})); }));
} }
@ -193,10 +192,9 @@ public class UnmannedAerialVehicle : MonoBehaviour
WWWForm headers = new WWWForm(); WWWForm headers = new WWWForm();
headers.AddField("id", _equipmentCommon.deviceID); headers.AddField("id", _equipmentCommon.deviceID);
StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data => //StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data => {
{ // //Debug.Log(data);
//Debug.Log(data); //}));
}));
GameObject Bao = Instantiate(explodePrefab, _transform); GameObject Bao = Instantiate(explodePrefab, _transform);
Bao.transform.localPosition = Vector3.zero; Bao.transform.localPosition = Vector3.zero;
Bao.transform.SetParent(null); Bao.transform.SetParent(null);
@ -220,12 +218,9 @@ public class UnmannedAerialVehicle : MonoBehaviour
/// </summary> /// </summary>
public void AttAck(Transform target) public void AttAck(Transform target)
{ {
if (attackTarget == null)
{
transform.DOKill();
attackTarget = target;
Debug.Log("开始攻击目标..:" + target.name); Debug.Log("开始攻击目标..:" + target.name);
Vector3 _v3 = target.position; Vector3 _v3 = target.position;
transform.DOLookAt(_v3, 0.1f).OnComplete(() => transform.DOLookAt(_v3, 0.1f).OnComplete(() =>
{ {
float distance = Vector3.Distance(transform.position, target.position); float distance = Vector3.Distance(transform.position, target.position);
@ -238,7 +233,6 @@ public class UnmannedAerialVehicle : MonoBehaviour
}); });
}); });
} }
}
/// <summary> /// <summary>
/// 发起攻击 /// 发起攻击

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

@ -275,7 +275,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
/// </summary> /// </summary>
private void SelectiveAttackDrone() private void SelectiveAttackDrone()
{ {
//if (isEngagedTarget) return; if (isEngagedTarget) return;
if (wrjModel == WRJModel.电子侦察无人机 || wrjModel == WRJModel.光学无人机) if (wrjModel == WRJModel.电子侦察无人机 || wrjModel == WRJModel.光学无人机)
{ {
List<Collider> colliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体 List<Collider> colliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体
@ -290,7 +290,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
{ {
if (attackColliders1.Count > 0) if (attackColliders1.Count > 0)
{ {
//isEngagedTarget = true; isEngagedTarget = true;
//colliders1.ForEach(x => Debug.Log(x.transform.name)); //colliders1.ForEach(x => Debug.Log(x.transform.name));
int _number = UnityEngine.Random.Range(0, attackColliders1.Count - 1); int _number = UnityEngine.Random.Range(0, attackColliders1.Count - 1);
List<UnmannedAerialVehicle> _unmannedAerialVehicles = unmannedAerialVehicles.FindAll(x => x != null && x.gameObject.activeSelf); List<UnmannedAerialVehicle> _unmannedAerialVehicles = unmannedAerialVehicles.FindAll(x => x != null && x.gameObject.activeSelf);