server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-08-23 11:01:38 +08:00
parent 5afc890c58
commit df9eac9267
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/human.cc
View File

@ -1546,6 +1546,9 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
(room->GetFrameNo() - room->GetGasData().gas_start_frameno); (room->GetFrameNo() - room->GetGasData().gas_start_frameno);
gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000); gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000);
} }
if (room->IsPveRoom()) {
gas_data->set_duration(0);
}
} }
TypeConvert::ToPb(room->GetGasData().pos_old, gas_data->mutable_pos_old()); TypeConvert::ToPb(room->GetGasData().pos_old, gas_data->mutable_pos_old());
TypeConvert::ToPb(room->GetGasData().pos_new, gas_data->mutable_pos_new()); TypeConvert::ToPb(room->GetGasData().pos_new, gas_data->mutable_pos_new());

9
server/gameserver/room.cc
View File

@ -1311,22 +1311,19 @@ void Room::UpdateGasInactivePvp()
void Room::UpdateGasInactivePve() void Room::UpdateGasInactivePve()
{ {
{ {
MetaData::SafeArea* first_safearea = MetaMgr::Instance()->GetSafeArea(FIRST_AREA_ID); first_safearea = pve_mode_meta->area[0];
if (!first_safearea) {
abort();
}
gas_data_.gas_mode = GasWaiting; gas_data_.gas_mode = GasWaiting;
gas_data_.gas_start_frameno = GetFrameNo(); gas_data_.gas_start_frameno = GetFrameNo();
battle_start_frameno_ = GetFrameNo(); battle_start_frameno_ = GetFrameNo();
gas_data_.old_area_meta = first_safearea; gas_data_.old_area_meta = first_safearea;
gas_data_.new_area_meta = pve_mode_meta->area[0]; gas_data_.new_area_meta = pve_mode_meta->area[0];
gas_data_.gas_progress = 0;
gas_data_.gas_start_frameno = GetFrameNo(); gas_data_.gas_start_frameno = GetFrameNo();
gas_data_.pos_old = a8::Vec2(first_safearea->i->x1(), first_safearea->i->y1());
gas_data_.pos_new = a8::Vec2(gas_data_.new_area_meta->i->x1(), gas_data_.new_area_meta->i->y1()); gas_data_.pos_new = a8::Vec2(gas_data_.new_area_meta->i->x1(), gas_data_.new_area_meta->i->y1());
gas_data_.pos_old = gas_data_.pos_new;
gas_data_.pos_old_bk = gas_data_.pos_old; gas_data_.pos_old_bk = gas_data_.pos_old;
gas_data_.rad_old = gas_data_.old_area_meta->i->rad(); gas_data_.rad_old = gas_data_.old_area_meta->i->rad();
gas_data_.rad_new = gas_data_.new_area_meta->i->rad(); gas_data_.rad_new = gas_data_.new_area_meta->i->rad();
gas_data_.gas_progress = 0;
} }
NotifyUiUpdate(); NotifyUiUpdate();
ClearPostBattleAutoFreeList(); ClearPostBattleAutoFreeList();