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

Assets/Temp/Scripts/Scenariopage.cs

@@ -466,6 +466,11 @@ public class Scenariopage : MonoBehaviour
                     microwavesliderlist[i].value = 0;
                 }
             }
+            radar_panl.gameObject.SetActive(false);
+            radio_wave_panl.gameObject.SetActive(false);
+            argument_panl.gameObject.SetActive(false);
+            valuerangepanl.gameObject.SetActive(false);
+            spectrum_detection_panl.gameObject.SetActive(false);
             microwave_weapon.gameObject.SetActive(true);
         });
         off1_btn12.onClick.AddListener(() =>
@@ -557,7 +562,12 @@ public class Scenariopage : MonoBehaviour
                 Slider_precision.value = 0;
                 Slider_minimum1.value = 0;
             }
+            radar_panl.gameObject.SetActive(false);
+            radio_wave_panl.gameObject.SetActive(false);
+            argument_panl.gameObject.SetActive(false);
+            valuerangepanl.gameObject.SetActive(false);
             spectrum_detection_panl.gameObject.SetActive(true);
+            microwave_weapon.gameObject.SetActive(false);
         });
         off_button.onClick.AddListener(() =>
         {
@@ -814,7 +824,12 @@ public class Scenariopage : MonoBehaviour
                 toggle8.isOn = true;
 
             }
+            radar_panl.gameObject.SetActive(false);
+            radio_wave_panl.gameObject.SetActive(false);
             argument_panl.gameObject.SetActive(true);
+            valuerangepanl.gameObject.SetActive(false);
+            spectrum_detection_panl.gameObject.SetActive(false);
+            microwave_weapon.gameObject.SetActive(false);
         });
         off_btnn4.onClick.AddListener(() =>
         {
@@ -1062,7 +1077,12 @@ public class Scenariopage : MonoBehaviour
                 Slider_angle.value = 0;
                 Slider_distance.value = 0;
             }
+            radar_panl.gameObject.SetActive(false);
             radio_wave_panl.gameObject.SetActive(true);
+            argument_panl.gameObject.SetActive(false);
+            valuerangepanl.gameObject.SetActive(false);
+            spectrum_detection_panl.gameObject.SetActive(false);
+            microwave_weapon.gameObject.SetActive(false);
         });
         offbi_btn.onClick.AddListener(() =>
         {
@@ -1251,6 +1271,11 @@ public class Scenariopage : MonoBehaviour
                 }
             }
             radar_panl.gameObject.SetActive(true);
+            radio_wave_panl.gameObject.SetActive(false);
+            argument_panl.gameObject.SetActive(false);
+            valuerangepanl.gameObject.SetActive(false);
+            spectrum_detection_panl.gameObject.SetActive(false);
+            microwave_weapon.gameObject.SetActive(false);
         });
         offguan1_btn.onClick.AddListener(() =>
         {
@@ -1345,7 +1370,12 @@ public class Scenariopage : MonoBehaviour
                     laserquantitylist[i].value = 0;
                 }
             }
+            radar_panl.gameObject.SetActive(false);
+            radio_wave_panl.gameObject.SetActive(false);
+            argument_panl.gameObject.SetActive(false);
             valuerangepanl.gameObject.SetActive(true);
+            spectrum_detection_panl.gameObject.SetActive(false);
+            microwave_weapon.gameObject.SetActive(false);
         });
         off1_btn1.onClick.AddListener(() =>
         {
@@ -1488,6 +1518,7 @@ public class Scenariopage : MonoBehaviour
             ispbaocun = true;
             contingency_list_panl.gameObject.SetActive(false);
             Scenariofile_panl.gameObject.SetActive(true);
+            model_panl.gameObject.SetActive(false);
             //点击确认按钮清除模型链表的路径和位置
             if (DragManager.Instance.deviceimages1.Count > 0)
             {
@@ -1524,6 +1555,12 @@ public class Scenariopage : MonoBehaviour
                 {
                     if (scen.data[i].EnvRain == "" || scen.data[i].EnvRain == "")
                     {
+                        weather1.isOn = true;
+                        weather6.isOn = true;
+                        windDrop.value = 0;
+                        windDir.value = 0;
+                        Slider.value = 10;
+                        Foggy_slider.value = 100;
                         break;
                     }
                     weather1.isOn = false;
@@ -1973,7 +2010,7 @@ public class Scenariopage : MonoBehaviour
             }
         }
     }
-   
+
     private void Propertymodel()
     {
         if (properties.Count > 0)//判断生成UI预设体的个数是否大于零
@@ -2048,7 +2085,7 @@ public class Scenariopage : MonoBehaviour
                         if (DragManager.Instance.devices[i] != null)//如果链表里有一个物体就进去
                         {
                             Destroy(DragManager.Instance.devices[i].gameObject);//删除链表有的物体
-                           
+
                         }
                     }
                     DragManager.Instance.devices.Clear();//清空链表
@@ -2647,6 +2684,7 @@ public class Scenariopage : MonoBehaviour
                 environment_configuration1.gameObject.SetActive(false);
                 object_list_panl.gameObject.SetActive(false);
                 basic_information_iamg1.gameObject.SetActive(false);
+                Scenariofile_panl.gameObject.SetActive(false);
                 model_panl.gameObject.SetActive(true);
                 select_device_iamg.gameObject.SetActive(true);
 

Assets/Zion/Scenes/Contingenc_yediting_panl.unity

@@ -117162,7 +117162,7 @@ RectTransform:
   - {fileID: 2018627321}
   - {fileID: 451282782}
   m_Father: {fileID: 936705244}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -441632,7 +441632,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &849899828
 RectTransform:
   m_ObjectHideFlags: 0
@@ -474732,7 +474732,7 @@ RectTransform:
   - {fileID: 2117432846}
   - {fileID: 1054830533}
   m_Father: {fileID: 936705244}
-  m_RootOrder: 8
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -484575,11 +484575,11 @@ RectTransform:
   - {fileID: 1707185790}
   - {fileID: 852395023}
   - {fileID: 593383798}
-  - {fileID: 912492106}
   - {fileID: 1449492559}
   - {fileID: 226935389}
-  - {fileID: 2045712511}
   - {fileID: 984174850}
+  - {fileID: 2045712511}
+  - {fileID: 912492106}
   - {fileID: 1536089029}
   - {fileID: 1410643710}
   - {fileID: 337966888}
@@ -506582,7 +506582,7 @@ RectTransform:
   - {fileID: 1752038989}
   - {fileID: 1005474341}
   m_Father: {fileID: 936705244}
-  m_RootOrder: 12
+  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}
@@ -737698,7 +737698,7 @@ RectTransform:
   - {fileID: 1824993616}
   - {fileID: 984921178}
   m_Father: {fileID: 936705244}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -926938,7 +926938,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 448045578
+  randSeed: 1651826234
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574