-
最近使用的图块列表（Ctrl+滚轮放缩）
+
（Ctrl+滚轮放缩，右键置顶）
diff --git a/libs/events.js b/libs/events.js
index 460e676c..b7601032 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -937,13 +937,6 @@ events.prototype._popEvents = function (current, prefix) {
events.prototype.insertAction = function (action, x, y, callback, addToLast) {
if (core.hasFlag("__statistics__")) return;
if (core.status.gameOver) return;
-
- // ------ 判定commonEvent
- var commonEvent = this.getCommonEvent(action);
- if (commonEvent instanceof Array) {
- // 将公共事件视为一个do-while事件插入执行，可被break跳出
- action = [{"type": "dowhile", "condition": "false", "data": commonEvent}];
- }
if (!action) return;
action = this.precompile(action);
@@ -960,6 +953,16 @@ events.prototype.insertAction = function (action, x, y, callback, addToLast) {
}
}
+////// 往当前事件列表之前或之后添加一个公共事件 //////
+events.prototype.insertCommonEvent = function (name, x, y, callback, addToLast) {
+ var commonEvent = this.getCommonEvent(name);
+ if (!commonEvent) {
+ if (callback) callback();
+ return;
+ }
+ this.insertAction(commonEvent, x, y, callback, addToLast);
+}
+
////// 获得一个公共事件 //////
events.prototype.getCommonEvent = function (name) {
if (!name || typeof name !== 'string') return null;
@@ -1119,11 +1122,14 @@ events.prototype.__precompile_getArray = function () {
"setValue", "setEnemy", "setFloor", "setGlobalValue",
];
var uievents = [
- "clearMap", "fillText", "fillBoldText", "fillRect", "strokeRect", "strokeCircle",
- "drawIcon", "drawSelector", "drawBackground",
+ "clearMap", "fillText", "fillBoldText", "fillRect", "strokeRect", "fillEllipse", "strokeEllipse",
+ "fillArc", "strokeArc", "drawIcon", "drawSelector", "drawBackground",
];
var others = {
- "strokeCircle": ["r"],
+ "fillEllipse": ["a", "b"],
+ "strokeEllipse": ["a", "b"],
+ "fillArc": ["r", "start", "end"],
+ "strokeArc": ["r", "start", "end"],
"drawLine": ["x1", "y1", "x2", "y2"],
"drawArrow": ["x1", "y1", "x2", "y2"],
"drawImage": ["x", "y", "w", "h", "x1", "y1", "w1", "h1"],
@@ -1562,7 +1568,7 @@ events.prototype._action_insert = function (data, x, y, prefix) {
}
if (data.name) { // 公共事件
core.setFlag('arg0', data.name);
- core.insertAction(data.name);
+ core.insertCommonEvent(data.name);
}
else {
var loc = this.__action_getLoc(data.loc, x, y, prefix);
@@ -1632,6 +1638,11 @@ events.prototype._action_setValue = function (data, x, y, prefix) {
core.doAction();
}
+events.prototype._action_addValue = function (data, x, y, prefix) {
+ data.operator = '+=';
+ this._action_setValue(data, x, y, prefix);
+}
+
events.prototype._action_setEnemy = function (data, x, y, prefix) {
this.setEnemy(data.id, data.name, data.value, prefix);
core.doAction();
@@ -2205,11 +2216,19 @@ events.prototype._precompile_strokePolygon = function (data) {
return data;
}
-events.prototype._action_fillCircle = function (data, x, y, prefix) {
+events.prototype._action_fillEllipse = function (data, x, y, prefix) {
this.__action_doUIEvent(data);
}
-events.prototype._action_strokeCircle = function (data, x, y, prefix) {
+events.prototype._action_strokeEllipse = function (data, x, y, prefix) {
+ this.__action_doUIEvent(data);
+}
+
+events.prototype._action_fillArc = function (data, x, y, prefix) {
+ this.__action_doUIEvent(data);
+}
+
+events.prototype._action_strokeArc = function (data, x, y, prefix) {
this.__action_doUIEvent(data);
}
diff --git a/libs/loader.js b/libs/loader.js
index 8f4ea8f6..0252d88a 100644
--- a/libs/loader.js
+++ b/libs/loader.js
@@ -25,115 +25,199 @@ loader.prototype._setStartLoadTipText = function (text) {
}
loader.prototype._load = function (callback) {
- this._loadIcons();
- this._loadAnimates();
- this._loadMusic();
+ if (main.useCompress) {
+ this._load_async(callback);
+ } else {
+ this._load_sync(callback);
+ }
+}
- core.loader._loadMaterialImages(function () {
- core.loader._loadExtraImages(function () {
- core.loader._loadAutotiles(function () {
- core.loader._loadTilesets(callback);
+loader.prototype._load_sync = function (callback) {
+ this._loadAnimates_sync();
+ this._loadMusic_sync();
+ core.loader._loadMaterials_sync(function () {
+ core.loader._loadExtraImages_sync(function () {
+ core.loader._loadAutotiles_sync(function () {
+ core.loader._loadTilesets_sync(callback);
})
})
});
}
-loader.prototype._loadIcons = function () {
- this.loadImage("materials", "icons.png", function (id, image) {
- var images = core.splitImage(image);
- for (var key in core.statusBar.icons) {
- if (typeof core.statusBar.icons[key] == 'number') {
- core.statusBar.icons[key] = images[core.statusBar.icons[key]];
- if (core.statusBar.image[key] != null)
- core.statusBar.image[key].src = core.statusBar.icons[key].src;
+loader.prototype._load_async = function (callback) {
+ core.loader._setStartLoadTipText('正在加载资源文件...');
+ var all = {};
+
+ var _makeOnProgress = function (name) {
+ if (!all[name]) all[name] = {loaded: 0, total: 0, finished: false};
+ return function (loaded, total) {
+ all[name].loaded = loaded;
+ all[name].total = total;
+ var allLoaded = 0, allTotal = 0;
+ for (var one in all) {
+ allLoaded += all[one].loaded;
+ allTotal += all[one].total;
}
+ if (allTotal > 0) {
+ if (allLoaded == allTotal) {
+ core.loader._setStartLoadTipText("正在处理资源文件... 请稍后...");
+ } else {
+ core.loader._setStartLoadTipText('正在加载资源文件... ' +
+ core.formatSize(allLoaded) + " / " + core.formatSize(allTotal) +
+ " (" + (allLoaded / allTotal * 100).toFixed(2) + "%)");
+ }
+ core.loader._setStartProgressVal(allLoaded / allTotal * 100);
+ }
+ };
+ }
+ var _makeOnFinished = function (name) {
+ return function () {
+ setTimeout(function () {
+ all[name].finished = true;
+ for (var one in all) {
+ if (!all[one].finished) return;
+ }
+ callback();
+ });
}
+ }
+
+ this._loadAnimates_async(_makeOnProgress('animates'), _makeOnFinished('animates'));
+ this._loadMusic_async(_makeOnProgress('sounds'), _makeOnFinished('sounds'));
+ this._loadMaterials_async(_makeOnProgress('materials'), _makeOnFinished('materials'));
+ this._loadExtraImages_async(_makeOnProgress('images'), _makeOnFinished('images'));
+ this._loadAutotiles_async(_makeOnProgress('autotiles'), _makeOnFinished('autotiles'));
+ this._loadTilesets_async(_makeOnProgress('tilesets'), _makeOnFinished('tilesets'));
+}
+
+// ----- 加载资源文件 ------ //
+
+loader.prototype._loadMaterials_sync = function (callback) {
+ this._setStartLoadTipText("正在加载资源文件...");
+ this.loadImages("materials", core.materials, core.material.images, function () {
+ core.loader._loadMaterials_afterLoad();
+ callback();
});
}
-loader.prototype._loadMaterialImages = function (callback) {
- this._setStartLoadTipText("正在加载资源文件...");
- if (main.useCompress) {
- this.loadImagesFromZip('project/materials/materials.h5data', core.materials, core.material.images, callback);
- } else {
- this.loadImages("materials", core.materials, core.material.images, callback);
+loader.prototype._loadMaterials_async = function (onprogress, onfinished) {
+ this.loadImagesFromZip('project/materials/materials.h5data', core.materials, core.material.images, onprogress, function () {
+ core.loader._loadMaterials_afterLoad();
+ onfinished();
+ });
+}
+
+loader.prototype._loadMaterials_afterLoad = function () {
+ var images = core.splitImage(core.material.images['icons']);
+ for (var key in core.statusBar.icons) {
+ if (typeof core.statusBar.icons[key] == 'number') {
+ core.statusBar.icons[key] = images[core.statusBar.icons[key]];
+ if (core.statusBar.image[key] != null)
+ core.statusBar.image[key].src = core.statusBar.icons[key].src;
+ }
}
}
-loader.prototype._loadExtraImages = function (callback) {
+// ------ 加载使用的图片 ------ //
+
+loader.prototype._loadExtraImages_sync = function (callback) {
core.material.images.images = {};
-
- var images = core.clone(core.images);
-
this._setStartLoadTipText("正在加载图片文件...");
- if (main.useCompress) {
- // Check .gif
- var gifs = images.filter(function (name) {
- return name.toLowerCase().endsWith('.gif');
- });
- images = images.filter(function (name) {
- return !name.toLowerCase().endsWith('.gif');
- });
-
- this.loadImagesFromZip('project/images/images.h5data', images, core.material.images.images, callback);
- gifs.forEach(function (gif) {
- this.loadImage("images", gif, function (id, image) {
- if (image != null) {
- core.material.images.images[gif] = image;
- }
- });
- }, this);
- } else {
- this.loadImages("images", images, core.material.images.images, callback);
- }
+ core.loadImages("images", core.images, core.material.images.images, callback);
}
-loader.prototype._loadAutotiles = function (callback) {
+loader.prototype._loadExtraImages_async = function (onprogress, onfinished) {
+ core.material.images.images = {};
+ var images = core.images;
+
+ // Check .gif
+ var gifs = images.filter(function (name) {
+ return name.toLowerCase().endsWith('.gif');
+ });
+ images = images.filter(function (name) {
+ return !name.toLowerCase().endsWith('.gif');
+ });
+
+ this.loadImagesFromZip('project/images/images.h5data', images, core.material.images.images, onprogress, onfinished);
+ // gif没有被压缩在zip中，延迟加载...
+ gifs.forEach(function (gif) {
+ this.loadImage("images", gif, function (id, image) {
+ if (image != null) {
+ core.material.images.images[gif] = image;
+ }
+ });
+ }, this);
+}
+
+// ------ 加载自动元件 ------ //
+
+loader.prototype._loadAutotiles_sync = function (callback) {
core.material.images.autotile = {};
var keys = Object.keys(core.material.icons.autotile);
var autotiles = {};
- var _callback = function () {
- keys.forEach(function (v) {
- core.material.images.autotile[v] = autotiles[v];
- });
- setTimeout(function () {
- core.maps._makeAutotileEdges();
- });
-
- callback();
- }
this._setStartLoadTipText("正在加载自动元件...");
- if (main.useCompress) {
- this.loadImagesFromZip('project/autotiles/autotiles.h5data', keys, autotiles, _callback);
- } else {
- this.loadImages("autotiles", keys, autotiles, _callback);
+ this.loadImages("autotiles", keys, autotiles, function () {
+ core.loader._loadAutotiles_afterLoad(keys, autotiles);
+ callback();
+ });
+}
+
+loader.prototype._loadAutotiles_async = function (onprogress, onfinished) {
+ core.material.images.autotile = {};
+ var keys = Object.keys(core.material.icons.autotile);
+ var autotiles = {};
+
+ this.loadImagesFromZip('project/autotiles/autotiles.h5data', keys, autotiles, onprogress, function () {
+ core.loader._loadAutotiles_afterLoad(keys, autotiles);
+ onfinished();
+ });
+}
+
+loader.prototype._loadAutotiles_afterLoad = function (keys, autotiles) {
+ // autotile需要保证顺序
+ keys.forEach(function (v) {
+ core.material.images.autotile[v] = autotiles[v];
+ });
+
+ setTimeout(function () {
+ core.maps._makeAutotileEdges();
+ });
+}
+
+// ------ 加载额外素材 ------ //
+
+loader.prototype._loadTilesets_sync = function (callback) {
+ core.material.images.tilesets = {};
+ this._setStartLoadTipText("正在加载额外素材...");
+ this.loadImages("tilesets", core.tilesets, core.material.images.tilesets, function () {
+ core.loader._loadTilesets_afterLoad();
+ callback();
+ });
+}
+
+loader.prototype._loadTilesets_async = function (onprogress, onfinished) {
+ core.material.images.tilesets = {};
+ this.loadImagesFromZip('project/tilesets/tilesets.h5data', core.tilesets, core.material.images.tilesets, onprogress, function () {
+ core.loader._loadTilesets_afterLoad();
+ onfinished();
+ });
+}
+
+loader.prototype._loadTilesets_afterLoad = function () {
+ // 检查宽高是32倍数，如果出错在控制台报错
+ for (var imgName in core.material.images.tilesets) {
+ var img = core.material.images.tilesets[imgName];
+ if (img.width % 32 != 0 || img.height % 32 != 0) {
+ console.warn("警告！" + imgName + "的宽或高不是32的倍数！");
+ }
+ if (img.width * img.height > 32 * 32 * 3000) {
+ console.warn("警告！" + imgName + "上的图块素材个数大于3000！");
+ }
}
}
-loader.prototype._loadTilesets = function (callback) {
- core.material.images.tilesets = {};
- core.tilesets = core.tilesets || [];
- var _callback = function () {
- // 检查宽高是32倍数，如果出错在控制台报错
- for (var imgName in core.material.images.tilesets) {
- var img = core.material.images.tilesets[imgName];
- if (img.width % 32 != 0 || img.height % 32 != 0) {
- console.warn("警告！" + imgName + "的宽或高不是32的倍数！");
- }
- if (img.width * img.height > 32 * 32 * 3000) {
- console.warn("警告！" + imgName + "上的图块素材个数大于3000！");
- }
- }
- callback();
- }
- this._setStartLoadTipText("正在加载额外素材...");
- if (main.useCompress) {
- this.loadImagesFromZip('project/tilesets/tilesets.h5data', core.tilesets, core.material.images.tilesets, _callback);
- } else {
- this.loadImages("tilesets", core.tilesets, core.material.images.tilesets, _callback);
- }
-}
+// ------ 实际加载一系列图片 ------ //
loader.prototype.loadImages = function (dir, names, toSave, callback) {
if (!names || names.length == 0) {
@@ -159,37 +243,6 @@ loader.prototype.loadImages = function (dir, names, toSave, callback) {
}
}
-loader.prototype.loadImagesFromZip = function (url, names, toSave, callback) {
- if (!names || names.length == 0) {
- if (callback) callback();
- return;
- }
-
- core.unzip(url + "?v=" + main.version, function (data) {
- var cnt = 1;
- names.forEach(function (name) {
- var imgName = name;
- if (imgName.indexOf('.') < 0) imgName += '.png';
- if (imgName in data) {
- var img = new Image();
- var url = URL.createObjectURL(data[imgName]);
- cnt++;
- img.onload = function () {
- cnt--;
- URL.revokeObjectURL(url);
- if (cnt == 0 && callback) callback();
- }
- img.src = url;
- toSave[name] = img;
- }
- });
- cnt--;
- if (cnt == 0 && callback) callback();
- }, null, false, function (percentage) {
- core.loader._setStartProgressVal(percentage * 100);
- });
-}
-
loader.prototype.loadImage = function (dir, imgName, callback) {
try {
var name = imgName;
@@ -211,28 +264,63 @@ loader.prototype.loadImage = function (dir, imgName, callback) {
}
}
-loader.prototype._loadAnimates = function () {
- this._setStartLoadTipText("正在加载动画文件...");
- if (main.useCompress) {
- core.unzip('project/animates/animates.h5data?v=' + main.version, function (animates) {
- for (var name in animates) {
- if (name.endsWith(".animate")) {
- var t = name.substring(0, name.length - 8);
- if (core.animates.indexOf(t) >= 0)
- core.loader._loadAnimate(t, animates[name]);
- }
- }
- }, null, true);
- } else {
- core.animates.forEach(function (t) {
- core.http('GET', 'project/animates/' + t + ".animate?v=" + main.version, null, function (content) {
- core.loader._loadAnimate(t, content);
- }, function (e) {
- main.log(e);
- core.material.animates[t] = null;
- }, "text/plain; charset=x-user-defined")
- })
+// ------ 从zip中加载一系列图片 ------ //
+
+loader.prototype.loadImagesFromZip = function (url, names, toSave, onprogress, onfinished) {
+ if (!names || names.length == 0) {
+ if (onfinished) onfinished();
+ return;
}
+
+ core.unzip(url + "?v=" + main.version, function (data) {
+ var cnt = 1;
+ names.forEach(function (name) {
+ var imgName = name;
+ if (imgName.indexOf('.') < 0) imgName += '.png';
+ if (imgName in data) {
+ var img = new Image();
+ var url = URL.createObjectURL(data[imgName]);
+ cnt++;
+ img.onload = function () {
+ cnt--;
+ URL.revokeObjectURL(url);
+ if (cnt == 0 && onfinished) onfinished();
+ }
+ img.src = url;
+ toSave[name] = img;
+ }
+ });
+ cnt--;
+ if (cnt == 0 && onfinished) onfinished();
+ }, null, false, onprogress);
+}
+
+// ------ 加载动画文件 ------ //
+
+loader.prototype._loadAnimates_sync = function () {
+ this._setStartLoadTipText("正在加载动画文件...");
+
+ core.animates.forEach(function (t) {
+ core.http('GET', 'project/animates/' + t + ".animate?v=" + main.version, null, function (content) {
+ core.loader._loadAnimate(t, content);
+ }, function (e) {
+ main.log(e);
+ core.material.animates[t] = null;
+ }, "text/plain; charset=x-user-defined")
+ });
+}
+
+loader.prototype._loadAnimates_async = function (onprogress, onfinished) {
+ core.unzip('project/animates/animates.h5data?v=' + main.version, function (animates) {
+ for (var name in animates) {
+ if (name.endsWith(".animate")) {
+ var t = name.substring(0, name.length - 8);
+ if (core.animates.indexOf(t) >= 0)
+ core.loader._loadAnimate(t, animates[name]);
+ }
+ }
+ onfinished();
+ }, null, true, onprogress);
}
loader.prototype._loadAnimate = function (name, content) {
@@ -283,26 +371,36 @@ loader.prototype._loadAnimate = function (name, content) {
}
}
-////// 加载音频 //////
-loader.prototype._loadMusic = function () {
+// ------ 加载音乐和音效 ------ //
+
+loader.prototype._loadMusic_sync = function () {
+ this._setStartLoadTipText("正在加载音效文件...");
core.bgms.forEach(function (t) {
core.loader.loadOneMusic(t);
});
+ core.sounds.forEach(function (t) {
+ core.loader.loadOneSound(t);
+ });
+ // 直接开始播放
+ core.playBgm(main.startBgm);
+}
- this._setStartLoadTipText("正在加载音效文件...");
- if (main.useCompress && core.musicStatus.audioContext) {
- core.unzip('project/sounds/sounds.h5data?v=' + main.version, function (data) {
+loader.prototype._loadMusic_async = function (onprogress, onfinished) {
+ core.bgms.forEach(function (t) {
+ core.loader.loadOneMusic(t);
+ });
+ core.unzip('project/sounds/sounds.h5data?v=' + main.version, function (data) {
+ // 延迟解析
+ setTimeout(function () {
for (var name in data) {
if (core.sounds.indexOf(name) >= 0) {
core.loader._loadOneSound_decodeData(name, data[name]);
}
}
});
- } else {
- core.sounds.forEach(function (t) {
- core.loader.loadOneSound(t);
- });
- }
+ onfinished();
+ }, null, false, onprogress);
+
// 直接开始播放
core.playBgm(main.startBgm);
}
@@ -317,19 +415,12 @@ loader.prototype.loadOneMusic = function (name) {
}
loader.prototype.loadOneSound = function (name) {
- if (core.musicStatus.audioContext != null) {
- core.http('GET', 'project/sounds/' + name + "?v=" + main.version, null, function (data) {
- core.loader._loadOneSound_decodeData(name, data);
- }, function (e) {
- main.log(e);
- core.material.sounds[name] = null;
- }, null, 'arraybuffer');
- }
- else {
- var music = new Audio();
- music.src = 'project/sounds/' + name;
- core.material.sounds[name] = music;
- }
+ core.http('GET', 'project/sounds/' + name + "?v=" + main.version, null, function (data) {
+ core.loader._loadOneSound_decodeData(name, data);
+ }, function (e) {
+ main.log(e);
+ core.material.sounds[name] = null;
+ }, null, 'arraybuffer');
}
loader.prototype._loadOneSound_decodeData = function (name, data) {
diff --git a/libs/ui.js b/libs/ui.js
index 94a0a1e1..204796d0 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -134,7 +134,65 @@ ui.prototype.fillRect = function (name, x, y, width, height, style) {
ui.prototype._uievent_fillRect = function (data) {
this._createUIEvent();
- this.fillRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style);
+ if (data.radius) {
+ this.fillRoundRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), core.calValue(data.radius), data.style);
+ } else {
+ this.fillRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style);
+ }
+}
+
+////// 在某个canvas上绘制一个矩形的边框 //////
+ui.prototype.strokeRect = function (name, x, y, width, height, style, lineWidth) {
+ if (style) core.setStrokeStyle(name, style);
+ if (lineWidth) core.setLineWidth(name, lineWidth);
+ var ctx = this.getContextByName(name);
+ if (ctx) ctx.strokeRect(x, y, width, height);
+}
+
+ui.prototype._uievent_strokeRect = function (data) {
+ this._createUIEvent();
+ if (data.radius) {
+ this.strokeRoundRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height),
+ core.calValue(data.radius), data.style, data.lineWidth);
+ } else {
+ this.strokeRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style, data.lineWidth);
+ }
+}
+
+////// 在某个canvas上绘制一个圆角矩形 //////
+ui.prototype.fillRoundRect = function (name, x, y, width, height, radius, style) {
+ if (style) core.setFillStyle(name, style);
+ var ctx = this.getContextByName(name);
+ if (ctx) {
+ this._roundRect_buildPath(ctx, x, y, width, height, radius);
+ ctx.fill();
+ }
+}
+
+////// 在某个canvas上绘制一个圆角矩形的边框 //////
+ui.prototype.strokeRoundRect = function (name, x, y, width, height, radius, style, lineWidth) {
+ if (style) core.setStrokeStyle(name, style);
+ if (lineWidth) core.setLineWidth(name, lineWidth);
+ var ctx = this.getContextByName(name);
+ if (ctx) {
+ this._roundRect_buildPath(ctx, x, y, width, height, radius);
+ ctx.stroke();
+ }
+}
+
+
+ui.prototype._roundRect_buildPath = function (ctx, x, y, width, height, radius) {
+ ctx.beginPath();
+ ctx.moveTo(x + radius, y);
+ ctx.lineTo(x + width - radius, y);
+ ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
+ ctx.lineTo(x + width, y + height - radius);
+ ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+ ctx.lineTo(x + radius, y + height);
+ ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
+ ctx.lineTo(x, y + radius);
+ ctx.quadraticCurveTo(x, y, x + radius, y);
+ ctx.closePath();
}
////// 在某个canvas上绘制一个多边形 //////
@@ -158,19 +216,6 @@ ui.prototype._uievent_fillPolygon = function (data) {
this.fillPolygon('uievent', data.nodes, data.style);
}
-////// 在某个canvas上绘制一个矩形的边框 //////
-ui.prototype.strokeRect = function (name, x, y, width, height, style, lineWidth) {
- if (style) core.setStrokeStyle(name, style);
- if (lineWidth) core.setLineWidth(name, lineWidth);
- var ctx = this.getContextByName(name);
- if (ctx) ctx.strokeRect(x, y, width, height);
-}
-
-ui.prototype._uievent_strokeRect = function (data) {
- this._createUIEvent();
- this.strokeRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style, data.lineWidth);
-}
-
////// 在某个canvas上绘制一个多边形的边框 //////
ui.prototype.strokePolygon = function (name, nodes, style, lineWidth) {
if (style) core.setStrokeStyle(name, style);
@@ -193,35 +238,78 @@ ui.prototype._uievent_strokePolygon = function (data) {
this.strokePolygon('uievent', data.nodes, data.style, data.lineWidth);
}
-////// 在某个canvas上绘制一个圆 //////
-ui.prototype.fillCircle = function (name, x, y, r, style) {
+////// 在某个canvas上绘制一个椭圆 //////
+ui.prototype.fillEllipse = function (name, x, y, a, b, angle, style) {
if (style) core.setFillStyle(name, style);
var ctx = this.getContextByName(name);
if (!ctx) return;
ctx.beginPath();
- ctx.arc(x, y, r, 0, 2*Math.PI);
+ ctx.ellipse(x, y, a, b, angle, 0, 2*Math.PI);
ctx.fill();
}
-ui.prototype._uievent_fillCircle = function (data) {
+ui.prototype.fillCircle = function (name, x, y, r, style) {
+ return this.fillEllipse(name, x, y, r, r, 0, style);
+}
+
+ui.prototype._uievent_fillEllipse = function (data) {
this._createUIEvent();
- this.fillCircle('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.r), data.style);
+ this.fillEllipse('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.a),
+ core.calValue(data.b), (core.calValue(data.angle) || 0) * Math.PI / 180, data.style);
}
////// 在某个canvas上绘制一个圆的边框 //////
-ui.prototype.strokeCircle = function (name, x, y, r, style, lineWidth) {
+ui.prototype.strokeEllipse = function (name, x, y, a, b, angle, style, lineWidth) {
if (style) core.setStrokeStyle(name, style);
if (lineWidth) core.setLineWidth(name, lineWidth);
var ctx = this.getContextByName(name);
if (!ctx) return;
ctx.beginPath();
- ctx.arc(x, y, r, 0, 2*Math.PI);
+ ctx.ellipse(x, y, a, b, angle, 0, 2*Math.PI);
ctx.stroke();
}
-ui.prototype._uievent_strokeCircle = function (data) {
+ui.prototype.strokeCircle = function (name, x, y, r, style, lineWidth) {
+ return this.strokeEllipse(name, x, y, r, r, 0, style, lineWidth);
+}
+
+ui.prototype._uievent_strokeEllipse = function (data) {
this._createUIEvent();
- this.strokeCircle('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.r), data.style, data.lineWidth);
+ this.strokeEllipse('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.a),
+ core.calValue(data.b), (core.calValue(data.angle) || 0) * Math.PI / 180, data.style, data.lineWidth);
+}
+
+ui.prototype.fillArc = function (name, x, y, r, start, end, style) {
+ if (style) core.setFillStyle(name, style);
+ var ctx = this.getContextByName(name);
+ if (!ctx) return;
+ ctx.beginPath();
+ ctx.moveTo(x, y);
+ ctx.arc(x, y, r, start, end);
+ ctx.closePath();
+ ctx.fill();
+}
+
+ui.prototype._uievent_fillArc = function (data) {
+ this._createUIEvent();
+ this.fillArc('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.r),
+ (core.calValue(data.start) || 0) * Math.PI / 180, (core.calValue(data.end) || 0) * Math.PI / 180, data.style);
+}
+
+ui.prototype.strokeArc = function (name, x, y, r, start, end, style, lineWidth) {
+ if (style) core.setStrokeStyle(name, style);
+ if (lineWidth) core.setLineWidth(name, lineWidth);
+ var ctx = this.getContextByName(name);
+ if (!ctx) return;
+ ctx.beginPath();
+ ctx.arc(x, y, r, start, end);
+ ctx.stroke();
+}
+
+ui.prototype._uievent_strokeArc = function (data) {
+ this._createUIEvent();
+ this.strokeArc('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.r),
+ (core.calValue(data.start) || 0) * Math.PI / 180, (core.calValue(data.end) || 0) * Math.PI / 180, data.style, data.lineWidth);
}
////// 在某个canvas上绘制一条线 //////
@@ -1496,8 +1584,8 @@ ui.prototype._drawChoices_drawChoices = function (choices, isWindowSkin, hPos, v
this.drawWindowSelector(core.status.textAttribute.background,
this.HPIXEL - len/2 - 5, vPos.choice_top + 32 * core.status.event.selection - 20, len + 10, 28);
else
- core.strokeRect('ui', this.HPIXEL - len/2 - 5, vPos.choice_top + 32 * core.status.event.selection - 20,
- len+10, 28, "#FFD700", 2);
+ core.strokeRoundRect('ui', this.HPIXEL - len/2 - 5, vPos.choice_top + 32 * core.status.event.selection - 20,
+ len+10, 28, 6, "#FFD700", 2);
}
}
@@ -1536,7 +1624,7 @@ ui.prototype.drawConfirmBox = function (text, yesCallback, noCallback) {
if (isWindowSkin)
this.drawWindowSelector(core.status.textAttribute.background, strokeLeft, rect.bottom-35-20, len+10, 28);
else
- core.strokeRect('ui', strokeLeft, rect.bottom-35-20, len+10, 28, "#FFD700", 2);
+ core.strokeRoundRect('ui', strokeLeft, rect.bottom-35-20, len+10, 28, 6, "#FFD700", 2);
}
}
@@ -1750,7 +1838,7 @@ ui.prototype._drawBook_drawOne = function (floorId, index, enemy, pageinfo, sele
this._drawBook_drawName(index, enemy, top, left, name_width);
this._drawBook_drawContent(index, enemy, top, left + name_width);
if (selected)
- core.strokeRect('ui', 10, top + 1, this.PIXEL - 10 * 2, pageinfo.per_height, '#FFD700');
+ core.strokeRoundRect('ui', 10, top + 1, this.PIXEL - 10 * 2, pageinfo.per_height, 10, '#FFD700');
}
ui.prototype._drawBook_drawBox = function (index, enemy, top, pageinfo) {
@@ -2273,7 +2361,7 @@ ui.prototype._drawToolbox_drawContent = function (info, line, items, page, drawC
if (drawCount)
core.fillText('ui', core.itemCount(item), 64 * (i % this.HSIZE) + 56, yoffset + 33, '#FFFFFF', this._buildFont(14, true));
if (info.selectId == item)
- core.strokeRect('ui', 64 * (i % this.HSIZE) + 17, yoffset - 4, 40, 40, '#FFD700');
+ core.strokeRoundRect('ui', 64 * (i % this.HSIZE) + 17, yoffset - 4, 40, 40, 6, '#FFD700');
}
}
@@ -2448,7 +2536,7 @@ ui.prototype._drawEquipbox_drawEquiped = function (info, line) {
core.drawImage('ui', core.material.images.items, 0, 32 * icon, 32, 32, offset_image, y, 32, 32);
}
core.fillText('ui', info.allEquips[i] || "未知", offset_text, y + 27, '#FFFFFF', this._buildFont(16, true))
- core.strokeRect('ui', offset_image - 4, y - 4, 40, 40, info.index==i?'#FFD700':"#FFFFFF");
+ core.strokeRoundRect('ui', offset_image - 4, y - 4, 40, 40, 6, info.index==i?'#FFD700':"#FFFFFF");
}
}
@@ -2631,7 +2719,7 @@ ui.prototype.drawKeyBoard = function () {
if (isWindowSkin)
this.drawWindowSelector(core.status.textAttribute.background, this.HPIXEL + 92, offset - 22, 72, 27);
else
- core.strokeRect('ui', this.HPIXEL + 92, offset - 22, 72, 27, "#FFD700", 2);
+ core.strokeRoundRect('ui', this.HPIXEL + 92, offset - 22, 72, 27, 6, "#FFD700", 2);
}
////// 绘制状态栏 /////
diff --git a/libs/utils.js b/libs/utils.js
index 7cd1ff71..1698c02e 100644
--- a/libs/utils.js
+++ b/libs/utils.js
@@ -392,6 +392,12 @@ utils.prototype.setTwoDigits = function (x) {
return parseInt(x) < 10 ? "0" + x : x;
}
+utils.prototype.formatSize = function (size) {
+ if (size < 1024) return size + 'B';
+ else if (size < 1024 * 1024) return (size/1024).toFixed(2) + "KB";
+ else return (size/1024/1024).toFixed(2) + "MB";
+}
+
utils.prototype.formatBigNumber = function (x, onMap) {
x = Math.floor(parseFloat(x));
if (!core.isset(x)) return '???';
@@ -1227,7 +1233,7 @@ utils.prototype.http = function (type, url, formData, success, error, mimeType,
};
xhr.onprogress = function (e) {
if (e.lengthComputable) {
- if (onprogress) onprogress(e.loaded / e.total);
+ if (onprogress) onprogress(e.loaded, e.total);
}
}
xhr.onabort = function () {
diff --git a/main.js b/main.js
index be30e993..71421aca 100644
--- a/main.js
+++ b/main.js
@@ -85,7 +85,7 @@ function main() {
'data', 'enemys', 'icons', 'maps', 'items', 'functions', 'events', 'plugins'
];
this.materials = [
- 'animates', 'enemys', 'items', 'npcs', 'terrains', 'enemy48', 'npc48'
+ 'animates', 'enemys', 'items', 'npcs', 'terrains', 'enemy48', 'npc48', 'icons'
];
this.statusBar = {
@@ -215,6 +215,7 @@ main.prototype.init = function (mode, callback) {
main.dom.levelChooseButtons.appendChild(span);
});
main.createOnChoiceAnimation();
+ main.importFonts(main.fonts);
main.loadJs('libs', main.loadList, function () {
main.core = core;
@@ -371,6 +372,19 @@ main.prototype.selectButton = function (index) {
}
}
+////// 创建字体 //////
+main.prototype.importFonts = function (fonts) {
+ if (!(fonts instanceof Array) || fonts.length == 0) return;
+ var style = document.createElement('style');
+ style.type = 'text/css';
+ var html = '';
+ fonts.forEach(function (font) {
+ html += '@font-face { font-family: "'+font+'"; src: url("project/fonts/'+font+'.ttf") format("truetype")';
+ });
+ style.innerHTML = html;
+ document.body.appendChild(style);
+}
+
main.prototype.listen = function () {
////// 窗口大小变化时 //////
diff --git a/project/data.js b/project/data.js
index fad424a9..4f33fa23 100644
--- a/project/data.js
+++ b/project/data.js
@@ -36,6 +36,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"bomb.mp3",
"centerFly.mp3"
],
+ "fonts": [],
"nameMap": {
"背景图.jpg": "bg.jpg",
"背景音乐.mp3": "bgm.mp3"
diff --git a/server.py b/server.py
index c6d279ff..6aaea881 100644
--- a/server.py
+++ b/server.py
@@ -67,7 +67,10 @@ def static_file(path):
if not os.path.isfile(path):
abort(404)
return None
- return Response(get_file(path), mimetype = get_mimetype(path))
+ mimetype = get_mimetype(path)
+ response = Response(get_file(path), mimetype = mimetype)
+ if mimetype.startswith('audio/'): response.headers["Accept-Ranges"] = "bytes"
+ return response
def process_request():
data = request.get_data() # str in py2 and bytes in py3
diff --git a/v2.x-final更新.txt b/v2.x-final更新.txt
index 2fc4b1c5..cc988fc5 100644
--- a/v2.x-final更新.txt
+++ b/v2.x-final更新.txt
@@ -43,7 +43,7 @@
（已完成！） 动画/音乐/音效自动补全
（已完成！） 重构全局商店！
（已完成！） 读档时色调数据丢失
-圆角边框
+（已完成！） 圆角边框
像素高分辨率问题
（已完成！） 道具效果优化，删除部分道具相关的开关
（已完成！） 素材列表选择
@@ -51,6 +51,12 @@
地图拉框选择复制剪切删除
（已完成！） 素材替换
大屏幕下放大游戏界面
+（已完成！） 最近使用/最常使用的图块
+（已完成！） loader并行加载
+合并items.js
+（已完成！） 增加fonts目录，全塔属性增加fonts引用
+（已完成！） 右边框输入完后解析按钮高亮
+32x48的门
-------------
@@ -129,7 +135,7 @@
70. “显隐勇士”事件指令希望加个淡入淡出时间参数
（不处理，请用等待事件） 1. 希望给core.drawTip()和core.playSound()出个同步版本，目前只有异步版本，后者如果要模拟同步就得绑在一个透明动画上
（已完成！） 72. “绘制描边文本”事件希望加一个“描边颜色”参数，目前只能描黑边
-73. 画弧既然有现成的API，那建议也作为UI绘制事件提供。甚至希望提供画椭圆功能（长短轴水平或铅直的那种）参数为中心坐标和长短轴长度
+（已完成！） 73. 画弧既然有现成的API，那建议也作为UI绘制事件提供。甚至希望提供画椭圆功能（长短轴水平或铅直的那种）参数为中心坐标和长短轴长度
（已完成！） 74. “设置画布属性”的基准线建议增加'hanging'和'ideographic'这两种模式
（已完成！） 75. 建议修复“绘制多行文本”时行距比字号大不太多会导致各行下缘丢失的bug（加大行距又会导致第一行的纵坐标难以估计），此bug在道具商店和1.3倍行距英文看的很明显
（已完成！） 76. （来自群友）建议给第一代全局商店像“显示选择项”一样提供图标、颜色和出现条件
diff --git a/v266-v2.7接档说明 b/v266-v2.7接档说明
new file mode 100644
index 00000000..baac3b03
--- /dev/null
+++ b/v266-v2.7接档说明
@@ -0,0 +1,91 @@
+V2.6.6 -> V2.7 接档说明：
+
+此版本仅可接档【地图】，【事件】和【怪物数据】。脚本编辑等不可进行接档。
+
+请严格按照此说明进行每一步操作以避免可能的bug。接档前请做好备份。
+
+接档准备：
+ - Visual Studio Code
+ - 需要进行接档的V266的样板
+ - 两个全新的V2.7的样板（一个用于接档结果，一个用于抄部分修改后的内容）
+
+接档步骤：
+1. 将V266的样板中，【project】目录下的如下文件和文件夹，直接复制并覆盖到V2.7的样板中的project目录下：
+ - animates/
+ - floors/
+ - enemys.js
+ - events.js
+ - icons.js
+ - items.js
+ - maps.js
+
+2. 将V266样板中，【project/images】目录下的图片，拆分后放入V2.7的对应图片目录下：
+ - 系统默认图片放入materials中
+ - 自动元件放入autotiles中
+ - 额外素材放入tilesets中
+ - 使用到的其他图片放入images中
+【请注意】hero.png在V2.7请放入images目录（而不是materials目录）
+
+3. 将V266样板中，【project/sounds】目录下的音乐和音效，分别放入V2.7的bgms和sounds目录。
+
+4. 使用VSCode直接分别打开V266和V2.7的【project/data.js】，并执行以下操作：
+ - 将【main】一项的全部内容从V2.6.6直接复制到V2.7
+ - 将【firstData】一项中的，【title】，【name】，【floorId】，【hero】直接复制到
+ - 在注册的图片中，请手动补上【hero.png】项
+ - 在【hero】中【name】上方增加 "image": "hero.png"
+ - 在【hero】中【steps】上方新增一项 "followers": []
+ - 将【hero】中的【experience】改成【exp】
+ - 删除【hero】中【items】中的【keys】项
+请勿覆盖或复制其他内容（例如全塔数值或全局开关），否则可能导致编辑器无法打开。
+
+5. 使用VSCode分别打开接档后的V2.7和纯净的V2.7的【project/items.js】，并执行以下操作：
+ - 将三色钥匙的cls从"keys"改成"tools"，并新增 "hideInToolbox": true
+ - 如下道具的【useItemEffect】和【canUseItemEffect】有所改变，请直接从纯净的V2.7覆盖到你要接档的V2.7：
+ - earthquake, pickaxe, icePickaxe, snow, bigKey, bomb, upFly, downFly
+ - 如果确认你的塔不会使用该道具，可忽略
+ - 黄宝石和生命魔杖增加了【useItemEvent】；如需使用请进行复制
+
+6. 使用VSCode打开接档后的V2.7的【project/icons.js】，并执行如下操作：
+ - 找到【terrains】中的三色墙和六色门，删除对应的这几行
+ - yellowWall, blueWall, whiteWall, yellowDoor, blueDoor, redDoor, greenDoor, specialDoor, steelDoor
+ - （在V2.7中，terrains不再保留门的引用，门效果仅由animates决定）
+ - 将【terrains】中的 blueShop-left, blueShop-right, pinkShop-left, pinkShop-right 分别重命名为
+ blueShopLeft, blueShopRight, pinkShopLeft, pinkShopRight
+
+7. 使用VSCode分别打开接档后的V2.7和纯净的V2.7的【project/maps.js】，并执行以下操作：
+ - 将纯净的V2.7中如下ID的行，直接替换掉要接档的V2.7：
+ - yellowWall, whiteWall, blueWall, blueShopLeft, blueShopRight, pinkShopLeft, pinkShopRight,
+ lavaNet, poisonNet, weakNet, curseNet, yellowDoor, blueDoor, redDoor, greenDoor, specialDoor, steelDoor,
+ arrowUp, arrowDown, arrowLeft, arrowRight, light
+ - 将所有的 "noPass":false 改成 "canPass":true 原来是 "noPass":true 的请直接删除
+ - V2.7中，不再在图块属性使用noPass，而是全部改成了canPass；请检查此文件的全部noPass是否被替换或删除
+
+8. 到这一步后已经可以打开编辑器了。
+ - 如果打开编辑器白屏或报错，请检查一下上面是否每个步骤都完成了
+ - 如果还有问题请联系小艾
+
+9. 在编辑器中，切换到「全塔属性」标签，并进行修改：
+ - V2.7中，全局商店的结构完全重写了，请重新实现一遍
+ - 全塔开关中，是否在状态栏显示XXX改成在同一个方框中
+ - 删除了部分全局数值和全塔开关
+
+10. 在编辑器中，切换到「脚本编辑」标签，并进行修改：
+ - setInitData已经被删除；移动到了开场剧情的startText中
+ - 删除了afterChangeLight和afterPassNet脚本
+ - 很多函数的实现有所改变，改变较为严重的有：
+ - resetGame, changingFloor, afterBattle, getDamageInfo, saveData, loadData,
+ updateStatusBar, updateCheckBlock, moveOneStep
+ - 修改脚本编辑（例如getDamageInfo）时，请勿直接拿原来的脚本进行覆盖，而是重新对函数进行修改！
+
+11. 在编辑器中，切换到「插件编写」标签，并重新增加新增的插件插件
+ - 请勿随意修改已有的默认插件
+
+12. 逐楼层检查firstArrive以及每个点的事件列表；主要事件API变化如下：
+ - 所有的「数值增减」事件已被删除，被数值设置+运算符替代
+ - 编辑器将无法再解析「数值增减」事件（会被解析成自定义事件），但是游戏中仍然可以正确执行
+ - 「隐藏事件」将不再默认删除该点（而只是纯粹的隐藏）；请给有需要的「隐藏事件」勾选「同时删除」选项
+ - 「重启当前事件」已经被删除并且无法在游戏中使用。请替换成等价的循环处理或者插入事件
+ - 在V2.7中，所有的experience全部改名exp；请检查所有对经验值进行操作的地方
+
+
+