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

地图上坐骑标记

Browse Source
This commit is contained in:
aozhiwei 2021-06-04 13:09:39 +08:00
parent a089b5e6c7
commit 370fbf4ced
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/car.cc
View File

@ -149,6 +149,7 @@ void Car::GetOn(Human* passenger)
driver_ = passenger; driver_ = passenger;
driver_->SetAttackDir(a8::Vec2::RIGHT); driver_->SetAttackDir(a8::Vec2::RIGHT);
SetAttackDir(driver_->GetAttackDir()); SetAttackDir(driver_->GetAttackDir());
room->TakeOnCarObject(GetEntityUniId());
} }
passenger->SetCar(this); passenger->SetCar(this);
passenger->SetSeat(seat); passenger->SetSeat(seat);
@ -170,6 +171,7 @@ void Car::GetOn(Human* passenger)
TryAddBuff(this, meta->car_active_buff_id); TryAddBuff(this, meta->car_active_buff_id);
} }
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
room->NotifyUiUpdate();
} }
void Car::SwitchSeat(Human* passenger, int seat) void Car::SwitchSeat(Human* passenger, int seat)
@ -310,6 +312,7 @@ void Car::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int
void Car::BeKill(int killer_id, const std::string& killer_name, int weapon_id) void Car::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
{ {
dead = true; dead = true;
room->TakeOnCarObject(GetEntityUniId());
BroadcastDeleteState(room); BroadcastDeleteState(room);
RemoveFromAroundPlayers(room); RemoveFromAroundPlayers(room);
room->grid_service->RemoveCreature(this); room->grid_service->RemoveCreature(this);

2
server/gameserver/human.cc
View File

@ -3383,8 +3383,6 @@ void Human::DoGetOnWithLoot(Loot* entity)
team_id team_id
); );
car->GetOn(this); car->GetOn(this);
room->TakeOnCarObject(entity->GetEntityUniId());
room->NotifyUiUpdate();
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("DoGetOnWithLoot uniid:%d car_uniid:%d\n", {car->GetEntityUniId(), car->car_uniid}); a8::XPrintf("DoGetOnWithLoot uniid:%d car_uniid:%d\n", {car->GetEntityUniId(), car->car_uniid});
#endif #endif

3
server/gameserver/metamgr.cc
View File

@ -520,6 +520,9 @@ private:
MetaData::Buff& item = a8::FastAppend(buff_list); MetaData::Buff& item = a8::FastAppend(buff_list);
item.i = &meta; item.i = &meta;
item.Init(); item.Init();
if (buff_hash.find(item.i->buff_id()) != buff_hash.end()) {
abort();
}
buff_hash[item.i->buff_id()] = &item; buff_hash[item.i->buff_id()] = &item;
} }