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

Compare commits

base: WangWeiZhi:344a6badcb626b70185fecc11d3a71e83f1670a1
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
...
compare: WangWeiZhi:f5b411a98f305bfc7eca3023fc07fbdb0a7c9f4a
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

2 Commits
344a6badcb ... f5b411a98f

Author SHA1 Message Date
陈向学 f5b411a98f Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-02 17:21:23 +08:00
陈向学 2dd72fa3d4 aa 2024-09-02 17:21:20 +08:00
2 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
Assets/Scripts/CXX/Tools/Tool_TestPen.cs
View File

@ -75,6 +75,7 @@ public class Tool_TestPen : Tool_Base
{
if (!isMoving)
{
isFlicker = false;
base.ReBackHead();
}
}

4
Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs
View File

@ -38,12 +38,12 @@ public class D_SubProcessStep : I_Enter, I_Exit
string[] toolIdTemp = triggerID.Split(',');
for (int i = 0; i < toolIdTemp.Length; i++)
{
triggersName.Add(toolIdTemp[i].Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
triggersName.Add(toolIdTemp[i].Replace("\r\n", "").Replace("\n", "").Replace("\r", "").Trim());
}
}
else
{
triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", "").Trim());
}
ProcessManager.Instance.subProcessStepTriggerID = triggersName[0];
}