1

server/gameserver/CMakeLists.txt

@@ -147,9 +147,17 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     behaviac_gcc_debug
     )
 else()
+  if (${ASAN})
+    target_link_libraries(
+      gameserver${GAME_ID}
+      #tcmalloc
+      behaviac_gcc_release
+      )
+  else()
   target_link_libraries(
-    gameserver${GAME_ID}
-    tcmalloc
-    behaviac_gcc_release
-    )
+      gameserver${GAME_ID}
+      tcmalloc
+      behaviac_gcc_release
+      )
+    endif()
 endif()

server/gameserver/app.cc

@@ -189,6 +189,18 @@ bool App::Init(int argc, char* argv[])
     GGListener::Instance()->Init();
     HttpProxy::Instance()->Init();
 
+    #if 0
+    for (int i = 0;i <1000; ++i)
+    {
+        auto agent_ = behaviac::Agent::Create<AndroidAgent>();
+        agent_->SetOwner(nullptr);
+        f8::BtMgr::Instance()->BtLoad(agent_, "android_attack");
+        //f8::BtMgr::Instance()->BtSetCurrent(agent_, "android_pvp");
+        f8::BtMgr::Instance()->BtDestory(agent_);
+        //agent_ = nullptr;
+    }
+    #endif
+
     f8::UdpLog::Instance()->Info("gameserver starting instance_id:%d pid:%d debug_mode:%d channel:%d",
                                  {
                                   instance_id_,

server/gameserver/handlermgr.cc

@@ -67,7 +67,6 @@ static void _GMOpsTerminate(std::shared_ptr<f8::JsonHttpRequest> request)
     App::Instance()->Terminate();
 }
 
-
 static void _GMStatGetRealTimeOnline(std::shared_ptr<f8::JsonHttpRequest> request)
 {
     request->resp_xobj->SetVal("errcode", 0);

server/gameserver/mapinstance.cc

@@ -942,7 +942,7 @@ void MapInstance::LoadHouse()
                                            box_collider->size.z
                                            );
                                 }
-                                #endif
+#endif
                                 std::vector<glm::vec3> new_points;
                                 mc::RotateBounds(box_collider->center,
                                                  box_collider->size,

server/gameserver/mt/Map.h

@@ -34,6 +34,7 @@ namespace mt
         std::map<int, int> car_num_limit_;
         std::vector<int> safearea_list;
         std::vector<std::shared_ptr<WorldObject>> _world_objects;
+        std::shared_ptr<MapCollider> collider_info;
         std::map<int, std::vector<std::shared_ptr<WorldObject>>> _group_world_objects;
         std::shared_ptr<MapCollider> collider_info = nullptr;
         std::vector<std::tuple<std::shared_ptr<WorldObject>, int>> moba_born_points;

server/gameserver/mt/MapCollider.cc

@@ -33,7 +33,7 @@ namespace mt
             "main3d_map.colliders.json"
         };
         for (auto& filename : files) {
-            MapCollider* p = new MapCollider();
+            std::shared_ptr<MapCollider> p = std::make_shared<MapCollider>();
             p->Load(filename);
             p->LoadTerrain("map4_terrain.bin");
             raw_list.push_back(p);

server/gameserver/room.cc

@@ -192,6 +192,11 @@ void Room::UnInit()
     f8::BtMgr::Instance()->BtDestory(room_agent_);
     room_agent_ = nullptr;
     team_hash_.clear();
+    for (auto& pair : discard_team_hash_) {
+        delete pair.second;
+    }
+    discard_team_hash_.clear();
+    task_hash_.clear();
     A8_SAFE_DELETE(frame_event_data);
     PerfMonitor::Instance()->alive_count -= alive_count_;
 }
@@ -2102,8 +2107,9 @@ void Room::RandRemoveAndroid()
         }
     }
     if (hum) {
-        if (hum->team_id != 0) {
-            team_hash_.erase(hum->team_id);
+        if (hum->GetTeam()) {
+            team_hash_.erase(hum->GetTeam()->GetTeamId());
+            discard_team_hash_[hum->GetTeam()->GetTeamId()] = hum->GetTeam();
         }
         if (hum->born_point) {
             DecBornPointHumanNum(hum->born_point, hum);

server/gameserver/room.h

@@ -392,6 +392,7 @@ private:
     std::set<int> refreshed_robot_set_;
     std::map<int, Team*> team_hash_;
     std::map<int, Team*> combineable_team_hash_;
+    std::map<int, Team*> discard_team_hash_;
     std::map<std::string, Player*> accountid_hash_;
     std::map<int, MoveableEntity*> moveable_hash_;
     std::map<int, Entity*> uniid_hash_;

third_party/f8

@@ -1 +1 @@
-Subproject commit 7fb9c9083275fd35c2bb4456999673444dcfe986
+Subproject commit f856de73d2a3087289495690e3ea9bd7b1aa79ef