"; + html += ""; + return html; + } editor_table.prototype.title = function () { - return /* html */`\n
${tdstr}
该变量出现的所有位置如下：
- ";
+ var list = uievent._searchUsedFlags(flag);
+ list.forEach(function (v) {
+ var x = "
- "; + if (v[0] != null) x += v[0] + "层 "; + else x += "公共事件 "; + x += v[1]; + if (v[2] != null) x += " 的 (" + v[2] + ") 点"; + x += " "; + html += x; + }); + html += "
色相: @@ -101,7 +102,7 @@
- 地图选点
+
@@ -236,6 +241,7 @@
语法检查
+
地图选点
+ 地图选点
0,0
@@ -195,6 +196,7 @@
-->
-
+
+
+
+ 开启中文名替换
@@ -236,6 +241,7 @@
语法检查
+
0,0
@@ -195,6 +196,7 @@ -->
@@ -336,7 +342,7 @@
- 地图选点
+
地图选点
+ 地图选点
0,0
@@ -191,6 +192,7 @@
-->
@@ -357,7 +362,7 @@
@@ -526,6 +532,7 @@
+
@@ -554,9 +561,12 @@
-
-
-
+
+
+
+
+
+
@@ -564,7 +574,7 @@
请稍后...
![]()
diff --git a/libs/actions.js b/libs/actions.js
index 648b8dd6..7caba11d 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -2626,7 +2626,6 @@ actions.prototype.exitPaint = function () {
core.ui.closePanel();
core.statusBar.image.keyboard.style.opacity = 1;
core.statusBar.image.shop.style.opacity = 1;
- core.updateStatusBar();
core.drawTip("退出绘图模式");
}
diff --git a/libs/control.js b/libs/control.js
index 9a981c78..6f0a3854 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -22,6 +22,7 @@ control.prototype._init = function () {
this.registerAnimationFrame("animate", true, this._animationFrame_animate);
this.registerAnimationFrame("heroMoving", true, this._animationFrame_heroMoving);
this.registerAnimationFrame("weather", true, this._animationFrame_weather);
+ this.registerAnimationFrame("tips", true, this._animateFrame_tips);
this.registerAnimationFrame("parallelDo", false, this._animationFrame_parallelDo);
this.registerAnimationFrame("checkConsoleOpened", true, this._animationFrame_checkConsoleOpened);
// --- 注册系统的replay
@@ -278,6 +279,40 @@ control.prototype._animationFrame_weather_fog = function () {
}
}
+control.prototype._animateFrame_tips = function (timestamp) {
+ var tips = core.animateFrame.tips;
+ if (timestamp - tips.time <= 30) return;
+ var delta = timestamp - tips.time;
+ tips.time = timestamp;
+ if (tips.list.length == 0) return;
+
+ var currentOffset = Math.max(tips.offset - 5, 0), firstOffset = null;
+ var currList = [];
+ core.setFont('data', "16px Arial");
+ core.setTextAlign('data', 'left');
+ core.clearMap('data', 0, 0, this.PIXEL, tips.lastSize * 50);
+ tips.lastLength = tips.list.length;
+
+ while (tips.list.length > 0) {
+ var one = tips.list.shift();
+ core.ui._drawTip_drawOne(one, currentOffset);
+ if (one.stage == 1) {
+ one.opacity += 0.05;
+ if (one.opacity >= 0.7) one.stage = 2;
+ } else if (one.stage == 2) {
+ one.time += delta;
+ if (one.time >= 2000) one.stage = 3;
+ } else one.opacity -= 0.05;
+ if (one.opacity > 0) {
+ currList.push(one);
+ if (firstOffset == null) firstOffset = currentOffset;
+ }
+ currentOffset += 50;
+ }
+ tips.list = currList;
+ tips.offset = firstOffset || 0;
+}
+
control.prototype._animationFrame_parallelDo = function (timestamp) {
core.control.controldata.parallelDo(timestamp);
}
@@ -1391,9 +1426,7 @@ control.prototype.__replay_getTimeout = function () {
control.prototype._replayAction_move = function (action) {
if (["up","down","left","right"].indexOf(action)<0) return false;
- core.moveHero(action, function () {
- setTimeout(core.replay);
- });
+ core.moveHero(action, core.replay);
return true;
}
@@ -1475,8 +1508,8 @@ control.prototype._replayAction_shop = function (action) {
if (selections.length == 0) return false;
var shop=core.status.shops[shopId];
if (!shop || !shop.visited) return false;
- // --- 判定commonEvent
- if (shop.commonEvent) {
+ // --- 判定commonEvent或item
+ if (shop.commonEvent || shop.item) {
core.openShop(shopId, false);
setTimeout(core.replay);
return true;
@@ -2136,6 +2169,7 @@ control.prototype.setCurtain = function(color, time, callback) {
control.prototype._setCurtain_animate = function (nowColor, color, time, callback) {
time /= Math.max(core.status.replay.speed, 1)
var per_time = 10, step = parseInt(time / per_time);
+ if (step <= 0) step = 1;
var animate = setInterval(function() {
nowColor = [
(nowColor[0]*(step-1)+color[0])/step,
@@ -2330,9 +2364,10 @@ control.prototype.clearStatusBar = function() {
}
////// 更新状态栏 //////
-control.prototype.updateStatusBar = function () {
+control.prototype.updateStatusBar = function (doNotCheckAutoEvents) {
if (!core.isPlaying()) return;
this.controldata.updateStatusBar();
+ if (!doNotCheckAutoEvents) core.checkAutoEvents();
this._updateStatusBar_setToolboxIcon();
}
diff --git a/libs/core.js b/libs/core.js
index a9e571bc..0268bb5a 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -16,17 +16,15 @@ function core() {
'ground': null,
'items': {},
'enemys': {},
- 'icons': {}
+ 'icons': {},
}
this.timeout = {
- 'tipTimeout': null,
'turnHeroTimeout': null,
'onDownTimeout': null,
'sleepTimeout': null,
}
this.interval = {
'heroMoveInterval': null,
- "tipAnimate": null,
'onDownInterval': null,
}
this.animateFrame = {
@@ -47,6 +45,12 @@ function core() {
'data': null,
'fog': null,
},
+ "tips": {
+ 'time': 0,
+ 'offset': 0,
+ 'list': [],
+ 'lastSize': 0,
+ },
"asyncId": {}
}
this.musicStatus = {
@@ -170,6 +174,7 @@ function core() {
'ui': null,
'interval': null,
},
+ 'autoEvents': [],
'textAttribute': {
'position': "center",
"offset": 0,
@@ -221,7 +226,9 @@ core.prototype.init = function (coreData, callback) {
this._initPlugins();
core.loader._load(function () {
- core._afterLoadResources(callback);
+ core.extensions._load(function () {
+ core._afterLoadResources(callback);
+ });
});
}
@@ -231,11 +238,37 @@ core.prototype._init_flags = function () {
core.firstData = core.clone(core.data.firstData);
this._init_sys_flags();
- core.dom.versionLabel.innerHTML = core.firstData.version;
- core.dom.logoLabel.innerHTML = core.firstData.title;
+ core.dom.versionLabel.innerText = core.firstData.version;
+ core.dom.logoLabel.innerText = core.firstData.title;
document.title = core.firstData.title + " - HTML5魔塔";
- document.getElementById("startLogo").innerHTML = core.firstData.title;
+ document.getElementById("startLogo").innerText = core.firstData.title;
(core.firstData.shops||[]).forEach(function (t) { core.initStatus.shops[t.id] = t; });
+ // 初始化自动事件
+ for (var floorId in core.floors) {
+ var autoEvents = core.floors[floorId].autoEvent || {};
+ for (var loc in autoEvents) {
+ var locs = loc.split(","), x = parseInt(locs[0]), y = parseInt(locs[1]);
+ for (var index in autoEvents[loc]) {
+ var autoEvent = core.clone(autoEvents[loc][index]);
+ if (autoEvent && autoEvent.data) {
+ autoEvent.floorId = floorId;
+ autoEvent.x = x;
+ autoEvent.y = y;
+ autoEvent.index = index;
+ autoEvent.symbol = floorId + "@" + x + "@" + y + "@" + index;
+ core.initStatus.autoEvents.push(autoEvent);
+ }
+ }
+ }
+ }
+ core.initStatus.autoEvents.sort(function (e1, e2) {
+ if (e1.priority != e2.priority) return e2.priority - e1.priority;
+ if (e1.floorId != e2.floorId) return core.floorIds.indexOf(e1.floorId) - core.floorIds.indexOf(e2.floorId);
+ if (e1.x != e2.x) return e1.x - e2.x;
+ if (e1.y != e2.y) return e1.y - e2.y;
+ return e1.index - e2.index;
+ })
+
core.maps._setFloorSize();
// 初始化怪物、道具等
core.material.enemys = core.enemys.getEnemys();
diff --git a/libs/events.js b/libs/events.js
index 4d786341..eb141e85 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -297,6 +297,12 @@ events.prototype._trigger = function (x, y) {
var block = core.getBlock(x, y);
if (block == null) return;
block = block.block;
+
+ // 执行该点的脚本
+ try {
+ eval(block.event.script);
+ } catch (e) { main.log(e); }
+
if (block.event.trigger) {
var noPass = block.event.noPass, trigger = block.event.trigger;
if (noPass) core.clearAutomaticRouteNode(x, y);
@@ -341,7 +347,7 @@ events.prototype.battle = function (id, x, y, force, callback) {
if (!id) return core.clearContinueAutomaticRoute(callback);
// 非强制战斗
if (!core.enemys.canBattle(id, x, y) && !force && !core.status.event.id) {
- core.drawTip("你打不过此怪物！");
+ core.drawTip("你打不过此怪物！", null, true);
return core.clearContinueAutomaticRoute(callback);
}
// 自动存档
@@ -401,8 +407,8 @@ events.prototype._openDoor_check = function (id, x, y, needKey) {
var key = id.replace("Door", "Key");
if (!core.hasItem(key)) {
if (key != "specialKey")
- core.drawTip("你没有" + ((core.material.items[key] || {}).name || "钥匙"));
- else core.drawTip("无法开启此门");
+ core.drawTip("你没有" + ((core.material.items[key] || {}).name || "钥匙"), null, true);
+ else core.drawTip("无法开启此门", null, true);
core.clearContinueAutomaticRoute();
return false;
}
@@ -456,7 +462,7 @@ events.prototype.getItem = function (id, num, x, y, callback) {
core.removeBlock(x, y);
var text = '获得 ' + core.material.items[id].name;
if (num > 1) text += "x" + num;
- if (itemCls === 'items') text += core.items.getItemEffectTip(id);
+ if (itemCls === 'items' && num == 1) text += core.items.getItemEffectTip(id);
core.drawTip(text, id);
// --- 首次获得道具的提示
@@ -467,11 +473,13 @@ events.prototype.getItem = function (id, num, x, y, callback) {
try {
hint = core.replaceText(hint);
} catch (e) {}
- core.insertAction("\t["+core.material.items[id].name+","+id+"]" + hint + "\n"
- + (itemCls == 'keys' || id == 'greenKey' || id == 'steelKey' ? "（钥匙类道具，遇到对应的门时自动打开）"
- : itemCls == 'tools' ? "（消耗类道具，请按T在道具栏使用）"
- : itemCls == 'constants' ? "（永久类道具，请按T在道具栏使用）"
- : itemCls == 'equips' ? "（装备类道具，请按Q在装备栏进行装备）" : ""))
+ if (!core.status.event.id || core.status.event.id=='action') {
+ core.insertAction("\t["+core.material.items[id].name+","+id+"]" + hint + "\n"
+ + (itemCls == 'keys' || id == 'greenKey' || id == 'steelKey' ? "（钥匙类道具，遇到对应的门时自动打开）"
+ : itemCls == 'tools' ? "（消耗类道具，请按T在道具栏使用）"
+ : itemCls == 'constants' ? "（永久类道具，请按T在道具栏使用）"
+ : itemCls == 'equips' ? "（装备类道具，请按Q在装备栏进行装备）" : ""));
+ }
itemHint.push(id);
}
@@ -487,17 +495,31 @@ events.prototype.afterGetItem = function (id, x, y, callback) {
////// 获得面前的物品（轻按） //////
events.prototype.getNextItem = function (noRoute) {
- if (core.isMoving() || !core.canMoveHero() || !core.flags.enableGentleClick) return false;
+ if (core.isMoving() || !core.flags.enableGentleClick) return false;
+ if (this._canGetNextItem()) return this._getNextItem(null, noRoute);
- var nextX = core.nextX(), nextY = core.nextY();
- var block = core.getBlock(nextX, nextY);
- if (block == null) return false;
- if (block.block.event.trigger == 'getItem') {
- if (!noRoute) core.status.route.push("getNext");
- this.getItem(block.block.event.id, 1, nextX, nextY);
- return true;
- }
- return false;
+ var directions = ["up", "down", "left", "right"].filter(function (dir) {
+ return core.events._canGetNextItem(dir);
+ });
+ return directions.length == 1 ? this._getNextItem(directions[0]) : false;
+}
+
+events.prototype._canGetNextItem = function (direction) {
+ direction = direction || core.getHeroLoc('direction');
+ if (!core.canMoveHero(null, null, direction)) return;
+ var nx = core.getHeroLoc('x') + core.utils.scan[direction].x;
+ var ny = core.getHeroLoc('y') + core.utils.scan[direction].y;
+ var block = core.getBlock(nx, ny);
+ return block != null && block.block.event.trigger == 'getItem';
+}
+
+events.prototype._getNextItem = function (direction, noRoute) {
+ direction = direction || core.getHeroLoc('direction');
+ var nx = core.getHeroLoc('x') + core.utils.scan[direction].x;
+ var ny = core.getHeroLoc('y') + core.utils.scan[direction].y;
+ if (!noRoute) core.status.route.push("getNext");
+ this.getItem(core.getBlockId(nx, ny), 1, nx, ny);
+ return true;
}
events.prototype._sys_changeFloor = function (data, callback) {
@@ -523,7 +545,7 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback
floorId = info.floorId;
info.locked = core.status.lockControl;
- core.dom.floorNameLabel.innerHTML = core.status.maps[floorId].title;
+ core.dom.floorNameLabel.innerText = core.status.maps[floorId].title;
core.lockControl();
core.stopAutomaticRoute();
core.clearContinueAutomaticRoute();
@@ -661,20 +683,26 @@ events.prototype._sys_passNet = function (data, callback) {
////// 经过一个路障 //////
events.prototype.passNet = function (data) {
- if (core.hasItem('shoes')) return;
- // 血网 lavaNet 移动到 checkBlock 中处理
- if (data.event.id == 'poisonNet') { // 毒网
- core.insertAction({"type":"insert","name":"毒衰咒处理","args":[0]});
- }
- else if (data.event.id == 'weakNet') { // 衰网
- core.insertAction({"type":"insert","name":"毒衰咒处理","args":[1]});
- }
- else if (data.event.id == 'curseNet') { // 咒网
- core.insertAction({"type":"insert","name":"毒衰咒处理","args":[2]});
+ if (!core.hasItem('shoes')) {
+ // 血网 lavaNet 移动到 checkBlock 中处理
+ if (data.event.id == 'poisonNet') { // 毒网
+ core.insertAction({"type":"insert","name":"毒衰咒处理","args":[0]});
+ }
+ else if (data.event.id == 'weakNet') { // 衰网
+ core.insertAction({"type":"insert","name":"毒衰咒处理","args":[1]});
+ }
+ else if (data.event.id == 'curseNet') { // 咒网
+ core.insertAction({"type":"insert","name":"毒衰咒处理","args":[2]});
+ }
}
+ this.afterPassNet(data.x, data.y, data.event.id);
core.updateStatusBar();
}
+events.prototype.afterPassNet = function (x, y, id) {
+ if (this.eventdata.afterPassNet) this.eventdata.afterPassNet(x, y, id);
+}
+
events.prototype._sys_pushBox = function (data, callback) {
this.pushBox(data);
if (callback) callback();
@@ -800,6 +828,8 @@ events.prototype.setEvents = function (list, x, y, callback) {
if (x != null) data.x = x;
if (y != null) data.y = y;
if (callback) data.callback = callback;
+ if (!data.appendingEvents) data.appendingEvents = [];
+ if (!data.locStack) data.locStack = [];
core.status.event.id = 'action';
core.status.event.data = data;
}
@@ -828,9 +858,10 @@ events.prototype.doAction = function (keepUI) {
}
// 判定是否执行完毕
if (this._doAction_finishEvents()) return;
+ var floorId = core.status.event.data.floorId || core.status.floorId;
// 当前点坐标和前缀
var x = core.status.event.data.x, y = core.status.event.data.y;
- var prefix = [core.status.floorId || ":f", x != null ? x : "x", y != null ? y : "y"].join("@");
+ var prefix = [floorId || ":f", x != null ? x : "x", y != null ? y : "y"].join("@");
var current = core.status.event.data.list[0];
if (this._popEvents(current, prefix)) return;
// 当前要执行的事件
@@ -838,6 +869,7 @@ events.prototype.doAction = function (keepUI) {
core.status.event.data.current = data;
if (typeof data == "string")
data = {"type": "text", "text": data};
+ data.floorId = data.floorId || floorId;
core.status.event.data.type = data.type;
this.doEvent(data, x, y, prefix);
return;
@@ -846,6 +878,11 @@ events.prototype.doAction = function (keepUI) {
events.prototype._doAction_finishEvents = function () {
// 事件处理完毕
if (core.status.event.data.list.length == 0) {
+ // 检测并执行延迟自动事件
+ if (core.status.event.data.appendingEvents.length > 0) {
+ this.setEvents(core.status.event.data.appendingEvents.shift());
+ return false;
+ }
var callback = core.status.event.data.callback;
core.ui.closePanel();
if (callback) callback();
@@ -915,6 +952,81 @@ events.prototype.recoverEvents = function (data) {
return false;
}
+////// 检测自动事件 //////
+events.prototype.checkAutoEvents = function () {
+ // 只有在无操作或事件流中才能执行自动事件！
+ if (!core.isPlaying() || core.status.lockControl && core.status.event.id != 'action') return;
+ var todo = [], delay = [];
+ core.status.autoEvents.forEach(function (autoEvent) {
+ var symbol = autoEvent.symbol, x = autoEvent.x, y = autoEvent.y, floorId = autoEvent.floorId;
+ // 不在当前楼层 or 已经执行过 or 正在执行中
+ if (autoEvent.currentFloor && floorId != core.status.floorId) return;
+ if (!autoEvent.multiExecute && autoEvent.executed) return;
+ if (core.autoEventExecuting(symbol)) return;
+ var prefix = floorId + "@" + x + "@" + y;
+ try {
+ if (!core.calValue(autoEvent.condition, prefix)) return;
+ } catch (e) {
+ return;
+ }
+
+ core.autoEventExecuting(symbol, true);
+ autoEvent.executed = true;
+
+ var event = [
+ {"type": "function", "function":
+ "function() { core.pushEventLoc(" + x + ", " + y + ", '" + floorId + "' ); }"},
+ // 用do-while(0)包一层防止break影响事件流
+ {"type": "dowhile", "condition": "false", "data": autoEvent.data},
+ {"type": "function", "function":
+ "function() { core.popEventLoc(); core.autoEventExecuting('" + symbol + "', false); }"}
+ ];
+
+ if (autoEvent.delayExecute)
+ delay.push(event);
+ else
+ core.push(todo, event);
+ });
+
+ if (todo.length == 0 && delay.length == 0) return;
+
+ if (core.status.event.id == 'action' || todo.length > 0) {
+ core.insertAction(todo);
+ core.push(core.status.event.data.appendingEvents, delay);
+ } else {
+ core.insertAction(delay);
+ }
+
+}
+
+events.prototype.autoEventExecuting = function (symbol, value) {
+ var name = '_executing_autoEvent_' + symbol;
+ if (value == null) return core.getFlag(name, false);
+ else core.setFlag(name, value || null);
+}
+
+events.prototype.pushEventLoc = function (x, y, floorId) {
+ if (core.status.event.id != 'action') return;
+ core.status.event.data.locStack.push({
+ x: core.status.event.data.x,
+ y: core.status.event.data.y,
+ floorId: core.status.event.data.floorId
+ });
+ core.status.event.data.x = x;
+ core.status.event.data.y = y;
+ core.status.event.data.floorId = floorId;
+}
+
+events.prototype.popEventLoc = function () {
+ if (core.status.event.id != 'action') return;
+ var loc = core.status.event.data.locStack.shift();
+ if (loc) {
+ core.status.event.data.x = loc.x;
+ core.status.event.data.y = loc.y;
+ core.status.event.data.floorId = loc.floorId;
+ }
+}
+
// ------ 样板提供的的自定义事件 ------ //
events.prototype.__action_checkReplaying = function () {
@@ -975,7 +1087,7 @@ events.prototype._action_comment = function (data, x, y, prefix) {
}
events.prototype._action_setText = function (data, x, y, prefix) {
- ["position", "offset", "align", "bold", "titlefont", "textfont", "time"].forEach(function (t) {
+ ["position", "offset", "align", "bold", "titlefont", "textfont", "time", "interval"].forEach(function (t) {
if (data[t] != null) core.status.textAttribute[t] = data[t];
});
["background", "title", "text"].forEach(function (t) {
@@ -1002,7 +1114,7 @@ events.prototype._action_tip = function (data, x, y, prefix) {
events.prototype._action_show = function (data, x, y, prefix) {
data.loc = this.__action_getLoc2D(data.loc, x, y, prefix);
- if (data.time > 0 && !(data.floorId && data.floorId != core.status.floorId)) {
+ if (data.time > 0 && data.floorId == core.status.floorId) {
this.__action_doAsyncFunc(data.async, core.animateBlock, data.loc, 'show', data.time);
}
else {
@@ -1015,7 +1127,7 @@ events.prototype._action_show = function (data, x, y, prefix) {
events.prototype._action_hide = function (data, x, y, prefix) {
data.loc = this.__action_getLoc2D(data.loc, x, y, prefix);
- if (data.time > 0 && !(data.floorId && data.floorId != core.status.floorId)) {
+ if (data.time > 0 && data.floorId == core.status.floorId) {
data.loc.forEach(function (t) {
core.hideBlock(t[0], t[1], data.floorId);
});
@@ -1115,7 +1227,7 @@ events.prototype._action_jumpHero = function (data, x, y, prefix) {
events.prototype._action_changeFloor = function (data, x, y, prefix) {
var loc = this.__action_getHeroLoc(data.loc, prefix);
var heroLoc = {x: loc[0], y: loc[1], direction: data.direction};
- core.changeFloor(data.floorId || core.status.floorId, null, heroLoc, data.time, core.doAction);
+ core.changeFloor(data.floorId, null, heroLoc, data.time, core.doAction);
}
events.prototype._action_changePos = function (data, x, y, prefix) {
@@ -1189,7 +1301,7 @@ events.prototype._action_setWeather = function (data, x, y, prefix) {
events.prototype._action_openDoor = function (data, x, y, prefix) {
var loc = this.__action_getLoc(data.loc, x, y, prefix);
- var floorId = data.floorId || core.status.floorId;
+ var floorId = data.floorId;
if (floorId == core.status.floorId) {
this.__action_doAsyncFunc(data.async, core.openDoor, loc[0], loc[1], data.needKey);
}
@@ -1234,6 +1346,10 @@ events.prototype._action_battle = function (data, x, y, prefix) {
this.battle(data.id, null, null, true, core.doAction);
}
else {
+ if (data.floorId != core.status.floorId) {
+ setTimeout(core.doAction);
+ return;
+ }
var loc = this.__action_getLoc(data.loc, x, y, prefix);
this.battle(null, loc[0], loc[1], true, core.doAction);
}
@@ -1272,7 +1388,7 @@ events.prototype._action_insert = function (data, x, y, prefix) {
else {
var loc = this.__action_getLoc(data.loc, x, y, prefix);
core.setFlag('arg0', loc);
- var floorId = data.floorId || core.status.floorId;
+ var floorId = data.floorId;
var which = data.which || "events";
var event = (core.floors[floorId][which]||[])[loc[0] + "," + loc[1]];
if (event) this.insertAction(event.data || event);
@@ -2155,6 +2271,7 @@ events.prototype.moveImage = function (code, to, opacityVal, time, callback) {
events.prototype._moveImage_moving = function (name, moveInfo, callback) {
var per_time = 10, step = 0, steps = parseInt(moveInfo.time / 10);
+ if (steps <= 0) steps = 1;
var fromX = moveInfo.fromX, fromY = moveInfo.fromY, toX = moveInfo.toX, toY = moveInfo.toY,
opacity = moveInfo.opacity, toOpacity = moveInfo.toOpacity;
var currX = fromX, currY = fromY, currOpacity = opacity;
@@ -2209,6 +2326,7 @@ events.prototype.setVolume = function (value, time, callback) {
var currVolume = core.musicStatus.volume;
time /= Math.max(core.status.replay.speed, 1);
var per_time = 10, step = 0, steps = parseInt(time / per_time);
+ if (steps <= 0) steps = 1;
var fade = setInterval(function () {
step++;
set(currVolume + (value - currVolume) * step / steps);
@@ -2363,7 +2481,7 @@ events.prototype.openShop = function (shopId, needVisited) {
shop.times = shop.times || 0;
if (shop.commonTimes) shop.times = core.getFlag('commonTimes', 0);
if (needVisited && !shop.visited) {
- if (!core.flags.enableDisabledShop || shop.commonEvent) {
+ if (!core.flags.enableDisabledShop || shop.commonEvent || shop.item) {
if (shop.times == 0) core.drawTip("该项尚未开启");
else core.drawTip("该项已失效");
core.ui.closePanel();
@@ -2375,8 +2493,15 @@ events.prototype.openShop = function (shopId, needVisited) {
}
else shop.visited = true;
- // --- 商店
- if (shop.commonEvent) {
+ if (shop.item) {
+ core.status.route.push("shop:" + shopId + ":0");
+ if (core.openItemShop) {
+ core.openItemShop(shopId);
+ } else {
+ core.insertAction("道具商店插件不存在！请检查是否存在该插件！");
+ }
+ return;
+ } else if (shop.commonEvent) {
core.status.route.push("shop:"+shopId+":0");
core.insertAction({"type": "insert", "name": shop.commonEvent, "args": shop.args});
return;
diff --git a/libs/extensions.js b/libs/extensions.js
new file mode 100644
index 00000000..3af7d629
--- /dev/null
+++ b/libs/extensions.js
@@ -0,0 +1,49 @@
+/*
+extensions.js：负责拓展插件
+ */
+
+"use strict";
+
+function extensions() {
+
+}
+
+extensions.prototype._load = function (callback) {
+ if (!window.fs) {
+ this._loadJs('_server/fs.js', function () {
+ core.extensions._listExtensions(callback);
+ }, callback);
+ } else this._listExtensions(callback);
+}
+
+extensions.prototype._loadJs = function (file, callback, onerror) {
+ var script = document.createElement('script');
+ script.src = file + '?v=' + main.version;
+ script.onload = callback;
+ script.onerror = onerror;
+ main.dom.body.appendChild(script);
+}
+
+extensions.prototype._listExtensions = function (callback) {
+ if (!window.fs) return callback();
+ fs.readdir('extensions', function (error, data) {
+ if (error || !(data instanceof Array)) return callback();
+ var list = [];
+ data.forEach(function (name) {
+ if (/^[\w.-]+\.js$/.test(name)) {
+ list.push(name);
+ }
+ });
+ list.sort();
+ core.extensions._loadExtensions(list, callback);
+ });
+}
+
+extensions.prototype._loadExtensions = function (list, callback) {
+ var i = 0;
+ var load = function () {
+ if (i == list.length) return callback();
+ core.extensions._loadJs('extensions/' + list[i++], load, load);
+ }
+ load();
+}
diff --git a/libs/items.js b/libs/items.js
index b4770490..ad841add 100644
--- a/libs/items.js
+++ b/libs/items.js
@@ -59,7 +59,8 @@ items.prototype.getItemEffect = function (itemId, itemNum) {
var curr_hp = core.status.hero.hp;
if (itemId in this.itemEffect) {
try {
- eval(this.itemEffect[itemId]);
+ for (var i = 0; i < itemNum; ++i)
+ eval(this.itemEffect[itemId]);
}
catch (e) {
main.log(e);
@@ -424,3 +425,14 @@ items.prototype.quickLoadEquip = function (index) {
core.drawTip("成功换上" + index + "号套装");
}
+
+////// 获得装备直接增加的属性数据 //////
+items.prototype.getEquippedStatus = function (name) {
+ var value = 0;
+ core.status.hero.equipment.forEach(function (v) {
+ if (!v || !(core.material.items[v] || {}).equip) return;
+ if (core.material.items[v].equip.percentage) return;
+ value += core.material.items[v].equip[name] || 0;
+ });
+ return value;
+}
diff --git a/libs/loader.js b/libs/loader.js
index 74435cd6..489d9ea4 100644
--- a/libs/loader.js
+++ b/libs/loader.js
@@ -19,7 +19,7 @@ loader.prototype._setStartProgressVal = function (val) {
////// 设置加载进度条提示文字 //////
loader.prototype._setStartLoadTipText = function (text) {
- core.dom.startTopLoadTips.innerHTML = text;
+ core.dom.startTopLoadTips.innerText = text;
}
loader.prototype._load = function (callback) {
diff --git a/libs/maps.js b/libs/maps.js
index e700f469..8c2aa54b 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -590,11 +590,11 @@ maps.prototype._canMoveDirectly_bfs = function (sx, sy, locs, number, ans) {
maps.prototype._canMoveDirectly_checkNextPoint = function (blocksObj, x, y) {
var index = x + "," + y;
// 该点是否有事件
- if (blocksObj[index]) return false;
+ if (blocksObj[index] && (blocksObj[index].event.trigger || blocksObj[index].event.noPass)) return false;
// 是否存在阻激夹域伤害
- if (core.status.checkBlock.damage[x + "," + y]) return false;
+ if (core.status.checkBlock.damage[index]) return false;
// 是否存在捕捉
- if (core.status.checkBlock.ambush[x + "," + y]) return false;
+ if (core.status.checkBlock.ambush[index]) return false;
return true;
}
@@ -1365,6 +1365,8 @@ maps.prototype.getBlockInfo = function (block) {
faceIds = block.event.faceIds || {};
if (core.material.enemys[id]) {
name = core.material.enemys[id].name;
+ } else if (core.material.items[id]) {
+ name = core.material.items[id].name;
}
}
@@ -1642,8 +1644,11 @@ maps.prototype.setBgFgBlock = function (name, number, x, y, floorId) {
core.setFlag(vFlag, number);
core.status[name + "maps"][floorId] = null;
- if (floorId == core.status.floorId)
- core.drawMap(floorId);
+ if (floorId == core.status.floorId){
+ core.clearMap(name);
+ if (name=='bg') core.drawBg(floorId);
+ else core.drawFg(floorId);
+ }
}
////// 重置地图 //////
diff --git a/libs/ui.js b/libs/ui.js
index ae81e542..a8275aa6 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -440,7 +440,7 @@ ui.prototype._uievent_drawIcon = function (data) {
ui.prototype.closePanel = function () {
this.clearUI();
core.maps.generateGroundPattern();
- core.updateStatusBar();
+ core.updateStatusBar(true);
core.unLockControl();
core.status.event.data = null;
core.status.event.id = null;
@@ -458,66 +458,50 @@ ui.prototype.clearUI = function () {
}
////// 左上角绘制一段提示 //////
-ui.prototype.drawTip = function (text, id) {
- var textX, textY, width, height;
- clearInterval(core.interval.tipAnimate);
- core.setFont('data', "16px Arial");
- core.setTextAlign('data', 'left');
+ui.prototype.drawTip = function (text, id, clear) {
+ if (clear) this.clearTip();
+ var one = {
+ text: text,
+ textX: 21,
+ width: 26 + core.calWidth('data', text, "16px Arial"),
+ opacity: 0.1,
+ stage: 1,
+ time: 0
+ };
if (id != null) {
var info = core.getBlockInfo(id);
- if (info == null || !info.image || info.height != 32) {
+ if (info == null || !info.image) {
// 检查状态栏图标
if (core.statusBar.icons[id] instanceof Image) {
- id = {image: core.statusBar.icons[id], posX: 0, posY: 0};
+ id = {image: core.statusBar.icons[id], posX: 0, posY: 0, height: 32};
}
- else id = null;
+ else info = null;
+ }
+ if (info != null) {
+ one.image = info.image;
+ one.posX = info.posX;
+ one.posY = info.posY;
+ one.height = info.height;
+ one.textX += 24;
+ one.width += 24;
}
- else id = info;
}
- if (!id) {
- textX = 16;
- textY = 18;
- width = textX + core.calWidth('data', text) + 16;
- height = 42;
- }
- else {
- textX = 44;
- textY = 18;
- width = textX + core.calWidth('data', text) + 8;
- height = 42;
- }
- this._drawTip_animate(text, id, textX, textY, width, height);
+ core.animateFrame.tips.list.push(one);
}
-ui.prototype._drawTip_animate = function (text, info, textX, textY, width, height) {
- var alpha = 0, hide = false;
- core.interval.tipAnimate = window.setInterval(function () {
- if (hide) alpha -= 0.1;
- else alpha += 0.1;
- core.clearMap('data', 5, 5, core.ui.PIXEL, height);
- core.setAlpha('data', alpha);
- core.fillRect('data', 5, 5, width, height, '#000');
- if (info)
- core.drawImage('data', info.image, info.posX * 32, info.posY * 32, 32, 32, 10, 8, 32, 32);
- core.fillText('data', text, textX + 5, textY + 15, '#fff');
- core.setAlpha('data', 1);
- if (alpha > 0.6 || alpha < 0) {
- if (hide) {
- core.clearMap('data', 5, 5, core.ui.PIXEL, height);
- clearInterval(core.interval.tipAnimate);
- return;
- }
- else {
- if (!core.timeout.tipTimeout) {
- core.timeout.tipTimeout = window.setTimeout(function () {
- hide = true;
- core.timeout.tipTimeout = null;
- }, 750);
- }
- alpha = 0.6;
- }
- }
- }, 30);
+ui.prototype._drawTip_drawOne = function (one, offset) {
+ core.setAlpha('data', one.opacity);
+ core.fillRect('data', 5, offset+ 5, one.width, 42, '#000000');
+ if (one.image)
+ core.drawImage('data', one.image, one.posX * 32, one.posY * one.height, 32, 32, 10, offset + 10, 32, 32);
+ core.fillText('data', one.text, one.textX, offset + 33, '#FFFFFF');
+ core.setAlpha('data', 1);
+}
+
+ui.prototype.clearTip = function () {
+ core.animateFrame.tips.list = [];
+ core.animateFrame.tips.offset = 0;
+ core.animateFrame.tips.lastSize = 0;
}
////// 地图中间绘制一段文字 //////
@@ -645,11 +629,8 @@ ui.prototype.drawWindowSelector = function(background, x, y, w, h) {
}
ui.prototype._uievent_drawSelector = function (data) {
- if (data.image == null) {
- if (main.mode != 'editor')
- core.deleteCanvas('_uievent_selector');
- return;
- }
+ var canvasName = '_uievent_selector_' + (data.code || 0);
+ if (data.image == null) return core.deleteCanvas(canvasName);
var background = data.image || core.status.textAttribute.background;
if (typeof background != 'string') return;
@@ -661,7 +642,8 @@ ui.prototype._uievent_drawSelector = function (data) {
}
var z = 136;
if (core.dymCanvas.uievent) z = (parseInt(core.dymCanvas.uievent.canvas.style.zIndex) || 135) + 1;
- var ctx = core.createCanvas('_uievent_selector', x, y, w, h, z);
+ var ctx = core.createCanvas(canvasName, x, y, w, h, z);
+ ctx.canvas.classList.add('_uievent_selector');
this._drawSelector(ctx, background, w, h);
}
@@ -875,6 +857,7 @@ ui.prototype.drawTextContent = function (ctx, content, config) {
config.fontSize = config.fontSize || textAttribute.textfont;
config.lineHeight = config.lineHeight || (config.fontSize * 1.3);
config.time = config.time || 0;
+ config.interval = config.interval == null ? (textAttribute.interval || 0) : config.interval;
config.index = 0;
config.currcolor = config.color;
@@ -980,7 +963,7 @@ ui.prototype._drawTextContent_drawChar = function (tempCtx, content, config, ch)
tempCtx.font = this._buildFont(config.fontSize, config.bold, config.italic);
}
// 检查是不是自动换行
- var charwidth = core.calWidth(tempCtx, ch);
+ var charwidth = core.calWidth(tempCtx, ch) + config.interval;
if (config.maxWidth != null && config.offsetX + charwidth > config.maxWidth) {
this._drawTextContent_newLine(tempCtx, config);
config.index--;
@@ -1298,7 +1281,7 @@ ui.prototype._drawScrollText_animate = function (ctx, time, callback) {
if (currH < -height) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- if (core.isset(callback)) callback();
+ if (callback) callback();
return;
}
core.drawImage('ui', ctx.canvas, 0, currH);
@@ -1418,7 +1401,7 @@ ui.prototype._drawChoices_drawChoices = function (choices, isWindowSkin, hPos, v
if (color instanceof Array) color = core.arrayToRGBA(color);
core.setFillStyle('ui', color);
var offset = this.HPIXEL;
- if (core.isset(choices[i].icon)) {
+ if (choices[i].icon) {
var iconInfo = this._getDrawableIconInfo(choices[i].icon), image = iconInfo[0], icon = iconInfo[1];
if (image != null) {
core.drawImage('ui', image, 0, 32 * icon, 32, 32,
@@ -1711,13 +1694,13 @@ ui.prototype._drawBook_drawName = function (index, enemy, top, left, width) {
core.setTextAlign('ui', 'center');
if (enemy.specialText=='') {
core.fillText('ui', enemy.name, left + width / 2,
- top + 35, '#DDDDDD', this._buildFont(17, true));
+ top + 35, '#DDDDDD', this._buildFont(17, true), width);
}
else {
core.fillText('ui', enemy.name, left + width / 2,
- top + 28, '#DDDDDD', this._buildFont(17, true));
+ top + 28, '#DDDDDD', this._buildFont(17, true), width);
core.fillText('ui', enemy.specialText, left + width / 2,
- top + 50, '#FF6A6A', this._buildFont(15, true));
+ top + 50, '#FF6A6A', this._buildFont(15, true), width);
}
}
@@ -1809,7 +1792,7 @@ ui.prototype.drawBookDetail = function (index) {
if (!enemy) return;
var content = info[1].join("\n");
core.status.event.id = 'book-detail';
- clearInterval(core.interval.tipAnimate);
+ core.clearTip();
core.clearMap('data');
var left = 10, width = this.PIXEL - 2 * left, right = left + width;
@@ -2037,7 +2020,7 @@ ui.prototype.drawShop = function (shopId) {
for (var i=0;i this.length) {
+ this_len = this.length;
+ }
+ return this.substring(0, search.length) === search;
+ }
+ }
}
@@ -634,7 +641,8 @@ utils.prototype.setStatusBarInnerHTML = function (name, value, css) {
var length = this.strlen(value) || 1;
style += 'font-size: ' + Math.min(1, 7 / length) + 'em; ';
if (css) style += css;
- core.statusBar[name].innerHTML = "" + value + "";
+ core.statusBar[name].innerHTML = "";
+ core.statusBar[name].children[0].innerText = value;
}
utils.prototype.strlen = function (str) {
diff --git a/logo.png b/logo.png
new file mode 100644
index 00000000..96da1025
Binary files /dev/null and b/logo.png differ
diff --git a/main.js b/main.js
index e2c8cf15..191e1773 100644
--- a/main.js
+++ b/main.js
@@ -2,7 +2,7 @@ function main() {
//------------------------ 用户修改内容 ------------------------//
- this.version = "2.6.3"; // 游戏版本号；如果更改了游戏内容建议修改此version以免造成缓存问题。
+ this.version = "2.6.4"; // 游戏版本号；如果更改了游戏内容建议修改此version以免造成缓存问题。
this.useCompress = false; // 是否使用压缩文件
// 当你即将发布你的塔时，请使用“JS代码压缩工具”将所有js代码进行压缩，然后将这里的useCompress改为true。
@@ -79,7 +79,7 @@ function main() {
};
this.mode = 'play';
this.loadList = [
- 'loader', 'control', 'utils', 'items', 'icons', 'maps', 'enemys', 'events', 'actions', 'data', 'ui', 'core'
+ 'loader', 'control', 'utils', 'items', 'icons', 'maps', 'enemys', 'events', 'actions', 'data', 'ui', 'extensions', 'core'
];
this.pureData = [
'data', 'enemys', 'icons', 'maps', 'items', 'functions', 'events', 'plugins'
@@ -189,8 +189,8 @@ function main() {
this.floors = {}
this.canvas = {};
- this.__VERSION__ = "2.6.3";
- this.__VERSION_CODE__ = 63;
+ this.__VERSION__ = "2.6.4";
+ this.__VERSION_CODE__ = 78;
}
main.prototype.init = function (mode, callback) {
@@ -231,7 +231,7 @@ main.prototype.init = function (mode, callback) {
main.loadFloors(function() {
var coreData = {};
["dom", "statusBar", "canvas", "images", "tilesets", "materials",
- "animates", "bgms", "sounds", "floorIds", "floors"].forEach(function (t) {
+ "animates", "bgms", "sounds", "floorIds", "floors"].forEach(function (t) {
coreData[t] = main[t];
})
main.core.init(coreData, callback);
@@ -267,14 +267,14 @@ main.prototype.loadJs = function (dir, loadList, callback) {
}
////// 加载某一个JS文件 //////
-main.prototype.loadMod = function (dir, modName, callback) {
+main.prototype.loadMod = function (dir, modName, callback, onerror) {
var script = document.createElement('script');
var name = modName;
script.src = dir + '/' + modName + (this.useCompress?".min":"") + '.js?v=' + this.version;
- main.dom.body.appendChild(script);
script.onload = function () {
callback(name);
}
+ main.dom.body.appendChild(script);
}
////// 动态加载所有楼层（剧本） //////
diff --git a/project/data.js b/project/data.js
index 247584ff..629b7a85 100644
--- a/project/data.js
+++ b/project/data.js
@@ -78,7 +78,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"firstData": {
"title": "魔塔样板",
"name": "template",
- "version": "Ver 2.6.3",
+ "version": "Ver 2.6.4",
"floorId": "sample0",
"hero": {
"name": "阳光",
@@ -266,18 +266,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
{
"text": "生命+800",
"effect": "status:hp+=800"
- },
- {
- "text": "攻击+4",
- "effect": "status:atk+=4"
- },
- {
- "text": "防御+4",
- "effect": "status:def+=4"
- },
- {
- "text": "魔防+10",
- "effect": "status:mdef+=10"
}
]
},
@@ -295,17 +283,20 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
{
"text": "等级+1",
"need": "100",
- "effect": "status:lv+=1;status:hp+=1000;status:atk+=7;status:def+=7"
- },
+ "effect": "status:hp+=1000"
+ }
+ ]
+ },
+ {
+ "id": "itemShop",
+ "item": true,
+ "textInList": "道具商店",
+ "mustEnable": false,
+ "choices": [
{
- "text": "攻击+5",
- "need": "30",
- "effect": "status:atk+=5"
- },
- {
- "text": "防御+5",
- "need": "30",
- "effect": "status:def+=5"
+ "id": "yellowKey",
+ "number": 10,
+ "money": 10
}
]
},
diff --git a/project/events.js b/project/events.js
index d8559846..57aec84c 100644
--- a/project/events.js
+++ b/project/events.js
@@ -4,7 +4,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
"加点事件": [
{
"type": "comment",
- "text": "通过传参，flag:arg1表示当前应该的加点数值"
+ "text": "通过传参，flag:arg1 表示当前应该的加点数值"
},
{
"type": "choices",
@@ -45,7 +45,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
"毒衰咒处理": [
{
"type": "comment",
- "text": "获得毒衰咒效果，flag:arg1为要获得的类型"
+ "text": "获得毒衰咒效果，flag:arg1 为要获得的类型"
},
{
"type": "switch",
diff --git a/project/floors/sample1.js b/project/floors/sample1.js
index 92b3a0e8..8b5c8646 100644
--- a/project/floors/sample1.js
+++ b/project/floors/sample1.js
@@ -728,20 +728,6 @@ main.floors.sample1=
"type": "setValue",
"name": "flag:door",
"value": "flag:door+1"
- },
- {
- "type": "if",
- "condition": "flag:door==2",
- "true": [
- {
- "type": "openDoor",
- "loc": [
- 10,
- 5
- ]
- }
- ],
- "false": []
}
],
"11,6": [
@@ -749,20 +735,6 @@ main.floors.sample1=
"type": "setValue",
"name": "flag:door",
"value": "flag:door+1"
- },
- {
- "type": "if",
- "condition": "flag:door==2",
- "true": [
- {
- "type": "openDoor",
- "loc": [
- 10,
- 5
- ]
- }
- ],
- "false": []
}
]
},
@@ -775,4 +747,21 @@ main.floors.sample1=
"fgmap": [
],
+"autoEvent": {
+ "10,5": {
+ "0": {
+ "condition": "flag:door==2",
+ "currentFloor": true,
+ "priority": 0,
+ "delayExecute": false,
+ "multiExecute": false,
+ "data": [
+ {
+ "type": "openDoor"
+ }
+
+ ]
+ }
+ }
+}
}
\ No newline at end of file
diff --git a/project/functions.js b/project/functions.js
index f09b5bda..ee55d2f7 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -306,7 +306,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
var hint = "打败 " + enemy.name;
if (core.flags.enableMoney) hint += "，金币+" + money;
if (core.flags.enableExperience) hint += "，经验+" + experience;
- core.drawTip(hint);
+ core.drawTip(hint, enemy.id);
// 事件的处理
var todo = [];
@@ -330,6 +330,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
// 自爆
if (core.enemys.hasSpecial(special, 19)) {
+ core.status.hero.statistics.battleDamage += core.status.hero.hp - 1;
core.status.hero.hp = 1;
}
// 退化
@@ -353,7 +354,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
core.setFlag('skill', 0);
core.setFlag('skillName', '无');
}
- core.updateStatusBar();
// 如果有加点
var point = core.material.enemys[enemyId].point;
@@ -375,6 +375,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// 如果事件不为空，将其插入
if (todo.length > 0) core.insertAction(todo, x, y);
+ core.updateStatusBar();
// 如果已有事件正在处理中
if (core.status.event.id == null)
@@ -444,6 +445,13 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
*/
+},
+ "afterPassNet": function (x, y, id) {
+ // 经过特殊地形后的事件；x和y为当前坐标，id为当前的图块id
+
+ // 这是个一次性血网的例子
+ // if (id == 'lavaNet') core.removeBlock(x, y);
+
},
"canUseQuickShop": function(shopId) {
// 当前能否使用某个快捷商店
@@ -1044,9 +1052,9 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// 设置魔力值
if (core.flags.enableMana) {
// status:manamax 只有在非负时才生效。
- if (core.status.hero.manamax != null && core.status.hero.manamax >= 0) {
- core.status.hero.mana = Math.min(core.status.hero.mana, core.status.hero.manamax);
- core.setStatusBarInnerHTML('mana', core.status.hero.mana + "/" + core.status.hero.manamax);
+ if (core.status.hero.manamax != null && core.getRealStatus('manamax') >= 0) {
+ core.status.hero.mana = Math.min(core.status.hero.mana, core.getRealStatus('manamax'));
+ core.setStatusBarInnerHTML('mana', core.status.hero.mana + "/" + core.getRealStatus('manamax'));
}
else {
core.setStatusBarInnerHTML("mana", core.status.hero.mana);
@@ -1091,7 +1099,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
// 难度
- core.statusBar.hard.innerHTML = core.status.hard;
+ core.statusBar.hard.innerText = core.status.hard;
// 自定义状态栏绘制
core.drawStatusBar();
diff --git a/project/items.js b/project/items.js
index 1c5b4c7f..e800d30d 100644
--- a/project/items.js
+++ b/project/items.js
@@ -19,17 +19,17 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"redJewel": {
"cls": "items",
"name": "红宝石",
- "text": "'，攻击+'+core.values.redJewel"
+ "text": "'，攻击+${core.values.redJewel}'"
},
"blueJewel": {
"cls": "items",
"name": "蓝宝石",
- "text": "'，防御+'+core.values.blueJewel"
+ "text": "'，防御+${core.values.blueJewel}'"
},
"greenJewel": {
"cls": "items",
"name": "绿宝石",
- "text": "'，魔防+'+core.values.greenJewel"
+ "text": "'，魔防+${core.values.greenJewel}'"
},
"yellowJewel": {
"cls": "items",
@@ -368,7 +368,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"pickaxe": "core.playSound('pickaxe.mp3');\ncore.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
"icePickaxe": "core.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
"snow": "core.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
- "bigKey": "core.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
+ "bigKey": "(function () {\n\tvar actions = core.status.event.ui.map(function (id) {\n\t\tvar block = core.status.thisMap.blocks[id];\n\t\treturn { \"type\": \"openDoor\", \"loc\": [block.x, block.y], \"async\": true };\n\t});\n\tactions.push({ \"type\": \"waitAsync\" });\n\tactions.push({ \"type\": \"tip\", \"text\": core.material.items[itemId].name + \"使用成功\" });\n\tcore.insertAction(actions);\n})();",
"bomb": "core.playSound('bomb.mp3');\ncore.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n\tcore.events.afterUseBomb();\n});",
"hammer": "core.playSound('bomb.mp3');\ncore.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n\tcore.events.afterUseBomb();\n});",
"centerFly": "core.playSound('centerFly.mp3');\ncore.clearMap('hero');\ncore.setHeroLoc('x', core.bigmap.width-1-core.getHeroLoc('x'));\ncore.setHeroLoc('y', core.bigmap.height-1-core.getHeroLoc('y'));\ncore.drawHero();\ncore.drawTip(core.material.items[itemId].name + '使用成功');",
@@ -402,7 +402,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"upFly": "(function() {\n\tvar floorId = core.status.floorId, index = core.floorIds.indexOf(floorId);\n\tif (index=0 && toX=0 && toY0) {\n\t\tvar toId = core.floorIds[index-1], toX = core.getHeroLoc('x'), toY = core.getHeroLoc('y');\n\t\tvar mw = core.floors[toId].width, mh = core.floors[toId].height;\n\t\tif (toX>=0 && toX=0 && toY0) {\n\t\tcore.status.event.ui = ids;\n\t\treturn true;\n\t}\n\tif (id2s.length==1) {\n\t\tcore.status.event.ui = id2s;\n\t\treturn true;\n\t}\n\treturn false;\n})();",
- "bigKey": "(function() {\n\tvar able=false, ids = [];\n\tfor (var i in core.status.thisMap.blocks) {\n\t\tvar block = core.status.thisMap.blocks[i];\n\t\tif (!block.disable && block.event.id == 'yellowDoor') {\n\t\t\tids.push(i);\n\t\t}\n\t}\n\tif (ids.length>0) {\n\t\tcore.status.event.ui = ids;\n\t\table=true;\n\t}\n\treturn able;\n})();",
+ "bigKey": "(function () {\n\tvar able = false,\n\t\tids = [];\n\tfor (var i in core.status.thisMap.blocks) {\n\t\tvar block = core.status.thisMap.blocks[i];\n\t\tif (!block.disable && block.event.id == 'yellowDoor') {\n\t\t\tids.push(i);\n\t\t}\n\t}\n\tif (ids.length > 0) {\n\t\tcore.status.event.ui = ids;\n\t\table = true;\n\t}\n\treturn able;\n})();",
"poisonWine": "core.hasFlag('poison');",
"weakWine": "core.hasFlag('weak');",
"curseWine": "core.hasFlag('curse');",
diff --git a/project/plugins.js b/project/plugins.js
index d09e9944..74dc269a 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -84,5 +84,479 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
ctx.globalCompositeOperation = 'source-over';
// 可以在任何地方（如afterXXX或自定义脚本事件）调用函数，方法为 core.plugin.xxx();
}
+},
+ "itemShop": function () {
+ // 道具商店相关的插件
+
+ var shopId = null; // 当前商店ID
+ var type = 0; // 当前正在选中的类型，0买入1卖出
+ var selectItem = 0; // 当前正在选中的道具
+ var selectCount = 0; // 当前已经选中的数量
+ var page = 0;
+ var totalPage = 0;
+ var totalMoney = 0;
+ var list = [];
+
+ var bigFont = core.ui._buildFont(20, false),
+ middleFont = core.ui._buildFont(18, false);
+
+ this.drawItemShop = function () {
+ // 绘制道具商店
+
+ // Step 1: 背景和固定的几个文字
+ core.ui._createUIEvent();
+ core.clearMap('uievent');
+ core.ui._uievent_drawSelector({ "code": 1 });
+ core.ui._uievent_drawSelector({ "code": 2 });
+ core.setTextAlign('uievent', 'left');
+ core.setTextBaseline('uievent', 'top');
+ core.fillRect('uievent', 0, 0, 416, 416, 'black');
+ core.ui._uievent_drawBackground({ x: 0, y: 0, width: 416, height: 56 });
+ core.ui._uievent_drawBackground({ x: 0, y: 56, width: 312, height: 56 });
+ core.ui._uievent_drawBackground({ x: 0, y: 112, width: 312, height: 304 });
+ core.ui._uievent_drawBackground({ x: 312, y: 56, width: 104, height: 56 });
+ core.ui._uievent_drawBackground({ x: 312, y: 112, width: 104, height: 304 });
+ core.setFillStyle('uievent', 'white');
+ core.setStrokeStyle('uievent', 'white');
+ core.fillText("uievent", "购买", 32, 74, 'white', bigFont);
+ core.fillText("uievent", "卖出", 132, 74);
+ core.fillText("uievent", "离开", 232, 74);
+ core.fillText("uievent", "当前金币", 324, 66, null, middleFont);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", core.formatBigNumber(core.status.hero.money), 405, 89);
+ core.setTextAlign("uievent", "left");
+ core.ui._uievent_drawSelector({
+ "type": "drawSelector",
+ "image": "winskin.png",
+ "code": 2,
+ "x": 22 + 100 * type,
+ "y": 66,
+ "width": 60,
+ "height": 33
+ });
+ if (selectItem != null) {
+ core.setTextAlign('uievent', 'center');
+ core.fillText("uievent", type == 0 ? "买入个数" : "卖出个数", 364, 320, null, bigFont);
+ core.fillText("uievent", "◀ " + selectCount + " ▶", 364, 350);
+ core.fillText("uievent", "确定", 364, 380);
+ }
+
+ // Step 2：获得列表并展示
+ var choices = core.status.shops[shopId].choices;
+ list = choices.filter(function (one) {
+ if (one.condition != null) {
+ try { if (!core.calValue(one.condition)) return false; } catch (e) {}
+ }
+ return (type == 0 && one.money != null) || (type == 1 && one.sell != null);
+ });
+ var per_page = 6;
+ totalPage = Math.ceil(list.length / per_page);
+ page = Math.floor((selectItem || 0) / per_page) + 1;
+
+ // 绘制分页
+ if (totalPage > 1) {
+ var half = 156;
+ core.setTextAlign('uievent', 'center');
+ core.fillText('uievent', page + " / " + totalPage, half, 388, null, middleFont);
+ if (page > 1) core.fillText('uievent', '上一页', half - 80, 388);
+ if (page < totalPage) core.fillText('uievent', '下一页', half + 80, 388);
+ }
+ core.setTextAlign('uievent', 'left');
+
+ // 绘制每一项
+ var start = (page - 1) * per_page;
+ for (var i = 0; i < per_page; ++i) {
+ var curr = start + i;
+ if (curr >= list.length) break;
+ var item = list[curr];
+ core.drawIcon('uievent', item.id, 10, 125 + i * 40);
+ core.setTextAlign('uievent', 'left');
+ core.fillText('uievent', core.material.items[item.id].name, 50, 132 + i * 40, null, bigFont);
+ core.setTextAlign('uievent', 'right');
+ core.fillText('uievent', (type == 0 ? core.calValue(item.money) : core.calValue(item.sell)) + "金币/个", 300, 133 + i * 40, null, middleFont);
+ core.setTextAlign("uievent", "left");
+ if (curr == selectItem) {
+ // 绘制描述，文字自动放缩
+ var text = core.material.items[item.id].text || "该道具暂无描述";
+ try { text = core.replaceText(text); } catch (e) {}
+ for (var fontSize = 20; fontSize >= 8; fontSize -= 2) {
+ var config = { left: 10, fontSize: fontSize, maxWidth: 403, lineHeight: 1.4 };
+ var height = core.getTextContentHeight(text, config);
+ if (height <= 50) {
+ config.top = (56 - height) / 2;
+ core.drawTextContent("uievent", text, config);
+ break;
+ }
+ }
+ core.ui._uievent_drawSelector({ "type": "drawSelector", "image": "winskin.png", "code": 1, "x": 8, "y": 120 + i * 40, "width": 295, "height": 40 });
+ if (type == 0 && item.number != null) {
+ core.fillText("uievent", "存货", 324, 132, null, bigFont);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", item.number, 406, 132, null, null, 40);
+ } else if (type == 1) {
+ core.fillText("uievent", "数量", 324, 132, null, bigFont);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", core.itemCount(item.id), 406, 132, null, null, 40);
+ }
+ core.setTextAlign("uievent", "left");
+ core.fillText("uievent", "预计金额", 324, 250);
+ core.setTextAlign("uievent", "right");
+ totalMoney = selectCount * (type == 0 ? core.calValue(item.money) : core.calValue(item.sell));
+ core.fillText("uievent", core.formatBigNumber(totalMoney), 405, 280);
+
+ core.setTextAlign("uievent", "left");
+ core.fillText("uievent", type == 0 ? "已购次数" : "已卖次数", 324, 170);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", (type == 0 ? item.money_count : item.sell_count) || 0, 405, 200);
+ }
+ }
+
+ core.setTextAlign('uievent', 'left');
+ core.setTextBaseline('uievent', 'alphabetic');
+ }
+
+ var _add = function (item, delta) {
+ if (item == null) return;
+ selectCount = core.clamp(
+ selectCount + delta, 0,
+ Math.min(type == 0 ? Math.floor(core.status.hero.money / core.calValue(item.money)) : core.itemCount(item.id),
+ type == 0 && item.number != null ? item.number : Number.MAX_SAFE_INTEGER)
+ );
+ }
+
+ var _confirm = function (item) {
+ if (item == null || selectCount == 0) return;
+ if (type == 0) {
+ core.status.hero.money -= totalMoney;
+ core.getItem(item.id, selectCount);
+ if (item.number != null) item.number -= selectCount;
+ item.money_count = (item.money_count || 0) + selectCount;
+ } else {
+ core.status.hero.money += totalMoney;
+ core.removeItem(item.id, selectCount);
+ core.drawTip("成功卖出" + selectCount + "个" + core.material.items[item.id].name, item.id);
+ if (item.number != null) item.number += selectCount;
+ item.sell_count = (item.sell_count || 0) + selectCount;
+ }
+ selectCount = 0;
+ }
+
+ this._performItemShopKeyBoard = function (keycode) {
+ var item = list[selectItem] || null;
+ // 键盘操作
+ switch (keycode) {
+ case 38: // up
+ if (selectItem == null) break;
+ if (selectItem == 0) selectItem = null;
+ else selectItem--;
+ selectCount = 0;
+ break;
+ case 37: // left
+ if (selectItem == null) {
+ if (type > 0) type--;
+ break;
+ }
+ _add(item, -1);
+ break;
+ case 39: // right
+ if (selectItem == null) {
+ if (type < 2) type++;
+ break;
+ }
+ _add(item, 1);
+ break;
+ case 40: // down
+ if (selectItem == null) {
+ if (list.length > 0) selectItem = 0;
+ break;
+ }
+ if (list.length == 0) break;
+ selectItem = Math.min(selectItem + 1, list.length - 1);
+ selectCount = 0;
+ break;
+ case 13:
+ case 32: // Enter/Space
+ if (selectItem == null) {
+ if (type == 2)
+ core.insertAction({ "type": "break" });
+ else if (list.length > 0)
+ selectItem = 0;
+ break;
+ }
+ _confirm(item);
+ break;
+ case 27: // ESC
+ if (selectItem == null) {
+ core.insertAction({ "type": "break" });
+ break;
+ }
+ selectItem = null;
+ break;
+ }
+ }
+
+ this._performItemShopClick = function (px, py) {
+ var item = list[selectItem] || null;
+ // 鼠标操作
+ if (px >= 22 && px <= 82 && py >= 71 && py <= 102) {
+ // 买
+ if (type != 0) {
+ type = 0;
+ selectItem = null;
+ selectCount = 0;
+ }
+ return;
+ }
+ if (px >= 122 && px <= 182 && py >= 71 && py <= 102) {
+ // 卖
+ if (type != 1) {
+ type = 1;
+ selectItem = null;
+ selectCount = 0;
+ }
+ return;
+ }
+ if (px >= 222 && px <= 282 && py >= 71 && py <= 102) // 离开
+ return core.insertAction({ "type": "break" });
+ // ◀，▶
+ if (px >= 318 && px <= 341 && py >= 348 && py <= 376)
+ return _add(item, -1);
+ if (px >= 388 && px <= 416 && py >= 348 && py <= 376)
+ return _add(item, 1);
+ // 确定
+ if (px >= 341 && px <= 387 && py >= 380 && py <= 407)
+ return _confirm(item);
+
+ // 上一页/下一页
+ if (px >= 45 && px <= 105 && py >= 388) {
+ if (page > 1) selectItem -= 6;
+ return;
+ }
+ if (px >= 208 && px <= 268 && py >= 388) {
+ if (page < totalPage) selectItem = Math.min(selectItem + 6, list.length - 1);
+ return;
+ }
+
+ // 实际区域
+ if (px >= 9 && px <= 300 && py >= 120 && py < 360) {
+ if (list.length == 0) return;
+ var index = parseInt((py - 120) / 40);
+ var newItem = 6 * (page - 1) + index;
+ if (newItem >= list.length) newItem = list.length - 1;
+ if (newItem != selectItem) {
+ selectItem = newItem;
+ selectCount = 0;
+ }
+ return;
+ }
+ }
+
+ this.performItemShopAction = function () {
+ if (flags.type == 0) return this._performItemShopKeyBoard(flags.keycode);
+ else return this._performItemShopClick(flags.px, flags.py);
+ }
+
+ this.openItemShop = function (itemShopId) {
+ shopId = itemShopId;
+ type = 0;
+ page = 0;
+ selectItem = null;
+ selectCount = 0;
+ core.insertAction([{
+ "type": "while",
+ "condition": "true",
+ "data": [
+ { "type": "function", "function": "function () { core.drawItemShop(); }" },
+ { "type": "wait" },
+ { "type": "function", "function": "function() { core.performItemShopAction(); }" }
+ ]
+ },
+ { "type": "function", "function": "function () { " +
+ "core.deleteCanvas('uievent'); " +
+ "core.ui._uievent_drawSelector({ \"code\": 1 }); " +
+ "core.ui._uievent_drawSelector({ \"code\": 2 }); " +
+ "}" }
+ ]);
+ }
+
+ // Write item number to save
+ core.control.saveData = function () {
+ var data = this.controldata.saveData();
+ for (var shopId in core.status.shops) {
+ if (core.status.shops[shopId].item) {
+ data.shops[shopId].choices = core.status.shops[shopId].choices.map(function (t) {
+ return {
+ number: t.number,
+ money_count: t.money_count || 0,
+ sell_count: t.sell_count || 0
+ }
+ });
+ }
+ }
+ return data;
+ }
+
+ core.control.loadData = function (data, callback) {
+ this.controldata.loadData(data, callback);
+ for (var shopId in data.shops) {
+ if (data.shops[shopId].choices) {
+ for (var i = 0; i < data.shops[shopId].choices.length; ++i) {
+ core.status.shops[shopId].choices[i].number = data.shops[shopId].choices[i].number;
+ core.status.shops[shopId].choices[i].money_count = data.shops[shopId].choices[i].money_count;
+ core.status.shops[shopId].choices[i].sell_count = data.shops[shopId].choices[i].sell_count;
+ }
+ }
+ }
+ }
+
+},
+ "smoothCamera": function () {
+
+ // 是否启用本插件，默认不启用
+ this.__enableSmoothCamera = false;
+ if (!this.__enableSmoothCamera) return;
+
+ this.Camera = function () {
+
+ // 下面这个变量决定本插件的开关
+ // 你可以在游戏中使用core.setFlag('smoothCamera',false)来关闭本插件的功能
+ // 同时也可以core.setFlag('smoothCamera',true)重新开启
+ // 此项默认为true
+ //
+ this.__switchName = 'smoothCamera';
+
+ // 初始化成员变量
+ this._cameraNeedRefresh = true;
+ this._nowOffsetX = 0;
+ this._nowOffsetY = 0;
+ this._targetOffsetX = 0;
+ this._targetOffsetY = 0;
+ this._currentFloorId = null;
+
+ // 重置镜头，在楼层变更时使用
+ this.resetCamera = function () {
+ this._targetOffsetX = core.bigmap.offsetX;
+ this._targetOffsetY = core.bigmap.offsetY;
+ this._nowOffsetX = this._targetOffsetX;
+ this._nowOffsetY = this._targetOffsetY;
+ this._cameraNeedRefresh = true;
+ };
+
+ // 设置焦点坐标，目前没有用
+ this.setTarget = function (x, y) {
+ this._targetOffsetX = x;
+ this._targetOffsetY = y;
+ };
+
+ // 请求镜头更新
+ this.requestCameraUpdate = function () {
+ this._cameraNeedRefresh = true;
+ };
+
+ // 更新焦点坐标，目前仅根据大地图偏移决定
+ this.updateTargetPosition = function () {
+ this._targetOffsetX = core.bigmap.offsetX;
+ this._targetOffsetY = core.bigmap.offsetY;
+ };
+
+ // 更新额外的刷新条件，即镜头未指向焦点时
+ this.updateRefreshFlag = function () {
+ if (this._nowOffsetX != this._targetOffsetX || this._nowOffsetY != this._targetOffsetY) {
+ this._cameraNeedRefresh = true;
+ }
+ };
+
+ // 判断是否禁止了弹性滚动
+ this.canDirectMove = function () {
+ return !core.getFlag(this.__switchName, true);
+ };
+
+ // 更新镜头坐标
+ this.updateCameraPosition = function () {
+ if (this._cameraNeedRefresh) {
+ this._cameraNeedRefresh = false;
+ var disX = this._targetOffsetX - this._nowOffsetX;
+ var disY = this._targetOffsetY - this._nowOffsetY;
+ if (Math.abs(disX) <= 2 && Math.abs(disY) <= 2 || this.canDirectMove()) {
+ this._nowOffsetX = this._targetOffsetX;
+ this._nowOffsetY = this._targetOffsetY;
+ } else {
+ this._nowOffsetX += disX / 10;
+ this._nowOffsetY += disY / 10;
+ }
+ var x = -Math.floor(this._nowOffsetX);
+ var y = -Math.floor(this._nowOffsetY);
+ core.bigmap.canvas.forEach(function (cn) {
+ core.control.setGameCanvasTranslate(cn, x, y);
+ });
+ core.relocateCanvas('route', core.status.automaticRoute.offsetX + x, core.status.automaticRoute.offsetY + y);
+ core.setGameCanvasTranslate('hero', x + this._targetOffsetX, y + this._targetOffsetY);
+ }
+ };
+
+ // 更新逻辑主体
+ this.update = function () {
+ this.updateTargetPosition();
+ this.updateRefreshFlag();
+ this.updateCameraPosition();
+ };
+ };
+
+ // 其实只注释了最后一行，只能这样了
+ control.drawHero = function (status, offset) {
+ if (!core.isPlaying() || !core.status.floorId || core.status.gameOver) return;
+ var x = core.getHeroLoc('x'),
+ y = core.getHeroLoc('y'),
+ direction = core.getHeroLoc('direction');
+ status = status || 'stop';
+ offset = offset || 0;
+ var way = core.utils.scan[direction];
+ var dx = way.x,
+ dy = way.y,
+ offsetX = dx * offset,
+ offsetY = dy * offset;
+ core.bigmap.offsetX = core.clamp((x - core.__HALF_SIZE__) * 32 + offsetX, 0, 32 * core.bigmap.width - core.__PIXELS__);
+ core.bigmap.offsetY = core.clamp((y - core.__HALF_SIZE__) * 32 + offsetY, 0, 32 * core.bigmap.height - core.__PIXELS__);
+ core.clearAutomaticRouteNode(x + dx, y + dy);
+ core.clearMap('hero');
+
+ if (!core.hasFlag('hideHero')) {
+ this._drawHero_getDrawObjs(direction, x, y, status, offset).forEach(function (block) {
+ core.drawImage('hero', block.img, block.heroIcon[block.status] * block.width,
+ block.heroIcon.loc * block.height, block.width, block.height,
+ block.posx + (32 - block.width) / 2, block.posy + 32 - block.height, block.width, block.height);
+ });
+ }
+
+ core.control.updateViewport();
+ //core.setGameCanvasTranslate('hero', 0, 0);
+ };
+
+ // 复写转发
+ core.drawHero = function (status, offset) {
+ return core.control.drawHero(status, offset);
+ };
+
+ // 创建摄像机对象
+ this.camera = new this.Camera();
+
+ // 帧事件 更新摄像机
+ this.updateCameraEx = function () {
+ this.camera.update();
+ };
+
+ // 代理原本的镜头事件
+ control.updateViewport = function () {
+ core.plugin.camera.requestCameraUpdate();
+ };
+
+ // 更变楼层的行为追加，重置镜头
+ events.prototype.changingFloor = function (floorId, heroLoc, fromLoad) {
+ this.eventdata.changingFloor(floorId, heroLoc, fromLoad);
+ core.plugin.camera.resetCamera();
+ };
+
+ // 注册帧事件
+ core.registerAnimationFrame('smoothCameraFlash', true, this.updateCameraEx.bind(this));
}
}
\ No newline at end of file
diff --git a/styles.css b/styles.css
index 3a428992..9fe80446 100644
--- a/styles.css
+++ b/styles.css
@@ -347,11 +347,10 @@ p#name {
position: fixed;
top: 50%;
left: 50%;
- transform: translate(-50%, -60%);
+ transform: translate(-50%, -55%);
background: white;
width: 250px;
min-height: 50px;
- max-height: 250px;
}
#inputMessage {
@@ -380,7 +379,7 @@ p#name {
margin-right: 10%;
}
-#_selector, #_uievent_selector {
+#_selector, ._uievent_selector {
animation: selector 2s ease-in-out 0s infinite normal none running;
}
@@ -423,4 +422,62 @@ p#name {
100% {
transform: rotate(45deg) translate(-3px, -3px);
}
-}
\ No newline at end of file
+}
+
+#startImageBackgroundDiv {
+ display: none;
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ z-index: 10000;
+}
+
+#startImageDiv {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ background: black;
+ opacity: 1;
+}
+
+#startImageLogo {
+ opacity: 0;
+ max-width: 60%;
+ max-height: 60%;
+ position: fixed;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+}
+
+.startImageAnimation {
+ -webkit-animation: startImage 4s ease-in-out 1s alternate 1;
+ animation: startImage 4s ease-in-out 1s alternate 1;
+}
+
+@-webkit-keyframes startImage {
+ 0% { opacity: 0; }
+ 60% { opacity: 1; }
+ 100% { opacity: 0; }
+}
+
+@keyframes startImage {
+ 0% { opacity: 0; }
+ 60% { opacity: 1; }
+ 100% { opacity: 0; }
+}
+
+.startImageDivAnimation {
+ -webkit-animation: startImageDivDisappear 2s ease-in-out 5s alternate 1;
+ animation: startImageDivDisappear 2s ease-in-out 5s alternate 1;
+}
+
+@-webkit-keyframes startImageDivDisappear {
+ 0% { opacity: 1 }
+ 100% { opacity: 0 }
+}
+
+@keyframes startImageDivDisappear {
+ 0% { opacity: 1 }
+ 100% { opacity: 0 }
+}
diff --git a/常用工具/RM动画导出器.exe b/常用工具/RM动画导出器.exe
index b894a786..632441a2 100644
Binary files a/常用工具/RM动画导出器.exe and b/常用工具/RM动画导出器.exe differ
0,0
@@ -191,6 +192,7 @@ -->
+
@@ -554,9 +561,12 @@
-
-
-
+
+
+
+
+
+
@@ -564,7 +574,7 @@
![]()
diff --git a/libs/actions.js b/libs/actions.js
index 648b8dd6..7caba11d 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -2626,7 +2626,6 @@ actions.prototype.exitPaint = function () {
core.ui.closePanel();
core.statusBar.image.keyboard.style.opacity = 1;
core.statusBar.image.shop.style.opacity = 1;
- core.updateStatusBar();
core.drawTip("退出绘图模式");
}
diff --git a/libs/control.js b/libs/control.js
index 9a981c78..6f0a3854 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -22,6 +22,7 @@ control.prototype._init = function () {
this.registerAnimationFrame("animate", true, this._animationFrame_animate);
this.registerAnimationFrame("heroMoving", true, this._animationFrame_heroMoving);
this.registerAnimationFrame("weather", true, this._animationFrame_weather);
+ this.registerAnimationFrame("tips", true, this._animateFrame_tips);
this.registerAnimationFrame("parallelDo", false, this._animationFrame_parallelDo);
this.registerAnimationFrame("checkConsoleOpened", true, this._animationFrame_checkConsoleOpened);
// --- 注册系统的replay
@@ -278,6 +279,40 @@ control.prototype._animationFrame_weather_fog = function () {
}
}
+control.prototype._animateFrame_tips = function (timestamp) {
+ var tips = core.animateFrame.tips;
+ if (timestamp - tips.time <= 30) return;
+ var delta = timestamp - tips.time;
+ tips.time = timestamp;
+ if (tips.list.length == 0) return;
+
+ var currentOffset = Math.max(tips.offset - 5, 0), firstOffset = null;
+ var currList = [];
+ core.setFont('data', "16px Arial");
+ core.setTextAlign('data', 'left');
+ core.clearMap('data', 0, 0, this.PIXEL, tips.lastSize * 50);
+ tips.lastLength = tips.list.length;
+
+ while (tips.list.length > 0) {
+ var one = tips.list.shift();
+ core.ui._drawTip_drawOne(one, currentOffset);
+ if (one.stage == 1) {
+ one.opacity += 0.05;
+ if (one.opacity >= 0.7) one.stage = 2;
+ } else if (one.stage == 2) {
+ one.time += delta;
+ if (one.time >= 2000) one.stage = 3;
+ } else one.opacity -= 0.05;
+ if (one.opacity > 0) {
+ currList.push(one);
+ if (firstOffset == null) firstOffset = currentOffset;
+ }
+ currentOffset += 50;
+ }
+ tips.list = currList;
+ tips.offset = firstOffset || 0;
+}
+
control.prototype._animationFrame_parallelDo = function (timestamp) {
core.control.controldata.parallelDo(timestamp);
}
@@ -1391,9 +1426,7 @@ control.prototype.__replay_getTimeout = function () {
control.prototype._replayAction_move = function (action) {
if (["up","down","left","right"].indexOf(action)<0) return false;
- core.moveHero(action, function () {
- setTimeout(core.replay);
- });
+ core.moveHero(action, core.replay);
return true;
}
@@ -1475,8 +1508,8 @@ control.prototype._replayAction_shop = function (action) {
if (selections.length == 0) return false;
var shop=core.status.shops[shopId];
if (!shop || !shop.visited) return false;
- // --- 判定commonEvent
- if (shop.commonEvent) {
+ // --- 判定commonEvent或item
+ if (shop.commonEvent || shop.item) {
core.openShop(shopId, false);
setTimeout(core.replay);
return true;
@@ -2136,6 +2169,7 @@ control.prototype.setCurtain = function(color, time, callback) {
control.prototype._setCurtain_animate = function (nowColor, color, time, callback) {
time /= Math.max(core.status.replay.speed, 1)
var per_time = 10, step = parseInt(time / per_time);
+ if (step <= 0) step = 1;
var animate = setInterval(function() {
nowColor = [
(nowColor[0]*(step-1)+color[0])/step,
@@ -2330,9 +2364,10 @@ control.prototype.clearStatusBar = function() {
}
////// 更新状态栏 //////
-control.prototype.updateStatusBar = function () {
+control.prototype.updateStatusBar = function (doNotCheckAutoEvents) {
if (!core.isPlaying()) return;
this.controldata.updateStatusBar();
+ if (!doNotCheckAutoEvents) core.checkAutoEvents();
this._updateStatusBar_setToolboxIcon();
}
diff --git a/libs/core.js b/libs/core.js
index a9e571bc..0268bb5a 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -16,17 +16,15 @@ function core() {
'ground': null,
'items': {},
'enemys': {},
- 'icons': {}
+ 'icons': {},
}
this.timeout = {
- 'tipTimeout': null,
'turnHeroTimeout': null,
'onDownTimeout': null,
'sleepTimeout': null,
}
this.interval = {
'heroMoveInterval': null,
- "tipAnimate": null,
'onDownInterval': null,
}
this.animateFrame = {
@@ -47,6 +45,12 @@ function core() {
'data': null,
'fog': null,
},
+ "tips": {
+ 'time': 0,
+ 'offset': 0,
+ 'list': [],
+ 'lastSize': 0,
+ },
"asyncId": {}
}
this.musicStatus = {
@@ -170,6 +174,7 @@ function core() {
'ui': null,
'interval': null,
},
+ 'autoEvents': [],
'textAttribute': {
'position': "center",
"offset": 0,
@@ -221,7 +226,9 @@ core.prototype.init = function (coreData, callback) {
this._initPlugins();
core.loader._load(function () {
- core._afterLoadResources(callback);
+ core.extensions._load(function () {
+ core._afterLoadResources(callback);
+ });
});
}
@@ -231,11 +238,37 @@ core.prototype._init_flags = function () {
core.firstData = core.clone(core.data.firstData);
this._init_sys_flags();
- core.dom.versionLabel.innerHTML = core.firstData.version;
- core.dom.logoLabel.innerHTML = core.firstData.title;
+ core.dom.versionLabel.innerText = core.firstData.version;
+ core.dom.logoLabel.innerText = core.firstData.title;
document.title = core.firstData.title + " - HTML5魔塔";
- document.getElementById("startLogo").innerHTML = core.firstData.title;
+ document.getElementById("startLogo").innerText = core.firstData.title;
(core.firstData.shops||[]).forEach(function (t) { core.initStatus.shops[t.id] = t; });
+ // 初始化自动事件
+ for (var floorId in core.floors) {
+ var autoEvents = core.floors[floorId].autoEvent || {};
+ for (var loc in autoEvents) {
+ var locs = loc.split(","), x = parseInt(locs[0]), y = parseInt(locs[1]);
+ for (var index in autoEvents[loc]) {
+ var autoEvent = core.clone(autoEvents[loc][index]);
+ if (autoEvent && autoEvent.data) {
+ autoEvent.floorId = floorId;
+ autoEvent.x = x;
+ autoEvent.y = y;
+ autoEvent.index = index;
+ autoEvent.symbol = floorId + "@" + x + "@" + y + "@" + index;
+ core.initStatus.autoEvents.push(autoEvent);
+ }
+ }
+ }
+ }
+ core.initStatus.autoEvents.sort(function (e1, e2) {
+ if (e1.priority != e2.priority) return e2.priority - e1.priority;
+ if (e1.floorId != e2.floorId) return core.floorIds.indexOf(e1.floorId) - core.floorIds.indexOf(e2.floorId);
+ if (e1.x != e2.x) return e1.x - e2.x;
+ if (e1.y != e2.y) return e1.y - e2.y;
+ return e1.index - e2.index;
+ })
+
core.maps._setFloorSize();
// 初始化怪物、道具等
core.material.enemys = core.enemys.getEnemys();
diff --git a/libs/events.js b/libs/events.js
index 4d786341..eb141e85 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -297,6 +297,12 @@ events.prototype._trigger = function (x, y) {
var block = core.getBlock(x, y);
if (block == null) return;
block = block.block;
+
+ // 执行该点的脚本
+ try {
+ eval(block.event.script);
+ } catch (e) { main.log(e); }
+
if (block.event.trigger) {
var noPass = block.event.noPass, trigger = block.event.trigger;
if (noPass) core.clearAutomaticRouteNode(x, y);
@@ -341,7 +347,7 @@ events.prototype.battle = function (id, x, y, force, callback) {
if (!id) return core.clearContinueAutomaticRoute(callback);
// 非强制战斗
if (!core.enemys.canBattle(id, x, y) && !force && !core.status.event.id) {
- core.drawTip("你打不过此怪物！");
+ core.drawTip("你打不过此怪物！", null, true);
return core.clearContinueAutomaticRoute(callback);
}
// 自动存档
@@ -401,8 +407,8 @@ events.prototype._openDoor_check = function (id, x, y, needKey) {
var key = id.replace("Door", "Key");
if (!core.hasItem(key)) {
if (key != "specialKey")
- core.drawTip("你没有" + ((core.material.items[key] || {}).name || "钥匙"));
- else core.drawTip("无法开启此门");
+ core.drawTip("你没有" + ((core.material.items[key] || {}).name || "钥匙"), null, true);
+ else core.drawTip("无法开启此门", null, true);
core.clearContinueAutomaticRoute();
return false;
}
@@ -456,7 +462,7 @@ events.prototype.getItem = function (id, num, x, y, callback) {
core.removeBlock(x, y);
var text = '获得 ' + core.material.items[id].name;
if (num > 1) text += "x" + num;
- if (itemCls === 'items') text += core.items.getItemEffectTip(id);
+ if (itemCls === 'items' && num == 1) text += core.items.getItemEffectTip(id);
core.drawTip(text, id);
// --- 首次获得道具的提示
@@ -467,11 +473,13 @@ events.prototype.getItem = function (id, num, x, y, callback) {
try {
hint = core.replaceText(hint);
} catch (e) {}
- core.insertAction("\t["+core.material.items[id].name+","+id+"]" + hint + "\n"
- + (itemCls == 'keys' || id == 'greenKey' || id == 'steelKey' ? "（钥匙类道具，遇到对应的门时自动打开）"
- : itemCls == 'tools' ? "（消耗类道具，请按T在道具栏使用）"
- : itemCls == 'constants' ? "（永久类道具，请按T在道具栏使用）"
- : itemCls == 'equips' ? "（装备类道具，请按Q在装备栏进行装备）" : ""))
+ if (!core.status.event.id || core.status.event.id=='action') {
+ core.insertAction("\t["+core.material.items[id].name+","+id+"]" + hint + "\n"
+ + (itemCls == 'keys' || id == 'greenKey' || id == 'steelKey' ? "（钥匙类道具，遇到对应的门时自动打开）"
+ : itemCls == 'tools' ? "（消耗类道具，请按T在道具栏使用）"
+ : itemCls == 'constants' ? "（永久类道具，请按T在道具栏使用）"
+ : itemCls == 'equips' ? "（装备类道具，请按Q在装备栏进行装备）" : ""));
+ }
itemHint.push(id);
}
@@ -487,17 +495,31 @@ events.prototype.afterGetItem = function (id, x, y, callback) {
////// 获得面前的物品（轻按） //////
events.prototype.getNextItem = function (noRoute) {
- if (core.isMoving() || !core.canMoveHero() || !core.flags.enableGentleClick) return false;
+ if (core.isMoving() || !core.flags.enableGentleClick) return false;
+ if (this._canGetNextItem()) return this._getNextItem(null, noRoute);
- var nextX = core.nextX(), nextY = core.nextY();
- var block = core.getBlock(nextX, nextY);
- if (block == null) return false;
- if (block.block.event.trigger == 'getItem') {
- if (!noRoute) core.status.route.push("getNext");
- this.getItem(block.block.event.id, 1, nextX, nextY);
- return true;
- }
- return false;
+ var directions = ["up", "down", "left", "right"].filter(function (dir) {
+ return core.events._canGetNextItem(dir);
+ });
+ return directions.length == 1 ? this._getNextItem(directions[0]) : false;
+}
+
+events.prototype._canGetNextItem = function (direction) {
+ direction = direction || core.getHeroLoc('direction');
+ if (!core.canMoveHero(null, null, direction)) return;
+ var nx = core.getHeroLoc('x') + core.utils.scan[direction].x;
+ var ny = core.getHeroLoc('y') + core.utils.scan[direction].y;
+ var block = core.getBlock(nx, ny);
+ return block != null && block.block.event.trigger == 'getItem';
+}
+
+events.prototype._getNextItem = function (direction, noRoute) {
+ direction = direction || core.getHeroLoc('direction');
+ var nx = core.getHeroLoc('x') + core.utils.scan[direction].x;
+ var ny = core.getHeroLoc('y') + core.utils.scan[direction].y;
+ if (!noRoute) core.status.route.push("getNext");
+ this.getItem(core.getBlockId(nx, ny), 1, nx, ny);
+ return true;
}
events.prototype._sys_changeFloor = function (data, callback) {
@@ -523,7 +545,7 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback
floorId = info.floorId;
info.locked = core.status.lockControl;
- core.dom.floorNameLabel.innerHTML = core.status.maps[floorId].title;
+ core.dom.floorNameLabel.innerText = core.status.maps[floorId].title;
core.lockControl();
core.stopAutomaticRoute();
core.clearContinueAutomaticRoute();
@@ -661,20 +683,26 @@ events.prototype._sys_passNet = function (data, callback) {
////// 经过一个路障 //////
events.prototype.passNet = function (data) {
- if (core.hasItem('shoes')) return;
- // 血网 lavaNet 移动到 checkBlock 中处理
- if (data.event.id == 'poisonNet') { // 毒网
- core.insertAction({"type":"insert","name":"毒衰咒处理","args":[0]});
- }
- else if (data.event.id == 'weakNet') { // 衰网
- core.insertAction({"type":"insert","name":"毒衰咒处理","args":[1]});
- }
- else if (data.event.id == 'curseNet') { // 咒网
- core.insertAction({"type":"insert","name":"毒衰咒处理","args":[2]});
+ if (!core.hasItem('shoes')) {
+ // 血网 lavaNet 移动到 checkBlock 中处理
+ if (data.event.id == 'poisonNet') { // 毒网
+ core.insertAction({"type":"insert","name":"毒衰咒处理","args":[0]});
+ }
+ else if (data.event.id == 'weakNet') { // 衰网
+ core.insertAction({"type":"insert","name":"毒衰咒处理","args":[1]});
+ }
+ else if (data.event.id == 'curseNet') { // 咒网
+ core.insertAction({"type":"insert","name":"毒衰咒处理","args":[2]});
+ }
}
+ this.afterPassNet(data.x, data.y, data.event.id);
core.updateStatusBar();
}
+events.prototype.afterPassNet = function (x, y, id) {
+ if (this.eventdata.afterPassNet) this.eventdata.afterPassNet(x, y, id);
+}
+
events.prototype._sys_pushBox = function (data, callback) {
this.pushBox(data);
if (callback) callback();
@@ -800,6 +828,8 @@ events.prototype.setEvents = function (list, x, y, callback) {
if (x != null) data.x = x;
if (y != null) data.y = y;
if (callback) data.callback = callback;
+ if (!data.appendingEvents) data.appendingEvents = [];
+ if (!data.locStack) data.locStack = [];
core.status.event.id = 'action';
core.status.event.data = data;
}
@@ -828,9 +858,10 @@ events.prototype.doAction = function (keepUI) {
}
// 判定是否执行完毕
if (this._doAction_finishEvents()) return;
+ var floorId = core.status.event.data.floorId || core.status.floorId;
// 当前点坐标和前缀
var x = core.status.event.data.x, y = core.status.event.data.y;
- var prefix = [core.status.floorId || ":f", x != null ? x : "x", y != null ? y : "y"].join("@");
+ var prefix = [floorId || ":f", x != null ? x : "x", y != null ? y : "y"].join("@");
var current = core.status.event.data.list[0];
if (this._popEvents(current, prefix)) return;
// 当前要执行的事件
@@ -838,6 +869,7 @@ events.prototype.doAction = function (keepUI) {
core.status.event.data.current = data;
if (typeof data == "string")
data = {"type": "text", "text": data};
+ data.floorId = data.floorId || floorId;
core.status.event.data.type = data.type;
this.doEvent(data, x, y, prefix);
return;
@@ -846,6 +878,11 @@ events.prototype.doAction = function (keepUI) {
events.prototype._doAction_finishEvents = function () {
// 事件处理完毕
if (core.status.event.data.list.length == 0) {
+ // 检测并执行延迟自动事件
+ if (core.status.event.data.appendingEvents.length > 0) {
+ this.setEvents(core.status.event.data.appendingEvents.shift());
+ return false;
+ }
var callback = core.status.event.data.callback;
core.ui.closePanel();
if (callback) callback();
@@ -915,6 +952,81 @@ events.prototype.recoverEvents = function (data) {
return false;
}
+////// 检测自动事件 //////
+events.prototype.checkAutoEvents = function () {
+ // 只有在无操作或事件流中才能执行自动事件！
+ if (!core.isPlaying() || core.status.lockControl && core.status.event.id != 'action') return;
+ var todo = [], delay = [];
+ core.status.autoEvents.forEach(function (autoEvent) {
+ var symbol = autoEvent.symbol, x = autoEvent.x, y = autoEvent.y, floorId = autoEvent.floorId;
+ // 不在当前楼层 or 已经执行过 or 正在执行中
+ if (autoEvent.currentFloor && floorId != core.status.floorId) return;
+ if (!autoEvent.multiExecute && autoEvent.executed) return;
+ if (core.autoEventExecuting(symbol)) return;
+ var prefix = floorId + "@" + x + "@" + y;
+ try {
+ if (!core.calValue(autoEvent.condition, prefix)) return;
+ } catch (e) {
+ return;
+ }
+
+ core.autoEventExecuting(symbol, true);
+ autoEvent.executed = true;
+
+ var event = [
+ {"type": "function", "function":
+ "function() { core.pushEventLoc(" + x + ", " + y + ", '" + floorId + "' ); }"},
+ // 用do-while(0)包一层防止break影响事件流
+ {"type": "dowhile", "condition": "false", "data": autoEvent.data},
+ {"type": "function", "function":
+ "function() { core.popEventLoc(); core.autoEventExecuting('" + symbol + "', false); }"}
+ ];
+
+ if (autoEvent.delayExecute)
+ delay.push(event);
+ else
+ core.push(todo, event);
+ });
+
+ if (todo.length == 0 && delay.length == 0) return;
+
+ if (core.status.event.id == 'action' || todo.length > 0) {
+ core.insertAction(todo);
+ core.push(core.status.event.data.appendingEvents, delay);
+ } else {
+ core.insertAction(delay);
+ }
+
+}
+
+events.prototype.autoEventExecuting = function (symbol, value) {
+ var name = '_executing_autoEvent_' + symbol;
+ if (value == null) return core.getFlag(name, false);
+ else core.setFlag(name, value || null);
+}
+
+events.prototype.pushEventLoc = function (x, y, floorId) {
+ if (core.status.event.id != 'action') return;
+ core.status.event.data.locStack.push({
+ x: core.status.event.data.x,
+ y: core.status.event.data.y,
+ floorId: core.status.event.data.floorId
+ });
+ core.status.event.data.x = x;
+ core.status.event.data.y = y;
+ core.status.event.data.floorId = floorId;
+}
+
+events.prototype.popEventLoc = function () {
+ if (core.status.event.id != 'action') return;
+ var loc = core.status.event.data.locStack.shift();
+ if (loc) {
+ core.status.event.data.x = loc.x;
+ core.status.event.data.y = loc.y;
+ core.status.event.data.floorId = loc.floorId;
+ }
+}
+
// ------ 样板提供的的自定义事件 ------ //
events.prototype.__action_checkReplaying = function () {
@@ -975,7 +1087,7 @@ events.prototype._action_comment = function (data, x, y, prefix) {
}
events.prototype._action_setText = function (data, x, y, prefix) {
- ["position", "offset", "align", "bold", "titlefont", "textfont", "time"].forEach(function (t) {
+ ["position", "offset", "align", "bold", "titlefont", "textfont", "time", "interval"].forEach(function (t) {
if (data[t] != null) core.status.textAttribute[t] = data[t];
});
["background", "title", "text"].forEach(function (t) {
@@ -1002,7 +1114,7 @@ events.prototype._action_tip = function (data, x, y, prefix) {
events.prototype._action_show = function (data, x, y, prefix) {
data.loc = this.__action_getLoc2D(data.loc, x, y, prefix);
- if (data.time > 0 && !(data.floorId && data.floorId != core.status.floorId)) {
+ if (data.time > 0 && data.floorId == core.status.floorId) {
this.__action_doAsyncFunc(data.async, core.animateBlock, data.loc, 'show', data.time);
}
else {
@@ -1015,7 +1127,7 @@ events.prototype._action_show = function (data, x, y, prefix) {
events.prototype._action_hide = function (data, x, y, prefix) {
data.loc = this.__action_getLoc2D(data.loc, x, y, prefix);
- if (data.time > 0 && !(data.floorId && data.floorId != core.status.floorId)) {
+ if (data.time > 0 && data.floorId == core.status.floorId) {
data.loc.forEach(function (t) {
core.hideBlock(t[0], t[1], data.floorId);
});
@@ -1115,7 +1227,7 @@ events.prototype._action_jumpHero = function (data, x, y, prefix) {
events.prototype._action_changeFloor = function (data, x, y, prefix) {
var loc = this.__action_getHeroLoc(data.loc, prefix);
var heroLoc = {x: loc[0], y: loc[1], direction: data.direction};
- core.changeFloor(data.floorId || core.status.floorId, null, heroLoc, data.time, core.doAction);
+ core.changeFloor(data.floorId, null, heroLoc, data.time, core.doAction);
}
events.prototype._action_changePos = function (data, x, y, prefix) {
@@ -1189,7 +1301,7 @@ events.prototype._action_setWeather = function (data, x, y, prefix) {
events.prototype._action_openDoor = function (data, x, y, prefix) {
var loc = this.__action_getLoc(data.loc, x, y, prefix);
- var floorId = data.floorId || core.status.floorId;
+ var floorId = data.floorId;
if (floorId == core.status.floorId) {
this.__action_doAsyncFunc(data.async, core.openDoor, loc[0], loc[1], data.needKey);
}
@@ -1234,6 +1346,10 @@ events.prototype._action_battle = function (data, x, y, prefix) {
this.battle(data.id, null, null, true, core.doAction);
}
else {
+ if (data.floorId != core.status.floorId) {
+ setTimeout(core.doAction);
+ return;
+ }
var loc = this.__action_getLoc(data.loc, x, y, prefix);
this.battle(null, loc[0], loc[1], true, core.doAction);
}
@@ -1272,7 +1388,7 @@ events.prototype._action_insert = function (data, x, y, prefix) {
else {
var loc = this.__action_getLoc(data.loc, x, y, prefix);
core.setFlag('arg0', loc);
- var floorId = data.floorId || core.status.floorId;
+ var floorId = data.floorId;
var which = data.which || "events";
var event = (core.floors[floorId][which]||[])[loc[0] + "," + loc[1]];
if (event) this.insertAction(event.data || event);
@@ -2155,6 +2271,7 @@ events.prototype.moveImage = function (code, to, opacityVal, time, callback) {
events.prototype._moveImage_moving = function (name, moveInfo, callback) {
var per_time = 10, step = 0, steps = parseInt(moveInfo.time / 10);
+ if (steps <= 0) steps = 1;
var fromX = moveInfo.fromX, fromY = moveInfo.fromY, toX = moveInfo.toX, toY = moveInfo.toY,
opacity = moveInfo.opacity, toOpacity = moveInfo.toOpacity;
var currX = fromX, currY = fromY, currOpacity = opacity;
@@ -2209,6 +2326,7 @@ events.prototype.setVolume = function (value, time, callback) {
var currVolume = core.musicStatus.volume;
time /= Math.max(core.status.replay.speed, 1);
var per_time = 10, step = 0, steps = parseInt(time / per_time);
+ if (steps <= 0) steps = 1;
var fade = setInterval(function () {
step++;
set(currVolume + (value - currVolume) * step / steps);
@@ -2363,7 +2481,7 @@ events.prototype.openShop = function (shopId, needVisited) {
shop.times = shop.times || 0;
if (shop.commonTimes) shop.times = core.getFlag('commonTimes', 0);
if (needVisited && !shop.visited) {
- if (!core.flags.enableDisabledShop || shop.commonEvent) {
+ if (!core.flags.enableDisabledShop || shop.commonEvent || shop.item) {
if (shop.times == 0) core.drawTip("该项尚未开启");
else core.drawTip("该项已失效");
core.ui.closePanel();
@@ -2375,8 +2493,15 @@ events.prototype.openShop = function (shopId, needVisited) {
}
else shop.visited = true;
- // --- 商店
- if (shop.commonEvent) {
+ if (shop.item) {
+ core.status.route.push("shop:" + shopId + ":0");
+ if (core.openItemShop) {
+ core.openItemShop(shopId);
+ } else {
+ core.insertAction("道具商店插件不存在！请检查是否存在该插件！");
+ }
+ return;
+ } else if (shop.commonEvent) {
core.status.route.push("shop:"+shopId+":0");
core.insertAction({"type": "insert", "name": shop.commonEvent, "args": shop.args});
return;
diff --git a/libs/extensions.js b/libs/extensions.js
new file mode 100644
index 00000000..3af7d629
--- /dev/null
+++ b/libs/extensions.js
@@ -0,0 +1,49 @@
+/*
+extensions.js：负责拓展插件
+ */
+
+"use strict";
+
+function extensions() {
+
+}
+
+extensions.prototype._load = function (callback) {
+ if (!window.fs) {
+ this._loadJs('_server/fs.js', function () {
+ core.extensions._listExtensions(callback);
+ }, callback);
+ } else this._listExtensions(callback);
+}
+
+extensions.prototype._loadJs = function (file, callback, onerror) {
+ var script = document.createElement('script');
+ script.src = file + '?v=' + main.version;
+ script.onload = callback;
+ script.onerror = onerror;
+ main.dom.body.appendChild(script);
+}
+
+extensions.prototype._listExtensions = function (callback) {
+ if (!window.fs) return callback();
+ fs.readdir('extensions', function (error, data) {
+ if (error || !(data instanceof Array)) return callback();
+ var list = [];
+ data.forEach(function (name) {
+ if (/^[\w.-]+\.js$/.test(name)) {
+ list.push(name);
+ }
+ });
+ list.sort();
+ core.extensions._loadExtensions(list, callback);
+ });
+}
+
+extensions.prototype._loadExtensions = function (list, callback) {
+ var i = 0;
+ var load = function () {
+ if (i == list.length) return callback();
+ core.extensions._loadJs('extensions/' + list[i++], load, load);
+ }
+ load();
+}
diff --git a/libs/items.js b/libs/items.js
index b4770490..ad841add 100644
--- a/libs/items.js
+++ b/libs/items.js
@@ -59,7 +59,8 @@ items.prototype.getItemEffect = function (itemId, itemNum) {
var curr_hp = core.status.hero.hp;
if (itemId in this.itemEffect) {
try {
- eval(this.itemEffect[itemId]);
+ for (var i = 0; i < itemNum; ++i)
+ eval(this.itemEffect[itemId]);
}
catch (e) {
main.log(e);
@@ -424,3 +425,14 @@ items.prototype.quickLoadEquip = function (index) {
core.drawTip("成功换上" + index + "号套装");
}
+
+////// 获得装备直接增加的属性数据 //////
+items.prototype.getEquippedStatus = function (name) {
+ var value = 0;
+ core.status.hero.equipment.forEach(function (v) {
+ if (!v || !(core.material.items[v] || {}).equip) return;
+ if (core.material.items[v].equip.percentage) return;
+ value += core.material.items[v].equip[name] || 0;
+ });
+ return value;
+}
diff --git a/libs/loader.js b/libs/loader.js
index 74435cd6..489d9ea4 100644
--- a/libs/loader.js
+++ b/libs/loader.js
@@ -19,7 +19,7 @@ loader.prototype._setStartProgressVal = function (val) {
////// 设置加载进度条提示文字 //////
loader.prototype._setStartLoadTipText = function (text) {
- core.dom.startTopLoadTips.innerHTML = text;
+ core.dom.startTopLoadTips.innerText = text;
}
loader.prototype._load = function (callback) {
diff --git a/libs/maps.js b/libs/maps.js
index e700f469..8c2aa54b 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -590,11 +590,11 @@ maps.prototype._canMoveDirectly_bfs = function (sx, sy, locs, number, ans) {
maps.prototype._canMoveDirectly_checkNextPoint = function (blocksObj, x, y) {
var index = x + "," + y;
// 该点是否有事件
- if (blocksObj[index]) return false;
+ if (blocksObj[index] && (blocksObj[index].event.trigger || blocksObj[index].event.noPass)) return false;
// 是否存在阻激夹域伤害
- if (core.status.checkBlock.damage[x + "," + y]) return false;
+ if (core.status.checkBlock.damage[index]) return false;
// 是否存在捕捉
- if (core.status.checkBlock.ambush[x + "," + y]) return false;
+ if (core.status.checkBlock.ambush[index]) return false;
return true;
}
@@ -1365,6 +1365,8 @@ maps.prototype.getBlockInfo = function (block) {
faceIds = block.event.faceIds || {};
if (core.material.enemys[id]) {
name = core.material.enemys[id].name;
+ } else if (core.material.items[id]) {
+ name = core.material.items[id].name;
}
}
@@ -1642,8 +1644,11 @@ maps.prototype.setBgFgBlock = function (name, number, x, y, floorId) {
core.setFlag(vFlag, number);
core.status[name + "maps"][floorId] = null;
- if (floorId == core.status.floorId)
- core.drawMap(floorId);
+ if (floorId == core.status.floorId){
+ core.clearMap(name);
+ if (name=='bg') core.drawBg(floorId);
+ else core.drawFg(floorId);
+ }
}
////// 重置地图 //////
diff --git a/libs/ui.js b/libs/ui.js
index ae81e542..a8275aa6 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -440,7 +440,7 @@ ui.prototype._uievent_drawIcon = function (data) {
ui.prototype.closePanel = function () {
this.clearUI();
core.maps.generateGroundPattern();
- core.updateStatusBar();
+ core.updateStatusBar(true);
core.unLockControl();
core.status.event.data = null;
core.status.event.id = null;
@@ -458,66 +458,50 @@ ui.prototype.clearUI = function () {
}
////// 左上角绘制一段提示 //////
-ui.prototype.drawTip = function (text, id) {
- var textX, textY, width, height;
- clearInterval(core.interval.tipAnimate);
- core.setFont('data', "16px Arial");
- core.setTextAlign('data', 'left');
+ui.prototype.drawTip = function (text, id, clear) {
+ if (clear) this.clearTip();
+ var one = {
+ text: text,
+ textX: 21,
+ width: 26 + core.calWidth('data', text, "16px Arial"),
+ opacity: 0.1,
+ stage: 1,
+ time: 0
+ };
if (id != null) {
var info = core.getBlockInfo(id);
- if (info == null || !info.image || info.height != 32) {
+ if (info == null || !info.image) {
// 检查状态栏图标
if (core.statusBar.icons[id] instanceof Image) {
- id = {image: core.statusBar.icons[id], posX: 0, posY: 0};
+ id = {image: core.statusBar.icons[id], posX: 0, posY: 0, height: 32};
}
- else id = null;
+ else info = null;
+ }
+ if (info != null) {
+ one.image = info.image;
+ one.posX = info.posX;
+ one.posY = info.posY;
+ one.height = info.height;
+ one.textX += 24;
+ one.width += 24;
}
- else id = info;
}
- if (!id) {
- textX = 16;
- textY = 18;
- width = textX + core.calWidth('data', text) + 16;
- height = 42;
- }
- else {
- textX = 44;
- textY = 18;
- width = textX + core.calWidth('data', text) + 8;
- height = 42;
- }
- this._drawTip_animate(text, id, textX, textY, width, height);
+ core.animateFrame.tips.list.push(one);
}
-ui.prototype._drawTip_animate = function (text, info, textX, textY, width, height) {
- var alpha = 0, hide = false;
- core.interval.tipAnimate = window.setInterval(function () {
- if (hide) alpha -= 0.1;
- else alpha += 0.1;
- core.clearMap('data', 5, 5, core.ui.PIXEL, height);
- core.setAlpha('data', alpha);
- core.fillRect('data', 5, 5, width, height, '#000');
- if (info)
- core.drawImage('data', info.image, info.posX * 32, info.posY * 32, 32, 32, 10, 8, 32, 32);
- core.fillText('data', text, textX + 5, textY + 15, '#fff');
- core.setAlpha('data', 1);
- if (alpha > 0.6 || alpha < 0) {
- if (hide) {
- core.clearMap('data', 5, 5, core.ui.PIXEL, height);
- clearInterval(core.interval.tipAnimate);
- return;
- }
- else {
- if (!core.timeout.tipTimeout) {
- core.timeout.tipTimeout = window.setTimeout(function () {
- hide = true;
- core.timeout.tipTimeout = null;
- }, 750);
- }
- alpha = 0.6;
- }
- }
- }, 30);
+ui.prototype._drawTip_drawOne = function (one, offset) {
+ core.setAlpha('data', one.opacity);
+ core.fillRect('data', 5, offset+ 5, one.width, 42, '#000000');
+ if (one.image)
+ core.drawImage('data', one.image, one.posX * 32, one.posY * one.height, 32, 32, 10, offset + 10, 32, 32);
+ core.fillText('data', one.text, one.textX, offset + 33, '#FFFFFF');
+ core.setAlpha('data', 1);
+}
+
+ui.prototype.clearTip = function () {
+ core.animateFrame.tips.list = [];
+ core.animateFrame.tips.offset = 0;
+ core.animateFrame.tips.lastSize = 0;
}
////// 地图中间绘制一段文字 //////
@@ -645,11 +629,8 @@ ui.prototype.drawWindowSelector = function(background, x, y, w, h) {
}
ui.prototype._uievent_drawSelector = function (data) {
- if (data.image == null) {
- if (main.mode != 'editor')
- core.deleteCanvas('_uievent_selector');
- return;
- }
+ var canvasName = '_uievent_selector_' + (data.code || 0);
+ if (data.image == null) return core.deleteCanvas(canvasName);
var background = data.image || core.status.textAttribute.background;
if (typeof background != 'string') return;
@@ -661,7 +642,8 @@ ui.prototype._uievent_drawSelector = function (data) {
}
var z = 136;
if (core.dymCanvas.uievent) z = (parseInt(core.dymCanvas.uievent.canvas.style.zIndex) || 135) + 1;
- var ctx = core.createCanvas('_uievent_selector', x, y, w, h, z);
+ var ctx = core.createCanvas(canvasName, x, y, w, h, z);
+ ctx.canvas.classList.add('_uievent_selector');
this._drawSelector(ctx, background, w, h);
}
@@ -875,6 +857,7 @@ ui.prototype.drawTextContent = function (ctx, content, config) {
config.fontSize = config.fontSize || textAttribute.textfont;
config.lineHeight = config.lineHeight || (config.fontSize * 1.3);
config.time = config.time || 0;
+ config.interval = config.interval == null ? (textAttribute.interval || 0) : config.interval;
config.index = 0;
config.currcolor = config.color;
@@ -980,7 +963,7 @@ ui.prototype._drawTextContent_drawChar = function (tempCtx, content, config, ch)
tempCtx.font = this._buildFont(config.fontSize, config.bold, config.italic);
}
// 检查是不是自动换行
- var charwidth = core.calWidth(tempCtx, ch);
+ var charwidth = core.calWidth(tempCtx, ch) + config.interval;
if (config.maxWidth != null && config.offsetX + charwidth > config.maxWidth) {
this._drawTextContent_newLine(tempCtx, config);
config.index--;
@@ -1298,7 +1281,7 @@ ui.prototype._drawScrollText_animate = function (ctx, time, callback) {
if (currH < -height) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- if (core.isset(callback)) callback();
+ if (callback) callback();
return;
}
core.drawImage('ui', ctx.canvas, 0, currH);
@@ -1418,7 +1401,7 @@ ui.prototype._drawChoices_drawChoices = function (choices, isWindowSkin, hPos, v
if (color instanceof Array) color = core.arrayToRGBA(color);
core.setFillStyle('ui', color);
var offset = this.HPIXEL;
- if (core.isset(choices[i].icon)) {
+ if (choices[i].icon) {
var iconInfo = this._getDrawableIconInfo(choices[i].icon), image = iconInfo[0], icon = iconInfo[1];
if (image != null) {
core.drawImage('ui', image, 0, 32 * icon, 32, 32,
@@ -1711,13 +1694,13 @@ ui.prototype._drawBook_drawName = function (index, enemy, top, left, width) {
core.setTextAlign('ui', 'center');
if (enemy.specialText=='') {
core.fillText('ui', enemy.name, left + width / 2,
- top + 35, '#DDDDDD', this._buildFont(17, true));
+ top + 35, '#DDDDDD', this._buildFont(17, true), width);
}
else {
core.fillText('ui', enemy.name, left + width / 2,
- top + 28, '#DDDDDD', this._buildFont(17, true));
+ top + 28, '#DDDDDD', this._buildFont(17, true), width);
core.fillText('ui', enemy.specialText, left + width / 2,
- top + 50, '#FF6A6A', this._buildFont(15, true));
+ top + 50, '#FF6A6A', this._buildFont(15, true), width);
}
}
@@ -1809,7 +1792,7 @@ ui.prototype.drawBookDetail = function (index) {
if (!enemy) return;
var content = info[1].join("\n");
core.status.event.id = 'book-detail';
- clearInterval(core.interval.tipAnimate);
+ core.clearTip();
core.clearMap('data');
var left = 10, width = this.PIXEL - 2 * left, right = left + width;
@@ -2037,7 +2020,7 @@ ui.prototype.drawShop = function (shopId) {
for (var i=0;i this.length) {
+ this_len = this.length;
+ }
+ return this.substring(0, search.length) === search;
+ }
+ }
}
@@ -634,7 +641,8 @@ utils.prototype.setStatusBarInnerHTML = function (name, value, css) {
var length = this.strlen(value) || 1;
style += 'font-size: ' + Math.min(1, 7 / length) + 'em; ';
if (css) style += css;
- core.statusBar[name].innerHTML = "" + value + "";
+ core.statusBar[name].innerHTML = "";
+ core.statusBar[name].children[0].innerText = value;
}
utils.prototype.strlen = function (str) {
diff --git a/logo.png b/logo.png
new file mode 100644
index 00000000..96da1025
Binary files /dev/null and b/logo.png differ
diff --git a/main.js b/main.js
index e2c8cf15..191e1773 100644
--- a/main.js
+++ b/main.js
@@ -2,7 +2,7 @@ function main() {
//------------------------ 用户修改内容 ------------------------//
- this.version = "2.6.3"; // 游戏版本号；如果更改了游戏内容建议修改此version以免造成缓存问题。
+ this.version = "2.6.4"; // 游戏版本号；如果更改了游戏内容建议修改此version以免造成缓存问题。
this.useCompress = false; // 是否使用压缩文件
// 当你即将发布你的塔时，请使用“JS代码压缩工具”将所有js代码进行压缩，然后将这里的useCompress改为true。
@@ -79,7 +79,7 @@ function main() {
};
this.mode = 'play';
this.loadList = [
- 'loader', 'control', 'utils', 'items', 'icons', 'maps', 'enemys', 'events', 'actions', 'data', 'ui', 'core'
+ 'loader', 'control', 'utils', 'items', 'icons', 'maps', 'enemys', 'events', 'actions', 'data', 'ui', 'extensions', 'core'
];
this.pureData = [
'data', 'enemys', 'icons', 'maps', 'items', 'functions', 'events', 'plugins'
@@ -189,8 +189,8 @@ function main() {
this.floors = {}
this.canvas = {};
- this.__VERSION__ = "2.6.3";
- this.__VERSION_CODE__ = 63;
+ this.__VERSION__ = "2.6.4";
+ this.__VERSION_CODE__ = 78;
}
main.prototype.init = function (mode, callback) {
@@ -231,7 +231,7 @@ main.prototype.init = function (mode, callback) {
main.loadFloors(function() {
var coreData = {};
["dom", "statusBar", "canvas", "images", "tilesets", "materials",
- "animates", "bgms", "sounds", "floorIds", "floors"].forEach(function (t) {
+ "animates", "bgms", "sounds", "floorIds", "floors"].forEach(function (t) {
coreData[t] = main[t];
})
main.core.init(coreData, callback);
@@ -267,14 +267,14 @@ main.prototype.loadJs = function (dir, loadList, callback) {
}
////// 加载某一个JS文件 //////
-main.prototype.loadMod = function (dir, modName, callback) {
+main.prototype.loadMod = function (dir, modName, callback, onerror) {
var script = document.createElement('script');
var name = modName;
script.src = dir + '/' + modName + (this.useCompress?".min":"") + '.js?v=' + this.version;
- main.dom.body.appendChild(script);
script.onload = function () {
callback(name);
}
+ main.dom.body.appendChild(script);
}
////// 动态加载所有楼层（剧本） //////
diff --git a/project/data.js b/project/data.js
index 247584ff..629b7a85 100644
--- a/project/data.js
+++ b/project/data.js
@@ -78,7 +78,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"firstData": {
"title": "魔塔样板",
"name": "template",
- "version": "Ver 2.6.3",
+ "version": "Ver 2.6.4",
"floorId": "sample0",
"hero": {
"name": "阳光",
@@ -266,18 +266,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
{
"text": "生命+800",
"effect": "status:hp+=800"
- },
- {
- "text": "攻击+4",
- "effect": "status:atk+=4"
- },
- {
- "text": "防御+4",
- "effect": "status:def+=4"
- },
- {
- "text": "魔防+10",
- "effect": "status:mdef+=10"
}
]
},
@@ -295,17 +283,20 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
{
"text": "等级+1",
"need": "100",
- "effect": "status:lv+=1;status:hp+=1000;status:atk+=7;status:def+=7"
- },
+ "effect": "status:hp+=1000"
+ }
+ ]
+ },
+ {
+ "id": "itemShop",
+ "item": true,
+ "textInList": "道具商店",
+ "mustEnable": false,
+ "choices": [
{
- "text": "攻击+5",
- "need": "30",
- "effect": "status:atk+=5"
- },
- {
- "text": "防御+5",
- "need": "30",
- "effect": "status:def+=5"
+ "id": "yellowKey",
+ "number": 10,
+ "money": 10
}
]
},
diff --git a/project/events.js b/project/events.js
index d8559846..57aec84c 100644
--- a/project/events.js
+++ b/project/events.js
@@ -4,7 +4,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
"加点事件": [
{
"type": "comment",
- "text": "通过传参，flag:arg1表示当前应该的加点数值"
+ "text": "通过传参，flag:arg1 表示当前应该的加点数值"
},
{
"type": "choices",
@@ -45,7 +45,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
"毒衰咒处理": [
{
"type": "comment",
- "text": "获得毒衰咒效果，flag:arg1为要获得的类型"
+ "text": "获得毒衰咒效果，flag:arg1 为要获得的类型"
},
{
"type": "switch",
diff --git a/project/floors/sample1.js b/project/floors/sample1.js
index 92b3a0e8..8b5c8646 100644
--- a/project/floors/sample1.js
+++ b/project/floors/sample1.js
@@ -728,20 +728,6 @@ main.floors.sample1=
"type": "setValue",
"name": "flag:door",
"value": "flag:door+1"
- },
- {
- "type": "if",
- "condition": "flag:door==2",
- "true": [
- {
- "type": "openDoor",
- "loc": [
- 10,
- 5
- ]
- }
- ],
- "false": []
}
],
"11,6": [
@@ -749,20 +735,6 @@ main.floors.sample1=
"type": "setValue",
"name": "flag:door",
"value": "flag:door+1"
- },
- {
- "type": "if",
- "condition": "flag:door==2",
- "true": [
- {
- "type": "openDoor",
- "loc": [
- 10,
- 5
- ]
- }
- ],
- "false": []
}
]
},
@@ -775,4 +747,21 @@ main.floors.sample1=
"fgmap": [
],
+"autoEvent": {
+ "10,5": {
+ "0": {
+ "condition": "flag:door==2",
+ "currentFloor": true,
+ "priority": 0,
+ "delayExecute": false,
+ "multiExecute": false,
+ "data": [
+ {
+ "type": "openDoor"
+ }
+
+ ]
+ }
+ }
+}
}
\ No newline at end of file
diff --git a/project/functions.js b/project/functions.js
index f09b5bda..ee55d2f7 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -306,7 +306,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
var hint = "打败 " + enemy.name;
if (core.flags.enableMoney) hint += "，金币+" + money;
if (core.flags.enableExperience) hint += "，经验+" + experience;
- core.drawTip(hint);
+ core.drawTip(hint, enemy.id);
// 事件的处理
var todo = [];
@@ -330,6 +330,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
// 自爆
if (core.enemys.hasSpecial(special, 19)) {
+ core.status.hero.statistics.battleDamage += core.status.hero.hp - 1;
core.status.hero.hp = 1;
}
// 退化
@@ -353,7 +354,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
core.setFlag('skill', 0);
core.setFlag('skillName', '无');
}
- core.updateStatusBar();
// 如果有加点
var point = core.material.enemys[enemyId].point;
@@ -375,6 +375,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// 如果事件不为空，将其插入
if (todo.length > 0) core.insertAction(todo, x, y);
+ core.updateStatusBar();
// 如果已有事件正在处理中
if (core.status.event.id == null)
@@ -444,6 +445,13 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
*/
+},
+ "afterPassNet": function (x, y, id) {
+ // 经过特殊地形后的事件；x和y为当前坐标，id为当前的图块id
+
+ // 这是个一次性血网的例子
+ // if (id == 'lavaNet') core.removeBlock(x, y);
+
},
"canUseQuickShop": function(shopId) {
// 当前能否使用某个快捷商店
@@ -1044,9 +1052,9 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// 设置魔力值
if (core.flags.enableMana) {
// status:manamax 只有在非负时才生效。
- if (core.status.hero.manamax != null && core.status.hero.manamax >= 0) {
- core.status.hero.mana = Math.min(core.status.hero.mana, core.status.hero.manamax);
- core.setStatusBarInnerHTML('mana', core.status.hero.mana + "/" + core.status.hero.manamax);
+ if (core.status.hero.manamax != null && core.getRealStatus('manamax') >= 0) {
+ core.status.hero.mana = Math.min(core.status.hero.mana, core.getRealStatus('manamax'));
+ core.setStatusBarInnerHTML('mana', core.status.hero.mana + "/" + core.getRealStatus('manamax'));
}
else {
core.setStatusBarInnerHTML("mana", core.status.hero.mana);
@@ -1091,7 +1099,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
// 难度
- core.statusBar.hard.innerHTML = core.status.hard;
+ core.statusBar.hard.innerText = core.status.hard;
// 自定义状态栏绘制
core.drawStatusBar();
diff --git a/project/items.js b/project/items.js
index 1c5b4c7f..e800d30d 100644
--- a/project/items.js
+++ b/project/items.js
@@ -19,17 +19,17 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"redJewel": {
"cls": "items",
"name": "红宝石",
- "text": "'，攻击+'+core.values.redJewel"
+ "text": "'，攻击+${core.values.redJewel}'"
},
"blueJewel": {
"cls": "items",
"name": "蓝宝石",
- "text": "'，防御+'+core.values.blueJewel"
+ "text": "'，防御+${core.values.blueJewel}'"
},
"greenJewel": {
"cls": "items",
"name": "绿宝石",
- "text": "'，魔防+'+core.values.greenJewel"
+ "text": "'，魔防+${core.values.greenJewel}'"
},
"yellowJewel": {
"cls": "items",
@@ -368,7 +368,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"pickaxe": "core.playSound('pickaxe.mp3');\ncore.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
"icePickaxe": "core.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
"snow": "core.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
- "bigKey": "core.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n});",
+ "bigKey": "(function () {\n\tvar actions = core.status.event.ui.map(function (id) {\n\t\tvar block = core.status.thisMap.blocks[id];\n\t\treturn { \"type\": \"openDoor\", \"loc\": [block.x, block.y], \"async\": true };\n\t});\n\tactions.push({ \"type\": \"waitAsync\" });\n\tactions.push({ \"type\": \"tip\", \"text\": core.material.items[itemId].name + \"使用成功\" });\n\tcore.insertAction(actions);\n})();",
"bomb": "core.playSound('bomb.mp3');\ncore.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n\tcore.events.afterUseBomb();\n});",
"hammer": "core.playSound('bomb.mp3');\ncore.removeBlockByIds(core.status.floorId, core.status.event.ui);\ncore.drawMap(core.status.floorId, function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n\tcore.events.afterUseBomb();\n});",
"centerFly": "core.playSound('centerFly.mp3');\ncore.clearMap('hero');\ncore.setHeroLoc('x', core.bigmap.width-1-core.getHeroLoc('x'));\ncore.setHeroLoc('y', core.bigmap.height-1-core.getHeroLoc('y'));\ncore.drawHero();\ncore.drawTip(core.material.items[itemId].name + '使用成功');",
@@ -402,7 +402,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"upFly": "(function() {\n\tvar floorId = core.status.floorId, index = core.floorIds.indexOf(floorId);\n\tif (index=0 && toX=0 && toY0) {\n\t\tvar toId = core.floorIds[index-1], toX = core.getHeroLoc('x'), toY = core.getHeroLoc('y');\n\t\tvar mw = core.floors[toId].width, mh = core.floors[toId].height;\n\t\tif (toX>=0 && toX=0 && toY0) {\n\t\tcore.status.event.ui = ids;\n\t\treturn true;\n\t}\n\tif (id2s.length==1) {\n\t\tcore.status.event.ui = id2s;\n\t\treturn true;\n\t}\n\treturn false;\n})();",
- "bigKey": "(function() {\n\tvar able=false, ids = [];\n\tfor (var i in core.status.thisMap.blocks) {\n\t\tvar block = core.status.thisMap.blocks[i];\n\t\tif (!block.disable && block.event.id == 'yellowDoor') {\n\t\t\tids.push(i);\n\t\t}\n\t}\n\tif (ids.length>0) {\n\t\tcore.status.event.ui = ids;\n\t\table=true;\n\t}\n\treturn able;\n})();",
+ "bigKey": "(function () {\n\tvar able = false,\n\t\tids = [];\n\tfor (var i in core.status.thisMap.blocks) {\n\t\tvar block = core.status.thisMap.blocks[i];\n\t\tif (!block.disable && block.event.id == 'yellowDoor') {\n\t\t\tids.push(i);\n\t\t}\n\t}\n\tif (ids.length > 0) {\n\t\tcore.status.event.ui = ids;\n\t\table = true;\n\t}\n\treturn able;\n})();",
"poisonWine": "core.hasFlag('poison');",
"weakWine": "core.hasFlag('weak');",
"curseWine": "core.hasFlag('curse');",
diff --git a/project/plugins.js b/project/plugins.js
index d09e9944..74dc269a 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -84,5 +84,479 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
ctx.globalCompositeOperation = 'source-over';
// 可以在任何地方（如afterXXX或自定义脚本事件）调用函数，方法为 core.plugin.xxx();
}
+},
+ "itemShop": function () {
+ // 道具商店相关的插件
+
+ var shopId = null; // 当前商店ID
+ var type = 0; // 当前正在选中的类型，0买入1卖出
+ var selectItem = 0; // 当前正在选中的道具
+ var selectCount = 0; // 当前已经选中的数量
+ var page = 0;
+ var totalPage = 0;
+ var totalMoney = 0;
+ var list = [];
+
+ var bigFont = core.ui._buildFont(20, false),
+ middleFont = core.ui._buildFont(18, false);
+
+ this.drawItemShop = function () {
+ // 绘制道具商店
+
+ // Step 1: 背景和固定的几个文字
+ core.ui._createUIEvent();
+ core.clearMap('uievent');
+ core.ui._uievent_drawSelector({ "code": 1 });
+ core.ui._uievent_drawSelector({ "code": 2 });
+ core.setTextAlign('uievent', 'left');
+ core.setTextBaseline('uievent', 'top');
+ core.fillRect('uievent', 0, 0, 416, 416, 'black');
+ core.ui._uievent_drawBackground({ x: 0, y: 0, width: 416, height: 56 });
+ core.ui._uievent_drawBackground({ x: 0, y: 56, width: 312, height: 56 });
+ core.ui._uievent_drawBackground({ x: 0, y: 112, width: 312, height: 304 });
+ core.ui._uievent_drawBackground({ x: 312, y: 56, width: 104, height: 56 });
+ core.ui._uievent_drawBackground({ x: 312, y: 112, width: 104, height: 304 });
+ core.setFillStyle('uievent', 'white');
+ core.setStrokeStyle('uievent', 'white');
+ core.fillText("uievent", "购买", 32, 74, 'white', bigFont);
+ core.fillText("uievent", "卖出", 132, 74);
+ core.fillText("uievent", "离开", 232, 74);
+ core.fillText("uievent", "当前金币", 324, 66, null, middleFont);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", core.formatBigNumber(core.status.hero.money), 405, 89);
+ core.setTextAlign("uievent", "left");
+ core.ui._uievent_drawSelector({
+ "type": "drawSelector",
+ "image": "winskin.png",
+ "code": 2,
+ "x": 22 + 100 * type,
+ "y": 66,
+ "width": 60,
+ "height": 33
+ });
+ if (selectItem != null) {
+ core.setTextAlign('uievent', 'center');
+ core.fillText("uievent", type == 0 ? "买入个数" : "卖出个数", 364, 320, null, bigFont);
+ core.fillText("uievent", "◀ " + selectCount + " ▶", 364, 350);
+ core.fillText("uievent", "确定", 364, 380);
+ }
+
+ // Step 2：获得列表并展示
+ var choices = core.status.shops[shopId].choices;
+ list = choices.filter(function (one) {
+ if (one.condition != null) {
+ try { if (!core.calValue(one.condition)) return false; } catch (e) {}
+ }
+ return (type == 0 && one.money != null) || (type == 1 && one.sell != null);
+ });
+ var per_page = 6;
+ totalPage = Math.ceil(list.length / per_page);
+ page = Math.floor((selectItem || 0) / per_page) + 1;
+
+ // 绘制分页
+ if (totalPage > 1) {
+ var half = 156;
+ core.setTextAlign('uievent', 'center');
+ core.fillText('uievent', page + " / " + totalPage, half, 388, null, middleFont);
+ if (page > 1) core.fillText('uievent', '上一页', half - 80, 388);
+ if (page < totalPage) core.fillText('uievent', '下一页', half + 80, 388);
+ }
+ core.setTextAlign('uievent', 'left');
+
+ // 绘制每一项
+ var start = (page - 1) * per_page;
+ for (var i = 0; i < per_page; ++i) {
+ var curr = start + i;
+ if (curr >= list.length) break;
+ var item = list[curr];
+ core.drawIcon('uievent', item.id, 10, 125 + i * 40);
+ core.setTextAlign('uievent', 'left');
+ core.fillText('uievent', core.material.items[item.id].name, 50, 132 + i * 40, null, bigFont);
+ core.setTextAlign('uievent', 'right');
+ core.fillText('uievent', (type == 0 ? core.calValue(item.money) : core.calValue(item.sell)) + "金币/个", 300, 133 + i * 40, null, middleFont);
+ core.setTextAlign("uievent", "left");
+ if (curr == selectItem) {
+ // 绘制描述，文字自动放缩
+ var text = core.material.items[item.id].text || "该道具暂无描述";
+ try { text = core.replaceText(text); } catch (e) {}
+ for (var fontSize = 20; fontSize >= 8; fontSize -= 2) {
+ var config = { left: 10, fontSize: fontSize, maxWidth: 403, lineHeight: 1.4 };
+ var height = core.getTextContentHeight(text, config);
+ if (height <= 50) {
+ config.top = (56 - height) / 2;
+ core.drawTextContent("uievent", text, config);
+ break;
+ }
+ }
+ core.ui._uievent_drawSelector({ "type": "drawSelector", "image": "winskin.png", "code": 1, "x": 8, "y": 120 + i * 40, "width": 295, "height": 40 });
+ if (type == 0 && item.number != null) {
+ core.fillText("uievent", "存货", 324, 132, null, bigFont);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", item.number, 406, 132, null, null, 40);
+ } else if (type == 1) {
+ core.fillText("uievent", "数量", 324, 132, null, bigFont);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", core.itemCount(item.id), 406, 132, null, null, 40);
+ }
+ core.setTextAlign("uievent", "left");
+ core.fillText("uievent", "预计金额", 324, 250);
+ core.setTextAlign("uievent", "right");
+ totalMoney = selectCount * (type == 0 ? core.calValue(item.money) : core.calValue(item.sell));
+ core.fillText("uievent", core.formatBigNumber(totalMoney), 405, 280);
+
+ core.setTextAlign("uievent", "left");
+ core.fillText("uievent", type == 0 ? "已购次数" : "已卖次数", 324, 170);
+ core.setTextAlign("uievent", "right");
+ core.fillText("uievent", (type == 0 ? item.money_count : item.sell_count) || 0, 405, 200);
+ }
+ }
+
+ core.setTextAlign('uievent', 'left');
+ core.setTextBaseline('uievent', 'alphabetic');
+ }
+
+ var _add = function (item, delta) {
+ if (item == null) return;
+ selectCount = core.clamp(
+ selectCount + delta, 0,
+ Math.min(type == 0 ? Math.floor(core.status.hero.money / core.calValue(item.money)) : core.itemCount(item.id),
+ type == 0 && item.number != null ? item.number : Number.MAX_SAFE_INTEGER)
+ );
+ }
+
+ var _confirm = function (item) {
+ if (item == null || selectCount == 0) return;
+ if (type == 0) {
+ core.status.hero.money -= totalMoney;
+ core.getItem(item.id, selectCount);
+ if (item.number != null) item.number -= selectCount;
+ item.money_count = (item.money_count || 0) + selectCount;
+ } else {
+ core.status.hero.money += totalMoney;
+ core.removeItem(item.id, selectCount);
+ core.drawTip("成功卖出" + selectCount + "个" + core.material.items[item.id].name, item.id);
+ if (item.number != null) item.number += selectCount;
+ item.sell_count = (item.sell_count || 0) + selectCount;
+ }
+ selectCount = 0;
+ }
+
+ this._performItemShopKeyBoard = function (keycode) {
+ var item = list[selectItem] || null;
+ // 键盘操作
+ switch (keycode) {
+ case 38: // up
+ if (selectItem == null) break;
+ if (selectItem == 0) selectItem = null;
+ else selectItem--;
+ selectCount = 0;
+ break;
+ case 37: // left
+ if (selectItem == null) {
+ if (type > 0) type--;
+ break;
+ }
+ _add(item, -1);
+ break;
+ case 39: // right
+ if (selectItem == null) {
+ if (type < 2) type++;
+ break;
+ }
+ _add(item, 1);
+ break;
+ case 40: // down
+ if (selectItem == null) {
+ if (list.length > 0) selectItem = 0;
+ break;
+ }
+ if (list.length == 0) break;
+ selectItem = Math.min(selectItem + 1, list.length - 1);
+ selectCount = 0;
+ break;
+ case 13:
+ case 32: // Enter/Space
+ if (selectItem == null) {
+ if (type == 2)
+ core.insertAction({ "type": "break" });
+ else if (list.length > 0)
+ selectItem = 0;
+ break;
+ }
+ _confirm(item);
+ break;
+ case 27: // ESC
+ if (selectItem == null) {
+ core.insertAction({ "type": "break" });
+ break;
+ }
+ selectItem = null;
+ break;
+ }
+ }
+
+ this._performItemShopClick = function (px, py) {
+ var item = list[selectItem] || null;
+ // 鼠标操作
+ if (px >= 22 && px <= 82 && py >= 71 && py <= 102) {
+ // 买
+ if (type != 0) {
+ type = 0;
+ selectItem = null;
+ selectCount = 0;
+ }
+ return;
+ }
+ if (px >= 122 && px <= 182 && py >= 71 && py <= 102) {
+ // 卖
+ if (type != 1) {
+ type = 1;
+ selectItem = null;
+ selectCount = 0;
+ }
+ return;
+ }
+ if (px >= 222 && px <= 282 && py >= 71 && py <= 102) // 离开
+ return core.insertAction({ "type": "break" });
+ // ◀，▶
+ if (px >= 318 && px <= 341 && py >= 348 && py <= 376)
+ return _add(item, -1);
+ if (px >= 388 && px <= 416 && py >= 348 && py <= 376)
+ return _add(item, 1);
+ // 确定
+ if (px >= 341 && px <= 387 && py >= 380 && py <= 407)
+ return _confirm(item);
+
+ // 上一页/下一页
+ if (px >= 45 && px <= 105 && py >= 388) {
+ if (page > 1) selectItem -= 6;
+ return;
+ }
+ if (px >= 208 && px <= 268 && py >= 388) {
+ if (page < totalPage) selectItem = Math.min(selectItem + 6, list.length - 1);
+ return;
+ }
+
+ // 实际区域
+ if (px >= 9 && px <= 300 && py >= 120 && py < 360) {
+ if (list.length == 0) return;
+ var index = parseInt((py - 120) / 40);
+ var newItem = 6 * (page - 1) + index;
+ if (newItem >= list.length) newItem = list.length - 1;
+ if (newItem != selectItem) {
+ selectItem = newItem;
+ selectCount = 0;
+ }
+ return;
+ }
+ }
+
+ this.performItemShopAction = function () {
+ if (flags.type == 0) return this._performItemShopKeyBoard(flags.keycode);
+ else return this._performItemShopClick(flags.px, flags.py);
+ }
+
+ this.openItemShop = function (itemShopId) {
+ shopId = itemShopId;
+ type = 0;
+ page = 0;
+ selectItem = null;
+ selectCount = 0;
+ core.insertAction([{
+ "type": "while",
+ "condition": "true",
+ "data": [
+ { "type": "function", "function": "function () { core.drawItemShop(); }" },
+ { "type": "wait" },
+ { "type": "function", "function": "function() { core.performItemShopAction(); }" }
+ ]
+ },
+ { "type": "function", "function": "function () { " +
+ "core.deleteCanvas('uievent'); " +
+ "core.ui._uievent_drawSelector({ \"code\": 1 }); " +
+ "core.ui._uievent_drawSelector({ \"code\": 2 }); " +
+ "}" }
+ ]);
+ }
+
+ // Write item number to save
+ core.control.saveData = function () {
+ var data = this.controldata.saveData();
+ for (var shopId in core.status.shops) {
+ if (core.status.shops[shopId].item) {
+ data.shops[shopId].choices = core.status.shops[shopId].choices.map(function (t) {
+ return {
+ number: t.number,
+ money_count: t.money_count || 0,
+ sell_count: t.sell_count || 0
+ }
+ });
+ }
+ }
+ return data;
+ }
+
+ core.control.loadData = function (data, callback) {
+ this.controldata.loadData(data, callback);
+ for (var shopId in data.shops) {
+ if (data.shops[shopId].choices) {
+ for (var i = 0; i < data.shops[shopId].choices.length; ++i) {
+ core.status.shops[shopId].choices[i].number = data.shops[shopId].choices[i].number;
+ core.status.shops[shopId].choices[i].money_count = data.shops[shopId].choices[i].money_count;
+ core.status.shops[shopId].choices[i].sell_count = data.shops[shopId].choices[i].sell_count;
+ }
+ }
+ }
+ }
+
+},
+ "smoothCamera": function () {
+
+ // 是否启用本插件，默认不启用
+ this.__enableSmoothCamera = false;
+ if (!this.__enableSmoothCamera) return;
+
+ this.Camera = function () {
+
+ // 下面这个变量决定本插件的开关
+ // 你可以在游戏中使用core.setFlag('smoothCamera',false)来关闭本插件的功能
+ // 同时也可以core.setFlag('smoothCamera',true)重新开启
+ // 此项默认为true
+ //
+ this.__switchName = 'smoothCamera';
+
+ // 初始化成员变量
+ this._cameraNeedRefresh = true;
+ this._nowOffsetX = 0;
+ this._nowOffsetY = 0;
+ this._targetOffsetX = 0;
+ this._targetOffsetY = 0;
+ this._currentFloorId = null;
+
+ // 重置镜头，在楼层变更时使用
+ this.resetCamera = function () {
+ this._targetOffsetX = core.bigmap.offsetX;
+ this._targetOffsetY = core.bigmap.offsetY;
+ this._nowOffsetX = this._targetOffsetX;
+ this._nowOffsetY = this._targetOffsetY;
+ this._cameraNeedRefresh = true;
+ };
+
+ // 设置焦点坐标，目前没有用
+ this.setTarget = function (x, y) {
+ this._targetOffsetX = x;
+ this._targetOffsetY = y;
+ };
+
+ // 请求镜头更新
+ this.requestCameraUpdate = function () {
+ this._cameraNeedRefresh = true;
+ };
+
+ // 更新焦点坐标，目前仅根据大地图偏移决定
+ this.updateTargetPosition = function () {
+ this._targetOffsetX = core.bigmap.offsetX;
+ this._targetOffsetY = core.bigmap.offsetY;
+ };
+
+ // 更新额外的刷新条件，即镜头未指向焦点时
+ this.updateRefreshFlag = function () {
+ if (this._nowOffsetX != this._targetOffsetX || this._nowOffsetY != this._targetOffsetY) {
+ this._cameraNeedRefresh = true;
+ }
+ };
+
+ // 判断是否禁止了弹性滚动
+ this.canDirectMove = function () {
+ return !core.getFlag(this.__switchName, true);
+ };
+
+ // 更新镜头坐标
+ this.updateCameraPosition = function () {
+ if (this._cameraNeedRefresh) {
+ this._cameraNeedRefresh = false;
+ var disX = this._targetOffsetX - this._nowOffsetX;
+ var disY = this._targetOffsetY - this._nowOffsetY;
+ if (Math.abs(disX) <= 2 && Math.abs(disY) <= 2 || this.canDirectMove()) {
+ this._nowOffsetX = this._targetOffsetX;
+ this._nowOffsetY = this._targetOffsetY;
+ } else {
+ this._nowOffsetX += disX / 10;
+ this._nowOffsetY += disY / 10;
+ }
+ var x = -Math.floor(this._nowOffsetX);
+ var y = -Math.floor(this._nowOffsetY);
+ core.bigmap.canvas.forEach(function (cn) {
+ core.control.setGameCanvasTranslate(cn, x, y);
+ });
+ core.relocateCanvas('route', core.status.automaticRoute.offsetX + x, core.status.automaticRoute.offsetY + y);
+ core.setGameCanvasTranslate('hero', x + this._targetOffsetX, y + this._targetOffsetY);
+ }
+ };
+
+ // 更新逻辑主体
+ this.update = function () {
+ this.updateTargetPosition();
+ this.updateRefreshFlag();
+ this.updateCameraPosition();
+ };
+ };
+
+ // 其实只注释了最后一行，只能这样了
+ control.drawHero = function (status, offset) {
+ if (!core.isPlaying() || !core.status.floorId || core.status.gameOver) return;
+ var x = core.getHeroLoc('x'),
+ y = core.getHeroLoc('y'),
+ direction = core.getHeroLoc('direction');
+ status = status || 'stop';
+ offset = offset || 0;
+ var way = core.utils.scan[direction];
+ var dx = way.x,
+ dy = way.y,
+ offsetX = dx * offset,
+ offsetY = dy * offset;
+ core.bigmap.offsetX = core.clamp((x - core.__HALF_SIZE__) * 32 + offsetX, 0, 32 * core.bigmap.width - core.__PIXELS__);
+ core.bigmap.offsetY = core.clamp((y - core.__HALF_SIZE__) * 32 + offsetY, 0, 32 * core.bigmap.height - core.__PIXELS__);
+ core.clearAutomaticRouteNode(x + dx, y + dy);
+ core.clearMap('hero');
+
+ if (!core.hasFlag('hideHero')) {
+ this._drawHero_getDrawObjs(direction, x, y, status, offset).forEach(function (block) {
+ core.drawImage('hero', block.img, block.heroIcon[block.status] * block.width,
+ block.heroIcon.loc * block.height, block.width, block.height,
+ block.posx + (32 - block.width) / 2, block.posy + 32 - block.height, block.width, block.height);
+ });
+ }
+
+ core.control.updateViewport();
+ //core.setGameCanvasTranslate('hero', 0, 0);
+ };
+
+ // 复写转发
+ core.drawHero = function (status, offset) {
+ return core.control.drawHero(status, offset);
+ };
+
+ // 创建摄像机对象
+ this.camera = new this.Camera();
+
+ // 帧事件 更新摄像机
+ this.updateCameraEx = function () {
+ this.camera.update();
+ };
+
+ // 代理原本的镜头事件
+ control.updateViewport = function () {
+ core.plugin.camera.requestCameraUpdate();
+ };
+
+ // 更变楼层的行为追加，重置镜头
+ events.prototype.changingFloor = function (floorId, heroLoc, fromLoad) {
+ this.eventdata.changingFloor(floorId, heroLoc, fromLoad);
+ core.plugin.camera.resetCamera();
+ };
+
+ // 注册帧事件
+ core.registerAnimationFrame('smoothCameraFlash', true, this.updateCameraEx.bind(this));
}
}
\ No newline at end of file
diff --git a/styles.css b/styles.css
index 3a428992..9fe80446 100644
--- a/styles.css
+++ b/styles.css
@@ -347,11 +347,10 @@ p#name {
position: fixed;
top: 50%;
left: 50%;
- transform: translate(-50%, -60%);
+ transform: translate(-50%, -55%);
background: white;
width: 250px;
min-height: 50px;
- max-height: 250px;
}
#inputMessage {
@@ -380,7 +379,7 @@ p#name {
margin-right: 10%;
}
-#_selector, #_uievent_selector {
+#_selector, ._uievent_selector {
animation: selector 2s ease-in-out 0s infinite normal none running;
}
@@ -423,4 +422,62 @@ p#name {
100% {
transform: rotate(45deg) translate(-3px, -3px);
}
-}
\ No newline at end of file
+}
+
+#startImageBackgroundDiv {
+ display: none;
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ z-index: 10000;
+}
+
+#startImageDiv {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ background: black;
+ opacity: 1;
+}
+
+#startImageLogo {
+ opacity: 0;
+ max-width: 60%;
+ max-height: 60%;
+ position: fixed;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+}
+
+.startImageAnimation {
+ -webkit-animation: startImage 4s ease-in-out 1s alternate 1;
+ animation: startImage 4s ease-in-out 1s alternate 1;
+}
+
+@-webkit-keyframes startImage {
+ 0% { opacity: 0; }
+ 60% { opacity: 1; }
+ 100% { opacity: 0; }
+}
+
+@keyframes startImage {
+ 0% { opacity: 0; }
+ 60% { opacity: 1; }
+ 100% { opacity: 0; }
+}
+
+.startImageDivAnimation {
+ -webkit-animation: startImageDivDisappear 2s ease-in-out 5s alternate 1;
+ animation: startImageDivDisappear 2s ease-in-out 5s alternate 1;
+}
+
+@-webkit-keyframes startImageDivDisappear {
+ 0% { opacity: 1 }
+ 100% { opacity: 0 }
+}
+
+@keyframes startImageDivDisappear {
+ 0% { opacity: 1 }
+ 100% { opacity: 0 }
+}
diff --git a/常用工具/RM动画导出器.exe b/常用工具/RM动画导出器.exe
index b894a786..632441a2 100644
Binary files a/常用工具/RM动画导出器.exe and b/常用工具/RM动画导出器.exe differ
请稍后...