Merge pull request #77 from NarraLeaf/dev_nomen

narraleaf-react-0.4.4

Author: helloyork

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## [0.4.3]
+## [0.4.4] - 2025/5/9
+
+### Fixed
+
+- Unhandled side effects causing performance issues
+- False positive of dead cycle
+
+## [0.4.3] - 2025/5/8
 
 ### Fixed
 
@@ -9,7 +16,7 @@
 - The behavior of `cps` is incorrect
 - The page exit animation is not working
 
-## [0.4.2] - 2025/5/8
+## [0.4.2] - 2025/5/7
 
 ### Fixed
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "narraleaf-react",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "A React visual novel player framework",
   "main": "./dist/main.js",
   "types": "./dist/index.d.ts",

src/game/nlcore/game/liveGame.ts

@@ -498,7 +498,7 @@ export class LiveGame {
         }
 
         if (this.lockedAwaiting) {
-            if (!this.lockedAwaiting.solved) {
+            if (!this.lockedAwaiting.isSettled()) {
                 this._lockedCount++;
 
                 if (this._lockedCount > 1000) {
@@ -515,6 +515,7 @@ export class LiveGame {
             if (!this.currentAction) {
                 state.events.emit(GameState.EventTypes["event:state.end"]);
             }
+            this._lockedCount = 0;
 
             state.logger.debug("next action (lockedAwaiting)", next);
 
@@ -530,6 +531,7 @@ export class LiveGame {
         const nextAction = this.currentAction.executeAction(state);
         if (Awaitable.isAwaitable<CalledActionResult, CalledActionResult>(nextAction)) {
             this.lockedAwaiting = nextAction;
+            this._lockedCount = 0;
 
             return nextAction;
         }

src/game/player/elements/image/AspectScaleImage.tsx

@@ -91,7 +91,7 @@ export default function AspectScaleImage(
             onLoad={handleOnLoad}
             width={width}
             height={height}
-            alt={"image"}
+            alt={""}
         />
     );
 }

src/game/player/elements/preload/Preload.tsx

@@ -5,6 +5,7 @@ import {usePreloaded} from "@player/provider/preloaded";
 import {Preloaded} from "@player/lib/Preloaded";
 import {TaskPool} from "@lib/util/data";
 import {useGame} from "@player/provider/game-state";
+import { Scene } from "@lib/game/nlcore/elements/scene";
 
 /**@internal */
 export function Preload(
@@ -18,7 +19,7 @@ export function Preload(
     const cachedSrc = useRef<Set<ActiveSrc>>(new Set());
 
     const LogTag = "Preload";
-    const lastScene = state.getLastScene();
+    const lastScene: Scene | null = state.getLastScene() || state.getPreloadingScene();
     const currentAction = game.getLiveGame().getCurrentAction();
     const story = game.getLiveGame().story;
 

src/game/player/elements/say/Sentence.tsx

@@ -123,11 +123,9 @@ function BaseText(
     useEffect(() => {
         return dialog.events.depends([
             dialog.events.on(DialogState.Events.requestComplete, () => {
-                gameState.logger.debug("Sentence.tsx", "requestComplete");
                 taskRef.current?.interact();
             }),
             dialog.events.on(DialogState.Events.forceSkip, () => {
-                gameState.logger.debug("Sentence.tsx", "forceSkip");
                 if (!dialog.isEnded()) {
                     taskRef.current?.forceSkip();
                 }
@@ -140,12 +138,14 @@ function BaseText(
      * - autoForward, gameSpeed changes
      */
     useEffect(() => {
-        game.preference.onPreferenceChange(Game.Preferences.gameSpeed, () => {
-            taskRef.current?.update();
-        });
-        game.preference.onPreferenceChange(Game.Preferences.autoForward, () => {
-            taskRef.current?.update();
-        });
+        return game.preference.events.depends([
+            game.preference.onPreferenceChange(Game.Preferences.gameSpeed, () => {
+                taskRef.current?.update();
+            }),
+            game.preference.onPreferenceChange(Game.Preferences.autoForward, () => {
+                taskRef.current?.update();
+            })
+        ]).cancel;
     }, []);
 
     function roll(): RollingTask {
@@ -202,8 +202,6 @@ function BaseText(
         };
 
         const trySkip = (untilEnd: boolean = false) => {
-            gameState.logger.debug("Sentence.tsx", "skipToEnd");
-
             // Skip to next pause or end
             let exited = false;
             while (!exited) {

src/game/player/elements/say/UIDialog.tsx

@@ -208,7 +208,6 @@ export default function PlayerDialog({
      */
     useEffect(() => {
         return gameState.events.on(GameState.EventTypes["event:state.player.skip"], () => {
-            gameState.logger.log("NarraLeaf-React: Say", "Skipped", dialogState.isIdle());
             if (dialogState.isIdle()) {
                 onFinished?.(true);
             } else {

src/game/player/gameState.ts

@@ -119,6 +119,7 @@ export class GameState {
     exposedState: Map<Values<ExposedKeys>, object> = new Map();
     guard: GameStateGuard;
     timelines: Timelines;
+    preloadingScene: Scene | null = null;
     public readonly notificationMgr: NotificationManager;
     public readonly events: EventDispatcher<GameStateEvents>;
     public readonly logger: Logger;
@@ -191,6 +192,15 @@ export class GameState {
         return this;
     }
 
+    public preloadScene(scene: Scene): this {
+        this.preloadingScene = scene;
+        return this;
+    }
+
+    public getPreloadingScene(): Scene | null {
+        return this.preloadingScene;
+    }
+
     public addElement(element: PlayerStateElement): this {
         this.state.elements.push(element);
         return this;