diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat
index dc853151..3519bd27 100644
--- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat
+++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat
@@ -48,7 +48,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- - _GIntensity: 0
+ - _GIntensity: 0.1
- _Intensity: 0
- _SIntensity: 1
- _perturbation: 0.405
diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat
index 846a590c..36f8bdcf 100644
--- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat
+++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat
@@ -33,7 +33,7 @@ Material:
- _overBright: 1
m_Colors:
- _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
- - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
+ - _Color: {r: 0, g: 0, b: 0, a: 1}
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab
index a203e872..44cf1f4a 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab
@@ -3586,6 +3586,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+ type: 3}
+ propertyPath: m_TagString
+ value: Importance
+ objectReference: {fileID: 0}
- target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
index 2aca9e07..6876257b 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
@@ -19623,7 +19623,7 @@ GameObject:
- component: {fileID: 2807491000924113457}
m_Layer: 12
m_Name: Image
- m_TagString: Untagged
+ m_TagString: Radar
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
index 31d63ab4..a0d5c1c7 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
@@ -2122,6 +2122,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+ type: 3}
+ propertyPath: m_TagString
+ value: WRJParameter
+ objectReference: {fileID: 0}
- target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2791,6 +2796,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+ type: 3}
+ propertyPath: m_TagString
+ value: WRJParameter
+ objectReference: {fileID: 0}
- target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
index 2e497ec3..a4865269 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
@@ -12822,6 +12822,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6102700022742998670, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_TagString
+ value: Importance
+ objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 1076142016709017099, guid: b2cb817bb62743a4194cd9d89f07e27d, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: b2cb817bb62743a4194cd9d89f07e27d, type: 3}
diff --git a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab
index 0196d162..e47690de 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab
@@ -248,7 +248,7 @@ GameObject:
- component: {fileID: 1578225509420461004}
m_Layer: 12
m_Name: Image
- m_TagString: Untagged
+ m_TagString: Radar
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -944,6 +944,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+ type: 3}
+ propertyPath: m_TagString
+ value: Importance
+ objectReference: {fileID: 0}
- target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Resources/model/重点攻击目标1.prefab b/Assets/Resources/model/重点攻击目标1.prefab
index 82b8757f..3a94567e 100644
--- a/Assets/Resources/model/重点攻击目标1.prefab
+++ b/Assets/Resources/model/重点攻击目标1.prefab
@@ -1090,7 +1090,7 @@ GameObject:
- component: {fileID: 8686255655278623726}
m_Layer: 5
m_Name: importance
- m_TagString: Untagged
+ m_TagString: Importance
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2653,13 +2653,6 @@ MonoBehaviour:
ModerDamage: {fileID: 2840960697985760213}
regulate: {fileID: 4820533728664913016}
buttonreg: {fileID: 7363043795831063353}
- toggle1: {fileID: 78723881495536872}
- toggle2: {fileID: 3463523368336500832}
- toggle3: {fileID: 3619221509897912575}
- toggle4: {fileID: 28412645170237004}
- toggle5: {fileID: 8932471483062020681}
- toggle6: {fileID: 64890494959671527}
- toggle7: {fileID: 4401106011680143311}
togFrequencyBands:
- {fileID: 78723881495536872}
- {fileID: 3463523368336500832}
diff --git a/Assets/Resources/model/重点攻击目标2.prefab b/Assets/Resources/model/重点攻击目标2.prefab
index 12316fcc..e104568f 100644
--- a/Assets/Resources/model/重点攻击目标2.prefab
+++ b/Assets/Resources/model/重点攻击目标2.prefab
@@ -770,7 +770,7 @@ GameObject:
- component: {fileID: 1747500451976562533}
m_Layer: 5
m_Name: importance
- m_TagString: Untagged
+ m_TagString: Importance
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2826,13 +2826,6 @@ MonoBehaviour:
ModerDamage: {fileID: 1467464424326605954}
regulate: {fileID: 2445121072340223621}
buttonreg: {fileID: 1893370117554305087}
- toggle1: {fileID: 6760580611336481383}
- toggle2: {fileID: 2327747177229680297}
- toggle3: {fileID: 6205561511136672778}
- toggle4: {fileID: 4866093980683021871}
- toggle5: {fileID: 1595232079232995888}
- toggle6: {fileID: 848134281435870856}
- toggle7: {fileID: 6994627430635325071}
togFrequencyBands:
- {fileID: 6760580611336481383}
- {fileID: 2327747177229680297}
diff --git a/Assets/Resources/model/重点攻击目标3.prefab b/Assets/Resources/model/重点攻击目标3.prefab
index 2c944eda..4d42027e 100644
--- a/Assets/Resources/model/重点攻击目标3.prefab
+++ b/Assets/Resources/model/重点攻击目标3.prefab
@@ -1558,7 +1558,7 @@ GameObject:
- component: {fileID: 5969528349560588974}
m_Layer: 5
m_Name: importance
- m_TagString: Untagged
+ m_TagString: Importance
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2826,13 +2826,6 @@ MonoBehaviour:
ModerDamage: {fileID: 7378831111228137673}
regulate: {fileID: 5625621529173534083}
buttonreg: {fileID: 2359957618957220921}
- toggle1: {fileID: 2987344993920604129}
- toggle2: {fileID: 4263437241937524701}
- toggle3: {fileID: 2372794671036074061}
- toggle4: {fileID: 6045683915690793988}
- toggle5: {fileID: 3776191318234792201}
- toggle6: {fileID: 6688120530323237334}
- toggle7: {fileID: 8540854955145205225}
togFrequencyBands:
- {fileID: 2987344993920604129}
- {fileID: 4263437241937524701}
diff --git a/Assets/StreamingAssets/IPPort.txt b/Assets/StreamingAssets/IPPort.txt
index 298829e4..56247b8d 100644
--- a/Assets/StreamingAssets/IPPort.txt
+++ b/Assets/StreamingAssets/IPPort.txt
@@ -1 +1 @@
-127.0.0.1:48888
\ No newline at end of file
+172.16.1.254:48888
\ No newline at end of file
diff --git a/Assets/StreamingAssets/confing.txt b/Assets/StreamingAssets/confing.txt
index e56ea71e..88e14c63 100644
--- a/Assets/StreamingAssets/confing.txt
+++ b/Assets/StreamingAssets/confing.txt
@@ -1 +1 @@
-127.0.0.1
\ No newline at end of file
+172.16.1.119
\ No newline at end of file
diff --git a/Assets/StreamingAssets/mqttConfig.json b/Assets/StreamingAssets/mqttConfig.json
index 9ca72740..6910f88d 100644
--- a/Assets/StreamingAssets/mqttConfig.json
+++ b/Assets/StreamingAssets/mqttConfig.json
@@ -1 +1 @@
-{"ip":"172.16.1.120","port":54232,"userName":"server1234","passwd":"123456"}
\ No newline at end of file
+{"ip":"172.16.1.119","port":54232,"userName":"server1234","passwd":"123456"}
\ No newline at end of file
diff --git a/Assets/Temp/Scripts/Judgmentstate.cs b/Assets/Temp/Scripts/Judgmentstate.cs
index 8eb9a309..ca37b0da 100644
--- a/Assets/Temp/Scripts/Judgmentstate.cs
+++ b/Assets/Temp/Scripts/Judgmentstate.cs
@@ -80,14 +80,15 @@ public class Judgmentstate : MonoBehaviour
_ = SyncCreateRoom.SendMessageAsync(msg);
});
off_btn.onClick.AddListener(() => {
- string url = Url_Exit + GlobalFlag.currentUser.login_name;
- StartCoroutine(GetString(url, data =>
- {
- Debug.Log(data);
- Application.Quit();
+ //string url = Url_Exit + GlobalFlag.currentUser.login_name;
+ //StartCoroutine(GetString(url, data =>
+ //{
+ // Debug.Log(data);
+
+
+ //}));
+ Application.Quit();
- }));
-
});
}
diff --git a/Assets/Temp/Scripts/Login_panl.cs b/Assets/Temp/Scripts/Login_panl.cs
index 39b76ab2..747b2172 100644
--- a/Assets/Temp/Scripts/Login_panl.cs
+++ b/Assets/Temp/Scripts/Login_panl.cs
@@ -2,7 +2,6 @@ using LitJson;
using System.Collections;
using UnityEngine;
using UnityEngine.Networking;
-using UnityEngine.SceneManagement;
using UnityEngine.UI;
using static InterfaceManager;
public class Login_panl : MonoBehaviour
@@ -23,8 +22,21 @@ public class Login_panl : MonoBehaviour
login_btn.onClick.AddListener(Login);
TZ();
AdamSync.SyncCreateRoom.registRequset += OnRegist;
+ username_input.onEndEdit.AddListener(delegate { OnEndEdit(username_input); });
+ password_input.onEndEdit.AddListener(delegate { OnEndEdit(password_input); });
}
+ // 当用户提交输入（按下回车键）时调用
+ public void OnEndEdit(InputField field)
+ {
+ // 检查是否是因为按下回车键（或"Enter"键）而提交
+ if (Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.KeypadEnter))
+ {
+ //Debug.Log("用户输入并按下了回车键: " + field.text);
+ // 在这里执行你需要的操作
+ Login();
+ }
+ }
private void TZ()
{
if (GameMain.tiao == true)
@@ -109,20 +121,20 @@ public class Login_panl : MonoBehaviour
/// 返回 退出
public void AddGetString(bool exirOrQuit)
{
- string url = Url_Exit + GlobalFlag.currentUser.login_name;
- StartCoroutine(GetString(url, data =>
- {
- Debug.Log(data);
- if (exirOrQuit)
- {
- SceneManager.LoadScene("SampleScene");
- }
- else
- {
- Application.Quit();
- }
+ //string url = Url_Exit + GlobalFlag.currentUser.login_name;
+ //StartCoroutine(GetString(url, data =>
+ //{
+ // Debug.Log(data);
+ // if (exirOrQuit)
+ // {
+ // SceneManager.LoadScene("SampleScene");
+ // }
+ // else
+ // {
+ // Application.Quit();
+ // }
- }));
+ //}));
}
public void OnRegist(string msg)
diff --git a/Assets/Temp/Scripts/Microwaveweapon.cs b/Assets/Temp/Scripts/Microwaveweapon.cs
index 976734f0..e6b7c53e 100644
--- a/Assets/Temp/Scripts/Microwaveweapon.cs
+++ b/Assets/Temp/Scripts/Microwaveweapon.cs
@@ -38,7 +38,7 @@ public class Microwaveweapon : MonoBehaviour
public string MicrowaveinterferenceAngle;
#endregion
- ///
+ ///
/// 是否演练开关
///
private bool _isStartRehearsing = false;
@@ -95,7 +95,7 @@ public class Microwaveweapon : MonoBehaviour
MicrowaveweaponList.Add(this);
// 订阅布尔值变化事件
OnActivationChanged += OnActivationChangedHandler;
-
+
}
///
/// 演练是否开始开关
@@ -118,7 +118,7 @@ public class Microwaveweapon : MonoBehaviour
///
private void Offmode()
{
- if (equipment.isPlayer&&coroutine!=null)
+ if (equipment.isPlayer && coroutine != null)
{
StopCoroutine(Timern());
coroutine = null;
@@ -130,7 +130,7 @@ public class Microwaveweapon : MonoBehaviour
///
private void Openmode()
{
- if (equipment.isPlayer&&coroutine ==null)
+ if (equipment.isPlayer && coroutine == null)
{
StartCoroutine(Timern());
}
@@ -140,7 +140,7 @@ public class Microwaveweapon : MonoBehaviour
while (true)
{
yield return new WaitForSeconds(microwtimer + 1.5f);
- if (miceopos!=null&&ismicow)
+ if (miceopos != null && ismicow)
{
Launchattack();
@@ -155,9 +155,12 @@ public class Microwaveweapon : MonoBehaviour
protected string Getmicdata()
{
//Debug.Log("上传位置");
- return string.Format("{0},{1},{2},{3},{4}","Micow", equipment.deviceID, miceopos.transform.position.x,miceopos.transform.position.y,miceopos.transform.position.z);
+ return string.Format("{0},{1},{2},{3},{4}", "Micow", equipment.deviceID, miceopos.transform.position.x, miceopos.transform.position.y, miceopos.transform.position.z);
+ }
+ private void OnMouseDown()
+ {
+ GameManager.Instance.GetAllImportance();
}
-
///
/// 获取设备的参数
///
@@ -169,7 +172,7 @@ public class Microwaveweapon : MonoBehaviour
{
case "储能间隔时间：":
Storageintervaltime = weaponitemone[i].para_value;
- microwtimer =float.Parse(Storageintervaltime);
+ microwtimer = float.Parse(Storageintervaltime);
break;
case "毁伤目标累积作用时间：":
Microwavedamagetime = weaponitemone[i].para_value;
@@ -198,7 +201,7 @@ public class Microwaveweapon : MonoBehaviour
if (miceopos != null)
{
microwavepoint.transform.DOLookAt(miceopos.position, 0.1f).SetEase(Ease.Linear);
-
+
}
}
///
@@ -206,13 +209,13 @@ public class Microwaveweapon : MonoBehaviour
///
public void Launchattack()
{
- if (miceopos!=null)
+ if (miceopos != null)
{
micdistance = Vector3.Distance(miceopos.position, transform.position);
var newdata = Getmicdata();
//_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", newdata));
MQTTManager.instance.SendData(MQTTManager.instance.Micow, newdata);
- microblog.MicrowaveDisplay(micdistance / 10+1, 0.5f);
+ microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f);
Closeattack(miceopos);
}
}
@@ -223,8 +226,8 @@ public class Microwaveweapon : MonoBehaviour
///
private void Closeattack(Transform pos)
{
- UnmannedAerialVehicle unmannedAerialVehicle =pos.GetComponent();
- if (unmannedAerialVehicle!=null)
+ UnmannedAerialVehicle unmannedAerialVehicle = pos.GetComponent();
+ if (unmannedAerialVehicle != null)
{
StartCoroutine(Destructiondata(unmannedAerialVehicle));
StartCoroutine(Offlaserstrike());
@@ -244,7 +247,7 @@ public class Microwaveweapon : MonoBehaviour
game.transform.SetParent(null);
game.SetActive(true);
Destroy(unmannedAerialVehicle.gameObject);
-
+
}
///
/// 销毁无人机
@@ -253,7 +256,7 @@ public class Microwaveweapon : MonoBehaviour
///
public string Aeroplane(UnmannedAerialVehicle unmannedAerialVehicle)
{
- return string.Format("{0},{1},{2}","Planedata",unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID,unmannedAerialVehicle.serialNumber);
+ return string.Format("{0},{1},{2}", "Planedata", unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID, unmannedAerialVehicle.serialNumber);
}
///
@@ -271,13 +274,14 @@ public class Microwaveweapon : MonoBehaviour
public void Microwavetransmission(string[] data)
{
//接收激光下发的位置
- Vector3 vector =new Vector3(float.Parse(data[2]), float.Parse(data[3]),float.Parse(data[4]));
+ Vector3 vector = new Vector3(float.Parse(data[2]), float.Parse(data[3]), float.Parse(data[4]));
float _micdistance = Vector3.Distance(vector, transform.position);
- microwavepoint.transform.DOLookAt(vector, 0.1f).SetEase(Ease.Linear).OnComplete(() => {
+ microwavepoint.transform.DOLookAt(vector, 0.1f).SetEase(Ease.Linear).OnComplete(() =>
+ {
microblog.MicrowaveDisplay(_micdistance / 10 + 1, 0.5f);
StartCoroutine(Offlaserstrike());
});
-
+
}
private void OnDestroy()
{
diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs
index ce35c9c8..af96825d 100644
--- a/Assets/Temp/Scripts/Spectrumdetection.cs
+++ b/Assets/Temp/Scripts/Spectrumdetection.cs
@@ -395,12 +395,9 @@ public class Spectrumdetection : MonoBehaviour
private void OnMouseDown()
{
- if (equipmentCommon.isPlayer)
- {
- SpectrumdetectionUI.SetActive(true);
- }
if (!GlobalFlag.isStartRehearsing && GlobalFlag.blueOrRed == 1)
{
+ GameManager.Instance.GetAllImportance();
EquipmentCommon equipmentCommon1 = GetComponent();
if (equipmentCommon.deviceID == equipmentCommon1.deviceID)
{
@@ -408,6 +405,10 @@ public class Spectrumdetection : MonoBehaviour
Frequencyiamge.gameObject.SetActive(true);
}
}
+ if (equipmentCommon.isPlayer)
+ {
+ SpectrumdetectionUI.SetActive(true);
+ }
//SpectrumdetectionUI.SetActive(true);
}
private void OnDestroy()
diff --git a/Assets/Temp/Scripts/Switchinginput.cs b/Assets/Temp/Scripts/Switchinginput.cs
index d47103ae..2b1ba607 100644
--- a/Assets/Temp/Scripts/Switchinginput.cs
+++ b/Assets/Temp/Scripts/Switchinginput.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
@@ -24,7 +24,8 @@ public class Switchinginput : MonoBehaviour
{
index = 0;
}
+ _eventSystem.SetSelectedGameObject(inputFields[index].gameObject, new BaseEventDate(_eventSystem));
}
- _eventSystem.SetSelectedGameObject(inputFields[index].gameObject, new BaseEventDate(_eventSystem));
+
}
}
diff --git a/Assets/Temp/Scripts/Taskpanel.cs b/Assets/Temp/Scripts/Taskpanel.cs
index 127d001e..a8bbcf83 100644
--- a/Assets/Temp/Scripts/Taskpanel.cs
+++ b/Assets/Temp/Scripts/Taskpanel.cs
@@ -119,13 +119,13 @@ public class Taskpanel : MonoBehaviour
});
guanji_button.onClick.AddListener(() =>
{
- string url = Url_Exit + GlobalFlag.currentUser.login_name;
- StartCoroutine(GetString(url, data =>
- {
- Debug.Log(data);
- Application.Quit();
- }));
-
+ //string url = Url_Exit + GlobalFlag.currentUser.login_name;
+ //StartCoroutine(GetString(url, data =>
+ //{
+ // Debug.Log(data);
+ // Application.Quit();
+ //}));
+ Application.Quit();
});
menu_button.onClick.AddListener(() =>
{
diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
index 29899096..39d64036 100644
--- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
+++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741}
- m_IndirectSpecularColor: {r: 0.066868424, g: 0.12216938, b: 0.2541184, a: 1}
+ m_IndirectSpecularColor: {r: 0.030100383, g: 0.03369107, b: 0.03534769, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -6834,7 +6834,7 @@ GameObject:
- component: {fileID: 147647013}
- component: {fileID: 147647014}
m_Layer: 5
- m_Name: Canvas
+ m_Name: MainCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -13803,12 +13803,12 @@ Light:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 250950117}
- m_Enabled: 1
+ m_Enabled: 0
serializedVersion: 10
m_Type: 1
m_Shape: 0
- m_Color: {r: 1, g: 0.99607843, b: 0.9843137, a: 1}
- m_Intensity: 1.088
+ m_Color: {r: 0, g: 0, b: 0, a: 0}
+ m_Intensity: 0.001
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
@@ -20176,7 +20176,7 @@ Camera:
m_Enabled: 0
serializedVersion: 2
m_ClearFlags: 1
- m_BackGroundColor: {r: 0.39735296, g: 0.46529412, b: 0.52294123, a: 0.6}
+ m_BackGroundColor: {r: 0.0041176477, g: 0.0041176477, b: 0.0041176477, a: 0.6}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@@ -53945,6 +53945,7 @@ GameObject:
- component: {fileID: 1436809534}
- component: {fileID: 1436809535}
- component: {fileID: 1436809536}
+ - component: {fileID: 1436809537}
m_Layer: 0
m_Name: Bootstraps
m_TagString: Untagged
@@ -54142,6 +54143,21 @@ MonoBehaviour:
SweepFrequencyBand: SweepFrequencyBand
KeyTarget: KeyTarget
identification:
+--- !u!114 &1436809537
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1436809528}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f072abdc6ffe11f459a53ff73c2d0984, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ startFormationBtn: {fileID: 0}
+ submitFormationBtn: {fileID: 0}
+ isStartFormation: 0
--- !u!1 &1444599844
GameObject:
m_ObjectHideFlags: 0
@@ -54383,7 +54399,7 @@ Light:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1452191771}
- m_Enabled: 0
+ m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
@@ -69477,15 +69493,15 @@ MonoBehaviour:
moonlightObject: {fileID: 639984703}
moonLightAmt: 0.90791565
moonPhase: 0.54604214
- ambientCol: {r: 1, g: 1, b: 1, a: 1}
- colorSun: {r: 1, g: 0.99607843, b: 0.9843137, a: 1}
+ ambientCol: {r: 0, g: 0, b: 0, a: 1}
+ colorSun: {r: 0, g: 0, b: 0, a: 1}
colorMoon: {r: 0.4392157, g: 0.5921569, b: 0.69803923, a: 1}
- colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8}
- colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1}
- colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
- colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
- colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1}
- colorClouds: {r: 1, g: 1, b: 1, a: 1}
+ colorSkyBase: {r: 0.00627451, g: 0.00627451, b: 0.00627451, a: 0.8}
+ colorSkyBaseLow: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1}
+ colorHorizon: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
+ colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
+ colorSkyAmbient: {r: 0, g: 0, b: 0, a: 1}
+ colorClouds: {r: 0, g: 0, b: 0, a: 1}
colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1}
colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1}
colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1}
@@ -69824,7 +69840,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- randSeed: 25527625
+ randSeed: 150061843
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
diff --git a/Assets/Zion/Scenes/InitConnect.unity b/Assets/Zion/Scenes/InitConnect.unity
index 959c8ee5..f122c156 100644
--- a/Assets/Zion/Scenes/InitConnect.unity
+++ b/Assets/Zion/Scenes/InitConnect.unity
@@ -212,6 +212,8 @@ MonoBehaviour:
data: []
loadingPanel: {fileID: 460561659324528917, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
type: 3}
+ go: {fileID: 0}
+ loadTem: {fileID: 0}
--- !u!1 &2132962757
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Zion/Scenes/SampleScene.unity b/Assets/Zion/Scenes/SampleScene.unity
index cca88844..42b10e4d 100644
--- a/Assets/Zion/Scenes/SampleScene.unity
+++ b/Assets/Zion/Scenes/SampleScene.unity
@@ -1037,7 +1037,7 @@ MonoBehaviour:
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
m_Text:
m_CaretBlinkRate: 0.85
- m_CaretWidth: 1
+ m_CaretWidth: 5
m_ReadOnly: 0
--- !u!114 &514598458
MonoBehaviour:
@@ -1421,7 +1421,7 @@ MonoBehaviour:
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
m_Text:
m_CaretBlinkRate: 0.85
- m_CaretWidth: 1
+ m_CaretWidth: 5
m_ReadOnly: 0
--- !u!114 &835460218
MonoBehaviour:
diff --git a/Assets/Zion/Scripts/Adam/DragController.cs b/Assets/Zion/Scripts/Adam/DragController.cs
index 41eaabc3..a6f27a8d 100644
--- a/Assets/Zion/Scripts/Adam/DragController.cs
+++ b/Assets/Zion/Scripts/Adam/DragController.cs
@@ -20,9 +20,9 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
public Mastermanagement mastermanagement;
- void Start()
+ void Awake()
{
- mastermanagement = GameObject.Find("Canvas").GetComponent();
+ mastermanagement = GameObject.Find("MainCanvas").GetComponent();
}
public void OnBeginDrag(PointerEventData eventData)
{
diff --git a/Assets/Zion/Scripts/Adam/FormationManager.cs b/Assets/Zion/Scripts/Adam/FormationManager.cs
new file mode 100644
index 00000000..69dacb15
--- /dev/null
+++ b/Assets/Zion/Scripts/Adam/FormationManager.cs
@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+///
+/// 编队控制脚本
+///
+public class FormationManager : MonoBehaviour
+{
+ public Button startFormationBtn;
+ public Button submitFormationBtn;
+ public bool isStartFormation;
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ startFormationBtn.onClick.AddListener(OnStartFormation);
+ submitFormationBtn.onClick.AddListener(OnSubmit);
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ if (isStartFormation)
+ {
+ if (Input.GetKeyDown(KeyCode.LeftControl) && Input.GetMouseButtonDown(0))
+ {
+ Debug.Log("拾取");
+ }
+ }
+ }
+
+ public void OnStartFormation()
+ {
+ isStartFormation = true;
+ }
+
+ public void OnSubmit()
+ {
+ isStartFormation = false;
+ }
+}
diff --git a/Assets/Zion/Scripts/Adam/FormationManager.cs.meta b/Assets/Zion/Scripts/Adam/FormationManager.cs.meta
new file mode 100644
index 00000000..74cfbf36
--- /dev/null
+++ b/Assets/Zion/Scripts/Adam/FormationManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f072abdc6ffe11f459a53ff73c2d0984
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs
index 14354aac..4d8c3b69 100644
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@@ -525,6 +525,35 @@ public class GameManager : MonoSingleton
}
}
+ ///
+ /// 获取 所有 参数 修改 面板
+ ///
+ ///
+ public void GetAllImportance()
+ {
+ GameObject[] radar = GameObject.FindGameObjectsWithTag("Radar");
+ GameObject[] objs = GameObject.FindGameObjectsWithTag("Importance");
+ for (int i = 0; i < objs.Length; i++)
+ {
+ objs[i].SetActive(false);
+ }
+ for (int i = 0; i < radar.Length; i++)
+ {
+ radar[i].SetActive(false);
+ }
+ }
+ ///
+ /// 获取无人机参数面板
+ ///
+ public void GetWRJParameter()
+ {
+ GameObject[] wrjParameter = GameObject.FindGameObjectsWithTag("WRJParameter");
+ for (int i = 0; i < wrjParameter.Length; i++)
+ {
+ wrjParameter[i].SetActive(false);
+ }
+ }
+
private void OnDisable()
diff --git a/Assets/Zion/Scripts/Adam/WRJManager.cs b/Assets/Zion/Scripts/Adam/WRJManager.cs
index da7d3ba4..29ddb616 100644
--- a/Assets/Zion/Scripts/Adam/WRJManager.cs
+++ b/Assets/Zion/Scripts/Adam/WRJManager.cs
@@ -23,6 +23,7 @@ namespace Assets.Zion.Scripts.Adam
{
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0" && Input.GetMouseButtonDown(0))
{
+ if (EventSystem.current.IsPointerOverGameObject()) return;
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hitInfo;
if (Physics.Raycast(ray, out hitInfo, 1000))
@@ -40,16 +41,19 @@ namespace Assets.Zion.Scripts.Adam
}
else
{
+ GameManager.Instance.GetWRJParameter();
wrjMenuSetPanel.localScale = Vector3.zero;
}
}
else
{
+ GameManager.Instance.GetWRJParameter();
wrjMenuSetPanel.localScale = Vector3.zero;
}
}
else
{
+ GameManager.Instance.GetWRJParameter();
wrjMenuSetPanel.localScale = Vector3.zero;
}
}
diff --git a/Assets/Zion/Scripts/AddConfing.cs b/Assets/Zion/Scripts/AddConfing.cs
index 243f5bc3..16d2ba76 100644
--- a/Assets/Zion/Scripts/AddConfing.cs
+++ b/Assets/Zion/Scripts/AddConfing.cs
@@ -57,12 +57,4 @@ public class AddConfing : MonoBehaviour
}
}
- private void OnDestroy()
- {
- string url = Url_Exit + GlobalFlag.currentUser.login_name;
- StartCoroutine(GetString(url, data =>
- {
- Debug.Log(data);
- }));
- }
}
diff --git a/Assets/Zion/Scripts/HighPriorityTarget.cs b/Assets/Zion/Scripts/HighPriorityTarget.cs
index b5c5c8a7..f16e0158 100644
--- a/Assets/Zion/Scripts/HighPriorityTarget.cs
+++ b/Assets/Zion/Scripts/HighPriorityTarget.cs
@@ -60,7 +60,7 @@ public class HighPriorityTarget : MonoBehaviour
///
/// 频率选择
///
- public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7;
+ //public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7;
///
/// 频段设置
///
@@ -104,88 +104,7 @@ public class HighPriorityTarget : MonoBehaviour
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)
{
int layerValue = LayerMask.NameToLayer(_frequency);
@@ -214,6 +133,8 @@ public class HighPriorityTarget : MonoBehaviour
HighPriorityTarget highPriorityTarget = hit.transform.GetComponent();
if (!GlobalFlag.isStartRehearsing && highPriorityTarget && highPriorityTarget.Number == Number)
{
+ GameManager.Instance.GetAllImportance();
+
regulate.transform.position = Camera.main.WorldToScreenPoint(hit.point);
regulate.gameObject.SetActive(true);
}
@@ -234,7 +155,7 @@ public class HighPriorityTarget : MonoBehaviour
{
HP -= 10;
string nowData = GetSyncDis(Pos);
- Debug.Log("发送："+nowData);
+ Debug.Log("发送：" + nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
MQTTManager.instance.SendData(MQTTManager.instance.KeyTarget, nowData);
}
@@ -288,7 +209,7 @@ public class HighPriorityTarget : MonoBehaviour
UploadLogMain uploadLogMain = new UploadLogMain();
uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID;
uploadLogMain.ThinkId = GlobalFlag.currentThinkId;
- string log = currentTime + " " + "重要用户(" + Number + ")频段设置为" + frequency;
+ string log = currentTime + " " + "重要用户(" + Number + ")频段设置为" + frequency;
uploadLogMain.log = log;
uploadLogMains.Add(uploadLogMain);
string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains);
diff --git a/Assets/Zion/Scripts/InterfaceManager.cs b/Assets/Zion/Scripts/InterfaceManager.cs
index 74934dfd..b1ca971f 100644
--- a/Assets/Zion/Scripts/InterfaceManager.cs
+++ b/Assets/Zion/Scripts/InterfaceManager.cs
@@ -145,7 +145,7 @@ public static class InterfaceManager
///
/// 用户退出
///
- public static string Url_Exit { get => IpAddress + "/Handler/User.ashx?action=exit&login_name="; }
+ //public static string Url_Exit { get => IpAddress + "/Handler/User.ashx?action=exit&login_name="; }
#endregion
diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
index a3b5cce4..0e74f78d 100644
--- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
+++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
@@ -362,7 +362,7 @@ public class RadarManger : MonoBehaviour
{
if (equipmentCommon.isPlayer && GlobalFlag.blueOrRed == 1)
{
-
+ GameManager.Instance.GetAllImportance();
imageprs.gameObject.SetActive(true);
}
}
diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
index 9ca6b9eb..1623a2fa 100644
--- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
+++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
@@ -8,8 +8,8 @@ using static InterfaceManager;
using System;
using UnityEngine.UI;
using UnityEngine.EventSystems;
-
-
+
+
/*
地面无线电干扰对无人机的干扰通常是指对其数据链通信频点的干扰，而不是卫星定位频点的干扰。
@@ -194,7 +194,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
private void disturb1()
{
- if (InterferingFrequency1.Length>0)
+ if (InterferingFrequency1.Length > 0)
{
string[] str = InterferingFrequency1.Split(',');
for (int i = 0; i < str.Length; i++)
@@ -206,7 +206,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
break;
case "L":
toggle2.gameObject.SetActive(true);
- break ;
+ break;
case "S":
toggle3.gameObject.SetActive(true);
break;
@@ -241,10 +241,10 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
//Interferencemode();
//Angularrange();
}
-
-
+
+
public GraphicRaycaster RaycastInCanvas;
-
+
#region 启动暂停
@@ -314,36 +314,36 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
///
public void FillInTheData(List weaponitemone)
{
-
+
for (int i = 0; i < weaponitemone.Count; i++)
{
switch (weaponitemone[i].para_name)
{
case "干扰频率:":
string[] str = weaponitemone[i].para_value.Split(',');
- if (str.Length>0)
+ if (str.Length > 0)
{
for (int j = 0; j < str.Length; j++)
{
switch (str[j])
{
case "0":
- InterferingFrequency1 += "UHF"+"," ;
+ InterferingFrequency1 += "UHF" + ",";
break;
case "1":
- InterferingFrequency1 += "L"+",";
+ InterferingFrequency1 += "L" + ",";
break;
case "2":
- InterferingFrequency1 += "S"+",";
+ InterferingFrequency1 += "S" + ",";
break;
case "3":
- InterferingFrequency1 += "C"+",";
+ InterferingFrequency1 += "C" + ",";
break;
case "4":
- InterferingFrequency1 += "X"+",";
+ InterferingFrequency1 += "X" + ",";
break;
case "5":
- InterferingFrequency1 += "Ku"+",";
+ InterferingFrequency1 += "Ku" + ",";
break;
case "6":
InterferingFrequency1 += "Ka" + ",";
@@ -353,7 +353,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
}
}
}
-
+
//interval= float.Parse(InterferingFrequency);
break;
case "干扰模式:":
@@ -456,7 +456,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
{
if (colliders[i].transform.tag == "WRJ")
{
-
+
UnmannedAerialVehicleManage unmannedAerialVehicleManage = colliders[i].GetComponent();
//Debug.Log("检测到无人机: " + col.name);
UnmannedAerialVehicle unmannedAerialVehicle = colliders[i].GetComponent();
@@ -475,7 +475,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
{
WRJs.Enqueue(unmannedAerialVehicleManage.transform);
}
-
+
}
}
@@ -501,7 +501,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
}
}
-
+
///
///上传日志
@@ -526,7 +526,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
}));
}
-
+
private void OnDestroy()
{
@@ -566,6 +566,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
{
if (!GlobalFlag.isStartRehearsing && GlobalFlag.blueOrRed == 1 && Input.GetMouseButtonDown(0))
{
+ GameManager.Instance.GetAllImportance();
Waveimage.transform.position = Camera.main.WorldToScreenPoint(transform.position);
Waveimage.gameObject.SetActive(true);
}
diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleUI.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleUI.cs
index c50970e0..194c4ac8 100644
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleUI.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleUI.cs
@@ -48,12 +48,14 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
btnFrequencyBand.onClick.AddListener(() => {
if (unmannedAerialVehicleManage)
{
+ GameManager.Instance.GetWRJParameter();
unmannedAerialVehicleManage.FrequencyBand.SetActive(true);
}
});
btnSurveillanceFrequencyBand.onClick.AddListener(() => {
if (unmannedAerialVehicleManage)
{
+ GameManager.Instance.GetWRJParameter();
unmannedAerialVehicleManage.SurveillanceFrequencyBand.SetActive(true);
}
});
@@ -74,6 +76,7 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
{
if (unmannedAerialVehicleManage)
{
+ GameManager.Instance.GetWRJParameter();
switch (unmannedAerialVehicleManage.wrjModel)
{
case WRJModel.光学无人机:
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index e3ef05e7..8d047a6d 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -9,6 +9,9 @@ TagManager:
- AttackTarget
- WRJ1
- AttackTarget1
+ - Importance
+ - Radar
+ - WRJParameter
layers:
- Default
- TransparentFX