diff --git a/editor.html b/editor.html
index cce7d36c..0ae3917b 100644
--- a/editor.html
+++ b/editor.html
@@ -341,6 +341,10 @@
![]()
+
diff --git a/index.html b/index.html
index 62182c53..2a05eb95 100644
--- a/index.html
+++ b/index.html
@@ -62,6 +62,10 @@
![]()
+
diff --git a/libs/actions.js b/libs/actions.js
index 5b6c1ee5..9c70ab75 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -8,7 +8,7 @@ function actions() {
}
actions.prototype.init = function () {
-
+ this.actionsdata = functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a.actions;
}
////// 按下某个键时 //////
@@ -282,152 +282,16 @@ actions.prototype.keyUp = function(keyCode, altKey) {
this.keyUpCenterFly(keyCode);
return;
}
+ if (core.status.event.id=='paint') {
+ this.keyUpPaint(keyCode);
+ }
return;
}
if(!core.status.played)
return;
- // 0~9的AltKey
- if (altKey && keyCode>=48 && keyCode<=57 && core.status.heroStop) {
- core.items.quickLoadEquip(keyCode-48);
- return;
- }
-
- switch (keyCode) {
- case 27: // ESC
- if (core.status.heroStop)
- core.openSettings(true);
- break;
- case 71: // G
- if (core.status.heroStop)
- core.useFly(true);
- break;
- case 81: // Q
- if (core.status.heroStop)
- core.openEquipbox(true);
- break;
- case 88: // X
- if (core.status.heroStop)
- core.openBook(true);
- break;
- case 65: // A
- if (core.status.heroStop)
- core.doSL("autoSave", "load");
- break;
- case 66: // B
- if (core.status.heroStop)
- core.ui.drawStatistics();
- break;
- case 83: // S
- if (core.status.heroStop)
- core.save(true);
- break;
- case 68: // D
- if (core.status.heroStop)
- core.load(true);
- break;
- case 69: // E
- if (core.status.heroStop)
- core.ui.drawCursor();
- break;
- case 84: // T
- if (core.status.heroStop)
- core.openToolbox(true);
- break;
- case 90: // Z
- if (core.status.heroStop)
- core.turnHero();
- break;
- case 75: case 86: // K/V
- if (core.status.heroStop)
- core.openQuickShop(true);
- break;
- case 32: // SPACE
- if (core.status.heroStop)
- core.getNextItem();
- break;
- case 72: // H
- if (core.status.heroStop)
- core.ui.drawHelp();
- break;
- case 82: // R
- if (core.status.heroStop) {
- if (core.hasFlag('debug')) {
- core.drawText("\t[系统提示]调试模式下无法回放录像");
- }
- else {
- core.ui.drawReplay();
- }
- }
- break;
- case 33: case 34: // PAGEUP/PAGEDOWN
- if (core.status.heroStop) {
- core.ui.drawMaps();
- }
- break;
- case 37: // UP
- break;
- case 38: // DOWN
- break;
- case 39: // RIGHT
- break;
- case 40: // DOWN
- break;
- case 49: // 快捷键1: 破
- if (core.status.heroStop && core.hasItem('pickaxe')) {
- if (core.canUseItem('pickaxe')) {
- core.useItem('pickaxe');
- }
- else {
- core.drawTip('当前不能使用破墙镐');
- }
- }
- break;
- case 50: // 快捷键2: 炸
- if (core.status.heroStop) {
- if (core.hasItem('bomb')) {
- if (core.canUseItem('bomb')) {
- core.useItem('bomb');
- }
- else {
- core.drawTip('当前不能使用炸弹');
- }
- }
- else if (core.hasItem('hammer')) {
- if (core.canUseItem('hammer')) {
- core.useItem('hammer');
- }
- else {
- core.drawTip('当前不能使用圣锤');
- }
-
- }
- }
- break;
- case 51: // 快捷键3: 飞
- if (core.status.heroStop && core.hasItem('centerFly')) {
- core.events.useItem('centerFly');
- }
- break;
- case 52: // 快捷键4：破冰/冰冻/地震/上下楼器/...
- if (core.status.heroStop) {
- var list = ["icePickaxe", "snow", "earthquake", "upFly", "downFly", "jumpShoes", "lifeWand", "poisonWine", "weakWine", "curseWine", "superWine"];
- for (var i=0;i
0) {
- text+="\n当前MAX为"+ending.max+"，最早由 "+(ending.username||"匿名")+" 于"+core.formatDate(new Date(1000*ending.timestamp))+"打出。";
- }
- })
- })
- core.drawText(text);
- }
- }
- else {
- core.drawText("出错啦！\n无法拉取统计信息。\n错误原因：HTTP "+xhr.status);
- }
- };
- xhr.ontimeout = function() {
- core.drawText("出错啦！\n无法拉取统计信息。\n错误原因：Timeout");
- }
- xhr.onerror = function() {
- core.drawText("出错啦！\n无法拉取统计信息。\n错误原因：XHR Error");
- }
- xhr.send(formData);
- */
- break;
case 6:
- core.ui.drawHelp();
+ core.ui.drawStatistics();
break;
case 7:
- core.ui.drawAbout();
+ core.ui.drawHelp();
break;
case 8:
+ core.ui.drawAbout();
+ break;
+ case 9:
core.ui.closePanel();
break;
}
@@ -2548,3 +2400,114 @@ actions.prototype.clickAbout = function () {
else
core.restart();
}
+
+
+////// 绘图相关 //////
+
+actions.prototype.ondownPaint = function (x, y) {
+ x+=core.bigmap.offsetX;
+ y+=core.bigmap.offsetY;
+ if (!core.status.event.data.erase) {
+ core.canvas.route.beginPath();
+ core.canvas.route.moveTo(x, y);
+ }
+ core.status.event.data.x = x;
+ core.status.event.data.y = y;
+}
+
+actions.prototype.onmovePaint = function (x, y) {
+ if (core.status.event.data.x==null) return;
+ x+=core.bigmap.offsetX;
+ y+=core.bigmap.offsetY;
+ if (core.status.event.data.erase) {
+ core.clearMap('route', x-10, y-10, 20, 20);
+ return;
+ }
+ var midx = (core.status.event.data.x+x)/2, midy = (core.status.event.data.y+y)/2;
+ core.canvas.route.quadraticCurveTo(midx, midy, x, y);
+ core.canvas.route.stroke();
+ core.status.event.data.x = x;
+ core.status.event.data.y = y;
+}
+
+actions.prototype.onupPaint = function (x,y) {
+ x+=core.bigmap.offsetX;
+ y+=core.bigmap.offsetY;
+ if (core.status.event.data.erase) {
+ core.clearMap('route', x-5, y-5, 10, 10);
+ }
+ else if (core.status.event.data.x!=null) {
+ var midx = (core.status.event.data.x+x)/2, midy = (core.status.event.data.y+y)/2;
+ core.canvas.route.quadraticCurveTo(midx, midy, x, y);
+ core.canvas.route.stroke();
+ }
+
+ core.status.event.data.x = null;
+ core.status.event.data.y = null;
+ // 保存
+ core.paint[core.status.floorId] = LZString.compress(core.utils.encodeCanvas(core.canvas.route).join(","));
+}
+
+actions.prototype.setPaintMode = function (mode) {
+ if (mode == 'paint') core.status.event.data.erase = false;
+ else if (mode == 'erase') core.status.event.data.erase = true;
+ else return;
+
+ core.drawTip("进入"+(core.status.event.data.erase?"擦除":"绘图")+"模式");
+}
+
+actions.prototype.savePaint = function () {
+ var data = {};
+ for (var floorId in core.paint) {
+ if (core.isset(core.paint[floorId]))
+ data[floorId] = LZString.decompress(core.paint[floorId]);
+ }
+ core.download(core.firstData.name+".h5paint", JSON.stringify({
+ 'name': core.firstData.name,
+ 'paint': data
+ }));
+}
+
+actions.prototype.loadPaint = function () {
+ core.readFile(function (obj) {
+ if (obj.name!=core.firstData.name) {
+ alert("绘图文件和游戏不一致！");
+ return;
+ }
+ if (!core.isset(obj.paint)) {
+ alert("无效的绘图文件！");
+ return;
+ }
+ core.paint = {};
+ for (var floorId in obj.paint) {
+ if (core.isset(obj.paint[floorId]))
+ core.paint[floorId] = LZString.compress(obj.paint[floorId]);
+ }
+
+ core.clearMap('route');
+ var value = core.paint[core.status.floorId];
+ if (core.isset(value)) value = LZString.decompress(value).split(",");
+ core.utils.decodeCanvas(value, 32*core.bigmap.width, 32*core.bigmap.height);
+ core.canvas.route.drawImage(core.bigmap.tempCanvas.canvas, 0, 0);
+
+ core.drawTip("读取绘图文件成功");
+ })
+}
+
+actions.prototype.exitPaint = function () {
+ core.clearMap('route');
+ core.ui.closePanel();
+ core.statusBar.image.shop.style.opacity = 1;
+ core.statusBar.image.toolbox.style.opacity = 1;
+ core.updateStatusBar();
+ core.drawTip("退出绘图模式");
+}
+
+actions.prototype.keyUpPaint = function (keycode) {
+ if (keycode==27 || keycode==88 || keycode==77 || keycode==13 || keycode==32 || keycode==67) {
+ this.exitPaint();
+ return;
+ }
+}
+
+////// 绘图相关 END //////
diff --git a/libs/control.js b/libs/control.js
index 0a6ce796..d69826b6 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2807,6 +2807,8 @@ control.prototype.resize = function(clientWidth, clientHeight) {
if (!core.flags.enableKeys) count--;
if (!core.flags.enablePZF) count--;
if (!core.flags.enableName) count--;
+ if (!core.flags.enableMana) count--;
+ if (!core.flags.enableSkill) count--;
var statusLineHeight = BASE_LINEHEIGHT * 9 / count;
var statusLineFontSize = DEFAULT_FONT_SIZE;
@@ -3086,6 +3088,12 @@ control.prototype.resize = function(clientWidth, clientHeight) {
display: core.flags.enableHPMax ? 'block': 'none'
}
},
+ {
+ id: 'manaCol',
+ rules: {
+ display: core.flags.enableMana ? 'block': 'none'
+ }
+ },
{
id: 'mdefCol',
rules: {
@@ -3110,6 +3118,12 @@ control.prototype.resize = function(clientWidth, clientHeight) {
display: core.flags.enableLevelUp ? 'block': 'none'
}
},
+ {
+ id: 'skillCol',
+ rules: {
+ display: core.flags.enableSkill ? 'block': 'none'
+ }
+ },
{
id: 'keyCol',
rules: {
diff --git a/libs/core.js b/libs/core.js
index d15765ae..38f0f4d8 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -81,6 +81,7 @@ function core() {
height: 13,
tempCanvas: null, // A temp canvas for drawing
}
+ this.paint = {}
this.initStatus = {
'played': false,
'gameOver': false,
@@ -395,18 +396,18 @@ core.prototype.keyUp = function(keyCode, altKey) {
}
////// 点击（触摸）事件按下时 //////
-core.prototype.ondown = function (x ,y) {
- return core.actions.ondown(x,y);
+core.prototype.ondown = function (loc) {
+ return core.actions.ondown(loc);
}
////// 当在触摸屏上滑动时 //////
-core.prototype.onmove = function (x ,y) {
- return core.actions.onmove(x,y);
+core.prototype.onmove = function (loc) {
+ return core.actions.onmove(loc);
}
////// 当点击（触摸）事件放开时 //////
-core.prototype.onup = function () {
- return core.actions.onup();
+core.prototype.onup = function (loc) {
+ return core.actions.onup(loc);
}
////// 获得点击事件相对左上角的坐标（0到12之间） //////
diff --git a/libs/events.js b/libs/events.js
index 56907f27..73397f40 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1532,6 +1532,8 @@ events.prototype.vibrate = function(time, callback) {
events.prototype.openShop = function(shopId, needVisited) {
var shop = core.status.shops[shopId];
shop.times = shop.times || 0;
+ if (shop.commonTimes)
+ shop.times = core.getFlag('commonTimes', 0);
shop.visited = shop.visited || false;
if (needVisited && !shop.visited) {
if (shop.times==0) core.drawTip("该商店尚未开启");
diff --git a/libs/ui.js b/libs/ui.js
index 381536ab..9636e447 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -836,7 +836,7 @@ ui.prototype.drawSettings = function () {
core.status.event.id = 'settings';
this.drawChoices(null, [
- "系统设置", "快捷商店", "浏览地图", "同步存档", "返回标题", "数据统计", "操作帮助", "关于本塔", "返回游戏"
+ "系统设置", "快捷商店", "浏览地图", "打开画板", "同步存档", "返回标题", "数据统计", "操作帮助", "关于本塔", "返回游戏"
]);
}
@@ -1645,6 +1645,10 @@ ui.prototype.drawMaps = function (index, x, y) {
core.clearMap('animate');
core.setOpacity('animate', 1);
+ var damage = (core.status.event.data||{}).damage, paint = (core.status.event.data||{}).paint;
+ if (core.isset(index.damage)) damage=index.damage;
+ if (core.isset(index.paint)) paint=index.paint;
+
if (core.isset(index.index)) {
x=index.x;
y=index.y;
@@ -1661,19 +1665,27 @@ ui.prototype.drawMaps = function (index, x, y) {
if (y<6) y=6;
if (y>mh-7) y=mh-7;
- core.status.event.data = {"index": index, "x": x, "y": y, "damage": (core.status.event.data||{"damage":false}).damage};
+ core.status.event.data = {"index": index, "x": x, "y": y, "damage": damage, "paint": paint};
clearTimeout(core.interval.tipAnimate);
core.clearMap('ui');
core.setAlpha('ui', 1);
this.drawThumbnail(floorId, 'ui', core.status.maps[floorId].blocks, 0, 0, 416, x, y);
+ // 绘图
+ if (core.status.event.data.paint) {
+ var offsetX = core.clamp(x-6, 0, mw-13), offsetY = core.clamp(y-6, 0, mh-13);
+ var value = core.paint[floorId];
+ if (core.isset(value)) value = LZString.decompress(value).split(",");
+ core.utils.decodeCanvas(value, 32*mw, 32*mh);
+ core.canvas.ui.drawImage(core.bigmap.tempCanvas.canvas, offsetX*32, offsetY*32, 416, 416, 0, 0, 416, 416);
+ }
+
core.clearMap('data');
core.setOpacity('data', 0.2);
core.canvas.data.textAlign = 'left';
core.setFont('data', '16px Arial');
-
var text = core.status.maps[floorId].title;
if (mw>13 || mh>13) text+=" ["+(x-6)+","+(y-6)+"]";
var textX = 16, textY = 18, width = textX + core.canvas.data.measureText(text).width + 16, height = 42;
@@ -2417,28 +2429,64 @@ ui.prototype.drawAbout = function () {
return this.uidata.drawAbout();
}
+////// 绘制“画图”界面 //////
+ui.prototype.drawPaint = function () {
+
+ core.drawText(
+ "\t[进入绘图模式]你可以在此页面上任意进行绘图和标记操作。\nM键可以进入或退出此模式。\n\n"+
+ "绘图的内容会自动保存，且以页面为生命周期，和存读档无关，重新开始游戏或读档后绘制的内容仍有效，但刷新页面就会消失。\n"+
+ "你可以将绘制内容保存到文件，也可以从文件读取保存的绘制内容。\n"+
+ "浏览地图页面可以按楼传按钮或M键来开启/关闭该层的绘图显示。\n\n更多功能请详见文档-元件-绘图模式。",
+ function () {
+ core.drawTip("打开绘图模式，现在可以任意在界面上绘图标记");
+
+ core.lockControl();
+ core.status.event.id = 'paint';
+ core.status.event.data = {"x": null, "y": null, "erase": false};
+
+ core.clearMap('ui');
+ core.clearMap('route');
+
+ core.setAlpha('route', 1);
+ core.setOpacity('route', 1);
+
+ // 将已有的内容绘制到route上
+ var value = core.paint[core.status.floorId];
+ if (core.isset(value)) value = LZString.decompress(value).split(",");
+ core.utils.decodeCanvas(value, 32*core.bigmap.width, 32*core.bigmap.height);
+ core.canvas.route.drawImage(core.bigmap.tempCanvas.canvas, 0, 0);
+
+ core.setLineWidth('route', 3);
+ core.setStrokeStyle('route', '#FF0000');
+
+ core.statusBar.image.shop.style.opacity = 0;
+ core.statusBar.image.toolbox.style.opacity = 0;
+
+ core.statusBar.image.book.src = core.statusBar.icons.paint.src;
+ core.statusBar.image.fly.src = core.statusBar.icons.erase.src;
+ core.statusBar.image.settings.src = core.statusBar.icons.exit.src;
+ core.statusBar.image.book.style.opacity = 1;
+ core.statusBar.image.fly.style.opacity = 1;
+ }
+ );
+}
+
////// 绘制帮助页面 //////
ui.prototype.drawHelp = function () {
core.drawText([
"\t[键盘快捷键列表]"+
- "[CTRL] 跳过对话\n" +
- "[Z] 转向\n" +
- "[X] 打开/关闭怪物手册\n" +
- "[G] 打开/关闭楼层传送器\n" +
- "[A] 读取自动存档（回退）\n" +
+ "[CTRL] 跳过对话 [Z] 转向\n" +
+ "[X] 怪物手册 [G] 楼层传送\n" +
+ "[A] 读取自动存档 [S/D] 存读档页面\n" +
"[S/D] 打开/关闭存/读档页面\n" +
- "[K/V] 打开/关闭快捷商店选择列表\n" +
- "[T] 打开/关闭工具栏\n" +
- "[ESC] 打开/关闭系统菜单\n" +
- "[B] 打开数据统计\n" +
- // "[E] 显示光标\n" +
- "[H] 打开帮助页面\n"+
- "[R] 回放\n"+
- "[SPACE] 轻按（仅在轻按开关打开时有效）\n" +
+ "[K/V] 快捷商店 [ESC] 系统菜单\n" +
+ "[T] 道具页面 [Q] 装备页面\n" +
+ "[B] 数据统计 [H] 帮助页面\n" +
+ "[R] 回放录像 [E] 显示光标\n" +
+ "[SPACE] 轻按 [M] 绘图模式\n" +
"[PgUp/PgDn] 浏览地图\n"+
- "[1] 快捷使用破墙镐\n" +
- "[2] 快捷使用炸弹/圣锤\n" +
- "[3] 快捷使用中心对称飞行器",
+ "[1~4] 快捷使用破炸飞和其他道具\n"+
+ "[Alt+0~9] 快捷换装",
"\t[鼠标操作]"+
"点状态栏中图标： 进行对应的操作\n"+
"点任意块： 寻路并移动\n"+
@@ -2446,7 +2494,7 @@ ui.prototype.drawHelp = function () {
"双击空地： 瞬间移动\n"+
"单击勇士： 转向\n"+
"双击勇士： 轻按（仅在轻按开关打开时有效）\n"+
- "长按任意位置：跳过剧情对话或打开虚拟键盘\n"
+ "长按任意位置：跳过剧情对话或打开虚拟键盘"
]);
}
diff --git a/libs/utils.js b/libs/utils.js
index ee7a845c..b347f524 100644
--- a/libs/utils.js
+++ b/libs/utils.js
@@ -253,14 +253,14 @@ utils.prototype.cropImage = function (image, size) {
////// 格式化时间为字符串 //////
utils.prototype.formatDate = function(date) {
if (!core.isset(date)) return "";
- return date.getFullYear()+"-"+core.setTwoDigits(date.getMonth()+1)+"-"+core.setTwoDigits(date.getDate())+" "
+ return ""+date.getFullYear()+"-"+core.setTwoDigits(date.getMonth()+1)+"-"+core.setTwoDigits(date.getDate())+" "
+core.setTwoDigits(date.getHours())+":"+core.setTwoDigits(date.getMinutes())+":"+core.setTwoDigits(date.getSeconds());
}
////// 格式化时间为最简字符串 //////
utils.prototype.formatDate2 = function (date) {
if (!core.isset(date)) return "";
- return date.getFullYear()+core.setTwoDigits(date.getMonth()+1)+core.setTwoDigits(date.getDate())
+ return ""+date.getFullYear()+core.setTwoDigits(date.getMonth()+1)+core.setTwoDigits(date.getDate())
+core.setTwoDigits(date.getHours())+core.setTwoDigits(date.getMinutes())+core.setTwoDigits(date.getSeconds());
}
@@ -460,6 +460,26 @@ utils.prototype.decodeBase64 = function (str) {
}).join(''));
}
+////// 任意进制转换 //////
+utils.prototype.convertBase = function (str, fromBase, toBase) {
+ var map = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_-+={}[]\\|:;<>,.?/";
+ if (fromBase==toBase) return str;
+ var len = str.length, ans="";
+ var t = [];
+ for (var i=0;i0) {
+ for (var i=len; i>=1; i--) {
+ t[i-1]+=t[i]%toBase*fromBase;
+ t[i]=parseInt(t[i]/toBase);
+ }
+ ans+=map.charAt(t[0]%toBase);
+ t[0]=parseInt(t[0]/toBase);
+ while (len>0 && t[len-1]==0) len--;
+ }
+ return ans;
+}
+
utils.prototype.__init_seed = function () {
var rand = new Date().getTime()%34834795 + 3534;
rand = this.__next_rand(rand);
@@ -726,6 +746,58 @@ utils.prototype.hide = function (obj, speed, callback) {
}, speed);
}
+utils.prototype.encodeCanvas = function (ctx) {
+ var list = [];
+ var width = ctx.canvas.width, height = ctx.canvas.height;
+ ctx.mozImageSmoothingEnabled = false;
+ ctx.webkitImageSmoothingEnabled = false;
+ ctx.msImageSmoothingEnabled = false;
+ ctx.imageSmoothingEnabled = false;
+
+ var imgData = ctx.getImageData(0, 0, width, height);
+ for (var i=0;i threshold;
diff --git a/main.js b/main.js
index d411900b..cee1293a 100644
--- a/main.js
+++ b/main.js
@@ -55,6 +55,7 @@ function main() {
'nameCol': document.getElementById('nameCol'),
'lvCol': document.getElementById('lvCol'),
'hpmaxCol': document.getElementById('hpmaxCol'),
+ 'manaCol': document.getElementById('manaCol'),
'mdefCol': document.getElementById('mdefCol'),
'moneyCol': document.getElementById('moneyCol'),
'expCol': document.getElementById('expCol'),
@@ -62,6 +63,7 @@ function main() {
'keyCol': document.getElementById('keyCol'),
'pzfCol': document.getElementById('pzfCol'),
'debuffCol': document.getElementById('debuffCol'),
+ 'skillCol': document.getElementById('skillCol'),
'hard': document.getElementById('hard'),
};
this.mode = 'play';
@@ -82,12 +84,14 @@ function main() {
'lv': document.getElementById('img-lv'),
'hpmax': document.getElementById('img-hpmax'),
'hp': document.getElementById("img-hp"),
+ 'mana': document.getElementById("img-mana"),
'atk': document.getElementById("img-atk"),
'def': document.getElementById("img-def"),
'mdef': document.getElementById("img-mdef"),
'money': document.getElementById("img-money"),
'experience': document.getElementById("img-experience"),
'up': document.getElementById("img-up"),
+ 'skill': document.getElementById('img-skill'),
'book': document.getElementById("img-book"),
'fly': document.getElementById("img-fly"),
'toolbox': document.getElementById("img-toolbox"),
@@ -122,18 +126,25 @@ function main() {
'speedUp': 21,
'rewind': 22,
'equipbox': 23,
+ 'mana': 24,
+ 'skill': 25,
+ 'paint': 26,
+ 'erase': 27,
+ 'exit': 28,
},
'floor': document.getElementById('floor'),
'name': document.getElementById('name'),
'lv': document.getElementById('lv'),
'hpmax': document.getElementById('hpmax'),
'hp': document.getElementById('hp'),
+ 'mana': document.getElementById('mana'),
'atk': document.getElementById('atk'),
'def': document.getElementById("def"),
'mdef': document.getElementById('mdef'),
'money': document.getElementById("money"),
'experience': document.getElementById("experience"),
'up': document.getElementById('up'),
+ 'skill': document.getElementById('skill'),
'yellowKey': document.getElementById("yellowKey"),
'blueKey': document.getElementById("blueKey"),
'redKey': document.getElementById("redKey"),
@@ -317,8 +328,7 @@ main.dom.data.onmousedown = function (e) {
}
var loc = main.core.getClickLoc(e.clientX, e.clientY);
if (loc == null) return;
- var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
- main.core.ondown(x, y);
+ main.core.ondown(loc);
} catch (ee) {}
}
@@ -328,15 +338,17 @@ main.dom.data.onmousemove = function (e) {
e.stopPropagation();
var loc = main.core.getClickLoc(e.clientX, e.clientY);
if (loc == null) return;
- var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
- main.core.onmove(x, y);
+ main.core.onmove(loc);
}catch (ee) {}
}
////// 鼠标放开时 //////
-main.dom.data.onmouseup = function () {
+main.dom.data.onmouseup = function (e) {
try {
- main.core.onup();
+ e.stopPropagation();
+ var loc = main.core.getClickLoc(e.clientX, e.clientY);
+ if (loc == null) return;
+ main.core.onup(loc);
}catch (e) {}
}
@@ -356,9 +368,7 @@ main.dom.data.ontouchstart = function (e) {
e.preventDefault();
var loc = main.core.getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY);
if (loc == null) return;
- var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
- //main.core.onclick(x, y, []);
- main.core.ondown(x, y);
+ main.core.ondown(loc);
}catch (ee) {}
}
@@ -368,15 +378,17 @@ main.dom.data.ontouchmove = function (e) {
e.preventDefault();
var loc = main.core.getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY);
if (loc == null) return;
- var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
- main.core.onmove(x, y);
+ main.core.onmove(loc);
}catch (ee) {}
}
////// 手指离开触摸屏时 //////
main.dom.data.ontouchend = function () {
try {
- main.core.onup();
+ e.preventDefault();
+ var loc = main.core.getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY);
+ if (loc == null) return;
+ main.core.onup(loc);
} catch (e) {
}
}
@@ -388,6 +400,11 @@ main.statusBar.image.book.onclick = function () {
return;
}
+ if (main.core.isPlaying() && (core.status.event||{}).id=='paint') {
+ core.actions.setPaintMode('paint');
+ return;
+ }
+
if (main.core.isPlaying())
main.core.openBook(true);
}
@@ -395,11 +412,27 @@ main.statusBar.image.book.onclick = function () {
////// 点击状态栏中的楼层传送器/装备栏时 //////
main.statusBar.image.fly.onclick = function () {
+ // 播放录像时
if (core.isset(core.status.replay) && core.status.replay.replaying) {
core.stopReplay();
return;
}
+ // 绘图模式
+ if (main.core.isPlaying() && (core.status.event||{}).id=='paint') {
+ core.actions.setPaintMode('erase');
+ return;
+ }
+
+ // 浏览地图时
+ if (main.core.isPlaying() && (core.status.event||{}).id=='viewMaps') {
+ if (core.isset(core.status.event.data)) {
+ core.status.event.data.paint = !core.status.event.data.paint;
+ core.ui.drawMaps(core.status.event.data);
+ }
+ return;
+ }
+
if (main.core.isPlaying()) {
if (!main.core.flags.equipboxButton) {
main.core.useFly(true);
@@ -456,6 +489,11 @@ main.statusBar.image.save.onclick = function () {
return;
}
+ if (main.core.isPlaying() && (core.status.event||{}).id=='paint') {
+ core.actions.savePaint();
+ return;
+ }
+
if (main.core.isPlaying())
main.core.save(true);
}
@@ -468,6 +506,11 @@ main.statusBar.image.load.onclick = function () {
return;
}
+ if (main.core.isPlaying() && (core.status.event||{}).id=='paint') {
+ core.actions.loadPaint();
+ return;
+ }
+
if (main.core.isPlaying())
main.core.load(true);
}
@@ -480,6 +523,11 @@ main.statusBar.image.settings.onclick = function () {
return;
}
+ if (main.core.isPlaying() && (core.status.event||{}).id=='paint') {
+ core.actions.exitPaint();
+ return;
+ }
+
if (main.core.isPlaying())
main.core.openSettings(true);
}
diff --git a/project/data.js b/project/data.js
index 74c27764..15eba994 100644
--- a/project/data.js
+++ b/project/data.js
@@ -75,10 +75,11 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"lv": 1,
"hpmax": 9999,
"hp": 1000,
+ "mana": 0,
"atk": 100,
"def": 100,
- "mdef": 100,
- "money": 100,
+ "mdef": 0,
+ "money": 0,
"experience": 0,
"equipment": [],
"items": {
@@ -197,6 +198,7 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"enableName": false,
"enableLv": false,
"enableHPMax": false,
+ "enableMana": false,
"enableMDef": true,
"enableMoney": true,
"enableExperience": false,
@@ -204,6 +206,7 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"enableKeys": true,
"enablePZF": false,
"enableDebuff": false,
+ "enableSkill": false,
"flyNearStair": true,
"pickaxeFourDirections": false,
"bombFourDirections": false,
diff --git a/project/functions.js b/project/functions.js
index fff7e6bb..59ad43f7 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -202,6 +202,19 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
// 增加仇恨值
core.setFlag('hatred', core.getFlag('hatred',0)+core.values.hatred);
+
+ // 战后的技能处理，比如扣除魔力值
+ if (core.flags.enableSkill) {
+ // 检测当前开启的技能类型
+ var skill = core.getFlag('skill', 0);
+ if (skill==1) { // 技能1：二倍斩
+ core.status.hero.mana-=5; // 扣除5点魔力值
+ }
+ // 关闭技能
+ core.setFlag('skill', 0);
+ core.setFlag('skillName', '无');
+ }
+
core.updateStatusBar();
@@ -476,6 +489,11 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// 对坚固模仿等处理扔到了脚本编辑-getEnemyInfo之中
var enemyInfo = core.enemys.getEnemyInfo(enemy, hero_hp, hero_atk, hero_def, hero_mdef, x, y, floorId);
var mon_hp = enemyInfo.hp, mon_atk = enemyInfo.atk, mon_def = enemyInfo.def, mon_special = enemyInfo.special;
+
+ // 技能的处理
+ if (core.getFlag('skill', 0)==1) { // 开启了技能1：二倍斩
+ hero_atk *= 2; // 计算时攻击力翻倍
+ }
// 如果是无敌属性，且勇士未持有十字架
if (this.hasSpecial(mon_special, 20) && !core.hasItem("cross"))
@@ -563,6 +581,153 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
*/
// 别忘了在事件中调用“更新怪物数据”事件！
+}
+ },
+ "actions": {
+ "onKeyUp": function (keyCode, altKey) {
+ // 键盘按键处理，可以在这里自定义快捷键列表
+ // keyCode：当前按键的keyCode（每个键的keyCode自行百度）
+ // altKey：Alt键是否被按下，为true代表同时按下了Alt键
+ // 可以在这里任意增加或编辑每个按键的行为
+
+ // 如果处于正在行走状态，则不处理
+ if (!core.status.heroStop)
+ return;
+
+ // Alt+0~9，快捷换上套装
+ if (altKey && keyCode>=48 && keyCode<=57) {
+ core.items.quickLoadEquip(keyCode-48);
+ return;
+ }
+
+ // 根据keyCode值来执行对应操作
+ switch (keyCode) {
+ case 27: // ESC：打开菜单栏
+ core.openSettings(true);
+ break;
+ case 88: // X：使用怪物手册
+ core.openBook(true);
+ break;
+ case 71: // G：使用楼传器
+ core.useFly(true);
+ break;
+ case 65: // A：读取自动存档（回退）
+ core.doSL("autoSave", "load");
+ break;
+ case 83: // S：存档
+ core.save(true);
+ break;
+ case 68: // D：独挡
+ core.load(true);
+ break;
+ case 69: // E：打开光标
+ core.ui.drawCursor();
+ break;
+ case 84: // T：打开道具栏
+ core.openToolbox(true);
+ break;
+ case 81: // Q：打开装备栏
+ core.openEquipbox(true);
+ break;
+ case 90: // Z：转向
+ core.turnHero();
+ break;
+ case 75: case 86: // K/V：打开快捷商店列表
+ core.openQuickShop(true);
+ break;
+ case 32: // SPACE：轻按
+ core.getNextItem();
+ break;
+ case 82: // R：回放录像
+ if (core.hasFlag('debug')) {
+ core.drawText("\t[系统提示]调试模式下无法回放录像");
+ }
+ else {
+ core.ui.drawReplay();
+ }
+ break;
+ case 33: case 34: // PgUp/PgDn：浏览地图
+ core.ui.drawMaps();
+ break;
+ case 77: // M：绘图模式
+ core.ui.drawPaint();
+ break;
+ case 66: // B：打开数据统计
+ core.ui.drawStatistics();
+ break;
+ case 72: // H：打开帮助页面
+ core.ui.drawHelp();
+ break;
+ case 49: // 快捷键1: 破
+ if (core.hasItem('pickaxe')) {
+ if (core.canUseItem('pickaxe')) {
+ core.useItem('pickaxe');
+ }
+ else {
+ core.drawTip('当前不能使用破墙镐');
+ }
+ }
+ break;
+ case 50: // 快捷键2: 炸
+ if (core.hasItem('bomb')) {
+ if (core.canUseItem('bomb')) {
+ core.useItem('bomb');
+ }
+ else {
+ core.drawTip('当前不能使用炸弹');
+ }
+ }
+ else if (core.hasItem('hammer')) {
+ if (core.canUseItem('hammer')) {
+ core.useItem('hammer');
+ }
+ else {
+ core.drawTip('当前不能使用圣锤');
+ }
+
+ }
+ break;
+ case 51: // 快捷键3: 飞
+ if (core.hasItem('centerFly')) {
+ core.events.useItem('centerFly');
+ }
+ break;
+ case 52: // 快捷键4：破冰/冰冻/地震/上下楼器/... 其他道具依次判断
+ {
+ var list = ["icePickaxe", "snow", "earthquake", "upFly", "downFly", "jumpShoes", "lifeWand", "poisonWine", "weakWine", "curseWine", "superWine"];
+ for (var i=0;i=5) { // 这里要写当前能否开技能的条件判断，比如魔力值至少要多少\n\t\tcore.setFlag('skill', 1); // 开技能1\n\t\tcore.setFlag('skillName', '二倍斩'); // 设置技能名\n\t}\n\telse {\n\t\tcore.drawTip(\"魔力不足，无法开启技能\");\n\t}\n}\nelse { // 关闭技能\n\tcore.setFlag('skill', 0); // 关闭技能状态\n\tcore.setFlag('skillName', '无');\n}"
},
"canUseItemEffect": {
"book": "true",
@@ -401,6 +407,7 @@ items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"redJewel": "true",
"blueJewel": "true",
"greenJewel": "true",
- "yellowJewel": "true"
+ "yellowJewel": "true",
+ "skill1": "true"
}
}
\ No newline at end of file
diff --git a/project/maps.js b/project/maps.js
index 6fee9b19..66ef81d1 100644
--- a/project/maps.js
+++ b/project/maps.js
@@ -79,6 +79,7 @@ maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
'65':{'cls': 'items', 'id': 'hammer'}, // 圣锤
'68':{'cls': 'items', 'id': 'lifeWand'}, // 生命魔杖
'69':{'cls': 'items', 'id': 'jumpShoes'}, // 生命魔杖
+ '70':{'cls': 'items', 'id': 'skill1'}, // 技能：二倍斩
////////////////////////// 门、楼梯、传送点部分 //////////////////////////