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

Compare commits

base: yulong:af6c663b9889e1c8464c508a96255cd3fed6db0b
Branches Tags
yulong:master
..
compare: yulong:226d47fbb5860663e1c45e062093ab7dd85319ec
Branches Tags
yulong:master

No commits in common. "af6c663b9889e1c8464c508a96255cd3fed6db0b" and "226d47fbb5860663e1c45e062093ab7dd85319ec" have entirely different histories.
af6c663b98 ... 226d47fbb5

2 changed files with 5 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -135,7 +135,7 @@ public class GameManager : MonoSingleton<GameManager>
Teacher.gameObject.SetActive(false); Teacher.gameObject.SetActive(false);
student.gameObject.SetActive(true); student.gameObject.SetActive(true);
GlobalFlag.isStartRehearsing = (UIBootstrap.Instance.GetRoomStateById(GlobalFlag.roomID) == 1); GlobalFlag.isStartRehearsing = (UIBootstrap.Instance.GetRoomStateById(GlobalFlag.roomID) == 1);
Debug.Log($"<color=red>isStartRehearsing={ GlobalFlag.isStartRehearsing}</color>"); //Debug.Log($"<color=red>isStartRehearsing={ GlobalFlag.isStartRehearsing}</color>");
if (GlobalFlag.isStartRehearsing) if (GlobalFlag.isStartRehearsing)
{ {
spt.GetComponent<Camera>().cullingMask = -1; spt.GetComponent<Camera>().cullingMask = -1;

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

@ -260,7 +260,8 @@ public class UnmannedAerialVehicle : MonoBehaviour
yield return new WaitForSeconds(5f); yield return new WaitForSeconds(5f);
GameObject obj = Instantiate(bulletPrefab, bulletPoint.position, bulletPoint.rotation); GameObject obj = Instantiate(bulletPrefab, bulletPoint.position, bulletPoint.rotation);
obj.SetActive(true); obj.SetActive(true);
//Rigidbody rb = obj.GetComponent<Rigidbody>();
//rb.AddForce(bulletPoint.forward * 20f, ForceMode.Impulse);
obj.transform.DOMove(v3, 2).SetEase(Ease.Linear).OnComplete(() => { obj.transform.DOMove(v3, 2).SetEase(Ease.Linear).OnComplete(() => {
Destroy(obj); Destroy(obj);
}); });
@ -270,6 +271,8 @@ public class UnmannedAerialVehicle : MonoBehaviour
{ {
atkPos = sb.transform.position; atkPos = sb.transform.position;
AddBao(attackTarget.transform); AddBao(attackTarget.transform);
// 销毁objectToDestroy对象
//BeAssaulted("攻击到目标");
Destroy(sb); Destroy(sb);
}); });
} }