From c00c0aad3107ba827b35aebd4f64dd59b988edc8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 10 Jun 2019 17:18:58 +0800
Subject: [PATCH] 1

---
 server/gameserver/app.cc      | 8 ++++++--
 server/gameserver/constant.h  | 1 +
 server/gameserver/entity.cc   | 1 +
 server/gameserver/movement.cc | 6 +++---
 server/gameserver/types.h     | 2 ++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index b753dc5..d36c0e6 100755
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -61,19 +61,23 @@ static void SavePerfLog()
                                   PlayerMgr::Instance()->OnlineNum()
                                  });
     if (App::Instance()->HasFlag(4)) {
-        a8::XPrintf("mainloop_time:%d netmsg_time:%d room:%d over_room:%d online:%d bullet:%d\n",
+        a8::XPrintf("mainloop_time:%d netmsg_time:%d room:%d over_room:%d online:%d bullet:%d grid_chg_times:%d test_times:%d\n",
                     {
                      App::Instance()->perf.max_run_delay_time,
                      App::Instance()->perf.max_dispatchmsg_time,
                      RoomMgr::Instance()->RoomNum(),
                      RoomMgr::Instance()->OverRoomNum(),
                      PlayerMgr::Instance()->OnlineNum(),
-                     App::Instance()->perf.entity_num[ET_Bullet]
+                     App::Instance()->perf.entity_num[ET_Bullet],
+                     App::Instance()->perf.grid_chg_times,
+                     App::Instance()->perf.test_times,
                     });
     }
     App::Instance()->perf.max_run_delay_time = 0;
     App::Instance()->perf.max_dispatchmsg_time = 0;
     App::Instance()->perf.max_timer_idle = 0;
+    App::Instance()->perf.grid_chg_times = 0;
+    App::Instance()->perf.test_times = 0;
     f8::HttpClientPool::Instance()->max_request_delay = 0;
 }
 
diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index 0e9c9de..adbc317 100755
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -157,6 +157,7 @@ const int SMOKE_SLOT = 4;
 const int MAP_HEIGHT = 8192;
 const int MAP_WIDTH = 8192;
 const int MAP_CELL_WIDTH = 64 * 8;
+const int MAP_GRID_WIDTH = 64;
 
 const int DOOR_THING_ID = 61701;
 
diff --git a/server/gameserver/entity.cc b/server/gameserver/entity.cc
index 150943a..12e02b2 100644
--- a/server/gameserver/entity.cc
+++ b/server/gameserver/entity.cc
@@ -44,6 +44,7 @@ void Entity::GetCircleBox(CircleCollider& circle_box)
 
 bool Entity::TestCollision(Entity* b)
 {
+    App::Instance()->perf.test_times++;
     for (auto& a_collider : colliders) {
         for (auto& b_collider : b->colliders) {
             if (a_collider->Intersect(b_collider)) {
diff --git a/server/gameserver/movement.cc b/server/gameserver/movement.cc
index f369e42..65a76a3 100644
--- a/server/gameserver/movement.cc
+++ b/server/gameserver/movement.cc
@@ -16,7 +16,7 @@ void MovementComponent::RayDetection()
     } else if (owner->entity_type == ET_Player) {
         Human* hum = (Human*)owner;
         start_point = hum->pos;
-        target_point = hum->pos + hum->move_dir * (MAP_CELL_WIDTH - 64);
+        target_point = hum->pos + hum->move_dir * (MAP_CELL_WIDTH - MAP_GRID_WIDTH);
         target_distance = (target_point - start_point).Norm();
         {
             Vector2D left_dir = hum->move_dir;
@@ -27,9 +27,9 @@ void MovementComponent::RayDetection()
             right_dir.Normalize();
 
             Vector2D left_p0 = left_dir * (hum->meta->i->radius() + 1);
-            Vector2D left_p1 = left_p0 + hum->move_dir * (MAP_CELL_WIDTH - 64);
+            Vector2D left_p1 = left_p0 + hum->move_dir * (MAP_CELL_WIDTH - MAP_GRID_WIDTH);
             Vector2D right_p0 = right_dir * (hum->meta->i->radius() + 1);
-            Vector2D right_p1 = right_p0 + hum->move_dir * (MAP_CELL_WIDTH - 64);
+            Vector2D right_p1 = right_p0 + hum->move_dir * (MAP_CELL_WIDTH - MAP_GRID_WIDTH);
 
             for (auto& grid : hum->grid_list) {
                 for (Entity* entity : grid->entity_list) {
diff --git a/server/gameserver/types.h b/server/gameserver/types.h
index f176889..f5cee2a 100755
--- a/server/gameserver/types.h
+++ b/server/gameserver/types.h
@@ -8,6 +8,8 @@ struct PerfMonitor
     long long out_data_size = 0;
     long long in_data_size = 0;
     long long read_count = 0;
+    long long grid_chg_times = 0;
+    long long test_times = 0;
     std::array<int, 30> entity_num = {};
 };