This commit is contained in:
yulong 2024-01-04 17:37:43 +08:00
parent 705ce05d79
commit d083d913b7
8 changed files with 42 additions and 42 deletions

View File

@ -185,7 +185,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1586417955185665358} m_GameObject: {fileID: 1586417955185665358}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:

View File

@ -1 +1 @@
172.16.1.41:48888 192.168.138.15:48888

View File

@ -1 +1 @@
172.16.1.41 192.168.138.15

View File

@ -1,4 +1,5 @@
using System; using AdamSync;
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -44,9 +45,12 @@ public class Conversionfrequency : MonoBehaviour
}); });
verify_buttn.onClick.AddListener(() => verify_buttn.onClick.AddListener(() =>
{ {
Smallfrequency = dropdown.value; //Smallfrequency = dropdown.value;
terrestrialRadioInterferenceManger.Interference(Smallfrequency); terrestrialRadioInterferenceManger.InterferingFrequency= dropdown.options[dropdown.value].text;
//terrestrialRadioInterferenceManger.Interference(Smallfrequency);
transform.gameObject.SetActive(false); transform.gameObject.SetActive(false);
string msg = $"send2room EditorDevice,{terrestrialRadioInterferenceManger.equipmentCommon.deviceID},{terrestrialRadioInterferenceManger.InterferingFrequency}";
_ = SyncCreateRoom.SendMessageAsync(msg);
}); });
} }

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.16231456, g: 0.30614573, b: 0.66931695, a: 1} m_IndirectSpecularColor: {r: 0.16234905, g: 0.3061682, b: 0.669197, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -63100,7 +63100,7 @@ MonoBehaviour:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
randSeed: 1780006765 randSeed: 1793377296
isDoingTransition: 0 isDoingTransition: 0
minimumHeight: 0 minimumHeight: 0
--- !u!114 &1820978574 --- !u!114 &1820978574

View File

@ -8,7 +8,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
/// <summary> /// <summary>
/// 所有设备 /// 所有设备
/// </summary> /// </summary>
public List<EquipmentCommon> devices = new List<EquipmentCommon>(); public List<EquipmentCommon> devices = new List<EquipmentCommon>();
/// <summary> /// <summary>
/// 发送消息 /// 发送消息
/// </summary> /// </summary>
@ -55,7 +55,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
public bool isOnlyOne = true; public bool isOnlyOne = true;
private void Update() private void Update()
{ {
if (send2roomStr.Count > 0&&isOnlyOne) if (send2roomStr.Count > 0 && isOnlyOne)
{ {
isOnlyOne = false; isOnlyOne = false;
StartCoroutine(DequeueSend2roomStr()); StartCoroutine(DequeueSend2roomStr());
@ -68,7 +68,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
{ {
_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue())); _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue()));
yield return new WaitForSeconds(0.05f); yield return new WaitForSeconds(0.05f);
if(send2roomStr.Count==0) if (send2roomStr.Count == 0)
isOnlyOne = true; isOnlyOne = true;
} }
} }
@ -87,10 +87,18 @@ public class DeviceManager : MonoSingleton<DeviceManager>
Debug.LogError("设备..:" + data); Debug.LogError("设备..:" + data);
string[] info = data.Split(','); string[] info = data.Split(',');
if (info.Length < 2) return; if (info.Length < 2) return;
EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]); EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]);
if (equipmentCommon) if (info[0] == "EditorDevice")
{ {
equipmentCommon.ReceivingPositionAngle(info); equipmentCommon.GetComponent<TerrestrialRadioInterferenceManger>().InterferingFrequency = info[2];
}
else
{
if (equipmentCommon)
{
equipmentCommon.ReceivingPositionAngle(info);
}
} }
} }

View File

@ -9,7 +9,7 @@ using Newtonsoft.Json.Linq;
public static class InterfaceManager public static class InterfaceManager
{ {
private static string _IP = "172.16.1.41"; private static string _IP = "192.168.138.15";
public static string IP public static string IP
{ {
get { return _IP; } get { return _IP; }

View File

@ -46,11 +46,6 @@ public class RadarManger : MonoBehaviour
/// </summary> /// </summary>
public float interval = 5.0f; public float interval = 5.0f;
#endregion #endregion
/// <summary>
/// 飞机不显示在小地图上
/// <summary>
public GameObject minimap;
/// <summary> /// <summary>
/// 雷达UI预制体 /// 雷达UI预制体
/// </summary> /// </summary>
@ -299,33 +294,26 @@ public class RadarManger : MonoBehaviour
Mincamera.orthographicSize = detectionRadius; Mincamera.orthographicSize = detectionRadius;
if (colliders2.Count > 0) if (colliders2.Count > 0)
{ {
if (Random.value > (1 - float.Parse(DetectionSuccessRate)/100))
for (int i = 0; i < colliders2.Count; i++)
{ {
if (i <= NumberOfProbes) for (int i = 0; i < colliders2.Count; i++)
{ {
UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent<UnmannedAerialVehicle>();
if (Random.value > (1 - float.Parse(DetectionSuccessRate) / 1000)) if (unmannedAerialVehicle)
{ {
UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent<UnmannedAerialVehicle>(); LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false));
if (unmannedAerialVehicle) if (laserFireControlPlatformManger)
{ {
LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false)); laserFireControlPlatformManger.isLasing = true;
if (laserFireControlPlatformManger) Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name);
{ laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform;
laserFireControlPlatformManger.isLasing = true; laserFireControlPlatformManger.Lasing();
Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name);
laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform;
laserFireControlPlatformManger.Lasing();
}
number++;
} }
number++;
} }
} }
else
{
minimap.GetComponent<Camera>().cullingMask = ~(1 << 15);
}
} }
} }
} }
@ -334,7 +322,7 @@ public class RadarManger : MonoBehaviour
{ {
Debug.LogError("鼠标进入"); Debug.LogError("鼠标进入");
RadarUi.transform.localScale = Vector3.one; RadarUi.transform.localScale = Vector3.one;
Mincamera.transform.position = new Vector3(transform.position.x,350, transform.position.z); Mincamera.transform.position = new Vector3(transform.position.x, 350, transform.position.z);
} }
private void OnMouseExit() private void OnMouseExit()