大获成功

Author: StArraySharp

Android/library/src/main/cpp/CMakeLists.txt

@@ -55,11 +55,17 @@ set_target_properties(clrjit PROPERTIES
     IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/libs/coreclr/libclrjit.so
 )
 
+# ---- cimgui: build from source as shared library ----
+set(IMGUI_STATIC OFF CACHE BOOL "" FORCE)
+set(IMGUI_FREETYPE OFF CACHE BOOL "" FORCE)
+add_subdirectory(libs/cimgui ${CMAKE_CURRENT_BINARY_DIR}/cimgui)
+
 # ---- Include directories (modloader) ----
 target_include_directories(modloader
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/core
+        ${CMAKE_CURRENT_SOURCE_DIR}/libs/cimgui
         ${CMAKE_CURRENT_SOURCE_DIR}/libs/dobby/include
         ${CMAKE_CURRENT_SOURCE_DIR}/libs/unityresolve
 )
@@ -78,6 +84,15 @@ find_library(log-lib log)
 target_link_libraries(modloader
     ${log-lib}
     dobby
+    cimgui
+)
+
+# ---- Post-build: copy libcimgui.so alongside libmodloader.so ----
+add_custom_command(TARGET modloader POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        "$<TARGET_FILE:cimgui>"
+        "$<TARGET_FILE_DIR:modloader>/libcimgui.so"
+    COMMENT "Copying libcimgui.so to modloader output"
 )
 
 # ---- Link libraries (monodroid) ----

Android/library/src/main/cpp/core/monodroid-coreclr.c

@@ -99,50 +99,65 @@ bundle_executable_path (const char* executable, const char* bundle_path, const c
 }
 
 static bool
-external_assembly_probe(const char* relative_assembly_path, void** data, int64_t* size)
+try_map_assembly(const char* dir, const char* name, void** data, int64_t* size)
 {
-    if (g_mapped_files_count >= MAX_MAPPED_COUNT)
-    {
-        LOG_ERROR("Too many mapped files, cannot map %s", relative_assembly_path);
-        return false;
-    }
-
-    // Look in the bundle path where the files were extracted
     char full_path[1024];
-    size_t path_len = strlen(g_bundle_path) + strlen(relative_assembly_path) + 1; // +1 for '/'
-    size_t res = snprintf(full_path, path_len + 1, "%s/%s", g_bundle_path, relative_assembly_path);
-    if (res < 0 || res != path_len)
-        return false;
+    size_t path_len = strlen(dir) + strlen(name) + 1;
+    size_t res = snprintf(full_path, path_len + 1, "%s/%s", dir, name);
+    if (res < 0 || res != path_len) return false;
 
     int fd = open(full_path, O_RDONLY);
-    if (fd == -1)
-        return false;
+    if (fd == -1) return false;
 
     struct stat buf;
-    if (fstat(fd, &buf) == -1)
-    {
-        close(fd);
-        return false;
-    }
+    if (fstat(fd, &buf) == -1) { close(fd); return false; }
 
     int64_t size_local = buf.st_size;
     void* mapped = mmap(NULL, size_local, PROT_READ, MAP_PRIVATE, fd, 0);
-    if (mapped == MAP_FAILED)
-    {
-        close(fd);
-        return false;
-    }
+    if (mapped == MAP_FAILED) { close(fd); return false; }
 
-    LOG_INFO("Mapped %s -> %s", relative_assembly_path, full_path);
     g_mapped_files[g_mapped_files_count] = mapped;
     g_mapped_file_sizes[g_mapped_files_count] = size_local;
     g_mapped_files_count++;
     close(fd);
     *data = mapped;
     *size = size_local;
+    LOG_INFO("Mapped %s -> %s", name, full_path);
     return true;
 }
 
+static bool
+external_assembly_probe(const char* relative_assembly_path, void** data, int64_t* size)
+{
+    if (g_mapped_files_count >= MAX_MAPPED_COUNT)
+    {
+        LOG_ERROR("Too many mapped files, cannot map %s", relative_assembly_path);
+        return false;
+    }
+
+    // 1) Try g_bundle_path (dotnet root)
+    if (try_map_assembly(g_bundle_path, relative_assembly_path, data, size))
+        return true;
+
+    // 2) Try each APP_PATHS directory
+    const char* app_paths = getenv("APP_PATHS");
+    if (app_paths) {
+        char* paths = strdup(app_paths);
+        char* tok = strtok(paths, ":");
+        while (tok) {
+            if (strcmp(tok, g_bundle_path) != 0 && // skip g_bundle_path (already tried)
+                try_map_assembly(tok, relative_assembly_path, data, size)) {
+                free(paths);
+                return true;
+            }
+            tok = strtok(NULL, ":");
+        }
+        free(paths);
+    }
+
+    return false;
+}
+
 static void
 free_resources ()
 {

Android/library/src/main/cpp/core/unity_resolve.cpp

@@ -18,6 +18,10 @@ extern "C" {
 
 // ---- Init / Lifecycle ----
 
+void GetAssemblyCount(){
+    UnityResolve::Init(dlopen("libil2cpp.so",1),UnityResolve::Mode::Il2Cpp);
+    LOGE("assembly count:%zu",UnityResolve::assembly.size());
+}
 /**
  * 初始化 UnityResolve 并遍历所有程序集。
  * @param hmodule  Mono 模块句柄 (通常为 dlopen("libmonosgen-2.0.so") 的返回值)
@@ -31,6 +35,26 @@ int modloader_resolve_init(void *hmodule, int mode) {
     return 0;
 }
 
+/**
+ * 初始化 UnityResolve（Il2Cpp 模式，自动获取句柄）。
+ * 内部使用 dlopen+RTLD_NOLOAD 获取已加载的 libil2cpp.so 句柄，
+ * 避免 C# 侧传递的句柄导致新加载副本。
+ * @return 0 成功
+ */
+int modloader_resolve_init_il2cpp(void) {
+    void *hmodule = dlopen("libil2cpp.so", RTLD_LAZY | RTLD_NOLOAD);
+    LOGE("modloader_resolve_init_il2cpp: dlopen handle=%p", hmodule);
+    if (!hmodule) {
+        // 回退：RTLD_NOLOAD 可能在一些旧版 Android 上不支持
+        hmodule = dlopen("libil2cpp.so", RTLD_LAZY);
+        LOGE("modloader_resolve_init_il2cpp: fallback handle=%p", hmodule);
+    }
+    if (!hmodule) return -1;
+    g_resolve_is_il2cpp = true;
+    UnityResolve::Init(hmodule, UnityResolve::Mode::Il2Cpp);
+    return 0;
+}
+
 /**
  * 将当前线程附加到 Mono/Il2Cpp 域。
  */