WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: WangWeiZhi:4184b24f4b28ea827c4eea831bdde80ae5a59cfc
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
..
compare: WangWeiZhi:c7beeb4a7d3c9342f2580f0f48c2709e4e256db3
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

No commits in common. "4184b24f4b28ea827c4eea831bdde80ae5a59cfc" and "c7beeb4a7d3c9342f2580f0f48c2709e4e256db3" have entirely different histories.
4184b24f4b ... c7beeb4a7d

2 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
View File

@ -267,8 +267,6 @@ public class Device_MeasuringCabinet : MonoBehaviour
AddActions(); AddActions();
//刷新带电状态 //刷新带电状态
CheckHasElectricity(); CheckHasElectricity();
//打分
ScoreManager.instance.Check(dianCollider.gameObject.name, true);
} }
} }
else else
@ -278,8 +276,6 @@ public class Device_MeasuringCabinet : MonoBehaviour
//情况接线关联螺丝 //情况接线关联螺丝
ClearLineScrew(); ClearLineScrew();
sundries.gameObject.SetActive(true); sundries.gameObject.SetActive(true);
//打分
ScoreManager.instance.Check(dianCollider.gameObject.name, false);
} }
} }
} }

8
Assets/Scripts/CXX/Score/Score_1002.cs
View File

@ -25,8 +25,8 @@ public class Score_1002 : ScoreBase
tmps.Add(new ScoreSubjectStep(3009, 3)); tmps.Add(new ScoreSubjectStep(3009, 3));
tmps.Add(new ScoreSubjectStep(3010,4)); tmps.Add(new ScoreSubjectStep(3010,4));
tmps.Add(new ScoreSubjectStep(3011, 3)); tmps.Add(new ScoreSubjectStep(3011, 3));
tmps.Add(new ScoreSubjectStep(3012, 20,true)); tmps.Add(new ScoreSubjectStep(3012, 20));
tmps.Add(new ScoreSubjectStep(3013, 20,true)); tmps.Add(new ScoreSubjectStep(3013, 20));
tmps.Add(new ScoreSubjectStep(3014, 5)); tmps.Add(new ScoreSubjectStep(3014, 5));
tmps.Add(new ScoreSubjectStep(3015, 5)); tmps.Add(new ScoreSubjectStep(3015, 5));
tmps.Add(new ScoreSubjectStep(3016, 3)); tmps.Add(new ScoreSubjectStep(3016, 3));
@ -386,7 +386,7 @@ public class Score_1002 : ScoreBase
if(!currentInstallJieXian.Contains("电能表拆装螺丝1") || !currentInstallJieXian.Contains("电能表拆装螺丝2")) if(!currentInstallJieXian.Contains("电能表拆装螺丝1") || !currentInstallJieXian.Contains("电能表拆装螺丝2"))
return false; return false;
if (currentInstallJieXian.Count < installJieXian.Count+2) if (currentInstallJieXian.Count < currentInstallJieXian.Count+2)
{ {
return false; return false;
} }
@ -415,7 +415,7 @@ public class Score_1002 : ScoreBase
if (SiteManager.instance.measuringCabinet.inSwitch.isOpen && installCover.Contains("电能表盖子固定螺丝1") && installCover.Contains("电能表盖子固定螺丝2")) if (SiteManager.instance.measuringCabinet.inSwitch.isOpen && installCover.Contains("电能表盖子固定螺丝1") && installCover.Contains("电能表盖子固定螺丝2"))
{ {
//无验电顺序 //无验电顺序
if(installTestJieXian.TrueForAll(a => currentInstallTestJieXian.Any(b=>b.Replace("up","").Replace("down","")==a))) if(installTestJieXian.TrueForAll(a => currentInstallTestJieXian.Contains(a.Replace("up","").Replace("down",""))))
{ {
return true; return true;
} }