merge dev2

This commit is contained in:
aozhiwei 2020-05-27 10:34:04 +08:00
commit 7139f8cadd

View File

@ -2177,12 +2177,12 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
{ {
std::string items_str; std::string items_str;
MetaData::RankReward* rank_reward_meta = MetaMgr::Instance()->GetRankReward(rank); MetaData::RankReward* rank_reward_meta = MetaMgr::Instance()->GetRankReward(rank);
#if 1 #ifdef DEBUG
{ {
#else
if (rank_reward_meta && rank_reward_meta->i->drop() > 0) { if (rank_reward_meta && rank_reward_meta->i->drop() > 0) {
#else
#endif #endif
#if 1 #ifdef DEBUG
{ {
#else #else
if (rand() % 100 < rank_reward_meta->i->drop()) { if (rand() % 100 < rank_reward_meta->i->drop()) {