Merge pull request #122 from Next2D/develop

Loadingの処理を修正
Next2D · Nov 7, 2023 · 2309ffb · 2309ffb
2 parents 2a57a2a + d590c41
commit 2309ffb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next2d/framework",
   "description": "Next2D Framework is designed according to the principles of clean architecture, domain-driven development, test-driven development, and MVVM, with an emphasis on flexibility, scalability, and maintainability, and a design methodology that keeps each layer loosely coupled.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "homepage": "https://next2d.app",
   "bugs": "https://github.com/Next2D/Framework/issues/new",
   "author": "Toshiyuki Ienaga <ienaga@next2d.app> (https://github.com/ienaga/)",

diff --git a/src/domain/loading/Loading.ts b/src/domain/loading/Loading.ts
@@ -43,12 +43,7 @@ export const start = (): Promise<void> =>
             return resolve();
         }
 
-        $instance.start();
-
-        setTimeout(() =>
-        {
-            resolve();
-        }, 500);
+        resolve($instance.start());
     });
 };
 

diff --git a/src/domain/screen/DefaultLoading.ts b/src/domain/screen/DefaultLoading.ts
@@ -55,8 +55,8 @@ const initialize = (): void =>
             sprite,
             getEndObject(),
             getStartObject(),
-            0.2,
-            0.7,
+            0.12,
+            0.5,
             Easing.inOutCubic
         );
         sprite.setLocalVariable("reduceJob", reduceJob);
@@ -65,8 +65,8 @@ const initialize = (): void =>
             sprite,
             getStartObject(),
             getEndObject(),
-            0.2,
-            0.7,
+            0.12,
+            0.5,
             Easing.inOutCubic
         );
         sprite.setLocalVariable("expandJob", expandJob);
@@ -139,7 +139,7 @@ export class DefaultLoading
                 setTimeout((): void =>
                 {
                     expandJob.start();
-                }, 200 * idx);
+                }, 120 * idx);
             } else {
                 expandJob.start();
             }