1
This commit is contained in:
parent
cd4d138336
commit
2cbc3e36b8
@ -88,9 +88,12 @@ void Player::_CMExecCommand(f8::MsgHdr* hdr, const cs::CMExecCommand& msg)
|
|||||||
} else if (cmd == "chiji") {
|
} else if (cmd == "chiji") {
|
||||||
#if MYDEBUG
|
#if MYDEBUG
|
||||||
if (room->IsMobaModeRoom()) {
|
if (room->IsMobaModeRoom()) {
|
||||||
while (!room->GetVictoryTeam()) {
|
while (GetTeam()->GetKillCount() <100) {
|
||||||
GetTeam()->IncKillCount();
|
GetTeam()->IncKillCount();
|
||||||
}
|
}
|
||||||
|
if (!room->moba_over_timer.expired()) {
|
||||||
|
room->xtimer.ModifyTime(room->moba_over_timer, 0);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
room->debug_params[119] = 1;
|
room->debug_params[119] = 1;
|
||||||
room->xtimer.SetTimeoutEx
|
room->xtimer.SetTimeoutEx
|
||||||
|
0
server/gameserver/ingamevoice.cc
Normal file
0
server/gameserver/ingamevoice.cc
Normal file
0
server/gameserver/ingamevoice.h
Normal file
0
server/gameserver/ingamevoice.h
Normal file
@ -45,6 +45,7 @@ class CustomBattle;
|
|||||||
class CustomMember;
|
class CustomMember;
|
||||||
class RoomAgent;
|
class RoomAgent;
|
||||||
class RoomOb;
|
class RoomOb;
|
||||||
|
class InGameVoice;
|
||||||
|
|
||||||
struct Plane
|
struct Plane
|
||||||
{
|
{
|
||||||
@ -291,6 +292,7 @@ public:
|
|||||||
std::shared_ptr<RoomOb> GetRoomOb();
|
std::shared_ptr<RoomOb> GetRoomOb();
|
||||||
void SendSMTeamFull(Human* hum);
|
void SendSMTeamFull(Human* hum);
|
||||||
void OnTeamPartChg(Human* hum);
|
void OnTeamPartChg(Human* hum);
|
||||||
|
std::shared_ptr<InGameVoice> GetInGameVoice() { return ingame_voice_; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ShuaAndroid();
|
void ShuaAndroid();
|
||||||
@ -443,6 +445,8 @@ private:
|
|||||||
|
|
||||||
RoomAgent* room_agent_;
|
RoomAgent* room_agent_;
|
||||||
|
|
||||||
|
std::shared_ptr<InGameVoice> ingame_voice_;
|
||||||
|
|
||||||
friend class Incubator;
|
friend class Incubator;
|
||||||
friend class Team;
|
friend class Team;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user