This commit is contained in:
aozhiwei 2020-09-28 09:39:36 +08:00
parent 51aeed0c1c
commit acc71ccd87
6 changed files with 32 additions and 5 deletions

View File

@ -133,7 +133,8 @@ void DBHelper::ConfirmGuild(Player* hum, long long guild_id)
.SetSender(hum->AccountId()),
[] (a8::XParams& param, const f8::DataSet* data_set)
{
Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId(param.sender.GetString());
Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId
(param.sender.GetString());
if (hum) {
cs::SMGuildCreate respmsg;
hum->SendMsg(respmsg);
@ -173,9 +174,7 @@ void DBHelper::ConfirmGuild(Player* hum, long long guild_id)
};
std::string guild_data;
{
}
Guild::GenGuildData(hum, guild_id, guild_data);
a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(guild_id);
DBEngine::Instance()->ExecAsyncScript
(
@ -183,7 +182,7 @@ void DBHelper::ConfirmGuild(Player* hum, long long guild_id)
"UPDATE `guild` SET status=%d, guild_data='%s', modifytime=%d WHERE guild_id=%d;",
{
kGuildCreated,
"",
guild_data,
App::Instance()->nowtime,
guild_id
},

View File

@ -11,6 +11,7 @@
#include "utils.h"
#include "dbhelper.h"
#include "synchelper.h"
#include "player.h"
const int GUILD_MAX_MEMBER_NUM = 50;
@ -686,3 +687,18 @@ void Guild::SendErrorMsg(int socket_handle, const ss::MFIMMsgConext& context, co
context,
notifymsg);
}
void Guild::GenGuildData(Player* hum, long long guild_id, std::string& guild_data)
{
ss::MFGuildDB guild_db;
{
auto member = guild_db.add_members();
cs::MFUserInfo user_info;
hum->FillMFUserInfo(&user_info);
BaseUserData base_data;
TypeConvert::Convert(user_info.base_data(), base_data);
TypeConvert::Convert(base_data, *member->mutable_base_data());
member->mutable_base_data()->set_guild_job(kGuildOwner);
}
guild_db.SerializeToString(&guild_data);
}

View File

@ -101,4 +101,5 @@ public:
int guild_status,
int createtime
);
static void GenGuildData(Player* hum, long long guild_id, std::string& guild_data);
};

View File

@ -190,6 +190,11 @@ void GuildMgr::__GuildRank(f8::JsonHttpRequest* request)
delete guild_list;
}
void GuildMgr::__GuildConfirmed(f8::JsonHttpRequest* request)
{
}
void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
{
if (!load_done_) {

View File

@ -18,6 +18,7 @@ class GuildMgr : public a8::Singleton<GuildMgr>
void __GuildCreate(f8::JsonHttpRequest* request);
void __GuildSearch(f8::JsonHttpRequest* request);
void __GuildRank(f8::JsonHttpRequest* request);
void __GuildConfirmed(f8::JsonHttpRequest* request);
void __GenTestData(f8::JsonHttpRequest* request);
private:

View File

@ -45,6 +45,11 @@ void HandlerMgr::Init()
{
GuildMgr::Instance()->__GuildRank(request);
});
RegisterGMMsgHandler("Guild@confirmed",
[] (f8::JsonHttpRequest* request)
{
GuildMgr::Instance()->__GuildConfirmed(request);
});
RegisterGMMsgHandler("Guild@genTestData",
[] (f8::JsonHttpRequest* request)
{