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 2024-01-19 19:25:10 +08:00
parent 6432a4c81c
commit ca6a1191ee
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/buff/callfunc.cc
View File

@ -1463,7 +1463,7 @@ void CallFuncBuff::Shot()
auto on_bullet_exit = auto on_bullet_exit =
[owner_wp, buff_uniid_copy, meta_copy] (Bullet* bullet) mutable [owner_wp, buff_uniid_copy, meta_copy] (Bullet* bullet) mutable
{ {
if (owner_wp.Get()) { if (owner_wp.Get() && !owner_wp.Get()->IsDestorying()) {
std::shared_ptr<std::vector<float>> vars = std::make_shared<std::vector<float>>(); std::shared_ptr<std::vector<float>> vars = std::make_shared<std::vector<float>>();
vars->push_back(bullet->GetPos().GetX()); vars->push_back(bullet->GetPos().GetX());
vars->push_back(bullet->GetPos().GetY()); vars->push_back(bullet->GetPos().GetY());

5
server/gameserver/creature.cc
View File

@ -3344,7 +3344,10 @@ std::shared_ptr<std::set<int>> Creature::CalcReporterList(bool is_trace_bullet,
break; break;
} }
if (weapon_meta->equip_subtype() == GUN_SUB_EQUIP_TYPE_THREE_GUN) { if (weapon_meta->equip_subtype() == GUN_SUB_EQUIP_TYPE_THREE_GUN) {
need_gen = true; need_gen = true;
}
if (GetAbility()->GetSwitchTimes(kForceClientReportBullet) > 0) {
need_gen = true;
} }
if (need_gen) { if (need_gen) {
float nearest_distance = FLT_MAX; float nearest_distance = FLT_MAX;

2
server/gameserver/shot.cc
View File

@ -55,6 +55,7 @@ struct BulletInfo
std::shared_ptr<std::set<int>> reporter_list; std::shared_ptr<std::set<int>> reporter_list;
int shot_uniid = 0; int shot_uniid = 0;
a8::XTimerWp keep_shot_animi_timer_ptr; a8::XTimerWp keep_shot_animi_timer_ptr;
bool ignore_original_dmg = false;
}; };
static void CalcGunMuzzlePosition(Creature* c, static void CalcGunMuzzlePosition(Creature* c,
@ -500,6 +501,7 @@ void InternalShot(Creature* c,
bullet_info.weapon_lv = weapon_lv; bullet_info.weapon_lv = weapon_lv;
bullet_info.weapon_buff_id = weapon_buff_id; bullet_info.weapon_buff_id = weapon_buff_id;
bullet_info.reporter_list = c->CalcReporterList(trace_target_uniid, weapon_meta, bullet_meta); bullet_info.reporter_list = c->CalcReporterList(trace_target_uniid, weapon_meta, bullet_meta);
bullet_info.ignore_original_dmg = c->GetAbility()->GetSwitchTimes(kIgnoreOriginalDmg) > 0;
if (weapon_meta->double_gun() && if (weapon_meta->double_gun() &&
bulletIdx > (int)(bulletNum / 2)) { bulletIdx > (int)(bulletNum / 2)) {
bullet_info.hand = 1; bullet_info.hand = 1;