From abf27b8923d1ba390256c18917628baacf20283f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 18 Jun 2020 16:09:47 +0800 Subject: [PATCH] 1 --- server/imserver/player.cc | 2 +- server/imserver/playermgr.cc | 25 +++++++++++++------------ server/imserver/playermgr.h | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 8a21614..fcc1d3a 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -618,7 +618,7 @@ void Player::SaveToDB() auto on_error = [] (a8::XParams& param, int error_code, const std::string& error_msg) { - + printf("xxxxx=n"); }; a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(myself.crc32_code); diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index b151c7c..0d1623c 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -275,17 +275,18 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg) "" ); } else { - PlayerMgr::Instance()->AsyncLoginOnOk( - data_set->at(0).at(0), - data_set->at(0).at(1), - data_set->at(0).at(2), - a8::XValue(data_set->at(0).at(3)), - a8::XValue(data_set->at(0).at(4)), - a8::XValue(data_set->at(0).at(6)), - a8::XValue(data_set->at(0).at(5)), - a8::XValue(data_set->at(0).at(7)), - a8::XValue(data_set->at(0).at(8)) - ); + PlayerMgr::Instance()->AsyncLoginOnOk + ( + data_set->at(0).at(0), //account_id + data_set->at(0).at(1), //nickname + data_set->at(0).at(2), //avatar_url + a8::XValue(data_set->at(0).at(3)), //sex + a8::XValue(data_set->at(0).at(4)), //data_version1 + data_set->at(0).at(5), //friend_data + a8::XValue(data_set->at(0).at(6)), //user_value1 + a8::XValue(data_set->at(0).at(7)), //user_value2 + a8::XValue(data_set->at(0).at(8)) //user_value3 + ); } delete msg; }; @@ -325,8 +326,8 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id, const std::string& nickname, const std::string& avatar_url, int sex, - const std::string& friend_data, int data_version1, + const std::string& friend_data, long long user_value1, long long user_value2, long long user_value3) diff --git a/server/imserver/playermgr.h b/server/imserver/playermgr.h index 6c29394..2b9a970 100644 --- a/server/imserver/playermgr.h +++ b/server/imserver/playermgr.h @@ -56,8 +56,8 @@ class PlayerMgr : public a8::Singleton const std::string& nickname, const std::string& avatar_url, int sex, - const std::string& friend_data, int data_version1, + const std::string& friend_data, long long user_value1, long long user_value2, long long user_value3);