bump version to `3.1.0`

app/build.gradle

@@ -16,7 +16,7 @@ android {
         minSdk 29
         targetSdk 34
         versionCode 12
-        versionName "v3.0.4"
+        versionName "v3.1.0"
         buildConfigField "String", "VERSION_NAME", "\"${versionName}\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/cpp/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,
+    DEFINE_HOOK(void*, Produce_ViewPictureBookLiveAsync, (void* retstr, void* musicId, void* characterId,
-        void* ct, void* callOption, void* errorHandlerIl, Il2cppString* requestIdForResponseCache, void* mtd)) {
+        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"));

app/src/main/res/values/strings.xml

@@ -48,7 +48,7 @@
     <string name="axisx_y">axisX.y</string>
     <string name="axisy_y">axisY.y</string>
     <string name="axisz_y">axisZ.y</string>
-    <string name="basic_settings">Basic Ssettings</string>
+    <string name="basic_settings">Basic Settings</string>
     <string name="graphic_settings">Graphic Settings</string>
     <string name="camera_settings">Camera Settings</string>
     <string name="test_mode_live">Test Mode - LIVE</string>