@famibee/skynovel 1.25.8 → 1.27.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/app.js CHANGED
@@ -65943,8 +65943,8 @@ class Button extends pixi_js_1.Container {
65943
65943
  this.getBtnBounds = () => __classPrivateFieldGet(this, _Button_rctBtnTxt, "f");
65944
65944
  _Button_rctBtnTxt.set(this, new pixi_js_1.Rectangle);
65945
65945
  _Button_idc.set(this, void 0);
65946
- _Button_sp_b_pic.set(this, null);
65947
- _Button_sp_pic.set(this, null);
65946
+ _Button_sp_b_pic.set(this, undefined);
65947
+ _Button_sp_pic.set(this, undefined);
65948
65948
  _Button_normal.set(this, () => { });
65949
65949
  _Button_hover.set(this, () => false);
65950
65950
  _Button_clicked.set(this, () => { });
@@ -66906,8 +66906,8 @@ class DesignCast {
66906
66906
  'height': 0,
66907
66907
  };
66908
66908
  this.fncLay = () => { };
66909
- this.mov = null;
66910
- this.div = null;
66909
+ this.mov = undefined;
66910
+ this.div = undefined;
66911
66911
  this.lx = 0;
66912
66912
  this.ly = 0;
66913
66913
  this.rect = pixi_js_1.Rectangle.EMPTY;
@@ -66969,9 +66969,9 @@ class DesignCast {
66969
66969
  s.height = `${CmnLib_1.CmnLib.stageH * CmnLib_1.CmnLib.cvsScale}px`;
66970
66970
  }
66971
66971
  destroy() {
66972
- this.div = null;
66972
+ this.div = undefined;
66973
66973
  this.mov?.destroy();
66974
- this.mov = null;
66974
+ this.mov = undefined;
66975
66975
  }
66976
66976
  gethArg() { return this.hArg; }
66977
66977
  sethArg(hArg) {
@@ -68518,12 +68518,12 @@ class FocusMng {
68518
68518
  }
68519
68519
  getFocus() {
68520
68520
  if (__classPrivateFieldGet(this, _FocusMng_idx, "f") < 0)
68521
- return null;
68521
+ return undefined;
68522
68522
  __classPrivateFieldGet(this, _FocusMng_instances, "m", _FocusMng_allOff).call(this);
68523
68523
  if (__classPrivateFieldGet(this, _FocusMng_idx, "f") >= __classPrivateFieldGet(this, _FocusMng_aBtn, "f").length)
68524
68524
  __classPrivateFieldSet(this, _FocusMng_idx, 0, "f");
68525
68525
  const b = __classPrivateFieldGet(this, _FocusMng_aBtn, "f")[__classPrivateFieldGet(this, _FocusMng_idx, "f")];
68526
- return b.on() ? b.btn : null;
68526
+ return b.on() ? b.btn : undefined;
68527
68527
  }
68528
68528
  blur() { __classPrivateFieldGet(this, _FocusMng_instances, "m", _FocusMng_allOff).call(this); __classPrivateFieldSet(this, _FocusMng_idx, -1, "f"); globalThis.focus(); }
68529
68529
  }
@@ -68947,7 +68947,7 @@ function splitAmpersand(token) {
68947
68947
  return {
68948
68948
  name: equa[0].replaceAll('=', '==').replaceAll('≠', '!='),
68949
68949
  text: equa[1].replaceAll('=', '==').replaceAll('≠', '!='),
68950
- cast: ((cnt_equa === 3) ? equa[2].trim() : null)
68950
+ cast: ((cnt_equa === 3) ? equa[2].trim() : undefined)
68951
68951
  };
68952
68952
  }
68953
68953
  exports.splitAmpersand = splitAmpersand;
@@ -69089,7 +69089,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
69089
69089
  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
69090
69090
  return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
69091
69091
  };
69092
- var _a, _GrpLayer_elc, _GrpLayer_hFace, _GrpLayer_main, _GrpLayer_cfg, _GrpLayer_sys, _GrpLayer_glbVol, _GrpLayer_movVol, _GrpLayer_evtMng, _GrpLayer_idc, _GrpLayer_csvFn, _GrpLayer_sBkFn, _GrpLayer_sBkFace, _GrpLayer_width, _GrpLayer_height, _GrpLayer_dec2cache, _GrpLayer_sortAFrameName, _GrpLayer_dec2cache4Cripto, _GrpLayer_mkSprite, _GrpLayer_hAEncImg, _GrpLayer_hEncImgOUrl;
69092
+ var _a, _GrpLayer_elc, _GrpLayer_hFace, _GrpLayer_main, _GrpLayer_cfg, _GrpLayer_appPixi, _GrpLayer_sys, _GrpLayer_glbVol, _GrpLayer_movVol, _GrpLayer_evtMng, _GrpLayer_idc, _GrpLayer_csvFn, _GrpLayer_sBkFn, _GrpLayer_sBkFace, _GrpLayer_width, _GrpLayer_height, _GrpLayer_dec2cache, _GrpLayer_sortAFrameName, _GrpLayer_dec2cache4Cripto, _GrpLayer_mkSprite, _GrpLayer_rtTsy, _GrpLayer_spTsy, _GrpLayer_fncRender, _GrpLayer_hAEncImg, _GrpLayer_hEncImgOUrl;
69093
69093
  Object.defineProperty(exports, "__esModule", ({ value: true }));
69094
69094
  exports.GrpLayer = void 0;
69095
69095
  const Layer_1 = __webpack_require__(/*! ./Layer */ "./core/src/sn/Layer.ts");
@@ -69114,6 +69114,9 @@ class GrpLayer extends Layer_1.Layer {
69114
69114
  });
69115
69115
  _GrpLayer_width.set(this, 0);
69116
69116
  _GrpLayer_height.set(this, 0);
