diff --git a/public/index.html b/public/index.html index f978bb5..b855454 100644 --- a/public/index.html +++ b/public/index.html @@ -147,7 +147,7 @@ -
+
diff --git a/public/libs/control.js b/public/libs/control.js index 0ede38e..a70acbd 100644 --- a/public/libs/control.js +++ b/public/libs/control.js @@ -87,8 +87,6 @@ control.prototype._init = function () { // --- 注册系统的resize this.registerResize('gameGroup', this._resize_gameGroup); this.registerResize('canvas', this._resize_canvas); - this.registerResize('toolBar', this._resize_toolBar); - this.registerResize('tools', this._resize_tools); }; // ------ requestAnimationFrame 相关 ------ // @@ -3499,6 +3497,8 @@ control.prototype.hideStatusBar = function (showToolbox) { ////// 改变工具栏为按钮1-8 ////// control.prototype.setToolbarButton = function (useButton) { + // Deprecated. Use CustomToolbar instead. + return; if (!core.domStyle.showStatusBar) { // 隐藏状态栏时检查竖屏 if (!core.domStyle.isVertical && !core.flags.extendToolbar) { @@ -3692,11 +3692,7 @@ control.prototype._resize_gameGroup = function (obj) { obj.outerWidth + obj.BAR_WIDTH * core.domStyle.scale + (obj.extendToolbar ? 0 : obj.BORDER); - totalHeight = - obj.outerHeight + - (obj.extendToolbar - ? obj.TOOLBAR_HEIGHT * core.domStyle.scale + obj.BORDER - : 0); + totalHeight = obj.outerHeight; } gameGroup.style.width = totalWidth + 'px'; gameGroup.style.height = totalHeight + 'px'; @@ -3787,51 +3783,21 @@ control.prototype._resize_canvas = function (obj) { }; control.prototype._resize_toolBar = function (obj) { - // toolBar - var toolBar = core.dom.toolBar; - if (core.domStyle.isVertical) { - toolBar.style.left = 0; - toolBar.style.right = ''; - toolBar.style.width = obj.outerWidth - 6 + 'px'; - toolBar.style.top = - obj.statusBarHeightInVertical + obj.outerHeight - 3 + 'px'; - toolBar.style.height = obj.toolbarHeightInVertical + 'px'; - toolBar.style.background = 'none'; - } else { - toolBar.style.left = ''; - toolBar.style.right = 0; - toolBar.style.width = obj.outerWidth - 6 + 'px'; - toolBar.style.top = obj.outerHeight - 3 + 'px'; - toolBar.style.height = - obj.TOOLBAR_HEIGHT * core.domStyle.scale + obj.BORDER + 'px'; - toolBar.style.background = 'none'; - } - toolBar.style.fontSize = 16 * core.domStyle.scale + 'px'; - - if ( - !core.domStyle.showStatusBar && - !core.domStyle.isVertical && - !obj.extendToolbar - ) { - toolBar.style.display = 'none'; - } else { - toolBar.style.display = 'block'; - } + // Deprecated. Use CustomToolbar instead. }; control.prototype._resize_tools = function (obj) { - var toolsHeight = 32 * core.domStyle.scale; - var toolsMarginLeft; - - toolsMarginLeft = (core._HALF_WIDTH_ - 3) * 3 * core.domStyle.scale; - for (var i = 0; i < core.dom.tools.length; ++i) { - var style = core.dom.tools[i].style; - style.height = toolsHeight + 'px'; - style.marginLeft = toolsMarginLeft + 'px'; - style.marginTop = 3 * core.domStyle.scale + 'px'; - } - core.dom.hard.style.lineHeight = toolsHeight + 'px'; - - core.dom.hard.style.width = - obj.outerWidth - 9 * toolsMarginLeft - 8.5 * toolsHeight - 12 + 'px'; + // Deprecated. Use CustomToolbar instead. + // var toolsHeight = 32 * core.domStyle.scale; + // var toolsMarginLeft; + // toolsMarginLeft = (core._HALF_WIDTH_ - 3) * 3 * core.domStyle.scale; + // for (var i = 0; i < core.dom.tools.length; ++i) { + // var style = core.dom.tools[i].style; + // style.height = toolsHeight + 'px'; + // style.marginLeft = toolsMarginLeft + 'px'; + // style.marginTop = 3 * core.domStyle.scale + 'px'; + // } + // core.dom.hard.style.lineHeight = toolsHeight + 'px'; + // core.dom.hard.style.width = + // obj.outerWidth - 9 * toolsMarginLeft - 8.5 * toolsHeight - 12 + 'px'; }; diff --git a/public/project/bgms/palaceCenter.mp3 b/public/project/bgms/palaceCenter.mp3 new file mode 100644 index 0000000..53c91a4 Binary files /dev/null and b/public/project/bgms/palaceCenter.mp3 differ diff --git a/public/project/data.js b/public/project/data.js index 02090fc..48eaa9b 100644 --- a/public/project/data.js +++ b/public/project/data.js @@ -82,7 +82,29 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "MT67", "MT68", "MT69", - "MT71" + "MT71", + "MT72", + "MT73", + "MT74", + "MT75", + "MT76", + "MT77", + "MT78", + "MT79", + "MT80", + "MT81", + "MT82", + "MT83", + "MT84", + "MT85", + "MT86", + "MT87", + "MT88", + "MT89", + "MT90", + "MT91", + "MT92", + "MT93" ], "floorPartitions": [ [ @@ -169,8 +191,11 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "beforeBoss.mp3", "cave.mp3", "escape.mp3", + "escape2.mp3", "grass.mp3", "mount.mp3", + "night.mp3", + "palaceCenter.mp3", "palaceNorth.mp3", "palaceSouth.mp3", "plot1.mp3", diff --git a/public/project/floors/MT60.js b/public/project/floors/MT60.js index f5f5932..dd9266a 100644 --- a/public/project/floors/MT60.js +++ b/public/project/floors/MT60.js @@ -282,7 +282,21 @@ main.floors.MT60= [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,50400,50401,50402, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,50408,50409,50410, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,50416,50417,50418, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fgmap": [ diff --git a/public/project/floors/MT61.js b/public/project/floors/MT61.js index 734e303..6307948 100644 --- a/public/project/floors/MT61.js +++ b/public/project/floors/MT61.js @@ -38,6 +38,13 @@ main.floors.MT61= 0, 7 ] + }, + "7,0": { + "floorId": "MT72", + "loc": [ + 7, + 14 + ] } }, "beforeBattle": {}, @@ -65,7 +72,21 @@ main.floors.MT61= [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50448,50449,50450,50451,50452, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50456,50457,50458,50459,50460, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50464,50465,50466,50467,50468, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50472,50473,50474,50475,50476, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50480,50481,50482,50483,50484, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fgmap": [ diff --git a/public/project/floors/MT72.js b/public/project/floors/MT72.js new file mode 100644 index 0000000..553b6ae --- /dev/null +++ b/public/project/floors/MT72.js @@ -0,0 +1,79 @@ +main.floors.MT72= +{ + "floorId": "MT72", + "title": "苍蓝之殿-中", + "name": "72", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 8, + "defaultGround": "T650", + "bgm": "palaceNorth.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "7,14": { + "floorId": "MT61", + "loc": [ + 7, + 0 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [648,648,648,648,648,648,648, 91,648,648,648,648,648,648,648], + [648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,648], + [648, 0,487, 0, 0, 0, 0,103, 0, 0, 0, 0,487, 0,648], + [648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,648], + [648, 0, 0, 0,648,648,648, 85,648,648,648, 0, 0, 0,648], + [648, 0, 0, 0,648, 0, 0, 0, 0, 0,648, 0, 0, 0,648], + [648, 0, 0, 0,648, 0, 0, 0, 0, 0,648, 0, 0, 0,648], + [648, 0,103, 0, 85, 0, 0, 87, 0, 0, 85, 0,103, 0,648], + [648, 0, 0, 0,648, 0, 0, 0, 0, 0,648, 0, 0, 0,648], + [648, 0, 0, 0,648, 0, 0, 0, 0, 0,648, 0, 0, 0,648], + [648, 0, 0, 0,648,648,648, 85,648,648,648, 0, 0, 0,648], + [648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,648], + [648, 0,487, 0, 0, 0, 0,103, 0, 0, 0, 0,487, 0,648], + [648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,648], + [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] +], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50448,50449,50450,50451,50452, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50456,50457,50458,50459,50460, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50464,50465,50466,50467,50468, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50472,50473,50474,50475,50476, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,50480,50481,50482,50483,50484, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/public/project/floors/MT73.js b/public/project/floors/MT73.js new file mode 100644 index 0000000..3ed497a --- /dev/null +++ b/public/project/floors/MT73.js @@ -0,0 +1,45 @@ +main.floors.MT73= +{ +"floorId": "MT73", +"title": "苍蓝之殿-中", +"name": "73", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT74.js b/public/project/floors/MT74.js new file mode 100644 index 0000000..74410fc --- /dev/null +++ b/public/project/floors/MT74.js @@ -0,0 +1,45 @@ +main.floors.MT74= +{ +"floorId": "MT74", +"title": "苍蓝之殿-中", +"name": "74", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT75.js b/public/project/floors/MT75.js new file mode 100644 index 0000000..c7a719f --- /dev/null +++ b/public/project/floors/MT75.js @@ -0,0 +1,45 @@ +main.floors.MT75= +{ +"floorId": "MT75", +"title": "苍蓝之殿-中", +"name": "75", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT76.js b/public/project/floors/MT76.js new file mode 100644 index 0000000..99883e2 --- /dev/null +++ b/public/project/floors/MT76.js @@ -0,0 +1,45 @@ +main.floors.MT76= +{ +"floorId": "MT76", +"title": "苍蓝之殿-左上", +"name": "76", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT77.js b/public/project/floors/MT77.js new file mode 100644 index 0000000..2b3e213 --- /dev/null +++ b/public/project/floors/MT77.js @@ -0,0 +1,45 @@ +main.floors.MT77= +{ +"floorId": "MT77", +"title": "苍蓝之殿-左上", +"name": "77", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT78.js b/public/project/floors/MT78.js new file mode 100644 index 0000000..d84d763 --- /dev/null +++ b/public/project/floors/MT78.js @@ -0,0 +1,45 @@ +main.floors.MT78= +{ +"floorId": "MT78", +"title": "苍蓝之殿-左上", +"name": "78", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT79.js b/public/project/floors/MT79.js new file mode 100644 index 0000000..6d1ec18 --- /dev/null +++ b/public/project/floors/MT79.js @@ -0,0 +1,45 @@ +main.floors.MT79= +{ +"floorId": "MT79", +"title": "苍蓝之殿-左上", +"name": "79", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT80.js b/public/project/floors/MT80.js new file mode 100644 index 0000000..df30cff --- /dev/null +++ b/public/project/floors/MT80.js @@ -0,0 +1,45 @@ +main.floors.MT80= +{ +"floorId": "MT80", +"title": "苍蓝之殿-左上", +"name": "80", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT81.js b/public/project/floors/MT81.js new file mode 100644 index 0000000..4b0a307 --- /dev/null +++ b/public/project/floors/MT81.js @@ -0,0 +1,45 @@ +main.floors.MT81= +{ +"floorId": "MT81", +"title": "苍蓝之殿-左上", +"name": "81", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT82.js b/public/project/floors/MT82.js new file mode 100644 index 0000000..b7cb058 --- /dev/null +++ b/public/project/floors/MT82.js @@ -0,0 +1,45 @@ +main.floors.MT82= +{ +"floorId": "MT82", +"title": "苍蓝之殿-左上", +"name": "82", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT83.js b/public/project/floors/MT83.js new file mode 100644 index 0000000..4818e43 --- /dev/null +++ b/public/project/floors/MT83.js @@ -0,0 +1,45 @@ +main.floors.MT83= +{ +"floorId": "MT83", +"title": "苍蓝之殿-左上", +"name": "83", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT84.js b/public/project/floors/MT84.js new file mode 100644 index 0000000..d29caa4 --- /dev/null +++ b/public/project/floors/MT84.js @@ -0,0 +1,45 @@ +main.floors.MT84= +{ +"floorId": "MT84", +"title": "苍蓝之殿-左上", +"name": "84", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT85.js b/public/project/floors/MT85.js new file mode 100644 index 0000000..321255d --- /dev/null +++ b/public/project/floors/MT85.js @@ -0,0 +1,57 @@ +main.floors.MT85= +{ + "floorId": "MT85", + "title": "苍蓝之殿-右上", + "name": "85", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 8, + "defaultGround": "T650", + "bgm": "palaceNorth.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": {}, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "bgmap": [ + +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/public/project/floors/MT86.js b/public/project/floors/MT86.js new file mode 100644 index 0000000..0febebc --- /dev/null +++ b/public/project/floors/MT86.js @@ -0,0 +1,45 @@ +main.floors.MT86= +{ +"floorId": "MT86", +"title": "苍蓝之殿-右上", +"name": "86", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT87.js b/public/project/floors/MT87.js new file mode 100644 index 0000000..7c2c47b --- /dev/null +++ b/public/project/floors/MT87.js @@ -0,0 +1,45 @@ +main.floors.MT87= +{ +"floorId": "MT87", +"title": "苍蓝之殿-右上", +"name": "87", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT88.js b/public/project/floors/MT88.js new file mode 100644 index 0000000..1724096 --- /dev/null +++ b/public/project/floors/MT88.js @@ -0,0 +1,45 @@ +main.floors.MT88= +{ +"floorId": "MT88", +"title": "苍蓝之殿-右上", +"name": "88", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT89.js b/public/project/floors/MT89.js new file mode 100644 index 0000000..0c8d7d5 --- /dev/null +++ b/public/project/floors/MT89.js @@ -0,0 +1,45 @@ +main.floors.MT89= +{ +"floorId": "MT89", +"title": "苍蓝之殿-右上", +"name": "89", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT90.js b/public/project/floors/MT90.js new file mode 100644 index 0000000..86f0c04 --- /dev/null +++ b/public/project/floors/MT90.js @@ -0,0 +1,45 @@ +main.floors.MT90= +{ +"floorId": "MT90", +"title": "苍蓝之殿-右上", +"name": "90", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT91.js b/public/project/floors/MT91.js new file mode 100644 index 0000000..9c86bf6 --- /dev/null +++ b/public/project/floors/MT91.js @@ -0,0 +1,45 @@ +main.floors.MT91= +{ +"floorId": "MT91", +"title": "苍蓝之殿-右上", +"name": "91", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT92.js b/public/project/floors/MT92.js new file mode 100644 index 0000000..2160a62 --- /dev/null +++ b/public/project/floors/MT92.js @@ -0,0 +1,45 @@ +main.floors.MT92= +{ +"floorId": "MT92", +"title": "苍蓝之殿-右上", +"name": "92", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/public/project/floors/MT93.js b/public/project/floors/MT93.js new file mode 100644 index 0000000..f1c0f14 --- /dev/null +++ b/public/project/floors/MT93.js @@ -0,0 +1,45 @@ +main.floors.MT93= +{ +"floorId": "MT93", +"title": "苍蓝之殿-右上", +"name": "93", +"width": 15, +"height": 15, +"canFlyTo": true, +"canFlyFrom": true, +"canUseQuickShop": true, +"cannotViewMap": false, +"images": [], +"ratio": 8, +"defaultGround": "T650", +"bgm": "palaceNorth.mp3", +"firstArrive": [], +"eachArrive": [], +"parallelDo": "", +"events": {}, +"changeFloor": {}, +"beforeBattle": {}, +"afterBattle": {}, +"afterGetItem": {}, +"afterOpenDoor": {}, +"autoEvent": {}, +"cannotMove": {}, +"cannotMoveIn": {}, +"map": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], +} \ No newline at end of file diff --git a/src/core/common/resource.ts b/src/core/common/resource.ts index ed4dcf6..9f22b37 100644 --- a/src/core/common/resource.ts +++ b/src/core/common/resource.ts @@ -312,7 +312,7 @@ interface LoadEvent extends EmitableEvent { now: number, total: number ) => void; - load: (resource: ResourceMap[T]) => void | Promise; + load: (resource: ResourceMap[T]) => void | Promise; loadStart: (resource: ResourceMap[T]) => void; } @@ -365,7 +365,7 @@ export class LoadTask< * 执行加载过程，当加载完毕后，返回的Promise将会被resolve * @returns 加载的Promise */ - load(): Promise { + async load(): Promise { if (this.loadingStarted) { logger.warn( 2, @@ -394,14 +394,13 @@ export class LoadTask< ); }); this.emit('loadStart', this.resource); - return load.then(async value => { - // @ts-ignore - LoadTask.loadedTaskList.add(this); - this.loaded = totalByte; - LoadTask.loadedTask++; - await Promise.all(this.emit('load', this.resource)); - return value; - }); + const value = await load; + // @ts-ignore + LoadTask.loadedTaskList.add(this); + this.loaded = totalByte; + LoadTask.loadedTask++; + await Promise.all(this.emit('load', this.resource)); + return await value; } /** @@ -619,79 +618,100 @@ export async function loadCompressedResource() { res.once('load', resource => { const res = resource.resource; if (!res) return; - list.forEach(async v => { - const { type, name, usage } = v; - const asyncType = types[type]; - const value = await res - .file(`${type}/${name}`) - ?.async(asyncType); + return Promise.all( + list.map(async v => { + const { type, name, usage } = v; + const asyncType = types[type]; + const value = await res + .file(`${type}/${name}`) + ?.async(asyncType); - if (!value) return; + if (!value) return; - // 图片类型的资源 - if (type === 'image') { - const img = value as Blob; - const image = new Image(); - image.src = URL.createObjectURL(img); - image.addEventListener('load', () => { - image.setAttribute('_width', image.width.toString()); - image.setAttribute('_height', image.height.toString()); - }); + // 图片类型的资源 + if (type === 'image') { + const img = value as Blob; + const image = new Image(); + image.src = URL.createObjectURL(img); + image.addEventListener('load', () => { + image.setAttribute( + '_width', + image.width.toString() + ); + image.setAttribute( + '_height', + image.height.toString() + ); + }); - // 图片 - if (usage === 'image') { - core.material.images.images[name as ImageIds] = image; - } else if (usage === 'tileset') { - // 额外素材 - core.material.images.tilesets[name] = image; - } else if (usage === 'autotile') { - // 自动元件 - autotiles[name.slice(0, -4) as AllIdsOf<'autotile'>] = - image; - const loading = Mota.require('var', 'loading'); - loading.addAutotileLoaded(); - loading.onAutotileLoaded(autotiles); - core.material.images.autotile[ - name.slice(0, -4) as AllIdsOf<'autotile'> - ] = image; + // 图片 + if (usage === 'image') { + core.material.images.images[name as ImageIds] = + image; + } else if (usage === 'tileset') { + // 额外素材 + core.material.images.tilesets[name] = image; + } else if (usage === 'autotile') { + // 自动元件 + autotiles[ + name.slice(0, -4) as AllIdsOf<'autotile'> + ] = image; + const loading = Mota.require('var', 'loading'); + loading.addAutotileLoaded(); + loading.onAutotileLoaded(autotiles); + core.material.images.autotile[ + name.slice(0, -4) as AllIdsOf<'autotile'> + ] = image; + } + } else if (type === 'material') { + const img = value as Blob; + const image = new Image(); + image.src = URL.createObjectURL(img); + image.addEventListener('load', () => { + image.setAttribute( + '_width', + image.width.toString() + ); + image.setAttribute( + '_height', + image.height.toString() + ); + }); + + // material + if (materialImages.some(v => name === v + '.png')) { + // @ts-ignore + core.material.images[ + name.slice(0, -4) as SelectKey< + MaterialImages, + HTMLImageElement + > + ] = image; + } else if (weathers.some(v => name === v + '.png')) { + // @ts-ignore + core.animateFrame.weather[v] = image; + } } - } else if (type === 'material') { - const img = value as Blob; - const image = new Image(); - image.src = URL.createObjectURL(img); - image.addEventListener('load', () => { - image.setAttribute('_width', image.width.toString()); - image.setAttribute('_height', image.height.toString()); - }); - // material - if (materialImages.some(v => name === v + '.png')) { - // @ts-ignore - core.material.images[ - name.slice(0, -4) as SelectKey< - MaterialImages, - HTMLImageElement - > - ] = image; - } else if (weathers.some(v => name === v + '.png')) { - // @ts-ignore - core.animateFrame.weather[v] = image; - } else { + if (usage === 'font') { + const font = value as ArrayBuffer; + document.fonts.add( + new FontFace(name.slice(0, -4), font) + ); + } else if (usage === 'sound') { + const sound = value as ArrayBuffer; + Mota.require('var', 'sound').add( + `sounds.${name}`, + sound + ); + } else if (usage === 'animate') { + const ani = value as string; + core.material.animates[ + name.slice(0, -8) as AnimationIds + ] = core.loader._loadAnimate(ani); } - } - - if (usage === 'font') { - const font = value as ArrayBuffer; - document.fonts.add(new FontFace(name.slice(0, -4), font)); - } else if (usage === 'sound') { - const sound = value as ArrayBuffer; - Mota.require('var', 'sound').add(`sounds.${name}`, sound); - } else if (usage === 'animate') { - const ani = value as string; - core.material.animates[name.slice(0, -8) as AnimationIds] = - core.loader._loadAnimate(ani); - } - }); + }) + ); }); }); } diff --git a/src/core/fx/shadow.ts b/src/core/fx/shadow.ts index 6e2f933..1856c69 100644 --- a/src/core/fx/shadow.ts +++ b/src/core/fx/shadow.ts @@ -73,14 +73,14 @@ function addLightFromBlock(floors: FloorIds[], block: number, config: LightConfi Mota.require('var', 'hook').once('reset', () => { Shadow.init(); addLightFromBlock( - core.floorIds.slice(61, 70).concat(core.floorIds.slice(72)), + core.floorIds.slice(61, 70).concat(core.floorIds.slice(72, 81)).concat(core.floorIds.slice(85, 103)), 103, { decay: 50, r: 300, color: [0.9333, 0.6, 0.333, 0.3] }, { background: [0, 0, 0, 0.26] }, { decay: 50, r: 250, color: [0, 0, 0, 0] } ); addLightFromBlock( - ['MT50', 'MT60', 'MT61'], + ['MT50', 'MT60', 'MT61', 'MT72', 'MT73', 'MT74', 'MT75'], 103, { decay: 20, r: 150, color: [0.9333, 0.6, 0.333, 0.4], noShelter: true }, { background: [0, 0, 0, 0.4] } diff --git a/src/core/main/custom/danmaku.ts b/src/core/main/custom/danmaku.ts index 5d3112b..bc1e703 100644 --- a/src/core/main/custom/danmaku.ts +++ b/src/core/main/custom/danmaku.ts @@ -11,7 +11,7 @@ import { } from '@/plugin/utils'; import axios, { AxiosResponse, toFormData } from 'axios'; import { Component, VNode, h, shallowReactive } from 'vue'; -/* @__PURE__ */ import { id, password } from '../../../../user'; +// /* @__PURE__ */ import { id, password } from '../../../../user'; import { mainSetting } from '../setting'; type CSSObj = Partial>; @@ -135,8 +135,8 @@ export class Danmaku extends EventEmitter { this.posting = true; const form = toFormData(data); - /* @__PURE__ */ form.append('userid', id); - /* @__PURE__ */ form.append('password', password); + // /* @__PURE__ */ form.append('userid', id); + // /* @__PURE__ */ form.append('password', password); try { const res = await axios.post( @@ -385,8 +385,8 @@ export class Danmaku extends EventEmitter { }; const form = toFormData(post); - /* @__PURE__ */ form.append('userid', id); - /* @__PURE__ */ form.append('password', password); + // /* @__PURE__ */ form.append('userid', id); + // /* @__PURE__ */ form.append('password', password); const res = await axios.post(Danmaku.backend, form); if (res.data.code !== 0) { @@ -466,8 +466,8 @@ export class Danmaku extends EventEmitter { type: 1, towername: 'HumanBreak' }); - /* @__PURE__ */ form.append('userid', id); - /* @__PURE__ */ form.append('password', password); + // /* @__PURE__ */ form.append('userid', id); + // /* @__PURE__ */ form.append('password', password); const data = await axios.post(Danmaku.backend, form); data.data.list.forEach(v => { @@ -515,7 +515,9 @@ Danmaku.registerSpecContent('i', content => { }); }); -/* @__PURE__ */ Danmaku.backend = `/danmaku`; +if (import.meta.env.DEV) { + Danmaku.backend = `/danmaku`; +} Mota.require('var', 'hook').once('reset', () => { Danmaku.fetch(); diff --git a/src/core/main/custom/toolbar.ts b/src/core/main/custom/toolbar.ts index aa17240..cbdf3e7 100644 --- a/src/core/main/custom/toolbar.ts +++ b/src/core/main/custom/toolbar.ts @@ -11,6 +11,7 @@ import type { ToolbarItemMap, ToolbarItemType } from '../init/toolbar'; +import { isMobile } from '@/plugin/use'; interface CustomToolbarEvent extends EmitableEvent { add: (item: ValueOf) => void; @@ -378,3 +379,51 @@ Mota.require('var', 'loading').once('coreInit', () => { Mota.require('var', 'hook').on('reset', () => { CustomToolbar.showAll(); }); + +Mota.require('var', 'hook').once('reset', () => { + const mainStorage = GameStorage.for(GameStorage.fromGame('main')); + mainStorage.read(); + if (mainStorage.getValue('played', false)) { + mainStorage.setValue('played', true); + const defaultsTool = + CustomToolbar.list.find(v => v.id === '@defaults') ?? + new CustomToolbar('@defaults', true); + defaultsTool.closeAll(); + defaultsTool.items = reactive([]); + defaultsTool.add({ + id: '@defaults_misc', + type: 'misc', + folded: false, + noDefaultAction: true, + items: [ + 'book', + 'fly', + 'save', + 'load', + 'undo', + 'redo', + 'danmaku', + 'minimap', + 'toolbox', + 'equipbox', + 'shop', + 'virtualKey', + 'setting' + ] + }); + // 计算位置 + if (isMobile) { + // 手机端显示在最下方 + defaultsTool.setPos(25, window.innerHeight - 100); + defaultsTool.setSize(window.innerWidth - 50, 100); + } else { + // 电脑显示在屏幕右方 + const x = window.innerWidth / 2 + core.domStyle.scale * 240 + 75; + defaultsTool.setPos(x, window.innerHeight / 2 + 100); + defaultsTool.setSize(window.innerWidth - x - 75, 200); + } + + defaultsTool.show(); + CustomToolbar.save(); + } +}); diff --git a/src/core/main/init/toolbar.tsx b/src/core/main/init/toolbar.tsx index e1139a1..ded4867 100644 --- a/src/core/main/init/toolbar.tsx +++ b/src/core/main/init/toolbar.tsx @@ -16,7 +16,7 @@ import { SelectOption, Switch } from 'ant-design-vue'; -import { mainSetting } from '../setting'; +import { MotaSettingItem, mainSetting } from '../setting'; import Minimap from '@/components/minimap.vue'; import { gameKey } from './hotkey'; import { FunctionalComponent, StyleValue, h } from 'vue'; @@ -224,21 +224,13 @@ function MiscTool(props: CustomToolbarProps<'misc'>) { justify-content: center; font-size: ${18 * scale}px; `; - const blockStyle = ` - min-width: ${40 * scale}px; - display: flex; - align-items: center; - justify-content: center; - height: ${40 * scale}px; - border: 1px solid #ddd; - `; const toolStyle = ` display: flex; align-items: center; min-width: ${40 * scale}px; height: ${40 * scale}px; border: 1px solid #ddd; - margin-left: ${5 * scale}px; + margin: ${5 * scale}px ${5 * scale}px ${5 * scale}px 0; justify-content: center; `; const toolActivedStyle = ` @@ -247,7 +239,7 @@ function MiscTool(props: CustomToolbarProps<'misc'>) { min-width: ${40 * scale}px; height: ${40 * scale}px; border: 1px solid #ddd; - margin-left: ${5 * scale}px; + margin: ${5 * scale}px ${5 * scale}px ${5 * scale}px 0; justify-content: center; color: aqua; `; @@ -255,6 +247,7 @@ function MiscTool(props: CustomToolbarProps<'misc'>) { display: flex; align-items: center; padding: 0 ${5 * scale}px; + flex-wrap: wrap; `; return ( @@ -272,7 +265,7 @@ function MiscTool(props: CustomToolbarProps<'misc'>) { 折叠 @@ -753,6 +746,9 @@ Mota.require('var', 'hook').once('reset', () => { CustomToolbar.misc.requestRefresh('minimap'); } }); + const scale = mainSetting.getSetting('ui.toolbarScale') as Readonly< + MotaSettingItem + >; CustomToolbar.misc.register( 'danmaku', @@ -760,6 +756,34 @@ Mota.require('var', 'hook').once('reset', () => { openDanmakuPoster, h('span', '发弹幕') ); + CustomToolbar.misc.register( + 'book', + '怪物手册', + () => { + core.useItem('book', true); + }, + + ); + CustomToolbar.misc.register( + 'fly', + '楼层飞行器', + () => { + core.useItem('fly', true); + }, + + ); CustomToolbar.misc.register( 'toolbox', '道具栏', @@ -768,7 +792,24 @@ Mota.require('var', 'hook').once('reset', () => { }, + ); + CustomToolbar.misc.register( + 'equipbox', + '装备栏', + () => { + mainUi.open('equipbox'); + }, + ); CustomToolbar.misc.register( @@ -779,7 +820,10 @@ Mota.require('var', 'hook').once('reset', () => { }, ); CustomToolbar.misc.register( @@ -790,7 +834,10 @@ Mota.require('var', 'hook').once('reset', () => { }, ); CustomToolbar.misc.register( @@ -801,7 +848,10 @@ Mota.require('var', 'hook').once('reset', () => { }, ); CustomToolbar.misc.register( @@ -812,11 +862,14 @@ Mota.require('var', 'hook').once('reset', () => { }, ); CustomToolbar.misc.register( - 'redo', + 'undo', '回退（自动存档）', () => { core.doSL('autoSave', 'load'); @@ -824,7 +877,7 @@ Mota.require('var', 'hook').once('reset', () => { h('span', '回退') ); CustomToolbar.misc.register( - 'load', + 'redo', '恢复（撤销自动存档）', () => { core.doSL('autoSave', 'reload'); @@ -839,7 +892,10 @@ Mota.require('var', 'hook').once('reset', () => { }, ); CustomToolbar.misc.register( diff --git a/src/core/main/setting.ts b/src/core/main/setting.ts index ddcfb8a..346b457 100644 --- a/src/core/main/setting.ts +++ b/src/core/main/setting.ts @@ -499,7 +499,7 @@ loading.once('coreInit', () => { 'screen.heroDetail': !!storage.getValue('screen.heroDetail', false), 'screen.transition': !!storage.getValue('screen.transition', false), 'screen.antiAlias': !!storage.getValue('screen.antiAlias', false), - 'screen.fontSize': storage.getValue('screen.fontSize', 16), + 'screen.fontSize': storage.getValue('screen.fontSize', isMobile ? 9 : 16), 'screen.smoothView': !!storage.getValue('screen.smoothView', true), 'screen.criticalGem': !!storage.getValue('screen.criticalGem', false), 'screen.fontSizeStatus': storage.getValue('screen.fontSizeStatus', 100), diff --git a/src/data/settings.json b/src/data/settings.json index ccf6533..1e15419 100644 --- a/src/data/settings.json +++ b/src/data/settings.json @@ -14,7 +14,7 @@ "是否开启抗锯齿。开启后，画面会变得不那么锐利，观感更加舒适；关闭后，可以更好地展现出像素感，同时部分像素错误也不会出现。" ], "fontSize": [ - "在各种 ui 界面中显示的文字大小，范围为 8 - 28。注意，字体过大可能会引起 ui 布局发生错误" + "在各种 ui 界面中显示的文字大小，范围为 2 - 48。注意，字体过大可能会引起 ui 布局发生错误" ], "criticalGem": ["临界是否显示为在当前地图要吃的宝石数"] }, diff --git a/src/game/enemy/damage.ts b/src/game/enemy/damage.ts index 838f60f..851a24e 100644 --- a/src/game/enemy/damage.ts +++ b/src/game/enemy/damage.ts @@ -996,7 +996,7 @@ export class DamageEnemy { /** * 计算伤害时会用到的勇士属性，攻击防御，其余的不会有buff加成，直接从core.status.hero取 */ -const realStatus: (keyof HeroStatus)[] = ['atk', 'def']; +const realStatus: (keyof HeroStatus)[] = ['atk', 'def', 'hpmax', 'mana']; /** * 主动技能列表 */ @@ -1016,12 +1016,10 @@ export function calDamageWith( ): number | null { const { hp, - hpmax, - mana, mdef, special: heroSpec = { num: [], last: [] } } = core.status.hero; - let { atk, def } = hero as HeroStatus; + let { atk, def, hpmax, mana } = hero as HeroStatus; let { hp: monHp, atk: monAtk, def: monDef, special, enemy } = info; let damage = 0; diff --git a/src/plugin/game/skill.ts b/src/plugin/game/skill.ts index 590a2b2..ace4975 100644 --- a/src/plugin/game/skill.ts +++ b/src/plugin/game/skill.ts @@ -40,7 +40,11 @@ export const jumpIgnoreFloor: FloorIds[] = [ 'MT59', 'MT60', 'MT61', - 'MT71' + 'MT71', + 'MT72', + 'MT73', + 'MT74', + 'MT75' ]; // 跳跃 export function jumpSkill() { diff --git a/src/plugin/game/ui.ts b/src/plugin/game/ui.ts index 3565bc8..e1a75bb 100644 --- a/src/plugin/game/ui.ts +++ b/src/plugin/game/ui.ts @@ -39,8 +39,6 @@ export function init() { if (!fixedUi.hasName('statusBar')) { fixedUi.open('statusBar'); } - core.dom.tools.hard.style.display = 'block'; - core.dom.toolBar.style.display = 'block'; }; control.prototype.hideStatusBar = function (showToolbox) { @@ -61,9 +59,6 @@ export function init() { for (var i = 0; i < toolItems.length; ++i) toolItems[i].style.display = 'none'; } - if (!core.domStyle.isVertical && !core.flags.extendToolbar) { - core.dom.toolBar.style.display = 'none'; - } }; } diff --git a/src/source/data.d.ts b/src/source/data.d.ts index 4b3a023..c31d280 100644 --- a/src/source/data.d.ts +++ b/src/source/data.d.ts @@ -81,6 +81,28 @@ type FloorIds = | 'MT68' | 'MT69' | 'MT71' + | 'MT72' + | 'MT73' + | 'MT74' + | 'MT75' + | 'MT76' + | 'MT77' + | 'MT78' + | 'MT79' + | 'MT80' + | 'MT81' + | 'MT82' + | 'MT83' + | 'MT84' + | 'MT85' + | 'MT86' + | 'MT87' + | 'MT88' + | 'MT89' + | 'MT90' + | 'MT91' + | 'MT92' + | 'MT93' type ImageIds = | 'IQ.png' @@ -187,8 +209,11 @@ type BgmIds = | 'beforeBoss.mp3' | 'cave.mp3' | 'escape.mp3' + | 'escape2.mp3' | 'grass.mp3' | 'mount.mp3' + | 'night.mp3' + | 'palaceCenter.mp3' | 'palaceNorth.mp3' | 'palaceSouth.mp3' | 'plot1.mp3' diff --git a/src/ui/danmakuEditor.vue b/src/ui/danmakuEditor.vue index b1a023f..92ff593 100644 --- a/src/ui/danmakuEditor.vue +++ b/src/ui/danmakuEditor.vue @@ -1,5 +1,5 @@