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-12-14 19:00:07 +08:00
parent 8f2bfd1a15
commit a19b7331b4
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/metamgr.cc
View File

@ -650,6 +650,14 @@ private:
parameter_hash[item.pb->param_name()] = &item; parameter_hash[item.pb->param_name()] = &item;
} }
{
for (auto& meta : map_meta_list) {
MetaData::Map& item = a8::FastAppend(map_list);
item.pb = &meta;
item.Init();
gamemap_hash[item.pb->map_id()] = &item;
}
}
for (auto& meta : safearea_meta_list) { for (auto& meta : safearea_meta_list) {
MetaData::SafeArea& item = a8::FastAppend(safearea_list); MetaData::SafeArea& item = a8::FastAppend(safearea_list);
item.pb = &meta; item.pb = &meta;

8
server/gameserver/movehelper.cc
View File

@ -22,7 +22,11 @@ bool MoveHelper::GetMovePosition(glm::vec3& out_pos)
return false; return false;
} }
MovePathPoint& curr_point = paths_[path_index_]; MovePathPoint& curr_point = paths_[path_index_];
owner_->SetPos(curr_point.curr_pos); {
a8::Vec2 dir = a8::Vec2(curr_point.dir.x, curr_point.dir.z);
curr_point.curr_pos.AddVec2(dir * owner_->GetSpeed());
owner_->SetPos(curr_point.curr_pos);
}
if (owner_->GetPos().Distance2D2(curr_point.src_pos) - curr_point.distance >= 0.0001f) { if (owner_->GetPos().Distance2D2(curr_point.src_pos) - curr_point.distance >= 0.0001f) {
owner_->SetPos(curr_point.tar_pos); owner_->SetPos(curr_point.tar_pos);
++path_index_; ++path_index_;
@ -90,7 +94,7 @@ void MoveHelper::CalcTargetPos(float distance)
point.tar_pos.z < 0) { point.tar_pos.z < 0) {
abort(); abort();
} }
#ifdef DEBUG1 #ifdef DEBUG
a8::XPrintf("CalcTargetPos src_pos:%f,%f tar_pos:%f,%f is_hit:%d start:%f,%f,%f end:%f,%f,%f distance:%f\n", a8::XPrintf("CalcTargetPos src_pos:%f,%f tar_pos:%f,%f is_hit:%d start:%f,%f,%f end:%f,%f,%f distance:%f\n",
{ {
point.src_pos.x, point.src_pos.x,