This commit is contained in:
commit
bf92e54eb4
File diff suppressed because it is too large
Load Diff
|
@ -38,7 +38,7 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 1113159741}
|
||||
m_IndirectSpecularColor: {r: 0.16206118, g: 0.30587417, b: 0.6695679, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.16836876, g: 0.30755776, b: 0.636711, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
@ -39281,6 +39281,84 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 649046388}
|
||||
m_Mesh: {fileID: 4300000, guid: 2cb698e6b09f9f24a8d060a25497d80d, type: 3}
|
||||
--- !u!1 &658851277
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 658851278}
|
||||
- component: {fileID: 658851280}
|
||||
- component: {fileID: 658851279}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &658851278
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 658851277}
|
||||
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: 1142526260}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &658851279
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 658851277}
|
||||
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: 1, g: 1, b: 1, 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: 18
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u98DE\u884C\u901F\u5EA6"
|
||||
--- !u!222 &658851280
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 658851277}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &664092983
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -39870,6 +39948,11 @@ PrefabInstance:
|
|||
propertyPath: m_ChildForceExpandHeight
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7828191146020959853, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
|
||||
type: 3}
|
||||
propertyPath: flySpeed
|
||||
value:
|
||||
objectReference: {fileID: 1142526261}
|
||||
- target: {fileID: 7828191146970283773, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
|
@ -50358,6 +50441,125 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 35.834, y: -82.704, z: -37.546}
|
||||
--- !u!1 &1142526259
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1142526260}
|
||||
- component: {fileID: 1142526263}
|
||||
- component: {fileID: 1142526262}
|
||||
- component: {fileID: 1142526261}
|
||||
m_Layer: 5
|
||||
m_Name: "\u98DE\u884C\u901F\u5EA6"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1142526260
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1142526259}
|
||||
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:
|
||||
- {fileID: 658851278}
|
||||
m_Father: {fileID: 729007801}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1142526261
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1142526259}
|
||||
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: 1142526262}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1142526262
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1142526259}
|
||||
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: c4d733662388d564a94ca63ea626dd60, 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!222 &1142526263
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1142526259}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1165328046
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -70094,7 +70296,7 @@ MonoBehaviour:
|
|||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
randSeed: 90461718
|
||||
randSeed: 253161843
|
||||
isDoingTransition: 0
|
||||
minimumHeight: 0
|
||||
--- !u!114 &1820978574
|
||||
|
|
Binary file not shown.
|
@ -229,6 +229,17 @@ public class DeviceManager : MonoSingleton<DeviceManager>
|
|||
}
|
||||
}
|
||||
}
|
||||
else if(info[0] == "FlySpeed")
|
||||
{
|
||||
if (info[1] == "WRJ")
|
||||
{
|
||||
UnmannedAerialVehicleManage unmannedAerialVehicleManage = UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Find(x => x.equipmentCommon.deviceID == info[2]);
|
||||
if (unmannedAerialVehicleManage)
|
||||
{
|
||||
unmannedAerialVehicleManage.GetFlySpeedFormOther(info[3]);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]);
|
||||
|
|
|
@ -166,6 +166,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
/// 侦察频段设置面板
|
||||
/// </summary>
|
||||
public GameObject SurveillanceFrequencyBand;
|
||||
/// <summary>
|
||||
/// 飞行速度设置面板
|
||||
/// </summary>
|
||||
public GameObject flySpeedPlane;
|
||||
/// <summary>
|
||||
/// 速度调节滑动条
|
||||
/// </summary>
|
||||
public ExtendedSlider flySpeedSlider;
|
||||
|
||||
/// <summary>
|
||||
/// 显示频谱地图上的位置
|
||||
|
@ -211,7 +219,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
{
|
||||
toggle.onValueChanged.AddListener(delegate { SurveillanceFrequencyBandsValueChanged(toggle); });
|
||||
}
|
||||
|
||||
flySpeedSlider.DragStop.AddListener(ChanagerFlySpeed);
|
||||
}
|
||||
|
||||
private void Mapdisplay()
|
||||
|
@ -243,9 +251,6 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
equipmentCommon.SetDatabaseInfo("bdxx", index.ToString());
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 频段设置
|
||||
/// </summary>
|
||||
|
@ -264,16 +269,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
//MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 接受同步消息
|
||||
/// </summary>
|
||||
/// <param name="_frequency"></param>
|
||||
public void FrequencyGamepos(string _frequency)
|
||||
{
|
||||
int layerValue = LayerMask.NameToLayer(_frequency);
|
||||
dataLinkCommunicationFrequency = _frequency;
|
||||
gamePos.layer = layerValue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
@ -305,6 +301,24 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
dzWRJCamera.cullingMask = 1 << layerValue;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 接受同步消息
|
||||
/// </summary>
|
||||
/// <param name="_frequency"></param>
|
||||
public void FrequencyGamepos(string _frequency)
|
||||
{
|
||||
int layerValue = LayerMask.NameToLayer(_frequency);
|
||||
dataLinkCommunicationFrequency = _frequency;
|
||||
gamePos.layer = layerValue;
|
||||
}
|
||||
/// <summary>
|
||||
/// 接受同步消息
|
||||
/// </summary>
|
||||
public void GetFlySpeedFormOther(string flySpeed)
|
||||
{
|
||||
maximumFlyingSpeed = flySpeed;
|
||||
}
|
||||
|
||||
[ContextMenu("Test")]
|
||||
public void Test()
|
||||
{
|
||||
|
@ -357,10 +371,6 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
|
||||
if (Spectrumdetection.Radius > 0 && boisp)
|
||||
{
|
||||
//if (gxWRJCamera && dzWRJCamera)
|
||||
//{
|
||||
// //gxWRJCamera.orthographicSize = Spectrumdetection.Radius * 1000;
|
||||
|
||||
switch (Spectrumdetection.Radius)
|
||||
{
|
||||
case 1:
|
||||
|
@ -391,32 +401,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
//Judgingdistance();
|
||||
}
|
||||
|
||||
//private void Judgingdistance()
|
||||
//{
|
||||
// RaycastHit hit;
|
||||
// //Debug.LogError("调用了");
|
||||
// if (Physics.Raycast(transform.position, Vector3.down, out hit))
|
||||
// {
|
||||
// Debug.Log(hit.distance);
|
||||
// if (hit.distance <= 1f)
|
||||
// {
|
||||
// if (gamemap && gamePos)
|
||||
// {
|
||||
// gamePos.gameObject.SetActive(false);
|
||||
// gamemap.gameObject.SetActive(false);
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// if (gamemap && gamePos)
|
||||
// {
|
||||
// gamePos.gameObject.SetActive(true);
|
||||
// gamemap.gameObject.SetActive(true);
|
||||
// }
|
||||
// }
|
||||
|
||||
// }
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
///上传日志
|
||||
|
@ -659,7 +644,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
break;
|
||||
case "最大飞行速度:":
|
||||
maximumFlyingSpeed = weaponitemone[i].para_value;
|
||||
|
||||
flySpeedSlider.maxValue = float.Parse(maximumFlyingSpeed);
|
||||
break;
|
||||
case "RCS:":
|
||||
RCS = weaponitemone[i].para_value;
|
||||
|
@ -889,6 +874,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
}
|
||||
}
|
||||
|
||||
public void ChanagerFlySpeed(float speed)
|
||||
{
|
||||
maximumFlyingSpeed = speed.ToString();
|
||||
string nowData = string.Format("{0},{1},{2},{3}", "FlySpeed", "WRJ", equipmentCommon.deviceID, electronicReconnaissanceCapability);
|
||||
MyNetMQClient.instance.Send(maximumFlyingSpeed);
|
||||
equipmentCommon.SetDatabaseInfo("r4", maximumFlyingSpeed);
|
||||
}
|
||||
|
||||
public string WRJName;
|
||||
/// <summary>
|
||||
/// 单个无人机数据写入
|
||||
|
|
|
@ -35,6 +35,10 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
|
|||
/// 侦测频段设置
|
||||
/// </summary>
|
||||
public Button btnSurveillanceFrequencyBand;
|
||||
/// <summary>
|
||||
/// 飞行速度
|
||||
/// </summary>
|
||||
public Button flySpeed;
|
||||
|
||||
|
||||
public void Awake()
|
||||
|
@ -61,6 +65,14 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
|
|||
unmannedAerialVehicleManage.SurveillanceFrequencyBand.SetActive(true);
|
||||
}
|
||||
});
|
||||
flySpeed.onClick.AddListener(() =>
|
||||
{
|
||||
if (unmannedAerialVehicleManage)
|
||||
{
|
||||
GameManager.Instance.GetWRJParameter();
|
||||
unmannedAerialVehicleManage.flySpeedPlane.SetActive(true);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in New Issue