Merge pull request #95 from vs26625/main

Finish Line Bug fixes-Animations Team
nighthawkcoders · May 24, 2024 · 7b5d526 · 7b5d526
2 parents 3cb1a45 + 54cba62
commit 7b5d526
Show file tree

Hide file tree

Showing 45 changed files with 188 additions and 1,427 deletions.
diff --git a/assets/js/platformer3x/BossItem.js b/assets/js/platformer3x/BossItem.js
@@ -44,4 +44,4 @@ export class BossItem extends JumpPlatform {
     }
 }
 
-export default BossItem;
+export default BossItem;
diff --git a/assets/js/platformer3x/Coin.js b/assets/js/platformer3x/Coin.js
@@ -85,4 +85,4 @@ export class Coin extends GameObject {
     }
 }
 
-export default Coin;
+export default Coin;
diff --git a/assets/js/platformer3x/Cutstory.js b/assets/js/platformer3x/Cutstory.js
@@ -45,4 +45,4 @@ function startCutstory() {
         }, 3000);
     });
 }
-export default startCutstory;
+export default startCutstory;
diff --git a/assets/js/platformer3x/FinishLine.js b/assets/js/platformer3x/FinishLine.js
@@ -6,7 +6,7 @@ export class FinishLine extends GameObject {
         super(canvas, image, data);
         this.aspect_ratio = image.width / image.height;
         this.x = xPercentage * GameEnv.innerWidth;
-        this.y = yPercentage * GameEnv.innerHeight;
+        this.y = yPercentage * GameEnv.bottom;
         this.scaleSize = data?.scaleSize || 80;
     }
 

diff --git a/assets/js/platformer3x/Flag.js b/assets/js/platformer3x/Flag.js
diff --git a/assets/js/platformer3x/GameControl.js b/assets/js/platformer3x/GameControl.js
@@ -269,4 +269,4 @@ const GameControl = {
     },
 };
 
-export default GameControl;
+export default GameControl;
diff --git a/assets/js/platformer3x/GameObject.js b/assets/js/platformer3x/GameObject.js
@@ -221,4 +221,4 @@ class GameObject {
 
 }
 
-export default GameObject;
+export default GameObject;
diff --git a/assets/js/platformer3x/GameSet.js b/assets/js/platformer3x/GameSet.js
@@ -25,4 +25,4 @@ class GameSet {
 
   }
 
-  export default GameSet;
+  export default GameSet;
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,4 +44,4 @@ export class BossItem extends JumpPlatform { @@
         }
     }
-    export default BossItem;
+    export default BossItem;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -221,4 +221,4 @@ class GameObject {

		}

		export default GameObject;
		export default GameObject;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,4 @@ class GameSet {

		}

		export default GameSet;
		export default GameSet;