69117
+ _GrpLayer_rtTsy.set(this, void 0);
69118
+ _GrpLayer_spTsy.set(this, void 0);
69119
+ _GrpLayer_fncRender.set(this, () => { });
69117
69120
  this.record = () => Object.assign(super.record(), {
69118
69121
  sBkFn: __classPrivateFieldGet(this, _GrpLayer_sBkFn, "f"),
69119
69122
  sBkFace: __classPrivateFieldGet(this, _GrpLayer_sBkFace, "f"),
@@ -69125,9 +69128,10 @@ class GrpLayer extends Layer_1.Layer {
69125
69128
  this.cvsResize = () => { super.cvsResize(); __classPrivateFieldGet(this, _GrpLayer_idc, "f").cvsResize(); };
69126
69129
  }
69127
69130
  }
69128
- static init(main, cfg, sys, sndMng) {
69131
+ static init(main, cfg, appPixi, sys, sndMng) {
69129
69132
  __classPrivateFieldSet(GrpLayer, _a, main, "f", _GrpLayer_main);
69130
69133
  __classPrivateFieldSet(GrpLayer, _a, cfg, "f", _GrpLayer_cfg);
69134
+ __classPrivateFieldSet(GrpLayer, _a, appPixi, "f", _GrpLayer_appPixi);
69131
69135
  __classPrivateFieldSet(GrpLayer, _a, sys, "f", _GrpLayer_sys);
69132
69136
  const fnc = () => {
69133
69137
  const vol = __classPrivateFieldGet(GrpLayer, _a, "f", _GrpLayer_glbVol) * __classPrivateFieldGet(GrpLayer, _a, "f", _GrpLayer_movVol);
@@ -69240,6 +69244,7 @@ class GrpLayer extends Layer_1.Layer {
69240
69244
  const fncLoaded = (hRes) => {
69241
69245
  for (const v of aComp) {
69242
69246
  const sp = __classPrivateFieldGet(GrpLayer, _a, "m", _GrpLayer_mkSprite).call(GrpLayer, v.fn, hRes);
69247
+ sp.name = v.fn;
69243
69248
  parent?.addChild(sp);
69244
69249
  v.fnc(sp);
69245
69250
  }
@@ -69276,6 +69281,40 @@ class GrpLayer extends Layer_1.Layer {
69276
69281
  hve.addEventListener('ended', fnc, { once: true, passive: true });
69277
69282
  return __classPrivateFieldGet(GrpLayer, _a, "f", _GrpLayer_evtMng).waitEvent(() => { hve.pause(); fnc(); }, (0, CmnLib_1.argChk_Boolean)(hArg, 'canskip', true), (0, CmnLib_1.argChk_Boolean)(hArg, 'global', false));
69278
69283
  }
69284
+ renderStart() {
69285
+ __classPrivateFieldSet(this, _GrpLayer_rtTsy, pixi_js_1.RenderTexture.create({
69286
+ width: CmnLib_1.CmnLib.stageW,
69287
+ height: CmnLib_1.CmnLib.stageH,
69288
+ }), "f");
69289
+ __classPrivateFieldSet(this, _GrpLayer_spTsy, new pixi_js_1.Sprite(__classPrivateFieldGet(this, _GrpLayer_rtTsy, "f")), "f");
69290
+ __classPrivateFieldGet(this, _GrpLayer_spTsy, "f").visible = false;
69291
+ this.spLay.addChildAt(__classPrivateFieldGet(this, _GrpLayer_spTsy, "f"), 0);
69292
+ __classPrivateFieldGet(this, _GrpLayer_spTsy, "f").position.set(-this.spLay.x, -this.spLay.y);
69293
+ let fncRenderFore = () => {
69294
+ const a = this.spLay.alpha;
69295
+ this.spLay.alpha = 1;
69296
+ this.spLay.children.forEach(s => s.visible = true);
69297
+ __classPrivateFieldGet(this, _GrpLayer_spTsy, "f").visible = false;
69298
+ __classPrivateFieldGet(GrpLayer, _a, "f", _GrpLayer_appPixi).renderer.render(this.spLay, { renderTexture: __classPrivateFieldGet(this, _GrpLayer_rtTsy, "f") });
69299
+ this.spLay.alpha = a;
69300
+ this.spLay.children.forEach(s => s.visible = false);
69301
+ };
69302
+ if (!this.containMovement) {
69303
+ let oldFnc = fncRenderFore;
69304
+ fncRenderFore = () => { fncRenderFore = () => { }; oldFnc(); };
69305
+ }
69306
+ __classPrivateFieldSet(this, _GrpLayer_fncRender, () => {
69307
+ fncRenderFore();
69308
+ __classPrivateFieldGet(this, _GrpLayer_spTsy, "f").visible = true;
69309
+ }, "f");
69310
+ __classPrivateFieldGet(GrpLayer, _a, "f", _GrpLayer_appPixi).ticker.add(__classPrivateFieldGet(this, _GrpLayer_fncRender, "f"));
69311
+ }
69312
+ renderEnd() {
69313
+ __classPrivateFieldGet(GrpLayer, _a, "f", _GrpLayer_appPixi).ticker.remove(__classPrivateFieldGet(this, _GrpLayer_fncRender, "f"));
69314
+ this.spLay.removeChild(__classPrivateFieldGet(this, _GrpLayer_spTsy, "f"));
69315
+ this.spLay.children.forEach(s => s.visible = true);
69316
+ __classPrivateFieldGet(this, _GrpLayer_spTsy, "f").destroy(true);
69317
+ }
69279
69318
  static loadPic2Img(src, img, onload) {
69280
69319
  const oUrl = __classPrivateFieldGet(this, _a, "f", _GrpLayer_hEncImgOUrl)[src];
69281
69320
  if (oUrl) {
@@ -69330,7 +69369,7 @@ class GrpLayer extends Layer_1.Layer {
69330
69369
  throw '一つのname(' + name + ')に対して同じ画像を複数割り当てられません';
69331
69370
  const fn = hArg.fn ?? name;
69332
69371
  __classPrivateFieldGet(GrpLayer, _a, "f", _GrpLayer_hFace)[name] = {
69333
- fn: fn,
69372
+ fn,
69334
69373
  dx: (0, CmnLib_1.argChk_Num)(hArg, 'dx', 0) * CmnLib_1.CmnLib.retinaRate,
69335
69374
  dy: (0, CmnLib_1.argChk_Num)(hArg, 'dy', 0) * CmnLib_1.CmnLib.retinaRate,
69336
69375
  blendmode: Layer_1.Layer.getBlendmodeNum(hArg.blendmode || '')
@@ -69338,6 +69377,12 @@ class GrpLayer extends Layer_1.Layer {
69338
69377
  return false;
69339
69378
  }
69340
69379
  static clearFace2Name() { __classPrivateFieldSet(GrpLayer, _a, {}, "f", _GrpLayer_hFace); }
69380
+ get containMovement() {
69381
+ if (__classPrivateFieldGet(this, _GrpLayer_csvFn, "f") === '')
69382
+ return false;
69383
+ const c = this.spLay.children;
69384
+ return __classPrivateFieldGet(this, _GrpLayer_csvFn, "f").split(',').some((fn, i) => c[i] instanceof pixi_js_1.AnimatedSprite || GrpLayer.hFn2VElm[fn]);
69385
+ }
69341
69386
  clearLay(hArg) {
69342
69387
  super.clearLay(hArg);
69343
69388
  for (const c of this.spLay.removeChildren())
@@ -69365,7 +69410,7 @@ class GrpLayer extends Layer_1.Layer {
69365
69410
  showDesignCast() { __classPrivateFieldGet(this, _GrpLayer_idc, "f").visible = true; }
69366
69411
  }
69367
69412
  exports.GrpLayer = GrpLayer;
69368
- _a = GrpLayer, _GrpLayer_idc = new WeakMap(), _GrpLayer_csvFn = new WeakMap(), _GrpLayer_sBkFn = new WeakMap(), _GrpLayer_sBkFace = new WeakMap(), _GrpLayer_width = new WeakMap(), _GrpLayer_height = new WeakMap(), _GrpLayer_sortAFrameName = function _GrpLayer_sortAFrameName(aFn) {
69413
+ _a = GrpLayer, _GrpLayer_idc = new WeakMap(), _GrpLayer_csvFn = new WeakMap(), _GrpLayer_sBkFn = new WeakMap(), _GrpLayer_sBkFace = new WeakMap(), _GrpLayer_width = new WeakMap(), _GrpLayer_height = new WeakMap(), _GrpLayer_rtTsy = new WeakMap(), _GrpLayer_spTsy = new WeakMap(), _GrpLayer_fncRender = new WeakMap(), _GrpLayer_sortAFrameName = function _GrpLayer_sortAFrameName(aFn) {
69369
69414
  const a_base_name = /([^\d]+)\d+\.(\w+)/.exec(aFn[0]);
69370
69415
  if (!a_base_name)
69371
69416
  return;
@@ -69447,6 +69492,7 @@ _GrpLayer_elc = { value: new EventListenerCtn_1.EventListenerCtn };
69447
69492
  _GrpLayer_hFace = { value: {} };
69448
69493
  _GrpLayer_main = { value: void 0 };
69449
69494
  _GrpLayer_cfg = { value: void 0 };
69495
+ _GrpLayer_appPixi = { value: void 0 };
69450
69496
  _GrpLayer_sys = { value: void 0 };
69451
69497
  _GrpLayer_glbVol = { value: 1 };
69452
69498
  _GrpLayer_movVol = { value: 1 };
@@ -69553,6 +69599,9 @@ class Layer {
69553
69599
  return bmn;
69554
69600
  throw `${bm_name} はサポートされない blendmode です`;
69555
69601
  }
69602
+ get containMovement() { return false; }
69603
+ renderStart() { }
69604
+ renderEnd() { }
69556
69605
  clearLay(hArg) {
69557
69606
  this.spLay.alpha = 1;
69558
69607
  this.spLay.blendMode = pixi_js_1.BLEND_MODES.NORMAL;
@@ -69690,10 +69739,10 @@ class Layer {
69690
69739
  static setXYByPos(base, pos, ret) {
69691
69740
  if (pos === 'stay')
69692
69741
  return;
69693
- if (base === null)
69694
- throw 'setXYByPos base === null';
69695
- if (ret === null)
69696
- throw 'setXYByPos result === null';
69742
+ if (base === undefined)
69743
+ throw 'setXYByPos base === undefined';
69744
+ if (ret === undefined)
69745
+ throw 'setXYByPos result === undefined';
69697
69746
  const rct_base = base.getBounds();
69698
69747
  const r_absclX = (ret.scale.x < 0) ? -ret.scale.x : ret.scale.x;
69699
69748
  const b_width = (r_absclX === 1) ? rct_base.width : rct_base.width * r_absclX;
@@ -69811,7 +69860,7 @@ class LayerMng {
69811
69860
  _LayerMng_modeLn.set(this, '');
69812
69861
  _LayerMng_modeLnSub.set(this, '');
69813
69862
  this.getFrmDisabled = (id) => __classPrivateFieldGet(this, _LayerMng_frmMng, "f").getFrmDisabled(id);
69814
- _LayerMng_grpCover.set(this, null);
69863
+ _LayerMng_grpCover.set(this, undefined);
69815
69864
  _LayerMng_evtMng.set(this, void 0);
69816
69865
  _LayerMng_cmdTxt.set(this, (cmd, tl = this.currentTxtlayForeNeedErr, _record = true) => tl.tagCh('| 《' + cmd + '》'));
69817
69866
  this.goTxt = () => { };
@@ -69869,7 +69918,7 @@ void main(void) {
69869
69918
  }));
69870
69919
  _LayerMng_spTransFore.set(this, new pixi_js_1.Sprite(__classPrivateFieldGet(this, _LayerMng_rtTransFore, "f")));
69871
69920
  _LayerMng_aBackTransAfter.set(this, []);
69872
- _LayerMng_tiTrans.set(this, { tw: null, resume: false });
69921
+ _LayerMng_tiTrans.set(this, { tw: undefined, resume: false });
69873
69922
  _LayerMng_hTwInf.set(this, {});
69874
69923
  _LayerMng_getTxtLayer.set(this, (_hArg) => { __classPrivateFieldGet(this, _LayerMng_chkTxtLay, "f").call(this); throw 0; });
69875
69924
  _LayerMng_current.set(this, (_hArg) => { __classPrivateFieldGet(this, _LayerMng_chkTxtLay, "f").call(this); throw 0; });
@@ -69902,7 +69951,7 @@ void main(void) {
69902
69951
  }
69903
69952
  CmnLib_1.CmnLib.cvsResize(cvs);
69904
69953
  TxtLayer_1.TxtLayer.init(cfg, hTag, val, (txt) => this.recText(txt), (me) => __classPrivateFieldGet(this, _LayerMng_hPages, "f")[me.layname].fore === me);
69905
- GrpLayer_1.GrpLayer.init(main, cfg, sys, sndMng);
69954
+ GrpLayer_1.GrpLayer.init(main, cfg, appPixi, sys, sndMng);
69906
69955
  Button_1.Button.init(cfg);
69907
69956
  __classPrivateFieldSet(this, _LayerMng_frmMng, new FrameMng_1.FrameMng(this.cfg, this.hTag, this.appPixi, this.val, main, this.sys, __classPrivateFieldGet(this, _LayerMng_hTwInf, "f")), "f");
69908
69957
  sys.hFactoryCls.grp = () => new GrpLayer_1.GrpLayer;
@@ -69988,7 +70037,7 @@ void main(void) {
69988
70037
  if (__classPrivateFieldGet(this, _LayerMng_grpCover, "f")) {
69989
70038
  __classPrivateFieldGet(this, _LayerMng_stage, "f").removeChild(__classPrivateFieldGet(this, _LayerMng_grpCover, "f"));
69990
70039
  __classPrivateFieldGet(this, _LayerMng_grpCover, "f").destroy();
69991
- __classPrivateFieldSet(this, _LayerMng_grpCover, null, "f");
70040
+ __classPrivateFieldSet(this, _LayerMng_grpCover, undefined, "f");
69992
70041
  }
69993
70042
  if (visible)
69994
70043
  __classPrivateFieldGet(this, _LayerMng_stage, "f").addChild((__classPrivateFieldSet(this, _LayerMng_grpCover, new pixi_js_1.Graphics, "f"))
@@ -70298,22 +70347,45 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70298
70347
  const ease = CmnTween_1.CmnTween.ease(hArg.ease);
70299
70348
  __classPrivateFieldSet(this, _LayerMng_aBackTransAfter, [], "f");
70300
70349
  const hTarget = {};
70301
- __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this, hArg.layer).forEach(v => hTarget[v] = true);
70302
- __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this).forEach(lay_nm => __classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").push(__classPrivateFieldGet(this, _LayerMng_hPages, "f")[lay_nm][hTarget[lay_nm] ? 'back' : 'fore'].spLay));
70350
+ const aFore = [];
70351
+ __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this, hArg.layer).forEach(lay_nm => {
70352
+ hTarget[lay_nm] = true;
70353
+ aFore.push(__classPrivateFieldGet(this, _LayerMng_hPages, "f")[lay_nm].fore);
70354
+ });
70355
+ const aBack = [];
70356
+ __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this).forEach(lay_nm => {
70357
+ const lay = __classPrivateFieldGet(this, _LayerMng_hPages, "f")[lay_nm][hTarget[lay_nm] ? 'back' : 'fore'];
70358
+ __classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").push(lay.spLay);
70359
+ aBack.push(lay);
70360
+ });
70303
70361
  __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f").resize(CmnLib_1.CmnLib.stageW, CmnLib_1.CmnLib.stageH);
70304
70362
  this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_back, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f") });
70305
- __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f").resize(CmnLib_1.CmnLib.stageW, CmnLib_1.CmnLib.stageH);
70306
- this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
70307
- const fncRender = () => {
70363
+ let fncRenderBack = () => {
70308
70364
  __classPrivateFieldGet(this, _LayerMng_back, "f").visible = true;
70309
- __classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").forEach(lay => {
70310
- this.appPixi.renderer.render(lay, { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f"), clear: false });
70365
+ __classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").forEach(spLay => {
70366
+ this.appPixi.renderer.render(spLay, { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f"), clear: false });
70311
70367
  });
70312
70368
  __classPrivateFieldGet(this, _LayerMng_back, "f").visible = false;
70313
- __classPrivateFieldGet(this, _LayerMng_spTransBack, "f").visible = true;
70369
+ };
70370
+ if (!aBack.some(lay => lay.containMovement)) {
70371
+ let oldFnc = fncRenderBack;
70372
+ fncRenderBack = () => { fncRenderBack = () => { }; oldFnc(); };
70373
+ }
70374
+ __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f").resize(CmnLib_1.CmnLib.stageW, CmnLib_1.CmnLib.stageH);
70375
+ this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
70376
+ let fncRenderFore = () => {
70314
70377
  __classPrivateFieldGet(this, _LayerMng_fore, "f").visible = true;
70315
70378
  this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
70316
70379
  __classPrivateFieldGet(this, _LayerMng_fore, "f").visible = false;
70380
+ };
70381
+ if (!aFore.some(lay => lay.containMovement)) {
70382
+ let oldFnc = fncRenderFore;
70383
+ fncRenderFore = () => { fncRenderFore = () => { }; oldFnc(); };
70384
+ }
70385
+ const fncRender = () => {
70386
+ fncRenderBack();
70387
+ __classPrivateFieldGet(this, _LayerMng_spTransBack, "f").visible = true;
70388
+ fncRenderFore();
70317
70389
  __classPrivateFieldGet(this, _LayerMng_spTransFore, "f").visible = true;
70318
70390
  };
70319
70391
  __classPrivateFieldGet(this, _LayerMng_spTransFore, "f").alpha = 1;
@@ -70343,9 +70415,9 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70343
70415
  __classPrivateFieldGet(this, _LayerMng_tiTrans, "f").tw?.stop();
70344
70416
  if (__classPrivateFieldGet(this, _LayerMng_tiTrans, "f").resume)
70345
70417
  this.main.resume();
70346
- __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: null, resume: false }, "f");
70418
+ __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: undefined, resume: false }, "f");
70347
70419
  };
70348
- __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: null, resume: false }, "f");
70420
+ __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: undefined, resume: false }, "f");
70349
70421
  const time = (0, CmnLib_1.argChk_Num)(hArg, 'time', 0);
70350
70422
  if (time === 0 || __classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkippingByKeyDown()) {
70351
70423
  comp();
@@ -70381,7 +70453,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70381
70453
  }
70382
70454
  if (!hArg.rule)
70383
70455
  throw 'ruleが指定されていません';
70384
- GrpLayer_1.GrpLayer.csv2Sprites(hArg.rule, null, sp => {
70456
+ GrpLayer_1.GrpLayer.csv2Sprites(hArg.rule, undefined, sp => {
70385
70457
  flt.uniforms.rule = sp.texture;
70386
70458
  sp.destroy();
70387
70459
  __classPrivateFieldGet(this, _LayerMng_tiTrans, "f").tw?.start();
@@ -70438,7 +70510,6 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70438
70510
  };
70439
70511
  __classPrivateFieldGet(this, _LayerMng_spTransFore, "f").visible = true;
70440
70512
  __classPrivateFieldGet(this, _LayerMng_spTransFore, "f").alpha = 1;
70441
- const ease = CmnTween_1.CmnTween.ease(hArg.ease);
70442
70513
  const h = (0, CmnLib_1.uint)((0, CmnLib_1.argChk_Num)(hArg, 'hmax', 10));
70443
70514
  const v = (0, CmnLib_1.uint)((0, CmnLib_1.argChk_Num)(hArg, 'vmax', 10));
70444
70515
  const fncH = (h === 0)
@@ -70452,7 +70523,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70452
70523
  const tw = new tween_js_1.Tween(__classPrivateFieldGet(this, _LayerMng_spTransFore, "f"))
70453
70524
  .to({ x: 0, y: 0 }, time)
70454
70525
  .delay((0, CmnLib_1.argChk_Num)(hArg, 'delay', 0))
70455
- .easing(ease)
70526
+ .easing(CmnTween_1.CmnTween.ease(hArg.ease))
70456
70527
  .onUpdate(() => { fncH(); fncV(); })
70457
70528
  .repeat(repeat === 0 ? Infinity : (repeat - 1))
70458
70529
  .yoyo((0, CmnLib_1.argChk_Boolean)(hArg, 'yoyo', false))
@@ -70465,23 +70536,28 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70465
70536
  __classPrivateFieldGet(this, _LayerMng_tiTrans, "f").tw?.stop();
70466
70537
  if (__classPrivateFieldGet(this, _LayerMng_tiTrans, "f").resume)
70467
70538
  this.main.resume();
70468
- __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: null, resume: false }, "f");
70539
+ __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: undefined, resume: false }, "f");
70469
70540
  })
70470
70541
  .start();
70471
- __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: tw, resume: false }, "f");
70542
+ __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw, resume: false }, "f");
70472
70543
  this.appPixi.ticker.add(fncRender);
70473
70544
  return false;
70474
70545
  }, _LayerMng_tsy = function _LayerMng_tsy(hArg) {
70475
70546
  if (!hArg.layer)
70476
70547
  throw 'layerは必須です';
70477
70548
  const layer = __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_argChk_layer).call(this, hArg);
