up

Author: kebiao

kbe/src/lib/entitydef/datatype.cpp

@@ -2713,7 +2713,7 @@ PyObject* EntityComponentType::createCellDataFromPersistentStream(MemoryStream*
 		PyObject* pyobj = NULL;
 
 		if(mstream)
-			propertyDescription->createFromStream(mstream);
+			pyobj = propertyDescription->createFromStream(mstream);
 
 		if (pyobj == NULL)
 		{

kbe/src/lib/entitydef/entitydef.cpp

@@ -1853,6 +1853,7 @@ bool EntityDef::loadAllComponentScriptModules(std::string entitiesPath, std::vec
 								flags &= ~ENTITY_CLIENT_DATA_FLAGS;
 
 							compPropertyInter->second->setFlags(flags);
+							compPropertyInter->second->decRef();
 
 							propertyDescrs.erase(compPropertyInter++);
 							continue;
@@ -1902,6 +1903,16 @@ bool EntityDef::loadAllComponentScriptModules(std::string entitiesPath, std::vec
 					}
 
 					pComponentPropertyDescription->setFlags(pflags);
+					if (pComponentPropertyDescription->isPersistent() && pCompScriptModule->numPropertys() == 0)
+					{
+						pComponentPropertyDescription->isPersistent(false);
+
+						if ((*entityScriptModuleIter)->findPersistentPropertyDescription(pComponentPropertyDescription->getUType()))
+						{
+							(*entityScriptModuleIter)->getPersistentPropertyDescriptions().erase(pComponentPropertyDescription->getName());
+							(*entityScriptModuleIter)->getPersistentPropertyDescriptions_uidmap().erase(pComponentPropertyDescription->getUType());
+						}
+					}
 
 					if ((*entityScriptModuleIter)->findPropertyDescription(pComponentPropertyDescription->getName(), g_componentType) != pComponentPropertyDescription)
 					{

kbe/src/lib/entitydef/property.h

@@ -46,7 +46,8 @@ class PropertyDescription : public RefCountable
 		是否是一个保存到数据库中的属性 
 	*/
 	INLINE bool isPersistent(void) const;
-	
+	INLINE void isPersistent(bool v);
+
 	/** 
 		获取这个属性的数据类别 
 	*/

kbe/src/lib/entitydef/property.inl

@@ -13,6 +13,11 @@ INLINE bool PropertyDescription::isPersistent(void) const
 	return isPersistent_; 
 };
 
+INLINE void PropertyDescription::isPersistent(bool v)
+{
+	isPersistent_ = v;
+}
+
 INLINE DataType* PropertyDescription::getDataType(void) const
 { 
 	return dataType_; 

kbe/src/server/baseapp/baseapp.cpp

@@ -72,8 +72,7 @@ PyObject* createDictDataFromPersistentStream(MemoryStream& s, const char* entity
 				bool hasComponentData = false;
 				EntityComponentType* pEntityComponentType = ((EntityComponentType*)propertyDescription->getDataType());
 
-				if(pEntityComponentType->pScriptDefModule()->numPropertys() > 0)
-					s >> hasComponentData;
+				s >> hasComponentData;
 
 				if (hasComponentData)
 				{

kbe/src/server/baseapp/entity.cpp

@@ -410,13 +410,6 @@ void Entity::addPersistentsDataToStream(uint32 flags, MemoryStream* s)
 		if(propertyDescription->isPersistent() && (flags & propertyDescription->getFlags()) > 0)
 		{
 			bool isComponent = propertyDescription->getDataType()->type() == DATA_TYPE_ENTITY_COMPONENT;
-			if (isComponent)
-			{
-				// 由于存在一种情况， 组件def中没有内容， 但有cell脚本，此时baseapp上无法判断他是否有cell属性，所以写celldata时没有数据写入
-				EntityComponentType* pEntityComponentType = (EntityComponentType*)propertyDescription->getDataType();
-				if (pEntityComponentType->pScriptDefModule()->numPropertys() == 0)
-					continue;
-			}
 
 			PyObject *key = PyUnicode_FromString(attrname);