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

remove GasDump

Browse Source
This commit is contained in:
aozhiwei 2020-06-01 20:18:57 +08:00
parent e1b05b6dee
commit 9e52d8f763
5 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/constant.h
View File

@ -56,7 +56,6 @@ enum GasMode_e
GasInactive = 0, GasInactive = 0,
GasWaiting = 1, GasWaiting = 1,
GasMoving = 2, GasMoving = 2,
GasJump = 3
}; };
enum ActionType_e enum ActionType_e

18
server/gameserver/framemaker.cc
View File

@ -10,13 +10,6 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(const Human* hum)
cs::SMUpdate* msg = new cs::SMUpdate; cs::SMUpdate* msg = new cs::SMUpdate;
{ {
Room* room = hum->room; Room* room = hum->room;
#if 0
if (room->gas_data.gas_mode == GasJump) {
cs::MFPlane* p = msg->mutable_plane();
TypeConvert::ToPb(room->plane.start_point, p->mutable_start_point());
TypeConvert::ToPb(room->plane.end_point, p->mutable_end_point());
}
#endif
for (auto& itr : hum->new_objects) { for (auto& itr : hum->new_objects) {
#ifdef DEBUG #ifdef DEBUG
if (hum->del_objects.find(itr->GetEntityUniId()) != hum->del_objects.end()) { if (hum->del_objects.find(itr->GetEntityUniId()) != hum->del_objects.end()) {
@ -27,17 +20,10 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(const Human* hum)
} }
for (auto& itr : hum->part_objects) { for (auto& itr : hum->part_objects) {
Entity* entity = itr; Entity* entity = itr;
if (entity->IsDead(room) && hum->room->GetFrameNo() - entity->GetDeadFrameNo(room) > 10) { if (entity->IsDead(room) &&
hum->room->GetFrameNo() - entity->GetDeadFrameNo(room) > 10) {
continue; continue;
} else { } else {
#if 0
if (room->gas_data.gas_mode == GasJump &&
entity != hum &&
entity->entity_type == ET_Player &&
a8::HasBitFlag(((Human*)entity)->status, HS_Fly)) {
continue;
}
#endif
} }
entity->FillMFObjectPart(room, msg->add_part_objects()); entity->FillMFObjectPart(room, msg->add_part_objects());
} }

7
server/gameserver/human.cc
View File

@ -274,12 +274,7 @@ long long Human::GetDeadFrameNo(Room* room)
void Human::FillMFTeamData(cs::MFTeamData* team_data) void Human::FillMFTeamData(cs::MFTeamData* team_data)
{ {
#if 1
{ {
#else
if (room->GetGasData().gas_mode == GasJump ||
room->GetFrameNo() - last_sync_teamdata_frameno_ > SERVER_FRAME_RATE * 2) {
#endif
last_sync_teamdata_frameno_ = room->GetFrameNo(); last_sync_teamdata_frameno_ = room->GetFrameNo();
team_data->set_player_id(GetEntityUniId()); team_data->set_player_id(GetEntityUniId());
team_data->set_name(name); team_data->set_name(name);
@ -1332,8 +1327,6 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
long long duration = room->GetGasInactiveTime() * SERVER_FRAME_RATE - long long duration = room->GetGasInactiveTime() * SERVER_FRAME_RATE -
(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);
} else if (room->GetGasData().gas_mode == GasJump) {
gas_data->set_duration(0);
} else if (room->GetGasData().gas_mode == GasMoving) { } else if (room->GetGasData().gas_mode == GasMoving) {
if (room->GetGasData().new_area_meta->i->shrink_speed() > 0.01f) { if (room->GetGasData().new_area_meta->i->shrink_speed() > 0.01f) {
long long duration = (room->GetGasData().old_area_meta->i->rad() - room->GetGasData().new_area_meta->i->rad()) / long long duration = (room->GetGasData().old_area_meta->i->rad() - room->GetGasData().new_area_meta->i->rad()) /

3
server/gameserver/player.cc
View File

@ -296,8 +296,7 @@ void Player::UpdateUseItemId()
void Player::UpdateSpectate() void Player::UpdateSpectate()
{ {
if (room->GetGasData().gas_mode == GasInactive || if (room->GetGasData().gas_mode == GasInactive) {
room->GetGasData().gas_mode == GasJump) {
spectate = false; spectate = false;
return; return;
} }

5
server/gameserver/room.cc
View File

@ -768,9 +768,6 @@ void Room::UpdateGas()
case GasInactive: case GasInactive:
UpdateGasInactive(); UpdateGasInactive();
break; break;
case GasJump:
abort();
break;
case GasWaiting: case GasWaiting:
UpdateGasWaiting(); UpdateGasWaiting();
break; break;
@ -778,7 +775,7 @@ void Room::UpdateGas()
UpdateGasMoving(); UpdateGasMoving();
break; break;
} }
if (gas_data_.gas_mode != GasInactive && gas_data_.gas_mode != GasJump) { if (gas_data_.gas_mode != GasInactive) {
if (!IsGameOver() && alive_count_ <= MAX_TEAM_NUM && GetAliveTeamNum() <= 1) { if (!IsGameOver() && alive_count_ <= MAX_TEAM_NUM && GetAliveTeamNum() <= 1) {
game_over_ = true; game_over_ = true;
game_over_frameno_ = GetFrameNo(); game_over_frameno_ = GetFrameNo();