Compare commits

..

No commits in common. "07c2e0321e5e8a4b71b07f903b73610c5f5d22ae" and "d70d2bc316831dc7db9524f7984742a727d25672" have entirely different histories.

7 changed files with 15 additions and 20 deletions

Binary file not shown.

View File

@ -2960,7 +2960,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
triggerID: 5021 triggerID: 5021
triggerName: "\u7A7A\u5F002" triggerName:
_highlight: {fileID: 0} _highlight: {fileID: 0}
deviceType: 4 deviceType: 4
isOpen: 1 isOpen: 1
@ -3162,7 +3162,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
triggerID: 0 triggerID: 0
triggerName: "\u7A7A\u5F002" triggerName:
_highlight: {fileID: 0} _highlight: {fileID: 0}
deviceType: 4 deviceType: 4
isOpen: 1 isOpen: 1

View File

@ -30,23 +30,20 @@ public class Device_Cover : Device_Base
private void OnMouseDown() private void OnMouseDown()
{ {
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0) Debug.Log("½ÓÏßÍêºÃ");
{ isCheckOK = true;
Debug.Log("½ÓÏßÍêºÃ");
isCheckOK = true;
if (!isOpen) if(!isOpen)
{
if (!cover_screw_Left.isInstall && !cover_screw_Right.isInstall)
{ {
if (!cover_screw_Left.isInstall && !cover_screw_Right.isInstall) Open();
{
Open();
}
}
else if (isOpen)
{
Close();
} }
} }
else if(isOpen)
{
Close();
}
} }
/// <summary> /// <summary>
@ -57,10 +54,7 @@ public class Device_Cover : Device_Base
Debug.Log("´ò¿ª¸Ç×Ó"); Debug.Log("´ò¿ª¸Ç×Ó");
isOpen = true; isOpen = true;
transform.DOLocalMoveY(-0.1388763f, 2); transform.DOLocalMoveY(-0.1388763f, 2);
transform.DOLocalMoveZ(-0.2485413f, 2).OnComplete(() => transform.DOLocalMoveZ(-0.2485413f, 2);
{
GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
});
} }
/// <summary> /// <summary>

View File

@ -55,7 +55,7 @@ public class Tool_Screwdriver : Tool_Base
Debug.Log("·âӡδ¼ô¶Ï"); Debug.Log("·âӡδ¼ô¶Ï");
return; return;
} }
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ts.triggerName, true) == 0) if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ts.triggerName, false) == 0)
{ {
if (ts.isInstall) if (ts.isInstall)
{ {

View File

@ -69,6 +69,7 @@ public class Tool_TestPen : Tool_Base
{ {
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0) if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0)
{ {
Debug.Log("Test(Device_Base device_base)");
if (device_base.deviceType == DeviceType.¼ÆÁ¿¹ñ_²å×ù) if (device_base.deviceType == DeviceType.¼ÆÁ¿¹ñ_²å×ù)
{ {
var tmp = ((Device_Socket)device_base); var tmp = ((Device_Socket)device_base);