70478
- const foreLay = __classPrivateFieldGet(this, _LayerMng_hPages, "f")[layer].fore;
70549
+ let foreLay = __classPrivateFieldGet(this, _LayerMng_hPages, "f")[layer].fore;
70550
+ let finishBlendLayer = () => { };
70551
+ const isSkip = __classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkippingByKeyDown();
70552
+ if (!isSkip && 'render' in hArg) {
70553
+ foreLay.renderStart();
70554
+ finishBlendLayer = () => foreLay.renderEnd();
70555
+ }
70479
70556
  const hTo = (0, CmnLib_1.cnvTweenArg)(hArg, foreLay);
70480
70557
  const repeat = (0, CmnLib_1.argChk_Num)(hArg, 'repeat', 1);
70481
70558
  const tw_nm = hArg.name ?? hArg.layer;
70482
70559
  const tw = new tween_js_1.Tween(foreLay)
70483
- .to(hTo, (0, CmnLib_1.argChk_Num)(hArg, 'time', NaN) * (Boolean(this.val.getVal('tmp:sn.skip.enabled')
70484
- || __classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkippingByKeyDown()) ? 0 : 1))
70560
+ .to(hTo, (0, CmnLib_1.argChk_Num)(hArg, 'time', NaN) * (Boolean(this.val.getVal('tmp:sn.skip.enabled') || isSkip) ? 0 : 1))
70485
70561
  .delay((0, CmnLib_1.argChk_Num)(hArg, 'delay', 0))
