Merge remote-tracking branch 'origin/main'

Author: Fogrexon

build/umd/bubble-engine.js

@@ -3,7 +3,9 @@ import { AssetBase, DynamicFileLoader, FileType, StaticFileLoader } from './load
 import { AchievementBlueprintTable, AchievementManager, AchievementStatusBlueprintTable } from './achievement';
 import { CollisionPreprocessManager, GraphicPreprocessManager } from './preprocess';
 import { GlobalStore } from './store';
-export type GameCoreSettings<T1 extends Record<string, InputKeybind> = Record<string, InputKeybind>, T2 extends Record<string, AssetBase<FileType>> = Record<string, AssetBase<FileType>>, T3 extends string[] = string[], T4 extends string[] = string[], T5 extends [T4[number], T4[number]][] = [T4[number], T4[number]][], T6 extends AchievementStatusBlueprintTable = AchievementStatusBlueprintTable, T7 extends AchievementBlueprintTable<T6> = AchievementBlueprintTable<T6>, T8 extends Record<string, unknown> = Record<string, unknown>> = {
+import { LevelManager } from '../levelControl';
+import { GameEntry } from '../entry';
+export type GameCoreSettings<T1 extends Record<string, InputKeybind> = Record<string, InputKeybind>, T2 extends Record<string, AssetBase<FileType>> = Record<string, AssetBase<FileType>>, T3 extends string[] = string[], T4 extends string[] = string[], T5 extends [T4[number], T4[number]][] = [T4[number], T4[number]][], T6 extends AchievementStatusBlueprintTable = AchievementStatusBlueprintTable, T7 extends AchievementBlueprintTable<T6> = AchievementBlueprintTable<T6>, T8 extends Record<string, unknown> = Record<string, unknown>, T9 extends LevelManager = LevelManager, T10 extends Record<string, GameEntry> = Record<string, GameEntry>, T11 extends keyof T10 = keyof T10> = {
     keybind: T1;
     staticLoadAssets: T2;
     graphicLayers: T3;
@@ -12,6 +14,9 @@ export type GameCoreSettings<T1 extends Record<string, InputKeybind> = Record<st
     achievementStatusBlueprint: T6;
     achievementBlueprint: T7;
     initialGlobalStore: T8;
+    levelManager: T9;
+    levelTable: T10;
+    initialLevel: T11;
 };
 export declare class GameCore<T extends GameCoreSettings = GameCoreSettings> {
     private _originalSettings;
@@ -29,5 +34,15 @@ export declare class GameCore<T extends GameCoreSettings = GameCoreSettings> {
     get achievementManager(): AchievementManager<T["achievementStatusBlueprint"], T["achievementBlueprint"]>;
     private _globalStore;
     get globalStore(): GlobalStore<T["initialGlobalStore"]>;
+    private _levelManager;
+    get levelManager(): T["levelManager"];
+    private _levelSelector;
+    private _requestAnimationFrameId;
     constructor(settings: T);
+    private initializeGame;
+    private gameLoop;
+    /**
+     * ゲームの開始コマンド
+     */
+    run(): void;
 }

build/umd/bubble-engine.js.map

@@ -1,5 +1,5 @@
-import { LevelManager } from '../../levelControl/LevelManager';
-type LevelRecord = Record<string, LevelManager>;
+import { GameEntry } from '../../entry';
+type LevelRecord = Record<string, GameEntry>;
 export declare class LevelSelector<T extends LevelRecord = LevelRecord> {
     private readonly _levelRecord;
     private _currentLevelKey;

build/umd/core/GameCore.d.ts

@@ -5,7 +5,27 @@ import { AssetBase } from './asset';
  */
 export declare class DynamicFileLoader {
     private _registeredAssetTable;
+    /**
+     * アセットの読み込み
+     * @param key
+     * @param asset
+     * @param progress
+     */
     load(key: string, asset: AssetBase<FileType>, progress: ProgressFunc): Promise<void>;
+    /**
+     * 複数アセットの読み込み
+     * @param fileTable
+     * @param progress
+     */
+    loadAll(fileTable: Record<string, AssetBase<FileType>>, progress?: (rate: number) => void): Promise<void>;
+    /**
+     * アセットの取得
+     * @param id
+     */
     get(id: string): AssetBase<FileType>;
+    /**
+     * アセットのメモリ開放
+     * @param id
+     */
     dispose(id: string): void;
 }

build/umd/core/level/LevelSelector.d.ts

@@ -0,0 +1,4 @@
+export declare const mapRecord: (record: Record<string, unknown>, fn: (key: string, value: unknown) => unknown) => {
+    [k: string]: unknown;
+};
+export declare const sumRecord: (record: Record<string, number>) => number;