diff --git a/.idea/misc.xml b/.idea/misc.xml index 3b0be22..6c5519f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/libs/firefly-go.aar b/app/libs/firefly-go.aar index 085c01c..782d7b5 100644 --- a/app/libs/firefly-go.aar +++ b/app/libs/firefly-go.aar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:304f5ee6d7c3601f230a1298bf9d08ec6b3876e4bc15fe526d00f25efb1dd719 -size 13915082 +oid sha256:f7358f4eef59b28b0d1e1af35d9028312b2a301217063256c184adfdd530dfba +size 13923389 diff --git a/app/src/main/assets/data-in-game.json b/app/src/main/assets/data-in-game.json index 470d158..598ad7b 100644 --- a/app/src/main/assets/data-in-game.json +++ b/app/src/main/assets/data-in-game.json @@ -1,10 +1,10 @@ { - "leader": 3, + "leader": 2, "lineups": { - "0": 1217, - "1": 1307, - "2": 1005, - "3": 1410 + "0": 1308, + "1": 1406, + "2": 1218, + "3": 1304 }, "position": { "x": -30, @@ -278,7 +278,7 @@ "is_hard_mode": false }, "knight_data": { - "current_challenge_id": 603, + "current_challenge_id": 602, "details_data": [ { "lineup": [ diff --git a/app/src/main/assets/freesr-data.json b/app/src/main/assets/freesr-data.json index 65e77af..57408a2 100644 --- a/app/src/main/assets/freesr-data.json +++ b/app/src/main/assets/freesr-data.json @@ -12457,24 +12457,24 @@ "data": { "rank": 0, "skills": { - "1217001": 6, - "1217002": 10, - "1217003": 10, - "1217004": 10, - "1217007": 1, - "1217101": 1, - "1217102": 1, - "1217103": 1, - "1217201": 1, - "1217202": 1, - "1217203": 1, - "1217204": 1, - "1217205": 1, - "1217206": 1, - "1217207": 1, - "1217208": 1, - "1217209": 1, - "1217210": 1 + "11217001": 6, + "11217002": 10, + "11217003": 10, + "11217004": 10, + "11217007": 1, + "11217101": 1, + "11217102": 1, + "11217103": 1, + "11217201": 1, + "11217202": 1, + "11217203": 1, + "11217204": 1, + "11217205": 1, + "11217206": 1, + "11217207": 1, + "11217208": 1, + "11217209": 1, + "11217210": 1 }, "skills_by_anchor_type": { "1": 6, @@ -14699,7 +14699,7 @@ "owner_uid": 0, "avatar_id": 1506, "data": { - "rank": 0, + "rank": 1, "skills": { "1506001": 6, "1506002": 10, @@ -15189,7 +15189,7 @@ "owner_uid": 0, "avatar_id": 8009, "data": { - "rank": 0, + "rank": 6, "skills": { "8009001": 6, "8009002": 10, @@ -15295,43 +15295,48 @@ } }, "battle_config": { - "battle_type": "CE", - "blessings": [], + "battle_type": "PEAK", + "blessings": [ + { + "level": 1, + "id": 3033025 + } + ], "custom_stats": [], - "cycle_count": 30, - "stage_id": 0, + "cycle_count": 6, + "stage_id": 30505013, "path_resonance_id": 0, "monsters": [ [ { - "monster_id": 101302009, + "monster_id": 4012010, "level": 95, "amount": 1 }, { - "monster_id": 101302009, + "monster_id": 4012030, "level": 95, "amount": 1 }, { - "monster_id": 101302009, + "monster_id": 4032030, + "level": 95, + "amount": 1 + }, + { + "monster_id": 4032030, + "level": 95, + "amount": 1 + }, + { + "monster_id": 4052020, "level": 95, "amount": 1 } ], [ { - "monster_id": 101302009, - "level": 95, - "amount": 1 - }, - { - "monster_id": 101302009, - "level": 95, - "amount": 1 - }, - { - "monster_id": 101302009, + "monster_id": 4044010, "level": 95, "amount": 1 } diff --git a/app/src/main/assets/version.json b/app/src/main/assets/version.json index b1c378b..0531236 100644 --- a/app/src/main/assets/version.json +++ b/app/src/main/assets/version.json @@ -6,6 +6,20 @@ "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14358961_e055a63b3c34_b199a0234548b5", "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14374543_04d971175704_ab00cb3f54bb00" }, + "CNBETAAndroid4.1.52": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14427120_6f7bdcd832cf_5c861411529529", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14426018_808f7828fdd4_646eb1de0d5580", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14460274_5ed5ff5977db_299d2e7b72efe8" + }, + "CNBETAAndroid4.1.53": { + "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_14536466_eef3376243be_0b6e5633eb67ac", + "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_14527836_2bed15e185c1_05d2c57e28ff4e", + "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4" + }, "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", @@ -13,6 +27,20 @@ "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.1.52": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14427120_6f7bdcd832cf_5c861411529529", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14426018_808f7828fdd4_646eb1de0d5580", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14460274_5ed5ff5977db_299d2e7b72efe8" + }, + "CNBETAWin4.1.53": { + "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_14536466_eef3376243be_0b6e5633eb67ac", + "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_14527836_2bed15e185c1_05d2c57e28ff4e", + "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4" + }, "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", @@ -20,6 +48,20 @@ "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.1.52": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14427120_6f7bdcd832cf_5c861411529529", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14426018_808f7828fdd4_646eb1de0d5580", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14460274_5ed5ff5977db_299d2e7b72efe8" + }, + "CNBETAiOS4.1.53": { + "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_14536466_eef3376243be_0b6e5633eb67ac", + "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_14527836_2bed15e185c1_05d2c57e28ff4e", + "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4" + }, "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", @@ -27,6 +69,20 @@ "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.1.52": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14427120_6f7bdcd832cf_5c861411529529", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14426018_808f7828fdd4_646eb1de0d5580", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14460274_5ed5ff5977db_299d2e7b72efe8" + }, + "OSBETAAndroid4.1.53": { + "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_14536466_eef3376243be_0b6e5633eb67ac", + "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_14527836_2bed15e185c1_05d2c57e28ff4e", + "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4" + }, "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", @@ -34,11 +90,39 @@ "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.1.52": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14427120_6f7bdcd832cf_5c861411529529", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14426018_808f7828fdd4_646eb1de0d5580", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14460274_5ed5ff5977db_299d2e7b72efe8" + }, + "OSBETAWin4.1.53": { + "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_14536466_eef3376243be_0b6e5633eb67ac", + "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_14527836_2bed15e185c1_05d2c57e28ff4e", + "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4" + }, "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" + }, + "OSBETAiOS4.1.52": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_14420305_7a74f0e95f84_edf69bcd963b3a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_14427120_6f7bdcd832cf_5c861411529529", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_14426018_808f7828fdd4_646eb1de0d5580", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_14460274_5ed5ff5977db_299d2e7b72efe8" + }, + "OSBETAiOS4.1.53": { + "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_14511152_92f232b7216a_602de31e31b1a4", + "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_14536466_eef3376243be_0b6e5633eb67ac", + "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_14527836_2bed15e185c1_05d2c57e28ff4e", + "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4" } } \ No newline at end of file diff --git a/app/src/main/java/com/example/firefly_go_android/FireflyModMenu.kt b/app/src/main/java/com/example/firefly_go_android/FireflyModMenu.kt index 366dc43..08db3be 100644 --- a/app/src/main/java/com/example/firefly_go_android/FireflyModMenu.kt +++ b/app/src/main/java/com/example/firefly_go_android/FireflyModMenu.kt @@ -2,6 +2,7 @@ package com.example.firefly_go_android import android.app.Activity import android.os.Environment +import android.util.Log import libandroid.Libandroid import java.io.File import java.io.FileOutputStream @@ -18,6 +19,7 @@ object FireflyModMenu { if (!dataDir.exists()) dataDir.mkdirs() if (!isServerStarted) { + Log.d("FireflyMod", "Start Server") isServerStarted = true Thread { try { diff --git a/script/release.json b/script/release.json index 6c9f094..8b5992c 100644 --- 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.3-01", + "title": "PreBuild Version 4.1.53 - 01" } \ No newline at end of file