@famibee/skynovel 1.27.0 → 1.27.1

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.27.1](https://github.com/famibee/SKYNovel/compare/v1.27.0...v1.27.1) (2022-01-12)
+
+
+### Bug Fixes
+
+* [playse][stopse][fadeoutse]にてObjの扱いでエラーになる件 ([ed92d0b](https://github.com/famibee/SKYNovel/commit/ed92d0b82942f3fbaf0c9da338b76d21a29339d8))
+
+- fix: [playse][stopse][fadeoutse]にてオブジェクトの扱いによりエラーになる場合に対応
+
+
 # [1.27.0](https://github.com/famibee/SKYNovel/compare/v1.26.0...v1.27.0) (2022-01-11)
 
 
@@ -5,7 +15,7 @@
 
 * [update_check]DLでアーキテクチャ（x32、x64など）別の対応が可能に ([b8e569f](https://github.com/famibee/SKYNovel/commit/b8e569febb418f69c58879cab036d370fa66a3f1))
 
-- feat: [update_check]のアプリダウンロードでアーキテクチャ（x32、x64など）別の対応が可能に
+- feat: [update_check]のアプリダウンロードでアーキテクチャ（ia32、x64など）別の対応が可能に
 	- 拡張機能により生成された _index.json ファイルを使用
 	- 旧版の .yml ファイルもしばらく対応する
 - feat: アプリ実行時に OSや CPU アーキテクチャに対応するファイルが見つからない場合、同じOSのファイルをすべてダウンロードさせる

package/app.js

@@ -72747,7 +72747,7 @@ class SoundMng {
         [hArg.clickse, hArg.enterse, hArg.leavese].forEach(fn => {
             if (!fn || sound_1.sound.exists(fn))
                 return;
-            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, { preload: true, autoPlay: false });
+            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, '', fn, { preload: true, autoPlay: false });
         });
     }
     playLoopFromSaveObj() {
@@ -72858,7 +72858,7 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
     __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_stopse).call(this, { buf });
     const fn = hArg.fn;
     if (!fn)
-        throw '[playse] fnは必須です(buf=' + buf + ')';
+        throw `[playse] fnは必須です buf:${buf}`;
     if ((0, CmnLib_1.argChk_Boolean)(hArg, 'canskip', true)
         && __classPrivateFieldGet(this, _SoundMng_evtMng, "f").isSkippingByKeyDown())
         return false;
@@ -72889,11 +72889,11 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
     const snd = sound_1.sound.find(fn);
     const oSb = __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf] = {
         now_buf: buf,
-        snd: snd,
-        loop: loop,
-        start_ms: start_ms,
-        end_ms: end_ms,
-        ret_ms: ret_ms,
+        snd,
+        loop,
+        start_ms,
+        end_ms,
+        ret_ms,
         resume: false,
         playing: () => true,
         onend: () => {
@@ -72908,7 +72908,7 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
         },
     };
     const o = {
-        loop: loop,
+        loop,
         volume: vol,
         speed: (0, CmnLib_1.argChk_Num)(hArg, 'speed', 1),
         sprites: {},
@@ -72993,14 +72993,14 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
             }
             if (o2s.start >= d)
                 throw `[playse] ret_ms:${ret_ms} >= 音声ファイル再生時間:${d} は異常値です`;
-            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, o2);
+            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, buf, fn, o2);
         };
     }
     __classPrivateFieldGet(this, _SoundMng_initVol, "f").call(this);
     if (snd) {
         snd.volume = vol;
         if (sp_nm)
-            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, o);
+            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, buf, fn, o);
         else if (snd.isPlayable) {
             const ab = snd.options.source;
             if (!(ab instanceof ArrayBuffer)
@@ -73020,13 +73020,15 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
         const old = o.loaded;
         o.loaded = (e, snd) => { old?.(e, snd); this.main.resume(); };
     }
-    __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, o);
+    __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, buf, fn, o);
     return join;
-}, _SoundMng_playseSub = function _SoundMng_playseSub(fn, o) {
+}, _SoundMng_playseSub = function _SoundMng_playseSub(buf, fn, o) {
     const url = this.cfg.searchPath(fn, Config_1.Config.EXT_SOUND);
     if (url.slice(-4) !== '.bin') {
         o.url = url;
         const snd = sound_1.Sound.from(o);
+        if (buf)
+            __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf].snd = snd;
         if (!o.loop)
             sound_1.sound.add(fn, snd);
         return;
@@ -73040,6 +73042,8 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
         .load((_ldr, hRes) => {
         o.source = hRes[fn]?.data;
         const snd = sound_1.Sound.from(o);
+        if (buf)
+            __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf].snd = snd;
         if (!o.loop)
             sound_1.sound.add(fn, snd);
     });
@@ -73051,9 +73055,12 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
     return false;
 }, _SoundMng_stopbgm = function _SoundMng_stopbgm(hArg) { hArg.buf = 'BGM'; return __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_stopse).call(this, hArg); }, _SoundMng_stopse = function _SoundMng_stopse(hArg) {
     const buf = hArg.buf ?? 'SE';
-    __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_stopfadese).call(this, hArg);
     __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_delLoopPlay).call(this, buf);
-    __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf]?.snd?.stop();
+    const oSb = __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf];
+    if (oSb) {
+        oSb.snd?.stop();
+        oSb.onend();
+    }
     return false;
 }, _SoundMng_wb = function _SoundMng_wb(hArg) { hArg.buf = 'BGM'; return __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_wf).call(this, hArg); }, _SoundMng_wf = function _SoundMng_wf(hArg) {
     const buf = hArg.buf ?? 'SE';

package/core/lib/sn/SoundMng.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SoundMng.d.ts","sourceRoot":"","sources":["../../src/sn/SoundMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,OAAO,EAA6B,MAAM,UAAU,CAAC;AAE7D,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAqBlC,qBAAa,QAAQ;;IAIR,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAuB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAA7G,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,SAAS,EAAmB,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,OAAO;IAwBnJ,SAAS,CAAC,MAAM,EAAE,OAAO;IACzB,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB;IA6S3E,UAAU;IAwGV,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAS9B,mBAAmB,IAAI,IAAI;CAwC3B"}
+{"version":3,"file":"SoundMng.d.ts","sourceRoot":"","sources":["../../src/sn/SoundMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,OAAO,EAA6B,MAAM,UAAU,CAAC;AAE7D,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAqBlC,qBAAa,QAAQ;;IAIR,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAuB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAA7G,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,SAAS,EAAmB,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,OAAO;IAwBnJ,SAAS,CAAC,MAAM,EAAE,OAAO;IACzB,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB;IA+S3E,UAAU;IAwGV,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAS9B,mBAAmB,IAAI,IAAI;CAwC3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@famibee/skynovel",
-	"version": "1.27.0",
+	"version": "1.27.1",
 	"description": "webgl novelgame framework",
 	"main": "core/web.js",
 	"types": "core/lib/index.d.ts",
@@ -36,7 +36,7 @@
 		"@types/store": "^2.0.2",
 		"@types/tar-fs": "^2.0.1",
 		"@types/xml2js": "^0.4.9",
-		"electron": "^16.0.6",
+		"electron": "^16.0.7",
 		"mocha": "^9.1.3",
 		"power-assert": "^1.6.1",
 		"rimraf": "^3.0.2",
@@ -44,9 +44,9 @@
 		"ts-loader": "^9.2.6",
 		"ts-node": "^10.4.0",
 		"typescript": "^4.5.4",
-		"webpack": "^5.65.0",
+		"webpack": "^5.66.0",
 		"webpack-cli": "^4.9.1",
-		"webpack-dev-server": "^4.7.2"
+		"webpack-dev-server": "^4.7.3"
 	},
 	"scripts": {
 		"build": "npm run wp && npm run test",

package/web.js

@@ -74095,7 +74095,7 @@ class SoundMng {
         [hArg.clickse, hArg.enterse, hArg.leavese].forEach(fn => {
             if (!fn || sound_1.sound.exists(fn))
                 return;
-            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, { preload: true, autoPlay: false });
+            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, '', fn, { preload: true, autoPlay: false });
         });
     }
     playLoopFromSaveObj() {
@@ -74206,7 +74206,7 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
     __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_stopse).call(this, { buf });
     const fn = hArg.fn;
     if (!fn)
-        throw '[playse] fnは必須です(buf=' + buf + ')';
+        throw `[playse] fnは必須です buf:${buf}`;
     if ((0, CmnLib_1.argChk_Boolean)(hArg, 'canskip', true)
         && __classPrivateFieldGet(this, _SoundMng_evtMng, "f").isSkippingByKeyDown())
         return false;
@@ -74237,11 +74237,11 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
     const snd = sound_1.sound.find(fn);
     const oSb = __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf] = {
         now_buf: buf,
-        snd: snd,
-        loop: loop,
-        start_ms: start_ms,
-        end_ms: end_ms,
-        ret_ms: ret_ms,
+        snd,
+        loop,
+        start_ms,
+        end_ms,
+        ret_ms,
         resume: false,
         playing: () => true,
         onend: () => {
@@ -74256,7 +74256,7 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
         },
     };
     const o = {
-        loop: loop,
+        loop,
         volume: vol,
         speed: (0, CmnLib_1.argChk_Num)(hArg, 'speed', 1),
         sprites: {},
@@ -74341,14 +74341,14 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
             }
             if (o2s.start >= d)
                 throw `[playse] ret_ms:${ret_ms} >= 音声ファイル再生時間:${d} は異常値です`;
