commit

DDFrey · Dec 18, 2020 · 4a8538d · 4a8538d
1 parent 5837548
commit 4a8538d
Show file tree

Hide file tree

Showing 48 changed files with 765 additions and 92 deletions.
diff --git a/Proto/proto_raw/Msg_Account.proto b/Proto/proto_raw/Msg_Account.proto
@@ -100,6 +100,11 @@ message SealAccountAck {
     uint32    RetCode        = 1;
     string    AccountName    = 2;
     uint64    AccountID      = 3; //账号ID
+    int32     ServerID       = 4; //上次登录SvrID
+}
+
+message SealAccountNtf {
+    uint64    AccountID      = 1; //账号ID
 }
 
 message SetLastServerNty {

diff --git a/Proto/proto_raw/Msg_Base.proto b/Proto/proto_raw/Msg_Base.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+message ItemData {
+    int32   ItemID = 1;
+    int32   ItemNum = 2;
+}
+
+message SkillItem {
+    uint32 SkillID = 1;
+    int32  Level = 2;
+    int32  KeyPos = 3;   //强化等级
+}
+
diff --git a/Proto/proto_raw/Msg_Copy.proto b/Proto/proto_raw/Msg_Copy.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-
+import "Msg_Base.proto";
 message ResultObject{
     uint64 ObjectID = 1;
     int32  ActorID = 2;
@@ -40,11 +40,6 @@ message MainCopyAck {
     uint32   RetCode = 1;
 }
 
-message ItemData {
-    int32   ItemID = 1;
-    int32   ItemNum = 2;
-}
-
 message MainCopyResultNty {
     uint64   RoleID             = 1; //角色ID
     int32    CopyID             = 2; //副本ID

diff --git a/Proto/proto_raw/Msg_Game.proto b/Proto/proto_raw/Msg_Game.proto
@@ -1,10 +1,5 @@
 syntax = "proto3";
-
-message SkillItem {
-    uint32 SkillID = 1;
-    int32  Level = 2;
-    int32  KeyPos = 3;   //强化等级
-}
+import "Msg_Base.proto";
 
 message GmStopServerReq {
     uint32    Data        	= 1;
@@ -237,10 +232,9 @@ message ChatMessageReq {
     string    SrcName        = 1;
     uint64    SrcID          = 2;
     uint64    TargetID       = 3; //目标ID
-    int32     Channel        = 4; //聊天频道
+    int32     ChatChl        = 4; //聊天频道; 
     uint64    GuildID        = 5; //公会ID
     string    Content        = 6;
-
 }
 
 message ChatMessageAck {
@@ -250,10 +244,12 @@ message ChatMessageAck {
 message ChatMessageNty {
     string    SrcName        = 1;
     uint64    SrcID          = 2;
-    uint64    TargetID       = 3; //目标ID
-    int32     Channel        = 4;
-    uint64    GuildID        = 5;
-    string    Content        = 6;
+    int32     SrcLevel       = 3;
+    uint64    TargetID       = 4; //目标ID
+    int32     ChatChl        = 5;
+    uint64    GuildID        = 6;
+    uint64    TimeStamp      = 7;
+    string    Content        = 8;
 }
 
 message CommonReq {
@@ -284,6 +280,16 @@ message LogicRegToLoginAck {
     string    NewSvrName    = 2;
 }
 
+message LogicRegToDbSvrReq {
+    int32    ServerID      = 1;
+    string   ServerName    = 2;
+	uint32   ProcessID     = 3;
+}
+
+message LogicRegToDbSvrAck {
+    uint32    RetCode       = 1;
+}
+
 message LogicUpdateInfoReq {
     int32     ServerID     = 1;
     string    ServerName   = 2;
@@ -320,6 +326,21 @@ message SetupEquipAck {
     uint32    RetCode    = 1;
 }
 
+message Msg_GiftCodeReq{
+    uint64  RoleID     = 1;
+    string  GiftCode   = 2;
+    uint32  Channel    = 3;
+    uint64  AccountID  = 4;
+    int32   AreaID     = 5;
+
+}
+
+message Msg_GiftCodeAck{
+    uint32   RetCode = 1;
+    uint64   RoleID  = 2;
+    repeated ItemData items = 3;
+}
+
 message UnsetEquipReq {
     uint64    EquipGuid = 1;
 }

diff --git a/Proto/proto_raw/Msg_ID.proto b/Proto/proto_raw/Msg_ID.proto
@@ -47,8 +47,13 @@ enum MessageID {
     MSG_WATCH_HEART_BEAT_ACK         = 100025;
 
     MSG_REMOVE_CONNECT_NTY           = 100026;
-    MSG_DISCONNECT_NTY               = 100032;    //断开连接
-
+    MSG_DISCONNECT_NTY               = 100027;    //断开连接
+
+    MSG_NETWORK_STATUS_NTY           = 100028;    //客户端专用网络状态通知
+
+    MSG_LOGIC_REGTO_DBSVR_REQ        = 100031;    //逻辑服注册到db服请求
+    MSG_LOGIC_REGTO_DBSVR_ACK        = 100032;    //逻辑服注册到db服返回
+
     MSG_ROLE_DATA_CHANGE_NTY         = 100033;
 
     MSG_SET_LAST_SERVER_NTY          = 100034;
@@ -64,6 +69,8 @@ enum MessageID {
 
     MSG_DB_WRITE_ERROR_NTY           = 100041;   //DB写错误通知
 
+    MSG_SEAL_ACCOUNT_NTY             = 100042;   //封账号通知
+
     MSG_NORMAL_MSGID_END             = 199999;
 
     //============================================================================================

diff --git a/Proto/proto_raw/Msg_LoginCltData.proto b/Proto/proto_raw/Msg_LoginCltData.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-import "Msg_Game.proto";
+import "Msg_Base.proto";
 
 message BagItem {
     uint64   Guid        = 1;

diff --git a/Proto/proto_raw/Msg_LoginDBData.proto b/Proto/proto_raw/Msg_LoginDBData.proto
@@ -205,7 +205,7 @@ message DBCounterData {
 
 message DBFriendItem {
     uint64    RoleID        = 1;        //角色ID
-    uint64    FriendID    = 2;        //好友ID
+    uint64    FriendID      = 2;        //好友ID
 }
 
 message DBFriendData {

diff --git a/Proto/proto_raw/Msg_Move.proto b/Proto/proto_raw/Msg_Move.proto
@@ -1,6 +1,5 @@
 syntax = "proto3";
-import "Msg_Game.proto";
-
+import "Msg_Base.proto";
 //请求释放技能
 message SkillCastReq
 {    

diff --git a/Proto/proto_raw/Msg_Payment.proto b/Proto/proto_raw/Msg_Payment.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+message CreatePaymentReq
+{
+	string OrderID    = 1;  //订单ID
+	int32  Platform   = 2;  //平台 1:安卓，2:ios
+	int32  Channel    = 3;  //渠道
+	uint64 RoleID     = 4;  //角色ID
+	int32  ServerID   = 5;  //区服ID
+	uint64 AccountID  = 6;  //账号ID
+	int32  ProductID  = 7;  //档位ID
+	int32  BuyID      = 8; //购买的游戏内的商品ID
+	int32  ProxyID    = 9;  //不需要客户端传
+	int32  ClientID   = 10;  //不需要客户端传
+}
+
+message CreatePaymentAck
+{
+	uint32    RetCode = 1;
+	string    OrderID = 2;
+}
diff --git a/Proto/proto_raw/Msg_RetCode.proto b/Proto/proto_raw/Msg_RetCode.proto
@@ -59,6 +59,9 @@ enum MessageRetCode {
    MRC_SERVER_NOT_AVAILABLE   = 316;   //服务器不可用
    MRC_SERVER_MAINTAIN        = 317;   //服务器维护中
    MRC_SERVER_NO_NEW_ROLE     = 318;   //不允许创建新角色
+   MRC_SEAL_ROLE              = 319;   //角色己被封
+   MRC_SEAL_ACCOUNT           = 320;   //账号己被封
+   MRC_DELETE_ROLE            = 321;   //角色被删除
 
       //礼包码
    MRC_GIFTCODE_AREADY_USED   = 500;    //礼包码己使用

diff --git a/Server/Src/AccountServer/AccountManager.cpp b/Server/Src/AccountServer/AccountManager.cpp
@@ -99,7 +99,7 @@ BOOL CAccountObjectMgr::ReleaseAccountObject(UINT64 AccountID )
 	return Delete(AccountID);
 }
 
-BOOL CAccountObjectMgr::SealAccount(UINT64 uAccountID, const std::string& strName, UINT32 dwChannel, BOOL bSeal, UINT32 dwSealTime)
+BOOL CAccountObjectMgr::SealAccount(UINT64& uAccountID, const std::string& strName, UINT32 dwChannel, BOOL bSeal, UINT32 dwSealTime, UINT32& dwLastSvrID)
 {
 	CAccountObject* pAccObj = NULL;
 	if (uAccountID == 0)
@@ -113,12 +113,15 @@ BOOL CAccountObjectMgr::SealAccount(UINT64 uAccountID, const std::string& strNam
 
 	if (pAccObj == NULL)
 	{
+		CLog::GetInstancePtr()->LogError("CAccountObjectMgr::SealAccount Error Cannot find account uAccountID:%lld, strName:%s", uAccountID, strName.c_str());
 		return FALSE;
 	}
 
 	if (bSeal)
 	{
 		pAccObj->m_uSealTime = CommonFunc::GetCurrTime() + dwSealTime;
+		uAccountID = pAccObj->m_ID;
+		dwLastSvrID = pAccObj->m_dwLastSvrID[0];
 	}
 	else
 	{
@@ -264,12 +267,12 @@ BOOL CAccountObjectMgr::IsRun()
 
 BOOL CAccountObjectMgr::CheckAccountName(const std::string& strName, bool bFromChannel)
 {
-	if (strName.size() < 6)
+	if (strName.size() < 1)
 	{
 		return FALSE;
 	}
 
-	if (CommonConvert::HasSymbol(strName.c_str(), (const char*)"\'\" \\"))
+	if (CommonConvert::HasSymbol(strName.c_str(), (const char*)"\'\" \\\r\n"))
 	{
 		return FALSE;
 	}

diff --git a/Server/Src/AccountServer/AccountManager.h b/Server/Src/AccountServer/AccountManager.h
@@ -32,7 +32,7 @@ class CAccountObjectMgr : public AVLTree<UINT64, CAccountObject>
 
 	BOOL				ReleaseAccountObject(UINT64 m_u64AccountID);
 
-	BOOL				SealAccount(UINT64 uAccountID, const std::string& strName, UINT32 dwChannel, BOOL bSeal, UINT32 dwSealTime);
+	BOOL				SealAccount(UINT64& uAccountID, const std::string& strName, UINT32 dwChannel, BOOL bSeal, UINT32 dwSealTime, UINT32& dwLastSvrID);
 
 	BOOL				SetLastServer(UINT64 uAccountID, INT32 ServerID);
 

diff --git a/Server/Src/AccountServer/AccountMsgHandler.cpp b/Server/Src/AccountServer/AccountMsgHandler.cpp
@@ -59,22 +59,26 @@ BOOL CAccountMsgHandler::OnMsgAccountRegReq(NetPacket* pPacket)
 
 	AccountRegAck Ack;
 
-	if(!m_AccountManager.CheckAccountName(Req.accountname(), false))
+	std::string strAccountName = Req.accountname();
+
+	if(!m_AccountManager.CheckAccountName(strAccountName, false))
 	{
 		Ack.set_retcode(MRC_ACCOUNT_NAME_ERR_FMT);
 		ServiceBase::GetInstancePtr()->SendMsgProtoBuf(pPacket->m_dwConnID, MSG_ACCOUNT_REG_ACK, 0, pHeader->dwUserData, Ack);
 		return TRUE;
 	}
 
-	CAccountObject* pAccount = m_AccountManager.GetAccountObject(Req.accountname(), Req.channel());
+	CommonConvert::StringTrim(strAccountName);
+
+	CAccountObject* pAccount = m_AccountManager.GetAccountObject(strAccountName, Req.channel());
 	if(pAccount != NULL)
 	{
 		Ack.set_retcode(MRC_ACCOUNT_NAME_EXIST);
 		ServiceBase::GetInstancePtr()->SendMsgProtoBuf(pPacket->m_dwConnID, MSG_ACCOUNT_REG_ACK, 0, pHeader->dwUserData, Ack);
 		return TRUE;
 	}
 
-	pAccount = m_AccountManager.CreateAccountObject(Req.accountname(), Req.password(), Req.channel());
+	pAccount = m_AccountManager.CreateAccountObject(strAccountName, Req.password(), Req.channel());
 	if(pAccount == NULL)
 	{
 		Ack.set_retcode(MRC_UNKNOW_ERROR);
@@ -103,14 +107,18 @@ BOOL CAccountMsgHandler::OnMsgAccontLoginReq(NetPacket* pPacket)
 	AccountLoginAck Ack;
 	Ack.set_review(Req.review());
 
-	if (!m_AccountManager.CheckAccountName(Req.accountname(), Req.fromchannel()))
+	std::string strAccountName = Req.accountname();
+
+	if (!m_AccountManager.CheckAccountName(strAccountName, Req.fromchannel()))
 	{
 		Ack.set_retcode(MRC_ACCOUNT_NAME_ERR_FMT);
 		ServiceBase::GetInstancePtr()->SendMsgProtoBuf(pPacket->m_dwConnID, MSG_ACCOUNT_LOGIN_ACK, 0, pHeader->dwUserData, Ack);
 		return TRUE;
 	}
 
-	CAccountObject* pAccObj = m_AccountManager.GetAccountObject(Req.accountname(), Req.channel());
+	CommonConvert::StringTrim(strAccountName);
+
+	CAccountObject* pAccObj = m_AccountManager.GetAccountObject(strAccountName, Req.channel());
 	if(pAccObj != NULL)
 	{
 		ERROR_RETURN_FALSE(pAccObj->m_ID != 0);
@@ -150,7 +158,7 @@ BOOL CAccountMsgHandler::OnMsgAccontLoginReq(NetPacket* pPacket)
 	UINT64 u64ID = 0;
 	UINT32 dwChannel = 0;
 	std::string strPwd;
-	pAccObj = m_AccountManager.CreateAccountObject(Req.accountname(), Req.password(), Req.channel());
+	pAccObj = m_AccountManager.CreateAccountObject(strAccountName, Req.password(), Req.channel());
 	if (pAccObj == NULL)
 	{
 		Ack.set_retcode(MRC_UNKNOW_ERROR);
@@ -179,10 +187,17 @@ BOOL CAccountMsgHandler::OnMsgSealAccountReq(NetPacket* pPacket)
 	ERROR_RETURN_TRUE(pHeader->dwUserData != 0);
 
 	SealAccountAck Ack;
-
-	if (m_AccountManager.SealAccount(Req.accountid(), Req.accountname(), Req.channel(), Req.seal(), Req.sealtime()))
+	UINT64 uAccountID = Req.accountid();
+	UINT32 dwLastSvrID = 0;
+	if (m_AccountManager.SealAccount(uAccountID, Req.accountname(), Req.channel(), Req.seal(), Req.sealtime(), dwLastSvrID))
 	{
 		Ack.set_retcode(MRC_SUCCESSED);
+
+		if (Req.seal())
+		{
+			Ack.set_accountid(uAccountID);
+			Ack.set_serverid(dwLastSvrID);
+		}
 	}
 	else
 	{

diff --git a/Server/Src/AccountServer/AccountServer.vcxproj b/Server/Src/AccountServer/AccountServer.vcxproj
@@ -66,7 +66,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4996;4800;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -88,7 +88,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4800</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4996;4800;4244;</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -108,6 +108,10 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\Message\Msg_Base.pb.cc">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\Message\Msg_Game.pb.cc">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
@@ -129,6 +133,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Message\Msg_Account.pb.h" />
+    <ClInclude Include="..\Message\Msg_Base.pb.h" />
     <ClInclude Include="..\Message\Msg_Game.pb.h" />
     <ClInclude Include="..\Message\Msg_ID.pb.h" />
     <ClInclude Include="..\WatcherClient\WatcherClient.h" />

diff --git a/Server/Src/AccountServer/AccountServer.vcxproj.filters b/Server/Src/AccountServer/AccountServer.vcxproj.filters
@@ -48,6 +48,9 @@
     <ClCompile Include="..\Message\Msg_ID.pb.cc">
       <Filter>Proto</Filter>
     </ClCompile>
+    <ClCompile Include="..\Message\Msg_Base.pb.cc">
+      <Filter>Proto</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="GameService.h">
@@ -77,6 +80,9 @@
     <ClInclude Include="..\Message\Msg_ID.pb.h">
       <Filter>Proto</Filter>
     </ClInclude>
+    <ClInclude Include="..\Message\Msg_Base.pb.h">
+      <Filter>Proto</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />