From 7eea9aae73318cd76f65a5dcce36b5575b9f12fa Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期五, 06 六月 2025 14:29:45 +0800 Subject: [PATCH] 1.不同的Slot绑定不同的信号(Link Signal path) --- SourceCode/Bond/Servo/CEquipment.cpp | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp index 0aa06b1..2bc7c6e 100644 --- a/SourceCode/Bond/Servo/CEquipment.cpp +++ b/SourceCode/Bond/Servo/CEquipment.cpp @@ -1149,10 +1149,11 @@ if (m_slot[i].isLock()) continue; CGlass* pGlass = (CGlass*)m_slot[i].getContext(); if (pGlass == nullptr) continue; - if(!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE] - || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE] - || !m_bLinkSignal[0][SIGNAL_INTERLOCK] - || !m_bLinkSignal[0][SIGNAL_SEND_ABLE] ) continue; + int lsPath = m_slot[i].getLinkSignalPath(); + if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE] + || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE] + || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK] + || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue; MaterialsType glassType = pGlass->getType(); if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue; @@ -1173,10 +1174,11 @@ if (m_slot[i].isLock()) continue; CGlass* pGlass = (CGlass*)m_slot[i].getContext(); if (pGlass == nullptr) continue; - if (!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE] - || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE] - || !m_bLinkSignal[0][SIGNAL_INTERLOCK] - || !m_bLinkSignal[0][SIGNAL_SEND_ABLE]) continue; + int lsPath = m_slot[i].getLinkSignalPath(); + if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE] + || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE] + || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK] + || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue; MaterialsType glassType = pGlass->getType(); if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue; -- Gitblit v1.9.3