0219-1
This commit is contained in:
parent
6644caf893
commit
377cedaff3
|
@ -1,14 +1,84 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{B60A1A4B-3274-9214-3B33-B6B07FF00508}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{479C7785-00F8-E4DD-6F50-4912B2328559}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{45A86287-EECA-2404-3600-49979BD6DF7A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{C7732B68-8759-6B9C-C6DC-383ACBB6867F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniRx", "UniRx.csproj", "{027529A4-757F-2DCA-8A3D-6BF8D4679C54}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{A3409E4B-03A6-422B-5442-09EF9FEA472C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{6FED8397-9CE4-ABC2-8B3A-EB6C4BB115BF}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{17D55B71-69D4-B1FF-82EE-115B4B038AB4}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{C5722A6B-5CDA-5F7B-47D3-D91CA3FA2AEC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{6606376D-2751-5A78-024B-7FD7BE51BE7D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{269EC4DC-055C-AEC4-C9EC-15E1FBD584C8}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sirenix.OdinInspector.Modules.UnityMathematics", "Sirenix.OdinInspector.Modules.UnityMathematics.csproj", "{A4DA56F2-3C40-80F1-5F93-641EBA82D021}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
|
||||
{B60A1A4B-3274-9214-3B33-B6B07FF00508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B60A1A4B-3274-9214-3B33-B6B07FF00508}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B60A1A4B-3274-9214-3B33-B6B07FF00508}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B60A1A4B-3274-9214-3B33-B6B07FF00508}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{479C7785-00F8-E4DD-6F50-4912B2328559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{479C7785-00F8-E4DD-6F50-4912B2328559}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{479C7785-00F8-E4DD-6F50-4912B2328559}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{479C7785-00F8-E4DD-6F50-4912B2328559}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{45A86287-EECA-2404-3600-49979BD6DF7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{45A86287-EECA-2404-3600-49979BD6DF7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{45A86287-EECA-2404-3600-49979BD6DF7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{45A86287-EECA-2404-3600-49979BD6DF7A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C7732B68-8759-6B9C-C6DC-383ACBB6867F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C7732B68-8759-6B9C-C6DC-383ACBB6867F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C7732B68-8759-6B9C-C6DC-383ACBB6867F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C7732B68-8759-6B9C-C6DC-383ACBB6867F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{027529A4-757F-2DCA-8A3D-6BF8D4679C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{027529A4-757F-2DCA-8A3D-6BF8D4679C54}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{027529A4-757F-2DCA-8A3D-6BF8D4679C54}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{027529A4-757F-2DCA-8A3D-6BF8D4679C54}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A3409E4B-03A6-422B-5442-09EF9FEA472C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A3409E4B-03A6-422B-5442-09EF9FEA472C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A3409E4B-03A6-422B-5442-09EF9FEA472C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A3409E4B-03A6-422B-5442-09EF9FEA472C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6FED8397-9CE4-ABC2-8B3A-EB6C4BB115BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6FED8397-9CE4-ABC2-8B3A-EB6C4BB115BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6FED8397-9CE4-ABC2-8B3A-EB6C4BB115BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6FED8397-9CE4-ABC2-8B3A-EB6C4BB115BF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{17D55B71-69D4-B1FF-82EE-115B4B038AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{17D55B71-69D4-B1FF-82EE-115B4B038AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{17D55B71-69D4-B1FF-82EE-115B4B038AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{17D55B71-69D4-B1FF-82EE-115B4B038AB4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C5722A6B-5CDA-5F7B-47D3-D91CA3FA2AEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C5722A6B-5CDA-5F7B-47D3-D91CA3FA2AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C5722A6B-5CDA-5F7B-47D3-D91CA3FA2AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C5722A6B-5CDA-5F7B-47D3-D91CA3FA2AEC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6606376D-2751-5A78-024B-7FD7BE51BE7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6606376D-2751-5A78-024B-7FD7BE51BE7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6606376D-2751-5A78-024B-7FD7BE51BE7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6606376D-2751-5A78-024B-7FD7BE51BE7D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{269EC4DC-055C-AEC4-C9EC-15E1FBD584C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{269EC4DC-055C-AEC4-C9EC-15E1FBD584C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{269EC4DC-055C-AEC4-C9EC-15E1FBD584C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{269EC4DC-055C-AEC4-C9EC-15E1FBD584C8}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A4DA56F2-3C40-80F1-5F93-641EBA82D021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A4DA56F2-3C40-80F1-5F93-641EBA82D021}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A4DA56F2-3C40-80F1-5F93-641EBA82D021}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A4DA56F2-3C40-80F1-5F93-641EBA82D021}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
@ -445,7 +445,7 @@ Transform:
|
|||
m_Children:
|
||||
- {fileID: 1817104531432765975}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1817104532591070032
|
||||
MonoBehaviour:
|
||||
|
@ -472,60 +472,3 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isOnceAddFun: 0
|
||||
--- !u!1001 &3218341170884851037
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 757468636791730901, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Reporter
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 757468636791730902, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: cfe11cf69e9a8eb48aa8d7f55802df30, type: 3}
|
||||
|
|
|
@ -175,12 +175,12 @@ public class Score_4001 : ScoreBase
|
|||
float tmp = 0;
|
||||
tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("国网安全帽") ? 0.25f : 0);
|
||||
tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("工作服") ? 0.25f : 0);
|
||||
tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("绝缘手套") ? 0.25f : 0);
|
||||
tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("编织手套") ? 0.25f : 0);
|
||||
tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("绝缘靴") ? 0.25f : 0);
|
||||
steps[5].SetScore(tmp);
|
||||
|
||||
//检查背包是否携带
|
||||
string[] shoudleTools = new string[] { "剥线钳", "绝缘螺丝刀", "验电笔", "国网安全帽", "工作服", "绝缘手套", "绝缘靴", "工作证", "盒装封印", "采集器" };
|
||||
string[] shoudleTools = new string[] { "剥线钳", "绝缘螺丝刀", "验电笔", "国网安全帽", "工作服", "编织手套", "绝缘靴", "工作证", "盒装封印", "采集器" };
|
||||
float tmp2 = 1;
|
||||
shoudleTools.ToList().ForEach(a =>
|
||||
{
|
||||
|
|
|
@ -96,7 +96,7 @@ public class StepState_4001 : StepState
|
|||
//选取工器具
|
||||
|
||||
//服装拿到背包
|
||||
List<Tool_SelectComponent> items = ToolAndmaterialMgr.Instance.GetItemInfoByName(new List<string> { "国网安全帽", "工作服", "绝缘手套", "绝缘靴" });
|
||||
List<Tool_SelectComponent> items = TooRoomMannger.Instance.GetItemInfoByName(new List<string> { "国网安全帽", "工作服", "编织手套", "绝缘靴" });
|
||||
items.ForEach(item =>
|
||||
{
|
||||
PacksackBagMgr.Instance.AddOneToolOrMater(item.itemInfo);
|
||||
|
@ -132,7 +132,7 @@ public class StepState_4001 : StepState
|
|||
//清空背包数据
|
||||
PacksackBagMgr.Instance.ClearAllData();
|
||||
//生成服装
|
||||
List<ItemInfo> items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "国网安全帽", "工作服", "绝缘手套", "绝缘靴" });
|
||||
List<ItemInfo> items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "国网安全帽", "工作服", "编织手套", "绝缘靴" });
|
||||
//放入背包
|
||||
items.ForEach(item =>
|
||||
{
|
||||
|
@ -141,7 +141,7 @@ public class StepState_4001 : StepState
|
|||
PacksackBagMgr.Instance.WearItemState(item, true);
|
||||
});
|
||||
//生成工具
|
||||
List<ItemInfo> items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "剥线钳","绝缘螺丝刀","验电笔","国网安全帽","工作服","绝缘手套","绝缘靴","工作证","盒装封印","采集器" });
|
||||
List<ItemInfo> items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "剥线钳","绝缘螺丝刀","验电笔","国网安全帽","工作服","编织手套","绝缘靴","工作证","盒装封印","采集器" });
|
||||
items2.ForEach(item =>
|
||||
{
|
||||
PacksackBagMgr.Instance.AddOneToolOrMater(item);
|
||||
|
|
|
@ -182,7 +182,7 @@ public class Device_Control_6001 : Device_Control
|
|||
collector.gameObject.SetActive(true);
|
||||
collector.gameObject.name = "采集器";
|
||||
collector.isInstalled = true;
|
||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_collectorTrigger.triggerName, true) == 0)
|
||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_collectorTrigger.triggerName, false) == 0)
|
||||
{
|
||||
collector.plug.SetPlugColliderState(true);
|
||||
ScoreManager.instance.Check(collector.gameObject.name, "采集器完成重装");
|
||||
|
|
|
@ -18,7 +18,7 @@ public class MobileAttach10002_2002 : MonoBehaviour
|
|||
{
|
||||
GameManager.UIMgr.ShowPanel<UI_PlayerSessionPanel>(E_UI_Layer.Mid, (panel) =>
|
||||
{
|
||||
panel.Init(triggerName, "我是xxx供电所人员,到xxx地方开展直接接入式电能计量装置装拆及验收标准化作业。", PlayerTalk, 0);
|
||||
panel.Init(triggerName, "您好,我是 XX 供电公司工作人员。请问您是 XX(地址)的客户 X 先生/女士吗?我们在系统上监测到贵户的电表数据没有上传,计划在 XX 日 XX 时至 XX 时派人到您那排查问题,请问您是否可以留人配合我们工作?", PlayerTalk, 0);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<ToolMaterial id="5007" objName="拆装工单按钮" type="3"></ToolMaterial>
|
||||
<ToolMaterial id="5008" objName="国网安全帽" type="0"></ToolMaterial>
|
||||
<ToolMaterial id="5009" objName="工作服" type="0"></ToolMaterial>
|
||||
<ToolMaterial id="5010" objName="绝缘手套" type="0"></ToolMaterial>
|
||||
<ToolMaterial id="5010" objName="编织手套" type="0"></ToolMaterial>
|
||||
<ToolMaterial id="5011" objName="绝缘靴" type="0"></ToolMaterial>
|
||||
<ToolMaterial id="5012" objName="镜子" type="3"></ToolMaterial>
|
||||
<ToolMaterial id="5013" objName="低压工作票确认按钮" type="3"></ToolMaterial>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<TB_System id="10002" systemName="计量装置轮换及现场校验仿真" loadName="计量装置轮换及现场校验仿真" titleName="计量装置轮换及现场校验仿真">
|
||||
|
||||
<Subject id="2002" deviceTypeId="20002" schemeName="直接接入式电能计量装置" deviceMap="单相表" schemeDes="" ToolOrMaterilOrDevice="剥线钳,绝缘螺丝刀,验电笔,国网安全帽,工作服,绝缘手套,绝缘靴,工作证,盒装封印,绝缘胶带,三相四线费控智能电能表">
|
||||
<Subject id="2002" deviceTypeId="20002" schemeName="直接接入式电能计量装置" deviceMap="单相表" schemeDes="" ToolOrMaterilOrDevice="剥线钳,绝缘螺丝刀,验电笔,国网安全帽,工作服,编织手套,绝缘靴,工作证,盒装封印,绝缘胶带,三相四线费控智能电能表">
|
||||
|
||||
<Process id="" processName="任务接受" processDes="">
|
||||
|
||||
|
@ -25,8 +25,8 @@
|
|||
|
||||
<Step id="" subProcessName="正确着装" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间,选取工作服、绝缘鞋、安全帽、手套,到梳妆镜面前进行换装">
|
||||
<operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="前往工具间" score=""></operation>
|
||||
<operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请按照提示点击正确的着装" score=""></operation>
|
||||
<operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请点击镜子,按顺序点击着装" score=""></operation>
|
||||
<operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,编织手套,绝缘靴" tipTitle="请按照提示点击正确的着装" score=""></operation>
|
||||
<operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,编织手套,绝缘靴" tipTitle="请点击镜子,按顺序点击着装" score=""></operation>
|
||||
</Step>
|
||||
|
||||
<Step id="" subProcessName="选取工器具" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间,按照顺序选取剥线钳,绝缘螺丝刀,验电笔,工作证,盒装封印,绝缘胶带,三相四线费控智能电能表">
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue