From fa773a1cd95811d8afd02cd7b4d965acd0653ef0 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Thu, 29 Aug 2024 13:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Tools/三相四线电能表.prefab | 8 +- .../Devices/计量柜/Device_MeasuringCabinet.cs | 13 ++- .../CXX/Devices/计量柜/Device_Sundries.cs | 5 +- Assets/Scripts/CXX/Score/Score_1002.cs | 91 +++++++++++++++++-- Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs | 4 + 5 files changed, 106 insertions(+), 15 deletions(-) diff --git a/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab index 01c927e..d6fd3de 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab @@ -285,7 +285,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080142119082} - hasElectricity: 1 + hasElectricity: 0 initPostionY: 0.0256958 --- !u!114 &2576541079962278358 MonoBehaviour: @@ -5765,7 +5765,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541079818901621} - hasElectricity: 1 + hasElectricity: 0 initPostionY: 0.0256958 --- !u!1 &4627208948562638019 GameObject: @@ -9551,7 +9551,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081300379520} - hasElectricity: 1 + hasElectricity: 0 initPostionY: 0.02220154 --- !u!1 &7847778419808227353 GameObject: @@ -9838,7 +9838,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081225681401} - hasElectricity: 1 + hasElectricity: 0 initPostionY: 0.02220154 --- !u!114 &2576541080563400542 MonoBehaviour: diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs index 8c48ded..89bdbb4 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs @@ -182,8 +182,17 @@ public class Device_MeasuringCabinet : MonoBehaviour { a.screws.ForEach(b => { - //װ - b.hasElectricity = b.isInstall; + //װ + //޵еѹ + if(b.triggerName.Contains("")) + { + b.hasElectricity = false; + } + else + { + //ĿǷϵ + b.hasElectricity = b.isInstall; + } }); } } diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs index 59e9de4..5ce6a05 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs @@ -8,6 +8,9 @@ public class Device_Sundries : Device_Base { base.OnMDown(); Debug.Log(""); - gameObject.SetActive(false); + gameObject.SetActive(false); + triggerAction.Invoke(triggerName, false); + base.CallScoreAction(); + } } diff --git a/Assets/Scripts/CXX/Score/Score_1002.cs b/Assets/Scripts/CXX/Score/Score_1002.cs index 1ed0ffe..1de97be 100644 --- a/Assets/Scripts/CXX/Score/Score_1002.cs +++ b/Assets/Scripts/CXX/Score/Score_1002.cs @@ -46,10 +46,14 @@ public class Score_1002 : ScoreBase /// List TestPen3list = new List(); /// - /// + /// ضϵ /// List InSwitchCloseYDList=new List(); /// + /// ͨ + /// + List InSwitchOpenYDList = new List(); + /// /// ˳ /// List unInstallJieXian=new List() @@ -85,6 +89,19 @@ public class Score_1002 : ScoreBase /// װ˿ /// List currentInstallJieXian = new List(); + + /// + /// װ̰װ + /// + List installCover = new List(); + /// + /// װ̶Խ˿ + /// + List installTestJieXian=new List() { "+A_in_˿", "+B_in_˿", "+C_in_˿" }; + /// + /// װ̶Խ + /// + List currentInstallTestJieXian = new List(); public override void CheckScore(string triggerName, object para) { base.CheckScore(triggerName, para); @@ -159,7 +176,7 @@ public class Score_1002 : ScoreBase if (SiteManager.instance.measuringCabinet.inSwitch.isOpen == false) { InSwitchCloseYDList.Add(triggerName); - steps[3010].SetScore(isInSwitchCheckE()); + steps[3010].SetScore(isInSwitchCheckE(),true); } } else @@ -167,7 +184,7 @@ public class Score_1002 : ScoreBase //ͨ if (SiteManager.instance.measuringCabinet.inSwitch.isOpen==true) { - + InSwitchOpenYDList.Add(triggerName); } } } @@ -222,6 +239,47 @@ public class Score_1002 : ScoreBase currentInstallJieXian.Remove(triggerName); } } + else if(triggerName.Contains("ܱӹ̶˿")) + { + //װ + if (steps[3012].isDone) + { + if ((bool)para) + installCover.Add(triggerName); + else + installCover.Remove(triggerName); + + steps[3015].SetScore(Check3015(),true); + } + } + else if(installTestJieXian.Any(a=>triggerName.StartsWith(a))) + { + // + if (steps[3012].isDone) + { + currentInstallTestJieXian.Add(triggerName); + } + } + else if(triggerName.Contains("ܱӡ")) + { + if (steps[3012].isDone) + { + if((bool)para) + { + if(!SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.isCut && !SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.isCut) + { + steps[3016].SetScore(true,true); + } + } + } + } + else if(triggerName== "") + { + if (steps[3012].isDone) + { + steps[3018].SetScore(true); + } + } } /// @@ -293,7 +351,9 @@ public class Score_1002 : ScoreBase { if (currentunInstallJieXian[i] != unInstallJieXian[i]) { - return false; + //˿ + if (currentunInstallJieXian[i].Replace("up","").Replace("down","") != unInstallJieXian[i].Replace("up", "").Replace("down", "")) + return false; } } @@ -321,14 +381,29 @@ public class Score_1002 : ScoreBase tmplist.Remove("ܱװ˿1"); tmplist.Remove("ܱװ˿2"); + for (int i = 0; i < tmplist.Count; i++) { - if (tmplist[i] != installJieXian[i]) - { - return false; - } + //˿ + if (tmplist[i].Replace("up", "").Replace("down", "") != installJieXian[i].Replace("up", "").Replace("down", "")) + return false; } return true; } + + public bool Check3015() + { + //عˣš + if (SiteManager.instance.measuringCabinet.inSwitch.isOpen && installCover.Contains("ܱӹ̶˿1") && installCover.Contains("ܱӹ̶˿2")) + { + //˳ + if(installTestJieXian.TrueForAll(a => currentInstallTestJieXian.Contains(a.Replace("up","").Replace("down","")))) + { + return true; + } + } + + return false; + } } diff --git a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs index 4e5a303..c9a5cfc 100644 --- a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs +++ b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs @@ -25,11 +25,15 @@ public class Tool_BoxSeal : Tool_Base { //ӡ SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install(); + // + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.CallScoreAction(true); } else if (screw == SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Right && SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Right.isInstall) { //ҷӡ SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install(); + // + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.CallScoreAction(true); } } }