From 01c4ea4d317bf6f0898e62ec706eb63c507a73cb Mon Sep 17 00:00:00 2001 From: oc Date: Wed, 25 Apr 2018 15:26:44 +0800 Subject: [PATCH] setHeroIcon --- _server/blockly/MotaAction.g4 | 18 ++++++++++++++++++ _server/editor_blockly.js | 1 + libs/control.js | 34 +++++++++++++++++++++------------- libs/events.js | 15 ++++++++++++--- libs/maps.js | 2 +- libs/ui.js | 14 ++++++++------ project/data.js | 2 +- project/images/hero0.png | Bin 0 -> 7949 bytes project/items.js | 16 ++++++++-------- 更新说明.txt | 2 +- 10 files changed, 71 insertions(+), 33 deletions(-) create mode 100644 project/images/hero0.png diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index 033ed685..e3bdd92d 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -165,6 +165,7 @@ action | revisit_s | exit_s | setBlock_s + | setHero_s | update_s | sleep_s | battle_s @@ -415,6 +416,19 @@ var code = '{"type": "setBlock", "number":'+Int_0+floorstr+IdString_0+'},\n'; return code; */ +setHero_s + : '更改角色行走图' EvalString Newline + ; + +/* setHero_s +tooltip : setHero：更改角色行走图 +helpUrl : https://ckcz123.github.io/mota-js/#/event?id=setHero-%e6%9b%b4%e6%94%b9%e8%a7%92%e8%89%b2%e8%a1%8c%e8%b5%b0%e5%9b%be +colour : this.dataColor +default : ["hero.png"] +var code = '{"type": "setHero", "name": "'+EvalString_0+'"},\n'; +return code; +*/ + update_s : '更新状态栏和地图显伤' Newline ; @@ -1262,6 +1276,10 @@ ActionParser.prototype.parseAction = function() { this.next = MotaActionBlocks['setBlock_s'].xmlText([ data.number||0,data.loc[0]||'',data.loc[1]||'',data.floorId||'',this.next]); break; + case "setHero": // 改变勇士 + this.next = MotaActionBlocks['setHero_s'].xmlText([ + data.name,this.next]); + break; case "move": // 移动事件 data.loc=data.loc||[]; this.next = MotaActionBlocks['move_s'].xmlText([ diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index 0baf0f45..abfdf2e9 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -90,6 +90,7 @@ editor_blockly = function () { MotaActionBlocks['battle_s'].xmlText(), MotaActionBlocks['openDoor_s'].xmlText(), MotaActionBlocks['setBlock_s'].xmlText(), + MotaActionBlocks['setHero_s'].xmlText(), '', MotaActionBlocks['if_s'].xmlText(), MotaActionBlocks['revisit_s'].xmlText(), diff --git a/libs/control.js b/libs/control.js index f3a057b9..0ecaec87 100644 --- a/libs/control.js +++ b/libs/control.js @@ -357,7 +357,7 @@ control.prototype.setAutomaticRoute = function (destX, destY, stepPostfix) { core.clearMap('hero', 0, 0, 416, 416); core.setHeroLoc('x', destX); core.setHeroLoc('y', destY); - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); core.status.route.push("move:"+destX+":"+destY); } } @@ -594,9 +594,7 @@ control.prototype.setHeroMoveInterval = function (direction, x, y, callback) { core.setHeroLoc('y', y+scan[direction].y); core.moveOneStep(); core.clearMap('hero', 0, 0, 416, 416); - core.drawHero(direction, core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); - //if (core.status.heroStop) - // core.drawHero(direction, core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(direction); clearInterval(core.interval.heroMoveInterval); core.status.heroMoving = 0; if (core.isset(callback)) callback(); @@ -624,7 +622,7 @@ control.prototype.moveAction = function (callback) { core.status.automaticRoute.moveStepBeforeStop = []; if (canMove) // 非箭头：触发 core.trigger(x + scan[direction].x, y + scan[direction].y); - core.drawHero(direction, x, y, 'stop'); + core.drawHero(direction, x, y); if (core.status.automaticRoute.moveStepBeforeStop.length==0) { core.clearContinueAutomaticRoute(); @@ -652,7 +650,7 @@ control.prototype.moveAction = function (callback) { } } else if (core.status.heroStop) { - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); } if (core.status.event.id!='ski') core.status.route.push(direction); @@ -669,7 +667,7 @@ control.prototype.turnHero = function() { else if (core.status.hero.loc.direction == 'right') core.status.hero.loc.direction = 'down'; else if (core.status.hero.loc.direction == 'down') core.status.hero.loc.direction = 'left'; else if (core.status.hero.loc.direction == 'left') core.status.hero.loc.direction = 'up'; - core.drawHero(core.status.hero.loc.direction, core.status.hero.loc.x, core.status.hero.loc.y, 'stop', 0, 0); + core.drawHero(); core.canvas.ui.clearRect(0, 0, 416, 416); core.status.route.push("turn"); } @@ -742,7 +740,7 @@ control.prototype.eventMoveHero = function(steps, time, callback) { var x=core.getHeroLoc('x'), y=core.getHeroLoc('y'); if (moveSteps.length==0) { clearInterval(animate); - core.drawHero(core.getHeroLoc('direction'), x, y, 'stop'); + core.drawHero(null, x, y); core.status.replay.animate=false; if (core.isset(callback)) callback(); } @@ -792,7 +790,7 @@ control.prototype.waitHeroToStop = function(callback) { core.status.automaticRoute.moveDirectly = false; setTimeout(function(){ core.status.replay.animate=false; - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); callback(); }, 30); } @@ -808,10 +806,13 @@ control.prototype.drawHero = function (direction, x, y, status, offsetX, offsetY offsetX = offsetX || 0; offsetY = offsetY || 0; var dx=offsetX==0?0:offsetX/Math.abs(offsetX), dy=offsetY==0?0:offsetY/Math.abs(offsetY); + if (!core.isset(x)) x = core.getHeroLoc('x'); + if (!core.isset(y)) y = core.getHeroLoc('y'); core.clearAutomaticRouteNode(x+dx, y+dy); - var heroIcon = core.material.icons.hero[direction]; x = x * 32; y = y * 32; + status = status || 'stop'; + var heroIcon = core.material.icons.hero[direction || core.getHeroLoc('direction')]; core.canvas.hero.clearRect(x - 32, y - 32, 96, 96); var height=core.material.icons.hero.height; core.canvas.hero.drawImage(core.material.images.hero, heroIcon[status] * 32, heroIcon.loc * height, 32, height, x + offsetX, y + offsetY + 32-height, 32, height); @@ -869,7 +870,7 @@ control.prototype.updateCheckBlock = function() { for (var n=0;n12 || ny<0 || ny>12) continue; var id=core.status.checkBlock.map[13*nx+ny]; if (core.isset(id)) { - var enemy = core.enemys.getEnemys(id); + var enemy = core.material.enemys[id]; if (core.isset(enemy) && core.enemys.hasSpecial(enemy.special, 18)) { snipe.push({'direction': direction, 'x': nx, 'y': ny}); } @@ -1615,7 +1616,7 @@ control.prototype.replay = function () { core.clearMap('hero', 0, 0, 416, 416); core.setHeroLoc('x', x); core.setHeroLoc('y', y); - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); core.status.route.push("move:"+x+":"+y); core.replay(); return; @@ -1969,6 +1970,13 @@ control.prototype.loadData = function (data, callback) { } } + // load icons + var icon = core.getFlag("heroIcon", "hero.png"); + if (core.isset(core.material.images.images[icon])) { + core.material.images.hero.src = core.material.images.images[icon].src; + core.material.icons.hero.height = core.material.images.hero.height/4; + } + core.events.afterLoadData(data); core.changeFloor(data.floorId, null, data.hero.loc, 0, function() { diff --git a/libs/events.js b/libs/events.js index 77f37f19..3ac53e3f 100644 --- a/libs/events.js +++ b/libs/events.js @@ -366,7 +366,7 @@ events.prototype.doAction = function() { } if (floorId==core.status.floorId) { core.drawMap(floorId); - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); core.updateStatusBar(); } } @@ -419,7 +419,7 @@ events.prototype.doAction = function() { core.setHeroLoc('y', data.loc[1]); } if (core.isset(data.direction)) core.setHeroLoc('direction', data.direction); - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); this.doAction(); break; case "showImage": // 显示图片 @@ -569,6 +569,15 @@ events.prototype.doAction = function() { this.doAction(); } break; + case "setHero": + if (core.isset(core.material.images.images[data.name]) && core.material.images.images[data.name].width==128) { + core.setFlag("heroIcon", data.name); + core.material.images.hero.src = core.material.images.images[data.name].src; + core.material.icons.hero.height = core.material.images.hero.height/4; + core.drawHero(); + } + this.doAction(); + break; case "input": { var value; @@ -972,7 +981,7 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback core.setHeroLoc('direction', heroLoc.direction); core.setHeroLoc('x', heroLoc.x); core.setHeroLoc('y', heroLoc.y); - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); core.updateStatusBar(); var changed = function () { diff --git a/libs/maps.js b/libs/maps.js index 4b99a178..008f8676 100644 --- a/libs/maps.js +++ b/libs/maps.js @@ -893,7 +893,7 @@ maps.prototype.resetMap = function() { var floorId = core.status.floorId; core.status.maps[floorId] = this.loadFloor(floorId); this.drawMap(floorId, function() { - core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); + core.drawHero(); core.updateStatusBar(); }) } \ No newline at end of file diff --git a/libs/ui.js b/libs/ui.js index 89802697..4da0595c 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -1585,7 +1585,7 @@ ui.prototype.drawSLPanel = function(index) { core.fillText('ui', i==0?"自动存档":name+id, (2*i+1)*u, 35, '#FFFFFF', "bold 17px Verdana"); core.strokeRect('ui', (2*i+1)*u-size/2, 50, size, size, i==offset?strokeColor:'#FFFFFF', i==offset?6:2); if (core.isset(data) && core.isset(data.floorId)) { - this.drawThumbnail(data.floorId, 'ui', core.maps.load(data.maps, data.floorId).blocks, (2*i+1)*u-size/2, 50, size, data.hero.loc); + this.drawThumbnail(data.floorId, 'ui', core.maps.load(data.maps, data.floorId).blocks, (2*i+1)*u-size/2, 50, size, data.hero.loc, data.hero.flags.heroIcon||"hero.png"); core.fillText('ui', core.formatDate(new Date(data.time)), (2*i+1)*u, 65+size, '#FFFFFF', '10px Verdana'); } else { @@ -1597,7 +1597,7 @@ ui.prototype.drawSLPanel = function(index) { core.fillText('ui', name+id, (2*i-5)*u, 230, '#FFFFFF', "bold 17px Verdana"); core.strokeRect('ui', (2*i-5)*u-size/2, 245, size, size, i==offset?strokeColor:'#FFFFFF', i==offset?6:2); if (core.isset(data) && core.isset(data.floorId)) { - this.drawThumbnail(data.floorId, 'ui', core.maps.load(data.maps, data.floorId).blocks, (2*i-5)*u-size/2, 245, size, data.hero.loc); + this.drawThumbnail(data.floorId, 'ui', core.maps.load(data.maps, data.floorId).blocks, (2*i-5)*u-size/2, 245, size, data.hero.loc, data.hero.flags.heroIcon||"hero.png"); core.fillText('ui', core.formatDate(new Date(data.time)), (2*i-5)*u, 260+size, '#FFFFFF', '10px Verdana'); } else { @@ -1615,7 +1615,7 @@ ui.prototype.drawSLPanel = function(index) { } ////// 绘制一个缩略图 ////// -ui.prototype.drawThumbnail = function(floorId, canvas, blocks, x, y, size, heroLoc) { +ui.prototype.drawThumbnail = function(floorId, canvas, blocks, x, y, size, heroLoc, heroIcon) { core.clearMap(canvas, x, y, size, size); var groundId = core.floors[floorId].defaultGround || "ground"; var blockIcon = core.material.icons.terrains[groundId]; @@ -1664,10 +1664,12 @@ ui.prototype.drawThumbnail = function(floorId, canvas, blocks, x, y, size, heroL } if (core.isset(heroLoc)) { - var heroIcon = core.material.icons.hero[heroLoc.direction]; - var height = core.material.icons.hero.height; + if (!core.isset(core.material.images.images[heroIcon])) + heroIcon = "hero.png"; + var icon = core.material.icons.hero[heroLoc.direction]; + var height = core.material.images.images[heroIcon].height/4; var realHeight = persize*height/32; - core.canvas[canvas].drawImage(core.material.images.hero, heroIcon.stop * 32, heroIcon.loc * height, 32, height, x+persize*heroLoc.x, y+persize*heroLoc.y+persize-realHeight, persize, realHeight); + core.canvas[canvas].drawImage(core.material.images.images[heroIcon], icon.stop * 32, icon.loc * height, 32, height, x+persize*heroLoc.x, y+persize*heroLoc.y+persize-realHeight, persize, realHeight); } images.forEach(function (t) { diff --git a/project/data.js b/project/data.js index 1d14035d..e49f7fbc 100644 --- a/project/data.js +++ b/project/data.js @@ -5,7 +5,7 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "sample0", "sample1", "sample2", "MT0" ], "images" : [ - "bg.jpg" + "bg.jpg", "hero0.png" ], "animates" : [ "hand", "sword", "zone", diff --git a/project/images/hero0.png b/project/images/hero0.png new file mode 100644 index 0000000000000000000000000000000000000000..d3f439e263b1f9b9d46ce46cc3711d25ca8fc6d9 GIT binary patch literal 7949 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 AX#fBK literal 0 HcmV?d00001 diff --git a/project/items.js b/project/items.js index 6f7d33d1..3a7660ce 100644 --- a/project/items.js +++ b/project/items.js @@ -117,14 +117,14 @@ items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "useItemEffect": { "book": "core.ui.drawBook(0);", "fly": "core.ui.drawFly(core.status.hero.flyRange.indexOf(core.status.floorId));", - "earthquake": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", - "pickaxe": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", - "icePickaxe": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", - "snow": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", - "bigKey": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", - "bomb": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n core.events.afterUseBomb();\n});", - "hammer": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n core.events.afterUseBomb();\n});", - "centerFly": "core.clearMap('hero', 0, 0, 416, 416);\ncore.setHeroLoc('x', core.status.event.data.x);\ncore.setHeroLoc('y', core.status.event.data.y);\ncore.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');\ncore.drawTip(core.material.items[itemId].name + '使用成功');", + "earthquake": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero();\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", + "pickaxe": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero();\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", + "icePickaxe": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero(), 'stop');\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", + "snow": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero();\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", + "bigKey": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero();\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n});", + "bomb": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero();\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n core.events.afterUseBomb();\n});", + "hammer": "core.removeBlockByIds(core.status.floorId, core.status.event.data);\ncore.drawMap(core.status.floorId, function () {\n core.drawHero();\n core.updateFg();\n core.drawTip(core.material.items[itemId].name + '使用成功');\n core.events.afterUseBomb();\n});", + "centerFly": "core.clearMap('hero', 0, 0, 416, 416);\ncore.setHeroLoc('x', core.status.event.data.x);\ncore.setHeroLoc('y', core.status.event.data.y);\ncore.drawHero();\ncore.drawTip(core.material.items[itemId].name + '使用成功');", "upFly": "var loc = {'direction': core.status.hero.loc.direction, 'x': core.status.event.data.x, 'y': core.status.event.data.y};\ncore.changeFloor(core.status.event.data.id, null, loc, null, function (){\n core.drawTip(core.material.items[itemId].name + '使用成功');\n core.replay();\n});", "downFly": "var loc = {'direction': core.status.hero.loc.direction, 'x': core.status.event.data.x, 'y': core.status.event.data.y};\ncore.changeFloor(core.status.event.data.id, null, loc, null, function (){\n core.drawTip(core.material.items[itemId].name + '使用成功');\n core.replay();\n});", "poisonWine": "core.setFlag('poison', false);", diff --git a/更新说明.txt b/更新说明.txt index 8f043eab..f9f338f8 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,6 +1,6 @@ HTML5魔塔样板V2.1.1 -改变勇士行走图 +改变勇士行走图 √ 楼传器落点设置 √ 录像回放从任意存档点开始 录像过程中允许存档