@famibee/skynovel 1.24.0 → 1.24.1
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/CHANGELOG.md +11 -0
- package/app.js +32 -40
- package/core/lib/sn/TxtLayer.d.ts.map +1 -1
- package/core/lib/sn/TxtStage.d.ts.map +1 -1
- package/package.json +2 -2
- package/web.js +32 -40
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
## [1.24.1](https://github.com/famibee/SKYNovel/compare/v1.24.0...v1.24.1) (2021-12-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* [tcy]（縦中横）を使うとフリーズする場合がある件 ([4419df4](https://github.com/famibee/SKYNovel/commit/4419df48599026460985ad5b5b27ee981fe26683))
|
|
7
|
+
|
|
8
|
+
- fix: [tcy]（縦中横）を使うとフリーズする場合がある件
|
|
9
|
+
- fix: [ch]で wait属性を指定しないと、他のstyle指定などが無効になる件
|
|
10
|
+
|
|
11
|
+
|
|
1
12
|
# [1.24.0](https://github.com/famibee/SKYNovel/compare/v1.23.2...v1.24.0) (2021-12-16)
|
|
2
13
|
|
|
3
14
|
|
package/app.js
CHANGED
|
@@ -71470,14 +71470,14 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
|
|
|
71470
71470
|
const txt = hArg.text;
|
|
71471
71471
|
if (!txt)
|
|
71472
71472
|
throw 'textは必須です';
|
|
71473
|
-
let wait = (0, CmnLib_1.argChk_Num)(hArg, 'wait', -1);
|
|
71474
|
-
if (wait > 0 && this.val.getVal('tmp:sn.skip.enabled'))
|
|
71475
|
-
wait = 0;
|
|
71476
|
-
hArg.wait = wait;
|
|
71477
71473
|
const tl = __classPrivateFieldGet(this, _LayerMng_getTxtLayer, "f").call(this, hArg);
|
|
71478
71474
|
delete hArg.text;
|
|
71479
|
-
if (wait
|
|
71480
|
-
|
|
71475
|
+
if ('wait' in hArg) {
|
|
71476
|
+
(0, CmnLib_1.argChk_Num)(hArg, 'wait', NaN);
|
|
71477
|
+
if (this.val.getVal('tmp:sn.skip.enabled'))
|
|
71478
|
+
hArg.wait = 0;
|
|
71479
|
+
}
|
|
71480
|
+
__classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, 'add｜' + JSON.stringify(hArg), tl);
|
|
71481
71481
|
const record = (0, CmnLib_1.argChk_Boolean)(hArg, 'record', true);
|
|
71482
71482
|
const doRecLog = this.val.doRecLog();
|
|
71483
71483
|
if (!record)
|
|
@@ -71485,8 +71485,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
|
|
|
71485
71485
|
tl.tagCh(txt.replaceAll('[r]', '\n'));
|
|
71486
71486
|
if (!record)
|
|
71487
71487
|
this.val.setVal_Nochk('save', 'sn.doRecLog', doRecLog);
|
|
71488
|
-
|
|
71489
|
-
__classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, `add_close｜`, tl);
|
|
71488
|
+
__classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, `add_close｜`, tl);
|
|
71490
71489
|
return false;
|
|
71491
71490
|
}, _LayerMng_$getTxtLayer = function _LayerMng_$getTxtLayer(hArg) {
|
|
71492
71491
|
const layer = __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_argChk_layer).call(this, hArg, __classPrivateFieldGet(this, _LayerMng_curTxtlay, "f"));
|
|
@@ -74979,43 +74978,32 @@ class TxtLayer extends Layer_1.Layer {
|
|
|
74979
74978
|
if (isSkip)
|
|
74980
74979
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, 0, "f");
|
|
74981
74980
|
const rs = this.mkStyle_r_align(tx, rb, __classPrivateFieldGet(this, _TxtLayer_r_align, "f"));
|
|
74981
|
+
const da = ` data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'`;
|
|
74982
|
+
const st = `<span data-tcy='${id_tcy}' style='
|
|
74983
|
+
text-combine-upright: all;
|
|
74984
|
+
-webkit-text-combine: horizontal;
|
|
74985
|
+
${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}`;
|
|
74982
74986
|
add_htm = rb
|
|
74983
74987
|
? (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
74984
|
-
?
|
|
74985
|
-
|
|
74986
|
-
|
|
74987
|
-
|
|
74988
|
-
|
|
74989
|
-
|
|
74990
|
-
: (`<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;'>`
|
|
74991
|
-
+ `<ruby><span data-tcy='${id_tcy}' style='
|
|
74992
|
-
text-combine-upright: all;
|
|
74993
|
-
-webkit-text-combine: horizontal;
|
|
74994
|
-
${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}
|
|
74995
|
-
' data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'>${tx}</span>`
|
|
74996
|
-
+ `<rt${rs}>${rb}</rt></ruby>`
|
|
74997
|
-
+ `</span>`))
|
|
74988
|
+
? `<ruby>${st}'${da} data-cmd='linkrsv'>${tx}</span>
|
|
74989
|
+
<rt${rs}>${rb}</rt></ruby>`
|
|
74990
|
+
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;'>
|
|
74991
|
+
<ruby>${st}'${da}>${tx}</span>
|
|
74992
|
+
<rt${rs}>${rb}</rt></ruby>
|
|
74993
|
+
</span>`)
|
|
74998
74994
|
: (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
74999
|
-
?
|
|
75000
|
-
|
|
75001
|
-
-webkit-text-combine: horizontal;
|
|
75002
|
-
${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}
|
|
75003
|
-
' data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}' data-cmd='linkrsv'>${tx}</span>`)
|
|
75004
|
-
: `<span data-tcy='${id_tcy}' style='
|
|
75005
|
-
text-combine-upright: all;
|
|
75006
|
-
-webkit-text-combine: horizontal;
|
|
74995
|
+
? `${st}'${da} data-cmd='linkrsv'>${tx}</span>`
|
|
74996
|
+
: `${st}
|
|
75007
74997
|
animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;
|
|
75008
74998
|
height: 1em;
|
|
75009
|
-
|
|
75010
|
-
' class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'>${tx}</span>`);
|
|
74999
|
+
' class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}'${da}>${tx}</span>`);
|
|
75011
75000
|
if (__classPrivateFieldGet(this, _TxtLayer_ch_in_join, "f"))
|
|
75012
75001
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, __classPrivateFieldGet(this, _TxtLayer_cumDelay, "f") + ((__classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_doAutoWc))
|
|
75013
75002
|
? __classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_hAutoWc)[ch.charAt(0)] ?? 0
|
|
75014
75003
|
: LayerMng_1.LayerMng.msecChWait), "f");
|
|
75015
75004
|
}
|
|
75016
75005
|
break;
|
|
75017
|
-
default:
|
|
75018
|
-
throw `異常な値です putCh(text: ${ch}, ruby: ${ruby})`;
|
|
75006
|
+
default: throw `異常な値です putCh(text: ${ch}, ruby: ${ruby})`;
|
|
75019
75007
|
}
|
|
75020
75008
|
break;
|
|
75021
75009
|
}
|
|
@@ -75497,15 +75485,16 @@ _a = TxtLayer, _TxtLayer_b_color = new WeakMap(), _TxtLayer_b_alpha = new WeakMa
|
|
|
75497
75485
|
const rs = this.mkStyle_r_align(ch, ruby, r_align);
|
|
75498
75486
|
if (isSkip)
|
|
75499
75487
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, 0, "f");
|
|
75488
|
+
const da = ` data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'`;
|
|
75500
75489
|
add_htm = ruby
|
|
75501
75490
|
? (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
75502
|
-
? `<ruby style='${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'
|
|
75503
|
-
:
|
|
75504
|
-
|
|
75505
|
-
|
|
75491
|
+
? `<ruby style='${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'${da} data-cmd='linkrsv'>${ch}<rt${rs}>${ruby}</rt></ruby>`
|
|
75492
|
+
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'>
|
|
75493
|
+
<ruby${da}>${ch}<rt${rs}>${ruby}</rt></ruby>
|
|
75494
|
+
</span>`)
|
|
75506
75495
|
: (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
75507
75496
|
? __classPrivateFieldGet(this, _TxtLayer_fncFFSSpan, "f").call(this, ch)
|
|
75508
|
-
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'
|
|
75497
|
+
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'${da}>${ch}</span>`);
|
|
75509
75498
|
if (__classPrivateFieldGet(this, _TxtLayer_ch_in_join, "f"))
|
|
75510
75499
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, __classPrivateFieldGet(this, _TxtLayer_cumDelay, "f") + (__classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_doAutoWc)
|
|
75511
75500
|
? __classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_hAutoWc)[ch.charAt(0)] ?? 0
|
|
@@ -75763,11 +75752,12 @@ class TxtStage extends pixi_js_1.Container {
|
|
|
75763
75752
|
if (he.elm.outerHTML.slice(0, 3) === '<rt')
|
|
75764
75753
|
continue;
|
|
75765
75754
|
const xy = this.tategaki ? he.rect.y : he.rect.x;
|
|
75766
|
-
if (sl_xy
|
|
75755
|
+
if (sl_xy <= xy) {
|
|
75767
75756
|
sl_xy = xy;
|
|
75768
75757
|
continue;
|
|
75769
75758
|
}
|
|
75770
75759
|
sl_xy = -Infinity;
|
|
75760
|
+
const oldJ = j;
|
|
75771
75761
|
if (__classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_reg分割禁止).test(e[j - 1].ch)
|
|
75772
75762
|
&& (e[j - 1].ch === he.ch)) {
|
|
75773
75763
|
if (CmnLib_1.CmnLib.debugLog)
|
|
@@ -75803,6 +75793,8 @@ class TxtStage extends pixi_js_1.Container {
|
|
|
75803
75793
|
else
|
|
75804
75794
|
pal.parentElement.insertBefore(br, pal);
|
|
75805
75795
|
j += 2;
|
|
75796
|
+
if (j < oldJ)
|
|
75797
|
+
j = oldJ;
|
|
75806
75798
|
len = -1;
|
|
75807
75799
|
break;
|
|
75808
75800
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxtLayer.d.ts","sourceRoot":"","sources":["../../src/sn/TxtLayer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAe,OAAO,EAAgE,MAAM,UAAU,CAAC;AAC9G,OAAO,EAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAU,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAW,eAAe,EAAC,MAAM,YAAY,CAAC;AAErD,OAAO,EAA6C,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE7E,qBAAa,QAAS,SAAQ,KAAK;;IAKlC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAI,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAI,OAAO,GAAG,IAAI;IAyHhI,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO;;IA6DpC,OAAO;IAWhB,IAAa,IAAI,CAAC,EAAE,EAAE,MAAM,EAAyC;IACrE,IAAa,IAAI,IADK,MAAM,CACY;IAG/B,SAAS;IACT,iBAAiB;IAEjB,GAAG,CAAC,IAAI,EAAE,IAAI;IAqCvB,IAAa,KAAK,WAA8B;IAChD,IAAa,MAAM,WAA+B;IA4ElD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAuDnC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO;IAM9B,MAAM,CAAC,GAAG,OAAQ,MAAM,YAAO;IAE/B,KAAK,UAAS;IAEd,OAAO,CAAC,eAAe;IAqDvB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"TxtLayer.d.ts","sourceRoot":"","sources":["../../src/sn/TxtLayer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAe,OAAO,EAAgE,MAAM,UAAU,CAAC;AAC9G,OAAO,EAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAU,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAW,eAAe,EAAC,MAAM,YAAY,CAAC;AAErD,OAAO,EAA6C,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE7E,qBAAa,QAAS,SAAQ,KAAK;;IAKlC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAI,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAI,OAAO,GAAG,IAAI;IAyHhI,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO;;IA6DpC,OAAO;IAWhB,IAAa,IAAI,CAAC,EAAE,EAAE,MAAM,EAAyC;IACrE,IAAa,IAAI,IADK,MAAM,CACY;IAG/B,SAAS;IACT,iBAAiB;IAEjB,GAAG,CAAC,IAAI,EAAE,IAAI;IAqCvB,IAAa,KAAK,WAA8B;IAChD,IAAa,MAAM,WAA+B;IA4ElD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAuDnC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO;IAM9B,MAAM,CAAC,GAAG,OAAQ,MAAM,YAAO;IAE/B,KAAK,UAAS;IAEd,OAAO,CAAC,eAAe;IAqDvB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAmTzB,QAAQ,CAAC,KAAK,gBAGb;IAED,SAAS,IAAI,IAAI;IAWjB,IAAI,QAAQ,WAA8C;IAE1D,IAAI,OAAO,YAA0C;IACrD,IAAI,OAAO,CAAC,CAAC,SAAA,EAAsC;IAEnD,QAAQ,CAAC,SAAS,SAAU,IAAI,mBAO7B;IACH,QAAQ,IAAI,OAAO;IAMV,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAOnC,SAAkB,MAAM,YAkBrB;IACM,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI;IA0BhD,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAK,IAAI;IAIrC,YAAY;IAEZ,cAAc,CAAC,GAAG,EAAE,eAAe;IAInC,sBAAsB,CAAC,GAAG,EAAE,eAAe;IAK3C,cAAc;IACd,sBAAsB;IAItB,IAAI,IAAI,MAAM;CAoBvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxtStage.d.ts","sourceRoot":"","sources":["../../src/sn/TxtStage.ts"],"names":[],"mappings":"AAOA,OAAO,EAAS,OAAO,EAA6B,MAAM,UAAU,CAAC;AACrE,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAC,SAAS,EAAW,MAAM,EAAuB,QAAQ,EAAQ,MAAM,SAAS,CAAC;AAGzF,UAAU,SAAS;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,MAAM,EAAI,MAAM,CAAC;IACjB,OAAO,EAAI,MAAM,CAAC;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,SAAS,EAAG,MAAM,CAAC;IACnB,OAAO,EAAI,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;CACpB;AAiBD,qBAAa,QAAS,SAAQ,SAAS;;IAmD1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAU,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhDrE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9B,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO;IAEhC,MAAM,CAAC,OAAO;gBAqCe,KAAK,EAAE,MAAM,EAAmB,QAAQ,EAAE,MAAK,OAAO;IAenF,GAAG,CAAC,IAAI,EAAE,IAAI;IAyEd,SAAS;IAWT,IAAI,QAAQ,YAA4B;IAIxC,IAAI,KAAK,IAAI,SAAS,CAAqB;IAC3C,IAAI,QAAQ,WAA8B;IAC1C,IAAI,SAAS,WAA+B;IAE5C,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA8WrC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"TxtStage.d.ts","sourceRoot":"","sources":["../../src/sn/TxtStage.ts"],"names":[],"mappings":"AAOA,OAAO,EAAS,OAAO,EAA6B,MAAM,UAAU,CAAC;AACrE,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAC,SAAS,EAAW,MAAM,EAAuB,QAAQ,EAAQ,MAAM,SAAS,CAAC;AAGzF,UAAU,SAAS;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,MAAM,EAAI,MAAM,CAAC;IACjB,OAAO,EAAI,MAAM,CAAC;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,SAAS,EAAG,MAAM,CAAC;IACnB,OAAO,EAAI,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;CACpB;AAiBD,qBAAa,QAAS,SAAQ,SAAS;;IAmD1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAU,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhDrE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9B,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO;IAEhC,MAAM,CAAC,OAAO;gBAqCe,KAAK,EAAE,MAAM,EAAmB,QAAQ,EAAE,MAAK,OAAO;IAenF,GAAG,CAAC,IAAI,EAAE,IAAI;IAyEd,SAAS;IAWT,IAAI,QAAQ,YAA4B;IAIxC,IAAI,KAAK,IAAI,SAAS,CAAqB;IAC3C,IAAI,QAAQ,WAA8B;IAC1C,IAAI,SAAS,WAA+B;IAE5C,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA8WrC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE;IAuRrB,QAAQ,IAAI,OAAO;IAWnB,MAAM,CAAC,WAAW;IAIlB,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM;IAChC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG;IA2CnC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;;IACjC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG;IA+BpC,SAAS,CAAC,GAAG,EAAE,MAAM;IAQrB,MAAM,CAAC,QAAQ;IAkGf,KAAK,IAAI,QAAQ;IAqBjB,MAAM;;;;;;;;;IAWN,QAAQ,CAAC,IAAI,EAAE,GAAG;IAelB,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAK,IAAI;IAgBrC,YAAY;IAIZ,cAAc,CAAC,GAAG,EAAE,eAAe;IAOnC,cAAc;IAEd,IAAI,IAAI,MAAM;IAaL,OAAO;CAOhB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@famibee/skynovel",
|
|
3
|
-
"version": "1.24.
|
|
3
|
+
"version": "1.24.1",
|
|
4
4
|
"description": "webgl novelgame framework",
|
|
5
5
|
"main": "core/web.js",
|
|
6
6
|
"types": "core/lib/index.d.ts",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@types/store": "^2.0.2",
|
|
37
37
|
"@types/tar-fs": "^2.0.1",
|
|
38
38
|
"@types/xml2js": "^0.4.9",
|
|
39
|
-
"electron": "^16.0.
|
|
39
|
+
"electron": "^16.0.5",
|
|
40
40
|
"mocha": "^9.1.3",
|
|
41
41
|
"power-assert": "^1.6.1",
|
|
42
42
|
"rimraf": "^3.0.2",
|
package/web.js
CHANGED
|
@@ -72818,14 +72818,14 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
|
|
|
72818
72818
|
const txt = hArg.text;
|
|
72819
72819
|
if (!txt)
|
|
72820
72820
|
throw 'textは必須です';
|
|
72821
|
-
let wait = (0, CmnLib_1.argChk_Num)(hArg, 'wait', -1);
|
|
72822
|
-
if (wait > 0 && this.val.getVal('tmp:sn.skip.enabled'))
|
|
72823
|
-
wait = 0;
|
|
72824
|
-
hArg.wait = wait;
|
|
72825
72821
|
const tl = __classPrivateFieldGet(this, _LayerMng_getTxtLayer, "f").call(this, hArg);
|
|
72826
72822
|
delete hArg.text;
|
|
72827
|
-
if (wait
|
|
72828
|
-
|
|
72823
|
+
if ('wait' in hArg) {
|
|
72824
|
+
(0, CmnLib_1.argChk_Num)(hArg, 'wait', NaN);
|
|
72825
|
+
if (this.val.getVal('tmp:sn.skip.enabled'))
|
|
72826
|
+
hArg.wait = 0;
|
|
72827
|
+
}
|
|
72828
|
+
__classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, 'add｜' + JSON.stringify(hArg), tl);
|
|
72829
72829
|
const record = (0, CmnLib_1.argChk_Boolean)(hArg, 'record', true);
|
|
72830
72830
|
const doRecLog = this.val.doRecLog();
|
|
72831
72831
|
if (!record)
|
|
@@ -72833,8 +72833,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
|
|
|
72833
72833
|
tl.tagCh(txt.replaceAll('[r]', '\n'));
|
|
72834
72834
|
if (!record)
|
|
72835
72835
|
this.val.setVal_Nochk('save', 'sn.doRecLog', doRecLog);
|
|
72836
|
-
|
|
72837
|
-
__classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, `add_close｜`, tl);
|
|
72836
|
+
__classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, `add_close｜`, tl);
|
|
72838
72837
|
return false;
|
|
72839
72838
|
}, _LayerMng_$getTxtLayer = function _LayerMng_$getTxtLayer(hArg) {
|
|
72840
72839
|
const layer = __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_argChk_layer).call(this, hArg, __classPrivateFieldGet(this, _LayerMng_curTxtlay, "f"));
|
|
@@ -76214,43 +76213,32 @@ class TxtLayer extends Layer_1.Layer {
|
|
|
76214
76213
|
if (isSkip)
|
|
76215
76214
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, 0, "f");
|
|
76216
76215
|
const rs = this.mkStyle_r_align(tx, rb, __classPrivateFieldGet(this, _TxtLayer_r_align, "f"));
|
|
76216
|
+
const da = ` data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'`;
|
|
76217
|
+
const st = `<span data-tcy='${id_tcy}' style='
|
|
76218
|
+
text-combine-upright: all;
|
|
76219
|
+
-webkit-text-combine: horizontal;
|
|
76220
|
+
${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}`;
|
|
76217
76221
|
add_htm = rb
|
|
76218
76222
|
? (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
76219
|
-
?
|
|
76220
|
-
|
|
76221
|
-
|
|
76222
|
-
|
|
76223
|
-
|
|
76224
|
-
|
|
76225
|
-
: (`<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;'>`
|
|
76226
|
-
+ `<ruby><span data-tcy='${id_tcy}' style='
|
|
76227
|
-
text-combine-upright: all;
|
|
76228
|
-
-webkit-text-combine: horizontal;
|
|
76229
|
-
${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}
|
|
76230
|
-
' data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'>${tx}</span>`
|
|
76231
|
-
+ `<rt${rs}>${rb}</rt></ruby>`
|
|
76232
|
-
+ `</span>`))
|
|
76223
|
+
? `<ruby>${st}'${da} data-cmd='linkrsv'>${tx}</span>
|
|
76224
|
+
<rt${rs}>${rb}</rt></ruby>`
|
|
76225
|
+
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;'>
|
|
76226
|
+
<ruby>${st}'${da}>${tx}</span>
|
|
76227
|
+
<rt${rs}>${rb}</rt></ruby>
|
|
76228
|
+
</span>`)
|
|
76233
76229
|
: (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
76234
|
-
?
|
|
76235
|
-
|
|
76236
|
-
-webkit-text-combine: horizontal;
|
|
76237
|
-
${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, tx)}
|
|
76238
|
-
' data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}' data-cmd='linkrsv'>${tx}</span>`)
|
|
76239
|
-
: `<span data-tcy='${id_tcy}' style='
|
|
76240
|
-
text-combine-upright: all;
|
|
76241
|
-
-webkit-text-combine: horizontal;
|
|
76230
|
+
? `${st}'${da} data-cmd='linkrsv'>${tx}</span>`
|
|
76231
|
+
: `${st}
|
|
76242
76232
|
animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;
|
|
76243
76233
|
height: 1em;
|
|
76244
|
-
|
|
76245
|
-
' class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'>${tx}</span>`);
|
|
76234
|
+
' class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}'${da}>${tx}</span>`);
|
|
76246
76235
|
if (__classPrivateFieldGet(this, _TxtLayer_ch_in_join, "f"))
|
|
76247
76236
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, __classPrivateFieldGet(this, _TxtLayer_cumDelay, "f") + ((__classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_doAutoWc))
|
|
76248
76237
|
? __classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_hAutoWc)[ch.charAt(0)] ?? 0
|
|
76249
76238
|
: LayerMng_1.LayerMng.msecChWait), "f");
|
|
76250
76239
|
}
|
|
76251
76240
|
break;
|
|
76252
|
-
default:
|
|
76253
|
-
throw `異常な値です putCh(text: ${ch}, ruby: ${ruby})`;
|
|
76241
|
+
default: throw `異常な値です putCh(text: ${ch}, ruby: ${ruby})`;
|
|
76254
76242
|
}
|
|
76255
76243
|
break;
|
|
76256
76244
|
}
|
|
@@ -76732,15 +76720,16 @@ _a = TxtLayer, _TxtLayer_b_color = new WeakMap(), _TxtLayer_b_alpha = new WeakMa
|
|
|
76732
76720
|
const rs = this.mkStyle_r_align(ch, ruby, r_align);
|
|
76733
76721
|
if (isSkip)
|
|
76734
76722
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, 0, "f");
|
|
76723
|
+
const da = ` data-add='{"ch_in_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}", "ch_out_style":"${__classPrivateFieldGet(this, _TxtLayer_$ch_out_style, "f")}"}'`;
|
|
76735
76724
|
add_htm = ruby
|
|
76736
76725
|
? (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
76737
|
-
? `<ruby style='${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'
|
|
76738
|
-
:
|
|
76739
|
-
|
|
76740
|
-
|
|
76726
|
+
? `<ruby style='${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'${da} data-cmd='linkrsv'>${ch}<rt${rs}>${ruby}</rt></ruby>`
|
|
76727
|
+
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'>
|
|
76728
|
+
<ruby${da}>${ch}<rt${rs}>${ruby}</rt></ruby>
|
|
76729
|
+
</span>`)
|
|
76741
76730
|
: (__classPrivateFieldGet(this, _TxtLayer_aSpan_bk, "f")
|
|
76742
76731
|
? __classPrivateFieldGet(this, _TxtLayer_fncFFSSpan, "f").call(this, ch)
|
|
76743
|
-
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'
|
|
76732
|
+
: `<span class='sn_ch sn_ch_in_${__classPrivateFieldGet(this, _TxtLayer_$ch_in_style, "f")}' style='animation-delay: ${__classPrivateFieldGet(this, _TxtLayer_cumDelay, "f")}ms;${__classPrivateFieldGet(this, _TxtLayer_fncFFSStyle, "f").call(this, ch)}'${da}>${ch}</span>`);
|
|
76744
76733
|
if (__classPrivateFieldGet(this, _TxtLayer_ch_in_join, "f"))
|
|
76745
76734
|
__classPrivateFieldSet(this, _TxtLayer_cumDelay, __classPrivateFieldGet(this, _TxtLayer_cumDelay, "f") + (__classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_doAutoWc)
|
|
76746
76735
|
? __classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_hAutoWc)[ch.charAt(0)] ?? 0
|
|
@@ -76998,11 +76987,12 @@ class TxtStage extends pixi_js_1.Container {
|
|
|
76998
76987
|
if (he.elm.outerHTML.slice(0, 3) === '<rt')
|
|
76999
76988
|
continue;
|
|
77000
76989
|
const xy = this.tategaki ? he.rect.y : he.rect.x;
|
|
77001
|
-
if (sl_xy
|
|
76990
|
+
if (sl_xy <= xy) {
|
|
77002
76991
|
sl_xy = xy;
|
|
77003
76992
|
continue;
|
|
77004
76993
|
}
|
|
77005
76994
|
sl_xy = -Infinity;
|
|
76995
|
+
const oldJ = j;
|
|
77006
76996
|
if (__classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_reg分割禁止).test(e[j - 1].ch)
|
|
77007
76997
|
&& (e[j - 1].ch === he.ch)) {
|
|
77008
76998
|
if (CmnLib_1.CmnLib.debugLog)
|
|
@@ -77038,6 +77028,8 @@ class TxtStage extends pixi_js_1.Container {
|
|
|
77038
77028
|
else
|
|
77039
77029
|
pal.parentElement.insertBefore(br, pal);
|
|
77040
77030
|
j += 2;
|
|
77031
|
+
if (j < oldJ)
|
|
77032
|
+
j = oldJ;
|
|
77041
77033
|
len = -1;
|
|
77042
77034
|
break;
|
|
77043
77035
|
}
|