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-12-19 19:29:37 +08:00
parent c08d323bc1
commit cbafcf0e8a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/shot.cc
View File

@ -157,7 +157,7 @@ static void InternalCreateBullet(BulletInfo& bullet_info)
} }
} }
if (c->IsCar() && c->AsCar()->IsSingle()) { if (c->IsCar() && c->AsCar()->IsSingle()) {
a8::Vec2 bullet_born_offset; glm::vec3 bullet_born_offset;
bool is_player = c->IsPlayer(); bool is_player = c->IsPlayer();
bool is_car = c->IsCar(); bool is_car = c->IsCar();
float bullet_born_angle = GlmHelper::CalcAngle(c->GetAttackDir(), GlmHelper::RIGHT); float bullet_born_angle = GlmHelper::CalcAngle(c->GetAttackDir(), GlmHelper::RIGHT);
@ -165,7 +165,7 @@ static void InternalCreateBullet(BulletInfo& bullet_info)
bullet_born_angle = -bullet_born_angle; bullet_born_angle = -bullet_born_angle;
} }
float old_bullet_born_angle = bullet_born_angle; float old_bullet_born_angle = bullet_born_angle;
bullet_born_offset.Rotate(bullet_born_angle); GlmHelper::RotateY(bullet_born_offset, bullet_born_angle);
auto transform = glm::rotate(hero_transform, auto transform = glm::rotate(hero_transform,
bullet_born_angle * A8_PI, bullet_born_angle * A8_PI,
@ -178,8 +178,8 @@ static void InternalCreateBullet(BulletInfo& bullet_info)
bullet_info.bullet_idx, bullet_info.bullet_idx,
bullet_info.bullet_num); bullet_info.bullet_num);
glm::vec4 v = transform * gun_muzzle_position; glm::vec4 v = transform * gun_muzzle_position;
bullet_born_offset = a8::Vec2(v.z *10*1, v.x*10*-1); bullet_born_offset = glm::vec3(v.z *10*1, 0.0f, v.x*10*-1);
bullet_info.bullet_born_pos.FromVec2(c->GetPos().ToVec2() + bullet_born_offset); bullet_info.bullet_born_pos.FromGlmVec3(c->GetPos().ToGlmVec3() + bullet_born_offset);
bullet_info.bullet_dir = c->GetShotDir(); bullet_info.bullet_dir = c->GetShotDir();
} }
int bullet_uniid = 0; int bullet_uniid = 0;

7
server/gameserver/skill.cc
View File

@ -524,12 +524,9 @@ void Skill::ProcSWZB()
glm::vec3 dir = sender.Get()->GetAttackDir(); glm::vec3 dir = sender.Get()->GetAttackDir();
if (!GlmHelper::IsZero(dir)) { if (!GlmHelper::IsZero(dir)) {
// 999 // 999
#if 1 glm::vec3 target_pos = c->GetPos().ToGlmVec3() +
#else dir * (float)(SkillHelper::GetSwzbPullDistance(skill_meta));
a8::Vec2 target_pos = c->GetPos() +
dir * SkillHelper::GetSwzbPullDistance(skill_meta);
c->PullTarget(target_pos); c->PullTarget(target_pos);
#endif
} }
int buff_id = SkillHelper::GetSwzbBuffId(skill_meta); int buff_id = SkillHelper::GetSwzbBuffId(skill_meta);
float buff_time = SkillHelper::GetSwzbBuffTime(skill_meta); float buff_time = SkillHelper::GetSwzbBuffTime(skill_meta);