From c4b13a1392f032c8dc75c1e143a7a99a5d8b5bd7 Mon Sep 17 00:00:00 2001 From: chinosk <2248589280@qq.com> Date: Fri, 6 Jun 2025 03:10:57 +0100 Subject: [PATCH] bump version to `3.1.0` --- src/GakumasLocalify/Hook.cpp | 11 +++++++---- src/platformDefine.hpp | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/GakumasLocalify/Hook.cpp b/src/GakumasLocalify/Hook.cpp index f66f5b3..78697b2 100644 --- a/src/GakumasLocalify/Hook.cpp +++ b/src/GakumasLocalify/Hook.cpp @@ -895,12 +895,12 @@ namespace GakumasLocal::HookMain { return Produce_ViewPictureBookLiveAsync_Orig(retstr, musicId, characterId, ct, callOption, errorHandlerIl, requestIdForResponseCache, mtd); } #else - DEFINE_HOOK(void*, Produce_ViewPictureBookLiveAsync, (Il2cppString* musicId, Il2cppString* characterId, - void* ct, void* callOption, void* errorHandlerIl, Il2cppString* requestIdForResponseCache, void* mtd)) { + DEFINE_HOOK(void*, Produce_ViewPictureBookLiveAsync, (void* retstr, void* musicId, void* characterId, + void* ct, void* callOption, void* errorHandlerIl, void* requestIdForResponseCache, void* mtd, void* wenhao)) { // Log::DebugFmt("Produce_ViewPictureBookLiveAsync: %s - %s", musicId->ToString().c_str(), characterId->ToString().c_str()); if (Config::unlockAllLive) return getCompletedUniTask(); - return Produce_ViewPictureBookLiveAsync_Orig(musicId, characterId, ct, callOption, errorHandlerIl, requestIdForResponseCache, mtd); + return Produce_ViewPictureBookLiveAsync_Orig(retstr, musicId, characterId, ct, callOption, errorHandlerIl, requestIdForResponseCache, mtd, wenhao); } #endif // GKMS_WINDOWS @@ -1696,10 +1696,13 @@ namespace GakumasLocal::HookMain { ADD_HOOK(PictureBookWindowPresenter_GetLiveMusics, Il2cppUtils::GetMethodPointer("Assembly-CSharp.dll", "Campus.OutGame", "PictureBookWindowPresenter", "GetLiveMusics")); - + +#ifdef GKMS_WINDOWS + // 跳过切歌Loading,安卓端会崩溃 ADD_HOOK(Produce_ViewPictureBookLiveAsync, Il2cppUtils::GetMethodPointer("Assembly-CSharp.dll", "", "Produce", "ViewPictureBookLiveAsync")); +#endif ADD_HOOK(PictureBookLiveSelectScreenModel_ctor, Il2cppUtils::GetMethodPointer("Assembly-CSharp.dll", "Campus.OutGame", "PictureBookLiveSelectScreenModel", ".ctor")); diff --git a/src/platformDefine.hpp b/src/platformDefine.hpp index 732ff86..7f70bb5 100644 --- a/src/platformDefine.hpp +++ b/src/platformDefine.hpp @@ -11,7 +11,7 @@ #define LogMinVersion ANDROID_LOG_DEBUG -#define PLUGIN_VERSION "3.0.4" +#define PLUGIN_VERSION "3.1.0" #define ADD_HOOK(name, addr) \ name##_Addr = reinterpret_cast(addr); \