diff --git a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab index ef3709c4..4ff26cf0 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab @@ -940,7 +940,7 @@ MonoBehaviour: - {fileID: 5382943705491709219} - {fileID: 6251437642903478223} - {fileID: 117463751223528660} - Frequency: + Frequency: UHF; Frequencysuccessrate: Camera1: {fileID: 480111845} rawImage: {fileID: 1115657768} @@ -1285,7 +1285,7 @@ PrefabInstance: - target: {fileID: 774263706619759321, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.y - value: -70 + value: -60 objectReference: {fileID: 0} - target: {fileID: 774263706619759321, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -1315,7 +1315,7 @@ PrefabInstance: - target: {fileID: 787071647807583119, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.y - value: -70 + value: -60 objectReference: {fileID: 0} - target: {fileID: 787071647807583119, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -1467,6 +1467,11 @@ PrefabInstance: propertyPath: m_Group value: objectReference: {fileID: 0} + - target: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + propertyPath: m_IsOn + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1762964555520084189, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchorMin.y @@ -1537,6 +1542,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2845739617830017690, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + propertyPath: m_CellSize.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2845739617830017690, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + propertyPath: m_Spacing.y + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2952508982754408232, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_IsActive @@ -1570,7 +1585,7 @@ PrefabInstance: - target: {fileID: 4615187386309863894, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: -35 objectReference: {fileID: 0} - target: {fileID: 4615187386309863894, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -1600,7 +1615,7 @@ PrefabInstance: - target: {fileID: 5189183387702235965, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: -35 objectReference: {fileID: 0} - target: {fileID: 5189183387702235965, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -1617,6 +1632,11 @@ PrefabInstance: propertyPath: m_Group value: objectReference: {fileID: 0} + - target: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + propertyPath: m_IsOn + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_Group @@ -1655,7 +1675,7 @@ PrefabInstance: - target: {fileID: 8220085496440315604, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.y - value: -100 + value: -85 objectReference: {fileID: 0} - target: {fileID: 8220085496440315604, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index ecc04c3f..377e4126 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -471,10 +471,10 @@ public class Scenariopage : MonoBehaviour } else { - for (int i = 0; i < microwavesliderlist.Count; i++) - { - microwavesliderlist[i].value = 0; - } + //for (int i = 0; i < microwavesliderlist.Count; i++) + //{ + // microwavesliderlist[i].value = 0; + //} } radar_panl.gameObject.SetActive(false); radio_wave_panl.gameObject.SetActive(false); @@ -561,17 +561,17 @@ public class Scenariopage : MonoBehaviour } else { - Slider_probe1.value = 0; - Slider_batch.value = 0; - for (int i = 0; i < toggleprobes.Count; i++) - { - toggleprobes[i].isOn = false; - } - toggleprobes[0].isOn = true; - Slider_Successful1.value = 0; - Slider_respond.value = 0; - Slider_precision.value = 0; - Slider_minimum1.value = 0; + //Slider_probe1.value = 0; + //Slider_batch.value = 0; + //for (int i = 0; i < toggleprobes.Count; i++) + //{ + // toggleprobes[i].isOn = false; + //} + //toggleprobes[0].isOn = true; + //Slider_Successful1.value = 0; + //Slider_respond.value = 0; + //Slider_precision.value = 0; + //Slider_minimum1.value = 0; } radar_panl.gameObject.SetActive(false); radio_wave_panl.gameObject.SetActive(false); @@ -810,29 +810,29 @@ public class Scenariopage : MonoBehaviour else { - toggle1.isOn = true; - toggle2.isOn = false; - toggle3.isOn = false; - toggle4.isOn = false; - toggle5.isOn = false; - toggle6.isOn = false; - toggle7.isOn = false; - toggle8.isOn = false; - toggle9.isOn = false; - Slider_endurance.value = 0; - Dropdown_wind.value = 0; - Slider_speed.value = 0; - Slider_rcs.value = 0; - Dropdown_orientation.value = 0; - Toggle1.isOn = true; - Toggle2.isOn = false; - Toggle3.isOn = false; - Toggle4.isOn = false; - Toggle5.isOn = false; - Toggle6.isOn = false; - Toggle7.isOn = false; - toggle8.isOn = true; - toggle9.isOn = false; + //toggle1.isOn = true; + //toggle2.isOn = false; + //toggle3.isOn = false; + //toggle4.isOn = false; + //toggle5.isOn = false; + //toggle6.isOn = false; + //toggle7.isOn = false; + //toggle8.isOn = false; + //toggle9.isOn = false; + //Slider_endurance.value = 0; + //Dropdown_wind.value = 0; + //Slider_speed.value = 0; + //Slider_rcs.value = 0; + //Dropdown_orientation.value = 0; + //Toggle1.isOn = true; + //Toggle2.isOn = false; + //Toggle3.isOn = false; + //Toggle4.isOn = false; + //Toggle5.isOn = false; + //Toggle6.isOn = false; + //Toggle7.isOn = false; + //toggle8.isOn = true; + //toggle9.isOn = false; } radar_panl.gameObject.SetActive(false); @@ -1079,15 +1079,15 @@ public class Scenariopage : MonoBehaviour } else { - for (int i = 0; i < togglesdisturbs.Count; i++) - { - togglesdisturbs[i].isOn = false; - } - togglesdisturbs[0].isOn = true; - Toggle_Drive.isOn = true; - Dropdown_power.value = 0; - Slider_angle.value = 0; - Slider_distance.value = 0; + //for (int i = 0; i < togglesdisturbs.Count; i++) + //{ + // togglesdisturbs[i].isOn = false; + //} + //togglesdisturbs[0].isOn = true; + //Toggle_Drive.isOn = true; + //Dropdown_power.value = 0; + //Slider_angle.value = 0; + //Slider_distance.value = 0; } radar_panl.gameObject.SetActive(false); radio_wave_panl.gameObject.SetActive(true); @@ -1277,10 +1277,10 @@ public class Scenariopage : MonoBehaviour } else { - for (int i = 0; i < Radarparameterlist.Count; i++) - { - Radarparameterlist[i].value = 0; - } + //for (int i = 0; i < Radarparameterlist.Count; i++) + //{ + // Radarparameterlist[i].value = 0; + //} } radar_panl.gameObject.SetActive(true); radio_wave_panl.gameObject.SetActive(false); @@ -1377,10 +1377,10 @@ public class Scenariopage : MonoBehaviour } else { - for (int i = 0; i < laserquantitylist.Count; i++) - { - laserquantitylist[i].value = 0; - } + //for (int i = 0; i < laserquantitylist.Count; i++) + //{ + // laserquantitylist[i].value = 0; + //} } radar_panl.gameObject.SetActive(false); radio_wave_panl.gameObject.SetActive(false); @@ -2193,7 +2193,78 @@ public class Scenariopage : MonoBehaviour { Addweapons();//添加想定武器参数 } + else + { + Initializepanl();//初始化面板 + } } + + private void Initializepanl() + { + //激光武器 + for (int i = 0; i < laserquantitylist.Count; i++) + { + laserquantitylist[i].value = 0; + } + //探测雷达 + for (int i = 0; i < Radarparameterlist.Count; i++) + { + Radarparameterlist[i].value = 0; + } + //地面无线电干扰 + for (int i = 0; i < togglesdisturbs.Count; i++) + { + togglesdisturbs[i].isOn = false; + } + togglesdisturbs[0].isOn = true; + Toggle_Drive.isOn = true; + Dropdown_power.value = 0; + Slider_angle.value = 0; + Slider_distance.value = 0; + //无人机 + toggle1.isOn = true; + toggle2.isOn = false; + toggle3.isOn = false; + toggle4.isOn = false; + toggle5.isOn = false; + toggle6.isOn = false; + toggle7.isOn = false; + toggle8.isOn = false; + toggle9.isOn = false; + Slider_endurance.value = 0; + Dropdown_wind.value = 0; + Slider_speed.value = 0; + Slider_rcs.value = 0; + Dropdown_orientation.value = 0; + Toggle1.isOn = true; + Toggle2.isOn = false; + Toggle3.isOn = false; + Toggle4.isOn = false; + Toggle5.isOn = false; + Toggle6.isOn = false; + Toggle7.isOn = false; + toggle8.isOn = true; + toggle9.isOn = false; + Slider_probe1.value = 0; + Slider_batch.value = 0; + //频谱探测 + for (int i = 0; i < toggleprobes.Count; i++) + { + toggleprobes[i].isOn = false; + } + toggleprobes[0].isOn = true; + Slider_Successful1.value = 0; + Slider_respond.value = 0; + Slider_precision.value = 0; + Slider_minimum1.value = 0; + //微波武器 + for (int i = 0; i < microwavesliderlist.Count; i++) + { + microwavesliderlist[i].value = 0; + } + + } + private void Addweapons() { diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index d80a9e1d..0f3bb79a 100644 Binary files a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity and b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity differ