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

Assets/Resources/UIPanel/Training_pilot_panl.prefab

@@ -624,7 +624,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -97.9, y: 0}
+  m_AnchoredPosition: {x: -220, y: 0}
   m_SizeDelta: {x: 140, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2860036571858398482
@@ -668,6 +668,84 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5F00\u59CB\u6F14\u7EC3"
+--- !u!1 &1375685714112631388
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5170853652334685242}
+  - component: {fileID: 3790189068543463837}
+  - component: {fileID: 3858405990189970489}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5170853652334685242
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375685714112631388}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5855821741515730287}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 10, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3790189068543463837
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375685714112631388}
+  m_CullTransparentMesh: 0
+--- !u!114 &3858405990189970489
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375685714112631388}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9811321, g: 0.9487362, b: 0.9487362, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7ED3\u675F\u6F14\u7EC3"
 --- !u!1 &2664863769300752706
 GameObject:
   m_ObjectHideFlags: 0
@@ -742,6 +820,124 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2845477322580315714
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5640954770527259063}
+  - component: {fileID: 5023179464410205105}
+  - component: {fileID: 7522610960832761157}
+  - component: {fileID: 2117340063577781519}
+  m_Layer: 5
+  m_Name: finish_bton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5640954770527259063
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2845477322580315714}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5855821741515730287}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 120, y: 0}
+  m_SizeDelta: {x: 40, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5023179464410205105
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2845477322580315714}
+  m_CullTransparentMesh: 0
+--- !u!114 &7522610960832761157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2845477322580315714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2117340063577781519
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2845477322580315714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7522610960832761157}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5855821740803227380
 GameObject:
   m_ObjectHideFlags: 0
@@ -1327,6 +1523,8 @@ RectTransform:
   - {fileID: 5855821741593404593}
   - {fileID: 5855821741361037919}
   - {fileID: 6708533476933354608}
+  - {fileID: 5640954770527259063}
+  - {fileID: 5170853652334685242}
   m_Father: {fileID: 5855821741811488939}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1600,7 +1798,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -120, y: 0}
   m_SizeDelta: {x: 40, y: 41}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5855821741614971531
@@ -1829,6 +2027,7 @@ MonoBehaviour:
   modellinkedlistpanl: {fileID: 0}
   model2_btn: {fileID: 5855821740938569027}
   initiate_botn: {fileID: 78139659}
+  finish_bton: {fileID: 0}
 --- !u!1 &5855821741812748368
 GameObject:
   m_ObjectHideFlags: 0
@@ -1864,7 +2063,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -120, y: 0}
   m_SizeDelta: {x: 40, y: 41}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5855821741812748372

Assets/Temp/Scripts/Doubleclickdelete.cs

@@ -1,6 +1,9 @@
-using System;
+using DataModel.Model;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.CompilerServices;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Events;
@@ -14,10 +17,9 @@ public class Doubleclickdelete : MonoBehaviour
     public int count;//用来判断点击了几下
     public float interval = 0.2f;//用来判断双击间隔时间
     private bool iscount = true;//用来判断的是单机还是双击
-    public Scenariopage scenariopage;
     void Start()
     {
-         scenariopage = GetComponent<Scenariopage>();
+         
     }
 
 
@@ -64,30 +66,34 @@ public class Doubleclickdelete : MonoBehaviour
     {
         Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
         RaycastHit hit;
-        if (Physics.Raycast(ray, out hit, Mathf.Infinity))
+        if (Physics.Raycast(ray, out hit,1000))
         {
-            if (hit.collider.gameObject.tag == "model")
+            if (hit.collider.gameObject.tag =="model")
             {
                 if (DragManager.Instance.devices.Count > 0)
                 {
-                    
+                    Scenariopage scenariopage = GetComponent<Scenariopage>();
                     for (int i = 0; i < DragManager.Instance.devices.Count; i++)
                     {
                         int index = i;
                         if (hit.collider.gameObject.name == DragManager.Instance.devices[index].name)
                         {
                             Destroy(DragManager.Instance.devices[index].gameObject);
+                            DragManager.Instance.devices.RemoveAt(index);
                             if (scenariopage.properties.Count > 0)
                             {
                                 Deletebutton(scenariopage, DragManager.Instance.devices[index].gameObject.name);
                             }
+                            break;
                         }
                     }
                 }
+
             }
         }
     }
 
+
     private void Deletebutton(Scenariopage scenariopage, string name)
     {
 
@@ -97,8 +103,11 @@ public class Doubleclickdelete : MonoBehaviour
             if (scenariopage.properties[index].name == name)
             {
                 Destroy(scenariopage.properties[index].gameObject);
+                scenariopage.properties.RemoveAt(index);
+                break;
             }
         }
 
     }
+
 }

Assets/Temp/Scripts/Judgmentstate.cs

@@ -1,4 +1,5 @@
 using AdamSync;
+using System;
 using UnityEngine;
 using UnityEngine.UI;
 using static InterfaceManager;
@@ -20,6 +21,7 @@ public class Judgmentstate : MonoBehaviour
     public Modellinkedlistpanl modellinkedlistpanl;//模型页面列表
     public Button model2_btn;//模型列表按钮
     public Button initiate_botn;//开始推演按钮
+    public Button finish_bton;//结束按钮
 
 
 
@@ -36,6 +38,15 @@ public class Judgmentstate : MonoBehaviour
             OnLeaveRoom();
         });
         Operation();//开始暂停结束方法
+        Finish();
+    }
+
+    private void Finish()
+    {
+        finish_bton.onClick.AddListener(() =>
+        {
+
+        });
     }
 
     private void Operation()

Assets/Temp/Scripts/Scenariopage.cs

@@ -2043,13 +2043,16 @@ public class Scenariopage : MonoBehaviour
         for (int i = 0; i < DragManager.Instance.devices.Count; i++)//判断单例生成预设体
         {
             int index = i;
-            if (DragManager.Instance.devices[i] != null)
+            if (DragManager.Instance.devices[index] != null)
             {
                 Propertypanl pro = Instantiate(propertypanl, Panel_making);//生成预设体对象
                 pro.Property(DragManager.Instance.devices[index].name.Replace("(Clone)", ""), () =>
                 {
                     Destroy(DragManager.Instance.devices[index].gameObject);//删除
+                    //DragManager.Instance.devices.Remove(DragManager.Instance.devices[index]);
                     Destroy(pro.gameObject);//删除
+                    //Destroy(properties[index].gameObject);
+                    //properties.Remove(properties[index]);
                 });
                 pro.name = DragManager.Instance.devices[index].name;
                 properties.Add(pro);

Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 1113159741}
-  m_IndirectSpecularColor: {r: 0.1622766, g: 0.30692616, b: 0.67379403, a: 1}
+  m_IndirectSpecularColor: {r: 0.16233805, g: 0.3060893, b: 0.6688442, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -72521,7 +72521,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 168024906
+  randSeed: 599115265
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574
@@ -74601,6 +74601,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Training_pilot_panl
       objectReference: {fileID: 0}
+    - target: {fileID: 5855821741811488938, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5855821741811488939, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -74721,6 +74726,11 @@ PrefabInstance:
       propertyPath: modellinkedlistpanl
       value: 
       objectReference: {fileID: 1576746880}
+    - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
+        type: 3}
+      propertyPath: finish_bton
+      value: 
+      objectReference: {fileID: 1923624324}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
 --- !u!224 &1923624323 stripped
@@ -74729,6 +74739,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 1923624322}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1923624324 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2117340063577781519, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1923624322}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1925617538
 GameObject:
   m_ObjectHideFlags: 0