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-12-28 11:52:07 +08:00
parent 8be61c1810
commit 8b477e257d
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/gameserver/android.cc
View File

@ -85,16 +85,14 @@ void Android::Update(int delta_time)
} }
} }
#ifdef MYDEBUG #ifdef MYDEBUG
if (room->BattleStarted()) { if (!dead &&
if (!dead && room->debug_params.find(119) != room->debug_params.end()) {
room->debug_params.find(119) != room->debug_params.end()) { BeKill(VP_Gas,
BeKill(VP_Gas, TEXT("battle_server_killer_gas", "毒圈"),
TEXT("battle_server_killer_gas", "毒圈"), VW_Gas,
VW_Gas, VP_Gas,
VP_Gas, TEXT("battle_server_killer_gas", "毒圈"));
TEXT("battle_server_killer_gas", "毒圈")); a8::UnSetBitFlag(status, CS_Disable);
a8::UnSetBitFlag(status, CS_Disable);
}
} }
#endif #endif
InternalUpdate(delta_time); InternalUpdate(delta_time);

9
server/gameserver/commands.cc
View File

@ -86,6 +86,15 @@ void Player::_CMExecCommand(f8::MsgHdr* hdr, const cs::CMExecCommand& msg)
} else if (cmd == "chiji") { } else if (cmd == "chiji") {
#if MYDEBUG #if MYDEBUG
room->debug_params[119] = 1; room->debug_params[119] = 1;
room->xtimer.SetTimeoutEx
(1,
[this] (int event, const a8::Args* args)
{
if (a8::TIMER_EXEC_EVENT == event) {
room->GetIncubator()->ShowHand();
}
},
&xtimer_attacher);
#endif #endif
} else if (cmd == "add_hp") { } else if (cmd == "add_hp") {
if (cmds.size() > 1) { if (cmds.size() > 1) {

4
server/gameserver/incubator.cc
View File

@ -252,7 +252,11 @@ void Incubator::AutoAllocAndroid()
case GasWaiting: case GasWaiting:
case GasMoving: case GasMoving:
{ {
#if 1
if (!hold_humans_.empty() && hold_humans_.size() > 0) {
#else
if (!hold_humans_.empty() && hold_humans_.size() > 6) { if (!hold_humans_.empty() && hold_humans_.size() > 6) {
#endif
Human* hum = hold_humans_[0]; Human* hum = hold_humans_[0];
if (room->GetGasData().GetGasMode() == GasWaiting && if (room->GetGasData().GetGasMode() == GasWaiting &&
hold_humans_.size() > 1 && hold_humans_.size() > 1 &&

4
server/gameserver/pbutils.cc
View File

@ -2252,6 +2252,10 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
moba_teams.push_back(team); moba_teams.push_back(team);
return true; return true;
}); });
if (moba_teams.size() < 1 ||
moba_teams.size() > 2) {
abort();
}
p->TraverseMemberList p->TraverseMemberList
( (
[p, msg, ip_saddr, socket_handle] (MobaMember* m) -> bool [p, msg, ip_saddr, socket_handle] (MobaMember* m) -> bool