-            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, o2);
+            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, buf, fn, o2);
         };
     }
     __classPrivateFieldGet(this, _SoundMng_initVol, "f").call(this);
     if (snd) {
         snd.volume = vol;
         if (sp_nm)
-            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, o);
+            __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, buf, fn, o);
         else if (snd.isPlayable) {
             const ab = snd.options.source;
             if (!(ab instanceof ArrayBuffer)
@@ -74368,13 +74368,15 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
         const old = o.loaded;
         o.loaded = (e, snd) => { old?.(e, snd); this.main.resume(); };
     }
-    __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, fn, o);
+    __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_playseSub).call(this, buf, fn, o);
     return join;
-}, _SoundMng_playseSub = function _SoundMng_playseSub(fn, o) {
+}, _SoundMng_playseSub = function _SoundMng_playseSub(buf, fn, o) {
     const url = this.cfg.searchPath(fn, Config_1.Config.EXT_SOUND);
     if (url.slice(-4) !== '.bin') {
         o.url = url;
         const snd = sound_1.Sound.from(o);
+        if (buf)
+            __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf].snd = snd;
         if (!o.loop)
             sound_1.sound.add(fn, snd);
         return;
@@ -74388,6 +74390,8 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
         .load((_ldr, hRes) => {
         o.source = hRes[fn]?.data;
         const snd = sound_1.Sound.from(o);
+        if (buf)
+            __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf].snd = snd;
         if (!o.loop)
             sound_1.sound.add(fn, snd);
     });
@@ -74399,9 +74403,12 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
     return false;
 }, _SoundMng_stopbgm = function _SoundMng_stopbgm(hArg) { hArg.buf = 'BGM'; return __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_stopse).call(this, hArg); }, _SoundMng_stopse = function _SoundMng_stopse(hArg) {
     const buf = hArg.buf ?? 'SE';
-    __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_stopfadese).call(this, hArg);
     __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_delLoopPlay).call(this, buf);
-    __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf]?.snd?.stop();
+    const oSb = __classPrivateFieldGet(this, _SoundMng_hSndBuf, "f")[buf];
+    if (oSb) {
+        oSb.snd?.stop();
+        oSb.onend();
+    }
     return false;
 }, _SoundMng_wb = function _SoundMng_wb(hArg) { hArg.buf = 'BGM'; return __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_wf).call(this, hArg); }, _SoundMng_wf = function _SoundMng_wf(hArg) {
     const buf = hArg.buf ?? 'SE';