From 8341539b4c7e83ff0873c5d897d9b9e4e4a424b3 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Thu, 29 Aug 2024 18:00:15 +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 --- .../Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs | 4 ++++ Assets/Scripts/CXX/Score/Score_1002.cs | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs index 89bdbb4..9c83ca7 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs @@ -267,6 +267,8 @@ public class Device_MeasuringCabinet : MonoBehaviour AddActions(); //ˢ´״̬ CheckHasElectricity(); + // + ScoreManager.instance.Check(dianCollider.gameObject.name, true); } } else @@ -276,6 +278,8 @@ public class Device_MeasuringCabinet : MonoBehaviour //߹˿ ClearLineScrew(); sundries.gameObject.SetActive(true); + // + ScoreManager.instance.Check(dianCollider.gameObject.name, false); } } } diff --git a/Assets/Scripts/CXX/Score/Score_1002.cs b/Assets/Scripts/CXX/Score/Score_1002.cs index f62ae1a..21e480f 100644 --- a/Assets/Scripts/CXX/Score/Score_1002.cs +++ b/Assets/Scripts/CXX/Score/Score_1002.cs @@ -25,8 +25,8 @@ public class Score_1002 : ScoreBase tmps.Add(new ScoreSubjectStep(3009, 3)); tmps.Add(new ScoreSubjectStep(3010,4)); tmps.Add(new ScoreSubjectStep(3011, 3)); - tmps.Add(new ScoreSubjectStep(3012, 20)); - tmps.Add(new ScoreSubjectStep(3013, 20)); + tmps.Add(new ScoreSubjectStep(3012, 20,true)); + tmps.Add(new ScoreSubjectStep(3013, 20,true)); tmps.Add(new ScoreSubjectStep(3014, 5)); tmps.Add(new ScoreSubjectStep(3015, 5)); tmps.Add(new ScoreSubjectStep(3016, 3)); @@ -386,7 +386,7 @@ public class Score_1002 : ScoreBase if(!currentInstallJieXian.Contains("ܱװ˿1") || !currentInstallJieXian.Contains("ܱװ˿2")) return false; - if (currentInstallJieXian.Count < currentInstallJieXian.Count+2) + if (currentInstallJieXian.Count < installJieXian.Count+2) { return false; } @@ -415,7 +415,7 @@ public class Score_1002 : ScoreBase if (SiteManager.instance.measuringCabinet.inSwitch.isOpen && installCover.Contains("ܱӹ̶˿1") && installCover.Contains("ܱӹ̶˿2")) { //˳ - if(installTestJieXian.TrueForAll(a => currentInstallTestJieXian.Contains(a.Replace("up","").Replace("down","")))) + if(installTestJieXian.TrueForAll(a => currentInstallTestJieXian.Any(b=>b.Replace("up","").Replace("down","")==a))) { return true; }