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-29 10:25:00 +08:00
parent b861ac2372 378161ebec
commit ac20a2451b
12 changed files with 962664 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Assets/Material/bule.mat Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bule
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Material/bule.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ad9b6f211aa7f56408a0fc152bd1acde
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Resources/model/重点攻击目标1.prefab
View File

@ -322,7 +322,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2}
- {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

2
Assets/Resources/model/重点攻击目标2.prefab
View File

@ -1891,7 +1891,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2}
- {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

2
Assets/Resources/model/重点攻击目标3.prefab
View File

@ -247,7 +247,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2}
- {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

28
Assets/Temp/Scripts/Spectrumdetection.cs
View File

@ -1,11 +1,11 @@
using AdamThinkDevicesData;
using Newtonsoft.Json;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using static InterfaceManager;
/// <summary>
/// 频谱探测
/// </summary>
@ -193,8 +193,32 @@ public class Spectrumdetection : MonoBehaviour
/// <returns></returns>
protected string GetSyncDataThree()
{
UploadLog();
return string.Format("{0},{1},{2},{3}", "SweepFrequencyBand", "PPTC", equipmentCommon.deviceID, Frequency);
}
/// <summary>
///上传日志
/// </summary>
/// <param name="deviceID"></param>
public void UploadLog()
{
string currentTime = System.DateTime.Now.ToString();
List<UploadLogMain> uploadLogMains = new List<UploadLogMain>();
UploadLogMain uploadLogMain = new UploadLogMain();
uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID;
uploadLogMain.ThinkId = GlobalFlag.currentThinkId;
string log = currentTime + " " + transform.name + "(" + equipmentCommon.deviceID + ")频段设置为" + Frequency;
uploadLogMain.log = log;
uploadLogMains.Add(uploadLogMain);
string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains);
WWWForm wWWForm = new WWWForm();
wWWForm.AddField("data", uploadLogMainJson);
StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data =>
{
//Debug.Log(data);
}));
}
/// <summary>
/// 演习是否启动
/// </summary>

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

File diff suppressed because it is too large Load Diff

29
Assets/Zion/Scripts/HighPriorityTarget.cs
View File

@ -1,11 +1,12 @@
using AdamSync;
using AdamThinkDevicesData;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Security.Permissions;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using static InterfaceManager;
/// <summary>
/// 重点保护目标
/// </summary>
@ -246,6 +247,30 @@ public class HighPriorityTarget : MonoBehaviour
/// <returns></returns>
protected string GetSyncDataTwo()
{
UploadLog();
return string.Format("{0},{1},{2},{3}", "BandSetting", "ZYMB", Number, frequency);
}
/// <summary>
///上传日志
/// </summary>
/// <param name="deviceID"></param>
public void UploadLog()
{
string currentTime = System.DateTime.Now.ToString();
List<UploadLogMain> uploadLogMains = new List<UploadLogMain>();
UploadLogMain uploadLogMain = new UploadLogMain();
uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID;
uploadLogMain.ThinkId = GlobalFlag.currentThinkId;
string log = currentTime + " " + "重要用户(" + Number + ")频段设置为" + frequency;
uploadLogMain.log = log;
uploadLogMains.Add(uploadLogMain);
string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains);
WWWForm wWWForm = new WWWForm();
wWWForm.AddField("data", uploadLogMainJson);
StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data =>
{
//Debug.Log(data);
}));
}
}

2
Assets/Zion/Scripts/InterfaceManager.cs
View File

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

1
Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
View File

@ -218,7 +218,6 @@ public class EquipmentCommon : MonoBehaviour
string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains);
WWWForm wWWForm = new WWWForm();
wWWForm.AddField("data", uploadLogMainJson);
//Debug.Log(uploadLogMainJson);
StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data =>
{
//Debug.Log(data);

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

@ -221,7 +221,7 @@ public class RadarManger : MonoBehaviour
{
case "转台转速:":
TurntableSpeed = weaponitemone[i].para_value;
RadarRotationSpeed(TurntableSpeed);
//RadarRotationSpeed(TurntableSpeed);
break;
case "探测距离:":
DetectionRange = weaponitemone[i].para_value;

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

@ -372,9 +372,15 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
List<Collider> allColliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体
for (int i = 0; i < allColliders.Count; i++)
{
if (allColliders[i].gameObject.tag == "AttackTarget" && !allColliders[i].isTrigger
&& !attackColliders1.Contains(allColliders[i]) && allColliders[i].transform.GetComponent<HighPriorityTarget>())
if (allColliders[i].gameObject.tag == "AttackTarget"
&& !allColliders[i].isTrigger
&& !attackColliders1.Contains(allColliders[i])
&& allColliders[i].transform.GetComponent<HighPriorityTarget>()
&& allColliders[i].transform.GetComponent<HighPriorityTarget>().frequency== electronicReconnaissanceCapability)
{
attackColliders1.Add(allColliders[i]);
}
}
}
else if(wrjModel == WRJModel.光学无人机)
@ -449,16 +455,39 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
/// <returns></returns>
protected string GetSyncDataTwo()
{
UploadLog("频段设置为:", dataLinkCommunicationFrequency);
return string.Format("{0},{1},{2},{3}", "BandSetting", "WRJ", equipmentCommon.deviceID, dataLinkCommunicationFrequency);
}
/// <summary>
///上传日志
/// </summary>
/// <param name="deviceID"></param>
public void UploadLog(string str1,string str2)
{
string currentTime = System.DateTime.Now.ToString();
List<UploadLogMain> uploadLogMains = new List<UploadLogMain>();
UploadLogMain uploadLogMain = new UploadLogMain();
uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID;
uploadLogMain.ThinkId = GlobalFlag.currentThinkId;
string log = currentTime + " " + transform.name+"(" + equipmentCommon.deviceID + ")"+ str1 + str2;
uploadLogMain.log = log;
uploadLogMains.Add(uploadLogMain);
string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains);
WWWForm wWWForm = new WWWForm();
wWWForm.AddField("data", uploadLogMainJson);
StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data =>
{
//Debug.Log(data);
}));
}
/// <summary>
/// 设置扫描频段同步
/// </summary>
/// <returns></returns>
protected string GetSyncDataThree()
{
return string.Format("{0},{1},{2},{3}", "SweepFrequencyBand", "WRJ", equipmentCommon.deviceID, dataLinkCommunicationFrequency);
UploadLog("扫描频段设置为:", electronicReconnaissanceCapability);
return string.Format("{0},{1},{2},{3}", "SweepFrequencyBand", "WRJ", equipmentCommon.deviceID, electronicReconnaissanceCapability);
}
#region 启动暂停
/// <summary>