add f8

server/gameserver/CMakeLists.txt

@@ -19,7 +19,8 @@ set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -D
 
 include_directories(
   AFTER
-  ../../third_party/a8engine
+  ../../third_party/a8
+  ../../third_party/f8
   /usr/include/mysql
   /usr/include/jsoncpp
   /usr/include/hiredis
@@ -41,15 +42,15 @@ link_directories(
   ../../third_party/behaviac/lib/${LIB_DIR}
 )
 
-aux_source_directory(../../third_party/a8engine/a8
+aux_source_directory(../../third_party/a8/a8
   SRC_LIST
 )
 
-aux_source_directory(../../third_party/framework/cpp
+aux_source_directory(../../third_party/f8/f8
   SRC_LIST
 )
-list(REMOVE_ITEM SRC_LIST "../../third_party/framework/cpp/im_msgid.pb.cc")
+list(REMOVE_ITEM SRC_LIST "../../third_party/f8/f8/im_msgid.pb.cc")
-list(REMOVE_ITEM SRC_LIST "../../third_party/framework/cpp/im_proto.pb.cc")
+list(REMOVE_ITEM SRC_LIST "../../third_party/f8/f8/im_proto.pb.cc")
 
 aux_source_directory(../../third_party/recastnavigation/Recast/Source
   SRC_LIST

server/gameserver/GGListener.cc

@@ -4,8 +4,8 @@
 #include <a8/mixedsession.h>
 #include <a8/tcplistener.h>
 
-#include "framework/cpp/netmsghandler.h"
+#include "f8/netmsghandler.h"
-#include "framework/cpp/msgqueue.h"
+#include "f8/msgqueue.h"
 
 #include "app.h"
 #include "GGListener.h"

server/gameserver/android.cc

@@ -7,7 +7,7 @@
 #include "android_agent.h"
 #include "movehelper.h"
 
-#include "framework/cpp/btmgr.h"
+#include "f8/btmgr.h"
 
 Android::Android():Human()
 {

server/gameserver/app.cc

@@ -12,7 +12,7 @@
 #include <a8/uuid.h>
 #include <a8/collision.h>
 
-#include "framework/cpp/netmsghandler.h"
+#include "f8/netmsghandler.h"
 
 #include "app.h"
 #include "jsondatamgr.h"
@@ -30,10 +30,10 @@
 #include "ss_msgid.pb.h"
 #include "ss_proto.pb.h"
 
-#include "framework/cpp/msgqueue.h"
+#include "f8/msgqueue.h"
-#include "framework/cpp/tglog.h"
+#include "f8/tglog.h"
-#include "framework/cpp/httpclientpool.h"
+#include "f8/httpclientpool.h"
-#include "framework/cpp/btmgr.h"
+#include "f8/btmgr.h"
 
 #include "collider.h"
 

server/gameserver/base_agent.cc

@@ -6,7 +6,7 @@
 #include "human.h"
 #include "movehelper.h"
 
-#include "framework/cpp/btmgr.h"
+#include "f8/btmgr.h"
 
 void DumpBt(BaseAgent* agent)
 {

server/gameserver/creature.cc

@@ -17,7 +17,7 @@
 #include "shot.h"
 #include "movehelper.h"
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 static int GetTraceTargetId(Creature* c)
 {

server/gameserver/gamelog.cc

@@ -1,7 +1,7 @@
 #include "precompile.h"
 #include "gamelog.h"
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
-#include "framework/cpp/tglog.h"
+#include "f8/tglog.h"
 #include <a8/mutable_xobject.h>
 #include "player.h"
 #include "app.h"

server/gameserver/handlermgr.h

@@ -2,7 +2,7 @@
 
 #include <a8/basehttpsession.h>
 
-#include "framework/cpp/netmsghandler.h"
+#include "f8/netmsghandler.h"
 
 namespace a8
 {

server/gameserver/httpproxy.cc

@@ -8,7 +8,7 @@
 #include "jsondatamgr.h"
 #include "handlermgr.h"
 
-#include "framework/cpp/httpclientpool.h"
+#include "f8/httpclientpool.h"
 
 struct HttpProxyRequest
 {

server/gameserver/httpproxy.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "framework/cpp/httpclientpool.h"
+#include "f8/httpclientpool.h"
 
 struct HttpProxyRequest;
 class HttpProxy : public a8::Singleton<HttpProxy>

server/gameserver/human.cc

@@ -6,7 +6,7 @@
 #include <a8/mutable_xobject.h>
 #include <a8/collision.h>
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 #include "human.h"
 #include "cs_proto.pb.h"

server/gameserver/jsondatamgr.cc

@@ -3,7 +3,7 @@
 #include "jsondatamgr.h"
 #include "app.h"
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 void JsonDataMgr::Init()
 {

server/gameserver/matchmgr.cc

@@ -7,7 +7,7 @@
 #include "GGListener.h"
 #include "matchteam.h"
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 void MatchMgr::Init()
 {

server/gameserver/matchteam.cc

@@ -8,7 +8,7 @@
 #include "metamgr.h"
 #include "roommgr.h"
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 RawTeamMember::RawTeamMember()
 {

server/gameserver/metadata.cc

@@ -6,7 +6,7 @@
 #include "metamgr.h"
 #include "skillhelper.h"
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 namespace MetaData
 {

server/gameserver/playermgr.cc

@@ -8,7 +8,7 @@
 #include "metamgr.h"
 #include "matchmgr.h"
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 void PlayerMgr::Init()
 {

server/gameserver/precompile.h

@@ -28,6 +28,6 @@ namespace google
     }
 }
 
-#include "framework/cpp/types.h"
+#include "f8/types.h"
-#include "framework/cpp/protoutils.h"
+#include "f8/protoutils.h"
 

server/gameserver/room.cc

@@ -8,7 +8,7 @@
 #include <a8/collision.h>
 #include <a8/vec2.h>
 
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 #include "playermgr.h"
 #include "player.h"

server/gameserver/roommgr.cc

@@ -19,8 +19,8 @@
 #include "matchteam.h"
 #include "httpproxy.h"
 
-#include "framework/cpp/httpclientpool.h"
+#include "f8/httpclientpool.h"
-#include "framework/cpp/utils.h"
+#include "f8/utils.h"
 
 const int ROOM_NUM_UP_LIMIT = 1000;
 const int HUM_NUM_DOWN_LIMIT = 2500;

third_party/f8

@@ -1 +1 @@
-Subproject commit 1dbae08b6f5d9e4df8325f5170a2355953ff4db8
+Subproject commit 37c1840e2e58fd84267cbd4a6d5dfc2d2bcc5478