修复一些小问题

MisaLiu · Nov 19, 2022 · b70b96d · b70b96d
1 parent 7f8387d
commit b70b96d
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 17 deletions.
diff --git a/public/style.css b/public/style.css
@@ -114,6 +114,7 @@ div.error-window pre * {
     width: 100%;
     height: 100%;
     color: #FFF;
+    overflow: hidden;
     z-index: 10;
     pointer-events: none;
     touch-action: none;

diff --git a/src/chart/index.js b/src/chart/index.js
@@ -188,7 +188,7 @@ export default class Chart
         stage.addChild(this.sprites.info.songDiff);
     }
 
-    resizeSprites(size)
+    resizeSprites(size, isEnded)
     {
         this.renderSize = size;
 
@@ -232,6 +232,7 @@ export default class Chart
                 judgeline.sprite.position.x = judgeline.x * this.renderSize.width;
                 judgeline.sprite.position.y = judgeline.y * this.renderSize.height;
 
+                if (isEnded) judgeline.sprite.alpha = 0;
                 if (judgeline.debugSprite) judgeline.debugSprite.scale.set(this.renderSize.heightPercent);
             });
         }
@@ -249,6 +250,7 @@ export default class Chart
 
                 note.sprite.baseScale = this.renderSize.noteScale;
                 note.sprite.scale.set(this.renderSize.noteScale * note.xScale, this.renderSize.noteScale);
+                if (isEnded) note.sprite.alpha = 0;
                 if (note.debugSprite) note.debugSprite.scale.set(this.renderSize.heightPercent);
             });
         }

diff --git a/src/game.js b/src/game.js
@@ -126,6 +126,7 @@ export default class Game
         this._gameStartTime = NaN;
         this._gameEndTime   = NaN;
         this._isPaused = false;
+        this._isEnded = false;
 
         this.resize = this.resize.bind(this);
         this._pauseBtnClickCallback = this._pauseBtnClickCallback.bind(this);
@@ -349,6 +350,7 @@ export default class Game
         this.chart.calcTime(0);
 
         this._isPaused = false;
+        this._isEnded = false;
 
         this._animateStatus = 0;
         this._gameStartTime = Date.now();
@@ -531,6 +533,7 @@ export default class Game
                     });
 
                     this._isPaused = false;
+                    this._isEnded = false;
                     this.sprites.fakeJudgeline.visible = false;
 
                     this._runCallback('start');
@@ -540,6 +543,7 @@ export default class Game
             {
                 this._animateStatus = 3;
                 this._isPaused = true;
+                this._isEnded = true;
                 this._runCallback('end');
             }
         }
@@ -631,7 +635,7 @@ export default class Game
             this.render.mainContainerCover.visible = false;
         }
 
-        if (this.sprites)
+        if (!this._isEnded && this.sprites)
         {
             if (this.sprites.progressBar)
             {
@@ -653,7 +657,7 @@ export default class Game
                 this.sprites.fakeJudgeline.position.y = this.render.sizer.height / 2;
 
                 this.sprites.fakeJudgeline.height = this.render.sizer.lineScale * 18.75 * 0.008;
-                if (shouldResetFakeJudgeLine)
+                if (shouldResetFakeJudgeLine || this._isEnded)
                 {
                     this.sprites.fakeJudgeline.width = 0;
                 }
@@ -678,8 +682,8 @@ export default class Game
 
         if (withChartSprites)
         {
-            this.judgement.resizeSprites(this.render.sizer);
-            this.chart.resizeSprites(this.render.sizer);
+            this.judgement.resizeSprites(this.render.sizer, this._isEnded);
+            this.chart.resizeSprites(this.render.sizer, this._isEnded);
         }
     }
 }

diff --git a/src/judgement/index.js b/src/judgement/index.js
@@ -78,11 +78,11 @@ export default class Judgement
         // this.stage.addChild(this.input.sprite);
     }
 
-    resizeSprites(size)
+    resizeSprites(size, isEnded)
     {
         this.renderSize = size;
-        this.score.resizeSprites(size);
-        this.input.resizeSprites(size);
+        this.score.resizeSprites(size, isEnded);
+        this.input.resizeSprites(size, isEnded);
     }
 
     calcTick()

diff --git a/src/judgement/score.js b/src/judgement/score.js
@@ -146,7 +146,7 @@ export default class Score
         }
     }
 
-    resizeSprites(size)
+    resizeSprites(size, isEnded)
     {
         this.renderSize = size;
 
@@ -159,16 +159,26 @@ export default class Score
 
         this.sprites.score.style.fontSize = size.heightPercent * 50;
 
-        this.sprites.combo.container.position.x = size.heightPercent * 72;
-        this.sprites.combo.container.position.y = size.heightPercent * 41;
-        this.sprites.combo.text.position.x = this.sprites.combo.number.width + size.heightPercent * 6;
-        this.sprites.combo.text.position.y = size.heightPercent * 30;
+        if (!isEnded)
+        {
+            this.sprites.combo.container.position.x = size.heightPercent * 72;
+            this.sprites.combo.container.position.y = size.heightPercent * 41;
+            this.sprites.combo.text.position.x = this.sprites.combo.number.width + size.heightPercent * 6;
+            this.sprites.combo.text.position.y = size.heightPercent * 30;
 
-        this.sprites.acc.position.x = size.heightPercent * 72;
-        this.sprites.acc.position.y = size.heightPercent * 113;
+            this.sprites.acc.position.x = size.heightPercent * 72;
+            this.sprites.acc.position.y = size.heightPercent * 113;
 
-        this.sprites.score.position.x = size.width - size.heightPercent * 139;
-        this.sprites.score.position.y = size.heightPercent * 61;
+            this.sprites.score.position.x = size.width - size.heightPercent * 139;
+            this.sprites.score.position.y = size.heightPercent * 61;
+        }
+        else
+        {
+            this.sprites.combo.container.position.y = size.height;
+            this.sprites.combo.text.position.y = size.height;
+            this.sprites.acc.position.y = size.height;
+            this.sprites.score.position.y = size.height;
+        }
     }
 
     pushJudge(type = 0, judgelines = [])