70486
70562
  .easing(CmnTween_1.CmnTween.ease(hArg.ease))
70487
70563
  .repeat(repeat === 0 ? Infinity : (repeat - 1))
@@ -70490,6 +70566,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70490
70566
  const ti = __classPrivateFieldGet(this, _LayerMng_hTwInf, "f")[tw_nm];
70491
70567
  if (!ti)
70492
70568
  return;
70569
+ finishBlendLayer();
70493
70570
  delete __classPrivateFieldGet(this, _LayerMng_hTwInf, "f")[tw_nm];
70494
70571
  ti.tw?.stop();
70495
70572
  if (ti.resume)
@@ -70507,7 +70584,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
70507
70584
  tw.start();
70508
70585
  const arrive = (0, CmnLib_1.argChk_Boolean)(hArg, 'arrive', false);
70509
70586
  const backlay = (0, CmnLib_1.argChk_Boolean)(hArg, 'backlay', false);
70510
- __classPrivateFieldGet(this, _LayerMng_hTwInf, "f")[tw_nm] = { tw: tw, resume: false, onEnd: () => {
70587
+ __classPrivateFieldGet(this, _LayerMng_hTwInf, "f")[tw_nm] = { tw, resume: false, onEnd: () => {
70511
70588
  if (arrive)
70512
70589
  Object.assign(foreLay, hTo);
70513
70590
  if (backlay) {
@@ -71448,14 +71525,14 @@ const DebugMng_1 = __webpack_require__(/*! ./DebugMng */ "./core/src/sn/DebugMng
71448
71525
  ;
71449
71526
  var BreakState;
71450
71527
  (function (BreakState) {
71451
- BreakState[BreakState["running"] = 0] = "running";
71452
- BreakState[BreakState["wait"] = 1] = "wait";
71453
- BreakState[BreakState["break"] = 2] = "break";
71454
- BreakState[BreakState["breaking"] = 3] = "breaking";
71455
- BreakState[BreakState["step"] = 4] = "step";
71456
- BreakState[BreakState["stepping"] = 5] = "stepping";
71457
- BreakState[BreakState["stepouting"] = 6] = "stepouting";
71458
- BreakState[BreakState["stepout"] = 7] = "stepout";
71528
+ BreakState[BreakState["Running"] = 0] = "Running";
71529
+ BreakState[BreakState["Wait"] = 1] = "Wait";
71530
+ BreakState[BreakState["Break"] = 2] = "Break";
71531
+ BreakState[BreakState["Breaking"] = 3] = "Breaking";
71532
+ BreakState[BreakState["Step"] = 4] = "Step";
71533
+ BreakState[BreakState["Stepping"] = 5] = "Stepping";
71534
+ BreakState[BreakState["StepOuting"] = 6] = "StepOuting";
71535
+ BreakState[BreakState["StepOut"] = 7] = "StepOut";
71459
71536
  })(BreakState || (BreakState = {}));
71460
71537
  ;
71461
71538
  class ScriptIterator {
@@ -71484,14 +71561,14 @@ class ScriptIterator {
71484
71561
  __classPrivateFieldSet(ScriptIterator, _a, {}, "f", _ScriptIterator_hFuncBP);
71485
71562
  this.isBreak = () => false;
71486
71563
  __classPrivateFieldGet(this, _ScriptIterator_hHook, "f").continue({});
71487
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.running, "f");
71564
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Running, "f");
71488
71565
  },
71489
71566
  restart: () => this.isBreak = () => false,
71490
71567
  add_break: o => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_regBreakPoint).call(this, o.fn, o.o),
71491
71568
  data_break: o => {
71492
- if (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f") !== BreakState.running)
71569
+ if (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f") !== BreakState.Running)
71493
71570
  return;
71494
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.wait, "f");
71571
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Wait, "f");
71495
71572
  this.main.setLoop(false, `変数 ${o.dataId}【${o.old_v}】→【${o.new_v}】データブレーク`);
71496
71573
  this.sys.callHook('stopOnDataBreakpoint', {});
71497
71574
  this.sys.send2Dbg('stopOnDataBreakpoint', {});
@@ -71507,7 +71584,7 @@ class ScriptIterator {
71507
71584
  if (__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_isIdxOverLast).call(this))
71508
71585
  return;
71509
71586
  __classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
71510
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.breaking, "f");
71587
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Breaking, "f");
71511
71588
  this.main.setLoop(true);
71512
71589
  this.main.resume();
71513
71590
  },
@@ -71518,9 +71595,9 @@ class ScriptIterator {
71518
71595
  const tkn = __classPrivateFieldGet(this, _ScriptIterator_script, "f").aToken[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get)];
71519
71596
  this.sys.callHook(`stopOnStep${__classPrivateFieldGet(this, _ScriptIterator_REGSTEPIN, "f").test(tkn) ? 'In' : ''}`, {});
71520
71597
  __classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
71521
- __classPrivateFieldSet(this, _ScriptIterator_breakState, __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.wait
71522
- ? BreakState.step
71523
- : BreakState.stepping, "f");
71598
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Wait
71599
+ ? BreakState.Step
71600
+ : BreakState.Stepping, "f");
71524
71601
  this.main.setLoop(true);
71525
71602
  this.main.resume();
71526
71603
  },
