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

Assets/Resources/DeviceBtn/Tips.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cf122010443e3604895bdfb8410700d5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/model/重点攻击目标1.prefab

@@ -585,7 +585,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
+  m_IsOn: 1
 --- !u!1 &2630901018476344866
 GameObject:
   m_ObjectHideFlags: 0
@@ -2772,8 +2772,7 @@ MonoBehaviour:
   - {fileID: 8932471483062020681}
   - {fileID: 64890494959671527}
   - {fileID: 4401106011680143311}
-  frequency: 
-  gamepos: {fileID: 0}
+  frequency: UHF;
 --- !u!54 &-3761067737480147572
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -2830,6 +2829,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   number: 
   slider: {fileID: 8342369848364726390}
+  standaloneevent:
+    m_PersistentCalls:
+      m_Calls: []
+  doubleclickecent:
+    m_PersistentCalls:
+      m_Calls: []
+  timer1: 0
+  lasttime: 0
+  count: 0
+  interval: 0.2
 --- !u!1 &8469085005729862802
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/model/重点攻击目标2.prefab

@@ -1660,7 +1660,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
+  m_IsOn: 1
 --- !u!1 &4536037141069892858
 GameObject:
   m_ObjectHideFlags: 0
@@ -2945,8 +2945,7 @@ MonoBehaviour:
   - {fileID: 1595232079232995888}
   - {fileID: 848134281435870856}
   - {fileID: 6994627430635325071}
-  frequency: 
-  gamepos: {fileID: 0}
+  frequency: UHF;
 --- !u!54 &-5022022242888478449
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -3003,6 +3002,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   number: 
   slider: {fileID: 8156631250937224867}
+  standaloneevent:
+    m_PersistentCalls:
+      m_Calls: []
+  doubleclickecent:
+    m_PersistentCalls:
+      m_Calls: []
+  timer1: 0
+  lasttime: 0
+  count: 0
+  interval: 0.2
 --- !u!1 &8523810302534801015
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/model/重点攻击目标3.prefab

@@ -272,7 +272,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
+  m_IsOn: 1
 --- !u!1 &1761400387808716194
 GameObject:
   m_ObjectHideFlags: 0
@@ -2945,8 +2945,7 @@ MonoBehaviour:
   - {fileID: 3776191318234792201}
   - {fileID: 6688120530323237334}
   - {fileID: 8540854955145205225}
-  frequency: 
-  gamepos: {fileID: 0}
+  frequency: HUF;
 --- !u!54 &-796140687388611865
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -3003,6 +3002,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   number: 
   slider: {fileID: 6948589270895844640}
+  standaloneevent:
+    m_PersistentCalls:
+      m_Calls: []
+  doubleclickecent:
+    m_PersistentCalls:
+      m_Calls: []
+  timer1: 0
+  lasttime: 0
+  count: 0
+  interval: 0.2
 --- !u!1 &8450263572622937584
 GameObject:
   m_ObjectHideFlags: 0

Assets/Temp/Scripts/Scenariopage.cs

@@ -809,7 +809,7 @@ public class Scenariopage : MonoBehaviour
             else
             {
 
-                toggle1.isOn = false;
+                toggle1.isOn = true;
                 toggle2.isOn = false;
                 toggle3.isOn = false;
                 toggle4.isOn = false;
@@ -823,7 +823,7 @@ public class Scenariopage : MonoBehaviour
                 Slider_speed.value = 0;
                 Slider_rcs.value = 0;
                 Dropdown_orientation.value = 0;
-                Toggle1.isOn = false;
+                Toggle1.isOn = true;
                 Toggle2.isOn = false;
                 Toggle3.isOn = false;
                 Toggle4.isOn = false;
@@ -831,7 +831,7 @@ public class Scenariopage : MonoBehaviour
                 Toggle6.isOn = false;
                 Toggle7.isOn = false;
                 toggle1.isOn = true;
-                toggle8.isOn = true;
+                toggle8.isOn = false;
 
             }
             radar_panl.gameObject.SetActive(false);
@@ -1839,7 +1839,7 @@ public class Scenariopage : MonoBehaviour
                 Scenariofile_panl.gameObject.SetActive(false);
                 object_list_panl.gameObject.SetActive(true);
                 //Screen();
-                Propertymodel();//添加场景双击删除按钮
+                //Propertymodel();//场景对应模型生成对应的UI
                 if (strlist.Count > 0)
                 {
                     Radarid();//保存雷达id
@@ -1866,7 +1866,7 @@ public class Scenariopage : MonoBehaviour
     {
         if (arg1)
         {
-            Debug.LogError(arg2);
+            Debug.Log(arg2);
             weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(arg2);
         }
         if (weaponitemone1.state)
@@ -1894,7 +1894,7 @@ public class Scenariopage : MonoBehaviour
     {
         if (arg1)
         {
-            Debug.LogError(arg2);
+            Debug.Log(arg2);
             weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(arg2);
         }
         if (weaponitemone1.state)

Assets/Temp/Scripts/Secondarymovement.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.UI;
 
 public class Secondarymovement : MonoBehaviour
@@ -13,6 +14,13 @@ public class Secondarymovement : MonoBehaviour
     private float time1 = 3;
     private float timer = 0;
     private Coroutine myCoroutine;
+    public UnityEvent standaloneevent;
+    public UnityEvent doubleclickecent;
+    public float timer1;//用来判断是否事单机还是双击
+    public float lasttime;//计入当前场景的时间
+    public int count;//用来判断点击了几下
+    public float interval = 0.2f;//用来判断双击间隔时间
+    private bool iscount = true;//用来判断的是单机还是双击
     void Awake()
     {
         if (GameMain.skip ==false)
@@ -54,10 +62,56 @@ public class Secondarymovement : MonoBehaviour
             slider.value = 0;
 
         }
+        if (Input.GetMouseButtonDown(1))
+        {
+            timer1 = 0.2f;
+            if (Time.realtimeSinceStartup - lasttime < interval)
+            {
+                count = 2;
+            }
+            else
+            {
+                count = 1;
+            }
+        }
+        if (Input.GetMouseButtonUp(1))
+        {
+            iscount = false;
+            lasttime = Time.realtimeSinceStartup;
+        }
+        if (!iscount)
+        {
+            timer1 -= Time.deltaTime;
+            if (timer1 < 0)
+            {
+                if (count == 1)
+                {
 
+                    standaloneevent?.Invoke();
+                }
+                else if (count == 2)
+                {
+                    Deletionmodel();
+                    doubleclickecent?.Invoke();
+                }
+                iscount = true;
+            }
+        }
     }
 
-
+    private void Deletionmodel()
+    {
+        Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+        RaycastHit hit;
+        if (Physics.Raycast(ray, out hit, 1000))
+        {
+            Secondarymovement secondarymovement = hit.collider.GetComponent<Secondarymovement>();
+            if (secondarymovement&&secondarymovement.number==number)
+            {
+                Destroy(gameObject);
+            }
+        }
+    }