From 690bbf01bc579aff0ca31b2f326c7a6b5d83604d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 六月 2025 10:51:13 +0800
Subject: [PATCH] 1.Slot的部分数据不需要存储,否则影响代码修改Slot布局等信息; 2.Bonder Porcess完成后,合成两片一起搬送的逻辑问题;

---
 SourceCode/Bond/Servo/CEquipment.cpp |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 0a7d384..bd36700 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -777,16 +777,19 @@
 
 
 		// 如果此玻璃已经贴合,贴合的玻璃也要从加入到列表中
-		/*
 		CGlass* pBuddy = pGlass->getBuddy();
 		if (pBuddy != nullptr) {
 			Lock();
 			pBuddy->addPath(m_nID);
-			pBuddy->addRef();					// 加入list,addRef
-			m_glassList.push_back(pBuddy);
+			if (putSlot % 2 == 0) {
+				m_slot[putSlot - 2].setContext(pBuddy);
+			}
+			else {
+				m_slot[putSlot].setContext(pBuddy);
+			}
 			Unlock();
 		}
-		*/
+
 
 		if (m_listener.onDataChanged != nullptr) {
 			m_listener.onDataChanged(this, EDCC_STORED_JOB);

--
Gitblit v1.9.3