@@ -71533,12 +71610,12 @@ class ScriptIterator {
71533
71610
  __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepover).call(this, o);
71534
71611
  },
71535
71612
  pause: () => {
71536
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
71613
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
71537
71614
  this.main.setLoop(false, '一時停止');
71538
71615
  this.sys.send2Dbg('stopOnStep', {});
71539
71616
  },
71540
71617
  stopOnEntry: () => {
71541
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
71618
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
71542
71619
  this.main.setLoop(false, '一時停止');
71543
71620
  this.sys.send2Dbg('stopOnEntry', {});
71544
71621
  },
@@ -71548,7 +71625,7 @@ class ScriptIterator {
71548
71625
  .replace(__classPrivateFieldGet(ScriptIterator, _a, "f", _ScriptIterator_REG4CODE_FN), `$1/prj/$2/${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")}$3`));
71549
71626
  this.cnvPath4Dbg = (fn) => this.sys.pathBaseCnvSnPath4Dbg + fn.replace('/crypto_prj/', '/prj/');
71550
71627
  _ScriptIterator_csDepth_macro_esc.set(this, 0);
71551
- _ScriptIterator_breakState.set(this, BreakState.running);
71628
+ _ScriptIterator_breakState.set(this, BreakState.Running);
71552
71629
  this.isBreak = (_token) => false;
71553
71630
  _ScriptIterator_procDebugtag.set(this, (_tag_name) => { });
71554
71631
  _ScriptIterator_evtMng.set(this, void 0);
@@ -71879,12 +71956,12 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
71879
71956
  this.sys.callHook(`stopOnStep${out ? 'Out' : ''}`, {});
71880
71957
  __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - (out ? 1 : 0), "f");
71881
71958
  __classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
71882
- __classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.stepout : BreakState.stepouting, "f");
71959
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.StepOut : BreakState.StepOuting, "f");
71883
71960
  this.main.setLoop(true);
71884
71961
  this.main.resume();
71885
71962
  }, _ScriptIterator_idxDx4Dbg_get = function _ScriptIterator_idxDx4Dbg_get() {
71886
- return __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.break
71887
- || __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.step ? 1 : 0;
71963
+ return __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Break
71964
+ || __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Step ? 1 : 0;
71888
71965
  }, _ScriptIterator_isIdxOverLast = function _ScriptIterator_isIdxOverLast() {
71889
71966
  if (__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") < __classPrivateFieldGet(this, _ScriptIterator_script, "f").len)
71890
71967
  return false;
@@ -71893,34 +71970,34 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
71893
71970
  return true;
71894
71971
  }, _ScriptIterator_isBreak_base = function _ScriptIterator_isBreak_base(token) {
71895
71972
  switch (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f")) {
71896
- case BreakState.stepouting:
71973
+ case BreakState.StepOuting:
71897
71974
  __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
71898
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.stepout, "f");
71975
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.StepOut, "f");
71899
71976
  break;
71900
- case BreakState.stepout:
71977
+ case BreakState.StepOut:
71901
71978
  if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
71902
71979
  break;
71903
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
71980
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
71904
71981
  this.main.setLoop(false, 'ステップ実行');
71905
71982
  this.sys.send2Dbg('stopOnStep', {});
71906
71983
  return true;
71907
- case BreakState.stepping:
71984
+ case BreakState.Stepping:
71908
71985
  __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
71909
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
71986
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
71910
71987
  break;
71911
- case BreakState.step:
71988
+ case BreakState.Step:
71912
71989
  __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
71913
71990
  this.main.setLoop(false, 'ステップ実行');
71914
71991
  this.sys.send2Dbg('stopOnStep', {});
71915
71992
  return true;
71916
- case BreakState.breaking:
71993
+ case BreakState.Breaking:
71917
71994
  __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
71918
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.running, "f");
71995
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Running, "f");
71919
71996
  break;
71920
71997
  default:
71921
71998
  {
71922
71999
  if ((0, Grammar_1.tagToken2Name)(token) in __classPrivateFieldGet(ScriptIterator, _a, "f", _ScriptIterator_hFuncBP)) {
71923
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.break, "f");
72000
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Break, "f");
71924
72001
  this.main.setLoop(false, `関数 ${token} ブレーク`);
71925
72002
  this.sys.callHook('stopOnBreakpoint', {});
71926
72003
  this.sys.send2Dbg('stopOnBreakpoint', {});
@@ -71940,8 +72017,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
71940
72017
  }
71941
72018
  else if (('hitCondition' in o) && --o.hitCondition > 0)
71942
72019
  break;
71943
- const isBreak = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.running;
71944
- __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.break, "f");
72020
+ const isBreak = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Running;
72021
+ __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Break, "f");
71945
72022
  this.main.setLoop(false, isBreak ? ((o.condition ? '条件' : 'ヒットカウント') + 'ブレーク') : 'ステップ実行');
71946
72023
  const type = isBreak ? 'stopOnBreakpoint' : 'stopOnStep';
71947
72024
  this.sys.callHook(type, {});
