From 2cea368db6c8d75e5fe1bcd3d1e297a3bad2429f Mon Sep 17 00:00:00 2001
From: JOJO <1498581755@qq.com>
Date: Thu, 6 Aug 2026 10:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D'=E5=86=8D=E6=9D=A5=E4=B8=80?=
 =?UTF-8?q?=E5=B1=80'=E8=BF=9B=E9=94=99=E6=A8=A1=E5=BC=8F=EF=BC=9Ab-again/?=
 =?UTF-8?q?b-restart=E6=94=B9=E7=94=A8=E5=88=9A=E7=BB=93=E6=9D=9F=E5=B1=80?=
 =?UTF-8?q?=E8=87=AA=E8=BA=AB=E7=9A=84mode/ship/diff=E9=87=8D=E5=BC=80?=
 =?UTF-8?q?=EF=BC=88=E5=8E=9F=E8=AF=BBSETUP.mode=EF=BC=8C=E7=8E=A9?=
 =?UTF-8?q?=E8=BF=87=E6=97=A0=E5=B0=BD=E5=90=8ESETUP=E6=BC=82=E7=A7=BB?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=97=AF=E5=85=B3/rush=E6=AD=BB=E4=BA=86?=
 =?UTF-8?q?=E9=83=BD=E8=BF=9B=E6=97=A0=E5=B0=BD=EF=BC=89=EF=BC=9Brush?=
 =?UTF-8?q?=E5=B1=80=E9=87=8D=E5=BC=80=E5=9B=9E=E5=90=8C=E4=B8=80Boss?=
 =?UTF-8?q?=E3=80=82=E5=A4=A7=E5=8E=85=E5=B8=83=E5=B1=80=EF=BC=9A=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E4=B8=8A=E7=A7=BBflex:1=E6=92=91=E6=BB=A1?=
 =?UTF-8?q?=E3=80=81=E8=BF=9B=E5=85=A5=E5=9F=BA=E5=9C=B0/=E7=99=BB?=
 =?UTF-8?q?=E5=87=BA=E6=B2=89=E5=BA=95=E3=80=81=E9=9D=A2=E6=9D=BF=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=85=A8=E5=8D=8A=E9=80=8F=E6=98=8E=E9=9C=B2=E5=87=BA?=
 =?UTF-8?q?=E8=83=8C=E5=90=8E=E6=A8=A1=E6=8B=9F=E6=88=98=E3=80=82playwrigh?=
 =?UTF-8?q?t=E5=9B=9E=E5=BD=92=EF=BC=9Astage/endless/rush=E4=B8=89?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=86=8D=E6=9D=A5=E4=B8=80=E5=B1=80=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E6=AD=A3=E7=A1=AE=EF=BC=8C=E5=B8=83=E5=B1=80=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=8E=E5=8D=8A=E9=80=8F=E6=98=8E=E6=96=AD=E8=A8=80?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star-raid/css/style.css |  5 ++++-
 star-raid/index.html    |  8 ++++----
 star-raid/js/ui.js      | 11 +++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/star-raid/css/style.css b/star-raid/css/style.css
index 7b87768..339fca7 100644
--- a/star-raid/css/style.css
+++ b/star-raid/css/style.css
@@ -128,7 +128,10 @@ h1.logo{font-size:clamp(20px,5.4vw,44px);color:#fff;letter-spacing:4px;line-heig
 .auth-f .btn{width:100%;min-width:0;margin-top:2px}
 /* ---------- 飞行员大厅 ---------- */
 #o-home{background:rgba(4,7,16,.42);justify-content:flex-start;gap:8px;overflow-y:auto}
-#o-home .lb{width:min(94%,430px);flex:1;min-height:0;display:flex;flex-direction:column;background:var(--panel);border:3px solid var(--line);padding:10px 10px 8px;margin-bottom:2%}
+#o-home .lb{width:min(94%,430px);flex:1;min-height:0;display:flex;flex-direction:column;background:rgba(11,18,38,.55);border:3px solid var(--line);padding:10px 10px 8px}
+#o-home .btn{background:rgba(16,26,51,.55)}
+#o-home .btn.primary{background:rgba(65,230,255,.68)}
+#o-home .lb-tabs button{background:rgba(16,26,51,.5)}
 .lb-tabs{display:flex;gap:6px;justify-content:center;margin:6px 0 8px}
 .lb-tabs button{font:inherit;font-size:clamp(7px,1.3vw,9px);background:var(--panel2);color:var(--dim);
   border:2px solid var(--line);padding:6px 10px;cursor:pointer;letter-spacing:1px}
diff --git a/star-raid/index.html b/star-raid/index.html
index 3ad634d..5113880 100644
--- a/star-raid/index.html
+++ b/star-raid/index.html
@@ -45,10 +45,6 @@
   <div class="ovl hide" id="o-home">
     <div class="h2" style="margin-top:2%">— 飞行员大厅 —</div>
     <div class="h3" id="home-stats">　</div>
-    <div class="row">
-      <button class="btn primary" id="b-base" style="min-width:min(56vw,200px)">▶ 进入基地</button>
-      <button class="btn" id="b-logout" style="min-width:0">登出</button>
-    </div>
     <div class="lb">
       <div class="h3" style="color:var(--cyan);letter-spacing:3px">— 全服排行榜 TOP 100 —</div>
       <div class="lb-tabs">
@@ -59,6 +55,10 @@
       <div class="lb-row lb-head"><span>#</span><span>飞行员</span><span>击坠</span><span>图鉴</span><span>无尽最高</span></div>
       <div class="lb-list" id="lb-list"></div>
     </div>
+    <div class="row" style="margin-bottom:2%">
+      <button class="btn primary" id="b-base" style="min-width:min(56vw,200px)">▶ 进入基地</button>
+      <button class="btn" id="b-logout" style="min-width:0">登出</button>
+    </div>
   </div>
 
   <!-- 标题 -->
diff --git a/star-raid/js/ui.js b/star-raid/js/ui.js
index bd58576..f5cec3e 100644
--- a/star-raid/js/ui.js
+++ b/star-raid/js/ui.js
@@ -19,9 +19,16 @@ $("b-back5").onclick=exitDemoSim;
 $("b-start").onclick=()=>startGame();
 if("ontouchstart" in window){const pb=$("tb-pause");pb.style.display="block";pb.onclick=()=>togglePause();}
 $("b-resume").onclick=()=>togglePause();
-$("b-restart").onclick=()=>{show("");if(G&&G.mode==="rush")startRush(G.rushIdx);else startGame();};   // Boss挑战重开仍在挑战模式
+$("b-restart").onclick=()=>{show("");restartSameRun();};
 $("b-quit").onclick=()=>{bank();G=null;MUS.stop();UI="title";bestLine();show("o-title");};
-$("b-again").onclick=()=>startGame();
+/* 再来一局：按刚结束那一局自己的 mode/ship/diff 重开（修复 SETUP 漂移导致进错模式，如 rush/闯关死后进了无尽） */
+function restartSameRun(){
+  if(!G){startGame();return;}
+  if(G.mode==="rush"){startRush(G.rushIdx);return;}
+  SETUP.mode=G.mode;SETUP.ship=G.ship;SETUP.diff=G.diff;
+  startGame();
+}
+$("b-again").onclick=()=>restartSameRun();
 $("b-home").onclick=()=>{G=null;UI="title";bestLine();show("o-title");};
 $("mode-pick").addEventListener("click",e=>{
   const c=e.target.closest(".pcard");if(!c)return;