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-09-23 19:05:08 +08:00
parent 71c9703cff
commit 5732cb535a
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/custom_battle.cc
View File

@ -59,6 +59,7 @@ void CustomBattle::ParseResult(a8::XObject& obj)
return; return;
} }
auto member = std::make_shared<CustomMember>(); auto member = std::make_shared<CustomMember>();
member->team_ = team.get();
member->account_id_ = member_obj->Get("account_id").GetString(); member->account_id_ = member_obj->Get("account_id").GetString();
member->session_id_ = member_obj->Get("session_id").GetString(); member->session_id_ = member_obj->Get("session_id").GetString();
member->battle_context_ = std::make_shared<BattleDataContext>(); member->battle_context_ = std::make_shared<BattleDataContext>();

3
server/gameserver/custom_member.h
View File

@ -2,11 +2,13 @@
struct BattleDataContext; struct BattleDataContext;
class Player; class Player;
class CustomTeam;
class CustomMember class CustomMember
{ {
public: public:
void Join(Player* hum); void Join(Player* hum);
CustomTeam* GetTeam() { return team_; }
bool IsJoined() { return joined_; } bool IsJoined() { return joined_; }
int GetJoinTime() { return join_time_; } int GetJoinTime() { return join_time_; }
bool IsViewer() { return is_viewer_; } bool IsViewer() { return is_viewer_; }
@ -15,6 +17,7 @@ class CustomMember
std::shared_ptr<BattleDataContext>& GetNetData() { return battle_context_; }; std::shared_ptr<BattleDataContext>& GetNetData() { return battle_context_; };
private: private:
CustomTeam *team_ = nullptr;
bool joined_ = false; bool joined_ = false;
int join_time_ = 0; int join_time_ = 0;
bool is_viewer_ = false; bool is_viewer_ = false;

2
server/gameserver/room.cc
View File

@ -3551,7 +3551,7 @@ void Room::FillCustomBattleHuman()
if (!member->IsJoined()) { if (!member->IsJoined()) {
auto p = custom_battle_; auto p = custom_battle_;
cs::CMJoin msg; cs::CMJoin msg;
CustomTeam *team; CustomTeam *team = member->GetTeam();
int socket_handle = 0; int socket_handle = 0;
int ip_saddr = 0; int ip_saddr = 0;