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-09-29 13:10:47 +08:00
commit 60e1b43f34
3 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/incubator.cc
View File

@ -24,7 +24,7 @@ void Incubator::Init()
if (room->IsPveRoom()) { if (room->IsPveRoom()) {
room->pve_data.max_wave = room->pve_mode_meta->mode_time.size(); room->pve_data.max_wave = room->pve_mode_meta->mode_time.size();
int wave = 0; int wave = 0;
int total_time = 0; int total_time = room->GetGasInactiveTime() * 1000;
SpawnWaveMon(0); SpawnWaveMon(0);
for (int time : room->pve_mode_meta->mode_time) { for (int time : room->pve_mode_meta->mode_time) {
total_time += time; total_time += time;

60
server/gameserver/room.cc
View File

@ -1255,7 +1255,8 @@ void Room::UpdateGasInactive()
void Room::UpdateGasInactivePvp() void Room::UpdateGasInactivePvp()
{ {
if (GetFrameNo() - gas_data_.gas_start_frameno >= GetGasInactiveTime() * SERVER_FRAME_RATE) { if (GetFrameNo() - gas_data_.gas_start_frameno >=
GetGasInactiveTime() * SERVER_FRAME_RATE) {
long long begin_tick = a8::XGetTickCount(); long long begin_tick = a8::XGetTickCount();
gas_data_.gas_mode = GasJump; gas_data_.gas_mode = GasJump;
gas_data_.gas_start_frameno = GetFrameNo(); gas_data_.gas_start_frameno = GetFrameNo();
@ -1315,26 +1316,29 @@ void Room::UpdateGasInactivePvp()
void Room::UpdateGasInactivePve() void Room::UpdateGasInactivePve()
{ {
{ if (GetFrameNo() - gas_data_.gas_start_frameno >=
auto first_safearea = pve_mode_meta->area[0]; GetGasInactiveTime() * SERVER_FRAME_RATE) {
gas_data_.gas_mode = GasWaiting; {
gas_data_.gas_start_frameno = GetFrameNo(); auto first_safearea = pve_mode_meta->area[0];
battle_start_frameno_ = GetFrameNo(); gas_data_.gas_mode = GasWaiting;
gas_data_.old_area_meta = first_safearea; gas_data_.gas_start_frameno = GetFrameNo();
gas_data_.new_area_meta = pve_mode_meta->area[0]; battle_start_frameno_ = GetFrameNo();
gas_data_.gas_start_frameno = GetFrameNo(); gas_data_.old_area_meta = first_safearea;
gas_data_.pos_new = a8::Vec2(gas_data_.new_area_meta->i->x1(), gas_data_.new_area_meta->i->y1()); gas_data_.new_area_meta = pve_mode_meta->area[0];
gas_data_.pos_old = gas_data_.pos_new; gas_data_.gas_start_frameno = GetFrameNo();
gas_data_.pos_old_bk = gas_data_.pos_old; gas_data_.pos_new = a8::Vec2(gas_data_.new_area_meta->i->x1(), gas_data_.new_area_meta->i->y1());
gas_data_.rad_old = gas_data_.old_area_meta->i->rad(); gas_data_.pos_old = gas_data_.pos_new;
gas_data_.rad_new = gas_data_.new_area_meta->i->rad(); gas_data_.pos_old_bk = gas_data_.pos_old;
gas_data_.gas_progress = 0; gas_data_.rad_old = gas_data_.old_area_meta->i->rad();
gas_data_.rad_new = gas_data_.new_area_meta->i->rad();
gas_data_.gas_progress = 0;
}
NotifyUiUpdate();
ClearPostBattleAutoFreeList();
OnBattleStart();
NotifyGameStart();
InitAndroidAI();
} }
NotifyUiUpdate();
ClearPostBattleAutoFreeList();
OnBattleStart();
NotifyGameStart();
InitAndroidAI();
} }
void Room::UpdateGasWaiting() void Room::UpdateGasWaiting()
@ -2434,18 +2438,10 @@ long long Room::GetGasInactiveTime()
return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ? return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ?
App::Instance()->debug_params[1] : 10; App::Instance()->debug_params[1] : 10;
#endif #endif
{ if (IsPveRoom()) {
if (room_type_ == RT_NewBrid) { return 10;
if (creator_game_times_ <= 0) { } else {
return MetaMgr::Instance()->newbie_gas_inactive_time; return MetaMgr::Instance()->gas_inactive_time;
} else {
return MetaMgr::Instance()->common_gas_inactive_time;
}
} else if (room_type_ == RT_MidBrid) {
return MetaMgr::Instance()->midbrid_gas_inactive_time;
} else {
return MetaMgr::Instance()->gas_inactive_time;
}
} }
} }

2
server/gameserver/skill.cc
View File

@ -79,8 +79,8 @@ void Skill::FillMFSkill(cs::MFSkill* skill_pb)
minor_type_, minor_type_,
minor_left_time, minor_left_time,
minor_cd_time_ minor_cd_time_
#endif
}); });
#endif
} }
} }