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

修改数据读取

This commit is contained in:
YangHua 2024-09-01 18:37:49 +08:00
parent 33b9624624
commit b1e6a750a3
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Scripts/Project/Manager/DataManager.cs
View File

@ -134,6 +134,9 @@ public class DataManager : BaseManager<DataManager>
d_System.subjects.Add(subject);
//流程
int processindex = 1;
int stepindex=1;
int operationIndex = 1;
var processNodes = xmlDoc.SelectNodes("TB_System/Subject/Process");
foreach (XmlNode processNode in processNodes)
{
@ -142,7 +145,9 @@ public class DataManager : BaseManager<DataManager>
process.processName = processNode.Attributes["processName"].Value;
//process.processDes = processNode.Attributes["processDes"].Value;
subject.processes.Add(process);
process.id = subject.processes.IndexOf(process)+1;
//process.id = subject.processes.IndexOf(process)+1;
process.id = processindex;
processindex++;
//步骤
foreach (XmlNode stepNode in processNode.ChildNodes)
{
@ -155,7 +160,9 @@ public class DataManager : BaseManager<DataManager>
//step.precondition= stepNode.Attributes["precondition"].Value;
//step.isPrecondition= bool.Parse(stepNode.Attributes["isPrecondition"].Value);
process.subProcesses.Add(step);
step.id = process.subProcesses.IndexOf(step)+1;
//step.id = process.subProcesses.IndexOf(step)+1;
step.id = stepindex;
stepindex++;
foreach (XmlNode operationNode in stepNode.ChildNodes)
{
@ -169,8 +176,9 @@ public class DataManager : BaseManager<DataManager>
operation.precondition = operationNode.Attributes["precondition"].Value;
//operation.isPrecondition = bool.Parse(operationNode.Attributes["isPrecondition"].Value);
step.subProcessStepes.Add(operation);
//operation.id = operationIndex;
operation.id = step.subProcessStepes.IndexOf(operation) + 1;
operation.id = operationIndex;
operationIndex++;
//operation.id = step.subProcessStepes.IndexOf(operation) + 1;
}
}
}

42
Assets/Scripts/Project/Manager/ProcessManager.cs
View File

@ -113,10 +113,10 @@ public class ProcessManager : BaseManager<ProcessManager>
}
/// <summary>
/// 切换
/// 切换 -1-错误操作，0-结束，1-流程，2-子流程，3-子流程步骤
/// </summary>
/// <returns></returns>
public bool CheckSubProcessSteps(int subProcessStepID)
public int CheckSubProcessSteps(int subProcessStepID)
{
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId.Equals(subProcessStepID))
{
@ -127,7 +127,7 @@ public class ProcessManager : BaseManager<ProcessManager>
HandoverSubProcessStep(spStepID);
//Debug.Log("进入下一步子流程步骤");
return true;
return 3;
}
else
{
@ -138,7 +138,7 @@ public class ProcessManager : BaseManager<ProcessManager>
HandoverSubProcess(spID, 0);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
//Debug.Log("进入下一步子流程");
return true;
return 2;
}
else
{
@ -151,14 +151,14 @@ public class ProcessManager : BaseManager<ProcessManager>
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
Debug.Log($"<color=red>进入下一步流程</color>");
return true;
return 1;
}
else
{
Debug.Log($"<color=red>完成所有</color>");
//HQB 20240828完成后展示学习完成Tips
GameManager.UIMgr.ShowPanel<UI_TipsForPracticePanel>(E_UI_Layer.System);
return false;
return 0;
}
}
@ -168,7 +168,7 @@ public class ProcessManager : BaseManager<ProcessManager>
{
Debug.Log($"<color=red>按照流程走</color>");
StepErrorTips();
return false;
return -1;
}
}
@ -194,24 +194,24 @@ public class ProcessManager : BaseManager<ProcessManager>
}
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0)
{
//if (currentSubProcessIDTemp == d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId)
//{
// Debug.Log($"<color=red>子流程id相等</color>");
//}
//else
//{
// Debug.Log($"<color=green>子流程id不相等</color>");
//}
if (triggerName != "工具间按钮" && triggerName != "现场按钮" && triggerName != "收回工具")
{
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
{
p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () =>
//if (CheckSubProcessSteps(subProcessStepId) == 3)
//{
//}
//else
//{
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
{
CheckSubProcessSteps(subProcessStepId);
CurrentSubProcessStepTriggerNames();
p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () =>
{
CheckSubProcessSteps(subProcessStepId);
CurrentSubProcessStepTriggerNames();
});
});
});
//}
}
else
{