1
This commit is contained in:
parent
f168e1128c
commit
f5dd02c341
@ -50,11 +50,13 @@ void Bullet::Initialize()
|
|||||||
|
|
||||||
void Bullet::Update(int delta_time)
|
void Bullet::Update(int delta_time)
|
||||||
{
|
{
|
||||||
|
if (shot_animi_time <= (room->GetFrameNo() - create_frameno_) * FRAME_RATE_MS) {
|
||||||
if (!trace_target_id) {
|
if (!trace_target_id) {
|
||||||
MapServiceUpdate();
|
MapServiceUpdate();
|
||||||
++updated_times_;
|
++updated_times_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Bullet::RecalcSelfCollider()
|
void Bullet::RecalcSelfCollider()
|
||||||
{
|
{
|
||||||
|
@ -36,6 +36,7 @@ class Bullet : public MoveableEntity
|
|||||||
int strengthen_wall = 0;
|
int strengthen_wall = 0;
|
||||||
int hand = 0;
|
int hand = 0;
|
||||||
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr;
|
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr;
|
||||||
|
float shot_animi_time = 0.0f;
|
||||||
|
|
||||||
virtual ~Bullet() override;
|
virtual ~Bullet() override;
|
||||||
virtual void Initialize() override;
|
virtual void Initialize() override;
|
||||||
|
@ -43,6 +43,7 @@ struct BulletInfo
|
|||||||
float track_change_time = 0;
|
float track_change_time = 0;
|
||||||
int is_through = 0;
|
int is_through = 0;
|
||||||
int hand = 0;
|
int hand = 0;
|
||||||
|
float shot_animi_time = 0;
|
||||||
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr;
|
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -94,7 +95,8 @@ static void InternalCreateBullet(BulletInfo& bullet_info)
|
|||||||
bullet_info.weapon_uniid,
|
bullet_info.weapon_uniid,
|
||||||
bullet_info.trace_target_uniid,
|
bullet_info.trace_target_uniid,
|
||||||
bullet_info.hand,
|
bullet_info.hand,
|
||||||
bullet_info.keep_shot_animi_timer_ptr);
|
bullet_info.keep_shot_animi_timer_ptr,
|
||||||
|
bullet_info.shot_animi_time);
|
||||||
#ifdef DEBUG1
|
#ifdef DEBUG1
|
||||||
if (bullet_info.c.Get()->IsPlayer()) {
|
if (bullet_info.c.Get()->IsPlayer()) {
|
||||||
bullet_info.c.Get()->SendDebugMsg(a8::Format("CreateBullet id:%d",
|
bullet_info.c.Get()->SendDebugMsg(a8::Format("CreateBullet id:%d",
|
||||||
@ -325,6 +327,9 @@ void InternalShot(Creature* c,
|
|||||||
}
|
}
|
||||||
bullet_dir.Rotate(bullet_angle / 180.0f);
|
bullet_dir.Rotate(bullet_angle / 180.0f);
|
||||||
int shot_animi_time = (shot_animi ? shot_animi->t : 0);
|
int shot_animi_time = (shot_animi ? shot_animi->t : 0);
|
||||||
|
if (shot_animi_time > 0) {
|
||||||
|
shot_animi_time = std::max(100, shot_animi_time);
|
||||||
|
}
|
||||||
{
|
{
|
||||||
bool is_player = c->IsPlayer();
|
bool is_player = c->IsPlayer();
|
||||||
bool is_car = c->IsCar();
|
bool is_car = c->IsCar();
|
||||||
@ -382,6 +387,7 @@ void InternalShot(Creature* c,
|
|||||||
bullet_info->invincible_buff_uniid = invincible_buff_uniid;
|
bullet_info->invincible_buff_uniid = invincible_buff_uniid;
|
||||||
bullet_info->trace_target_uniid = trace_target_uniid;
|
bullet_info->trace_target_uniid = trace_target_uniid;
|
||||||
bullet_info->keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr;
|
bullet_info->keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr;
|
||||||
|
bullet_info->shot_animi_time = shot_animi_time;
|
||||||
if (skill_meta &&
|
if (skill_meta &&
|
||||||
(skill_meta->GetMagicId() == MAGIC_AXXF ||
|
(skill_meta->GetMagicId() == MAGIC_AXXF ||
|
||||||
skill_meta->GetMagicId() == MAGIC_HJHX)) {
|
skill_meta->GetMagicId() == MAGIC_HJHX)) {
|
||||||
|
@ -599,7 +599,8 @@ int Room::CreateBullet(Creature* sender,
|
|||||||
long long weapon_uniid,
|
long long weapon_uniid,
|
||||||
int trace_target_id,
|
int trace_target_id,
|
||||||
int hand,
|
int hand,
|
||||||
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr)
|
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr,
|
||||||
|
float shot_animi_time)
|
||||||
{
|
{
|
||||||
int bullet_uniid = 0;
|
int bullet_uniid = 0;
|
||||||
if (grid_service->CanAdd(pos.x, pos.y)) {
|
if (grid_service->CanAdd(pos.x, pos.y)) {
|
||||||
@ -621,6 +622,7 @@ int Room::CreateBullet(Creature* sender,
|
|||||||
bullet->trace_target_id = trace_target_id;
|
bullet->trace_target_id = trace_target_id;
|
||||||
bullet->hand = hand;
|
bullet->hand = hand;
|
||||||
bullet->keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr;
|
bullet->keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr;
|
||||||
|
bullet->shot_animi_time = shot_animi_time;
|
||||||
bullet->Initialize();
|
bullet->Initialize();
|
||||||
AddObjectLater(bullet);
|
AddObjectLater(bullet);
|
||||||
bullet_uniid = bullet->GetUniId();
|
bullet_uniid = bullet->GetUniId();
|
||||||
|
@ -173,7 +173,8 @@ public:
|
|||||||
long long weapon_uniid,
|
long long weapon_uniid,
|
||||||
int trace_target_id,
|
int trace_target_id,
|
||||||
int hand,
|
int hand,
|
||||||
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr);
|
std::weak_ptr<a8::XTimerPtr> keep_shot_animi_timer_ptr,
|
||||||
|
float shot_animi_time);
|
||||||
Car* CreateCar(Human* driver,
|
Car* CreateCar(Human* driver,
|
||||||
int car_uniid,
|
int car_uniid,
|
||||||
MetaData::Equip* meta,
|
MetaData::Equip* meta,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user