Merge branch 'noAnimate' into hasAnimate

This commit is contained in:
bdf1 2022-11-13 21:13:44 +13:00
commit af85295bfd
5 changed files with 338 additions and 159 deletions

View File

@ -49,12 +49,19 @@ main.floors.MT22=
"time": 100
},
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"287.2",
"417.6"
],
"opacity": 1,
"time": 0
@ -87,12 +94,19 @@ main.floors.MT22=
"time": 100
},
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"287.2",
"417.6"
],
"opacity": 1,
"time": 0
@ -113,12 +127,19 @@ main.floors.MT22=
"time": 100
},
{
"type": "showImage",
"type": "showImage2",
"code": 3,
"image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"287.2",
"417.6"
],
"opacity": 1,
"time": 0
@ -144,12 +165,19 @@ main.floors.MT22=
"value": "flag:juqing+1"
},
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
20
330,
70,
"287.2",
"417.6"
],
"opacity": 1,
"time": 0
@ -164,18 +192,21 @@ main.floors.MT22=
"time": 100
},
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "shaohusikao.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
},
{
"type": "sleep",
"time": 100
},
"\t[邵虎]明知道这里很危险你还过来,还跟一个怪物叫板,是算准了我会来救你么。",
@ -195,12 +226,19 @@ main.floors.MT22=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 3,
"image": "shaohuzixin.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
@ -362,12 +400,19 @@ main.floors.MT22=
"condition": "(flag:22fjieke==1)",
"true": [
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -392,24 +437,38 @@ main.floors.MT22=
"text": "否",
"action": [
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
},
"\t[杰克]可恶......这样下去......",
{
"type": "showImage",
"type": "showImage2",
"code": 3,
"image": "shaohuzixin.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
@ -421,12 +480,19 @@ main.floors.MT22=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 4,
"image": "jiekeyilv.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -439,12 +505,19 @@ main.floors.MT22=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 5,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0

View File

@ -117,24 +117,38 @@ main.floors.MT23=
"keep": true
},
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "shaohuzixin.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
},
"\t[邵虎]这不是杰克嘛。怎么跑这么快。",
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "jiekexiaohei.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -146,12 +160,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 3,
"image": "shaohujinzhang.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
@ -163,12 +184,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 4,
"image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -180,12 +208,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 5,
"image": "shaohujinzhang.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
@ -199,12 +234,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 6,
"image": "jiekexiaohei.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -217,12 +259,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 7,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -251,12 +300,19 @@ main.floors.MT23=
]
},
{
"type": "showImage",
"type": "showImage2",
"code": 8,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -291,24 +347,38 @@ main.floors.MT23=
"keep": true
},
{
"type": "showImage",
"type": "showImage2",
"code": 9,
"image": "shaohuyilv.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
},
"\t[邵虎]诶?",
{
"type": "showImage",
"type": "showImage2",
"code": 10,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -351,12 +421,19 @@ main.floors.MT23=
"direction": "right"
},
{
"type": "showImage",
"type": "showImage2",
"code": 11,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -370,12 +447,19 @@ main.floors.MT23=
"\t[水化人]。。。。。。",
"\t[水化人]真是见鬼。。我好像听到什么声音。。",
{
"type": "showImage",
"type": "showImage2",
"code": 12,
"image": "jiekedajiao.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -388,12 +472,19 @@ main.floors.MT23=
},
"\t[水化人]。。。。。。",
{
"type": "showImage",
"type": "showImage2",
"code": 13,
"image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -419,12 +510,19 @@ main.floors.MT23=
},
"\t[水化人]。。。哇哇哇!!!谁。。谁打我!?",
{
"type": "showImage",
"type": "showImage2",
"code": 14,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -436,12 +534,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 15,
"image": "shaohujinzhang.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
@ -453,12 +558,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 16,
"image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -486,12 +598,19 @@ main.floors.MT23=
]
},
{
"type": "showImage",
"type": "showImage2",
"code": 17,
"image": "shaohujinzhang.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
0,
50,
291,
466
],
"opacity": 1,
"time": 0
@ -503,12 +622,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 18,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -563,12 +689,19 @@ main.floors.MT23=
]
},
{
"type": "showImage",
"type": "showImage2",
"code": 19,
"image": "jiekedajiao.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -589,12 +722,19 @@ main.floors.MT23=
]
},
{
"type": "showImage",
"type": "showImage2",
"code": 20,
"image": "fuyi.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
400,
100,
192,
300
],
"opacity": 1,
"time": 0
@ -650,12 +790,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 21,
"image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0
@ -667,12 +814,19 @@ main.floors.MT23=
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 22,
"image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [
200,
40
330,
70,
"289.6",
"376.8"
],
"opacity": 1,
"time": 0

View File

