同步story分支
This commit is contained in:
parent
d4c40a95c9
commit
39ad2254f8
@ -1,11 +1,6 @@
|
||||
<<<<<<< HEAD
|
||||
var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
|
||||
"init": function () {
|
||||
=======
|
||||
var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
{
|
||||
"init": function () {
|
||||
>>>>>>> story
|
||||
this._afterLoadResources = function () {
|
||||
// 本函数将在所有资源加载完毕后，游戏开启前被执行
|
||||
core.ui.statusBar.init();
|
||||
@ -267,11 +262,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
});
|
||||
};
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"drawLight": function () {
|
||||
=======
|
||||
"drawLight": function () {
|
||||
>>>>>>> story
|
||||
// 绘制灯光/漆黑层效果。调用方式 core.plugin.drawLight(...)
|
||||
// 【参数说明】
|
||||
// name：必填，要绘制到的画布名；可以是一个系统画布，或者是个自定义画布；如果不存在则创建
|
||||
@ -337,11 +328,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
// 可以在任何地方（如afterXXX或自定义脚本事件）调用函数，方法为 core.plugin.xxx();
|
||||
};
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"shop": function () {
|
||||
=======
|
||||
"shop": function () {
|
||||
>>>>>>> story
|
||||
// 【全局商店】相关的功能
|
||||
//
|
||||
// 打开一个全局商店
|
||||
@ -617,11 +604,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
60
|
||||
);
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"removeMap": function () {
|
||||
=======
|
||||
"removeMap": function () {
|
||||
>>>>>>> story
|
||||
// 高层塔砍层插件，删除后不会存入存档，不可浏览地图也不可飞到。
|
||||
// 推荐用法：
|
||||
// 对于超高层或分区域塔，当在1区时将2区以后的地图删除；1区结束时恢复2区，进二区时删除1区地图，以此类推
|
||||
@ -711,21 +694,12 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
};
|
||||
},
|
||||
"fiveLayers": function () {
|
||||
<<<<<<< HEAD
|
||||
// 是否启用五图层（增加背景2层和前景2层） 将__enable置为true即会启用；启用后请保存后刷新编辑器
|
||||
// 背景层2将会覆盖背景层 被事件层覆盖 前景层2将会覆盖前景层
|
||||
// 另外 请注意加入两个新图层 会让大地图的性能降低一些
|
||||
// 插件作者：ad
|
||||
var __enable = true;
|
||||
if (!__enable) return;
|
||||
=======
|
||||
// 是否启用五图层（增加背景2层和前景2层） 将__enable置为true即会启用；启用后请保存后刷新编辑器
|
||||
// 背景层2将会覆盖背景层 被事件层覆盖 前景层2将会覆盖前景层
|
||||
// 另外 请注意加入两个新图层 会让大地图的性能降低一些
|
||||
// 插件作者：ad
|
||||
var __enable = true;
|
||||
if (!__enable) return;
|
||||
>>>>>>> story
|
||||
|
||||
// 创建新图层
|
||||
function createCanvas(name, zIndex) {
|
||||
@ -840,89 +814,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
var _loadFloor_doNotCopy = core.maps._loadFloor_doNotCopy;
|
||||
core.maps._loadFloor_doNotCopy = function () {
|
||||
return ["bg2map", "fg2map"].concat(_loadFloor_doNotCopy());
|
||||
};
|
||||
////// 绘制背景和前景层 //////
|
||||
core.maps._drawBg_draw = function (floorId, toDrawCtx, cacheCtx, config) {
|
||||
config.ctx = cacheCtx;
|
||||
core.maps._drawBg_drawBackground(floorId, config);
|
||||
// ------ 调整这两行的顺序来控制是先绘制贴图还是先绘制背景图块；后绘制的覆盖先绘制的。
|
||||
core.maps._drawFloorImages(
|
||||
floorId,
|
||||
config.ctx,
|
||||
"bg",
|
||||
null,
|
||||
null,
|
||||
config.onMap
|
||||
);
|
||||
core.maps._drawBgFgMap(floorId, "bg", config);
|
||||
if (config.onMap) {
|
||||
core.drawImage(
|
||||
toDrawCtx,
|
||||
cacheCtx.canvas,
|
||||
core.bigmap.v2 ? -32 : 0,
|
||||
core.bigmap.v2 ? -32 : 0
|
||||
);
|
||||
core.clearMap("bg2");
|
||||
core.clearMap(cacheCtx);
|
||||
}
|
||||
core.maps._drawBgFgMap(floorId, "bg2", config);
|
||||
if (config.onMap)
|
||||
core.drawImage(
|
||||
"bg2",
|
||||
cacheCtx.canvas,
|
||||
core.bigmap.v2 ? -32 : 0,
|
||||
core.bigmap.v2 ? -32 : 0
|
||||
);
|
||||
config.ctx = toDrawCtx;
|
||||
};
|
||||
core.maps._drawFg_draw = function (floorId, toDrawCtx, cacheCtx, config) {
|
||||
config.ctx = cacheCtx;
|
||||
// ------ 调整这两行的顺序来控制是先绘制贴图还是先绘制前景图块；后绘制的覆盖先绘制的。
|
||||
core.maps._drawFloorImages(
|
||||
floorId,
|
||||
config.ctx,
|
||||
"fg",
|
||||
null,
|
||||
null,
|
||||
config.onMap
|
||||
);
|
||||
core.maps._drawBgFgMap(floorId, "fg", config);
|
||||
if (config.onMap) {
|
||||
core.drawImage(
|
||||
toDrawCtx,
|
||||
cacheCtx.canvas,
|
||||
core.bigmap.v2 ? -32 : 0,
|
||||
core.bigmap.v2 ? -32 : 0
|
||||
);
|
||||
core.clearMap("fg2");
|
||||
core.clearMap(cacheCtx);
|
||||
}
|
||||
core.maps._drawBgFgMap(floorId, "fg2", config);
|
||||
if (config.onMap)
|
||||
core.drawImage(
|
||||
"fg2",
|
||||
cacheCtx.canvas,
|
||||
core.bigmap.v2 ? -32 : 0,
|
||||
core.bigmap.v2 ? -32 : 0
|
||||
);
|
||||
config.ctx = toDrawCtx;
|
||||
};
|
||||
////// 移动判定 //////
|
||||
core.maps._generateMovableArray_arrays = function (floorId) {
|
||||
return {
|
||||
bgArray: this.getBgMapArray(floorId),
|
||||
fgArray: this.getFgMapArray(floorId),
|
||||
eventArray: this.getMapArray(floorId),
|
||||
bg2Array: this._getBgFgMapArray("bg2", floorId),
|
||||
fg2Array: this._getBgFgMapArray("fg2", floorId),
|
||||
};
|
||||
};
|
||||
},
|
||||
=======
|
||||
var _loadFloor_doNotCopy = core.maps._loadFloor_doNotCopy;
|
||||
core.maps._loadFloor_doNotCopy = function () {
|
||||
return ["bg2map", "fg2map"].concat(_loadFloor_doNotCopy());
|
||||
@ -1004,7 +895,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
};
|
||||
};
|
||||
},
|
||||
>>>>>>> story
|
||||
"itemShop": function () {
|
||||
// 道具商店相关的插件
|
||||
// 可在全塔属性-全局商店中使用「道具商店」事件块进行编辑（如果找不到可以在入口方块中找）
|
||||
|
||||
Loading…
Reference in New Issue
Block a user