From 28626a2c80bda3c8d64307bdbdcaffd9a6873981 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 21 Mar 2024 17:38:31 +0800 Subject: [PATCH 1/2] 22111 --- Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab | 4 ++-- Assets/Zion/Scripts/Adam/GameManager.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 0b32a74e..b1c33e7d 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -79,7 +79,7 @@ TextMesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114525537} - m_Text: "\u7535\u5B50\u4FA6\u5BDF\u65E0\u4EBA\u673A" + m_Text: m_OffsetZ: 0 m_CharacterSize: 1 m_LineSpacing: 1 @@ -423,7 +423,7 @@ Animator: m_GameObject: {fileID: 1138956548591105957} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f69a267091a4b2e4c9f6ad1a4994c5d4, type: 2} + m_Controller: {fileID: 0} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 349b62f0..b5da1f3c 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -550,7 +550,7 @@ public class GameManager : MonoSingleton { string info = UIBootstrap.Instance.currentSceneInfo.data.DeviceContent; //Debug.Log(info); - if (info.Length > 0 && !string.IsNullOrWhiteSpace(info)) + if (info.Length > 2 && !string.IsNullOrWhiteSpace(info)) { modelsInfo = Jsonanalyze.FromJson>(info); for (int i = 0; i < modelsInfo.Count; i++) From 1aff87507e58b2c8cd73bb1f0ede8a191022bb6f Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 21 Mar 2024 18:01:59 +0800 Subject: [PATCH 2/2] 212 --- Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index 633ced84..e5beb48c 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -119,7 +119,7 @@ public class RadarManger : MonoBehaviour /// /// 批量标处理能力 /// - public int rcs = 0; + public float rcs = 0; /// /// 渲染小地图摄像机 /// @@ -165,7 +165,7 @@ public class RadarManger : MonoBehaviour if (isStartRehearsing) { minCamera.gameObject.SetActive(true); - targets = GameObject.FindGameObjectsWithTag("WRJ").ToList().FindAll(a => a.GetComponent().GetRCS() > float.Parse(RCS)); + targets = GameObject.FindGameObjectsWithTag("WRJ").ToList().FindAll(a => a.GetComponent().GetRCS() > rcs); foreach (Transform child in rawImage.transform) { @@ -304,7 +304,7 @@ public class RadarManger : MonoBehaviour break; case "RCS:": RCS = weaponitemone[i].para_value; - rcs = int.Parse(RCS); + rcs = float.Parse(RCS); break; case "探测成功率:": DetectionSuccessRate = weaponitemone[i].para_value;