@ -786,7 +786,7 @@ main.floors.zhenhong=
},
{
"type": "function",
"function": "function(){\ncore.plugin.donghua3()\n}"
"function": "function(){\ncore.plugin.donghua5()\n}"
},
{
"type": "moveHero",

View File

@ -1153,6 +1153,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
if (core.inArray(type, 'poison') && !core.hasFlag("poison")) {
// 获得毒效果
core.setFlag('poison', true);
core.plugin.donghua3();
}
if (core.inArray(type, 'weak') && !core.hasFlag('weak')) {
// 获得衰效果

View File

@ -2308,8 +2308,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
} else core.stopAnimate(core.getFlag("linshi2", 0), false);
}
this.donghua3 = function () {
if (core.getFlag("bofang", 0) == 1) {
core.setFlag("linshi3", core.drawHeroAnimate("lansebaofa",
if (core.getFlag("poison")) {
core.setFlag("linshi3", core.drawHeroAnimate("dufa",
function () {
core.plugin.donghua3();
}));
@ -2960,7 +2960,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
"怪物手册和显伤": function () {
// 在此增加新插件
////// 获得所有特殊属性的名称 /////
enemys.prototype.getSpecialText = function (enemy) {
core.enemys.getSpecialText = function (enemy) {
if (typeof enemy == 'string') enemy = core.material.enemys[enemy];
if (!enemy) return [];
var special = enemy.special;
@ -2980,7 +2980,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
}
////// 获得所有特殊属性的颜色 //////
enemys.prototype.getSpecialColor = function (enemy) {
core.enemys.getSpecialColor = function (enemy) {
if (typeof enemy == 'string') enemy = core.material.enemys[enemy];
if (!enemy) return [];
var special = enemy.special;
@ -2999,7 +2999,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
return colors;
}
ui.prototype._drawBook_drawDamage = function (index, enemy, offset, position) {
core.ui._drawBook_drawDamage = function (index, enemy, offset, position) {
core.setTextAlign('ui', 'center');
var damage = enemy.damage,
color = '#FFFF00';
@ -3008,7 +3008,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
color = '#FF2222';
} else {
if (damage >= core.status.hero.hp) color = '#FF2222';
else if (damage >= core.status.hero.hp * 2 / 3) color = '#FF9933';
else if (damage >= core.status.hero.hp * 1 / 3) color = '#FF9933';
else if (damage <= 0) color = '#11FF11';
damage = core.formatBigNumber(damage);
if (core.enemys.hasSpecial(enemy, 19)) damage += "+";
@ -3018,54 +3018,5 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
if (enemy.notBomb) damage += "[b]";
core.fillText('ui', damage, offset, position, color, this._buildFont(13, true));
}
},
"楼传界面": function () {
// 在此增加新插件
////// 绘制楼层传送器 //////
ui.prototype.drawFly = function (page) {
core.status.event.data = page;
var floorId = core.floorIds[page];
var title = core.status.maps[floorId].title;
core.clearMap('ui');
core.setAlpha('ui', 0.85);
core.fillRect('ui', 0, 0, core._PX_, core._PY_, '#000000');
core.setAlpha('ui', 1);
core.setTextAlign('ui', 'center');
core.fillText('ui', '楼层跳跃', core._PX_ / 2, 48, '#FFFFFF', this._buildFont(28, true));
core.fillText('ui', '返回游戏', core._PX_ / 2, core._PY_ - 13, null, this._buildFont(15, true))
core.setTextAlign('ui', 'right');
core.fillText('ui', '浏览地图时也', core._PX_ - 10, core._PY_ - 23, '#aaaaaa', this._buildFont(10, false));
core.fillText('ui', '可楼层跳跃!', core._PX_ - 10, core._PY_ - 11, null, this._buildFont(10, false));
core.setTextAlign('ui', 'center');
var middle = core._PY_ / 2 + 39;
// 换行
var lines = core.splitLines('ui', title, 120, this._buildFont(16, true));
var start_y = middle - (lines.length - 1) * 11;
for (var i in lines) {
core.fillText('ui', lines[i], core._PX_ - 60, start_y, '#FFFFFF');
start_y += 22;
}
if (core.actions._getNextFlyFloor(1) != page) {
core.fillText('ui', '▲', core._PX_ - 60, middle - 64, null, this._buildFont(17, false));
core.fillText('ui', '▲', core._PX_ - 60, middle - 96);
core.fillText('ui', '▲', core._PX_ - 60, middle - 96 - 7);
}
if (core.actions._getNextFlyFloor(-1) != page) {
core.fillText('ui', '▼', core._PX_ - 60, middle + 64, null, this._buildFont(17, false));
core.fillText('ui', '▼', core._PX_ - 60, middle + 96);
core.fillText('ui', '▼', core._PX_ - 60, middle + 96 + 7);
}
var size = 0.75;
core.strokeRect('ui', 16, 64, size * core._PX_, size * core._PY_, '#FFFFFF', 2);
core.drawThumbnail(floorId, null, { ctx: 'ui', x: 16, y: 64, size: size, damage: true, all: true });
}
}
}