@famibee/skynovel 1.64.19 → 1.64.21
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/dist/CmnTween.js +26 -27
- package/dist/CmnTween.js.map +1 -1
- package/dist/DebugMng.js +2 -2
- package/dist/DebugMng.js.map +1 -1
- package/dist/EventMng.js +218 -213
- package/dist/EventMng.js.map +1 -1
- package/dist/LayerMng.js +64 -52
- package/dist/LayerMng.js.map +1 -1
- package/dist/Reading.js +34 -28
- package/dist/Reading.js.map +1 -1
- package/dist/ScriptIterator.js +1 -1
- package/dist/ScriptIterator.js.map +1 -1
- package/dist/SndBuf.js +22 -22
- package/dist/SndBuf.js.map +1 -1
- package/dist/TxtLayer.js +238 -239
- package/dist/TxtLayer.js.map +1 -1
- package/dist/appMain_cmn.d.ts.map +1 -1
- package/dist/sn/CmnInterface.d.ts +1 -1
- package/dist/sn/CmnInterface.d.ts.map +1 -1
- package/dist/sn/CmnLib.d.ts +1 -0
- package/dist/sn/CmnLib.d.ts.map +1 -1
- package/dist/sn/CmnTween.d.ts.map +1 -1
- package/dist/sn/EventMng.d.ts.map +1 -1
- package/dist/sn/FocusMng.d.ts +2 -0
- package/dist/sn/FocusMng.d.ts.map +1 -1
- package/dist/sn/FrameMng.d.ts.map +1 -1
- package/dist/sn/Hyphenation.d.ts.map +1 -1
- package/dist/sn/Layer.d.ts.map +1 -1
- package/dist/sn/Reading.d.ts.map +1 -1
- package/dist/sn/SndBuf.d.ts.map +1 -1
- package/dist/sn/TxtLayer.d.ts.map +1 -1
- package/dist/sn/TxtStage.d.ts.map +1 -1
- package/dist/sn/htm2tx.d.ts.map +1 -1
- package/dist/web2.js +4 -4
- package/dist/web2.js.map +1 -1
- package/dist_app/CmnTween.js +28 -29
- package/dist_app/CmnTween.js.map +1 -1
- package/dist_app/EventMng.js +326 -321
- package/dist_app/EventMng.js.map +1 -1
- package/dist_app/LayerMng.js +64 -52
- package/dist_app/LayerMng.js.map +1 -1
- package/dist_app/Reading.js +34 -28
- package/dist_app/Reading.js.map +1 -1
- package/dist_app/ScriptIterator.js +1 -1
- package/dist_app/ScriptIterator.js.map +1 -1
- package/dist_app/SndBuf.js +22 -22
- package/dist_app/SndBuf.js.map +1 -1
- package/dist_app/TxtLayer.js +306 -307
- package/dist_app/TxtLayer.js.map +1 -1
- package/dist_app/app2.js +6 -6
- package/dist_app/app2.js.map +1 -1
- package/dist_app/appMain.js +1 -1
- package/dist_app/appMain.js.map +1 -1
- package/dist_app/appMain_cmn.d.ts.map +1 -1
- package/dist_app/sn/CmnInterface.d.ts +1 -1
- package/dist_app/sn/CmnInterface.d.ts.map +1 -1
- package/dist_app/sn/CmnLib.d.ts +1 -0
- package/dist_app/sn/CmnLib.d.ts.map +1 -1
- package/dist_app/sn/CmnTween.d.ts.map +1 -1
- package/dist_app/sn/EventMng.d.ts.map +1 -1
- package/dist_app/sn/FocusMng.d.ts +2 -2
- package/dist_app/sn/FocusMng.d.ts.map +1 -1
- package/dist_app/sn/FrameMng.d.ts.map +1 -1
- package/dist_app/sn/Hyphenation.d.ts.map +1 -1
- package/dist_app/sn/Layer.d.ts.map +1 -1
- package/dist_app/sn/Reading.d.ts.map +1 -1
- package/dist_app/sn/SndBuf.d.ts.map +1 -1
- package/dist_app/sn/TxtLayer.d.ts.map +1 -1
- package/dist_app/sn/TxtStage.d.ts.map +1 -1
- package/dist_app/sn/htm2tx.d.ts.map +1 -1
- package/package.json +2 -2
package/dist_app/LayerMng.js
CHANGED
|
@@ -5,7 +5,7 @@ import { S as E } from "./SpritesMng.js";
|
|
|
5
5
|
import { T as N, a as rt } from "./TxtLayer.js";
|
|
6
6
|
import { R as ot } from "./RubySpliter.js";
|
|
7
7
|
import { P as ct, b as K } from "./Main.js";
|
|
8
|
-
import { a as
|
|
8
|
+
import { a as C } from "./Reading.js";
|
|
9
9
|
import { Button as Q } from "./Button.js";
|
|
10
10
|
class I {
|
|
11
11
|
constructor(t, e, s, i, n, o, r, c) {
|
|
@@ -43,7 +43,7 @@ class I {
|
|
|
43
43
|
}
|
|
44
44
|
class p {
|
|
45
45
|
constructor(t, e, s) {
|
|
46
|
-
this.appPixi = e, this.val = s, t.add_frame = (i) => this.#x(i), t.let_frame = (i) => this.#d(i), t.set_frame = (i) => this.#N(i), t.frame = (i) => this
|
|
46
|
+
this.appPixi = e, this.val = s, t.add_frame = (i) => this.#x(i), t.let_frame = (i) => this.#d(i), t.set_frame = (i) => this.#N(i), t.frame = (i) => this.#$(i), t.tsy_frame = (i) => this.#w(i);
|
|
47
47
|
}
|
|
48
48
|
static #e;
|
|
49
49
|
static #t;
|
|
@@ -83,32 +83,32 @@ class p {
|
|
|
83
83
|
const c = "const.sn.frm." + e;
|
|
84
84
|
if (this.val.getVal(`tmp:${c}`)) throw `frame【${e}】はすでにあります`;
|
|
85
85
|
const h = g(t, "visible", !0), f = t.b_color ? ` background-color: ${t.b_color};` : "", l = this.#b(t);
|
|
86
|
-
p.#i.cvs.insertAdjacentHTML("beforebegin", `<iframe id="${e}" style="opacity: ${i}; ${f} position: absolute; left:${p.#t.ofsLeft4elm + l.x * p.#t.cvsScale}px; top: ${p.#t.ofsTop4elm + l.y * p.#t.cvsScale}px; z-index: 1; border: 0px; overflow: hidden; display: ${h ? "inline" : "none"}; transform: scale(${n}, ${o}) rotate(${r}deg);" width="${l.width * p.#t.cvsScale}" height="${l.height * p.#t.cvsScale}"></iframe>`);
|
|
87
|
-
const d =
|
|
88
|
-
|
|
86
|
+
p.#i.cvs.insertAdjacentHTML("beforebegin", `<iframe id="${e}" style="opacity: ${String(i)}; ${f} position: absolute; left:${String(p.#t.ofsLeft4elm + l.x * p.#t.cvsScale)}px; top: ${String(p.#t.ofsTop4elm + l.y * p.#t.cvsScale)}px; z-index: 1; border: 0px; overflow: hidden; display: ${h ? "inline" : "none"}; transform: scale(${String(n)}, ${String(o)}) rotate(${String(r)}deg);" width="${String(l.width * p.#t.cvsScale)}" height="${String(l.height * p.#t.cvsScale)}"></iframe>`);
|
|
87
|
+
const d = C.procID + `add_frame id:${e}`;
|
|
88
|
+
C.beginProc(d);
|
|
89
89
|
const u = p.#e.searchPath(s, H.HTML), a = new F().add({ name: s, url: u, xhrType: B.XHR_RESPONSE_TYPE.TEXT });
|
|
90
90
|
return p.#t.arg.crypto && a.use(
|
|
91
91
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
92
92
|
(b, x) => void p.#t.dec(b.extension, b.data).then((v) => {
|
|
93
93
|
b.data = v, x();
|
|
94
94
|
}).catch((v) => {
|
|
95
|
-
p.#i.errScript(`[add_frame]Html ロード失敗です src:${b.name} ${v}`, !1), x();
|
|
95
|
+
p.#i.errScript(`[add_frame]Html ロード失敗です src:${b.name} ${String(v)}`, !1), x();
|
|
96
96
|
})
|
|
97
97
|
), a.load((b, x) => {
|
|
98
98
|
const v = document.getElementById(e);
|
|
99
99
|
this.#c[e] = v, this.#y[e] = !1;
|
|
100
|
-
const
|
|
100
|
+
const S = u.lastIndexOf("/") + 1, V = u.slice(0, S), m = V.slice(0, S);
|
|
101
101
|
v.srcdoc = String(x[s]?.data).replace("sn_repRes();", "").replaceAll(
|
|
102
102
|
/\s(?:src|href)=(["'])(\S+?)\1/g,
|
|
103
103
|
// 【\s】が大事、data-src弾く
|
|
104
|
-
(y,
|
|
104
|
+
(y, $, T) => T.startsWith("../") ? m + y.slice(3) : y.replace("./", "").replace($, $ + V)
|
|
105
105
|
), v.srcdoc.includes("true/*WEBP*/;") && (v.srcdoc = v.srcdoc.replaceAll(
|
|
106
106
|
/data-src="(.+?\.)(?:jpe?g|png)/g,
|
|
107
|
-
(y,
|
|
107
|
+
(y, $) => `data-src="${$}webp`
|
|
108
108
|
)), v.onload = () => {
|
|
109
|
-
|
|
109
|
+
C.endProc(d), this.val.setVal_Nochk("tmp", c, !0), this.val.setVal_Nochk("tmp", c + ".alpha", i), this.val.setVal_Nochk("tmp", c + ".x", l.x), this.val.setVal_Nochk("tmp", c + ".y", l.y), this.val.setVal_Nochk("tmp", c + ".scale_x", n), this.val.setVal_Nochk("tmp", c + ".scale_y", o), this.val.setVal_Nochk("tmp", c + ".rotate", r), this.val.setVal_Nochk("tmp", c + ".width", l.width), this.val.setVal_Nochk("tmp", c + ".height", l.height), this.val.setVal_Nochk("tmp", c + ".visible", h);
|
|
110
110
|
const y = v.contentWindow;
|
|
111
|
-
this.#o.resvFlameEvent(y.document.body), y.sn_repRes?.((
|
|
111
|
+
this.#o.resvFlameEvent(y.document.body), y.sn_repRes?.(($) => p.#_($.dataset.src ?? "", $));
|
|
112
112
|
};
|
|
113
113
|
}), !0;
|
|
114
114
|
}
|
|
@@ -147,7 +147,7 @@ class p {
|
|
|
147
147
|
p.#t.decAB(f.data).then((d) => {
|
|
148
148
|
f.data = d, d instanceof HTMLImageElement && (f.type = B.TYPE.IMAGE), l();
|
|
149
149
|
}).catch((d) => {
|
|
150
|
-
p.#i.errScript(`FrameMng loadPic ロード失敗です fn:${f.name} ${d}`, !1), l();
|
|
150
|
+
p.#i.errScript(`FrameMng loadPic ロード失敗です fn:${f.name} ${String(d)}`, !1), l();
|
|
151
151
|
});
|
|
152
152
|
}), h.load((f, l) => {
|
|
153
153
|
for (const [d, { data: { src: u } }] of Object.entries(l)) {
|
|
@@ -164,7 +164,11 @@ class p {
|
|
|
164
164
|
cvsResize() {
|
|
165
165
|
for (const [t, e] of Object.entries(this.#c)) {
|
|
166
166
|
const s = "const.sn.frm." + t, i = Number(this.val.getVal(s + ".x")), n = Number(this.val.getVal(s + ".y")), o = Number(this.val.getVal(s + ".width")), r = Number(this.val.getVal(s + ".height"));
|
|
167
|
-
e.style.left = `${
|
|
167
|
+
e.style.left = `${String(
|
|
168
|
+
p.#t.ofsLeft4elm + i * p.#t.cvsScale
|
|
169
|
+
)}px`, e.style.top = `${String(
|
|
170
|
+
p.#t.ofsTop4elm + n * p.#t.cvsScale
|
|
171
|
+
)}px`, e.width = String(o * p.#t.cvsScale), e.height = String(r * p.#t.cvsScale);
|
|
168
172
|
}
|
|
169
173
|
}
|
|
170
174
|
// フレーム変数を取得
|
|
@@ -202,7 +206,7 @@ class p {
|
|
|
202
206
|
}
|
|
203
207
|
// フレームに設定
|
|
204
208
|
#n = 1;
|
|
205
|
-
|
|
209
|
+
#$(t) {
|
|
206
210
|
const { id: e } = t;
|
|
207
211
|
if (!e) throw "idは必須です";
|
|
208
212
|
const s = document.getElementById(e);
|
|
@@ -210,14 +214,18 @@ class p {
|
|
|
210
214
|
const i = "const.sn.frm." + e;
|
|
211
215
|
if (!this.val.getVal("tmp:" + i)) throw `frame【${e}】が読み込まれていません`;
|
|
212
216
|
const n = s.style;
|
|
213
|
-
if (g(t, "float", !1) ? n.zIndex =
|
|
217
|
+
if (g(t, "float", !1) ? n.zIndex = String(++this.#n) : "index" in t ? n.zIndex = String(k(t, "index", 0)) : t.dive && (n.zIndex = String(-++this.#n)), "alpha" in t) {
|
|
214
218
|
const r = n.opacity = String(t.alpha);
|
|
215
219
|
this.val.setVal_Nochk("tmp", i + ".alpha", r);
|
|
216
220
|
}
|
|
217
221
|
const o = this.#b(t);
|
|
218
|
-
if (("x" in t || "y" in t) && (n.left = `${
|
|
222
|
+
if (("x" in t || "y" in t) && (n.left = `${String(
|
|
223
|
+
p.#t.ofsLeft4elm + o.x * p.#t.cvsScale
|
|
224
|
+
)}px`, n.top = `${String(
|
|
225
|
+
p.#t.ofsTop4elm + o.y * p.#t.cvsScale
|
|
226
|
+
)}px`, this.val.setVal_Nochk("tmp", i + ".x", o.x), this.val.setVal_Nochk("tmp", i + ".y", o.y)), "scale_x" in t || "scale_y" in t || "rotate" in t) {
|
|
219
227
|
const r = k(t, "scale_x", 1), c = k(t, "scale_y", 1), h = k(t, "rotate", 0);
|
|
220
|
-
n.transform = `scale(${r}, ${c}) rotate(${h}deg)`, this.val.setVal_Nochk("tmp", i + ".scale_x", r), this.val.setVal_Nochk("tmp", i + ".scale_y", c), this.val.setVal_Nochk("tmp", i + ".rotate", h);
|
|
228
|
+
n.transform = `scale(${String(r)}, ${String(c)}) rotate(${String(h)}deg)`, this.val.setVal_Nochk("tmp", i + ".scale_x", r), this.val.setVal_Nochk("tmp", i + ".scale_y", c), this.val.setVal_Nochk("tmp", i + ".rotate", h);
|
|
221
229
|
}
|
|
222
230
|
if ("width" in t && (s.width = String(o.width * p.#t.cvsScale), this.val.setVal_Nochk("tmp", i + ".width", o.width)), "height" in t && (s.height = String(o.height * p.#t.cvsScale), this.val.setVal_Nochk("tmp", i + ".height", o.height)), "visible" in t) {
|
|
223
231
|
const r = g(t, "visible", !0);
|
|
@@ -252,20 +260,24 @@ class p {
|
|
|
252
260
|
};
|
|
253
261
|
const v = this.#b(a);
|
|
254
262
|
(i || n || o || r || c) && (v.x, v.y, k(a, "scale_x", 1), k(a, "scale_y", 1), k(a, "rotate", 0), x = (m) => {
|
|
255
|
-
l.style.left = `${
|
|
263
|
+
l.style.left = `${String(
|
|
264
|
+
p.#t.ofsLeft4elm + m.x * p.#t.cvsScale
|
|
265
|
+
)} px`, l.style.top = `${String(
|
|
266
|
+
p.#t.ofsTop4elm + m.y * p.#t.cvsScale
|
|
267
|
+
)} px`, l.style.transform = `scale(${String(m.sx)}, ${String(m.sy)}) rotate(${String(m.r)}deg)`, this.val.setVal_Nochk("tmp", d + ".x", m.x), this.val.setVal_Nochk("tmp", d + ".y", m.y), this.val.setVal_Nochk("tmp", d + ".scale_x", m.sx), this.val.setVal_Nochk("tmp", d + ".scale_y", m.sy), this.val.setVal_Nochk("tmp", d + ".rotate", m.r);
|
|
256
268
|
});
|
|
257
|
-
let
|
|
269
|
+
let S = (m) => {
|
|
258
270
|
};
|
|
259
|
-
h && (v.width,
|
|
260
|
-
l.width = `${m.w * p.#t.cvsScale} px`, this.val.setVal_Nochk("tmp", d + ".width", m.w);
|
|
271
|
+
h && (v.width, S = (m) => {
|
|
272
|
+
l.width = `${String(m.w * p.#t.cvsScale)} px`, this.val.setVal_Nochk("tmp", d + ".width", m.w);
|
|
261
273
|
});
|
|
262
274
|
let V = (m) => {
|
|
263
275
|
};
|
|
264
276
|
return f && (v.height, V = (m) => {
|
|
265
|
-
l.height = `${m.h * p.#t.cvsScale} px`, this.val.setVal_Nochk("tmp", d + ".height", m.h);
|
|
277
|
+
l.height = `${String(m.h * p.#t.cvsScale)} px`, this.val.setVal_Nochk("tmp", d + ".height", m.h);
|
|
266
278
|
}), this.appPixi.stage.interactive = !1, w.tween(`frm
|
|
267
279
|
${e}`, t, u, w.cnvTweenArg(t, u), (m) => {
|
|
268
|
-
b(m), x(m),
|
|
280
|
+
b(m), x(m), S(m), V(m);
|
|
269
281
|
}, () => {
|
|
270
282
|
this.appPixi.stage.interactive = !0;
|
|
271
283
|
}, () => {
|
|
@@ -357,7 +369,7 @@ class Z {
|
|
|
357
369
|
}, 1e3 / 60 * 10));
|
|
358
370
|
}, { passive: !0 });
|
|
359
371
|
}
|
|
360
|
-
r.cvsResize(), this.#l = new lt(this.cfg.oCfg, e, i), N.init(t, e, i, this.#l, (a) => this.#s[a.layname].fore === a, s), X.init(n, t, s, r, c, i), p.init(t, r, n), this.#o = new p(e, s, i), e.loadplugin = (a) => this.#O(a), e.snapshot = (a) => this
|
|
372
|
+
r.cvsResize(), this.#l = new lt(this.cfg.oCfg, e, i), N.init(t, e, i, this.#l, (a) => this.#s[a.layname].fore === a, s), X.init(n, t, s, r, c, i), p.init(t, r, n), this.#o = new p(e, s, i), e.loadplugin = (a) => this.#O(a), e.snapshot = (a) => this.#$(a), this.#w = this.sys.isApp ? (a, b, x, v, S) => this.#B(a, b, x, v, S) : (a, b, x, v, S) => this.#W(a, b, x, v, S), e.add_lay = (a) => this.#j(a), e.clear_lay = (a) => this.#H(a), e.finish_trans = () => !1, e.lay = (a) => this.#z(a), e.trans = (a) => this.#G(a), e.wt = (a) => w.wt(a), e.quake = (a) => this.#q(a), e.stop_quake = e.finish_trans, e.wq = e.wt, e.pause_tsy = (a) => w.pause_tsy(a), e.resume_tsy = (a) => w.resume_tsy(a), e.stop_tsy = (a) => w.stop_tsy(a), e.tsy = (a) => this.#J(a), e.wait_tsy = (a) => w.wait_tsy(a), e.add_filter = (a) => this.#X(a), e.clear_filter = (a) => this.#Y(a), e.enable_filter = (a) => this.#K(a), e.ch = (a) => this.#I(a), e.clear_text = (a) => this.#M(a), e.current = (a) => this.#D(a), e.endlink = (a) => this.#A(a), e.er = (a) => this.#tt(a), e.graph = (a) => this.#et(a), e.link = (a) => this.#st(a), e.r = (a) => this.#it(a), e.ruby2 = (a) => this.#at(a), e.span = (a) => this.#nt(a), e.tcy = (a) => this.#rt(a), e.add_face = (a) => E.add_face(a), e.wv = (a) => E.wv(a), e.dump_lay = (a) => this.#ot(a), e.enable_event = (a) => this.#ct(a), e.button = (a) => this.#lt(a), t.existsBreakline && (this.breakLine = (a) => {
|
|
361
373
|
delete a.visible, a.id = "break", a.pic = "breakline", this.#n("grp|" + L(a));
|
|
362
374
|
}), t.existsBreakpage && (this.breakPage = (a) => {
|
|
363
375
|
delete a.visible, a.id = "break", a.pic = "breakpage", this.#n("grp|" + L(a));
|
|
@@ -446,15 +458,15 @@ class Z {
|
|
|
446
458
|
}
|
|
447
459
|
// // システム
|
|
448
460
|
//MARK: スナップショット
|
|
449
|
-
|
|
461
|
+
#$(t) {
|
|
450
462
|
const e = tt("-", "_", "", "_"), s = t.fn ? t.fn.startsWith(ct) ? t.fn : `${K + t.fn + e}.png` : `${K}snapshot${e}.png`, i = this.cfg.searchPath(s), n = k(t, "width", _.stageW), o = k(t, "height", _.stageH);
|
|
451
463
|
return this.#w(t, i, n, o, `snapshot dt:${e}`);
|
|
452
464
|
}
|
|
453
465
|
#w = () => !1;
|
|
454
466
|
#B({ layer: t }, e, s, i, n) {
|
|
455
|
-
if (this.#o.hideAllFrame(),
|
|
467
|
+
if (this.#o.hideAllFrame(), C.beginProc(n), !t)
|
|
456
468
|
return this.sys.capturePage(e, s, i, () => {
|
|
457
|
-
this.#o.restoreAllFrame(),
|
|
469
|
+
this.#o.restoreAllFrame(), C.endProc(n);
|
|
458
470
|
}), !0;
|
|
459
471
|
const o = this.#r.map((r) => {
|
|
460
472
|
const { ctn: c } = this.#s[r].fore, h = [c, c.visible];
|
|
@@ -463,11 +475,11 @@ class Z {
|
|
|
463
475
|
for (const r of this.#p(t)) this.#s[r].fore.ctn.visible = !0;
|
|
464
476
|
return this.sys.capturePage(e, s, i, () => {
|
|
465
477
|
for (const [r, c] of o) r.visible = c;
|
|
466
|
-
this.#o.restoreAllFrame(),
|
|
478
|
+
this.#o.restoreAllFrame(), C.endProc(n);
|
|
467
479
|
}), !0;
|
|
468
480
|
}
|
|
469
481
|
#W(t, e, s, i, n) {
|
|
470
|
-
|
|
482
|
+
C.beginProc(n);
|
|
471
483
|
const o = et(t, "b_color", this.#c), r = st({
|
|
472
484
|
width: s,
|
|
473
485
|
height: i,
|
|
@@ -489,7 +501,7 @@ class Z {
|
|
|
489
501
|
r.plugins.extract.base64(f)
|
|
490
502
|
), f.destroy();
|
|
491
503
|
for (const l of this.#p(h)) this.#s[l][c].snapshot_end();
|
|
492
|
-
r.destroy(!0),
|
|
504
|
+
r.destroy(!0), C.endProc(n);
|
|
493
505
|
}), !0;
|
|
494
506
|
}
|
|
495
507
|
//MARK: プラグインの読み込み
|
|
@@ -497,11 +509,11 @@ class Z {
|
|
|
497
509
|
const { fn: e } = t;
|
|
498
510
|
if (!e) throw "fnは必須です";
|
|
499
511
|
if (!e.endsWith(".css")) throw "サポートされない拡張子です";
|
|
500
|
-
const s = g(t, "join", !0), i =
|
|
501
|
-
return s &&
|
|
512
|
+
const s = g(t, "join", !0), i = C.procID + `loadplugin fn:${e}`;
|
|
513
|
+
return s && C.beginProc(i), (async () => {
|
|
502
514
|
const n = await fetch(e);
|
|
503
515
|
if (!n.ok) throw new Error("Network response was not ok.");
|
|
504
|
-
it(await n.text()), s &&
|
|
516
|
+
it(await n.text()), s && C.endProc(i);
|
|
505
517
|
})(), s;
|
|
506
518
|
}
|
|
507
519
|
// // レイヤ共通
|
|
@@ -515,7 +527,7 @@ class Z {
|
|
|
515
527
|
const i = { isWait: !1 };
|
|
516
528
|
switch (this.#s[e] = new I(e, s, this.#t, this.#i, t, this.sys, this.val, i), this.#r.push(e), s) {
|
|
517
529
|
case "txt":
|
|
518
|
-
this.#v || (this
|
|
530
|
+
this.#v || (this.#C = () => {
|
|
519
531
|
}, this.#h = (n) => this.#Q(n), this.#D = (n) => this.#Z(n), this.hTag.current({ layer: e }), this.goTxt = () => {
|
|
520
532
|
this.#d.isSkipping ? N.msecChWait = 0 : this.setNormalChWait();
|
|
521
533
|
for (const n of this.#r) {
|
|
@@ -561,7 +573,7 @@ class Z {
|
|
|
561
573
|
}
|
|
562
574
|
//MARK: レイヤ設定の消去
|
|
563
575
|
#H(t) {
|
|
564
|
-
return this.#
|
|
576
|
+
return this.#S(t, (e) => {
|
|
565
577
|
const s = this.#s[this.#u({ layer: e })];
|
|
566
578
|
if (t.page === "both") {
|
|
567
579
|
s.fore.clearLay(t), s.back.clearLay(t);
|
|
@@ -629,8 +641,8 @@ void main() {
|
|
|
629
641
|
const { layer: e } = t, s = /* @__PURE__ */ new Set(), i = this.#p(e).map((y) => (s.add(y), this.#s[y].fore)), n = () => {
|
|
630
642
|
[this.#t, this.#i] = [this.#i, this.#t];
|
|
631
643
|
const y = [];
|
|
632
|
-
for (const [
|
|
633
|
-
if (s.has(
|
|
644
|
+
for (const [$, T] of Object.entries(this.#s)) {
|
|
645
|
+
if (s.has($)) {
|
|
634
646
|
T.transPage(y);
|
|
635
647
|
continue;
|
|
636
648
|
}
|
|
@@ -638,13 +650,13 @@ void main() {
|
|
|
638
650
|
this.#t.removeChild(D), this.#i.removeChild(P), this.#t.addChildAt(P, z), this.#i.addChildAt(D, z);
|
|
639
651
|
}
|
|
640
652
|
Promise.allSettled(y).then(() => {
|
|
641
|
-
this.#t.visible = !0, this.#i.visible = !1, this.#T.visible = !1, this.#a.visible = !1,
|
|
653
|
+
this.#t.visible = !0, this.#i.visible = !1, this.#T.visible = !1, this.#a.visible = !1, C.notifyEndProc(R);
|
|
642
654
|
});
|
|
643
655
|
};
|
|
644
656
|
if (this.#a.filters = [], this.#a.alpha = 1, k(t, "time", 0) === 0 || this.#d.isSkipping)
|
|
645
657
|
return n(), !1;
|
|
646
658
|
const r = [], c = this.#r.map((y) => {
|
|
647
|
-
const { fore:
|
|
659
|
+
const { fore: $, back: T } = this.#s[y], P = s.has(y) ? T : $;
|
|
648
660
|
return P.ctn.visible && r.push(P.ctn), P;
|
|
649
661
|
}), { ticker: h, renderer: f } = this.appPixi;
|
|
650
662
|
f.render(this.#i, { renderTexture: this.#L });
|
|
@@ -682,7 +694,7 @@ void main() {
|
|
|
682
694
|
return w.tween(R, t, this.#a, { alpha: 0 }, () => {
|
|
683
695
|
}, v, () => {
|
|
684
696
|
}), h.add(a), !1;
|
|
685
|
-
const
|
|
697
|
+
const S = {
|
|
686
698
|
rule: at.EMPTY,
|
|
687
699
|
vague: k(t, "vague", 0.04),
|
|
688
700
|
tick: 0
|
|
@@ -690,13 +702,13 @@ void main() {
|
|
|
690
702
|
this.#a.filters = [new nt(
|
|
691
703
|
void 0,
|
|
692
704
|
b ?? Z.#F,
|
|
693
|
-
|
|
705
|
+
S
|
|
694
706
|
)];
|
|
695
|
-
const V = w.tween(R, t,
|
|
707
|
+
const V = w.tween(R, t, S, { tick: 1 }, () => {
|
|
696
708
|
}, v, () => {
|
|
697
709
|
}, !x);
|
|
698
710
|
return x ? new E(x, void 0, (y) => {
|
|
699
|
-
|
|
711
|
+
S.rule = y.texture, y.destroy(), V.start(), h.add(a);
|
|
700
712
|
}, (y) => {
|
|
701
713
|
y && this.main.resume();
|
|
702
714
|
}).ret : (h.add(a), !1);
|
|
@@ -704,7 +716,7 @@ void main() {
|
|
|
704
716
|
#p(t = "") {
|
|
705
717
|
return t ? t.split(",") : this.#r;
|
|
706
718
|
}
|
|
707
|
-
#
|
|
719
|
+
#S(t, e) {
|
|
708
720
|
const s = this.#p(t.layer);
|
|
709
721
|
for (const i of s) {
|
|
710
722
|
const n = this.#s[i];
|
|
@@ -749,7 +761,7 @@ void main() {
|
|
|
749
761
|
return this.#a.filters = [], w.tween(R, t, this.#a, { x: 0, y: 0 }, () => {
|
|
750
762
|
c(), h();
|
|
751
763
|
}, () => {
|
|
752
|
-
i.remove(n), this.#t.visible = !0, this.#a.visible = !1, this.#a.x = 0, this.#a.y = 0,
|
|
764
|
+
i.remove(n), this.#t.visible = !0, this.#a.visible = !1, this.#a.x = 0, this.#a.y = 0, C.notifyEndProc(R);
|
|
753
765
|
}, () => {
|
|
754
766
|
}), i.add(n), !1;
|
|
755
767
|
}
|
|
@@ -769,7 +781,7 @@ void main() {
|
|
|
769
781
|
}
|
|
770
782
|
//MARK: フィルター追加
|
|
771
783
|
#X(t) {
|
|
772
|
-
return this.#
|
|
784
|
+
return this.#S(t, (e) => {
|
|
773
785
|
const s = this.#s[this.#u({ layer: e })];
|
|
774
786
|
if (t.page === "both") {
|
|
775
787
|
this.#P(s.fore, t), this.#P(s.back, t);
|
|
@@ -785,7 +797,7 @@ void main() {
|
|
|
785
797
|
}
|
|
786
798
|
//MARK: フィルター全削除
|
|
787
799
|
#Y(t) {
|
|
788
|
-
return this.#
|
|
800
|
+
return this.#S(t, (e) => {
|
|
789
801
|
const s = this.#s[this.#u({ layer: e })];
|
|
790
802
|
if (t.page === "both") {
|
|
791
803
|
const n = s.fore, o = s.back;
|
|
@@ -798,7 +810,7 @@ void main() {
|
|
|
798
810
|
}
|
|
799
811
|
//MARK: フィルター個別切替
|
|
800
812
|
#K(t) {
|
|
801
|
-
return this.#
|
|
813
|
+
return this.#S(t, (e) => {
|
|
802
814
|
const s = this.#s[this.#u({ layer: e })];
|
|
803
815
|
if (t.page === "both") {
|
|
804
816
|
this.#R(s.fore, t), this.#R(s.back, t);
|
|
@@ -827,7 +839,7 @@ void main() {
|
|
|
827
839
|
`)), this.val.setVal_Nochk("save", "sn.doRecLog", n), this.#n("add_close|", s), !1;
|
|
828
840
|
}
|
|
829
841
|
#h = (t) => {
|
|
830
|
-
throw this
|
|
842
|
+
throw this.#C(), 0;
|
|
831
843
|
};
|
|
832
844
|
#Q(t) {
|
|
833
845
|
const e = this.#u(t, this.#v), i = this.#s[e].getPage(t);
|
|
@@ -839,7 +851,7 @@ void main() {
|
|
|
839
851
|
}
|
|
840
852
|
//MARK: 操作対象のメッセージレイヤの指定
|
|
841
853
|
#D = (t) => {
|
|
842
|
-
throw this
|
|
854
|
+
throw this.#C(), 0;
|
|
843
855
|
};
|
|
844
856
|
#Z(t) {
|
|
845
857
|
const { layer: e } = t;
|
|
@@ -854,14 +866,14 @@ void main() {
|
|
|
854
866
|
return !1;
|
|
855
867
|
}
|
|
856
868
|
get currentTxtlayForeNeedErr() {
|
|
857
|
-
return this
|
|
869
|
+
return this.#C(), this.currentTxtlayFore;
|
|
858
870
|
}
|
|
859
871
|
get currentTxtlayFore() {
|
|
860
872
|
return this.#k ? this.#k.fore : null;
|
|
861
873
|
}
|
|
862
874
|
#k = void 0;
|
|
863
875
|
// カレントテキストレイヤ
|
|
864
|
-
|
|
876
|
+
#C = () => {
|
|
865
877
|
throw "文字レイヤーがありません。文字表示や操作する前に、[add_lay layer=(レイヤ名) class=txt]で文字レイヤを追加して下さい";
|
|
866
878
|
};
|
|
867
879
|
#u(t, e = "") {
|