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-06-15 13:30:19 +08:00
parent 3ca27125f5
commit 958bb73ee6
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/car.cc
View File

@ -569,3 +569,11 @@ void Car::DoSkillPostProc(bool used, int skill_id, int target_id)
#endif #endif
} }
} }
void Car::Update(int delta_time)
{
++updated_times_;
if (playing_skill) {
UpdateSkill();
}
}

1
server/gameserver/car.h
View File

@ -13,6 +13,7 @@ class Car : public Creature
Car(); Car();
virtual ~Car() override; virtual ~Car() override;
virtual void Update(int delta_time) override;
virtual void Initialize() override; virtual void Initialize() override;
virtual void FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data) override; virtual void FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data) override;
virtual void FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data) override; virtual void FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data) override;

10
server/gameserver/commands.cc
View File

@ -328,17 +328,17 @@ void Player::_CMExecCommand(f8::MsgHdr& hdr, const cs::CMExecCommand& msg)
} }
} }
} else if (cmd == "use_skill") { } else if (cmd == "use_skill") {
if (cmds.size() >= 2) { if (cmds.size() >= 2 && GetCar() && GetCar()->IsDriver(this)) {
int skill_id = a8::XValue(cmds[1]); int skill_id = a8::XValue(cmds[1]);
Skill* skill = GetSkill(skill_id); Skill* skill = GetCar()->GetSkill(skill_id);
Human* enemy = room->FindEnemy(this, 300); Human* enemy = room->FindEnemy(this, 300);
if (enemy && skill && GetCar() && GetCar()->IsDriver(this)) { if (enemy && skill) {
if (CanUseSkill(skill_id) && enemy->GetPos().Distance2D2(GetPos()) > 0.0001f) { if (GetCar()->CanUseSkill(skill_id) && enemy->GetPos().Distance2D2(GetPos()) > 0.0001f) {
glm::vec3 skill_dir = enemy->GetPos().ToGlmVec3() - GetPos().ToGlmVec3(); glm::vec3 skill_dir = enemy->GetPos().ToGlmVec3() - GetPos().ToGlmVec3();
float skill_distance = GlmHelper::Norm(skill_dir); float skill_distance = GlmHelper::Norm(skill_dir);
GlmHelper::Normalize(skill_dir); GlmHelper::Normalize(skill_dir);
DoSkill(skill_id, enemy->GetUniId(), skill_dir, skill_distance); GetCar()->DoSkill(skill_id, enemy->GetUniId(), skill_dir, skill_distance);
} }
} }
} }

2
server/gameserver/skill.cc
View File

@ -254,7 +254,7 @@ void Skill::InitActiveSkill()
}, },
&xtimer_attacher); &xtimer_attacher);
actived_ = !owner->GetBattleContext()->IsMainSkill(this); actived_ = !owner->GetBattleContext()->IsMainSkill(this);
if (owner->IsAndroid() || owner->IsHero()) { if (owner->IsAndroid() || owner->IsHero() || owner->IsCar()) {
actived_ = true; actived_ = true;
} }
} }