Compare commits

...

2 Commits

Author SHA1 Message Date
1422874ab6 Merge branch 'noAnimate' into hasAnimate 2023-04-18 23:10:58 +08:00
fec84878bf 修复选择难度层图片左移问题
修复MT0梅花屏障对话问题
修复MT10回忆剧情对话问题
MT10回忆画面中楼层切换增加转场效果
2023-04-18 23:10:06 +08:00
6 changed files with 28 additions and 18 deletions

View File

@ -81,7 +81,7 @@ main.floors.MT0=
},
{
"type": "if",
"condition": "(core.isReplaying()||flag:SkipThePlot)",
"condition": "(core.isReplaying()||(flag:SkipThePlot||switch:A))",
"true": [
{
"type": "setValue",
@ -93,6 +93,11 @@ main.floors.MT0=
"type": "hideImage",
"code": 1,
"time": 0
},
{
"type": "setValue",
"name": "switch:A",
"value": "true"
}
],
"false": [
@ -114,6 +119,11 @@ main.floors.MT0=
"type": "hideImage",
"code": 1,
"time": 0
},
{
"type": "setValue",
"name": "switch:A",
"value": "true"
}
]
}

View File

@ -81,7 +81,7 @@ main.floors.huxiao1=
"\r[#f49af1]就绝对不允许联盟和外人对我们妖社不利!",
"\r[#f49af1].........",
"\r[#fb928b]........但愿吧。",
"\r[#fb928b]嗜骨......你知道我们为什么要暗地与联盟作吗",
"\r[#fb928b]嗜骨......你知道我们为什么要暗地与联盟作吗",
"\r[#f49af1]....这.......因为他们是........",
"\r[#fb928b]不........天塔本身就不是为了我们魔物而建造的。",
"\r[#fb928b]建造天塔的本性在于封印【那个人】",
@ -118,6 +118,10 @@ main.floors.huxiao1=
"\r[#fb928b]要小心点那个家伙.....",
"\r[#fb928b]那家伙精得很,别说漏了什么......",
"\r[#f49af1]魔龙大人请放心,我一定不辜负您的重托!",
{
"type": "function",
"function": "function(){\ncore.maskPrepare();\n}"
},
{
"type": "changeFloor",
"floorId": "huxiao2",

View File

@ -19,14 +19,14 @@ main.floors.huxiao2=
"events": {
"1,0": [
{
"type": "setCurtain",
"time": 500
"type": "function",
"function": "function(){\ncore.maskFliter(500,'013-Square01.png')\n}"
},
"\r[#f49af1]毒尾..........你怎么又背着我喝那种东西........",
"\r[#87e291]没事的嗜骨......只有喝下这个......",
"\r[#87e291] ......才能让自己的毒性更强啊.........",
"\r[#f49af1]你给我.........不要喝了......",
"\r[#f49af1]你难道不知道你的是你的寿命......",
"\r[#f49af1]你难道不知道你的是你的寿命......",
"\r[#f49af1]喝的是你的时间吗!!!?",
"\r[#f49af1]你难道就不为了你身边的人想想?",
"\r[#f49af1]血尾呢?你们关系不是最好了吗?",
@ -65,15 +65,8 @@ main.floors.huxiao2=
"\r[#87e291](咕噜咕噜............",
"\r[#f49af1]...........(我什么都做不了)........",
{
"type": "setCurtain",
"color": [
0,
0,
0,
1
],
"time": 500,
"keep": true
"type": "function",
"function": "function(){\ncore.maskPrepare();\n}"
},
{
"type": "changeFloor",

View File

@ -19,8 +19,8 @@ main.floors.huxiao3=
"events": {
"1,0": [
{
"type": "setCurtain",
"time": 500
"type": "function",
"function": "function(){\ncore.maskFliter(500,'013-Square01.png')\n}"
},
"\r[#87e291]海骑士大人..........您就行行好吧...........",
"\r[#9decf8]毒尾,你回去吧。",

View File

@ -86,7 +86,7 @@ main.floors.nandu=
"function": "function(){\ncore.drawImage(core.dom.wholeCtx, core.material.images.images['nanduxuanze.jpg'], 0, 0);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 1 ? \"\" : \"an\") + 'easy.png'], -30, -55, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 2 ? \"\" : \"an\") + 'normal.png'], -30, 20, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 3 ? \"\" : \"an\") + 'hard.png'], -30, 95, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 4 ? \"\" : \"an\") + 'hell.png'], -30, 170, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 5 || flags.hard == 0 ? \"\" : \"an\") + 'cheating.png'], -30, 245, 710 * 0.6, 487 * 0.6);\n}"
},
{
"type": "showImage2",
"type": "showImage",
"code": 6,
"image": "0easy.png",
"loc": [
@ -213,7 +213,7 @@ main.floors.nandu=
"false": [
{
"type": "function",
"function": "function(){\ncore.drawImage(core.dom.wholeCtx, core.material.images.images['nanduxuanze.jpg'], 0, 0);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 1 ? \"\" : \"an\") + 'easy.png'], -30, -55, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 2 ? \"\" : \"an\") + 'normal.png'], -30, 20, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 3 ? \"\" : \"an\") + 'hard.png'], -30, 95, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 4 ? \"\" : \"an\") + 'hell.png'], -30, 170, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 5 || flags.hard == 0 ? \"\" : \"an\") + 'cheating.png'], -30, 245, 710 * 0.6, 487 * 0.6);\n\ncore.insertAction({ \"type\": \"showImage2\", \"code\": 6, \"image\": [\"0cheating.png\", \"0easy.png\", \"0normal.png\", \"0hard.png\", \"0hell.png\", \"0cheating.png\"][flags.hard], \"loc\": [-160, 0], \"opacity\": 1, \"time\": 0 })\n}"
"function": "function(){\ncore.drawImage(core.dom.wholeCtx, core.material.images.images['nanduxuanze.jpg'], 0, 0);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 1 ? \"\" : \"an\") + 'easy.png'], -30, -55, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 2 ? \"\" : \"an\") + 'normal.png'], -30, 20, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 3 ? \"\" : \"an\") + 'hard.png'], -30, 95, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 4 ? \"\" : \"an\") + 'hell.png'], -30, 170, 710 * 0.6, 487 * 0.6);\ncore.drawImage(core.dom.wholeCtx, core.material.images.images[(flags.hard == 5 || flags.hard == 0 ? \"\" : \"an\") + 'cheating.png'], -30, 245, 710 * 0.6, 487 * 0.6);\n\ncore.insertAction({ \"type\": \"showImage\", \"code\": 6, \"image\": [\"0cheating.png\", \"0easy.png\", \"0normal.png\", \"0hard.png\", \"0hell.png\", \"0cheating.png\"][flags.hard], \"loc\": [-160, 0], \"opacity\": 1, \"time\": 0 })\n}"
}
]
}

View File

@ -3941,6 +3941,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
this.maskPrepare = function () {
// 执行后画面将凝固
var mask = core.ui.createCanvas2("mask", 0, 0, core.__PIXELS__ + 161, core.__PIXELS__, 200);
if (flags.Memories_grayscale) { ///回忆中图片做旧
core.setFilter("mask", 'saturate(25%)');
}
core.drawThumbnail(core.status.floorId, null, { ctx: mask, x: 161, y: 0, size: 1, damage: false, all: true });
core.drawImage('mask', 'caidan.png', 0, 0);
// for (var m in core.canvas) {