1
This commit is contained in:
parent
37aec4b915
commit
52cc1c8213
@ -7,7 +7,9 @@
|
|||||||
|
|
||||||
void CustomBattle::Init()
|
void CustomBattle::Init()
|
||||||
{
|
{
|
||||||
|
ob_team_ = std::make_shared<CustomTeam>();
|
||||||
|
ob_team_->team_uuid_ = "";
|
||||||
|
ob_team_->is_view_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CustomBattle::UnInit()
|
void CustomBattle::UnInit()
|
||||||
@ -52,7 +54,7 @@ void CustomBattle::ParseResult(a8::XObject& obj)
|
|||||||
if (!team) {
|
if (!team) {
|
||||||
team = std::make_shared<CustomTeam>();
|
team = std::make_shared<CustomTeam>();
|
||||||
team->team_uuid_ = team_uuid;
|
team->team_uuid_ = team_uuid;
|
||||||
team->is_view_ = is_view ? true : false;
|
team->is_view_ = false;
|
||||||
uuid_hash_[team->team_uuid_] = team;
|
uuid_hash_[team->team_uuid_] = team;
|
||||||
}
|
}
|
||||||
for (int ii = 0; ii < member_list->Size(); ++ii) {
|
for (int ii = 0; ii < member_list->Size(); ++ii) {
|
||||||
@ -64,6 +66,11 @@ 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 MYDEBUG
|
||||||
|
if (IsMoba()) {
|
||||||
|
member->account_id_ = member->account_id_ + "$$$$";
|
||||||
|
}
|
||||||
|
#endif
|
||||||
member->session_id_ = member_obj->Get("session_id").GetString();
|
member->session_id_ = member_obj->Get("session_id").GetString();
|
||||||
member->name_ = member_obj->Get("name").GetString();
|
member->name_ = member_obj->Get("name").GetString();
|
||||||
member->sex_ = member_obj->Get("sex");
|
member->sex_ = member_obj->Get("sex");
|
||||||
@ -76,13 +83,28 @@ 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 MYDEBUG
|
||||||
|
if (IsMoba()) {
|
||||||
|
auto member = std::make_shared<CustomMember>();
|
||||||
|
member->team_ = ob_team_.get();
|
||||||
|
member->account_id_ = member_obj->Get("account_id").GetString();
|
||||||
|
member->session_id_ = member_obj->Get("session_id").GetString();
|
||||||
|
member->name_ = member_obj->Get("name").GetString();
|
||||||
|
member->sex_ = member_obj->Get("sex");
|
||||||
|
member->battle_context_ = std::make_shared<BattleDataContext>();
|
||||||
|
member->battle_context_->ParseResult(*member_obj);
|
||||||
|
if (!member->battle_context_->parse_ok) {
|
||||||
|
parse_ok_ = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
account_hash_[member->account_id_] = ob_team_;
|
||||||
|
ob_id_hash_[member->account_id_] = member;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
auto ob_team_ = std::make_shared<CustomTeam>();
|
|
||||||
ob_team_->team_uuid_ = "";
|
|
||||||
ob_team_->is_view_ = true;
|
|
||||||
auto ob_list = obj.At("ob_list");
|
auto ob_list = obj.At("ob_list");
|
||||||
if (ob_list && ob_list->IsArray()) {
|
if (ob_list && ob_list->IsArray()) {
|
||||||
for (int i = 0; i < ob_list->Size(); ++i) {
|
for (int i = 0; i < ob_list->Size(); ++i) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user