From b8ff90fe9e3c82dba4633543e4d2332c39360d68 Mon Sep 17 00:00:00 2001
From: yunyun <1159428885@qq.com>
Date: Tue, 2 Jun 2026 16:40:25 +0800
Subject: [PATCH] 1.4.3

---
 main.js              | 10 ++++-----
 package-lock.json    |  2 +-
 package.json         |  2 +-
 renderer/index.html  | 47 ++++++++++++++++++++++++++++---------------
 renderer/renderer.js | 48 +++++++++++++++++++++++++++++++++++++-------
 renderer/splash.html | 38 ++++++++++++++++++++++++-----------
 6 files changed, 105 insertions(+), 42 deletions(-)

diff --git a/main.js b/main.js
index de363ed..38d3133 100644
--- a/main.js
+++ b/main.js
@@ -65,7 +65,9 @@ const DEFAULT_SETTINGS = {
   },
   appearance: {
     theme: 'light',
-    scale: '110'
+    scale: '110',
+    playStartupAnimation: true,
+    skipSplash: false
   },
   download: {
     maxConcurrent: 64,
@@ -78,7 +80,6 @@ const DEFAULT_SETTINGS = {
     autoClearLogs: true,
     logRetentionValue: 7,
     logRetentionUnit: 'day',
-    playStartupAnimation: true,
     developerMode: false
   }
 };
