createBaseFromDBID等接口需要完善。 按照API手册来实现。

Author: kbengine

kbe/src/server/baseapp/baseapp.cpp

@@ -995,6 +995,8 @@ void Baseapp::onCreateBaseFromDBIDCallback(Network::Channel* pChannel, KBEngine:
 	bool success = false;
 	bool wasActive = false;
 	ENTITY_ID entityID;
+	COMPONENT_ID wasActiveCID;
+	ENTITY_ID wasActiveEntityID;
 
 	s >> entityType;
 	s >> dbid;
@@ -1003,23 +1005,49 @@ void Baseapp::onCreateBaseFromDBIDCallback(Network::Channel* pChannel, KBEngine:
 	s >> entityID;
 	s >> wasActive;
 
-	if(!success)
+	if(wasActive)
 	{
-		ERROR_MSG(fmt::format("Baseapp::onCreateBaseFromDBID: create {}({}) is failed.\n",
-			entityType.c_str(), dbid));
+		s >> wasActiveCID;
+		s >> wasActiveEntityID;
+	}
 
+	if(!success)
+	{
 		if(callbackID > 0)
 		{
 			SCOPED_PROFILE(SCRIPTCALL_PROFILE);
 
-			Py_INCREF(Py_None);
+			PyObject* baseRef = NULL;
+
+			if(wasActive && wasActiveCID > 0 && wasActiveEntityID > 0)
+			{
+				Base* pBase = this->findEntity(wasActiveEntityID);
+				if(pBase)
+				{
+					baseRef = static_cast<PyObject*>(pBase);
+					Py_INCREF(baseRef);
+				}
+				else
+				{
+					baseRef = static_cast<PyObject*>(new EntityMailbox(EntityDef::findScriptModule(entityType.c_str()), NULL, wasActiveCID, wasActiveEntityID, MAILBOX_TYPE_BASE));
+				}
+			}
+			else
+			{
+				baseRef = Py_None;
+				Py_INCREF(baseRef);
+
+				ERROR_MSG(fmt::format("Baseapp::onCreateBaseFromDBID: create {}({}) is failed.\n",
+					entityType.c_str(), dbid));
+			}
+
 			// baseRef, dbid, wasActive
 			PyObjectPtr pyfunc = pyCallbackMgr_.take(callbackID);
 			if(pyfunc != NULL)
 			{
 				PyObject* pyResult = PyObject_CallFunction(pyfunc.get(), 
 													const_cast<char*>("OKi"), 
-													Py_None, dbid, wasActive);
+													baseRef, dbid, wasActive);
 
 				if(pyResult != NULL)
 					Py_DECREF(pyResult);
@@ -1031,6 +1059,8 @@ void Baseapp::onCreateBaseFromDBIDCallback(Network::Channel* pChannel, KBEngine:
 				ERROR_MSG(fmt::format("Baseapp::onCreateBaseFromDBID: can't found callback:{}.\n",
 					callbackID));
 			}
+
+			Py_DECREF(baseRef);
 		}
 
 		s.opfini();
@@ -1207,6 +1237,8 @@ void Baseapp::onCreateBaseAnywhereFromDBIDCallback(Network::Channel* pChannel, K
 	bool success = false;
 	bool wasActive = false;
 	ENTITY_ID entityID;
+	COMPONENT_ID wasActiveCID;
+	ENTITY_ID wasActiveEntityID;
 
 	s >> entityType;
 	s >> dbid;
@@ -1215,23 +1247,49 @@ void Baseapp::onCreateBaseAnywhereFromDBIDCallback(Network::Channel* pChannel, K
 	s >> entityID;
 	s >> wasActive;
 
-	if(!success)
+	if(wasActive)
 	{
-		ERROR_MSG(fmt::format("Baseapp::createBaseAnywhereFromDBID: create {}({}) is failed.\n", 
-			entityType.c_str(), dbid));
+		s >> wasActiveCID;
+		s >> wasActiveEntityID;
+	}
 
+	if(!success)
+	{
 		if(callbackID > 0)
 		{
 			SCOPED_PROFILE(SCRIPTCALL_PROFILE);
 
-			Py_INCREF(Py_None);
+			PyObject* baseRef = NULL;
+
+			if(wasActive && wasActiveCID > 0 && wasActiveEntityID > 0)
+			{
+				Base* pBase = this->findEntity(wasActiveEntityID);
+				if(pBase)
+				{
+					baseRef = static_cast<PyObject*>(pBase);
+					Py_INCREF(baseRef);
+				}
+				else
+				{
+					baseRef = static_cast<PyObject*>(new EntityMailbox(EntityDef::findScriptModule(entityType.c_str()), NULL, wasActiveCID, wasActiveEntityID, MAILBOX_TYPE_BASE));
+				}
+			}
+			else
+			{
+				ERROR_MSG(fmt::format("Baseapp::createBaseAnywhereFromDBID: create {}({}) is failed.\n", 
+					entityType.c_str(), dbid));
+
+				baseRef = Py_None;
+				Py_INCREF(baseRef);
+			}
+
 			// baseRef, dbid, wasActive
 			PyObjectPtr pyfunc = pyCallbackMgr_.take(callbackID);
 			if(pyfunc != NULL)
 			{
 				PyObject* pyResult = PyObject_CallFunction(pyfunc.get(), 
 													const_cast<char*>("OKi"), 
-													Py_None, dbid, wasActive);
+													baseRef, dbid, wasActive);
 
 				if(pyResult != NULL)
 					Py_DECREF(pyResult);
@@ -1243,6 +1301,8 @@ void Baseapp::onCreateBaseAnywhereFromDBIDCallback(Network::Channel* pChannel, K
 				ERROR_MSG(fmt::format("Baseapp::createBaseAnywhereFromDBID: can't found callback:{}.\n",
 					callbackID));
 			}
+
+			Py_DECREF(baseRef);
 		}
 
 		s.opfini();

kbe/src/server/dbmgr/dbtasks.cpp

@@ -1579,7 +1579,9 @@ callbackID_(callbackID),
 success_(false),
 s_(),
 entityID_(entityID),
-wasActive_(false)
+wasActive_(false),
+wasActiveCID_(0),
+wasActiveEntityID_(0)
 {
 }
 
@@ -1619,7 +1621,29 @@ bool DBTaskQueryEntity::db_thread_process()
 		}
 
 		if(!success_)
+		{
+			KBEEntityLogTable::EntityLog entitylog;
+
+			try
+			{
+				pELTable->queryEntity(pdbi_, dbid_, entitylog, pModule->getUType());
+			}
+			catch (std::exception & e)
+			{
+				DBException& dbe = static_cast<DBException&>(e);
+				if(dbe.isLostConnection())
+				{
+					static_cast<DBInterfaceMysql*>(pdbi_)->processException(e);
+					return true;
+				}
+				else
+					success_ = false;
+			}
+
+			wasActiveCID_ = entitylog.componentID;
+			wasActiveEntityID_ = entitylog.entityID;
 			wasActive_ = true;
+		}
 	}
 
 	return false;
@@ -1645,6 +1669,12 @@ thread::TPTask::TPTaskState DBTaskQueryEntity::presentMainThread()
 	(*pBundle) << entityID_;
 	(*pBundle) << wasActive_;
 
+	if(wasActive_)
+	{
+		(*pBundle) << wasActiveCID_;
+		(*pBundle) << wasActiveEntityID_;
+	}
+
 	if(success_)
 	{
 		pBundle->append(s_);

kbe/src/server/dbmgr/dbtasks.hpp

@@ -481,7 +481,11 @@ class DBTaskQueryEntity : public EntityDBTask
 	bool success_;
 	MemoryStream s_;
 	ENTITY_ID entityID_;
+
+	// 如果实体已经激活，则这个属性指向实体所在app
 	bool wasActive_;
+	COMPONENT_ID wasActiveCID_;
+	ENTITY_ID wasActiveEntityID_;
 };
 
 }