This commit is contained in:
YangHua 2024-02-06 14:55:24 +08:00
parent 9afdd9b4f5
commit 465d55cbe6
8 changed files with 31 additions and 112 deletions

View File

@ -2726,7 +2726,7 @@ GameObject:
- component: {fileID: 1014353712495964052} - component: {fileID: 1014353712495964052}
m_Layer: 5 m_Layer: 5
m_Name: Canvas m_Name: Canvas
m_TagString: Untagged m_TagString: Importance
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

View File

@ -281,7 +281,7 @@ GameObject:
- component: {fileID: 1422880735768166433} - component: {fileID: 1422880735768166433}
m_Layer: 5 m_Layer: 5
m_Name: Canvas m_Name: Canvas
m_TagString: Untagged m_TagString: Importance
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

View File

@ -2513,7 +2513,7 @@ GameObject:
- component: {fileID: 4013790001393954177} - component: {fileID: 4013790001393954177}
m_Layer: 5 m_Layer: 5
m_Name: Canvas m_Name: Canvas
m_TagString: Untagged m_TagString: Importance
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

View File

@ -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.16234729, g: 0.30613518, b: 0.6690394, a: 1} m_IndirectSpecularColor: {r: 0.16231087, g: 0.30614385, b: 0.66932905, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -6834,7 +6834,7 @@ GameObject:
- component: {fileID: 147647013} - component: {fileID: 147647013}
- component: {fileID: 147647014} - component: {fileID: 147647014}
m_Layer: 5 m_Layer: 5
m_Name: Canvas m_Name: MianCanvas
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -54101,7 +54101,6 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
deviceimages1: [] deviceimages1: []
devices: [] devices: []
modellist: []
--- !u!114 &1436809535 --- !u!114 &1436809535
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -69825,7 +69824,7 @@ MonoBehaviour:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
randSeed: 4767687 randSeed: 753053593
isDoingTransition: 0 isDoingTransition: 0
minimumHeight: 0 minimumHeight: 0
--- !u!114 &1820978574 --- !u!114 &1820978574

View File

@ -20,9 +20,9 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
public Mastermanagement mastermanagement; public Mastermanagement mastermanagement;
void Start() void Awake()
{ {
mastermanagement = GameObject.Find("Canvas").GetComponent<Mastermanagement>(); mastermanagement = GameObject.Find("MianCanvas").GetComponent<Mastermanagement>();
} }
public void OnBeginDrag(PointerEventData eventData) public void OnBeginDrag(PointerEventData eventData)
{ {

View File

@ -60,7 +60,7 @@ public class HighPriorityTarget : MonoBehaviour
/// <summary> /// <summary>
/// 频率选择 /// 频率选择
/// </summary> /// </summary>
public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7; //public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7;
/// <summary> /// <summary>
/// 频段设置 /// 频段设置
/// </summary> /// </summary>
@ -104,88 +104,7 @@ public class HighPriorityTarget : MonoBehaviour
MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData);
} }
} }
/*
private void Interferencefrequency()
{
toggle1.onValueChanged.AddListener((ison) =>
{
if (ison)
{
frequency = "UHF";
gamepos.layer = 16;
string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData);
}
});
toggle2.onValueChanged.AddListener((ison) =>
{
if (ison)
{
frequency = "L";
gamepos.layer = 17;
string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData);
}
});
toggle3.onValueChanged.AddListener((ison) =>
{
if (ison)
{
frequency = "S";
gamepos.layer = 18;
string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData);
}
});
toggle4.onValueChanged.AddListener((ison) =>
{
if (ison)
{
frequency = "C";
gamepos.layer = 19;
string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData);
}
});
toggle5.onValueChanged.AddListener((ison) =>
{
if (ison)
{
frequency = "X";
gamepos.layer = 20;
string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData);
}
});
toggle6.onValueChanged.AddListener((ison) =>
{
if (ison)
{
frequency = "Ku";
gamepos.layer = 21;
string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData);
}
});
toggle7.onValueChanged.AddListener((ison) =>
{
if (ison)
{
frequency = "Ka";
gamepos.layer = 22;
string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData);
}
});
}
*/
public void FrequencyGamepos(string _frequency) public void FrequencyGamepos(string _frequency)
{ {
int layerValue = LayerMask.NameToLayer(_frequency); int layerValue = LayerMask.NameToLayer(_frequency);

View File

@ -8,8 +8,8 @@ using static InterfaceManager;
using System; using System;
using UnityEngine.UI; using UnityEngine.UI;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
/* /*
线 线
@ -194,7 +194,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
private void disturb1() private void disturb1()
{ {
if (InterferingFrequency1.Length>0) if (InterferingFrequency1.Length > 0)
{ {
string[] str = InterferingFrequency1.Split(','); string[] str = InterferingFrequency1.Split(',');
for (int i = 0; i < str.Length; i++) for (int i = 0; i < str.Length; i++)
@ -206,7 +206,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
break; break;
case "L": case "L":
toggle2.gameObject.SetActive(true); toggle2.gameObject.SetActive(true);
break ; break;
case "S": case "S":
toggle3.gameObject.SetActive(true); toggle3.gameObject.SetActive(true);
break; break;
@ -241,10 +241,10 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
//Interferencemode(); //Interferencemode();
//Angularrange(); //Angularrange();
} }
public GraphicRaycaster RaycastInCanvas; public GraphicRaycaster RaycastInCanvas;
#region #region
@ -314,36 +314,36 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
/// <param name="weaponitemone"></param> /// <param name="weaponitemone"></param>
public void FillInTheData(List<List_paraItem> weaponitemone) public void FillInTheData(List<List_paraItem> weaponitemone)
{ {
for (int i = 0; i < weaponitemone.Count; i++) for (int i = 0; i < weaponitemone.Count; i++)
{ {
switch (weaponitemone[i].para_name) switch (weaponitemone[i].para_name)
{ {
case "干扰频率:": case "干扰频率:":
string[] str = weaponitemone[i].para_value.Split(','); string[] str = weaponitemone[i].para_value.Split(',');
if (str.Length>0) if (str.Length > 0)
{ {
for (int j = 0; j < str.Length; j++) for (int j = 0; j < str.Length; j++)
{ {
switch (str[j]) switch (str[j])
{ {
case "0": case "0":
InterferingFrequency1 += "UHF"+"," ; InterferingFrequency1 += "UHF" + ",";
break; break;
case "1": case "1":
InterferingFrequency1 += "L"+","; InterferingFrequency1 += "L" + ",";
break; break;
case "2": case "2":
InterferingFrequency1 += "S"+","; InterferingFrequency1 += "S" + ",";
break; break;
case "3": case "3":
InterferingFrequency1 += "C"+","; InterferingFrequency1 += "C" + ",";
break; break;
case "4": case "4":
InterferingFrequency1 += "X"+","; InterferingFrequency1 += "X" + ",";
break; break;
case "5": case "5":
InterferingFrequency1 += "Ku"+","; InterferingFrequency1 += "Ku" + ",";
break; break;
case "6": case "6":
InterferingFrequency1 += "Ka" + ","; InterferingFrequency1 += "Ka" + ",";
@ -353,7 +353,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
} }
} }
} }
//interval= float.Parse(InterferingFrequency); //interval= float.Parse(InterferingFrequency);
break; break;
case "干扰模式:": case "干扰模式:":
@ -456,7 +456,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
{ {
if (colliders[i].transform.tag == "WRJ") if (colliders[i].transform.tag == "WRJ")
{ {
UnmannedAerialVehicleManage unmannedAerialVehicleManage = colliders[i].GetComponent<UnmannedAerialVehicleManage>(); UnmannedAerialVehicleManage unmannedAerialVehicleManage = colliders[i].GetComponent<UnmannedAerialVehicleManage>();
//Debug.Log("检测到无人机: " + col.name); //Debug.Log("检测到无人机: " + col.name);
UnmannedAerialVehicle unmannedAerialVehicle = colliders[i].GetComponent<UnmannedAerialVehicle>(); UnmannedAerialVehicle unmannedAerialVehicle = colliders[i].GetComponent<UnmannedAerialVehicle>();
@ -475,7 +475,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
{ {
WRJs.Enqueue(unmannedAerialVehicleManage.transform); WRJs.Enqueue(unmannedAerialVehicleManage.transform);
} }
} }
} }
@ -501,7 +501,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
} }
} }
/// <summary> /// <summary>
///上传日志 ///上传日志
@ -526,7 +526,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
})); }));
} }
private void OnDestroy() private void OnDestroy()
{ {

View File

@ -9,6 +9,7 @@ TagManager:
- AttackTarget - AttackTarget
- WRJ1 - WRJ1
- AttackTarget1 - AttackTarget1
- Importance
layers: layers:
- Default - Default
- TransparentFX - TransparentFX