红蓝双方

Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab

@@ -69,7 +69,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   equipmentCommon: {fileID: 0}
   InterferingFrequency: 1
-  InterferenceMode: 1
+  InterferenceMode: 0
   TransmittedPower: 1
   InterferenceAngle: 1
   InterferenceDistance: 1

Assets/Temp/Scripts/View_Panel2.cs

@@ -113,7 +113,7 @@ public class View_Panel2 : XUIPanel
         selector_panl = GameObject.Find("View_Panel2(Clone)").transform.GetChild(4).GetComponent<Image>();
         off3_btn = GameObject.Find("View_Panel2(Clone)").transform.GetChild(4).transform.GetChild(1).GetComponent<Button>();
         place = GameObject.Find("View_Panel2(Clone)").transform.GetChild(1).transform.GetChild(0).transform.GetChild(0).GetComponent<Transform>();
-
+        //Storm_and_capture_panl
 
         Storm_and_capture_panl = this.transform.Find("Storm_and_capture_panl").gameObject;
         submitView = Storm_and_capture_panl.transform.Find("SubmitView").gameObject;
@@ -585,7 +585,7 @@ public class View_Panel2 : XUIPanel
                 CreateSubjectInfo(currentSubjectInfo.data);
             });
         }
-        if (currentRoomSubjectItemConnect.childCount > 0)
+        if (currentRoomSubjectItemConnect.childCount > 1)
         {
             currentRoomSubjectItemConnect.GetChild(1).GetComponent<Button>().onClick.Invoke();
         }

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.17217532, g: 0.3051133, b: 0.6003367, a: 1}
+  m_IndirectSpecularColor: {r: 0.16235358, g: 0.30609837, b: 0.66879046, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -48885,7 +48885,7 @@ MonoBehaviour:
     type: 3}
   currentSpt: {fileID: 0}
   redSpawnPos: {fileID: 1618372688}
-  blueSpawnPos: {fileID: 0}
+  blueSpawnPos: {fileID: 2083507084}
   userIds: 
   tenkokuModule: {fileID: 1820978573}
   modelsInfo: []
@@ -63057,7 +63057,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 433448609
+  randSeed: 461563218
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574
@@ -80681,6 +80681,36 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2076215628}
   m_CullTransparentMesh: 0
+--- !u!1 &2083507083
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2083507084}
+  m_Layer: 0
+  m_Name: greenOriginPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2083507084
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2083507083}
+  m_LocalRotation: {x: 0.25164708, y: 0, z: 0, w: 0.9678191}
+  m_LocalPosition: {x: -500, y: 233.1, z: -128.6}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 29.15, y: 0, z: 0}
 --- !u!114 &2084742555 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7430886194077235610, guid: b81552d8e5962d94794a714000419631,

Assets/Zion/Scripts/Adam/Data/PracticeData.cs

@@ -108,6 +108,8 @@ namespace PData
         /// <summary>
         /// 
         /// </summary>
+        public string EnvWu;
+        public string Env1;
         public string Field_Decimal1;
         /// <summary>
         /// 

Assets/Zion/Scripts/Adam/GameManager.cs

@@ -378,8 +378,10 @@ public class GameManager : MonoSingleton<GameManager>
         tenkokuModule.weather_RainAmt = Mathf.Lerp(0f, 1f, float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvRain));
         tenkokuModule.weather_SnowAmt = Mathf.Lerp(0f, 1f, float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvSnow));
         tenkokuModule.weather_WindAmt = Mathf.Lerp(0f, 1f, float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvWindSpeed));
-        tenkokuModule.weather_WindDir = Mathf.Lerp(0f, 1f, float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvWindDir));
+        tenkokuModule.weather_WindDir = Mathf.Lerp(0f, 360f, float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvWindDir));
-        tenkokuModule.weather_OvercastAmt = Mathf.Lerp(0f, 1f, float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvLight));
+        tenkokuModule.weather_OvercastAmt = Mathf.Lerp(0f, 1f, 1-(float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvLight)/10));
+        tenkokuModule.weather_humidity = Mathf.Lerp(0f, 1f,1- (float.Parse(UIBootstrap.Instance.currentSceneInfo.data.EnvWu) / 100));
+        Debug.LogError(tenkokuModule.weather_humidity);
         Debug.LogError(tenkokuModule.weather_OvercastAmt);
     }
 

Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs

