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

1

Browse Source
This commit is contained in:
aozhiwei 2021-09-28 08:19:36 +00:00
parent c8cfc14893
commit 80a52b2fe2
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/matchmgr.h
View File

@ -13,7 +13,7 @@ class MatchTeam;
class MatchMgr : public a8::Singleton<MatchMgr> class MatchMgr : public a8::Singleton<MatchMgr>
{ {
public: public:
enum { HID = HID_RoomMgr }; enum { HID = HID_MatchMgr };
private: private:
MatchMgr() {}; MatchMgr() {};

6
server/gameserver/matchteam.cc
View File

@ -12,10 +12,14 @@ void RawTeamMember::FillMFMatchTeamMember(cs::MFMatchTeamMember* p)
p->set_account_id(msg.account_id()); p->set_account_id(msg.account_id());
p->set_name(msg.name()); p->set_name(msg.name());
p->set_avatar_url(msg.avatar_url()); p->set_avatar_url(msg.avatar_url());
if (state == kMatchReadying) {
p->set_hero_id(0);
} else {
p->set_hero_id(msg.hero_id()); p->set_hero_id(msg.hero_id());
*p->mutable_weapons() = msg.weapons(); *p->mutable_weapons() = msg.weapons();
*p->mutable_skins() = msg.skins(); *p->mutable_skins() = msg.skins();
*p->mutable_skill_list() = msg.skill_list(); *p->mutable_skill_list() = msg.skill_list();
}
p->set_is_leader(is_leader); p->set_is_leader(is_leader);
p->set_state(state); p->set_state(state);
p->set_head(msg.head()); p->set_head(msg.head());
@ -369,6 +373,7 @@ void MatchTeam::ShuaRobot()
void MatchTeam::StartGame() void MatchTeam::StartGame()
{ {
#if 0
for (auto& member : curr_member_hash_) { for (auto& member : curr_member_hash_) {
if (member->socket_handle != 0) { if (member->socket_handle != 0) {
MatchMgr::Instance()->RemoveSocket(member->socket_handle); MatchMgr::Instance()->RemoveSocket(member->socket_handle);
@ -378,6 +383,7 @@ void MatchTeam::StartGame()
MatchMgr::Instance()->RemoveTeam(pair.first); MatchMgr::Instance()->RemoveTeam(pair.first);
} }
MatchMgr::Instance()->RemoveTeam(GetTeamUUid()); MatchMgr::Instance()->RemoveTeam(GetTeamUUid());
#endif
} }
void MatchTeam::ChooseLeader() void MatchTeam::ChooseLeader()

2
server/gameserver/metamgr.cc
View File

@ -348,7 +348,7 @@ public:
#ifdef DEBUG #ifdef DEBUG
MetaMgr::Instance()->match_team_time = 10; MetaMgr::Instance()->match_team_time = 10;
MetaMgr::Instance()->match_robot_time = 5; MetaMgr::Instance()->match_robot_time = 5;
MetaMgr::Instance()->match_choose_time = 30; MetaMgr::Instance()->match_choose_time = 60;
MetaMgr::Instance()->match_lock_time = 10; MetaMgr::Instance()->match_lock_time = 10;
#endif #endif
{ {