From 3e13e0006c7e32d6fef34c9ca7ed878d443acbd4 Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Sun, 26 Feb 2023 22:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E7=94=BB=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/libs/control.js | 16 ++++--------- public/project/enemys.js | 2 +- public/project/floors/MT42.js | 14 ++++++++++++ public/project/floors/MT43.js | 43 +++++++++++++++++++++++------------ public/styles.css | 4 +++- 5 files changed, 51 insertions(+), 28 deletions(-) diff --git a/public/libs/control.js b/public/libs/control.js index 220c240..a97660c 100644 --- a/public/libs/control.js +++ b/public/libs/control.js @@ -4183,10 +4183,6 @@ control.prototype.resize = function () { }; control.prototype._resize_gameGroup = function (obj) { - var startBackground = core.domStyle.isVertical - ? main.styles.startVerticalBackground || main.styles.startBackground - : main.styles.startBackground; - var gameGroup = core.dom.gameGroup; var totalWidth, totalHeight; if (core.domStyle.isVertical) { @@ -4242,7 +4238,6 @@ control.prototype._resize_canvas = function (obj) { core.dom.gameDraw.style.height = innerHeight; core.dom.gameDraw.style.top = obj.statusBarHeightInVertical + 'px'; core.dom.gameDraw.style.right = 0; - core.dom.gameDraw.style.border = obj.border; core.dom.gameDraw.style.boxSizing = 'content-box'; // resize bigmap core.bigmap.canvas.forEach(function (cn) { @@ -4428,16 +4423,16 @@ control.prototype._resize_toolBar = function (obj) { toolBar.style.top = obj.statusBarHeightInVertical + obj.outerHeight + 'px'; toolBar.style.height = obj.toolbarHeightInVertical + 'px'; - toolBar.style.background = obj.globalAttribute.toolsBackground; + toolBar.style.background = 'none'; } else { if (obj.extendToolbar) { toolBar.style.left = ''; toolBar.style.right = 0; - toolBar.style.width = obj.outerWidth + 'px'; - toolBar.style.top = obj.outerHeight + 'px'; + toolBar.style.width = obj.outerWidth - 6 + 'px'; + toolBar.style.top = obj.outerHeight - 6 + 'px'; toolBar.style.height = obj.TOOLBAR_HEIGHT * core.domStyle.scale + obj.BORDER + 'px'; - toolBar.style.background = obj.globalAttribute.toolsBackground; + toolBar.style.background = 'none'; } else { toolBar.style.left = 0; toolBar.style.right = ''; @@ -4448,9 +4443,6 @@ control.prototype._resize_toolBar = function (obj) { toolBar.style.background = 'transparent'; } } - toolBar.style.borderLeft = obj.border; - toolBar.style.borderRight = toolBar.style.borderBottom = - core.domStyle.isVertical || obj.extendToolbar ? obj.border : ''; toolBar.style.fontSize = 16 * core.domStyle.scale + 'px'; if ( diff --git a/public/project/enemys.js b/public/project/enemys.js index 813e770..3834096 100644 --- a/public/project/enemys.js +++ b/public/project/enemys.js @@ -158,7 +158,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E607": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E608": {"name":"寒冰护卫","hp":25000,"atk":3500,"def":2250,"money":3,"exp":225,"point":0,"special":[]}, "E609": {"name":"具形雪人","hp":7500,"atk":2250,"def":1000,"money":2,"exp":90,"point":0,"special":[25],"melt":15}, - "E610": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E610": {"name":"高冷雪人","hp":10000,"atk":2750,"def":1500,"money":0,"exp":0,"point":0,"special":[25],"melt":25}, "E611": {"name":"具形雪人法师","hp":12500,"atk":2750,"def":1750,"money":2,"exp":175,"point":0,"special":[13,25],"melt":30}, "E612": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E613": {"name":"寒冰核心","hp":20000,"atk":3000,"def":1500,"money":3,"exp":150,"point":0,"special":[26],"iceCore":20}, diff --git a/public/project/floors/MT42.js b/public/project/floors/MT42.js index c1b32b3..679f599 100644 --- a/public/project/floors/MT42.js +++ b/public/project/floors/MT42.js @@ -31,6 +31,20 @@ main.floors.MT42= 5, 0 ] + }, + "0,7": { + "floorId": "MT43", + "loc": [ + 14, + 7 + ] + }, + "0,2": { + "floorId": "MT43", + "loc": [ + 14, + 2 + ] } }, "beforeBattle": {}, diff --git a/public/project/floors/MT43.js b/public/project/floors/MT43.js index f2bc3e4..60b7fda 100644 --- a/public/project/floors/MT43.js +++ b/public/project/floors/MT43.js @@ -17,7 +17,22 @@ main.floors.MT43= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "14,7": { + "floorId": "MT42", + "loc": [ + 0, + 7 + ] + }, + "14,2": { + "floorId": "MT42", + "loc": [ + 0, + 2 + ] + } + }, "beforeBattle": {}, "afterBattle": {}, "afterGetItem": {}, @@ -27,20 +42,20 @@ main.floors.MT43= "cannotMoveIn": {}, "map": [ [70031,70031,70031, 0, 0,70029,70029,70029,70029,70029,70029, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94], - [70031, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [70031, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,584,584], - [70031, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0,584,584,584,584,584, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94], - [70030, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,584], - [70030,584,584,584,584,584, 0, 0, 0, 0, 0, 0, 0, 0,584], + [ 0, 0, 0, 0, 0, 0,586,586,586, 0, 0, 0, 0, 0,604], + [ 0, 0,585,585,585, 0, 0, 0, 0, 0, 0,604,604, 0, 94], + [70031, 0,585, 0,585, 0, 0, 0, 0,588,588,588, 0, 0,604], + [70031, 0, 0, 0,610, 0, 0, 0, 0,588, 0, 0, 0,584,584], + [70031, 0,584,584,584,617, 0, 0, 0, 0, 0,588,588, 0, 0], + [ 0, 0, 0, 0,584, 0, 0, 0,584,584,584,584,584, 0, 0], + [ 0,586,586, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94], + [70030, 0, 0, 0,584, 0,602,584, 0, 0, 0, 0, 0, 0,584], + [70030,584,584,584,584,584, 0,584,584, 0, 0, 0, 0, 0,584], [70030, 0, 0, 0, 0, 0, 0, 0, 0, 0,584,584,584, 0,584], - [70030, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,584], - [584,584,584,584,584, 0, 0, 0, 0, 0,584,584,584,584,584], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + [70030, 0, 0, 0, 0, 0, 0,604,604, 0, 0, 0, 0, 0,584], + [584,584,584,584,584,584, 0, 0,604, 0,584,584,584,584,584], + [ 0, 0, 0, 0, 0,584, 0, 0,604, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,604,604, 0,604,604, 0, 0, 0, 0, 0] ], "bgmap": [ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70072,70073,70073,70073], diff --git a/public/styles.css b/public/styles.css index f8c7b0a..18f2e3c 100644 --- a/public/styles.css +++ b/public/styles.css @@ -314,13 +314,14 @@ span#hard { } #toolBar { position: absolute; - background: url(project/materials/ground.png) repeat; z-index: 210; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; display: none; padding: 3px; + border-top: 2px solid #ddd9; + margin-right: 3px; } #toolBar .tools { position: relative; @@ -379,6 +380,7 @@ p#name { background: #000000; overflow: hidden; z-index: 185; + margin: 3px; } #bg {