From a0022a4e7d8da7391db2926acd69b3c712135762 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 01 九月 2025 11:49:28 +0800
Subject: [PATCH] 1.仅在千传模式下显示千传计数；
---
SourceCode/Bond/Servo/CBonder.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index c4eb76c..ef46752 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -193,12 +193,13 @@
// master recipe list report
CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xa955 : 0xe955, 255 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+ short ret = MRLRC_OK;
if (code == ROK && pszData != nullptr && size > 0) {
// 此处解释配方数据
- short ret = decodeRecipeListReport(pszData, size);
- pStep->setReturnCode(ret);
+ ret = decodeRecipeListReport(pszData, size);
}
- pStep->setReturnCode(MRLRC_OK);
+ pTmpStep->setReturnCode(ret);
return -1;
});
pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
@@ -459,7 +460,7 @@
return m_nIndex;
}
- BOOL CBonder::hasBondClass()
+ BOOL CBonder::hasBondGlass()
{
CGlass* pGlass = (CGlass*)m_slot[1].getContext();
if (pGlass == nullptr) return FALSE;
@@ -467,7 +468,7 @@
return pBuddy != nullptr;
}
- BOOL CBonder::hasG2Class()
+ BOOL CBonder::hasG2Glass()
{
CGlass* pGlass = (CGlass*)m_slot[0].getContext();
return (pGlass != nullptr);
--
Gitblit v1.9.3