From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交

---
 SourceCode/Bond/BEQLibrary/Equipment.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BEQLibrary/Equipment.h b/SourceCode/Bond/BEQLibrary/Equipment.h
index 09e9c95..1240457 100644
--- a/SourceCode/Bond/BEQLibrary/Equipment.h
+++ b/SourceCode/Bond/BEQLibrary/Equipment.h
@@ -48,6 +48,7 @@
 		void repData(CAcceptClient* pClient, CUnit* pUnit, const char* pszReply);
 		void repRecipeList(CAcceptClient* pClient, CUnit* pUnit, const char* pszReply);
 		void repRunRecipe(CAcceptClient* pClient, CUnit* pUnit, int id, const char* pszName, const char* pszReply);
+		void repNotReady(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply);
 		void repLoadReady(CAcceptClient* pClient, CUnit* pUnit, const char* pszUnitName, const char* pszMaterielId, const char* pszRecipeId, const char* pszReply);
 		void repLoad(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply);
 		void repUnload(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply);

--
Gitblit v1.9.3