@famibee/skynovel 1.25.8 → 1.25.9
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/.github/workflows/codeql-analysis.yml +0 -5
- package/CHANGELOG.md +10 -0
- package/app.js +38 -8
- package/core/lib/sn/GrpLayer.d.ts +1 -0
- package/core/lib/sn/GrpLayer.d.ts.map +1 -1
- package/core/lib/sn/Layer.d.ts +1 -0
- package/core/lib/sn/Layer.d.ts.map +1 -1
- package/core/lib/sn/LayerMng.d.ts.map +1 -1
- package/package.json +1 -1
- package/web.js +38 -8
|
@@ -36,11 +36,6 @@ jobs:
|
|
|
36
36
|
# a pull request then we can checkout the head.
|
|
37
37
|
fetch-depth: 2
|
|
38
38
|
|
|
39
|
-
# If this run was triggered by a pull request event, then checkout
|
|
40
|
-
# the head of the pull request instead of the merge commit.
|
|
41
|
-
- run: git checkout HEAD^2
|
|
42
|
-
if: ${{ github.event_name == 'pull_request' }}
|
|
43
|
-
|
|
44
39
|
# Initializes the CodeQL tools for scanning.
|
|
45
40
|
- name: Initialize CodeQL
|
|
46
41
|
uses: github/codeql-action/init@v1
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
## [1.25.9](https://github.com/famibee/SKYNovel/compare/v1.25.8...v1.25.9) (2022-01-09)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* 動画やアニメスプライトを含まないレイヤのみのページの[trans]は処理を削減するように ([1e76a6f](https://github.com/famibee/SKYNovel/commit/1e76a6f900e3305abd292fcc4481323ee6978984))
|
|
7
|
+
|
|
8
|
+
- fix: 動画やアニメスプライトを含まないレイヤのみのページの[trans]は処理を削減するように
|
|
9
|
+
|
|
10
|
+
|
|
1
11
|
## [1.25.8](https://github.com/famibee/SKYNovel/compare/v1.25.7...v1.25.8) (2022-01-08)
|
|
2
12
|
|
|
3
13
|
|
package/app.js
CHANGED
|
@@ -69338,6 +69338,12 @@ class GrpLayer extends Layer_1.Layer {
|
|
|
69338
69338
|
return false;
|
|
69339
69339
|
}
|
|
69340
69340
|
static clearFace2Name() { __classPrivateFieldSet(GrpLayer, _a, {}, "f", _GrpLayer_hFace); }
|
|
69341
|
+
get containMovement() {
|
|
69342
|
+
if (__classPrivateFieldGet(this, _GrpLayer_csvFn, "f") === '')
|
|
69343
|
+
return false;
|
|
69344
|
+
const c = this.spLay.children;
|
|
69345
|
+
return __classPrivateFieldGet(this, _GrpLayer_csvFn, "f").split(',').some((fn, i) => c[i] instanceof pixi_js_1.AnimatedSprite || GrpLayer.hFn2VElm[fn]);
|
|
69346
|
+
}
|
|
69341
69347
|
clearLay(hArg) {
|
|
69342
69348
|
super.clearLay(hArg);
|
|
69343
69349
|
for (const c of this.spLay.removeChildren())
|
|
@@ -69553,6 +69559,7 @@ class Layer {
|
|
|
69553
69559
|
return bmn;
|
|
69554
69560
|
throw `${bm_name} はサポートされない blendmode です`;
|
|
69555
69561
|
}
|
|
69562
|
+
get containMovement() { return false; }
|
|
69556
69563
|
clearLay(hArg) {
|
|
69557
69564
|
this.spLay.alpha = 1;
|
|
69558
69565
|
this.spLay.blendMode = pixi_js_1.BLEND_MODES.NORMAL;
|
|
@@ -70298,22 +70305,45 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
|
|
|
70298
70305
|
const ease = CmnTween_1.CmnTween.ease(hArg.ease);
|
|
70299
70306
|
__classPrivateFieldSet(this, _LayerMng_aBackTransAfter, [], "f");
|
|
70300
70307
|
const hTarget = {};
|
|
70301
|
-
|
|
70302
|
-
__classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this).forEach(lay_nm =>
|
|
70308
|
+
const aFore = [];
|
|
70309
|
+
__classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this, hArg.layer).forEach(lay_nm => {
|
|
70310
|
+
hTarget[lay_nm] = true;
|
|
70311
|
+
aFore.push(__classPrivateFieldGet(this, _LayerMng_hPages, "f")[lay_nm].fore);
|
|
70312
|
+
});
|
|
70313
|
+
const aBack = [];
|
|
70314
|
+
__classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this).forEach(lay_nm => {
|
|
70315
|
+
const lay = __classPrivateFieldGet(this, _LayerMng_hPages, "f")[lay_nm][hTarget[lay_nm] ? 'back' : 'fore'];
|
|
70316
|
+
__classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").push(lay.spLay);
|
|
70317
|
+
aBack.push(lay);
|
|
70318
|
+
});
|
|
70303
70319
|
__classPrivateFieldGet(this, _LayerMng_rtTransBack, "f").resize(CmnLib_1.CmnLib.stageW, CmnLib_1.CmnLib.stageH);
|
|
70304
70320
|
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_back, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f") });
|
|
70305
|
-
|
|
70306
|
-
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
|
|
70307
|
-
const fncRender = () => {
|
|
70321
|
+
let fncRenderBack = () => {
|
|
70308
70322
|
__classPrivateFieldGet(this, _LayerMng_back, "f").visible = true;
|
|
70309
|
-
__classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").forEach(
|
|
70310
|
-
this.appPixi.renderer.render(
|
|
70323
|
+
__classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").forEach(spLay => {
|
|
70324
|
+
this.appPixi.renderer.render(spLay, { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f"), clear: false });
|
|
70311
70325
|
});
|
|
70312
70326
|
__classPrivateFieldGet(this, _LayerMng_back, "f").visible = false;
|
|
70313
|
-
|
|
70327
|
+
};
|
|
70328
|
+
if (!aBack.some(lay => lay.containMovement)) {
|
|
70329
|
+
fncRenderBack();
|
|
70330
|
+
fncRenderBack = () => { };
|
|
70331
|
+
}
|
|
70332
|
+
__classPrivateFieldGet(this, _LayerMng_rtTransFore, "f").resize(CmnLib_1.CmnLib.stageW, CmnLib_1.CmnLib.stageH);
|
|
70333
|
+
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
|
|
70334
|
+
let fncRenderFore = () => {
|
|
70314
70335
|
__classPrivateFieldGet(this, _LayerMng_fore, "f").visible = true;
|
|
70315
70336
|
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
|
|
70316
70337
|
__classPrivateFieldGet(this, _LayerMng_fore, "f").visible = false;
|
|
70338
|
+
};
|
|
70339
|
+
if (!aFore.some(lay => lay.containMovement)) {
|
|
70340
|
+
fncRenderFore();
|
|
70341
|
+
fncRenderFore = () => { };
|
|
70342
|
+
}
|
|
70343
|
+
const fncRender = () => {
|
|
70344
|
+
fncRenderBack();
|
|
70345
|
+
__classPrivateFieldGet(this, _LayerMng_spTransBack, "f").visible = true;
|
|
70346
|
+
fncRenderFore();
|
|
70317
70347
|
__classPrivateFieldGet(this, _LayerMng_spTransFore, "f").visible = true;
|
|
70318
70348
|
};
|
|
70319
70349
|
__classPrivateFieldGet(this, _LayerMng_spTransFore, "f").alpha = 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GrpLayer.d.ts","sourceRoot":"","sources":["../../src/sn/GrpLayer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAc,OAAO,EAAoC,MAAM,UAAU,CAAC;AACjF,OAAO,EAAC,IAAI,EAAE,KAAK,EAAc,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAA2D,MAAM,SAAS,CAAC;AAE1H,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAG3C,MAAM,WAAW,WAAW;IAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAAE;AAUpD,UAAU,UAAU;IACnB,IAAI,EAAG,OAAO,EAAE,CAAC;IACjB,IAAI,EAAG;QACN,cAAc,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACF;AAED,qBAAa,QAAS,SAAQ,KAAK;;IAUlC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI;IAgB3E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO;IAChC,MAAM,CAAC,OAAO;;IAiBd,OAAO,CAAC,KAAK;IAKb,MAAM,CAAC,aAAa,EAAG;QAAC,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAA;KAAC,CAAM;IACzD,SAAkB,GAAG,SAAU,IAAI,aAEhC;IACH,OAAO,CAAC,MAAM;IAkDd,IAAa,KAAK,WAAuB;IACzC,IAAa,MAAM,WAAwB;IAG3C,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,GAAE,CAAC,MAAM,EAAE,OAAO,KAAI,IAAc,GAAG,OAAO;IAyL7I,MAAM,CAAC,QAAQ,EAAG;QAAC,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAC,CAAM;IAC1D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI;IAwBpB,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAI,IAAI;IAuC/F,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IASxB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAepC,MAAM,CAAC,cAAc,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"GrpLayer.d.ts","sourceRoot":"","sources":["../../src/sn/GrpLayer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAc,OAAO,EAAoC,MAAM,UAAU,CAAC;AACjF,OAAO,EAAC,IAAI,EAAE,KAAK,EAAc,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAA2D,MAAM,SAAS,CAAC;AAE1H,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAG3C,MAAM,WAAW,WAAW;IAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAAE;AAUpD,UAAU,UAAU;IACnB,IAAI,EAAG,OAAO,EAAE,CAAC;IACjB,IAAI,EAAG;QACN,cAAc,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACF;AAED,qBAAa,QAAS,SAAQ,KAAK;;IAUlC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI;IAgB3E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO;IAChC,MAAM,CAAC,OAAO;;IAiBd,OAAO,CAAC,KAAK;IAKb,MAAM,CAAC,aAAa,EAAG;QAAC,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAA;KAAC,CAAM;IACzD,SAAkB,GAAG,SAAU,IAAI,aAEhC;IACH,OAAO,CAAC,MAAM;IAkDd,IAAa,KAAK,WAAuB;IACzC,IAAa,MAAM,WAAwB;IAG3C,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,GAAE,CAAC,MAAM,EAAE,OAAO,KAAI,IAAc,GAAG,OAAO;IAyL7I,MAAM,CAAC,QAAQ,EAAG;QAAC,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAC,CAAM;IAC1D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI;IAwBpB,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAI,IAAI;IAuC/F,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IASxB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAepC,MAAM,CAAC,cAAc,IAAI,IAAI;IAG7B,IAAa,eAAe,IAAI,OAAO,CAOtC;IAEQ,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAOnC,SAAkB,MAAM;;;;;;;;;;;;;;;;;MAIrB;IACM,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI;IAgBhD,cAAc,CAAC,GAAG,EAAE,eAAe;IAMnC,SAAS;IAET,cAAc;IAGvB,SAAkB,IAAI,eAAiD;CAEvE"}
|
package/core/lib/sn/Layer.d.ts
CHANGED
|
@@ -26,6 +26,7 @@ export declare class Layer {
|
|
|
26
26
|
lay(hArg: HArg): boolean;
|
|
27
27
|
static setBlendmode(cnt: Container, hArg: HArg): void;
|
|
28
28
|
static getBlendmodeNum(bm_name: string): number;
|
|
29
|
+
get containMovement(): boolean;
|
|
29
30
|
clearLay(hArg: HArg): void;
|
|
30
31
|
copy(fromLayer: Layer, aPrm: Promise<void>[]): void;
|
|
31
32
|
record(): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../src/sn/Layer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAW,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEjG,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAE3C,qBAAa,KAAK;;IACd,OAAO,SAAM;IAChB,SAAS,CAAC,KAAK,SAAM;IACrB,IAAI,IAAI,CAAC,EAAE,QAAA,EAAoB;IAC/B,IAAI,IAAI,WAAuB;IAC/B,QAAQ,CAAC,KAAK,SAA6B;IAG3C,IAAI,KAAK,WAA4B;IACrC,IAAI,KAAK,CAAC,CAAC,QAAA,EAAwB;IACnC,IAAI,MAAM,WAA6B;IACvC,IAAI,QAAQ,WAA4B;IACxC,IAAI,QAAQ,CAAC,CAAC,QAAA,EAAwB;IACtC,IAAI,OAAO,WAA8B;IACzC,IAAI,OAAO,CAAC,CAAC,QAAA,EAA0B;IACvC,IAAI,OAAO,WAA8B;IACzC,IAAI,OAAO,CAAC,CAAC,QAAA,EAA0B;IACvC,IAAI,KAAK,WAA4B;IACrC,IAAI,CAAC,WAAwB;IAC7B,IAAI,CAAC,CAAC,CAAC,QAAA,EAAoB;IAC3B,IAAI,CAAC,WAAwB;IAC7B,IAAI,CAAC,CAAC,CAAC,QAAA,EAAoB;IAE3B,OAAO;IAEP,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAwBxB,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI;IAa9C,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IA8C/C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAU1B,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI;IAKnD,MAAM;;;;;;;;;;;;;;IAcN,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI;IAcjD,QAAQ,CAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,EAAE,MAAK,IAAI;IAI7C,YAAY;IAEZ,cAAc,CAAC,IAAI,EAAE,eAAe;IACpC,sBAAsB,CAAC,IAAI,EAAE,eAAe;IAE5C,cAAc;IACd,sBAAsB;IAEtB,SAAS;IACT,iBAAiB;IAEjB,IAAI,IAAI,MAAM;IAQd,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,UAAQ,EAAE,QAAQ,UAAQ,GAAG,IAAI;IA6EpG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI;IAwB7E,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI;CAM5C"}
|
|
1
|
+
{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../src/sn/Layer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAW,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEjG,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAE3C,qBAAa,KAAK;;IACd,OAAO,SAAM;IAChB,SAAS,CAAC,KAAK,SAAM;IACrB,IAAI,IAAI,CAAC,EAAE,QAAA,EAAoB;IAC/B,IAAI,IAAI,WAAuB;IAC/B,QAAQ,CAAC,KAAK,SAA6B;IAG3C,IAAI,KAAK,WAA4B;IACrC,IAAI,KAAK,CAAC,CAAC,QAAA,EAAwB;IACnC,IAAI,MAAM,WAA6B;IACvC,IAAI,QAAQ,WAA4B;IACxC,IAAI,QAAQ,CAAC,CAAC,QAAA,EAAwB;IACtC,IAAI,OAAO,WAA8B;IACzC,IAAI,OAAO,CAAC,CAAC,QAAA,EAA0B;IACvC,IAAI,OAAO,WAA8B;IACzC,IAAI,OAAO,CAAC,CAAC,QAAA,EAA0B;IACvC,IAAI,KAAK,WAA4B;IACrC,IAAI,CAAC,WAAwB;IAC7B,IAAI,CAAC,CAAC,CAAC,QAAA,EAAoB;IAC3B,IAAI,CAAC,WAAwB;IAC7B,IAAI,CAAC,CAAC,CAAC,QAAA,EAAoB;IAE3B,OAAO;IAEP,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAwBxB,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI;IAa9C,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IA8C/C,IAAI,eAAe,IAAI,OAAO,CAAgB;IAE9C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAU1B,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI;IAKnD,MAAM;;;;;;;;;;;;;;IAcN,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI;IAcjD,QAAQ,CAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,EAAE,MAAK,IAAI;IAI7C,YAAY;IAEZ,cAAc,CAAC,IAAI,EAAE,eAAe;IACpC,sBAAsB,CAAC,IAAI,EAAE,eAAe;IAE5C,cAAc;IACd,sBAAsB;IAEtB,SAAS;IACT,iBAAiB;IAEjB,IAAI,IAAI,MAAM;IAQd,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,UAAQ,EAAE,QAAQ,UAAQ,GAAG,IAAI;IA6EpG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI;IAwB7E,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI;CAM5C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LayerMng.d.ts","sourceRoot":"","sources":["../../src/sn/LayerMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAA2B,OAAO,EAAsF,MAAM,UAAU,CAAC;AAEhJ,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAQ,OAAO,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"LayerMng.d.ts","sourceRoot":"","sources":["../../src/sn/LayerMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAA2B,OAAO,EAAsF,MAAM,UAAU,CAAC;AAEhJ,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAQ,OAAO,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAY,WAAW,EAAsF,MAAM,SAAS,CAAC;AAEpI,MAAM,WAAW,eAAe;IAAG,CAAC,GAAG,EAAG,UAAU,GAAG,IAAI,CAAC;CAAE;AAE9D,MAAM,WAAW,KAAK;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;CAAC;AAE9C,qBAAa,QAAS,YAAW,OAAO;;IAO3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAe,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAW,QAAQ,CAAC,MAAM,EAAE,QAAQ;IAAE,QAAQ,CAAC,SAAS,EAAE,aAAa;IAAE,QAAQ,CAAC,MAAM,EAAE,WAAW;gBAAnT,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAmB,OAAO,EAAE,WAAW,EAAmB,GAAG,EAAE,SAAS,EAAmB,IAAI,EAAE,KAAK,EAAmB,MAAM,EAAE,cAAc,EAAmB,GAAG,EAAE,OAAO,EAAW,MAAM,EAAE,QAAQ,EAAW,SAAS,EAAE,aAAa,EAAW,MAAM,EAAE,WAAW;IA0JhV,OAAO,CAAC,eAAe;IAoCvB,cAAc,OAAQ,MAAM,aAAoC;IAGhE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,SAAM;IAgBtC,SAAS,CAAC,MAAM,EAAE,OAAO;IAMzB,cAAc;IACd,OAAO;IAYP,SAAS;IAgBT,KAAK,aAAW;IAChB,SAAS,aAAW;IACpB,SAAS,aAAW;IACpB,UAAU;IAOV,WAAW;IA4kBX,MAAM,KAAK,UAAU,WAAiC;IACtD,MAAM,KAAK,UAAU,CAAC,CAAC,QAAA,EAA6B;IAiCpD,eAAe,IAAI,IAAI;IAwBvB,IAAI,wBAAwB,IAAI,QAAQ,CAGvC;IACD,IAAI,iBAAiB,IAAI,QAAQ,GAAG,SAAS,CAI5C;IAeD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,UAAQ;IA8JtC,MAAM,IAAI,GAAG;IAYb,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAK,IAAI,GAAG,IAAI;CAmCnD"}
|
package/package.json
CHANGED
package/web.js
CHANGED
|
@@ -70686,6 +70686,12 @@ class GrpLayer extends Layer_1.Layer {
|
|
|
70686
70686
|
return false;
|
|
70687
70687
|
}
|
|
70688
70688
|
static clearFace2Name() { __classPrivateFieldSet(GrpLayer, _a, {}, "f", _GrpLayer_hFace); }
|
|
70689
|
+
get containMovement() {
|
|
70690
|
+
if (__classPrivateFieldGet(this, _GrpLayer_csvFn, "f") === '')
|
|
70691
|
+
return false;
|
|
70692
|
+
const c = this.spLay.children;
|
|
70693
|
+
return __classPrivateFieldGet(this, _GrpLayer_csvFn, "f").split(',').some((fn, i) => c[i] instanceof pixi_js_1.AnimatedSprite || GrpLayer.hFn2VElm[fn]);
|
|
70694
|
+
}
|
|
70689
70695
|
clearLay(hArg) {
|
|
70690
70696
|
super.clearLay(hArg);
|
|
70691
70697
|
for (const c of this.spLay.removeChildren())
|
|
@@ -70901,6 +70907,7 @@ class Layer {
|
|
|
70901
70907
|
return bmn;
|
|
70902
70908
|
throw `${bm_name} はサポートされない blendmode です`;
|
|
70903
70909
|
}
|
|
70910
|
+
get containMovement() { return false; }
|
|
70904
70911
|
clearLay(hArg) {
|
|
70905
70912
|
this.spLay.alpha = 1;
|
|
70906
70913
|
this.spLay.blendMode = pixi_js_1.BLEND_MODES.NORMAL;
|
|
@@ -71646,22 +71653,45 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
|
|
|
71646
71653
|
const ease = CmnTween_1.CmnTween.ease(hArg.ease);
|
|
71647
71654
|
__classPrivateFieldSet(this, _LayerMng_aBackTransAfter, [], "f");
|
|
71648
71655
|
const hTarget = {};
|
|
71649
|
-
|
|
71650
|
-
__classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this).forEach(lay_nm =>
|
|
71656
|
+
const aFore = [];
|
|
71657
|
+
__classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this, hArg.layer).forEach(lay_nm => {
|
|
71658
|
+
hTarget[lay_nm] = true;
|
|
71659
|
+
aFore.push(__classPrivateFieldGet(this, _LayerMng_hPages, "f")[lay_nm].fore);
|
|
71660
|
+
});
|
|
71661
|
+
const aBack = [];
|
|
71662
|
+
__classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this).forEach(lay_nm => {
|
|
71663
|
+
const lay = __classPrivateFieldGet(this, _LayerMng_hPages, "f")[lay_nm][hTarget[lay_nm] ? 'back' : 'fore'];
|
|
71664
|
+
__classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").push(lay.spLay);
|
|
71665
|
+
aBack.push(lay);
|
|
71666
|
+
});
|
|
71651
71667
|
__classPrivateFieldGet(this, _LayerMng_rtTransBack, "f").resize(CmnLib_1.CmnLib.stageW, CmnLib_1.CmnLib.stageH);
|
|
71652
71668
|
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_back, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f") });
|
|
71653
|
-
|
|
71654
|
-
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
|
|
71655
|
-
const fncRender = () => {
|
|
71669
|
+
let fncRenderBack = () => {
|
|
71656
71670
|
__classPrivateFieldGet(this, _LayerMng_back, "f").visible = true;
|
|
71657
|
-
__classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").forEach(
|
|
71658
|
-
this.appPixi.renderer.render(
|
|
71671
|
+
__classPrivateFieldGet(this, _LayerMng_aBackTransAfter, "f").forEach(spLay => {
|
|
71672
|
+
this.appPixi.renderer.render(spLay, { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransBack, "f"), clear: false });
|
|
71659
71673
|
});
|
|
71660
71674
|
__classPrivateFieldGet(this, _LayerMng_back, "f").visible = false;
|
|
71661
|
-
|
|
71675
|
+
};
|
|
71676
|
+
if (!aBack.some(lay => lay.containMovement)) {
|
|
71677
|
+
fncRenderBack();
|
|
71678
|
+
fncRenderBack = () => { };
|
|
71679
|
+
}
|
|
71680
|
+
__classPrivateFieldGet(this, _LayerMng_rtTransFore, "f").resize(CmnLib_1.CmnLib.stageW, CmnLib_1.CmnLib.stageH);
|
|
71681
|
+
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
|
|
71682
|
+
let fncRenderFore = () => {
|
|
71662
71683
|
__classPrivateFieldGet(this, _LayerMng_fore, "f").visible = true;
|
|
71663
71684
|
this.appPixi.renderer.render(__classPrivateFieldGet(this, _LayerMng_fore, "f"), { renderTexture: __classPrivateFieldGet(this, _LayerMng_rtTransFore, "f") });
|
|
71664
71685
|
__classPrivateFieldGet(this, _LayerMng_fore, "f").visible = false;
|
|
71686
|
+
};
|
|
71687
|
+
if (!aFore.some(lay => lay.containMovement)) {
|
|
71688
|
+
fncRenderFore();
|
|
71689
|
+
fncRenderFore = () => { };
|
|
71690
|
+
}
|
|
71691
|
+
const fncRender = () => {
|
|
71692
|
+
fncRenderBack();
|
|
71693
|
+
__classPrivateFieldGet(this, _LayerMng_spTransBack, "f").visible = true;
|
|
71694
|
+
fncRenderFore();
|
|
71665
71695
|
__classPrivateFieldGet(this, _LayerMng_spTransFore, "f").visible = true;
|
|
71666
71696
|
};
|
|
71667
71697
|
__classPrivateFieldGet(this, _LayerMng_spTransFore, "f").alpha = 1;
|