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 2022-08-18 13:19:47 +08:00
parent 0922f7e846
commit 8a3e8dfb95
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/gameserver/metadata.cc
View File

@ -1674,20 +1674,16 @@ namespace MetaData
std::vector<std::string> strings; std::vector<std::string> strings;
a8::Split(pb->area(), strings, '|'); a8::Split(pb->area(), strings, '|');
for (auto& str : strings) { for (auto& str : strings) {
std::vector<std::string> strings2; MetaData::SafeArea* p = MetaMgr::Instance()->GetSafeArea(a8::XValue(str));
a8::Split(str, strings2, ':'); if (!p) {
if (strings2.size() != 3) {
abort(); abort();
} }
area.push_back(std::make_tuple area.push_back(p);
(
(float)a8::XValue(strings2[0]).GetDouble(),
(float)a8::XValue(strings2[1]).GetDouble(),
(int)a8::XValue(strings2[2]).GetInt()
)
);
} }
} }
if (area.empty()) {
abort();
}
waves.resize(mode_time.size()); waves.resize(mode_time.size());
for (auto& content : *MetaMgr::Instance()->GetPveGeminiContents(pb->id())) { for (auto& content : *MetaMgr::Instance()->GetPveGeminiContents(pb->id())) {
if (content.pb->round() <= 0 || if (content.pb->round() <= 0 ||

2
server/gameserver/metadata.h
View File

@ -412,7 +412,7 @@ namespace MetaData
{ {
const metatable::PveGeminiMode* pb = nullptr; const metatable::PveGeminiMode* pb = nullptr;
std::vector<int> mode_time; std::vector<int> mode_time;
std::vector<std::tuple<float, float, int>> area; std::vector<MetaData::SafeArea*> area;
std::vector<std::vector<PveGeminiContent*>> waves; std::vector<std::vector<PveGeminiContent*>> waves;
void Init(); void Init();

3
server/gameserver/room.cc
View File

@ -1302,6 +1302,9 @@ void Room::UpdateGasInactivePve()
NotifyUiUpdate(); NotifyUiUpdate();
ClearPostBattleAutoFreeList(); ClearPostBattleAutoFreeList();
OnBattleStart(); OnBattleStart();
if (IsSurvivalRoom()) {
}
} }
void Room::UpdateGasWaiting() void Room::UpdateGasWaiting()