1
This commit is contained in:
parent
23dc1d4548
commit
e9742e5973
@ -367,6 +367,7 @@ void Guide::NextStep()
|
|||||||
#endif
|
#endif
|
||||||
++curr_step_idx_;
|
++curr_step_idx_;
|
||||||
if (curr_step_idx_ >= mt::GuideStep::_steps.size()) {
|
if (curr_step_idx_ >= mt::GuideStep::_steps.size()) {
|
||||||
|
finished_ = true;
|
||||||
owner_->room->frame_event.AddPropChg
|
owner_->room->frame_event.AddPropChg
|
||||||
(
|
(
|
||||||
owner_->GetWeakPtrRef(),
|
owner_->GetWeakPtrRef(),
|
||||||
|
@ -23,9 +23,11 @@ class Guide
|
|||||||
void ProcUseSkill();
|
void ProcUseSkill();
|
||||||
|
|
||||||
void NextStep();
|
void NextStep();
|
||||||
|
bool IsFinished() { return finished_; };
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Human* owner_ = nullptr;
|
Human* owner_ = nullptr;
|
||||||
|
bool finished_ = false;
|
||||||
int curr_step_idx_ = 0;
|
int curr_step_idx_ = 0;
|
||||||
const mt::GuideStep* curr_step_meta_ = nullptr;
|
const mt::GuideStep* curr_step_meta_ = nullptr;
|
||||||
};
|
};
|
||||||
|
@ -486,6 +486,7 @@ void Room::FillSMJoinedNotify(Player* self_hum, cs::SMJoinedNotify& msg)
|
|||||||
{
|
{
|
||||||
msg.set_team_mode(msg.team_mode());
|
msg.set_team_mode(msg.team_mode());
|
||||||
msg.set_adjust_bullet(1);
|
msg.set_adjust_bullet(1);
|
||||||
|
msg.set_is_newbie_room(IsNewBieRoom() ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Room::ScatterDrop(const glm::vec3& center, int drop_id)
|
void Room::ScatterDrop(const glm::vec3& center, int drop_id)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user