yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

This commit is contained in:
YangHua 2024-01-08 11:20:53 +08:00
parent a638adf37f ac0f762b43
commit bd633a2f00
12 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/GameAssets/Renderer/Minimap.prefab
View File

@ -185,7 +185,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
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_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

8
Assets/Resources/UIPanel/frequencypanl.prefab
View File

@ -797,11 +797,11 @@ MonoBehaviour:
m_Value: 0
m_Options:
m_Options:
- m_Text: 1227.60 MHz
- m_Text: 1227.60MHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
- m_Text: 1381.05 MHz
- m_Text: 1381.05MHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
- m_Text: 1575.42 MHz
- m_Text: 1575.42MHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
- m_Text: 2GHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
@ -890,7 +890,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1227.60 MHz
m_Text: 1227.60MHz
--- !u!1 &1649737330324479757
GameObject:
m_ObjectHideFlags: 0

2
Assets/StreamingAssets/IPPort.txt
View File

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

2
Assets/StreamingAssets/confing.txt
View File

@ -1 +1 @@
172.16.1.41
192.168.138.15

11
Assets/Temp/Scripts/Conversionfrequency.cs
View File

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

6
Assets/Temp/Scripts/Scenariopage.cs
View File

@ -1494,13 +1494,13 @@ public class Scenariopage : MonoBehaviour
switch (value)
{
case 0:
frequency_text.text = "1227.60 MHz";
frequency_text.text = "1227.60MHz";
break;
case 1:
frequency_text.text = "1381.05 MHz";
frequency_text.text = "1381.05MHz";
break;
case 2:
frequency_text.text = "1575.42 MHz";
frequency_text.text = "1575.42MHz";
break;
case 3:
frequency_text.text = "2GHz";

4
Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741}
m_IndirectSpecularColor: {r: 0.16231456, g: 0.30614573, b: 0.66931695, a: 1}
m_IndirectSpecularColor: {r: 0.165218, g: 0.3075422, b: 0.6572481, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -63100,7 +63100,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 1780006765
randSeed: 1859322953
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574

20
Assets/Zion/Scenes/Contingenc_yediting_panl.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.16521391, g: 0.30764452, b: 0.6578343, a: 1}
m_IndirectSpecularColor: {r: 0.165218, g: 0.3075422, b: 0.6572481, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -11717,7 +11717,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1227.60 MHz
m_Text: 1227.60MHz
--- !u!222 &168482738
CanvasRenderer:
m_ObjectHideFlags: 0
@ -49818,11 +49818,11 @@ MonoBehaviour:
m_Value: 0
m_Options:
m_Options:
- m_Text: 1227.60 MHz
- m_Text: 1227.60MHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
- m_Text: 1381.05 MHz
- m_Text: 1381.05MHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
- m_Text: 1575.42 MHz
- m_Text: 1575.42MHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
- m_Text: 2GHz
m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3}
@ -51166,7 +51166,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1227.60 MHz
m_Text: 1227.60MHz
--- !u!222 &638510552
CanvasRenderer:
m_ObjectHideFlags: 0
@ -79930,11 +79930,11 @@ MonoBehaviour:
m_Value: 0
m_Options:
m_Options:
- m_Text: 1227.60 MHz
- m_Text: 1227.60MHz
m_Image: {fileID: 21300000, guid: aee371e0f91624d4194218195a5abb8f, type: 3}
- m_Text: 1381.05 MHz
- m_Text: 1381.05MHz
m_Image: {fileID: 21300000, guid: aee371e0f91624d4194218195a5abb8f, type: 3}
- m_Text: 1575.42 MHz
- m_Text: 1575.42MHz
m_Image: {fileID: 21300000, guid: aee371e0f91624d4194218195a5abb8f, type: 3}
m_OnValueChanged:
m_PersistentCalls:
@ -106459,7 +106459,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 678732734
randSeed: 1860173453
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574

15
Assets/Zion/Scripts/Adam/DeviceManager.cs
View File

@ -32,7 +32,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
public event System.Action<bool> OnActivationChanged;
// Start is called before the first frame update
void Start()
{
SyncCreateRoom.send2roomRequset += GetSend2roomMsg;
@ -55,7 +55,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
public bool isOnlyOne = true;
private void Update()
{
if (send2roomStr.Count > 0&&isOnlyOne)
if (send2roomStr.Count > 0 && isOnlyOne)
{
isOnlyOne = false;
StartCoroutine(DequeueSend2roomStr());
@ -68,7 +68,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
{
_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue()));
yield return new WaitForSeconds(0.05f);
if(send2roomStr.Count==0)
if (send2roomStr.Count == 0)
isOnlyOne = true;
}
}
@ -87,10 +87,19 @@ public class DeviceManager : MonoSingleton<DeviceManager>
Debug.LogError("设备..:" + data);
string[] info = data.Split(',');
if (info.Length < 2) return;
EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]);
if (info[0] == "EditorDevice")
{
equipmentCommon.GetComponent<TerrestrialRadioInterferenceManger>().InterferingFrequency = info[2];
}
else
{
if (equipmentCommon)
{
equipmentCommon.ReceivingPositionAngle(info);
}
}
}

22
Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
View File

@ -46,11 +46,6 @@ public class RadarManger : MonoBehaviour
/// </summary>
public float interval = 5.0f;
#endregion
/// <summary>
/// 飞机不显示在小地图上
/// <summary>
public GameObject minimap;
/// <summary>
/// 雷达UI预制体
/// </summary>
@ -299,13 +294,9 @@ public class RadarManger : MonoBehaviour
Mincamera.orthographicSize = detectionRadius;
if (colliders2.Count > 0)
{
if (Random.value > (1 - float.Parse(DetectionSuccessRate)/100))
{
for (int i = 0; i < colliders2.Count; i++)
{
if (i <= NumberOfProbes)
{
if (Random.value > (1 - float.Parse(DetectionSuccessRate) / 1000))
{
UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent<UnmannedAerialVehicle>();
if (unmannedAerialVehicle)
@ -321,11 +312,8 @@ public class RadarManger : MonoBehaviour
number++;
}
}
}
else
{
minimap.GetComponent<Camera>().cullingMask = ~(1 << 15);
}
}
}
}
@ -334,7 +322,7 @@ public class RadarManger : MonoBehaviour
{
Debug.LogError("鼠标进入");
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()

2
Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
View File

@ -441,7 +441,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
/// <exception cref="NotImplementedException"></exception>
private void Angularrange()
{
Collider[] collider = Physics.OverlapSphere(transform.position, 300);
Collider[] collider = Physics.OverlapSphere(transform.position,300);
for (int i = 0; i < collider.Length; i++)
{
if (collider[i].transform.tag == "WRJ")

6
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
View File

@ -338,13 +338,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
switch (weaponitemone[i].para_value)
{
case "0":
satellitePositioningFrequency = "1227.60 MHz";
satellitePositioningFrequency = "1227.60MHz";
break;
case "1":
satellitePositioningFrequency = "1381.05 MHz";
satellitePositioningFrequency = "1381.05MHz";
break;
case "2":
satellitePositioningFrequency = "1575.42 MHz";
satellitePositioningFrequency = "1575.42MHz";
break;
default:
break;