This commit is contained in:
aozhiwei 2024-07-31 16:19:32 +08:00
parent ba4eca4a11
commit a9c206ed29
3 changed files with 6 additions and 1 deletions

View File

@ -70,11 +70,14 @@ void BoxDrop::OnBattleStart()
{ {
if (a8::TIMER_EXEC_EVENT == event) { if (a8::TIMER_EXEC_EVENT == event) {
if (!room_->IsGameOver() && !room_->GetVictoryTeam()) { if (!room_->IsGameOver() && !room_->GetVictoryTeam()) {
RequestAllocBoxNum(); if (!alloced_) {
RequestAllocBoxNum();
}
} }
} }
}, },
&room_->xtimer_attacher_); &room_->xtimer_attacher_);
RequestAllocBoxNum();
} }
} }

View File

@ -74,6 +74,7 @@ void Player::_CMExecCommand(f8::MsgHdr* hdr, const cs::CMExecCommand& msg)
glm::vec3 pos; glm::vec3 pos;
if (room->GetBoxDrop()->GetNextBoxPos(pos)) { if (room->GetBoxDrop()->GetNextBoxPos(pos)) {
GetMutablePos().FromGlmVec3(pos); GetMutablePos().FromGlmVec3(pos);
GetMovement()->ClearPath();
room->grid_service->MoveCreature(this); room->grid_service->MoveCreature(this);
} }
} else if (cmd == "additem" && cmds.size() >= 3) { } else if (cmd == "additem" && cmds.size() >= 3) {

View File

@ -405,6 +405,7 @@ void Team::GenBattleReportData(a8::MutableXObject* params)
member_pb->SetVal("max_hero_skill_lv", hum->stats->max_hero_skill_lv); member_pb->SetVal("max_hero_skill_lv", hum->stats->max_hero_skill_lv);
member_pb->SetVal("abandon_battle", hum->stats->abandon_battle); member_pb->SetVal("abandon_battle", hum->stats->abandon_battle);
member_pb->SetVal("assist", hum->stats->assist); member_pb->SetVal("assist", hum->stats->assist);
member_pb->SetVal("box_num", hum->box_num);
{ {
std::string weapons_type; std::string weapons_type;
std::string weapons_slot; std::string weapons_slot;