Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

Assets/Temp/Scripts/Microwaveweapon.cs

@@ -209,7 +209,7 @@ public class Microwaveweapon : MonoBehaviour
     /// </summary>
     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;
+        }
     }
     /// <summary>
     /// 上传服务器即关闭激光

Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs

@@ -295,6 +295,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour
             }
             else
             {
+                targetPoint = null;
+                isLasing = false;
                 Debug.LogError("飞机不在摄像机范围内");
             }
         }

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();
     }
 }