From 8b8a7b7e8f2399f3e109c9d6405951f4e90d6c68 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 19 Nov 2020 13:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0vip=5Flv=20head=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/imserver/player.cc | 3 +++ server/imserver/playermgr.cc | 6 ++++-- server/imserver/typeconvert.cc | 16 ++++++++++++++++ server/imserver/types.h | 4 ++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 0c85759..cf1c12f 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -1403,6 +1403,7 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO "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, " + " vip_lv=%d, head=%d, " " guild_id=%d, guild_job=%d, last_logintime=%d " "WHERE account_id='%s';", { @@ -1415,6 +1416,8 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO myself.base_data.user_value1, myself.base_data.user_value2, myself.base_data.user_value3, + myself.base_data.vip_lv, + myself.base_data.head, myself.base_data.guild_id, myself.base_data.guild_job, App::Instance()->nowtime, diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index 70dc788..d965ccb 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -461,8 +461,8 @@ void PlayerMgr::AsyncLogin1(const cs::CMLogin& msg) DBEngine::Instance()->ExecAsyncScript (conn_info, "INSERT INTO `user`(gameid, channel, account_id, nickname, avatar_url," - " sex, friend_data, createtime, modifytime, registertime)" - "VALUES (%d, %d, '%s', '%s', '%s', %d, '', %d, %d, %d)" + " sex, vip_lv, head, friend_data, createtime, modifytime, registertime)" + "VALUES (%d, %d, '%s', '%s', '%s', %d, %d, %d, '', %d, %d, %d)" "ON DUPLICATE KEY UPDATE nickname='%s', avatar_url='%s'," " sex=%d, last_logintime=%d, data_version1=data_version1 + 1;", { @@ -472,6 +472,8 @@ void PlayerMgr::AsyncLogin1(const cs::CMLogin& msg) msg.nickname(), msg.avatar_url(), msg.sex(), + msg.vip_lv(), + msg.head(), App::Instance()->nowtime, App::Instance()->nowtime, f8::ExtractRegisterTimeFromSessionId(msg.session_id()), diff --git a/server/imserver/typeconvert.cc b/server/imserver/typeconvert.cc index 70a8527..f417cd3 100644 --- a/server/imserver/typeconvert.cc +++ b/server/imserver/typeconvert.cc @@ -78,6 +78,8 @@ void TypeConvert::Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& b base_data_pb.set_nickname(base_data.nickname); base_data_pb.set_avatar_url(base_data.avatar_url); base_data_pb.set_sex(base_data.sex); + base_data_pb.set_vip_lv(base_data.vip_lv); + base_data_pb.set_head(base_data.head); base_data_pb.set_last_login_time(base_data.last_login_time); base_data_pb.set_guild_id(base_data.guild_id); base_data_pb.set_guild_job(base_data.guild_job); @@ -93,6 +95,8 @@ void TypeConvert::Convert(const ss::MFBaseUserDataDB& base_data_pb, BaseUserData base_data.nickname = base_data_pb.nickname(); base_data.avatar_url = base_data_pb.avatar_url(); base_data.sex = base_data_pb.sex(); + base_data.vip_lv = base_data_pb.vip_lv(); + base_data.head = base_data_pb.head(); base_data.last_login_time = base_data_pb.last_login_time(); base_data.guild_id = base_data_pb.guild_id(); base_data.guild_job = base_data_pb.guild_job(); @@ -109,6 +113,8 @@ void TypeConvert::Convert(long long guild_id, int guild_job, base_data_pb.set_nickname(member.nickname); base_data_pb.set_avatar_url(member.avatar_url); base_data_pb.set_sex(member.sex); + base_data_pb.set_vip_lv(member.vip_lv); + base_data_pb.set_head(member.head); base_data_pb.set_last_login_time(member.last_login_time); base_data_pb.set_guild_id(guild_id); base_data_pb.set_guild_job(guild_job); @@ -125,6 +131,8 @@ void TypeConvert::Convert(long long guild_id, int guild_job, base_data_pb.set_nickname(member.nickname); base_data_pb.set_avatar_url(member.avatar_url); base_data_pb.set_sex(member.sex); + base_data_pb.set_vip_lv(member.vip_lv); + base_data_pb.set_head(member.head); base_data_pb.set_last_login_time(member.last_login_time); base_data_pb.set_guild_id(guild_id); base_data_pb.set_guild_job(guild_job); @@ -141,6 +149,8 @@ void TypeConvert::Convert(const ss::MFBaseUserDataDB& base_data_pb, GuildMember& member.nickname = base_data_pb.nickname(); member.avatar_url = base_data_pb.avatar_url(); member.sex = base_data_pb.sex(); + member.vip_lv = base_data_pb.vip_lv(); + member.head = base_data_pb.head(); member.last_login_time = base_data_pb.last_login_time(); member.user_value1 = base_data_pb.user_value1(); member.user_value2 = base_data_pb.user_value2(); @@ -154,6 +164,8 @@ void TypeConvert::Convert(const cs::MFBaseUserData& base_data_pb, GuildMember& m member.nickname = base_data_pb.nickname(); member.avatar_url = base_data_pb.avatar_url(); member.sex = base_data_pb.sex(); + member.vip_lv = base_data_pb.vip_lv(); + member.head = base_data_pb.head(); member.last_login_time = base_data_pb.last_login_time(); member.user_value1 = base_data_pb.user_value1(); member.user_value2 = base_data_pb.user_value2(); @@ -167,6 +179,8 @@ void TypeConvert::Convert(const cs::MFBaseUserData& base_data_pb, BaseUserData& base_data.nickname = base_data_pb.nickname(); base_data.avatar_url = base_data_pb.avatar_url(); base_data.sex = base_data_pb.sex(); + base_data.vip_lv = base_data_pb.vip_lv(); + base_data.head = base_data_pb.head(); base_data.online = base_data_pb._online(); base_data.last_login_time = base_data_pb.last_login_time(); base_data.guild_id = base_data_pb.guild_id(); @@ -183,6 +197,8 @@ void TypeConvert::Convert(const BaseUserData& base_data, cs::MFBaseUserData& bas base_data_pb.set_nickname(base_data.nickname); base_data_pb.set_avatar_url(base_data.avatar_url); base_data_pb.set_sex(base_data.sex); + base_data_pb.set_vip_lv(base_data.vip_lv); + base_data_pb.set_head(base_data.head); base_data_pb.set__online(base_data.online); base_data_pb.set_last_login_time(base_data.last_login_time); base_data_pb.set_guild_id(base_data.guild_id); diff --git a/server/imserver/types.h b/server/imserver/types.h index 6c8c17a..507e8d4 100644 --- a/server/imserver/types.h +++ b/server/imserver/types.h @@ -10,6 +10,8 @@ struct BaseUserData std::vector group_ids; long long guild_id = 0; int guild_job = 0; + int vip_lv = 0; + int head = 0; int last_login_time = 0; long long user_value1 = 0; @@ -94,6 +96,8 @@ struct GuildMember std::string nickname; std::string avatar_url; int sex = 0; + int vip_lv = 0; + int head = 0; int last_login_time = 0; long long user_value1 = 0;