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

1

Browse Source
This commit is contained in:
aozhiwei 2020-07-29 13:33:52 +08:00
parent b463c11be1
commit 98f6454670
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/frameevent.cc
View File

@ -46,7 +46,11 @@ void FrameEvent::AddShot(Human* sender)
auto& p = std::get<1>(tuple); auto& p = std::get<1>(tuple);
p.set_player_id(sender->GetEntityUniId()); p.set_player_id(sender->GetEntityUniId());
if (sender->car_weapon.meta) {
sender->car_weapon.ToPB(p.mutable_weapon());
} else {
sender->curr_weapon->ToPB(p.mutable_weapon()); sender->curr_weapon->ToPB(p.mutable_weapon());
}
#if 0 #if 0
p.set_offhand(true); p.set_offhand(true);
p.set_bullskin(10001); p.set_bullskin(10001);
@ -71,14 +75,23 @@ void FrameEvent::AddBullet(Human* sender, a8::Vec2 born_pos, a8::Vec2 dir, float
auto& p = std::get<1>(tuple); auto& p = std::get<1>(tuple);
p.set_player_id(sender->GetEntityUniId()); p.set_player_id(sender->GetEntityUniId());
if (sender->car_weapon.meta) {
p.set_bullet_id(sender->car_weapon.meta->i->use_bullet());
} else {
p.set_bullet_id(sender->curr_weapon->meta->i->use_bullet()); p.set_bullet_id(sender->curr_weapon->meta->i->use_bullet());
}
TypeConvert::ToPb(born_pos, p.mutable_pos()); TypeConvert::ToPb(born_pos, p.mutable_pos());
TypeConvert::ToPb(dir, p.mutable_dir()); TypeConvert::ToPb(dir, p.mutable_dir());
#if 0 #if 0
p.set_bulletskin(10001); p.set_bulletskin(10001);
#endif #endif
if (sender->car_weapon.meta) {
p.set_gun_id(sender->car_weapon.meta->i->id());
p.set_gun_lv(sender->car_weapon.weapon_lv);
} else {
p.set_gun_id(sender->curr_weapon->meta->i->id()); p.set_gun_id(sender->curr_weapon->meta->i->id());
p.set_gun_lv(sender->curr_weapon->weapon_lv); p.set_gun_lv(sender->curr_weapon->weapon_lv);
}
p.set_fly_distance(fly_distance); p.set_fly_distance(fly_distance);
} }
{ {

1
server/gameserver/human.cc
View File

@ -1297,6 +1297,7 @@ void Human::DoGetDown()
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
room->NotifyUiUpdate(); room->NotifyUiUpdate();
car_ = HumanCar(); car_ = HumanCar();
car_weapon = Weapon();
CancelAction(); CancelAction();
} }
} }

5
server/gameserver/player.cc
View File

@ -712,6 +712,11 @@ void Player::HumanInteraction(Human* hum)
void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& prepare_items) void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& prepare_items)
{ {
std::set<int> handled_items; std::set<int> handled_items;
#if 1
::google::protobuf::RepeatedField< ::google::protobuf::int32 >* mutable_prepare_items =
(::google::protobuf::RepeatedField< ::google::protobuf::int32 >*)&prepare_items;
mutable_prepare_items->Add(12805);
#endif
for (int equip_id : prepare_items) { for (int equip_id : prepare_items) {
if (handled_items.find(equip_id) != handled_items.end()) { if (handled_items.find(equip_id) != handled_items.end()) {
continue; continue;

4
server/gameserver/room.cc
View File

@ -3199,11 +3199,7 @@ void Room::NotifySysPiao(const std::string& msg, int color, int duration)
size_t Room::GetRoomMaxPlayerNum() size_t Room::GetRoomMaxPlayerNum()
{ {
if (room_mode_ == kZombieMode) { if (room_mode_ == kZombieMode) {
#if 1
return 4;
#else
return MetaMgr::Instance()->zbmode_player_num; return MetaMgr::Instance()->zbmode_player_num;
#endif
} else { } else {
if (IsMiniRoom()) { if (IsMiniRoom()) {
return MINI_ROOM_MAX_PLAYER_NUM; return MINI_ROOM_MAX_PLAYER_NUM;