diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index de8b255..6a21824 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -61,6 +61,9 @@ void Bullet::OnHit(std::set& objects) float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); player->stats.damage_amount_out += finaly_dmg; hum->DecHP(finaly_dmg, player->entity_uniid, player->name, gun_meta->i->id()); + #ifdef DEBUG + player->SendDebugMsg(a8::Format("bullet atk:%f", {GetAtk()})); + #endif } } break; @@ -84,6 +87,9 @@ void Bullet::OnHit(std::set& objects) player->DropItems(obstacle); } obstacle->BroadcastFullState(room); + #ifdef DEBUG + player->SendDebugMsg(a8::Format("bullet atk:%f", {GetAtk()})); + #endif } } break; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 923768a..9b2ef05 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2185,12 +2185,12 @@ void Human::GenBattleReportData(a8::MutableXObject* params) { std::string items_str; MetaData::RankReward* rank_reward_meta = MetaMgr::Instance()->GetRankReward(rank); -#ifdef DEBUG +#ifdef DEBUG1 { #else if (rank_reward_meta && rank_reward_meta->i->drop() > 0) { #endif -#ifdef DEBUG +#ifdef DEBUG1 { #else if (rand() % 100 < rank_reward_meta->i->drop()) { diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index 18d5e8e..b27cef4 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -456,6 +456,7 @@ private: for (auto& meta : equipupgrade_meta_list) { MetaData::EquipUpgrade& item = a8::FastAppend(equipupgrade_list); item.i = &meta; + item.Init(); equipupgrade_hash[meta.id()] = &item; } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 3450b2d..4d81152 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -221,6 +221,29 @@ void Room::AddPlayer(Player* hum) RandRemoveAndroid(); } NotifyUiUpdate(); + #ifdef DEBUG + xtimer.AddRepeatTimerAndAttach + (SERVER_FRAME_RATE * 5, + a8::XParams() + .SetSender(hum), + [] (const a8::XParams& param) + { + Human* hum = (Human*)param.sender.GetUserData(); + std::string debugmsg = a8::Format("weapon_id:%d weapon_lv:%d atk:%f fire_rate:%f " + "volume:%d maxhp:%f curr_hp:%f", + { + hum->curr_weapon->weapon_id, + hum->curr_weapon->weapon_lv, + hum->curr_weapon->GetAttrValue(kHAT_Atk), + hum->curr_weapon->GetAttrValue(kHAT_FireRate), + hum->curr_weapon->GetAttrValue(kHAT_Volume), + hum->curr_weapon->GetAttrValue(kHAT_MaxHp), + hum->GetHP() + }); + hum->SendDebugMsg(debugmsg); + }, + &hum->xtimer_attacher.timer_list_); + #endif } int Room::AllocUniid()