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-01 16:32:34 +08:00
parent 97d08587e3
commit ccc24bf686
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/player.cc
View File

@ -220,7 +220,11 @@ void Player::UpdateShot()
series_shot_frames = 0; series_shot_frames = 0;
return; return;
} }
if (HasBuffEffect(kBET_Vertigo) && !HasBuffEffect(kBET_AutoShot)) { if (HasBuffEffect(kBET_Vertigo) &&
!(
HasBuffEffect(kBET_AutoShot) ||
HasBuffEffect(kBET_MachineGun)
)) {
shot_start = false; shot_start = false;
shot_hold = false; shot_hold = false;
series_shot_frames = 0; series_shot_frames = 0;
@ -732,6 +736,9 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
bool can_set = true; bool can_set = true;
if (HasBuffEffect(kBET_Vertigo)) { if (HasBuffEffect(kBET_Vertigo)) {
can_set = HasBuffEffect(kBET_AutoShot); can_set = HasBuffEffect(kBET_AutoShot);
if (!can_set) {
can_set = HasBuffEffect(kBET_MachineGun);
}
} else if (GetCar()) { } else if (GetCar()) {
if (GetCar()->HasOil()) { if (GetCar()->HasOil()) {
if (GetCar()->HasBuffEffect(kBET_Vertigo)) { if (GetCar()->HasBuffEffect(kBET_Vertigo)) {

15
server/gameserver/roomobstacle.cc
View File

@ -302,6 +302,21 @@ void RoomObstacle::Active()
ActiveKeepRangeBuff(); ActiveKeepRangeBuff();
} }
break; break;
case kObstacleShield:
{
}
break;
case kObstacleStrengthenWall:
{
}
break;
case kObstacleMedicalStation:
{
}
break;
default: default:
{ {
} }