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

1

Browse Source
This commit is contained in:
aozhiwei 2021-07-09 11:32:47 +00:00
parent e6b98c6d9e
commit c0d5174c5b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -184,7 +184,7 @@ void Bullet::ProcBomb()
{ {
//烟雾弹 //烟雾弹
a8::Vec2 bomb_pos = GetPos(); a8::Vec2 bomb_pos = GetPos();
room->frame_event.AddSmoke(this, meta->i->id(), bomb_pos); room->frame_event.AddSmoke(this, meta->i->id(), bomb_pos, 1000 * 30);
ProcSmokeBomb(); ProcSmokeBomb();
} }
break; break;

3
server/gameserver/frameevent.cc
View File

@ -200,7 +200,7 @@ void FrameEvent::AddBulletNumChg(CreatureWeakPtr& sender)
} }
} }
void FrameEvent::AddSmoke(Bullet* bullet, int item_id, a8::Vec2 pos) void FrameEvent::AddSmoke(Bullet* bullet, int item_id, a8::Vec2 pos, float time_addition)
{ {
if (!bullet->sender.Get()) { if (!bullet->sender.Get()) {
return; return;
@ -213,6 +213,7 @@ void FrameEvent::AddSmoke(Bullet* bullet, int item_id, a8::Vec2 pos)
p.set_item_id(item_id); p.set_item_id(item_id);
TypeConvert::ToPb(pos, p.mutable_pos()); TypeConvert::ToPb(pos, p.mutable_pos());
p.set_player_id(bullet->sender.Get()->GetUniId()); p.set_player_id(bullet->sender.Get()->GetUniId());
p.set_time_addition(time_addition);
} }
{ {
int idx = smokes_.size() - 1; int idx = smokes_.size() - 1;

2
server/gameserver/frameevent.h
View File

@ -26,7 +26,7 @@ public:
float fly_distance); float fly_distance);
void RemoveBullet(a8::Vec2 pos, int bullet_uniid); void RemoveBullet(a8::Vec2 pos, int bullet_uniid);
void AddExplosion(Bullet* bullet, int item_id, a8::Vec2 bomb_pos); void AddExplosion(Bullet* bullet, int item_id, a8::Vec2 bomb_pos);
void AddSmoke(Bullet* bullet, int item_id, a8::Vec2 pos); void AddSmoke(Bullet* bullet, int item_id, a8::Vec2 pos, float time_addition);
void AddPlaySkill(CreatureWeakPtr& sender, int skill_id); void AddPlaySkill(CreatureWeakPtr& sender, int skill_id);
void AddExplosionEx(CreatureWeakPtr& sender, int item_id, a8::Vec2 bomb_pos, int effect); void AddExplosionEx(CreatureWeakPtr& sender, int item_id, a8::Vec2 bomb_pos, int effect);
void AddBulletNumChg(CreatureWeakPtr& sender); void AddBulletNumChg(CreatureWeakPtr& sender);

2
server/tools/protobuild/cs_proto.proto
View File

@ -453,7 +453,6 @@ message MFSmokeFull
optional int32 obj_uniid = 1; //唯一id optional int32 obj_uniid = 1; //唯一id
optional MFVec2 pos = 2; //位置 optional MFVec2 pos = 2; //位置
optional float rad = 3; //半径 optional float rad = 3; //半径
optional float time_addition = 4; //烟雾弹时间加成(单位毫秒)
} }
//载具-部分 //载具-部分
@ -674,6 +673,7 @@ message MFSmoke
optional int32 item_id = 1; //配置表id optional int32 item_id = 1; //配置表id
optional MFVec2 pos = 2; //位置 optional MFVec2 pos = 2; //位置
optional int32 player_id = 4; //玩家id optional int32 player_id = 4; //玩家id
optional float time_addition = 5; //烟雾弹时间加成(单位毫秒)
} }
//表情 //表情