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-04-03 10:08:51 +08:00
parent dbb53b64bc
commit 1ba97eabe0
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/obstacle.cc
View File

@ -294,6 +294,7 @@ bool Obstacle::DoInteraction(Human* sender)
default: default:
{ {
if (!IsDead(sender->room) && IsOpenInteraction()) { if (!IsDead(sender->room) && IsOpenInteraction()) {
dead_reason = 1;
Die(sender->room); Die(sender->room);
sender->DropItems(this); sender->DropItems(this);
BroadcastFullState(sender->room); BroadcastFullState(sender->room);

1
server/gameserver/obstacle.h
View File

@ -15,6 +15,7 @@ class Obstacle : public Entity
MapService* permanent_map_service = nullptr; MapService* permanent_map_service = nullptr;
bool is_permanent = false; bool is_permanent = false;
float scale = 1.0f; float scale = 1.0f;
int dead_reason = 0;
virtual ~Obstacle() override; virtual ~Obstacle() override;
virtual void Initialize() override; virtual void Initialize() override;

1
server/gameserver/pbutils.cc
View File

@ -451,6 +451,7 @@ void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d
p->set_health(GetHealth(room)); p->set_health(GetHealth(room));
p->set_dead(IsDead(room)); p->set_dead(IsDead(room));
p->set_dead_at_thisframe(IsDead(room) ? GetDeadFrameNo(room) <= room->GetFrameNo() : false); p->set_dead_at_thisframe(IsDead(room) ? GetDeadFrameNo(room) <= room->GetFrameNo() : false);
p->set_dead_reason(dead_reason);
if (!IsPermanent()) { if (!IsPermanent()) {
RoomObstacle* ob = (RoomObstacle*)this; RoomObstacle* ob = (RoomObstacle*)this;

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

@ -359,6 +359,7 @@ message MFObstacleFull
optional float health = 7; //血量 optional float health = 7; //血量
optional bool dead = 8; //是否已死亡 optional bool dead = 8; //是否已死亡
optional bool dead_at_thisframe = 9; //是否当前帧死亡(播放死亡特效) optional bool dead_at_thisframe = 9; //是否当前帧死亡(播放死亡特效)
optional int32 dead_reason = 42 [default = 0]; //死亡原因 0:被打 1:被开
optional bool is_door = 20; //是否门 optional bool is_door = 20; //是否门
//只有当is_door==ture时以下字段才有意义 //只有当is_door==ture时以下字段才有意义