1
This commit is contained in:
parent
2136fdb18d
commit
8deb24c276
@ -66,7 +66,7 @@ void CustomBattle::ParseResult(a8::XObject& obj)
|
|||||||
auto member = std::make_shared<CustomMember>();
|
auto member = std::make_shared<CustomMember>();
|
||||||
member->team_ = team.get();
|
member->team_ = team.get();
|
||||||
member->account_id_ = member_obj->Get("account_id").GetString();
|
member->account_id_ = member_obj->Get("account_id").GetString();
|
||||||
#ifdef MYDEBUG1
|
#ifdef MYDEBUG
|
||||||
if (IsMoba()) {
|
if (IsMoba()) {
|
||||||
member->account_id_ = member->account_id_ + "$$$$";
|
member->account_id_ = member->account_id_ + "$$$$";
|
||||||
}
|
}
|
||||||
@ -83,7 +83,7 @@ void CustomBattle::ParseResult(a8::XObject& obj)
|
|||||||
member_id_hash_[member->account_id_] = member;
|
member_id_hash_[member->account_id_] = member;
|
||||||
team->member_hash_[member->account_id_] = member;
|
team->member_hash_[member->account_id_] = member;
|
||||||
account_hash_[member->account_id_] = team;
|
account_hash_[member->account_id_] = team;
|
||||||
#ifdef MYDEBUG1
|
#ifdef MYDEBUG
|
||||||
if (IsMoba()) {
|
if (IsMoba()) {
|
||||||
auto member = std::make_shared<CustomMember>();
|
auto member = std::make_shared<CustomMember>();
|
||||||
member->team_ = ob_team_.get();
|
member->team_ = ob_team_.get();
|
||||||
|
@ -412,7 +412,9 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
|
|||||||
AddToMoveableHash(hum);
|
AddToMoveableHash(hum);
|
||||||
AddToAccountHash(hum);
|
AddToAccountHash(hum);
|
||||||
AddToHumanHash(hum);
|
AddToHumanHash(hum);
|
||||||
AddToAliveHumanHash(hum);
|
if (!hum->IsOb()) {
|
||||||
|
AddToAliveHumanHash(hum);
|
||||||
|
}
|
||||||
if (!no_matchteam) {
|
if (!no_matchteam) {
|
||||||
MatchTeam(hum);
|
MatchTeam(hum);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user