diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 45b96a6..9962712 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -913,7 +913,8 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO conn_info, "UPDATE `user` SET friend_data='%s', modifytime=%d, " " nickname='%s', avatar_url='%s', sex=%d, data_version1=%d, " - " user_value1=%d, user_value2=%d, user_value3=%d, guild_id=%d, last_logintime=%d " + " user_value1=%d, user_value2=%d, user_value3=%d, " + " guild_id=%d, guild_name='%s', guild_job=%d, last_logintime=%d " "WHERE account_id='%s';", { friend_data, @@ -926,6 +927,8 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO myself.base_data.user_value2, myself.base_data.user_value3, myself.base_data.guild_id, + myself.base_data.guild_name, + myself.base_data.guild_job, App::Instance()->nowtime, myself.base_data.account_id }, diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index edf48f0..8669aa6 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -534,6 +534,8 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id, hum->myself.base_data.user_value2 = user_value2; hum->myself.base_data.user_value3 = user_value3; hum->myself.base_data.guild_id = guild_id; + hum->myself.base_data.guild_name = guild_name; + hum->myself.base_data.guild_job = guild_job; hum->myself.base_data.online = true; hum->myself.base_data.last_login_time = App::Instance()->nowtime; hum->role_data.session_id = session_id; diff --git a/server/imserver/typeconvert.cc b/server/imserver/typeconvert.cc index 8612b42..e6e36db 100644 --- a/server/imserver/typeconvert.cc +++ b/server/imserver/typeconvert.cc @@ -29,9 +29,9 @@ void TypeConvert::Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& b base_data_pb.set_avatar_url(base_data.avatar_url); base_data_pb.set_sex(base_data.sex); base_data_pb.set_last_login_time(base_data.last_login_time); - #if 0 - base_data_pb.set_group_id(base_data.group_id); - #endif + base_data_pb.set_guild_id(base_data.guild_id); + base_data_pb.set_guild_name(base_data.guild_name); + base_data_pb.set_guild_job(base_data.guild_job); base_data_pb.set_user_value1(base_data.user_value1); base_data_pb.set_user_value2(base_data.user_value2); base_data_pb.set_user_value3(base_data.user_value3); @@ -45,9 +45,9 @@ void TypeConvert::Convert(const ss::MFBaseUserDataDB& base_data_pb, BaseUserData base_data.avatar_url = base_data_pb.avatar_url(); base_data.sex = base_data_pb.sex(); base_data.last_login_time = base_data_pb.last_login_time(); - #if 0 - base_data.group_id = base_data_pb.group_id(); - #endif + base_data.guild_id = base_data_pb.guild_id(); + base_data.guild_name = base_data_pb.guild_name(); + base_data.guild_job = base_data_pb.guild_job(); base_data.user_value1 = base_data_pb.user_value1(); base_data.user_value2 = base_data_pb.user_value2(); base_data.user_value3 = base_data_pb.user_value3(); @@ -104,9 +104,9 @@ void TypeConvert::Convert(const cs::MFBaseUserData& base_data_pb, BaseUserData& base_data.sex = base_data_pb.sex(); base_data.online = base_data_pb._online(); base_data.last_login_time = base_data_pb.last_login_time(); - #if 0 - base_data.group_id = base_data_pb.group_id(); - #endif + base_data.guild_id = base_data_pb.guild_id(); + base_data.guild_name = base_data_pb.guild_name(); + base_data.guild_job = base_data_pb.guild_job(); base_data.user_value1 = base_data_pb.user_value1(); base_data.user_value2 = base_data_pb.user_value2(); base_data.user_value3 = base_data_pb.user_value3(); @@ -121,9 +121,9 @@ void TypeConvert::Convert(const BaseUserData& base_data, cs::MFBaseUserData& bas base_data_pb.set_sex(base_data.sex); base_data_pb.set__online(base_data.online); base_data_pb.set_last_login_time(base_data.last_login_time); - #if 0 - base_data_pb.set_group_id(base_data.group_id); - #endif + base_data_pb.set_guild_id(base_data.guild_id); + base_data_pb.set_guild_name(base_data.guild_name); + base_data_pb.set_guild_job(base_data.guild_job); base_data_pb.set_user_value1(base_data.user_value1); base_data_pb.set_user_value2(base_data.user_value2); base_data_pb.set_user_value3(base_data.user_value3); diff --git a/server/imserver/types.h b/server/imserver/types.h index 206a865..519500d 100644 --- a/server/imserver/types.h +++ b/server/imserver/types.h @@ -9,6 +9,8 @@ struct BaseUserData int online = 0; std::vector group_ids; long long guild_id = 0; + std::string guild_name; + int guild_job = 0; int last_login_time = 0; long long user_value1 = 0;