diff --git a/Assets/Temp/Scripts/Microwaveweapon.cs b/Assets/Temp/Scripts/Microwaveweapon.cs index 31282939..51092813 100644 --- a/Assets/Temp/Scripts/Microwaveweapon.cs +++ b/Assets/Temp/Scripts/Microwaveweapon.cs @@ -209,7 +209,7 @@ public class Microwaveweapon : MonoBehaviour /// public void Launchattack() { - if (miceopos != null) + if (miceopos != null&&Vector3.Distance(miceopos.position, transform.position) < micdistance) { micdistance = Vector3.Distance(miceopos.position, transform.position); var newdata = Getmicdata(); @@ -220,6 +220,11 @@ public class Microwaveweapon : MonoBehaviour microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f); Closeattack(miceopos); } + else + { + ismicow = false; + miceopos = null; + } } /// /// 上传服务器即关闭激光 diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index ef69f236..ee0a73fb 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -295,6 +295,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour } else { + targetPoint = null; + isLasing = false; Debug.LogError("飞机不在摄像机范围内"); } } diff --git a/Assets/Zion/Scripts/Wzx/DropdownDouble.cs b/Assets/Zion/Scripts/Wzx/DropdownDouble.cs index a8017f06..b63a078b 100644 --- a/Assets/Zion/Scripts/Wzx/DropdownDouble.cs +++ b/Assets/Zion/Scripts/Wzx/DropdownDouble.cs @@ -73,8 +73,14 @@ public class DropdownDouble : MonoBehaviour, IPointerClickHandler _currentSubjectInfo.data = _data; subjectInfos.Add(_currentSubjectInfo); } - + Debug.Log(transform.GetSiblingIndex()); + if (transform.GetSiblingIndex() == 1) + { + Debug.Log("初始化"); + PointerClick(); + } })); + } @@ -91,11 +97,16 @@ public class DropdownDouble : MonoBehaviour, IPointerClickHandler // 单击事件 public void OnPointerClick(PointerEventData eventData) + { + PointerClick(); + //DoublePlayMain.instance.videolistmanager.VideoMain(); + } + + void PointerClick() { Debug.Log("Dropdown value 2: " + dropdown.value); DoublePlayMain.instance.doublePlayIntroduceList.IntroduceListShow(dataItem, traininginformation, dropdown.value, subjectInfos[dropdown.value]); DoublePlayMain.instance.doublePlayEvaluatePanel.DoublePlayEvaluatePanelShow(dataItem, traininginformation, dropdown.value, subjectInfos[dropdown.value]); DoublePlayMain.instance.videolistmanager._name = dataItem.Id; - //DoublePlayMain.instance.videolistmanager.VideoMain(); } }