@@ -403,8 +404,9 @@ app.whenReady().then(() => {
     return;
   }
 
-  // 提前初始化 BASE_DIR 以读取配置文件
+  // 提前初始化 BASE_DIR 和日志路径，确保所有 writeLog 都写入文件
   BASE_DIR = app.getPath('userData');
+  initPaths();
 
   // 检查是否启用防止多次启动
   let preventMultipleLaunch = true;
@@ -430,8 +432,6 @@ app.whenReady().then(() => {
     }
   }
 
-  initPaths();
-  
   cleanupExpiredLogs();
   
   try {
diff --git a/package-lock.json b/package-lock.json
index de9a382..e94b8a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "gpcl",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index c85fcbb..667d351 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gpcl",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "GoodPlanCraftLauncher",
   "main": "main.js",
   "scripts": {
diff --git a/renderer/index.html b/renderer/index.html
index e7d7b19..1b46ac1 100644
--- a/renderer/index.html
+++ b/renderer/index.html
@@ -1,4 +1,4 @@
-<!-- 
+<!-- 
   CaelLab BY-SA Code License 
   Copyright (c) 2026 Yunyun(云云) By 虚舟实验室(CaelLab) / CaelLabGameTS 
   
@@ -571,6 +571,36 @@
                       </div>
                     </div>
                   </div>
+
+                  <div class="setting-card">
+                    <div class="setting-row">
+                      <div class="setting-left">
+                        <div class="setting-label">播放启动动画</div>
+                        <div class="setting-desc">启动游戏时全屏播放 Minecraft 欢迎动画</div>
+                      </div>
+                      <div class="setting-control">
+                        <label class="switch">
+                          <input type="checkbox" id="play-startup-animation">
+                          <span class="slider"></span>
+                        </label>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="setting-card">
+                    <div class="setting-row">
+                      <div class="setting-left">
+                        <div class="setting-label">不渲染Splash</div>
+                        <div class="setting-desc">尝试在启动时不渲染Splash直接进入主界面，但可能延长白屏时间，同时对于预编译不友好</div>
+                      </div>
+                      <div class="setting-control">
+                        <label class="switch">
+                          <input type="checkbox" id="skip-splash">
+                          <span class="slider"></span>
+                        </label>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -667,21 +697,6 @@
                     </div>
                   </div>
 
-                  <div class="setting-card">
-                    <div class="setting-row">
-                      <div class="setting-left">
-                        <div class="setting-label">播放启动动画</div>
-                        <div class="setting-desc">启动游戏时全屏播放 Minecraft 欢迎动画</div>
-                      </div>
-                      <div class="setting-control">
-                        <label class="switch">
-                          <input type="checkbox" id="play-startup-animation">
-                          <span class="slider"></span>
-                        </label>
-                      </div>
-                    </div>
-                  </div>
-
                   <div class="setting-card">
                     <div class="setting-row">
                       <div class="setting-left">
diff --git a/renderer/renderer.js b/renderer/renderer.js
index a1dfbad..34770a2 100644
--- a/renderer/renderer.js
+++ b/renderer/renderer.js
@@ -866,7 +866,12 @@ async function reloadAllSettingsToUI() {
 
   const playStartupAnimationEl = document.getElementById('play-startup-animation');
   if (playStartupAnimationEl) {
-    playStartupAnimationEl.checked = settings.advanced?.playStartupAnimation === true;
+    playStartupAnimationEl.checked = settings.appearance?.playStartupAnimation === true;
+  }
+
+  const skipSplashEl = document.getElementById('skip-splash');
+  if (skipSplashEl) {
+    skipSplashEl.checked = settings.appearance?.skipSplash === true;
   }
 
   const developerModeEl = document.getElementById('developer-mode');
@@ -1723,12 +1728,12 @@ async function launchGame() {
     let windowMode = settings.game?.windowMode || 'windowed';
     let welcomeAnimPlaying = false;
     
-    if (settings.advanced?.playStartupAnimation && window.gpcl && window.gpcl.playStartupAnimation) {
+    if (settings.appearance?.playStartupAnimation && window.gpcl && window.gpcl.playStartupAnimation) {
       setStatus('[启动动画] 正在播放欢迎动画...');
       welcomeAnimPlaying = true;
       windowMode = 'fullscreen';
       
-      settings.advanced.playStartupAnimation = false;
+      settings.appearance.playStartupAnimation = false;
       await gpcl.saveSettings(settings);
       const playStartupEl = document.getElementById('play-startup-animation');
       if (playStartupEl) playStartupEl.checked = false;
@@ -2582,12 +2587,28 @@ launchBtn.addEventListener('click', launchGame);
   if (playStartupAnimation) {
     (async () => {
       const settings = await loadSettings();
-      playStartupAnimation.checked = settings.advanced?.playStartupAnimation === true;
+      playStartupAnimation.checked = settings.appearance?.playStartupAnimation === true;
     })();
 
     playStartupAnimation.addEventListener('change', async () => {
       const settings = await loadSettings();
-      settings.advanced.playStartupAnimation = playStartupAnimation.checked;
+      if (!settings.appearance) settings.appearance = {};
+      settings.appearance.playStartupAnimation = playStartupAnimation.checked;
+      await gpcl.saveSettings(settings);
+    });
+  }
+
+  const skipSplash = document.getElementById('skip-splash');
+  if (skipSplash) {
+    (async () => {
+      const settings = await loadSettings();
+      skipSplash.checked = settings.appearance?.skipSplash === true;
+    })();
+
+    skipSplash.addEventListener('change', async () => {
+      const settings = await loadSettings();
+      if (!settings.appearance) settings.appearance = {};
+      settings.appearance.skipSplash = skipSplash.checked;
       await gpcl.saveSettings(settings);
     });
   }
@@ -2708,6 +2729,18 @@ launchBtn.addEventListener('click', launchGame);
     setCustomSelectValue('settings-scale', scale);
     applyScale(scale);
     
+    // 播放启动动画
+    const playStartupAnimSync = document.getElementById('play-startup-animation');
+    if (playStartupAnimSync) {
+      playStartupAnimSync.checked = settings.appearance?.playStartupAnimation === true;
+    }
+    
+    // 不渲染Splash
+    const skipSplashSync = document.getElementById('skip-splash');
+    if (skipSplashSync) {
+      skipSplashSync.checked = settings.appearance?.skipSplash === true;
+    }
+    
     // Java镜像
     const javaMirror = settings.download?.javaMirror || 'tsinghua';
     setCustomSelectValue('java-mirror-select', javaMirror);
@@ -3172,7 +3205,9 @@ async function loadSettings() {
       },
       appearance: {
         theme: 'light',
-        scale: '100'
+        scale: '100',
+        playStartupAnimation: true,
+        skipSplash: false
       },
       download: {
         maxConcurrent: 64,
@@ -3185,7 +3220,6 @@ async function loadSettings() {
         autoClearLogs: true,
         logRetentionValue: 7,
         logRetentionUnit: 'day',
-        playStartupAnimation: true,
         developerMode: false
       }
     };
diff --git a/renderer/splash.html b/renderer/splash.html
index b9dd949..5e1d303 100644
--- a/renderer/splash.html
+++ b/renderer/splash.html
@@ -1,4 +1,4 @@
-<!-- 
+<!-- 
   CaelLab BY-SA Code License 
   Copyright (c) 2026 Yunyun(云云) By 虚舟实验室(CaelLab) / CaelLabGameTS 
   
@@ -168,19 +168,33 @@
     createParticles();
 
     window.addEventListener('DOMContentLoaded', () => {
-      if (window.gpcl && window.gpcl.getAppVersion) {
-        window.gpcl.getAppVersion().then(version => {
-          document.getElementById('version-info').textContent = 'v' + version;
-        });
-      }
+      const checkSkipSplash = async () => {
+        try {
+          if (window.gpcl && window.gpcl.getSettings) {
+            const settings = await window.gpcl.getSettings();
+            if (settings && settings.appearance && settings.appearance.skipSplash === true) {
+              window.location.href = 'index.html';
+              return;
+            }
+          }
+        } catch (e) {}
+
+        if (window.gpcl && window.gpcl.getAppVersion) {
+          window.gpcl.getAppVersion().then(version => {
+            document.getElementById('version-info').textContent = 'v' + version;
+          });
+        }
 
-      setTimeout(() => {
-        const splashContent = document.getElementById('splash-content');
-        splashContent.classList.add('fade-out');
         setTimeout(() => {
-          window.location.href = 'index.html';
-        }, 500);
-      }, 2000);
+          const splashContent = document.getElementById('splash-content');
+          splashContent.classList.add('fade-out');
+          setTimeout(() => {
+            window.location.href = 'index.html';
+          }, 500);
+        }, 2000);
+      };
+
+      checkSkipSplash();
     });
   </script>
 </body>