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-06-20 16:59:46 +08:00
parent 955f76da1a
commit d02976ac3e
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/incubator.cc
View File

@ -503,6 +503,12 @@ void Incubator::ShowHand()
glm::vec3 point = glm::vec3(room->GetGasData().new_area_meta->GetLastArea()->x1(), glm::vec3 point = glm::vec3(room->GetGasData().new_area_meta->GetLastArea()->x1(),
6.0f, 6.0f,
room->GetGasData().new_area_meta->GetLastArea()->y1()); room->GetGasData().new_area_meta->GetLastArea()->y1());
{
glm::vec3* safe_point = mt::SafeAreaSafePoint::RandPoint(room->GetGasData().new_area_meta->type());
if (safe_point) {
point = *safe_point;
}
}
Global::Instance()->verify_set_pos = 1; Global::Instance()->verify_set_pos = 1;
hum->GetMutablePos().FromGlmVec3(point); hum->GetMutablePos().FromGlmVec3(point);
Global::Instance()->verify_set_pos = 0; Global::Instance()->verify_set_pos = 0;

2
server/gameserver/mt/SafeAreaSafePoint.cc
View File

@ -23,7 +23,7 @@ namespace mt
{ {
} }
glm::vec3* SafeAreaSafePoint::RandPoint(int type) const glm::vec3* SafeAreaSafePoint::RandPoint(int type)
{ {
auto itr = _type_safe_points_hash.find(type); auto itr = _type_safe_points_hash.find(type);
return itr != _type_safe_points_hash.end() && !itr->second.empty() ? return itr != _type_safe_points_hash.end() && !itr->second.empty() ?

2
server/gameserver/mt/SafeAreaSafePoint.h
View File

@ -13,7 +13,7 @@ namespace mt
void Init1(); void Init1();
static void StaticPostInit(); static void StaticPostInit();
glm::vec3* RandPoint(int type) const; static glm::vec3* RandPoint(int type);
private: private:
static std::map<int, std::vector<glm::vec3>> _type_safe_points_hash; static std::map<int, std::vector<glm::vec3>> _type_safe_points_hash;