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-03-16 16:55:27 +08:00
parent 780812f702
commit 5cced8868a
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/battledatacontext.cc
View File

@ -370,11 +370,11 @@ void BattleDataContext::ParseResult(a8::XObject& obj)
match_mode_ = obj.Get("match_mode"); match_mode_ = obj.Get("match_mode");
} }
level_ = obj.HasKey("level") ? obj.Get("level").GetInt() : 1; level_ = obj.HasKey("level") ? obj.Get("level").GetInt() : 1;
skin_id_ = obj.HasKey("skin_id") ? obj.Get("skin_id").GetInt() : 0;
if (obj.HasKey("hero_dto") && obj.At("hero_dto")->IsObject()) { if (obj.HasKey("hero_dto") && obj.At("hero_dto")->IsObject()) {
hero_dto = obj.At("hero_dto"); hero_dto = obj.At("hero_dto");
hero_ability_->hero_uniid_ = hero_dto->Get("hero_uniid", ""); hero_ability_->hero_uniid_ = hero_dto->Get("hero_uniid", "");
hero_ability_->hero_dto = hero_dto; hero_ability_->hero_dto = hero_dto;
skin_id_ = hero_dto->HasKey("skin_id") ? hero_dto->Get("skin_id").GetInt() : 0;
const mt::Hero* meta = mt::Hero::GetById(hero_dto->Get("hero_id", "")); const mt::Hero* meta = mt::Hero::GetById(hero_dto->Get("hero_id", ""));
if (meta) { if (meta) {
hero_ability_->hero_meta = meta; hero_ability_->hero_meta = meta;

8
server/gameserver/room.cc
View File

@ -1640,6 +1640,14 @@ void Room::CombineTeam()
} }
} }
} while (++try_count < 20); } while (++try_count < 20);
FillTeam();
}
void Room::FillTeam()
{
for (auto& pair : accountid_hash_) {
}
} }
void Room::InitAirDrop() void Room::InitAirDrop()

1
server/gameserver/room.h
View File

@ -228,6 +228,7 @@ private:
bool GenSmallCircle(); bool GenSmallCircle();
void MatchTeam(Human* hum); void MatchTeam(Human* hum);
void CombineTeam(); void CombineTeam();
void FillTeam();
void AirDrop(int appear_time, int box_id, int airdrop_id); void AirDrop(int appear_time, int box_id, int airdrop_id);
void AdjustAirDropPos(const mt::MapThing* thing_meta, glm::vec3& box_pos); void AdjustAirDropPos(const mt::MapThing* thing_meta, glm::vec3& box_pos);
void AirRaid(int airraid_id); void AirRaid(int airraid_id);