diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index a5d4780e..48055783 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.16231444, g: 0.3061461, b: 0.66931677, a: 1} + m_IndirectSpecularColor: {r: 0.16235301, g: 0.30616894, b: 0.6691831, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -63100,7 +63100,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 1713787906 + randSeed: 1777163718 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -86115,6 +86115,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 343842254875067688, guid: 708d7629e400aea448483dd5797ffa36, + type: 3} + propertyPath: orthographic size + value: 5 + objectReference: {fileID: 0} - target: {fileID: 343842254875067690, guid: 708d7629e400aea448483dd5797ffa36, type: 3} propertyPath: m_Name diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index f7f61795..bdc9afa9 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -125,9 +125,10 @@ public class RadarManger : MonoBehaviour public Camera Mincamera; void Start() { + Mincamera = GameObject.Find("Minimap Camera").GetComponent<Camera>(); equipmentCommon = GetComponent<EquipmentCommon>(); aniRandar = GetComponent<Animator>(); - Mincamera = GameObject.Find("Minimap Camera").GetComponent<Camera>(); + if (RadarUi == null) { CreateRadarUI(); @@ -237,7 +238,7 @@ public class RadarManger : MonoBehaviour case "探测距离:": DetectionRange = weaponitemone[i].para_value; detectionRadius = float.Parse(DetectionRange) * 100; - //Mincamera.orthographicSize = detectionRadius; + Mincamera.orthographicSize = detectionRadius; break; case "近盲区:": NearBlindArea = weaponitemone[i].para_value; @@ -297,7 +298,7 @@ public class RadarManger : MonoBehaviour var colliders2 = colliders.FindAll(x => x.tag == "WRJ"); if (colliders2.Count > 0) { - Mincamera.orthographicSize = detectionRadius; + //Mincamera.orthographicSize = detectionRadius; for (int i = 0; i < colliders2.Count; i++) { if (i <= NumberOfProbes)