@@ -71955,7 +72032,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
71955
72032
  if (o?.hitCondition)
71956
72033
  --o.hitCondition;
71957
72034
  }, _ScriptIterator_aStack = function _ScriptIterator_aStack() {
71958
- const idx_n = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.breaking ? 1 : 0;
72035
+ const idx_n = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Breaking ? 1 : 0;
71959
72036
  const tkn0 = __classPrivateFieldGet(this, _ScriptIterator_script, "f").aToken[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - 1 + idx_n];
71960
72037
  const fn0 = __classPrivateFieldGet(this, _ScriptIterator_cnvSnPath4Dbg, "f").call(this, __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"));
71961
72038
  const tag_name0 = (0, Grammar_1.tagToken2Name)(tkn0);
@@ -72016,7 +72093,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
72016
72093
  for (let i = len - 1; i >= 0; --i) {
72017
72094
  const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[i];
72018
72095
  const hMp = cs.csArg[':hMp'];
72019
- const from_macro_nm = hMp ? hMp[':タグ名'] : null;
72096
+ const from_macro_nm = hMp ? hMp[':タグ名'] : undefined;
72020
72097
  const call_nm = cs.csArg[':タグ名'] ?? '';
72021
72098
  const lc = __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_cnvIdx2lineCol).call(this, __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")[cs.fn], cs.idx);
72022
72099
  console.info(`${len - i}つ前のコール元 fn:${cs.fn} line:${lc.ln} col:${lc.col_s + 1}` + (from_macro_nm ? '([' + from_macro_nm + ']マクロ内)' : ' ') +
@@ -72750,12 +72827,11 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
72750
72827
  __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_stopse).call(this, hArg);
72751
72828
  return false;
72752
72829
  }
72753
- const ease = CmnTween_1.CmnTween.ease(hArg.ease);
72754
72830
  const repeat = (0, CmnLib_1.argChk_Num)(hArg, 'repeat', 1);
72755
72831
  oSb.twFade = new tween_js_1.Tween({ v: oSb.snd.volume })
72756
72832
  .to({ v: vol }, time)
72757
72833
  .delay(delay)
72758
- .easing(ease)
72834
+ .easing(CmnTween_1.CmnTween.ease(hArg.ease))
72759
72835
  .repeat(repeat === 0 ? Infinity : (repeat - 1))
72760
72836
  .yoyo((0, CmnLib_1.argChk_Boolean)(hArg, 'yoyo', false))
72761
72837
  .onUpdate(o => { if (oSb.playing())
@@ -73074,7 +73150,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
73074
73150
  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
73075
73151
  return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
73076
73152
  };
73077
- var _SysApp_hInfo, _SysApp_main;
73153
+ var _SysApp_instances, _SysApp_hInfo, _SysApp_main, _SysApp_dl_app;
73078
73154
  Object.defineProperty(exports, "__esModule", ({ value: true }));
73079
73155
  exports.SysApp = void 0;
73080
73156
  const SysNode_1 = __webpack_require__(/*! ./SysNode */ "./core/src/sn/SysNode.ts");
@@ -73086,6 +73162,7 @@ const { to_app } = window;
73086
73162
  class SysApp extends SysNode_1.SysNode {
73087
73163
  constructor(hPlg = {}, arg = { cur: 'prj/', crypto: false, dip: '' }) {
73088
73164
  super(hPlg, arg);
73165
+ _SysApp_instances.add(this);
73089
73166
  _SysApp_hInfo.set(this, {
73090
73167
  getAppPath: '',
73091
73168
  isPackaged: false,
@@ -73093,6 +73170,8 @@ class SysApp extends SysNode_1.SysNode {
73093
73170
  userData: '',
73094
73171
  getVersion: '',
73095
73172
  env: {},
73173
+ platform: '',
73174
+ arch: '',
73096
73175
  screenResolutionX: 0,
73097
73176
  screenResolutionY: 0,
73098
73177
  });
@@ -73233,19 +73312,31 @@ class SysApp extends SysNode_1.SysNode {
73233
73312
  if (CmnLib_1.CmnLib.debugLog)
73234
73313
  DebugMng_1.DebugMng.myTrace(`[update_check] url=${url}`, 'D');
73235
73314
  (async () => {
73236
- const res = await this.fetch(url + `latest${CmnLib_1.CmnLib.isMac ? '-mac' : ''}.yml`);
73237
- if (!res.ok) {
73315
+ let oIdx = {};
73316
+ let sYml = '';
73317
+ let netver = '';
73318
+ const resIdxJS = await this.fetch(url + '_index.json');
73319
+ if (resIdxJS.ok) {
73238
73320
  if (CmnLib_1.CmnLib.debugLog)
73239
- DebugMng_1.DebugMng.myTrace(`[update_check] [update_check] .ymlが見つかりません`);
73240
- return;
73321
+ DebugMng_1.DebugMng.myTrace(`[update_check] _index.jsonを取得しました`, 'D');
73322
+ oIdx = await resIdxJS.json();
73323
+ netver = oIdx.version;
73324
+ }
73325
+ else {
73326
+ const resYml = await this.fetch(url + `latest${CmnLib_1.CmnLib.isMac ? '-mac' : ''}.yml`);
73327
+ if (!resYml.ok) {
73328
+ if (CmnLib_1.CmnLib.debugLog)
73329
+ DebugMng_1.DebugMng.myTrace(`[update_check] [update_check] .ymlが見つかりません`);
73330
+ return;
73331
+ }
73332
+ if (CmnLib_1.CmnLib.debugLog)
73333
+ DebugMng_1.DebugMng.myTrace(`[update_check] .ymlを取得しました`, 'D');
73334
+ sYml = await resYml.text();
73335
+ const mv = /version: (.+)/.exec(sYml);
73336
+ if (!mv)
73337
+ throw `[update_check] .yml に version が見つかりません`;
73338
+ netver = mv[1];
73241
73339
  }
73242
- if (CmnLib_1.CmnLib.debugLog)
73243
- DebugMng_1.DebugMng.myTrace(`[update_check] .ymlを取得しました`, 'D');
73244
- const txtYml = await res.text();
73245
- const mv = /version: (.+)/.exec(txtYml);
73246
- if (!mv)
73247
- throw `[update_check] .yml に version が見つかりません`;
73248
- const netver = mv[1];
73249
73340
  const appver = __classPrivateFieldGet(this, _SysApp_hInfo, "f").getVersion;
73250
73341
  if (CmnLib_1.CmnLib.debugLog)
73251
73342
  DebugMng_1.DebugMng.myTrace(`[update_check] 現在ver=${appver} 新規ver=${netver}`, 'D');
@@ -73254,39 +73345,65 @@ class SysApp extends SysNode_1.SysNode {
73254
73345
  DebugMng_1.DebugMng.myTrace(`[update_check] バージョン更新なし`, 'I');
73255
73346
  return;
73256
73347
  }
73348
+ const mbo = {
73349
+ title: 'アプリ更新',
73350
+ icon: (__classPrivateFieldGet(this, _SysApp_hInfo, "f").getAppPath + '/app/icon.png'),
73351
+ buttons: ['OK', 'Cancel'],
73352
+ defaultId: 0,
73353
+ cancelId: 1,
73354
+ message: `アプリ【${this.cfg.oCfg.book.title}】に更新があります。\nダウンロードしますか?`,
73355
+ detail: `現在 NOW ver ${appver}\n新規 NEW ver ${netver}`,
73356
+ };
73357
+ const di = await to_app.showMessageBox(mbo);
73358
+ if (di.response > 0)
73359
+ return;
73257
73360
  if (CmnLib_1.CmnLib.debugLog)
73258
73361
  DebugMng_1.DebugMng.myTrace(`[update_check] アプリダウンロード開始`, 'D');
73259
- const mp = /path: (.+)/.exec(txtYml);
73260
- if (!mp)
73261
- throw `[update_check] .yml に path が見つかりません`;
73262
- const path = mp[1];
73263
- if (CmnLib_1.CmnLib.debugLog)
73264
- DebugMng_1.DebugMng.myTrace(`[update_check] path=${path}`, 'D');
73265
- const mc = /sha512: (.+)/.exec(txtYml);
73266
- if (!mc)
73267
- throw `[update_check] .yml sha512 が見つかりません`;
73268
- const sha = mc[1];
73269
- if (CmnLib_1.CmnLib.debugLog)
73270
- DebugMng_1.DebugMng.myTrace(`[update_check] sha=${sha}=`, 'D');
73271
- const res_dl = await this.fetch(url + path);
73272
- if (!res_dl.ok) {
73362
+ if (resIdxJS.ok) {
73363
+ const key = __classPrivateFieldGet(this, _SysApp_hInfo, "f").platform + '_' + __classPrivateFieldGet(this, _SysApp_hInfo, "f").arch;
73364
+ let pa = oIdx[key];
73365
+ if (pa)
73366
+ await __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, url, key + '-' + pa.cn, pa.path);
73367
+ else {
73368
+ let d = '';
73369
+ const aApp = [];
73370
+ const regOldSameKey = new RegExp('^' + __classPrivateFieldGet(this, _SysApp_hInfo, "f").platform + '_');
73371
+ for (const k in oIdx) {
73372
+ if (!regOldSameKey.test(k))
73373
+ continue;
73374
+ const ap = oIdx[k];
73375
+ d += '\n- ' + ap.path;
73376
+ aApp.push({ url, urlApp: k + '-' + ap.cn, fn: String(ap.path) });
73377
+ }
73378
+ mbo.message = `CPU = ${__classPrivateFieldGet(this, _SysApp_hInfo, "f").arch}\nに対応するファイルが見つかりません。同じOSのファイルをすべてダウンロードしますか?`;
73379
+ mbo.detail = aApp.length + ' 個ファイルがあります' + d;
73380
+ const di = await to_app.showMessageBox(mbo);
73381
+ if (di.response > 0)
73382
+ return;
73383
+ await Promise.all(aApp.map(ap => __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, ap.url, ap.urlApp, ap.fn)));
73384
+ }
73385
+ }
73386
+ else {
73387
+ const mp = /path: (.+)/.exec(sYml);
73388
+ if (!mp)
73389
+ throw `[update_check] path が見つかりません`;
73390
+ const path = mp[1];
73273
73391
  if (CmnLib_1.CmnLib.debugLog)
73274
- DebugMng_1.DebugMng.myTrace(`[update_check] アプリファイルが見つかりません url=${url + path}`);
73275
- return;
73392
+ DebugMng_1.DebugMng.myTrace(`[update_check] path=${path}`, 'D');
73393
+ const mc = /sha512: (.+)/.exec(sYml);
73394
+ if (!mc)
73395
+ throw `[update_check] sha512 が見つかりません`;
73396
+ const sha = mc[1];
73397
+ if (CmnLib_1.CmnLib.debugLog)
73398
+ DebugMng_1.DebugMng.myTrace(`[update_check] sha=${sha}=`, 'D');
73399
+ const mm = /(.+)(\.\w+)/.exec(path) ?? ['', '', ''];
73400
+ await __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, url, mm[1] + '-' + __classPrivateFieldGet(this, _SysApp_hInfo, "f").arch + mm[2], path);
73276
73401
  }
73277
- const pathDL = __classPrivateFieldGet(this, _SysApp_hInfo, "f").downloads + '/' + path;
73278
- if (CmnLib_1.CmnLib.debugLog)
73279
- DebugMng_1.DebugMng.myTrace(`[update_check] pathDL=${pathDL}`, 'D');
73280
- const b = await res_dl.blob();
73281
- const url2 = URL.createObjectURL(b);
73282
- const a = document.createElement('a');
73283
- document.body.appendChild(a);
73284
- a.download = path;
73285
- a.href = url2;
73286
- a.click();
73287
- a.remove();
73288
73402
  if (CmnLib_1.CmnLib.debugLog)
73289
73403
  DebugMng_1.DebugMng.myTrace(`アプリファイルを保存しました`, 'D');
73404
+ mbo.buttons.pop();
73405
+ mbo.message = `アプリ【${this.cfg.oCfg.book.title}】の更新パッケージを\nダウンロードしました`;
73406
+ to_app.showMessageBox(mbo);
73290
73407
  })();
73291
73408
  return false;
73292
73409
  };
@@ -73369,7 +73486,21 @@ class SysApp extends SysNode_1.SysNode {
73369
73486
  titleSub(title) { to_app.win_setTitle(title); }
73370
73487
  }
73371
73488
  exports.SysApp = SysApp;
73372
- _SysApp_hInfo = new WeakMap(), _SysApp_main = new WeakMap();
73489
+ _SysApp_hInfo = new WeakMap(), _SysApp_main = new WeakMap(), _SysApp_instances = new WeakSet(), _SysApp_dl_app = async function _SysApp_dl_app(url, urlApp, fn) {
73490
+ if (CmnLib_1.CmnLib.debugLog)
73491
+ DebugMng_1.DebugMng.myTrace(`[update_check] アプリファイルDL試行... url=${url + urlApp}`, 'D');
73492
+ const res = await this.fetch(url + urlApp);
73493
+ if (!res.ok) {
73494
+ if (CmnLib_1.CmnLib.debugLog)
73495
+ DebugMng_1.DebugMng.myTrace(`[update_check] アプリファイルが見つかりません url=${url + fn}`);
73496
+ return;
73497
+ }
73498
+ const pathDL = __classPrivateFieldGet(this, _SysApp_hInfo, "f").downloads + '/' + fn;
73499
+ if (CmnLib_1.CmnLib.debugLog)
73500
+ DebugMng_1.DebugMng.myTrace(`[update_check] pathDL=${pathDL}`, 'D');
73501
+ const ab = await res.arrayBuffer();
73502
+ await this.writeFileSync(pathDL, new DataView(ab));
73503
+ };
73373
73504
 
73374
73505
 
73375
73506
  /***/ }),
@@ -73408,7 +73539,7 @@ class SysBase {
73408
73539
  this.reso4frame = 1;
73409
73540
  this.data = { sys: {}, mark: {}, kidoku: {} };
73410
73541
  this.extPort = 3776;
73411
- _SysBase_sk.set(this, null);
73542
+ _SysBase_sk.set(this, undefined);
73412
73543
  _SysBase_hHook.set(this, {
73413
73544
  auth: o => {
73414
73545
  if (o.t !== this.cfg.oCfg.debuger_token) {
@@ -73614,7 +73745,7 @@ class SysBase {
73614
73745
  }
73615
73746
  end() {
73616
73747
  __classPrivateFieldGet(this, _SysBase_sk, "f")?.disconnect();
73617
- __classPrivateFieldSet(this, _SysBase_sk, null, "f");
73748
+ __classPrivateFieldSet(this, _SysBase_sk, undefined, "f");
73618
73749
  }
73619
73750
  toast(nm) {
73620
73751
  const cvs = document.getElementById(CmnLib_1.CmnLib.SN_ID);
@@ -73781,7 +73912,7 @@ class TxtLayer extends Layer_1.Layer {
73781
73912
  _TxtLayer_b_color.set(this, 0x000000);
73782
73913
  _TxtLayer_b_alpha.set(this, 0);
73783
73914
  _TxtLayer_b_alpha_isfixed.set(this, false);
73784
- _TxtLayer_b_do.set(this, null);
73915
+ _TxtLayer_b_do.set(this, undefined);
73785
73916
  _TxtLayer_b_pic.set(this, '');
73786
73917
  _TxtLayer_txs.set(this, new TxtStage_1.TxtStage(this.spLay, () => this.canFocus()));
73787
73918
  _TxtLayer_rbSpl.set(this, new RubySpliter_1.RubySpliter);
@@ -74037,7 +74168,7 @@ ${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}`;
74037
74168
  _TxtLayer_cumDelay.set(this, 0);
74038
74169
  _TxtLayer_firstCh.set(this, true);
74039
74170
  _TxtLayer_aSpan.set(this, []);
74040
- _TxtLayer_aSpan_bk.set(this, null);
74171
+ _TxtLayer_aSpan_bk.set(this, undefined);
74041
74172
  _TxtLayer_aSpan_link.set(this, '');
74042
74173
  _TxtLayer_hSpanBk.set(this, {
74043
74174
  ch_in_style: '',
@@ -74061,8 +74192,8 @@ ${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}`;
74061
74192
  this.record = () => Object.assign(super.record(), {
74062
74193
  enabled: this.enabled,
74063
74194
  r_align: __classPrivateFieldGet(this, _TxtLayer_r_align, "f"),
74064
- b_do: (__classPrivateFieldGet(this, _TxtLayer_b_do, "f") === null)
74065
- ? null
74195
+ b_do: (__classPrivateFieldGet(this, _TxtLayer_b_do, "f") === undefined)
74196
+ ? undefined
74066
74197
  : (__classPrivateFieldGet(this, _TxtLayer_b_do, "f") instanceof pixi_js_1.Sprite ? 'Sprite' : 'Graphics'),
74067
74198
  b_pic: __classPrivateFieldGet(this, _TxtLayer_b_pic, "f"),
74068
74199
  b_color: __classPrivateFieldGet(this, _TxtLayer_b_color, "f"),
@@ -74150,7 +74281,7 @@ ${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}`;
74150
74281
  destroy() {
74151
74282
  if (__classPrivateFieldGet(this, _TxtLayer_b_do, "f")) {
74152
74283
  this.spLay.removeChild(__classPrivateFieldGet(this, _TxtLayer_b_do, "f")).destroy();
74153
- __classPrivateFieldSet(this, _TxtLayer_b_do, null, "f");
74284
+ __classPrivateFieldSet(this, _TxtLayer_b_do, undefined, "f");
74154
74285
  }
74155
74286
  this.clearText();
74156
74287
  __classPrivateFieldGet(this, _TxtLayer_txs, "f").destroy();
@@ -74247,7 +74378,7 @@ ${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}`;
74247
74378
  __classPrivateFieldSet(this, _TxtLayer_cumDelay, 0, "f");
74248
74379
  __classPrivateFieldSet(this, _TxtLayer_firstCh, true, "f");
74249
74380
  __classPrivateFieldSet(this, _TxtLayer_aSpan, [], "f");
74250
- __classPrivateFieldSet(this, _TxtLayer_aSpan_bk, null, "f");
74381
+ __classPrivateFieldSet(this, _TxtLayer_aSpan_bk, undefined, "f");
74251
74382
  __classPrivateFieldSet(this, _TxtLayer_page_text, '', "f");
74252
74383
  __classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_recText).call(TxtLayer, '', true);
74253
74384
  }
@@ -74538,7 +74669,7 @@ _a = TxtLayer, _TxtLayer_b_color = new WeakMap(), _TxtLayer_b_alpha = new WeakMa
74538
74669
  return;
74539
74670
  __classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f").push(__classPrivateFieldGet(this, _TxtLayer_aSpan, "f"), '</span>');
74540
74671
  __classPrivateFieldSet(this, _TxtLayer_aSpan, Array.prototype.concat.apply([], __classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")), "f");
74541
- __classPrivateFieldSet(this, _TxtLayer_aSpan_bk, null, "f");
74672
+ __classPrivateFieldSet(this, _TxtLayer_aSpan_bk, undefined, "f");
74542
74673
  __classPrivateFieldGet(this, _TxtLayer_instances, "m", _TxtLayer_set_ch_in).call(this, { in_style: __classPrivateFieldGet(this, _TxtLayer_hSpanBk, "f").ch_in_style });
74543
74674
  __classPrivateFieldGet(this, _TxtLayer_instances, "m", _TxtLayer_set_ch_out).call(this, { out_style: __classPrivateFieldGet(this, _TxtLayer_hSpanBk, "f").ch_out_style });
74544
74675
  __classPrivateFieldSet(this, _TxtLayer_r_align, __classPrivateFieldGet(this, _TxtLayer_hSpanBk, "f").r_align, "f");
@@ -74614,18 +74745,18 @@ class TxtStage extends pixi_js_1.Container {
74614
74745
  _TxtStage_isTategaki.set(this, false);
74615
74746
  _TxtStage_padTx4x.set(this, 0);
74616
74747
  _TxtStage_padTx4y.set(this, 0);
74617
- _TxtStage_ch_filter.set(this, void 0);
74748
+ _TxtStage_ch_filter.set(this, undefined);
74618
74749
  _TxtStage_aSpTw.set(this, []);
74619
74750
  _TxtStage_aRect.set(this, []);
74620
74751
  _TxtStage_lenHtmTxt.set(this, 0);
74621
- _TxtStage_beforeHTMLElm.set(this, null);
74752
+ _TxtStage_beforeHTMLElm.set(this, undefined);
74622
74753
  _TxtStage_REGDS.set(this, /animation\-duration: (?<ms>\d+)ms;/);
74623
74754
  _TxtStage_fncEndChIn.set(this, () => { });
74624
74755
  _TxtStage_isChInIng.set(this, false);
74625
74756
  _TxtStage_lh_half.set(this, 0);
74626
74757
  _TxtStage_fi_easing.set(this, 'Quadratic.Out');
74627
74758
  _TxtStage_fo_easing.set(this, 'Quadratic.Out');
74628
- _TxtStage_sss.set(this, null);
74759
+ _TxtStage_sss.set(this, undefined);
74629
74760
  __classPrivateFieldGet(this, _TxtStage_htmTxt, "f").classList.add('sn_tx');
74630
74761
  __classPrivateFieldGet(this, _TxtStage_htmTxt, "f").style.position = 'absolute';
74631
74762
  __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cvs).parentElement.appendChild(__classPrivateFieldGet(this, _TxtStage_htmTxt, "f"));
@@ -74914,7 +75045,7 @@ class TxtStage extends pixi_js_1.Container {
74914
75045
  __classPrivateFieldGet(this, _TxtStage_fncEndChIn, "f").call(this);
74915
75046
  return;
74916
75047
  }
74917
- let le = null;
75048
+ let le = undefined;
74918
75049
  for (let i = len_chs - 1; i >= 0; --i) {
74919
75050
  const v = chs[i];
74920
75051
  if (v.className === 'sn_ch')
@@ -75086,7 +75217,7 @@ class TxtStage extends pixi_js_1.Container {
75086
75217
  snapshot_end() {
75087
75218
  if (__classPrivateFieldGet(this, _TxtStage_sss, "f")) {
75088
75219
  __classPrivateFieldGet(this, _TxtStage_cntTxt, "f").removeChild(__classPrivateFieldGet(this, _TxtStage_sss, "f"));
75089
- __classPrivateFieldSet(this, _TxtStage_sss, null, "f");
75220
+ __classPrivateFieldSet(this, _TxtStage_sss, undefined, "f");
75090
75221
  }
75091
75222
  }
75092
75223
  makeDesignCast(gdc) {
@@ -75393,7 +75524,7 @@ _a = TxtStage, _TxtStage_htmTxt = new WeakMap(), _TxtStage_cntTxt = new WeakMap(
75393
75524
  .easing(ease)
75394
75525
  .delay((add.wait ?? 0) + (arg.delay ?? 0))
75395
75526
  .onComplete(() => {
75396
- st.tw = null;
75527
+ st.tw = undefined;
75397
75528
  })
75398
75529
  .start(),
75399
75530
  };