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

打分

This commit is contained in:
陈向学 2024-08-29 13:53:56 +08:00
parent a0782efc36
commit fa773a1cd9
5 changed files with 106 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab
View File

@ -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:

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

@ -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;
}
});
}
}

3
Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
View File

@ -9,5 +9,8 @@ public class Device_Sundries : Device_Base
base.OnMDown();
Debug.Log("清理柜子杂物");
gameObject.SetActive(false);
triggerAction.Invoke(triggerName, false);
base.CallScoreAction();
}
}

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

@ -46,10 +46,14 @@ public class Score_1002 : ScoreBase
/// </summary>
List<string> TestPen3list = new List<string>();
/// <summary>
/// 开关验电
/// 开关断电验电
/// </summary>
List<string> InSwitchCloseYDList=new List<string>();
/// <summary>
/// 开关通电验电
/// </summary>
List<string> InSwitchOpenYDList = new List<string>();
/// <summary>
/// 拆除接线顺序
/// </summary>
List<string> unInstallJieXian=new List<string>()
@ -85,6 +89,19 @@ public class Score_1002 : ScoreBase
/// 安装接线螺丝操作
/// </summary>
List<string> currentInstallJieXian = new List<string>();
/// <summary>
/// 安装流程安装盖子
/// </summary>
List<string> installCover = new List<string>();
/// <summary>
/// 安装流程对接验电螺丝
/// </summary>
List<string> installTestJieXian=new List<string>() { "验电笔+A_in_螺丝", "验电笔+B_in_螺丝", "验电笔+C_in_螺丝" };
/// <summary>
/// 安装流程对接验电操作
/// </summary>
List<string> currentInstallTestJieXian = new List<string>();
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);
}
}
}
/// <summary>
@ -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;
}
}

4
Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs
View File

@ -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);
}
}
}