Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
commit
3ef1bff6b0
|
@ -32,8 +32,8 @@ Material:
|
||||||
- _dispStrength: 1
|
- _dispStrength: 1
|
||||||
- _overBright: 1
|
- _overBright: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
|
- _AmbientTint: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
|
- _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003}
|
||||||
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
||||||
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
|
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
|
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
|
|
@ -1001,7 +1001,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &3717207340520904692
|
--- !u!224 &3717207340520904692
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -675,7 +675,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &3249154455552811412
|
--- !u!224 &3249154455552811412
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -1469,7 +1469,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &2949388239291875526
|
--- !u!224 &2949388239291875526
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -113,22 +113,22 @@ public class Spectrumdetection : MonoBehaviour
|
||||||
frequency += "UHF" + ",";
|
frequency += "UHF" + ",";
|
||||||
break;
|
break;
|
||||||
case "1":
|
case "1":
|
||||||
frequency = "L" + ",";
|
frequency += "L" + ",";
|
||||||
break;
|
break;
|
||||||
case "2":
|
case "2":
|
||||||
frequency = "S" + ",";
|
frequency += "S" + ",";
|
||||||
break;
|
break;
|
||||||
case "3":
|
case "3":
|
||||||
frequency = "C" + ",";
|
frequency += "C" + ",";
|
||||||
break;
|
break;
|
||||||
case "4":
|
case "4":
|
||||||
frequency = "X" + ",";
|
frequency += "X" + ",";
|
||||||
break;
|
break;
|
||||||
case "5":
|
case "5":
|
||||||
frequency = "Ku" + ",";
|
frequency += "Ku" + ",";
|
||||||
break;
|
break;
|
||||||
case "6":
|
case "6":
|
||||||
frequency = "Ka" + ",";
|
frequency += "Ka" + ",";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
||||||
m_ReflectionIntensity: 1
|
m_ReflectionIntensity: 1
|
||||||
m_CustomReflection: {fileID: 0}
|
m_CustomReflection: {fileID: 0}
|
||||||
m_Sun: {fileID: 1113159741}
|
m_Sun: {fileID: 1113159741}
|
||||||
m_IndirectSpecularColor: {r: 0.16308242, g: 0.30692217, b: 0.6682916, a: 1}
|
m_IndirectSpecularColor: {r: 0.064872116, g: 0.12184041, b: 0.26695764, a: 1}
|
||||||
m_UseRadianceAmbientProbe: 0
|
m_UseRadianceAmbientProbe: 0
|
||||||
--- !u!157 &3
|
--- !u!157 &3
|
||||||
LightmapSettings:
|
LightmapSettings:
|
||||||
|
@ -156,7 +156,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: -0.000015258789}
|
m_AnchoredPosition: {x: 0, y: -0.000015258789}
|
||||||
m_SizeDelta: {x: 0, y: 50}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &3921062
|
--- !u!114 &3921062
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -45765,7 +45765,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: -0.000015258789}
|
m_AnchoredPosition: {x: 0, y: -0.000015258789}
|
||||||
m_SizeDelta: {x: 0, y: 50}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &996536657
|
--- !u!114 &996536657
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -49466,7 +49466,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 227400, y: 165920}
|
m_AnchoredPosition: {x: 229200, y: 166840}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &1347317408
|
--- !u!114 &1347317408
|
||||||
|
@ -63226,7 +63226,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &1719983406
|
--- !u!224 &1719983406
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -64649,10 +64649,10 @@ MonoBehaviour:
|
||||||
colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8}
|
colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8}
|
||||||
colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1}
|
colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1}
|
||||||
colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
|
colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
|
||||||
colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
|
colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
|
||||||
colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1}
|
colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1}
|
||||||
colorClouds: {r: 1, g: 1, b: 1, a: 1}
|
colorClouds: {r: 1, g: 1, b: 1, a: 1}
|
||||||
colorHighlightClouds: {r: 1, g: 1, b: 1, a: 1}
|
colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1}
|
||||||
colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1}
|
colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1}
|
||||||
colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1}
|
colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1}
|
||||||
displayTime: '[ 10:30:00 AM] [ 3/6/1027 ad]'
|
displayTime: '[ 10:30:00 AM] [ 3/6/1027 ad]'
|
||||||
|
@ -64990,7 +64990,7 @@ MonoBehaviour:
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
randSeed: 697351296
|
randSeed: 703952078
|
||||||
isDoingTransition: 0
|
isDoingTransition: 0
|
||||||
minimumHeight: 0
|
minimumHeight: 0
|
||||||
--- !u!114 &1820978574
|
--- !u!114 &1820978574
|
||||||
|
@ -93092,7 +93092,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: -948, y: 10}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &6368481658076565719
|
--- !u!114 &6368481658076565719
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -95520,7 +95520,7 @@ RectTransform:
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 20, y: 20}
|
m_SizeDelta: {x: 20, y: 20}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
@ -96016,9 +96016,9 @@ RectTransform:
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: -7, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &6368481659665436127
|
--- !u!114 &6368481659665436127
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
|
@ -247,22 +247,22 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
|
||||||
InterferingFrequency += "UHF"+"," ;
|
InterferingFrequency += "UHF"+"," ;
|
||||||
break;
|
break;
|
||||||
case "1":
|
case "1":
|
||||||
InterferingFrequency = "L"+",";
|
InterferingFrequency += "L"+",";
|
||||||
break;
|
break;
|
||||||
case "2":
|
case "2":
|
||||||
InterferingFrequency = "S"+",";
|
InterferingFrequency += "S"+",";
|
||||||
break;
|
break;
|
||||||
case "3":
|
case "3":
|
||||||
InterferingFrequency = "C"+",";
|
InterferingFrequency += "C"+",";
|
||||||
break;
|
break;
|
||||||
case "4":
|
case "4":
|
||||||
InterferingFrequency = "X"+",";
|
InterferingFrequency += "X"+",";
|
||||||
break;
|
break;
|
||||||
case "5":
|
case "5":
|
||||||
InterferingFrequency = "Ku"+",";
|
InterferingFrequency += "Ku"+",";
|
||||||
break;
|
break;
|
||||||
case "6":
|
case "6":
|
||||||
InterferingFrequency = "Ka" + ",";
|
InterferingFrequency += "Ka" + ",";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -418,28 +418,28 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
||||||
{
|
{
|
||||||
for (int j = 0; j < str.Length; j++)
|
for (int j = 0; j < str.Length; j++)
|
||||||
{
|
{
|
||||||
switch (str[i])
|
switch (str[j])
|
||||||
{
|
{
|
||||||
case "0":
|
case "0":
|
||||||
dataLinkCommunicationFrequency += "UHF" + ",";
|
dataLinkCommunicationFrequency += "UHF" + ",";
|
||||||
break;
|
break;
|
||||||
case "1":
|
case "1":
|
||||||
dataLinkCommunicationFrequency = "L" + ",";
|
dataLinkCommunicationFrequency += "L" + ",";
|
||||||
break;
|
break;
|
||||||
case "2":
|
case "2":
|
||||||
dataLinkCommunicationFrequency = "S" + ",";
|
dataLinkCommunicationFrequency += "S" + ",";
|
||||||
break;
|
break;
|
||||||
case "3":
|
case "3":
|
||||||
dataLinkCommunicationFrequency = "C" + ",";
|
dataLinkCommunicationFrequency += "C" + ",";
|
||||||
break;
|
break;
|
||||||
case "4":
|
case "4":
|
||||||
dataLinkCommunicationFrequency = "X" + ",";
|
dataLinkCommunicationFrequency += "X" + ",";
|
||||||
break;
|
break;
|
||||||
case "5":
|
case "5":
|
||||||
dataLinkCommunicationFrequency = "Ku" + ",";
|
dataLinkCommunicationFrequency += "Ku" + ",";
|
||||||
break;
|
break;
|
||||||
case "6":
|
case "6":
|
||||||
dataLinkCommunicationFrequency = "Ka" + ",";
|
dataLinkCommunicationFrequency += "Ka" + ",";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -447,50 +447,35 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
//dataLinkCommunicationFrequency = weaponitemone[i].para_value;
|
|
||||||
//switch (weaponitemone[i].para_value)
|
|
||||||
//{
|
|
||||||
// case "0":
|
|
||||||
// dataLinkCommunicationFrequency = "2GHz";
|
|
||||||
// break;
|
|
||||||
// case "1":
|
|
||||||
// dataLinkCommunicationFrequency = "4GHz";
|
|
||||||
// break;
|
|
||||||
// case "2":
|
|
||||||
// dataLinkCommunicationFrequency = "5GHz";
|
|
||||||
// break;
|
|
||||||
// default:
|
|
||||||
// break;
|
|
||||||
//}
|
|
||||||
//break;
|
|
||||||
case "电子侦察能力:":
|
case "电子侦察能力:":
|
||||||
string[] str1 = weaponitemone[i].para_value.Split(',');
|
string[] str1 = weaponitemone[i].para_value.Split(',');
|
||||||
if (str1.Length > 0)
|
if (str1.Length > 0)
|
||||||
{
|
{
|
||||||
for (int j = 0; j < str1.Length; j++)
|
for (int j = 0; j < str1.Length; j++)
|
||||||
{
|
{
|
||||||
switch (str1[i])
|
switch (str1[j])
|
||||||
{
|
{
|
||||||
case "0":
|
case "0":
|
||||||
electronicReconnaissanceCapability += "UHF" + ",";
|
electronicReconnaissanceCapability += "UHF" + ",";
|
||||||
break;
|
break;
|
||||||
case "1":
|
case "1":
|
||||||
electronicReconnaissanceCapability = "L" + ",";
|
electronicReconnaissanceCapability += "L" + ",";
|
||||||
break;
|
break;
|
||||||
case "2":
|
case "2":
|
||||||
electronicReconnaissanceCapability = "S" + ",";
|
electronicReconnaissanceCapability += "S" + ",";
|
||||||
break;
|
break;
|
||||||
case "3":
|
case "3":
|
||||||
electronicReconnaissanceCapability = "C" + ",";
|
electronicReconnaissanceCapability += "C" + ",";
|
||||||
break;
|
break;
|
||||||
case "4":
|
case "4":
|
||||||
electronicReconnaissanceCapability = "X" + ",";
|
electronicReconnaissanceCapability += "X" + ",";
|
||||||
break;
|
break;
|
||||||
case "5":
|
case "5":
|
||||||
electronicReconnaissanceCapability = "Ku" + ",";
|
electronicReconnaissanceCapability += "Ku" + ",";
|
||||||
break;
|
break;
|
||||||
case "6":
|
case "6":
|
||||||
electronicReconnaissanceCapability = "Ka" + ",";
|
electronicReconnaissanceCapability += "Ka" + ",";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue