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

1

Browse Source
This commit is contained in:
aozhiwei 2020-07-28 10:25:20 +08:00
parent b89eeb0f85
commit c6aa137a5a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/gameserver/human.cc
View File

@ -3390,14 +3390,18 @@ void Human::ProcSkillPhase(MetaData::SkillPhase* phase)
break; break;
case kSkill_Shot: case kSkill_Shot:
{ {
Entity* entity = room->GetEntityByUniId(skill_target_id);
MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(phase->param1.GetInt()); MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(phase->param1.GetInt());
if (weapon_meta) { if (weapon_meta && entity) {
float target_distance = entity->GetPos().Distance(GetPos());
MetaData::EquipUpgrade* weapon_upgrade_meta = MetaData::EquipUpgrade* weapon_upgrade_meta =
MetaMgr::Instance()->GetEquipUpgrade(weapon_meta->i->id()); MetaMgr::Instance()->GetEquipUpgrade(weapon_meta->i->id());
MetaData::Equip* bullet_meta = MetaData::Equip* bullet_meta =
MetaMgr::Instance()->GetEquip(weapon_meta->i->use_bullet()); MetaMgr::Instance()->GetEquip(weapon_meta->i->use_bullet());
if (weapon_upgrade_meta && bullet_meta) { if (bullet_meta) {
a8::Vec2 old_attack_dir = attack_dir; a8::Vec2 old_attack_dir = attack_dir;
attack_dir = entity->GetPos() - GetPos();
attack_dir.Normalize();
InternalShot InternalShot
( (
this, this,
@ -3406,7 +3410,7 @@ void Human::ProcSkillPhase(MetaData::SkillPhase* phase)
bullet_meta, bullet_meta,
1, 1,
skill_meta_->i->skill_id(), skill_meta_->i->skill_id(),
5, target_distance,
false); false);
attack_dir = old_attack_dir; attack_dir = old_attack_dir;
} }

2
server/gameserver/room.cc
View File

@ -2604,7 +2604,7 @@ void Room::AddPlayerPostProc(Player* hum)
} }
if (GetRoomMode() == kZombieMode) { if (GetRoomMode() == kZombieMode) {
#if 1 #if 1
hum->ChangeToRace(kZombieRace, 2); hum->ChangeToRace(kZombieRace, 1);
#else #else
hum->ChangeToRace(kHumanRace, 1); hum->ChangeToRace(kHumanRace, 1);
#endif #endif