实体组件属性修改后的标脏机制

kbengine#630
实体组件方法的real调用机制
kbengine#629

Author: kebiao

kbe/src/lib/client_lib/entity_component.cpp

@@ -21,4 +21,10 @@ SCRIPT_GET_DECLARE("base",							pyGetBaseEntityCall,	0,					0)
 SCRIPT_GETSET_DECLARE_END()
 BASE_SCRIPT_INIT(EntityComponent, 0, 0, 0, 0, 0)
 
+//-------------------------------------------------------------------------------------
+PyObject* EntityComponent::onScriptGetAttribute(PyObject* attr)
+{
+	return ScriptObject::onScriptGetAttribute(attr);
+}
+
 }

kbe/src/lib/entitydef/entity_component.cpp

@@ -396,40 +396,6 @@ void EntityComponent::onInstallScript(PyObject* mod)
 	*/
 }
 
-//-------------------------------------------------------------------------------------
-PyObject* EntityComponent::onScriptGetAttribute(PyObject* attr)
-{
-	wchar_t* PyUnicode_AsWideCharStringRet0 = PyUnicode_AsWideCharString(attr, NULL);
-	char* ccattr = strutil::wchar2char(PyUnicode_AsWideCharStringRet0);
-	PyMem_Free(PyUnicode_AsWideCharStringRet0);
-
-	/*
-	// 如果是ghost调用def方法则需要rpc调用。
-	if (!isReal())
-	{
-		MethodDescription* pMethodDescription = const_cast<ScriptDefModule*>(pScriptModule())->findCellMethodDescription(ccattr);
-
-		if (pMethodDescription)
-		{
-			free(ccattr);
-			return new RealEntityMethod(pMethodDescription, this);
-		}
-	}
-	else
-	{
-		// 如果访问了def持久化类容器属性
-		// 由于没有很好的监测容器类属性内部的变化，这里使用一个折中的办法进行标脏
-		PropertyDescription* pPropertyDescription = const_cast<ScriptDefModule*>(pScriptModule())->findPersistentPropertyDescription(ccattr);
-		if (pPropertyDescription && (pPropertyDescription->getFlags() & ENTITY_CELL_DATA_FLAGS) > 0)
-		{
-			setDirty();
-		}
-	}
-	*/
-	free(ccattr);
-	return ScriptObject::onScriptGetAttribute(attr);
-}
-
 //-------------------------------------------------------------------------------------
 int EntityComponent::onScriptSetAttribute(PyObject* attr, PyObject* value)
 {

kbe/src/server/baseapp/entity_component.cpp

@@ -21,4 +21,10 @@ SCRIPT_GET_DECLARE("client",						pyGetClientEntityCall,	0,					0)
 SCRIPT_GETSET_DECLARE_END()
 BASE_SCRIPT_INIT(EntityComponent, 0, 0, 0, 0, 0)
 
+//-------------------------------------------------------------------------------------
+PyObject* EntityComponent::onScriptGetAttribute(PyObject* attr)
+{
+	return ScriptObject::onScriptGetAttribute(attr);
+}
+
 }

kbe/src/server/cellapp/entity_component.cpp

@@ -2,6 +2,8 @@
 
 
 #include "entitydef/entity_component.h"
+#include "entity.h"
+#include "real_entity_method.h"
 
 namespace KBEngine{
 
@@ -24,4 +26,45 @@ SCRIPT_GET_DECLARE("otherClients",					pyGetOtherClients,		0,					0)
 SCRIPT_GETSET_DECLARE_END()
 BASE_SCRIPT_INIT(EntityComponent, 0, 0, 0, 0, 0)
 
+//-------------------------------------------------------------------------------------
+PyObject* EntityComponent::onScriptGetAttribute(PyObject* attr)
+{
+	wchar_t* PyUnicode_AsWideCharStringRet0 = PyUnicode_AsWideCharString(attr, NULL);
+	char* ccattr = strutil::wchar2char(PyUnicode_AsWideCharStringRet0);
+	PyMem_Free(PyUnicode_AsWideCharStringRet0);
+
+	if (ownerID_ > 0)
+	{
+		Entity* pOwner = static_cast<Entity*>(owner());
+
+		if (pOwner)
+		{
+			// 如果是ghost调用def方法则需要rpc调用。
+			if (!pOwner->isReal())
+			{
+				MethodDescription* pMethodDescription = const_cast<ScriptDefModule*>(pComponentDescrs_)->findCellMethodDescription(ccattr);
+
+				if (pMethodDescription)
+				{
+					free(ccattr);
+					return new RealEntityMethod(pPropertyDescription_, pMethodDescription, pOwner);
+				}
+			}
+			else
+			{
+				// 如果访问了def持久化类容器属性
+				// 由于没有很好的监测容器类属性内部的变化，这里使用一个折中的办法进行标脏
+				PropertyDescription* pPropertyDescription = const_cast<ScriptDefModule*>(pComponentDescrs_)->findPersistentPropertyDescription(ccattr);
+				if (pPropertyDescription && (pPropertyDescription->getFlags() & ENTITY_CELL_DATA_FLAGS) > 0)
+				{
+					pOwner->setDirty();
+				}
+			}
+		}
+	}
+
+	free(ccattr);
+	return ScriptObject::onScriptGetAttribute(attr);
+}
+
 }

kbe/src/server/dbmgr/entity_component.cpp

@@ -13,4 +13,10 @@ SCRIPT_GET_DECLARE("isDestroyed",					pyIsDestroyed,			0,					0)
 SCRIPT_GETSET_DECLARE_END()
 BASE_SCRIPT_INIT(EntityComponent, 0, 0, 0, 0, 0)
 
+//-------------------------------------------------------------------------------------
+PyObject* EntityComponent::onScriptGetAttribute(PyObject* attr)
+{
+	return ScriptObject::onScriptGetAttribute(attr);
+}
+
 }

kbe/src/server/tools/kbcmd/entity_component.cpp

@@ -13,4 +13,10 @@ SCRIPT_GET_DECLARE("isDestroyed",					pyIsDestroyed,			0,					0)
 SCRIPT_GETSET_DECLARE_END()
 BASE_SCRIPT_INIT(EntityComponent, 0, 0, 0, 0, 0)
 
+//-------------------------------------------------------------------------------------
+PyObject* EntityComponent::onScriptGetAttribute(PyObject* attr)
+{
+	return ScriptObject::onScriptGetAttribute(attr);
+}
+
 }