简单修改

简单修改

Author: NingLeixueR

public/actor/actor_base/actor_type.cpp

@@ -42,8 +42,7 @@ namespace ngl
 		dinit_atype(actor_client, ACTOR_ADDRESS_CLIENT);
 		dinit_atype(actor_create, ACTOR_CREATE);
 		dinit_atype(actor_server, ACTOR_ADDRESS_SERVER);
-		dinit_atype(actor_cross, ACTOR_ADDRESS_CLIENT);
-		dinit_atype(actor_client, ACTOR_CROSS);
+		dinit_atype(actor_cross, ACTOR_CROSS);
 		dinit_atype(actor_manage_role, ACTOR_MANAGE_ROLE);
 		dinit_atype(actor_role, ACTOR_ROLE);
 		dinit_atype(actor_gateway, ACTOR_GATEWAY);

public/actor/actor_logic/game/actor_role.cpp

@@ -241,9 +241,9 @@ namespace ngl
 		cpro->set_m_rechargeid(lrechargeid);
 		cpro->set_m_orderid(adata.m_data->data()->m_orderid());
 		cpro->set_m_gold(lgold);
-		for (std::pair<const int, int>& item : ldropmap)
+		for(auto itor = ldropmap.begin(); itor != ldropmap.end();++itor)
 		{
-			cpro->mutable_m_items()->insert(item);
+			(*cpro->mutable_m_items())[itor->first] = itor->second;
 		}
 		send2client(cpro);
 

public/actor/actor_logic/login/actor_login.cpp

@@ -45,18 +45,18 @@ namespace ngl
 
 	void actor_login::loaddb_finish(bool adbishave)
 	{
-		for (auto& item : m_account.data())
-		{
-			const pbdb::db_account& laccount = item.second.getconst();
-			LogLocalError("[%][%] area=% id=% ",
-				laccount.m_account(),
-				laccount.m_passworld(),
-				laccount.m_passworld(),
-				laccount.m_area(),
-				actor_guid(laccount.m_roleid()).actordataid()
-			);
-		}
-
+		LogLocalError("actor_login::loaddb_finish");
+		//for (auto& item : m_account.data())
+		//{
+		//	const pbdb::db_account& laccount = item.second.getconst();
+		//	LogLocalError("[%][%] area=% id=% ",
+		//		laccount.m_account(),
+		//		laccount.m_passworld(),
+		//		laccount.m_passworld(),
+		//		laccount.m_area(),
+		//		actor_guid(laccount.m_roleid()).actordataid()
+		//	);
+		//}
 	}
 
 	data_modified<pbdb::db_account>* actor_login::get_account(int area, const std::string& account, const std::string& apassworld, bool& aiscreate)

public/logic/public/public/ranklist/ranklist.h

@@ -96,16 +96,16 @@ namespace ngl
 				lstream << "ranklist###id:[" << lranklist.m_id() << "]" << std::endl;
 
 				auto lmap = lranklist.mutable_m_item();
-				for (std::pair<const int64_t, pbdb::rankitem>& lpair : *lmap)
+				for(auto itor = lmap->begin();itor != lmap->end();++itor)
 				{
 					//m_ranklist[lpair.first] = &lpair.second;
 					switch (id)
 					{
 					case type_lv://lv
-						m_ranklv.insert(&lpair.second);
+						m_ranklv.insert(&itor->second);
 						break;
 					}
-					lstream << "\t[" << lpair.first << "]-[" << lpair.second.m_name() << "]" << std::endl;
+					lstream << "\t[" << itor->first << "]-[" << itor->second.m_name() << "]" << std::endl;
 				}
 			}
 		}

public/logic/public/role/task/task.cpp

@@ -83,7 +83,7 @@ namespace ngl
 	{
 		pbdb::db_task& ltask = db()->get(false);
 		auto lrundatas = ltask.mutable_m_rundatas();
-		for (std::pair<const int32_t, pbdb::db_task::data>& item : *lrundatas)
+		for (auto& item : *lrundatas)
 		{
 			auto lschedules = item.second.mutable_m_schedules();
 			for (pbdb::db_task::data_schedule& itemschedules : *lschedules)
@@ -195,7 +195,7 @@ namespace ngl
 						for (int32_t val : item.m_parmint)
 							lschedules->add_m_sumint(val);
 					}
-					lrundatas->insert(lpair);
+					(*lrundatas)[lpair.first] = lpair.second;
 					get_task(true);
 				}
 			});

public/protocol/init_protobuf.h

@@ -70,19 +70,20 @@ namespace ngl
 		template <typename T>
 		static bool init_protobufs()
 		{
-			int32_t lprotocol = xmlprotocol::protocol(typeid(T).name());
+			static std::string lname = boost::typeindex::type_id_with_cvr<T>().pretty_name();
+			int32_t lprotocol = xmlprotocol::protocol(lname);
 			if (lprotocol == -1)
 			{
-				LogLocalError("init_protobuf::init_protobufs(%) not xml!!!", typeid(T).name())
+				LogLocalError("init_protobuf::init_protobufs(%) not xml!!!", lname)
 				return false;
 			}
 			m_keyval.insert(std::make_pair(HASH_CODE_VALUE(T), pinfo
 				{
 					.m_type = EPROTOCOL_TYPE_PROTOCOLBUFF,
 					.m_protocol = lprotocol,
-					.m_name = typeid(T).name()
+					.m_name = lname
 				}));
-			LogLocalInfo("#[%][EPROTOCOL_TYPE_PROTOCOLBUFF][%]", lprotocol, typeid(T).name());
+			LogLocalInfo("#[%][EPROTOCOL_TYPE_PROTOCOLBUFF][%]", lprotocol, lname);
 			return true;
 		}