Refactor CMake configuration and enhance logging functionality

Author: muyuanjin

CMakeLists.txt

@@ -4,20 +4,17 @@ project(kcd2db LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Set default build type to Release
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build" FORCE)
-endif()
-
 if(NOT WIN32 OR NOT MSVC)
     message(FATAL_ERROR "This project only supports Windows and MSVC")
 endif()
+# 设置UTF-8编码
+add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
 # 设置为静态多线程运行时库（Release用MT，Debug用MTd）
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
-add_compile_options("/source-charset:utf-8")
+
 
 include(FetchContent)
 
@@ -26,7 +23,12 @@ FetchContent_Declare(libmem-config URL "https://raw.githubusercontent.com/rdbo/l
 FetchContent_MakeAvailable(libmem-config)
 set(CMAKE_PREFIX_PATH "${libmem-config_SOURCE_DIR}" "${CMAKE_PREFIX_PATH}")
 set(LIBMEM_DOWNLOAD_VERSION "5.0.4")
-set(LIBMEM_MSVC_CRT "MT")
+# 设置libmem的运行时，如果是Release则使用MT，如果是Debug则使用MTd
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(LIBMEM_MSVC_CRT "MTd")
+else()
+    set(LIBMEM_MSVC_CRT "MT")
+endif()
 
 # Find libmem package
 find_package(libmem CONFIG REQUIRED)

src/db/Database.cpp

@@ -114,6 +114,7 @@ int Database::GenericAccess(IFunctionHandler* pH, const AccessType action, const
     {
     case AccessType::Set:
         cache[key] = value;
+        LogDebug(isGlobal ? "Set Global %s = %s" : "Set %s = %s", key, FormatAnyValue(value));
         if (isGlobal)
         {
             m_globalDirty = true;
@@ -127,6 +128,7 @@ int Database::GenericAccess(IFunctionHandler* pH, const AccessType action, const
     case AccessType::Del:
         {
             const bool erased = cache.erase(key) > 0;
+            LogDebug(isGlobal ? "Delete Global %s: %s" : "Delete %s: %s", key, erased ? "OK" : "Not found");
             if (isGlobal && erased)
             {
                 m_globalDirty = true;
@@ -194,10 +196,9 @@ void Database::OnPostUpdate(float /*fDeltaTime*/)
     if (!m_globalDirty) return;
     if (const auto now = steady_clock::now(); now - m_lastSaveTime < SAVE_INTERVAL) return;
 
-    int successCount = 0;
-
     try
     {
+        int successCount = 0;
         ExecuteTransaction([this, &successCount](const SQLite::Database& db)
         {
             SQLite::Statement clearStmt(db, "DELETE FROM Store WHERE savefile = ''");
@@ -279,32 +280,17 @@ int Database::BatchOperation(SQLite::Database& db, const Cache& cache, const std
 
 std::optional<ScriptAnyValue> Database::ParseAnyValue(const int type, const std::string& value)
 {
-    ScriptAnyValue any;
     switch (type)
     {
     case ANY_TBOOLEAN:
-        {
-            any.type = ANY_TBOOLEAN;
-            any.b = std::stoi(value) != 0;
-        }
-        break;
+        return ScriptAnyValue(std::stoi(value) != 0);
     case ANY_TNUMBER:
-        {
-            any.type = ANY_TNUMBER;
-            any.number = std::stod(value);
-        }
-        break;
+        return ScriptAnyValue(std::stof(value));
     case ANY_TSTRING:
-        {
-            any.type = ANY_TSTRING;
-            // Fix for string encoding issues - ensure we properly handle UTF-8 strings
-            any.str = _strdup(value.c_str());
-        }
-        break;
+        return ScriptAnyValue(_strdup(value.c_str()));
     default:
         return std::nullopt;
     }
-    return any;
 }
 
 std::optional<std::string> Database::SerializeAnyValue(const ScriptAnyValue& any)
@@ -318,15 +304,32 @@ std::optional<std::string> Database::SerializeAnyValue(const ScriptAnyValue& any
     case ANY_TSTRING:
         {
             if (!any.str) return "";
-
-            // Return the string directly - SQLite handles UTF-8 text natively
             return std::string(any.str);
         }
     default:
         return std::nullopt;
     }
 }
 
+const char* Database::FormatAnyValue(const ScriptAnyValue& value)
+{
+    switch (value.type)
+    {
+    case ANY_TNUMBER: return std::to_string(value.number).c_str();
+    case ANY_TSTRING: return value.str;
+    case ANY_TBOOLEAN: return value.b ? "true" : "false";
+    case ANY_TTABLE: return "[Table]";
+    case ANY_TNIL: return "[Nil]";
+    case ANY_TFUNCTION: return "[Function]";
+    case ANY_TUSERDATA: return "[UserData]";
+    case ANY_TVECTOR: return "[Vector]";
+    case ANY_COUNT: return "[Count]";
+    case ANY_THANDLE: return "[Handle]";
+    case ANY_ANY: return "[Any]";
+    default: return "[Unknown]";
+    }
+}
+
 int Database::Dump(IFunctionHandler* pH)
 {
     std::lock_guard lock(m_mutex);

src/db/Database.h

@@ -59,6 +59,7 @@ class Database final : public CScriptableBase, public IGameFrameworkListener {
 
     static std::optional<ScriptAnyValue> ParseAnyValue(int type, const std::string& value);
     static std::optional<std::string> SerializeAnyValue(const ScriptAnyValue& any);
+    static const char* FormatAnyValue(const ScriptAnyValue& value);
     void ExecuteTransaction(const std::function<void(SQLite::Database&)>& task) const;
 
     std::unique_ptr<SQLite::Database> m_db;

src/kcd2db.cpp

@@ -8,6 +8,7 @@
 #define KCD2_ENV_IMPORT
 #include "db/Database.h"
 #include "kcd2/env.h"
+#include "kcd2/IGame.h"
 #include "log/log.h"
 #include "lua/db.h"
 
@@ -18,7 +19,7 @@ std::optional<uintptr_t> find_env_addr()
     // 持续尝试查找模块
     while (!LM_FindModule(CLIENT_DLL, &module))
     {
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     }
     // 通常会找到两个地址，不过两个地址其实通过RIP之后的偏移是一样的，都是指向 gEnv->pConsole 的 qword_1848A7C68
     const auto pattern = "48 8B 0D ?? ?? ?? ?? 48 8D 15 ?? ?? ?? ?? 45 33 C9 45 33 C0 4C 8B 11";
@@ -59,18 +60,22 @@ void start()
         LogDebug("Found environment address: 0x%llX", *env_addr);
 
         auto* env_ptr = reinterpret_cast<SSystemGlobalEnvironment*>(env_addr.value());
-        while (env_ptr->pGame == nullptr)
+        while (env_ptr->pGame == nullptr
+            || env_ptr->pGame->GetIGameFramework() == nullptr
+            || env_ptr->pScriptSystem == nullptr
+            || env_ptr->pConsole == nullptr)
         {
             Sleep(1000);
         }
         LogDebug("Game Started");
 
         gEnv = *env_ptr;
+
         const auto db = new Database(env_ptr);
+        LogInfo("Database initialized...%s", db->getName());
 
         env_ptr->pScriptSystem->ExecuteBuffer(db_lua, strlen(db_lua), "db.lua");
-
-        LogInfo("Database initialized...%s", db->getName());
+        LogInfo("DB lua API loaded");
     }
     else
     {