diff --git a/server/imserver/metamgr.cc b/server/imserver/metamgr.cc index 4658ead..2796c82 100644 --- a/server/imserver/metamgr.cc +++ b/server/imserver/metamgr.cc @@ -184,9 +184,9 @@ std::string MetaMgr::GetText(const std::string& textid, const std::string& def_t if (itr != loader_->text_hash.end()) { return itr->second; } -#if 1 - return ""; -#else +#if DEBUG return loader_->text_hash.empty() ? def_text : ""; +#else + return ""; #endif } diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 8718e3e..b1f37b5 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -844,6 +844,8 @@ void Player::_CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg) SendMsg(respmsg); return; } +#ifdef DEBUG +#else if (role_data.today_create_guild_times >= MAX_DAILY_CREATE_GUILD_TIMES) { ShowErrorMsg(TEXT("today_create_guild_times_not_enough", "今日创建战队次数已达上限")); respmsg.set_errcode(1); @@ -851,6 +853,7 @@ void Player::_CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg) SendMsg(respmsg); return; } +#endif ++role_data.today_create_guild_times; std::string ip; diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc index 9ff4e97..c34d9cb 100644 --- a/server/rankserver/guildmgr.cc +++ b/server/rankserver/guildmgr.cc @@ -94,7 +94,7 @@ void DbToGuildBasic(const std::vector& row, cs::MFGuildBasic* guild guild->set_owner_id(row[9]); guild->set_owner_name(row[10]); guild->set_owner_avatar_url(row[11]); - guild->set__guild_status(a8::XValue(row[12])); + guild->set__guild_status(a8::XValue(row[15])); guild->set_join_unlimited(a8::XValue(row[16])); guild->set_join_cond1(a8::XValue(row[17])); guild->set_join_cond2(a8::XValue(row[18])); diff --git a/server/rankserver/metamgr.cc b/server/rankserver/metamgr.cc index f566e88..7de23a4 100644 --- a/server/rankserver/metamgr.cc +++ b/server/rankserver/metamgr.cc @@ -176,5 +176,9 @@ std::string MetaMgr::ReplaceDirtyWord(const std::string& text, char c) std::string MetaMgr::GetText(const std::string& textid, const std::string& def_text) { auto itr = loader_->text_hash.find(textid); +#ifdef DEBUG + return itr != loader_->text_hash.end() ? itr->second : def_text; +#else return itr != loader_->text_hash.end() ? itr->second : ""; +#endif }