From 8eafed4b340e707c4308b9552b521a7e7b06fda5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 27 Nov 2023 15:27:38 +0800
Subject: [PATCH] 1

---
 server/gameserver/app.cc     | 14 +-------------
 server/gameserver/roommgr.cc |  5 +++++
 server/gameserver/roommgr.h  |  1 +
 third_party/f8               |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index c4bda73c..92991b01 100644
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -144,7 +144,7 @@ void App::UnInit()
 
 bool App::HasTask()
 {
-    return RoomMgr::Instance()->RoomNum() > 0;
+    return RoomMgr::Instance()->HasTask();
 }
 
 void App::ProcessGameGateMsg(f8::MsgHdr* hdr)
@@ -221,7 +221,6 @@ int App::GetVersion()
 {
     const char* current_file_name = __FILE__;
     if (!version_) {
-#if 1
         std::string self_path = GetSelfPath();
         //self_path = "/data/backups_app/b_game2006_gameserver_ty_z9.1.0.0.1.20231124R2/bin/gameserver2006";
         std::vector<std::string> strings;
@@ -233,17 +232,6 @@ int App::GetVersion()
         a8::ReplaceString(version_str, "R", "0");
         version_ = std::make_shared<int>(a8::XValue(version_str).GetInt());
         a8::XPrintf("%s %s %s\n", {self_path, *version_, version_str});
-#else
-        std::vector<std::string> strings;
-        a8::Split(current_file_name, strings, '/');
-        std::string tag = strings.at(strings.size() - 6);
-        std::vector<std::string> strings2;
-        a8::Split(tag, strings2, '.');
-        std::string version_str = strings2.at(strings2.size() - 1);
-        a8::ReplaceString(version_str, "R", "0");
-        version_ = std::make_shared<int>(a8::XValue(version_str).GetInt());
-        a8::XPrintf("%s %s %s\n", {current_file_name, *version_, version_str});
-#endif
     }
     return *version_;
 }
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 2a196c36..d1a5378f 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -1121,3 +1121,8 @@ void RoomMgr::SendGetCustomBattleData(std::shared_ptr<cs::CMJoin> join_msg,
              );
     }
 }
+
+bool RoomMgr::HasTask()
+{
+
+}
diff --git a/server/gameserver/roommgr.h b/server/gameserver/roommgr.h
index 2b797cda..7d49609a 100644
--- a/server/gameserver/roommgr.h
+++ b/server/gameserver/roommgr.h
@@ -88,6 +88,7 @@ class RoomMgr : public a8::Singleton<RoomMgr>
                            void(std::vector<std::shared_ptr<BattleDataContext>>&)> cb);
     int GetMatchMode() { return match_mode_; };
     void SetMatchMode(int mode);
+    bool HasTask();
 
  private:
     void InstallReportStateTimer();
diff --git a/third_party/f8 b/third_party/f8
index 6d385ed9..6fd4da23 160000
--- a/third_party/f8
+++ b/third_party/f8
@@ -1 +1 @@
-Subproject commit 6d385ed941caa9b15083ce1e1c012ef8311467c3
+Subproject commit 6fd4da23e3cef2aa0b55ebfa9c60ccf1798a31bc