UPDATE: 4.1.5X

2026-03-20 02:51:29 +07:00
12 changed files with 1945 additions and 963 deletions
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,6 @@
      <GradleProjectSettings>
        <option name="testRunner" value="CHOOSE_PER_TEST" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,6 +9,11 @@ kotlin {
    jvmToolchain(17)
 }

+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
 android {
    namespace = "com.example.firefly_go_android"
    compileSdk = 36
--- a/app/libs/firefly-go.aar
+++ b/app/libs/firefly-go.aar
--- a/app/src/main/res/raw/app_version_json.json
+++ b/app/src/main/res/raw/app_version_json.json
@@ -1,5 +1,5 @@
 {
-  "latest_version": "4.0.4-01",
-  "changelog": "UPDATE: 4.0.54",
-  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/4.0.4-01/firefly_go_android.apk"
+  "latest_version": "4.1.1-01",
+  "changelog": "UPDATE: 4.1.51",
+  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/4.1.1-01/firefly_go_android.apk"
 }
--- a/app/src/main/res/raw/data_in_game_json.json
+++ b/app/src/main/res/raw/data_in_game_json.json
@@ -1,5 +1,5 @@
 {
-  "leader": 2,
+  "leader": 3,
  "lineups": {
    "0": 1217,
    "1": 1307,
@@ -21,31 +21,35 @@
    1003
  ],
  "char_path": {
-    "main": 8008,
+    "main": 8010,
    "march_7": 1224
  },
  "char_enhanced": {
+    "1004": 1,
    "1005": 1,
    "1006": 1,
+    "1102": 1,
    "1205": 1,
    "1212": 1,
+    "1217": 1,
    "1306": 1,
-    "1307": 1
+    "1307": 1,
+    "1310": 1
  },
  "challenge": {
    "challenge_id": 0,
    "skip_half": 0,
    "blessings": [],
    "is_in_challenge": false,
-    "current_stage_id": 30121122,
+    "current_stage_id": 30122121,
    "path_resonance_id": 0,
    "maze_buff": 0,
    "first_lineup": [],
    "second_lineup": []
  },
  "challenge_peak": {
-    "current_mode": "Boss",
-    "group_id": 5,
+    "current_mode": "Knight",
+    "group_id": 6,
    "is_in_challenge_peak": false,
    "challenge_peak_data": {
      "1": {
@@ -259,6 +263,52 @@
            }
          ]
        }
+      },
+      "6": {
+        "checkmate_data": {
+          "challenge_id": 604,
+          "blessing": 3033053,
+          "lineup": [
+            1501,
+            1506,
+            1502,
+            1217
+          ],
+          "stage_id": 30506021,
+          "is_hard_mode": false
+        },
+        "knight_data": {
+          "current_challenge_id": 603,
+          "details_data": [
+            {
+              "lineup": [
+                1309
+              ],
+              "stage_id": 30506011,
+              "challenge_id": 601
+            },
+            {
+              "lineup": [
+                1321,
+                1310,
+                1225,
+                1303
+              ],
+              "stage_id": 30506012,
+              "challenge_id": 602
+            },
+            {
+              "lineup": [
+                1415,
+                1413,
+                1409,
+                1407
+              ],
+              "stage_id": 30506013,
+              "challenge_id": 603
+            }
+          ]
+        }
      }
    }
  },
@@ -273,7 +323,8 @@
        2000000000,
        2000000000,
        2000000000
-      ]
+      ],
+      "3": []
    },
    "cycle_count": 1,
    "stage_id": 30118121,
--- a/app/src/main/res/raw/freesr_data_json.json
+++ b/app/src/main/res/raw/freesr_data_json.json
--- a/app/src/main/res/raw/version_json.json
+++ b/app/src/main/res/raw/version_json.json
@@ -1,44 +1,44 @@
 {
-  "CNBETAAndroid4.0.54": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14270934_c5df39ade3cd_9db4958f23406e",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14239726_aa2162bcb19e_b24f07d946065b",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAAndroid4.1.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14372365_fa78e03ad599_36972b4e3bb553",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14352532_e3dee8767e70_9fd758f12171f5",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14394020_12e3f0c6a002_07566508dd1394",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14358961_e055a63b3c34_b199a0234548b5",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14374543_04d971175704_ab00cb3f54bb00"
  },
