From d7c43283243d09b5b1dd098c70a9fc61a689bbf7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 22 Jun 2020 16:31:33 +0800 Subject: [PATCH] 1 --- server/imserver/app.cc | 2 +- server/imserver/player.h | 2 ++ server/tools/protobuild/cs_msgid.proto | 1 + server/tools/protobuild/cs_proto.proto | 13 +++++++++++++ server/tools/protobuild/ss_proto.proto | 7 +++++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/server/imserver/app.cc b/server/imserver/app.cc index 8963f2d..285a3f9 100644 --- a/server/imserver/app.cc +++ b/server/imserver/app.cc @@ -87,7 +87,7 @@ bool App::Init(int argc, char* argv[]) HandlerMgr::Instance()->Init(); a8::Timer::Instance()->Init(); f8::MsgQueue::Instance()->Init(); - f8::TGLog::Instance()->Init(a8::Format(PROJ_NAME_FMT, {GAME_ID}), false); + f8::TGLog::Instance()->Init(a8::Format(PROJ_NAME_FMT, {GAME_ID}), true); GameLog::Instance()->Init(); a8::IoLoop::Instance()->Init(1); JsonDataMgr::Instance()->Init(); diff --git a/server/imserver/player.h b/server/imserver/player.h index 5fc87c4..5733256 100644 --- a/server/imserver/player.h +++ b/server/imserver/player.h @@ -17,6 +17,8 @@ class Player a8::TimerAttacher timer_attacher; Friend myself; + std::string account_id; + std::string session_id; int today_invite_times = 0; int last_invite_time = 0; diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index ca8386a..8f2605c 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -63,4 +63,5 @@ enum SMMessageId_e _SMCustomMsgNotify = 503; _SMUserTempCustomDataUpdate = 504; _SMDeleteFriendNotify = 505; + _SMUpdateAccountInfo = 506; } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index e748ce6..559e7ee 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -48,6 +48,12 @@ message MFUserTempCustomData optional int64 value3 = 3 [default = 0]; //自定义字段3 } +//账号信息(自己) +message MFAccountInfo +{ + +} + //用户信息 message MFUserInfo { @@ -78,6 +84,7 @@ message SMLogin { optional int32 errcode = 1; //错误码 optional string errmsg = 2; //错误信息 + optional MFAccountInfo account_info = 3; //账号信息 } //更新用户信息(增量更新,不需更新的字段不传即可) @@ -363,3 +370,9 @@ message SMUserTempCustomDataUpdate optional string account_id = 1; //账号id optional MFUserTempCustomData temp_custom_data = 2; //用户临时自定义数据 } + +//更新账号信息通知 +message SMUpdateAccountInfo +{ + +} diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index 5c25e45..a916244 100755 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -31,6 +31,13 @@ message MFBaseUserDataDB optional int64 base_data_version = 100; //数据版本号 } +message MFRole +{ + optional int32 today_apply_times = 1; + optional int32 save_count = 2; + optional int32 last_save_time = 3; +} + message MFGroupMemberDB { optional MFBaseUserDataDB base_data = 1; //基础数据