Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
		
						commit
						2d0f6cd10d
					
				
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
				
			
			@ -9,8 +9,7 @@ using System.Linq;
 | 
			
		|||
using System.Runtime.ConstrainedExecution;
 | 
			
		||||
using System.Security.Principal;
 | 
			
		||||
using Tenkoku.Core;
 | 
			
		||||
using UnityEditor.Animations;
 | 
			
		||||
using UnityEditor.VersionControl;
 | 
			
		||||
 | 
			
		||||
using UnityEngine;
 | 
			
		||||
using UnityEngine.Networking;
 | 
			
		||||
using UnityEngine.Playables;
 | 
			
		||||
| 
						 | 
				
			
			@ -221,9 +220,10 @@ public class Scenariopage : MonoBehaviour
 | 
			
		|||
    public Text frequency_text;//无线电选项框显示文本
 | 
			
		||||
    public float drive;
 | 
			
		||||
    public Toggle Toggle_Drive;//驱离选项
 | 
			
		||||
    public Text drive_text;//驱离文本
 | 
			
		||||
    //public Text drive_text;//驱离文本
 | 
			
		||||
    public Toggle Toggle_Crash;//迫降选项
 | 
			
		||||
    public Text crash_text;//迫降文本
 | 
			
		||||
    //public Text crash_text;//迫降文本
 | 
			
		||||
    public List<Toggle> toggledrive=new List<Toggle>();//
 | 
			
		||||
    public Dropdown Dropdown_power;//发射功率选项框
 | 
			
		||||
    public float power;
 | 
			
		||||
    public Text power_text;//功率选项框
 | 
			
		||||
| 
						 | 
				
			
			@ -263,9 +263,11 @@ public class Scenariopage : MonoBehaviour
 | 
			
		|||
    public Toggle toggle5;
 | 
			
		||||
    public Toggle toggle6;
 | 
			
		||||
    public Toggle toggle7;
 | 
			
		||||
    public List<Toggle> toggles = new List<Toggle>();//无人机选项
 | 
			
		||||
    //是否有光学侦察能力
 | 
			
		||||
    public Toggle toggle8;
 | 
			
		||||
    public Toggle toggle9;
 | 
			
		||||
    public List<Toggle> toggleslist= new List<Toggle>();//无人机页面选项
 | 
			
		||||
    public List<Text> uavnamelist = new List<Text>();//无人机参数
 | 
			
		||||
    public List<float> uavnamelist2 = new List<float>();//无人机数值
 | 
			
		||||
    public List<Text> Droneunitlist = new List<Text>();//无人机单位
 | 
			
		||||
| 
						 | 
				
			
			@ -331,69 +333,57 @@ public class Scenariopage : MonoBehaviour
 | 
			
		|||
 | 
			
		||||
    private void Electronicreconnaissance()
 | 
			
		||||
    {
 | 
			
		||||
        toggle1.onValueChanged.AddListener((ison) =>
 | 
			
		||||
        if (toggles.Count>0)
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            for (int i = 0; i < toggles.Count; i++)
 | 
			
		||||
            {
 | 
			
		||||
                quantity7 = 1;
 | 
			
		||||
                if (toggles[i]!=null)
 | 
			
		||||
                {
 | 
			
		||||
                    Destroy(toggles[i].gameObject);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle2.onValueChanged.AddListener((ison) =>
 | 
			
		||||
            toggles.Clear();
 | 
			
		||||
        }
 | 
			
		||||
        toggles.Add(toggle1);
 | 
			
		||||
        toggles.Add(toggle2);
 | 
			
		||||
        toggles.Add(toggle3);
 | 
			
		||||
        toggles.Add(toggle4);
 | 
			
		||||
        toggles.Add(toggle5);
 | 
			
		||||
        toggles.Add(toggle6);
 | 
			
		||||
        toggles.Add(toggle7);
 | 
			
		||||
        for (int j = 0; j < toggles.Count; j++)
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            int index=j;
 | 
			
		||||
            toggles[index].onValueChanged.AddListener((ison) =>
 | 
			
		||||
            {
 | 
			
		||||
                quantity7 = 2;
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle3.onValueChanged.AddListener((ison) =>
 | 
			
		||||
                if (ison==true)
 | 
			
		||||
                {
 | 
			
		||||
                    quantity7 = index;
 | 
			
		||||
                    Debug.LogError(quantity7);
 | 
			
		||||
                }
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
        if (toggleslist.Count>0)
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            for (int i = 0; i < toggleslist.Count; i++)
 | 
			
		||||
            {
 | 
			
		||||
                quantity7 = 3;
 | 
			
		||||
                Destroy(toggleslist[i].gameObject);
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle4.onValueChanged.AddListener((ison) =>
 | 
			
		||||
            toggleslist.Clear();    
 | 
			
		||||
        }
 | 
			
		||||
        toggleslist.Add(toggle8);
 | 
			
		||||
        toggleslist.Add(toggle9);
 | 
			
		||||
        for (int i = 0; i < toggleslist.Count; i++)
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            int index = i;
 | 
			
		||||
            toggleslist[i].onValueChanged.AddListener((ison) =>
 | 
			
		||||
            {
 | 
			
		||||
                quantity7 = 4;
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle5.onValueChanged.AddListener((ison) =>
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            {
 | 
			
		||||
                quantity7 = 5;
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle6.onValueChanged.AddListener((ison) =>
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            {
 | 
			
		||||
                quantity7 = 6;
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle7.onValueChanged.AddListener((ison) =>
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            {
 | 
			
		||||
                quantity7 = 7;
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle8.onValueChanged.AddListener((ison) =>
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            {
 | 
			
		||||
                quantity8 = 1;
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        toggle9.onValueChanged.AddListener((ison) =>
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            {
 | 
			
		||||
                quantity8 = 2;
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
                if (ison==true)
 | 
			
		||||
                {
 | 
			
		||||
                    quantity8 = index;
 | 
			
		||||
                }
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private void Drone()
 | 
			
		||||
| 
						 | 
				
			
			@ -444,7 +434,7 @@ public class Scenariopage : MonoBehaviour
 | 
			
		|||
        {
 | 
			
		||||
            Aircraft aircraft = new Aircraft();
 | 
			
		||||
            aircraft.id = droneidlist[i];
 | 
			
		||||
            aircraft.think_device_id = PlayerPrefs.GetString("id2");
 | 
			
		||||
            aircraft.think_device_id = strlist[2];
 | 
			
		||||
            aircraft.para_name = uavnamelist[i].text;
 | 
			
		||||
            //aircraft.para_type = "";
 | 
			
		||||
            aircraft.para_value = uavnamelist2[i].ToString("0");
 | 
			
		||||
| 
						 | 
				
			
			@ -617,22 +607,28 @@ public class Scenariopage : MonoBehaviour
 | 
			
		|||
        {
 | 
			
		||||
            radio_wave_panl.gameObject.SetActive(false);
 | 
			
		||||
        });
 | 
			
		||||
        Toggle_Drive.onValueChanged.AddListener((ison) =>
 | 
			
		||||
        if (toggledrive.Count>0)
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            for (int i = 0; i < toggledrive.Count; i++)
 | 
			
		||||
            {
 | 
			
		||||
                drive = 1;
 | 
			
		||||
                drive_text.text = "驱离";
 | 
			
		||||
                Destroy(toggledrive[i].gameObject);
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
        Toggle_Crash.onValueChanged.AddListener((ison) =>
 | 
			
		||||
            toggledrive.Clear();    
 | 
			
		||||
        }
 | 
			
		||||
        toggledrive.Add(Toggle_Drive);
 | 
			
		||||
        toggledrive.Add(Toggle_Crash);
 | 
			
		||||
        for (int i = 0; i < toggledrive.Count; i++)
 | 
			
		||||
        {
 | 
			
		||||
            if (ison)
 | 
			
		||||
            int index = i;
 | 
			
		||||
            toggledrive[index].onValueChanged.AddListener((ison) =>
 | 
			
		||||
            {
 | 
			
		||||
                drive = 2;
 | 
			
		||||
                crash_text.text = "迫降";
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
                if (ison==true)
 | 
			
		||||
                {
 | 
			
		||||
                    drive = index;
 | 
			
		||||
                }
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
       
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private void Wirelessmodification()
 | 
			
		||||
| 
						 | 
				
			
			@ -2339,7 +2335,6 @@ public class Scenariopage : MonoBehaviour
 | 
			
		|||
                tempEintAmt = 0.9f;
 | 
			
		||||
                break;
 | 
			
		||||
            case 9:
 | 
			
		||||
 | 
			
		||||
                tempEintAmt = 1.0f;
 | 
			
		||||
                break;
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53436,66 +53436,46 @@ PrefabInstance:
 | 
			
		|||
  m_Modification:
 | 
			
		||||
    m_TransformParent: {fileID: 936705244}
 | 
			
		||||
    m_Modifications:
 | 
			
		||||
    - target: {fileID: 1072734216, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.y
 | 
			
		||||
      value: 160
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1111770430, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_SizeDelta.x
 | 
			
		||||
      value: 150
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1111770430, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.x
 | 
			
		||||
      value: 100
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1111770430, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.y
 | 
			
		||||
      value: 160
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1582875492, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.x
 | 
			
		||||
      value: 60
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1582875492, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.y
 | 
			
		||||
      value: 160
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1582875492, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_SizeDelta.x
 | 
			
		||||
      value: 230
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1704071694, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.x
 | 
			
		||||
      value: 125
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1704071694, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_SizeDelta.x
 | 
			
		||||
      value: 100
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1704071694, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.y
 | 
			
		||||
      value: 160
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1747331146, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.x
 | 
			
		||||
      value: 220
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1747331146, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.y
 | 
			
		||||
      value: 160
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1747331146, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_SizeDelta.x
 | 
			
		||||
      value: 240
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2102688381, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.x
 | 
			
		||||
      value: 160
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 2102688381, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: m_AnchoredPosition.y
 | 
			
		||||
      value: 160
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 516132760, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 776204075, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 784847398, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 1186200113, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 1544114963, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 1599649904, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 1768390583, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 1874521477, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 1942451309, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 2024733423, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3}
 | 
			
		||||
      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
      value: 
 | 
			
		||||
      objectReference: {fileID: 1864715518}
 | 
			
		||||
    - target: {fileID: 767881266428941956, guid: a573eabe79e49f740807bf8ae0ff45cc,
 | 
			
		||||
        type: 3}
 | 
			
		||||
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
 | 
			
		||||
| 
						 | 
				
			
			@ -97110,7 +97090,7 @@ MonoBehaviour:
 | 
			
		|||
    m_PreInfinity: 2
 | 
			
		||||
    m_PostInfinity: 2
 | 
			
		||||
    m_RotationOrder: 4
 | 
			
		||||
  randSeed: 341821687
 | 
			
		||||
  randSeed: 442318296
 | 
			
		||||
  isDoingTransition: 0
 | 
			
		||||
  minimumHeight: 0
 | 
			
		||||
--- !u!114 &1820978574
 | 
			
		||||
| 
						 | 
				
			
			@ -98828,9 +98808,8 @@ MonoBehaviour:
 | 
			
		|||
  frequency_text: {fileID: 638510551}
 | 
			
		||||
  drive: 0
 | 
			
		||||
  Toggle_Drive: {fileID: 325349459}
 | 
			
		||||
  drive_text: {fileID: 1358258320}
 | 
			
		||||
  Toggle_Crash: {fileID: 1204428420}
 | 
			
		||||
  crash_text: {fileID: 417204528}
 | 
			
		||||
  toggledrive: []
 | 
			
		||||
  Dropdown_power: {fileID: 1958353411}
 | 
			
		||||
  power: 0
 | 
			
		||||
  power_text: {fileID: 644380947}
 | 
			
		||||
| 
						 | 
				
			
			@ -98883,8 +98862,10 @@ MonoBehaviour:
 | 
			
		|||
  toggle5: {fileID: 629052269}
 | 
			
		||||
  toggle6: {fileID: 1779797007}
 | 
			
		||||
  toggle7: {fileID: 12152249}
 | 
			
		||||
  toggles: []
 | 
			
		||||
  toggle8: {fileID: 399790158}
 | 
			
		||||
  toggle9: {fileID: 881518682}
 | 
			
		||||
  toggleslist: []
 | 
			
		||||
  uavnamelist:
 | 
			
		||||
  - {fileID: 407451444}
 | 
			
		||||
  - {fileID: 51556671}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue