commit

LuffyPan · Sep 17, 2021 · 105b11a · 105b11a
1 parent 890e514
commit 105b11a
Show file tree

Hide file tree

Showing 19 changed files with 412 additions and 353 deletions.
diff --git a/Server/Src/LogicServer/EquipModule.cpp b/Server/Src/LogicServer/EquipModule.cpp
@@ -299,8 +299,8 @@ BOOL CEquipModule::CalcFightValue(INT32 nValue[PROPERTY_NUM], INT32 nPercent[PRO
 
 VOID CEquipModule::RegisterMessageHanler()
 {
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_SETUP_EQUIP_REQ, &CEquipModule::OnMsgSetupEquipReq, this);
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_UNSET_EQUIP_REQ, &CEquipModule::OnMsgUnsetEquipReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_SETUP_EQUIP_REQ, &CEquipModule::OnMsgSetupEquipReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_UNSET_EQUIP_REQ, &CEquipModule::OnMsgUnsetEquipReq, this);
 }
 
 

diff --git a/Server/Src/LogicServer/GameService.cpp b/Server/Src/LogicServer/GameService.cpp
@@ -232,7 +232,7 @@ BOOL CGameService::Run()
 
 		m_LogicMsgHandler.OnUpdate(CommonFunc::GetTickCount());
 
-		CommonFunc::Sleep(1);
+		ServiceBase::GetInstancePtr()->FixFrameNum(200);
 	}
 
 	return TRUE;
@@ -459,7 +459,7 @@ BOOL CGameService::DispatchPacket(NetPacket* pNetPacket)
 		return TRUE;
 	}
 
-	if (pPlayer->m_NetMessagePump.FireMessage(pNetPacket->m_dwMsgID, pNetPacket))
+    if (pPlayer->FireMessage(pNetPacket->m_dwMsgID, pNetPacket))
 	{
 		return TRUE;
 	}

diff --git a/Server/Src/LogicServer/GemModule.cpp b/Server/Src/LogicServer/GemModule.cpp
@@ -329,6 +329,6 @@ BOOL CGemModule::CalcFightValue(INT32 nValue[PROPERTY_NUM], INT32 nPercent[PROPE
 
 VOID CGemModule::RegisterMessageHanler()
 {
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_SETUP_GEM_REQ, &CGemModule::OnMsgSetupGemReq, this);
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_UNSET_GEM_REQ, &CGemModule::OnMsgUnsetGemReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_SETUP_GEM_REQ, &CGemModule::OnMsgSetupGemReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_UNSET_GEM_REQ, &CGemModule::OnMsgUnsetGemReq, this);
 }
diff --git a/Server/Src/LogicServer/LogicMsgHandler.cpp b/Server/Src/LogicServer/LogicMsgHandler.cpp
@@ -187,7 +187,16 @@ BOOL CLogicMsgHandler::OnMsgRoleCreateReq(NetPacket* pNetPacket)
 	Ack.set_carrer(Req.carrer());
 	Ack.set_name(Req.name());
 
-	if (CSimpleManager::GetInstancePtr()->CheckNameExist(Req.name()))
+	std::string strName = Req.name();
+
+	if (!CommonConvert::IsTextUTF8(strName.c_str(), (UINT32)strName.size()))
+	{
+		Ack.set_retcode(MRC_ROLE_NAME_MUST_UTF8);
+		ServiceBase::GetInstancePtr()->SendMsgProtoBuf(pNetPacket->m_dwConnID, MSG_ROLE_CREATE_ACK, 0, pHeader->dwUserData, Ack);
+		return TRUE;
+	}
+
+	if (CSimpleManager::GetInstancePtr()->CheckNameExist(strName))
 	{
 		Ack.set_retcode(MRC_ROLE_NAME_EXIST);
 		ServiceBase::GetInstancePtr()->SendMsgProtoBuf(pNetPacket->m_dwConnID, MSG_ROLE_CREATE_ACK, 0, pHeader->dwUserData, Ack);
@@ -506,7 +515,8 @@ BOOL CLogicMsgHandler::OnMsgReconnectReq( NetPacket* pNetPacket )
 	RoleReconnectAck Ack;
 	if(pPlayer == NULL)
 	{
-		//重连失败，请重新登录
+		Ack.set_retcode(MRC_CANNOT_RECONNECT);
+		ServiceBase::GetInstancePtr()->SendMsgProtoBuf(pNetPacket->m_dwConnID, MSG_ROLE_RECONNECT_ACK, 0, pHeader->dwUserData, Ack);
 		return TRUE;
 	}
 

diff --git a/Server/Src/LogicServer/MailModule.cpp b/Server/Src/LogicServer/MailModule.cpp
@@ -4,9 +4,11 @@
 #include "GlobalDataMgr.h"
 #include "StaticData.h"
 #include "PlayerObject.h"
-#include "../Message/Msg_ID.pb.h"
 #include "MailManager.h"
 #include "RoleModule.h"
+#include "../Message/Msg_ID.pb.h"
+#include "../Message/Msg_RetCode.pb.h"
+#include "GameLogManager.h"
 
 CMailModule::CMailModule(CPlayerObject* pOwner): CModuleBase(pOwner)
 {

diff --git a/Server/Src/LogicServer/MountModule.cpp b/Server/Src/LogicServer/MountModule.cpp
@@ -102,8 +102,8 @@ BOOL CMountModule::CalcFightValue(INT32 nValue[PROPERTY_NUM], INT32 nPercent[PRO
 
 VOID CMountModule::RegisterMessageHanler()
 {
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_SETUP_MOUNT_REQ, &CMountModule::OnMsgSetupMountReq, this);
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_UNSET_MOUNT_REQ, &CMountModule::OnMsgUnsetMountReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_SETUP_MOUNT_REQ, &CMountModule::OnMsgSetupMountReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_UNSET_MOUNT_REQ, &CMountModule::OnMsgUnsetMountReq, this);
 
 }
 

diff --git a/Server/Src/LogicServer/PartnerModule.cpp b/Server/Src/LogicServer/PartnerModule.cpp
@@ -122,8 +122,8 @@ BOOL CPartnerModule::CalcFightValue(INT32 nValue[PROPERTY_NUM], INT32 nPercent[P
 
 VOID CPartnerModule::RegisterMessageHanler()
 {
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_SETUP_PARTNER_REQ, &CPartnerModule::OnMsgSetupPartnerReq, this);
-	m_pOwnPlayer->m_NetMessagePump.RegisterMessageHandle(MSG_UNSET_PARTNER_REQ, &CPartnerModule::OnMsgUnsetPartnerReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_SETUP_PARTNER_REQ, &CPartnerModule::OnMsgSetupPartnerReq, this);
+    m_pOwnPlayer->RegisterMessageHandle(MSG_UNSET_PARTNER_REQ, &CPartnerModule::OnMsgUnsetPartnerReq, this);
 }
 
 BOOL CPartnerModule::ToTransferData(TransferDataItem* pTransItem)