Skip to content

Commit b86ad45

Browse files
committed
fix: 修复1.5.2以及之前的版本可能由于options.txt错误导致无法启动的问题
1 parent 239b555 commit b86ad45

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

FCL/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ android {
2121
val pwd = System.getenv("FCL_KEYSTORE_PASSWORD") ?: localProperty?.getProperty("pwd")
2222
val curseApiKey = System.getenv("CURSE_API_KEY") ?: localProperty?.getProperty("curse.api.key")
2323
val oauthApiKey = System.getenv("OAUTH_API_KEY") ?: localProperty?.getProperty("oauth.api.key")
24+
if (localProperty != null && localProperty.getProperty("arch", "all") == "arm64")
25+
System.setProperty("arch", "arm64")
2426

2527
signingConfigs {
2628
create("FCLKey") {

FCL/src/main/java/com/tungsten/fcl/game/FCLGameLauncher.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
import com.mio.manager.RendererManager;
2424
import com.tungsten.fcl.R;
2525
import com.tungsten.fcl.util.RuntimeUtils;
26-
import com.tungsten.fclauncher.FCLConfig;
27-
import com.tungsten.fclauncher.utils.FCLPath;
2826
import com.tungsten.fclauncher.bridge.FCLBridge;
27+
import com.tungsten.fclauncher.utils.FCLPath;
2928
import com.tungsten.fclcore.auth.AuthInfo;
3029
import com.tungsten.fclcore.game.GameRepository;
3130
import com.tungsten.fclcore.game.LaunchOptions;
3231
import com.tungsten.fclcore.game.Version;
3332
import com.tungsten.fclcore.launch.DefaultLauncher;
3433
import com.tungsten.fclcore.util.Logging;
3534
import com.tungsten.fclcore.util.io.FileUtils;
35+
import com.tungsten.fclcore.util.versioning.GameVersionNumber;
3636
import com.tungsten.fclcore.util.versioning.VersionNumber;
3737
import com.tungsten.fcllibrary.util.LocaleUtils;
3838

@@ -76,6 +76,10 @@ private void generateOptionsTxt() {
7676
modifyOptions(optionsFile, false);
7777
return;
7878
}
79+
String v = repository.getGameVersion(version).orElse("");
80+
if (v.startsWith("2.0")) v = "1.5.1";
81+
if (GameVersionNumber.compare(v, "1.5.2") <= 0)
82+
return;
7983
try {
8084
RuntimeUtils.copyAssets(context, "options.txt", optionsFile.getAbsolutePath());
8185
} catch (IOException e) {

0 commit comments

Comments
 (0)