From dcef5c72d4a187c52b54e642986d91c36726d143 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 18 Sep 2020 17:49:01 +0800 Subject: [PATCH] 1 --- server/imserver/playermgr.cc | 11 ++++++++--- server/imserver/playermgr.h | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index 46c253b..edf48f0 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -449,7 +449,9 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg) 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 - a8::XValue(data_set->at(0).at(9)) //guild_id + a8::XValue(data_set->at(0).at(9)), //guild_id + data_set->at(0).at(10), //guild_name + a8::XValue(data_set->at(0).at(11)).GetInt() //guild_job ); } delete msg; @@ -472,7 +474,8 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg) DBEngine::Instance()->ExecAsyncQuery (conn_info, "SELECT account_id, nickname, avatar_url, sex, " - " data_version1, friend_data, user_value1, user_value2, user_value3, guild_id " + " data_version1, friend_data, user_value1, user_value2, user_value3, " + " guild_id, guild_name, guild_job " "FROM `user` WHERE account_id='%s';", { msg.account_id(), @@ -496,7 +499,9 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id, long long user_value1, long long user_value2, long long user_value3, - long long guild_id) + long long guild_id, + const std::string& guild_name, + int guild_job) { f8::MsgHdr* hdr = GetHdrByAccountId(account_id); if (hdr) { diff --git a/server/imserver/playermgr.h b/server/imserver/playermgr.h index 773dc0a..73f6165 100644 --- a/server/imserver/playermgr.h +++ b/server/imserver/playermgr.h @@ -84,7 +84,9 @@ class PlayerMgr : public a8::Singleton long long user_value1, long long user_value2, long long user_value3, - long long guild_id); + long long guild_id, + const std::string& guild_name, + int guild_job); void AsyncLoginOnError(const std::string& account_id, int step, int error_code,