From aabaff9cdcf9bb279b762891aedda5a03571fbb5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 08:55:07 +0800
Subject: [PATCH] 1.修改Glass的JobDataS的更新逻辑，在收到OnReceiveJob时，机器内未保存和管理Glass, 此时Glass在Arm上，应通过Arm来更新JobDataS；
---
SourceCode/Bond/Servo/CGlass.cpp | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index e975351..a88255a 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -108,8 +108,6 @@
m_pPath->serialize(ar);
}
char temp[JOBDATAS_SIZE] = { 0 };
- m_jobDataB.serialize(temp, JOBDATAB_SIZE);
- ar.Write(temp, JOBDATAB_SIZE);
m_jobDataS.serialize(temp, JOBDATAS_SIZE);
ar.Write(temp, JOBDATAS_SIZE);
ar << (ULONGLONG)m_pBuddy;
@@ -131,29 +129,22 @@
m_pPath->serialize(ar);
}
char temp[JOBDATAS_SIZE];
- ar.Read(temp, JOBDATAB_SIZE);
- m_jobDataB.unserialize(temp, JOBDATAB_SIZE);
ar.Read(temp, JOBDATAS_SIZE);
m_jobDataS.unserialize(temp, JOBDATAS_SIZE);
- ar >> ullPath; // 这是m_pBuddy, 用不上
+ ar >> ullPath; m_pBuddy = (CGlass*)ullPath;
ReadString(ar, m_strBuddyId);
Unlock();
}
}
- void CGlass::setJobDataB(CJobDataB* pJobDataB)
- {
- m_jobDataB.copy(pJobDataB);
- }
-
- CJobDataB* CGlass::getJobDataB()
- {
- return &m_jobDataB;
- }
-
void CGlass::setJobDataS(CJobDataS* pJobDataS)
{
m_jobDataS.copy(pJobDataS);
+ }
+
+ void CGlass::updateJobDataS(CJobDataS* pJobDataS)
+ {
+ m_jobDataS.update(pJobDataS);
}
CJobDataS* CGlass::getJobDataS()
@@ -166,9 +157,16 @@
if (m_pBuddy != nullptr) return FALSE;
if (pGlass->getType() == this->getType()) return FALSE;
m_pBuddy = pGlass;
- if (m_type == MaterialsType::G1) {
- m_pBuddy->addRef();
- }
+ m_pBuddy->addRef();
+ m_strBuddyId = m_pBuddy->getID();
+
+ return TRUE;
+ }
+
+ BOOL CGlass::forceSetBuddy(CGlass* pGlass)
+ {
+ m_pBuddy = pGlass;
+ m_pBuddy->addRef();
m_strBuddyId = m_pBuddy->getID();
return TRUE;
--
Gitblit v1.9.3