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

Compare commits

base: WangWeiZhi:4a3f280adc679ed67c2e9446fd56fdd713582455
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
..
compare: WangWeiZhi:177a21c9504bb1de34c7054a5c927ae675bd2aa7
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

No commits in common. "4a3f280adc679ed67c2e9446fd56fdd713582455" and "177a21c9504bb1de34c7054a5c927ae675bd2aa7" have entirely different histories.
4a3f280adc ... 177a21c950

11 changed files with 62 additions and 78 deletions
Show Stats Expand all files Collapse all files

BIN
Assets/ArtRes/Excel/Config.xlsx
View File

Binary file not shown.

12
Assets/Scenes/05_LiveScene.unity
View File

@ -6373,7 +6373,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2576541079831587447, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u5C01\u53701"
value: "\u7535\u80FD\u8868\u5C01\u5370"
objectReference: {fileID: 0}
- target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerID
@ -6381,7 +6381,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u5C01\u53702"
value: "\u7535\u80FD\u8868\u5C01\u5370"
objectReference: {fileID: 0}
- target: {fileID: 2576541080106509928, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
@ -6417,7 +6417,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2576541080563400544, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1"
value: "\u7535\u80FD\u8868\u87BA\u4E1D"
objectReference: {fileID: 0}
- target: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
@ -6433,7 +6433,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2576541080772862035, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2"
value: "\u7535\u80FD\u8868\u87BA\u4E1D"
objectReference: {fileID: 0}
- target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
@ -6519,10 +6519,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_Name
value: "\u7535\u80FD\u8868\u76D6\u5B50"
objectReference: {fileID: 0}
- target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_IsActive
value: 1

1
Assets/Scripts/CXX/Devices/Device_Base.cs
View File

@ -14,7 +14,6 @@ public class Device_Base : PermanentTriggerBase
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnStart();
Debug.Log("Device_Base PermanentTriggerBase");
}
}

32
Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
View File

@ -39,28 +39,24 @@ public class Device_CabinetDoor : Device_Base
//关门
transform.DOLocalRotate(new Vector3(0, 0, 0), 3).OnComplete(() =>
{
//关锁
transform.Find("计量柜锁2/计量柜锁3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() =>
{
isOpen = false;
});
//关锁
transform.Find("计量柜锁2/计量柜锁3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() =>
{
isOpen = false;
});
});
}
protected override void OnMDown()
private void OnMouseDown()
{
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "验电笔") return;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
if (LiveSceneManager.Instance.currentTool.name == "验电笔") return;
if (isOpen)
{
base.OnMDown();
if (isOpen)
{
Close();
}
else
{
Open();
}
Close();
}
else
{
Open();
}
}
}

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

@ -31,7 +31,7 @@ public class Tool_TestPen : Tool_Base
return;
}
//螺丝
//柜门
Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
if (tb != null)
{
@ -66,7 +66,6 @@ public class Tool_TestPen : Tool_Base
{
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0)
{
Debug.Log("Test(Device_Base device_base)");
if (device_base.deviceType == DeviceType.计量柜_插座)
{
var tmp = ((Device_Socket)device_base);
@ -75,12 +74,10 @@ public class Tool_TestPen : Tool_Base
transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
Debug.Log("计量柜_插座 已验电");
isFlicker = tmp.hasElectricity;
}
else if (device_base.deviceType == DeviceType.计量柜_柜门)
{
var tmp = ((Device_CabinetDoor)device_base);
//位置移动
transform.position = tmp.testPosAndRot.position;
transform.localEulerAngles = tmp.testPosAndRot.localEulerAngles;
@ -92,24 +89,24 @@ public class Tool_TestPen : Tool_Base
}
}
/// <summary>
/// 执行验电操作
/// </summary>
/// <param name="tool_base">被验电设备</param>
public void Test(Tool_Base tool_base)
/// <summary>
/// 执行验电操作
/// </summary>
/// <param name="tool_base">被验电设备</param>
public void Test(Tool_Base tool_base)
{
if (tool_base.toolType == ToolType.螺丝)
{
if (tool_base.toolType == ToolType.螺丝)
{
var tmp = ((Tool_Screw)tool_base);
//位置移动
transform.position = tmp.installPos.position;
transform.localEulerAngles = tmp.installPos.localEulerAngles;
Debug.Log("螺丝 已验电");
isFlicker = tmp.hasElectricity;
}
screem.materials[0].color = isFlicker ? Color.red : Color.white;
var tmp = ((Tool_Screw)tool_base);
//位置移动
transform.position = tmp.installPos.position;
transform.localEulerAngles = tmp.installPos.localEulerAngles;
Debug.Log("螺丝 已验电");
isFlicker = tmp.hasElectricity;
}
screem.materials[0].color = isFlicker ? Color.red : Color.white;
}
}

7
Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
View File

@ -27,7 +27,7 @@ public class Tool_WireStripper : Tool_Base
/// <returns></returns>
IEnumerator PlayAnimi(Device_Seal device_Seal)
{
SkinnedMeshRenderer renderer = GetComponentInChildren<SkinnedMeshRenderer>();
SkinnedMeshRenderer renderer= GetComponentInChildren<SkinnedMeshRenderer>();
float vlaue = 0;
//´ò¿ª
while (renderer.GetBlendShapeWeight(0) < 100)
@ -59,10 +59,7 @@ public class Tool_WireStripper : Tool_Base
Device_Seal ds = hit.transform.GetComponent<Device_Seal>();
if (ds != null)
{
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ds.triggerName, true) == 0)
{
CutOpen(ds);
}
CutOpen(ds);
}
}
}

1
Assets/Scripts/Project/Manager/LiveSceneManager.cs
View File

@ -30,7 +30,6 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
p.Init("", "您好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户更换电能计量表", (intTemp) => { Destroy(currentTool); });
});
tMDTips.gameObject.SetActive(false);
currentTool.transform.localEulerAngles = new Vector3(90, 0, 0);
}
}

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

@ -166,7 +166,10 @@ public class ProcessManager : BaseManager<ProcessManager>
else
{
Debug.Log("按照流程走");
StepErrorTips();
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.Mid, (panel) =>
{
panel.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
});
return false;
}
@ -201,7 +204,10 @@ public class ProcessManager : BaseManager<ProcessManager>
}
else
{
StepErrorTips();
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
{
p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
});
return 1;
}
}
@ -212,24 +218,12 @@ public class ProcessManager : BaseManager<ProcessManager>
}
}
else
{
StepErrorTips();
return -1;
}
}
private void StepErrorTips()
{
if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>())
{
GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>().Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
}
else
{
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
{
p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
p.Init($"错误,请前往{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.SceneName()}");
});
return -1;
}
}

12
Assets/Scripts/Project/Objects/Other/NPCController.cs
View File

@ -6,11 +6,19 @@ public class NPCController : PermanentTriggerBase
{
public List<string> npcSpeack;
public int speackIndex = 0;
private bool onSpeackOver;
protected override void OnMDown()
{
base.OnMDown();
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false ) == 0)
if(npcSpeack.Count > 1)
{
onSpeackOver = false;
}
else
{
onSpeackOver = true;
}
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, onSpeackOver) == 0)
{
GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>
{

4
Assets/Scripts/Project/UI/UI_Panel/UI_MiddleTipPanel.cs
View File

@ -23,13 +23,11 @@ public class UI_MiddleTipPanel : BasePanel
/// </summary>
private void Hide()
{
StopCoroutine(HideAsync());
StartCoroutine(HideAsync());
}
private IEnumerator HideAsync()
{
yield return new WaitForSeconds(disappear);
GameManager.UIMgr.HidePanel<UI_MiddleTipPanel>();
UIManager.Instance.HidePanel<UI_MiddleTipPanel>();
}
}

BIN
Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary
View File

Binary file not shown.