From 980048d93f7ee401639d441d65f4f885749fd898 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 六月 2025 17:54:09 +0800
Subject: [PATCH] 1.Glass List页面修改为Slot并以Slot的形式展现数据，不论有无Glass
---
SourceCode/Bond/Servo/CEquipment.cpp | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 0aa06b1..f5cfa15 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;
@@ -1190,6 +1192,12 @@
return nullptr;
}
+ CSlot* CEquipment::getSlot(int index)
+ {
+ if (index >= SLOT_MAX) return nullptr;
+ return &m_slot[index];
+ }
+
CGlass* CEquipment::getGlassFromSlot(int slotNo)
{
CSlot* pSlot = nullptr;
--
Gitblit v1.9.3