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 2023-02-13 17:28:44 +08:00
parent 1a8990cc59
commit e776c8a890
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/buff/machine_gun.cc
View File

@ -38,6 +38,7 @@ void MachineGunBuff::SwitchWeapons()
Weapon* weapon = &caster_.Get()->weapons[weapon_idx];
hold_weapons_.push_back(*weapon);
weapon->weapon_uniid = 0;
weapon->weapon_id = weapon_meta->id();
weapon->meta = weapon_meta;
weapon->skill_meta = skill_meta;

3
server/gameserver/hero.cc
View File

@ -166,6 +166,9 @@ void Hero::DetachFromMaster()
void Hero::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id,
int real_killer_id, const std::string& real_killer_name)
{
if (!room->BattleStarted()) {
return;
}
if (dec_hp < 0.001f) {
return;
}

24
server/gameserver/human.cc
View File

@ -453,15 +453,31 @@ float Human::GetSpeed()
if (GetCurrWeapon()->weapon_idx == GUN_SLOT1 ||
GetCurrWeapon()->weapon_idx == GUN_SLOT2) {
if (action_type != AT_Reload) {
return meta->shot_speed() * (1 + GetAbility()->GetAttrRate(kHAT_ShotSpeed));
speed = meta->shot_speed() * (1 + GetAbility()->GetAttrRate(kHAT_ShotSpeed));
if (HasBuffEffect(kBET_InWater)) {
speed *= mt::Param::s().water_move_coefficient;
}
return speed;
}
}
} else if (aiming) {
return std::max(1, meta->aiming_speed());
speed = std::max(1, meta->aiming_speed());
if (HasBuffEffect(kBET_InWater)) {
speed *= mt::Param::s().water_move_coefficient;
}
return speed;
} else if (action_type == AT_Reload) {
return std::max(1, meta->reload_speed());
speed = std::max(1, meta->reload_speed());
if (HasBuffEffect(kBET_InWater)) {
speed *= mt::Param::s().water_move_coefficient;
}
return speed;
} else if (action_type == AT_UseItem) {
return std::max(1, meta->useitem_speed());
speed = std::max(1, meta->useitem_speed());
if (HasBuffEffect(kBET_InWater)) {
speed *= mt::Param::s().water_move_coefficient;
}
return speed;
}
speed = meta->move_speed();
}

2
server/gameserver/human.h
View File

@ -247,6 +247,8 @@ class Human : public Creature
int pain_killer_lastingtime = 0;
a8::XTimerWp pain_killer_timer;
a8::XTimerWp shen_bao_timer;
a8::XTimerWp downed_timer;
std::set<Human*> kill_humans;

2
server/gameserver/pbutils.cc
View File

@ -956,12 +956,12 @@ void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
int action_param = 0;
switch (action_item_id) {
case IS_HEALTHKIT:
case IS_SHEN_BAO:
{
action_param = item_meta->heal();
}
break;
case IS_PAIN_KILLER:
case IS_SHEN_BAO:
{
action_param = item_meta->heal() * item_meta->time();
}