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 09:46:16 +08:00
parent dfe106e953
commit 20e2965286
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/human.cc
View File

@ -3816,4 +3816,6 @@ void Human::OnMetaChange()
if (passive_skill_meta) { if (passive_skill_meta) {
AddPassiveSkill(passive_skill_meta); AddPassiveSkill(passive_skill_meta);
} }
room->frame_event.AddRaceChg(this);
room->frame_event.AddLevelChg(this);
} }

16
server/gameserver/room.cc
View File

@ -848,6 +848,16 @@ void Room::FillSMUiUpdate(cs::SMUiUpdate& msg)
#endif #endif
msg.set_zombie_num(zombie_alive_count_); msg.set_zombie_num(zombie_alive_count_);
msg.set_human_num(human_alive_count_); msg.set_human_num(human_alive_count_);
if (BattleStarted() && human_alive_count_ <= 2 && !sent_terminator_airdrop) {
sent_terminator_airdrop = true;
MetaData::AirDrop* airdrop_meta = MetaMgr::Instance()->GetAirDrop
(map_meta_->i->terminator_airdrop());
if (airdrop_meta) {
AirDrop(airdrop_meta->i->appear_time(),
airdrop_meta->i->drop_id(),
airdrop_meta->i->id());
}
}
} }
} }
@ -2645,7 +2655,7 @@ void Room::AddPlayerPostProc(Player* hum)
RandRemoveAndroid(); RandRemoveAndroid();
} }
if (GetRoomMode() == kZombieMode) { if (GetRoomMode() == kZombieMode) {
#if 1 #if 0
hum->ChangeToRace(kZombieRace, 1); hum->ChangeToRace(kZombieRace, 1);
#else #else
hum->ChangeToRace(kHumanRace, 1); hum->ChangeToRace(kHumanRace, 1);
@ -3189,7 +3199,11 @@ 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;

1
server/gameserver/room.h
View File

@ -259,6 +259,7 @@ private:
int creator_register_time_ = 0; int creator_register_time_ = 0;
bool force_entry_newbie_room_ = false; bool force_entry_newbie_room_ = false;
xtimer_list* battle_report_timer_ = nullptr; xtimer_list* battle_report_timer_ = nullptr;
bool sent_terminator_airdrop = false;
int current_teamid_ = 0; int current_teamid_ = 0;
int current_uniid_ = FIXED_OBJECT_MAXID; int current_uniid_ = FIXED_OBJECT_MAXID;

4
server/gameserver/zombie.ai.cc
View File

@ -416,7 +416,9 @@ float ZombieAI::GetAttackRange()
float attack_range = 0; float attack_range = 0;
Human* myself = (Human*)owner; Human* myself = (Human*)owner;
if (myself->curr_weapon && myself->curr_weapon->meta) { if (myself->curr_weapon && myself->curr_weapon->meta) {
attack_range = myself->curr_weapon->meta->i->range(); attack_range = myself->curr_weapon->meta->i->range() + 10;
} else {
abort();
} }
attack_range = std::min(node_->ai_meta->i->attack_range(), (int)attack_range); attack_range = std::min(node_->ai_meta->i->attack_range(), (int)attack_range);
return attack_range; return attack_range;