@@ -126,8 +126,9 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
         while (true)
         {
             //Debug.Log("Timer fired at: " + Time.time);
-            yield return new WaitForSeconds(interval); // 等待一段时间后继续执行
+            yield return new WaitForSeconds(3); // 等待一段时间后继续执行
             RadioDisturbance();
+            Interferencemode();
         }
     }
 
@@ -173,17 +174,66 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
             switch (weaponitemone[i].para_name)
             {
                 case "干扰频率:":
-                    InterferingFrequency = weaponitemone[i].para_value;
+                    switch (weaponitemone[i].para_value)
-                    interval= float.Parse(InterferingFrequency);
+                    {
+                        case "0":
+                            InterferingFrequency = "430~470MHz";
+                            break;
+                        case "1":
+                            InterferingFrequency = "832~940MHz";
+                            break;
+                        case "2":
+                            InterferingFrequency = "1.2~1.3GHz";
+                            break;
+                        case "3":
+                            InterferingFrequency = "1.56~1.62GHz";
+                            break;
+                        case "4":
+                            InterferingFrequency = "2.4~2.5GHz";
+                            break;
+                        case "5":
+                            InterferingFrequency = "5.725~5.85GHz";
+                            break;
+                        default:
+                            break;
+                    }
+                    //interval= float.Parse(InterferingFrequency);
                     break;
                 case "干扰模式:":
-                    InterferenceMode = weaponitemone[i].para_value;
+                    Debug.LogError(weaponitemone[i].para_value);
-                    Debug.LogError(InterferenceMode);
+                    switch (weaponitemone[i].para_value)
+                    {
+                        case "0":
+                            InterferenceMode = "驱离";
+                            break ;
+                        case "1":
+                            InterferenceMode = "迫降";
+                            break;
+                        default:
+                            break;
+                    }
+                    //InterferenceMode = weaponitemone[i].para_value;
                     break;
                 case "发射功率:":
-                    TransmittedPower = weaponitemone[i].para_value;
+                    //TransmittedPower = weaponitemone[i].para_value;
+                    Debug.LogError(weaponitemone[i].para_value);
+                    switch (weaponitemone[i].para_value)
+                    {
+                        case "0":
+                            TransmittedPower = "10~30W";
+                            break;
+                        case "1":
+                            TransmittedPower = "30~50W";
+                            break;
+                        case "2":
+                            TransmittedPower = "50~100W";
+                            break;
+                        default:
+                            break;
+                    }
                     break;
                 case "干扰角度:":
+                    Debug.LogError(weaponitemone[i].para_value);
                     InterferenceAngle = weaponitemone[i].para_value;
                     break; 
                 case "干扰距离:":
@@ -195,7 +245,30 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
             }
         }
     }
-
+    /// <summary>
+    /// 干扰模式
+    /// </summary>
+    public void Interferencemode()
+    {
+        Collider[] colliders = Physics.OverlapSphere(transform.position, 100);//检索范围
+        for (int i = 0; i < colliders.Length; i++)
+        {
+            if (colliders[i].transform.tag=="WRJ")
+            {
+                UnmannedAerialVehicle unmannedAerialVehicle = colliders[i].GetComponent<UnmannedAerialVehicle>();
+                if (InterferenceMode=="驱离")
+                {
+                    Debug.LogError(unmannedAerialVehicle.name);
+                    unmannedAerialVehicle.transform.Translate(Vector3.back*5*Time.deltaTime);
+                }
+                else if (InterferenceMode == "迫降")
+                {
+                    Debug.LogError(unmannedAerialVehicle.name);
+                    unmannedAerialVehicle.transform.Translate(Vector3.down * 5 * Time.deltaTime);
+                }
+            }
+        }
+    }
     /// <summary>
     /// 开启无线电干扰
     /// </summary>