From eaba517950d54ad20aac189548963dcb95a081b0 Mon Sep 17 00:00:00 2001
From: yulong <1838206582@qq.com>
Date: Sat, 13 Jan 2024 09:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Temp/Scripts/Spectrumdetection.cs | 6 +--
.../Scenes/Contingenc_yediting_panl.unity | 4 +-
Assets/Zion/Scripts/Adam/GameManager.cs | 2 +
.../Scripts/ModelFunction/EquipmentCommon.cs | 1 +
.../LaserFireControlPlatformManger.cs | 39 ++++++++++++++-----
.../UAV/UnmannedAerialVehicleManage.cs | 7 ++--
6 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs
index 0df29598..71056403 100644
--- a/Assets/Temp/Scripts/Spectrumdetection.cs
+++ b/Assets/Temp/Scripts/Spectrumdetection.cs
@@ -120,10 +120,10 @@ public class Spectrumdetection : MonoBehaviour
{
if (colliders[i].transform.gameObject.tag=="WRJ")
{
- UnmannedAerialVehicleManage unmannedAerialVehicleManage = null;
- if (colliders[i].GetComponent<UnmannedAerialVehicleManage>())
+ UnmannedAerialVehicle unmannedAerialVehicle = null;
+ if (colliders[i].GetComponent<UnmannedAerialVehicle>())
{
- unmannedAerialVehicleManage = colliders[i].GetComponent<UnmannedAerialVehicleManage>();
+ unmannedAerialVehicle = colliders[i].GetComponent<UnmannedAerialVehicle>();
}
diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity
index 0b83037a..cb38dd40 100644
--- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity
+++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity
@@ -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.1652264, g: 0.30731973, b: 0.6559837, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -106474,7 +106474,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- randSeed: -2003133703
+ randSeed: -1799708578
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs
index d775bac7..e5a4eca7 100644
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@@ -208,11 +208,13 @@ public class GameManager : MonoSingleton<GameManager>
//0 red 1 blue
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
{
+ spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
spt.gameObject.transform.position = redSpawnPos.position;
spt.gameObject.transform.eulerAngles = redSpawnPos.eulerAngles;
}
else
{
+ spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
spt.gameObject.transform.position = blueSpawnPos.position;
spt.gameObject.transform.eulerAngles = blueSpawnPos.eulerAngles;
}
diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
index bc46ad31..d51c089c 100644
--- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
+++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
@@ -162,6 +162,7 @@ public class EquipmentCommon : MonoBehaviour
case "蜂群无人机":
UnmannedAerialVehicleManage unmannedAerialVehicleManage = GetComponent<UnmannedAerialVehicleManage>();
unmannedAerialVehicleManage.FillInTheData(weaponitemone);
+ unmannedAerialVehicleManage.MatrixFormation(30, 1);
break;
case "频谱探测":
Spectrumdetection spectrumdetection = GetComponent<Spectrumdetection>();
diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
index 385c868c..10f4cd3f 100644
--- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
+++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
@@ -9,6 +9,7 @@ using static InterfaceManager;
using DG.Tweening.Core.Easing;
using UnityEngine.EventSystems;
using System;
+using Random = UnityEngine.Random;
/// <summary>
/// 激光火控平台
@@ -309,13 +310,26 @@ public class LaserFireControlPlatformManger : MonoBehaviour
if (Receivingposin==null)
{
- Receivingposin = unmannedAerialVehicle.transform;
- Debug.LogError("接收无人机的位置" + Receivingposin.position);
- var nowData = GetSyncData();
- _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
- isLasings = true;
- CastRayAndRender();
- break;
+ //if (Random.value>0.5f)
+ //{
+ Receivingposin = unmannedAerialVehicle.transform;
+ Debug.LogError("接收无人机的位置" + Receivingposin.position);
+ var nowData = GetSyncData();
+ _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
+ isLasings = true;
+ CastRayAndRender();
+ break;
+ //}
+ //else
+ //{
+ // Receivingposin = unmannedAerialVehicle.transform;
+ // var nowData1= GetSyncData1();
+ // _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData1));
+ // isLasings = true;
+ // CastRayAndRender1();
+ // break;
+
+ //}
}
}
}
@@ -324,6 +338,11 @@ public class LaserFireControlPlatformManger : MonoBehaviour
}
}
+ private string GetSyncData1()
+ {
+ return string.Format("{0},{1},{2},{3}" + equipmentCommon.deviceID, Receivingposin.position.x+3,Receivingposin.position.y+3,Receivingposin.position.z);
+ }
+
/// <summary>
/// 看向无人机
@@ -399,7 +418,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour
{
targetPoint.position = new Vector3(targetPoint.position.x + 5, targetPoint.position.y, transform.position.z);
LaserModer.transform.DOLookAt(targetPoint.position, 0.5f);
- CastRayAndRender1();
+ //CastRayAndRender1();
}
}
/// <summary>
@@ -421,12 +440,12 @@ public class LaserFireControlPlatformManger : MonoBehaviour
if (InnerLaserlineRenderer)
{
InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置
- InnerLaserlineRenderer.SetPosition(1, targetPoint.position); // 设置线段终点为目标点
+ InnerLaserlineRenderer.SetPosition(1, Receivingposin.position); // 设置线段终点为目标点
}
if (OuterLaserlineRenderer)
{
InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置
- InnerLaserlineRenderer.SetPosition(1, targetPoint.position); // 设置线段终点为目标点
+ InnerLaserlineRenderer.SetPosition(1, Receivingposin.position); // 设置线段终点为目标点
}
StartCoroutine(LaserExtinction());
}
diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
index 8c87c4e8..bc49b519 100644
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
@@ -130,6 +130,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
// Start is called before the first frame update
void Start()
{
+ MatrixFormation(30, 1);
for (int i = 0; i < unmannedAerialVehicles.Count; i++)
{
unmannedAerialVehicles[i].serialNumber = (i + 1).ToString();
@@ -248,7 +249,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
for (int i = 0; i < colliders.Count; i++)
{
if (colliders[i].transform.tag == "AttackTarget")
- colliders1.Add(colliders[i]);
+ colliders1.Add(colliders[i]);
}
if (colliders1.Count > 0)
{
@@ -473,7 +474,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
}
-
+
/// <summary>
/// 无人机雁式阵型
@@ -550,7 +551,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
/// <summary>
/// 根据想定数据去设置无人机数量
/// </summary>
- private void MatrixFormation(int rows, int wrjCount)
+ public void MatrixFormation(int rows, int wrjCount)
{
for (int i = 0; i < unmannedAerialVehicles.Count; i++)
{