-  "CNBETAWin4.0.54": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14270934_c5df39ade3cd_9db4958f23406e",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14239726_aa2162bcb19e_b24f07d946065b",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAWin4.1.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14372365_fa78e03ad599_36972b4e3bb553",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14352532_e3dee8767e70_9fd758f12171f5",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14394020_12e3f0c6a002_07566508dd1394",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14358961_e055a63b3c34_b199a0234548b5",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14374543_04d971175704_ab00cb3f54bb00"
  },
-  "CNBETAiOS4.0.54": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14270934_c5df39ade3cd_9db4958f23406e",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14239726_aa2162bcb19e_b24f07d946065b",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAiOS4.1.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14372365_fa78e03ad599_36972b4e3bb553",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14352532_e3dee8767e70_9fd758f12171f5",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14394020_12e3f0c6a002_07566508dd1394",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14358961_e055a63b3c34_b199a0234548b5",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14374543_04d971175704_ab00cb3f54bb00"
  },
-  "OSBETAAndroid4.0.54": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14270934_c5df39ade3cd_9db4958f23406e",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14239726_aa2162bcb19e_b24f07d946065b",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "OSBETAAndroid4.1.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14372365_fa78e03ad599_36972b4e3bb553",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14352532_e3dee8767e70_9fd758f12171f5",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14394020_12e3f0c6a002_07566508dd1394",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14358961_e055a63b3c34_b199a0234548b5",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14374543_04d971175704_ab00cb3f54bb00"
  },
-  "OSBETAWin4.0.54": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14270934_c5df39ade3cd_9db4958f23406e",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14239726_aa2162bcb19e_b24f07d946065b",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "OSBETAWin4.1.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14372365_fa78e03ad599_36972b4e3bb553",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14352532_e3dee8767e70_9fd758f12171f5",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14394020_12e3f0c6a002_07566508dd1394",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14358961_e055a63b3c34_b199a0234548b5",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14374543_04d971175704_ab00cb3f54bb00"
  },
-  "OSBETAiOS4.0.54": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14239544_f4c7e35c12ab_be7a50ff5d1728",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14270934_c5df39ade3cd_9db4958f23406e",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14239726_aa2162bcb19e_b24f07d946065b",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "OSBETAiOS4.1.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14372365_fa78e03ad599_36972b4e3bb553",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14352532_e3dee8767e70_9fd758f12171f5",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14394020_12e3f0c6a002_07566508dd1394",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14358961_e055a63b3c34_b199a0234548b5",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14374543_04d971175704_ab00cb3f54bb00"
  }
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,3 +24,4 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 #org.gradle.configuration-cache=false
 android.r8.optimizedResourceShrinking=true
+org.gradle.java.installations.auto-download=true
--- a/gradle/gradle-daemon-jvm.properties
+++ b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/658299a896470fbb3103ba3a430ee227/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/248ffb1098f61659502d0c09aa348294/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/932015f6361ccaead0c6d9b8717ed96e/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=21
--- a/script/README_Note.md
+++ b/script/README_Note.md
@@ -1,3 +1,3 @@
 # Changelog

-## - UPDATE: Support 4.0.5X
+## - UPDATE: Support 4.1.5X
--- a/script/release.json
+++ b/script/release.json
@@ -1,4 +1,4 @@
 {
-    "tag": "4.0.4-01",
-    "title": "PreBuild Version 4.0.54 - 01"
+    "tag": "4.1.1-01",
+    "title": "PreBuild Version 4.1.51 - 01"
 }
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,6 +15,9 @@ pluginManagement {

    }
 }
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+}
 dependencyResolutionManagement {
    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
    repositories {