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-04-20 16:45:32 +08:00
parent 36f4ac34d1
commit ea013e9b08
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/guide.cc
View File

@ -79,9 +79,9 @@ void Guide::ProcMoveTarget()
if (!curr_step_meta_->_params.empty()) { if (!curr_step_meta_->_params.empty()) {
Position pos; Position pos;
pos.FromGlmVec3(std::get<1>(curr_step_meta_->_params.at(0))); pos.FromGlmVec3(std::get<1>(curr_step_meta_->_params.at(0)));
if (owner_->GetPos().Distance2D2(pos) < 5) { if (owner_->GetPos().Distance2D2(pos) < 30) {
owner_->room->xtimer.DeleteCurrentTimer();
NextStep(); NextStep();
owner_->room->xtimer.DeleteCurrentTimer();
} }
} else { } else {
NextStep(); NextStep();
@ -108,7 +108,6 @@ void Guide::ProcMoveTargetAndPickup()
int time = std::get<0>(tuple); int time = std::get<0>(tuple);
glm::vec3 pos = std::get<1>(tuple); glm::vec3 pos = std::get<1>(tuple);
int equip_id = std::get<2>(tuple); int equip_id = std::get<2>(tuple);
++i;
context->loots.push_back(-1); context->loots.push_back(-1);
owner_->room->xtimer.SetTimeoutEx owner_->room->xtimer.SetTimeoutEx
( (
@ -127,6 +126,7 @@ void Guide::ProcMoveTargetAndPickup()
} }
}, },
&owner_->xtimer_attacher); &owner_->xtimer_attacher);
++i;
} }
} }
@ -141,14 +141,14 @@ void Guide::ProcMoveTargetAndPickup()
done = false; done = false;
break; break;
} }
if (!owner_->room->GetEntityByUniId(loot_uniid)) { if (owner_->room->GetEntityByUniId(loot_uniid)) {
done = false; done = false;
break; break;
} }
} }
if (done) { if (done) {
owner_->room->xtimer.DeleteCurrentTimer();
NextStep(); NextStep();
owner_->room->xtimer.DeleteCurrentTimer();
} }
} }
}, },
@ -223,8 +223,8 @@ void Guide::ProcKillEnemy()
} }
} }
if (done) { if (done) {
owner_->room->xtimer.DeleteCurrentTimer();
NextStep(); NextStep();
owner_->room->xtimer.DeleteCurrentTimer();
} }
} }
}, },
@ -299,8 +299,8 @@ void Guide::ProcUseSkillAndKillEnemy()
} }
} }
if (done) { if (done) {
owner_->room->xtimer.DeleteCurrentTimer();
NextStep(); NextStep();
owner_->room->xtimer.DeleteCurrentTimer();
} }
} }
}, },

7
server/gameserver/hero.cc
View File

@ -336,8 +336,11 @@ void Hero::OnRemoveFromTargetPartObject(Entity* target)
void Hero::InitAI() void Hero::InitAI()
{ {
f8::BtMgr::Instance()->BtLoad(agent_, meta->bt().c_str()); if (room->IsNewBieRoom()) {
f8::BtMgr::Instance()->BtSetCurrent(agent_, meta->bt().c_str()); } else {
f8::BtMgr::Instance()->BtLoad(agent_, meta->bt().c_str());
f8::BtMgr::Instance()->BtSetCurrent(agent_, meta->bt().c_str());
}
} }
void Hero::OnBattleStart(Room* room) void Hero::OnBattleStart(Room* room)