From dab6656720ec5c70cf355864d1c87802bf77820b Mon Sep 17 00:00:00 2001 From: oc Date: Thu, 28 Dec 2017 12:08:01 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E9=A2=86=E5=9F=9F=E3=80=81=E5=A4=B9?= =?UTF-8?q?=E5=87=BB=E6=9C=BA=E5=88=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/core.js | 208 ++++++++++++++++++++++--------------------------- libs/data.js | 8 +- libs/enemys.js | 5 +- 3 files changed, 101 insertions(+), 120 deletions(-) diff --git a/libs/core.js b/libs/core.js index fb84f7b0..dfc681f3 100644 --- a/libs/core.js +++ b/libs/core.js @@ -57,7 +57,7 @@ function core() { 'floorId': null, 'thisMap': null, 'maps': null, - 'checkBlock': [], // 显伤伤害 + 'checkBlock': {}, // 显伤伤害 // 勇士状态；自动寻路相关 'heroMoving': false, @@ -1098,8 +1098,8 @@ core.prototype.automaticRoute = function (destX, destY) { // 绕过可能的夹击点 // if (nextBlock.block.event.trigger == 'checkBlock') deepAdd=200; } - if (core.status.checkBlock[nid]>0) - deepAdd = core.status.checkBlock[nid]; + if (core.status.checkBlock.damage[nid]>0) + deepAdd = core.status.checkBlock.damage[nid]; if (nx == destX && ny == destY) { route[nid] = direction; @@ -1270,9 +1270,9 @@ core.prototype.setHeroMoveTriggerInterval = function () { core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); } core.trigger(core.getHeroLoc('x'), core.getHeroLoc('y')); - core.checkBlock(); clearInterval(core.interval.heroMoveInterval); core.status.heroMoving = false; + core.checkBlock(); }); } }, 50); @@ -1549,7 +1549,6 @@ core.prototype.afterBattle = function(id, x, y, callback) { hint += "，经验+" + core.material.enemys[id].experience; core.drawTip(hint); - core.updateCheckBlockMap(); // 打完怪物，触发事件 core.events.afterBattle(id,x,y,callback); @@ -1637,9 +1636,6 @@ core.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback) core.setHeroLoc('y', heroLoc.y); core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); core.updateStatusBar(); - // core.updateCheckBlockMap(); - // core.updateCheckBlock(); - // core.updateFg(); }, 15) }); }); @@ -2153,7 +2149,6 @@ core.prototype.addBlock = function(x,y,floodId) { // 本身是禁用事件，启用之 if (core.isset(block.enable) && !block.enable) { block.enable = true; - core.updateCheckBlockMap(); // 在本层，添加动画 if (floodId == core.status.floorId && core.isset(block.event)) { blockIcon = core.material.icons[block.event.cls][block.event.id]; @@ -2195,17 +2190,12 @@ core.prototype.removeBlockById = function (index, floorId) { if (!core.isset(event)) event = core.floors[floorId].changeFloor[x+","+y]; - var shouldUpdateBlockMap = blocks[index].event.cls == 'enemys'; // 不存在事件，直接删除 if (!core.isset(event)) { blocks.splice(index,1); - if (shouldUpdateBlockMap) - core.updateCheckBlockMap(); return; } blocks[index].enable = false; - if (shouldUpdateBlockMap) - core.updateCheckBlockMap(); } core.prototype.removeBlockByIds = function (floorId, ids) { @@ -2304,70 +2294,88 @@ core.prototype.drawBoxAnimate = function (background) { } } -core.prototype.updateCheckBlockMap = function() { - // 更新领域、夹击地图 - core.status.checkBlockMap = []; +// 更新领域、显伤 +core.prototype.updateCheckBlock = function() { + core.status.checkBlock = {}; + if (!core.isset(core.status.thisMap)) return; var blocks = core.status.thisMap.blocks; + + // Step1: 更新怪物地图 + core.status.checkBlock.map = []; // 记录怪物地图 for (var n=0;n12 || ny<0 || ny>12) continue; + if (!zoneSquare && Math.abs(dx)+Math.abs(dy)>range) continue; + core.status.checkBlock.damage[13*nx+ny]+=enemy.value; + } + } + } + // 存在阻击 + if (core.enemys.hasSpecial(enemy.special, 18)) { + } } } } -} -// 更新领域、显伤点 -core.prototype.updateCheckBlock = function() { - if (!core.isset(core.status.thisMap)) return; - if (!core.isset(core.status.checkBlockMap)) core.updateCheckBlockMap(); - core.status.checkBlock = []; + + // Step3: 更新夹击点坐标，并将夹击伤害加入到damage中 + core.status.checkBlock.betweenAttack = []; // 记录(x,y)点是否有夹击 for (var x=0;x<13;x++) { for (var y=0;y<13;y++) { - // 计算(x,y)点伤害 - var damage = 0; - if (!core.enemyExists(x,y)) { // 如果该点本身不存在怪物（打死怪物会调用更新） - - // 领域 - [[-1,0],[0,-1],[1,0],[0,1]].forEach(function (dir) { - var nx = x+dir[0], ny = y+dir[1]; - if (nx<0 || nx>12 || ny<0 || ny>12) return; - if (core.status.checkBlockMap[13*nx+ny]%1000000>0) { - damage += core.status.checkBlockMap[13*nx+ny] % 1000000; - } - }) - - var leftValue = core.status.hero.hp - damage; - if (leftValue>1) { - var has = false; - // 夹击 - if (x>0 && x<12) { - var id1=parseInt(core.status.checkBlockMap[13*(x-1)+y]/1000000), - id2=parseInt(core.status.checkBlockMap[13*(x+1)+y]/1000000); - if (id1>0 && id1==id2) - has = true; - } - if (y>0 && y<12) { - var id1=parseInt(core.status.checkBlockMap[13*x+y-1]/1000000), - id2=parseInt(core.status.checkBlockMap[13*x+y+1]/1000000); - if (id1>0 && id1==id2) - has = true; - } - if (has) { - damage += parseInt((leftValue+1) / 2); + var has=false; + if (x>0 && x<12) { + var id1=core.status.checkBlock.map[13*(x-1)+y], + id2=core.status.checkBlock.map[13*(x+1)+y]; + if (core.isset(id1) && core.isset(id2) && id1==id2) { + var enemy = core.enemys.getEnemys(id1); + if (core.enemys.hasSpecial(enemy.special, 16)) { + has = true; } } } - core.status.checkBlock[13*x+y] = damage; + if (y>0 && y<12) { + var id1=core.status.checkBlock.map[13*x+y-1], + id2=core.status.checkBlock.map[13*x+y+1]; + if (core.isset(id1) && core.isset(id2) && id1==id2) { + var enemy = core.enemys.getEnemys(id1); + if (core.enemys.hasSpecial(enemy.special, 16)) { + has = true; + } + } + } + // 存在夹击 + if (has) { + core.status.checkBlock.betweenAttack[13*x+y]=true; + var leftHp = core.status.hero.hp - core.status.checkBlock.damage[13*x+y]; + if (leftHp>1) + core.status.checkBlock.damage[13*x+y] += parseInt((leftHp+1)/2); + } } } } @@ -2375,13 +2383,22 @@ core.prototype.updateCheckBlock = function() { core.prototype.checkBlock = function () { // 检查领域、夹击事件 var x=core.getHeroLoc('x'), y=core.getHeroLoc('y'); - if (core.status.checkBlock[13*x+y]>0) { - core.status.hero.hp -= core.status.checkBlock[13*x+y]; - if (core.hasBetweenAttack(x,y)) { + var damage = core.status.checkBlock.damage[13*x+y]; + if (damage>0) { + core.status.hero.hp -= damage; + + // 检查阻击事件 + var snipe = []; + + if (core.status.checkBlock.betweenAttack[13*x+y]) { core.drawTip('受到夹击，生命变成一半'); } - else if (core.hasZone(x,y)) { - core.drawTip('受到领域伤害'+core.status.checkBlock[13*x+y]+'点'); + // 阻击 + else if (snipe.length>0) { + core.drawTip('受到阻击伤害'+damage+'点'); + } + else { + core.drawTip('受到领域伤害'+damage+'点'); } if (core.status.hero.hp<=0) { core.status.hero.hp=0; @@ -2393,37 +2410,6 @@ core.prototype.checkBlock = function () { } } -core.prototype.hasZone = function (x,y) { - if (!core.isset(core.status.checkBlockMap)) core.updateCheckBlockMap(); - var isZone = false; - // 领域 - [[-1,0],[0,-1],[1,0],[0,1]].forEach(function (dir) { - var nx = x+dir[0], ny = y+dir[1]; - if (nx<0 || nx>12 || ny<0 || ny>12) return; - if (core.status.checkBlockMap[13*nx+ny]%1000000>0) { - isZone = true; - } - }) - return isZone; -} - -core.prototype.hasBetweenAttack = function(x,y) { - if (!core.isset(core.status.checkBlockMap)) core.updateCheckBlockMap(); - // 夹击 - if (x>0 && x<12) { - var id1=parseInt(core.status.checkBlockMap[13*(x-1)+y]/1000000), - id2=parseInt(core.status.checkBlockMap[13*(x+1)+y]/1000000); - if (id1>0 && id1==id2) - return true; - } - if (y>0 && y<12) { - var id1=parseInt(core.status.checkBlockMap[13*x+y-1]/1000000), - id2=parseInt(core.status.checkBlockMap[13*x+y+1]/1000000); - if (id1>0 && id1==id2) - return true; - } -} - core.prototype.setFg = function(color, time, callback) { time = time || 750; @@ -2508,16 +2494,6 @@ core.prototype.nextY = function () { */ core.prototype.updateFg = function () { - /* - // 如果存在颜色 - if (core.isset(core.status.event.data) && core.isset(core.status.event.data.currentColor)) { - var color=core.status.event.data.currentColor; - core.setAlpha('fg', color[3]); - core.fillRect("fg",0,0,416,416,"#"+((1<<24)+(color[0]<<16)+(color[1]<<8)+color[2]).toString(16).slice(1)); - return; - } - */ - if (!core.isset(core.status.thisMap) || !core.isset(core.status.thisMap.blocks)) return; // 更新显伤 var mapBlocks = core.status.thisMap.blocks; @@ -2562,7 +2538,7 @@ core.prototype.updateFg = function () { core.canvas.fg.textAlign = 'center'; for (var x=0;x<13;x++) { for (var y=0;y<13;y++) { - var damage = core.status.checkBlock[13*x+y]; + var damage = core.status.checkBlock.damage[13*x+y]; if (damage>0) { core.setFillStyle('fg', '#000000'); core.canvas.fg.fillText(damage, 32 * x + 17, 32 * (y + 1) - 13); @@ -3348,14 +3324,17 @@ core.prototype.clearStatusBar = function() { */ core.prototype.updateStatusBar = function () { - // 检查登记 + // 检查等级 core.checkLvUp(); - // 上限999999 + // 检查HP上限 if (core.values.HPMAX>0) { core.setStatus('hp', Math.min(core.values.HPMAX, core.getStatus('hp'))); } + // 更新领域、阻击、显伤 + core.updateCheckBlock(); + var lvName = core.getLvName(); core.statusBar.lv.innerHTML = lvName; if (/^[+-]?\d+$/.test(lvName)) @@ -3393,7 +3372,6 @@ core.prototype.updateStatusBar = function () { } else { core.statusBar.image.fly.style.opacity = 0.3; } - core.updateCheckBlock(); core.updateFg(); } diff --git a/libs/data.js b/libs/data.js index d8ad6961..606db8a4 100644 --- a/libs/data.js +++ b/libs/data.js @@ -85,7 +85,7 @@ data.prototype.init = function() { "levelUp": [ // 经验升级所需要的数值，是一个数组 {}, // 第一项为初始等级，可以简单留空，也可以写name - // 每一个里面可以含有三个参数 name, need, effect + // 每一个里面可以含有三个参数 need, name, effect // need为所需要的经验数值，是一个正整数。请确保need所需的依次递增 // name为该等级的名称，也可以省略代表使用系统默认值；本项将显示在状态栏中 // effect为本次升级所执行的操作，可由若干项组成，由分号分开 @@ -139,8 +139,7 @@ data.prototype.init = function() { } // 系统FLAG，在游戏运行中中请不要修改它。 this.flags = { - /****** 角色状态相关 ******/ - "enableNegativeDamage": true, // 是否支持负伤害（回血） + /****** 状态栏相关 ******/ "enableFloor": false, // 是否在状态栏显示当前楼层 "enableLv": true, // 是否在状态栏显示当前等级 "enableMDef": true, // 是否在状态栏及战斗界面显示魔防（护盾） @@ -154,6 +153,9 @@ data.prototype.init = function() { "pickaxeFourDirections": true, // 使用破墙镐是否四个方向都破坏；如果false则只破坏面前的墙壁 "bombFourDirections": true, // 使用炸弹是否四个方向都会炸；如果false则只炸面前的怪物（即和圣锤等价） "bigKeyIsBox": false, // 如果此项为true，则视为钥匙盒，红黄蓝钥匙+1；若为false，则视为大黄门钥匙 + /****** 怪物相关 ******/ + "enableNegativeDamage": true, // 是否支持负伤害（回血） + "zoneSquare": false, // 领域类型。如果此项为true则为九宫格伤害，为false则为十字伤害 /****** 系统相关 ******/ "startDirectly": false, // 点击“开始游戏”后是否立刻开始游戏而不显示难度选择界面 "canOpenBattleAnimate": true, // 是否允许用户开启战斗过程；如果此项为false，则下面两项均强制视为false diff --git a/libs/enemys.js b/libs/enemys.js index f236d68d..fdffc71a 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -23,8 +23,8 @@ enemys.prototype.init = function () { 'slimeMan': {'name': '影子战士', 'hp': 100, 'atk': 0, 'def': 0, 'money': 11, 'experience': 0, 'special': 10}, // 模仿怪的攻防设为0就好 'bluePriest': {'name': '初级法师', 'hp': 100, 'atk': 120, 'def': 0, 'money': 3, 'experience': 0, 'special': 2}, 'redPriest': {'name': '高级法师', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, - 'brownWizard': {'name': '初级巫师', 'hp': 100, 'atk': 120, 'def': 0, 'money': 16, 'experience': 0, 'special': 15, 'value': 100}, // 领域怪需要加value表示领域伤害的数值 - 'redWizard': {'name': '高级巫师', 'hp': 1000, 'atk': 1200, 'def': 0, 'money': 160, 'experience': 0, 'special': 15, 'value': 200}, + 'brownWizard': {'name': '初级巫师', 'hp': 100, 'atk': 120, 'def': 0, 'money': 16, 'experience': 0, 'special': 15, 'value': 100, 'zoneSquare': true}, // 领域怪需要加value表示领域伤害的数值；zoneSquare代表是否九宫格伤害 + 'redWizard': {'name': '高级巫师', 'hp': 1000, 'atk': 1200, 'def': 0, 'money': 160, 'experience': 0, 'special': 15, 'value': 200, 'range': 2}, // range可选，代表领域伤害的范围；不加默认为1 'yellowGuard': {'name': '初级卫兵', 'hp': 100, 'atk': 120, 'def': 0, 'money': 10, 'experience': 0, 'special': 0}, 'blueGuard': {'name': '中级卫兵', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'redGuard': {'name': '高级卫兵', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, @@ -100,6 +100,7 @@ enemys.prototype.getSpecialText = function (enemyId) { if (this.hasSpecial(special, 15)) text.push("领域"); if (this.hasSpecial(special, 16)) text.push("夹击"); if (this.hasSpecial(special, 17)) text.push("仇恨"); + if (this.hasSpecial(special, 18)) text.push("阻击"); return text.join(" "); } From 8dcb6cb61ad3eb67f15cb301b417e0aaea02c517 Mon Sep 17 00:00:00 2001 From: oc Date: Thu, 28 Dec 2017 13:27:54 +0800 Subject: [PATCH 02/24] Update Snipe --- libs/core.js | 19 ++++++++++++++++++- libs/data.js | 2 +- libs/enemys.js | 2 +- libs/floors/sample0.js | 4 ++-- libs/floors/test.js | 26 +++++++++++++------------- 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/libs/core.js b/libs/core.js index dfc681f3..f10ea08a 100644 --- a/libs/core.js +++ b/libs/core.js @@ -2337,7 +2337,13 @@ core.prototype.updateCheckBlock = function() { } // 存在阻击 if (core.enemys.hasSpecial(enemy.special, 18)) { - + for (var dx=-1;dx<=1;dx++) { + for (var dy=-1;dy<=1;dy++) { + var nx=x+dx, ny=y+dy; + if (nx<0 || nx>12 || ny<0 || ny>12 || Math.abs(dx)+Math.abs(dy)>1) continue; + core.status.checkBlock.damage[13*nx+ny]+=enemy.value; + } + } } } } @@ -2389,6 +2395,17 @@ core.prototype.checkBlock = function () { // 检查阻击事件 var snipe = []; + var scan = { + 'up': {'x': 0, 'y': -1}, + 'left': {'x': -1, 'y': 0}, + 'down': {'x': 0, 'y': 1}, + 'right': {'x': 1, 'y': 0} + } + for (var direction in scan) { + var nx = x+scan[direction].x, ny=y+scan[direction].y; + if (nx<0 || nx>12 || ny<0 || ny>12) continue; + } + if (core.status.checkBlock.betweenAttack[13*x+y]) { core.drawTip('受到夹击，生命变成一半'); diff --git a/libs/data.js b/libs/data.js index 606db8a4..6c490d77 100644 --- a/libs/data.js +++ b/libs/data.js @@ -7,7 +7,7 @@ data.prototype.init = function() { "title": "魔塔样板", // 游戏名，将显示在标题页面以及切换楼层的界面中 "name": "template", // 游戏的唯一英文标识符。由英文、数字、下划线组成，不能超过20个字符。 "version": "Ver 1.0.0 (Beta)", // 当前游戏版本；版本不一致的存档不能通用。 - "floorId": "sample0", // 初始楼层ID + "floorId": "test", // 初始楼层ID "hero": { // 勇士初始数据 "name": "阳光", // 勇士名；可以改成喜欢的 'lv': 1, // 初始等级，该项必须为正整数 diff --git a/libs/enemys.js b/libs/enemys.js index fdffc71a..c08ae30e 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -41,7 +41,7 @@ enemys.prototype.init = function () { 'poisonSkeleton': {'name': '紫骷髅', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'poisonBat': {'name': '紫蝙蝠', 'hp': 100, 'atk': 120, 'def': 0, 'money': 14, 'experience': 0, 'special': 13}, 'steelRock': {'name': '铁面人', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, - 'skeletonPriest': {'name': '骷髅法师', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, + 'skeletonPriest': {'name': '骷髅法师', 'hp': 100, 'atk': 100, 'def': 0, 'money': 0, 'experience': 0, 'special': 18, 'value': 20}, 'skeletonKing': {'name': '骷髅王', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'skeletonWizard': {'name': '骷髅巫师', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'redSkeletonCaption': {'name': '骷髅武士', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'special': 0}, diff --git a/libs/floors/sample0.js b/libs/floors/sample0.js index a32e0d7d..761bc5ed 100644 --- a/libs/floors/sample0.js +++ b/libs/floors/sample0.js @@ -16,8 +16,8 @@ main.floors.sample0 = { [216, 247, 256, 235, 248, 6, 0, 3, 49, 50, 51, 52, 38], [6, 6, 125, 6, 6, 6, 0, 1, 45, 46, 47, 48, 37], [224, 254, 212, 232, 204, 5, 0, 1, 31, 32, 34, 33, 36], - [201, 205, 217, 215, 207, 5, 50, 1, 27, 28, 29, 30, 35], - [5, 5, 125, 5, 5, 5, 50, 1, 21, 22, 23, 24, 25], + [201, 205, 217, 215, 207, 5, 0, 1, 27, 28, 29, 30, 35], + [5, 5, 125, 5, 5, 5, 0, 1, 21, 22, 23, 24, 25], [0, 0, 0, 0, 0, 0, 45, 1, 1, 1, 121, 1, 1], [4, 4, 126, 4, 4, 4, 0, 0, 0, 0, 0, 85, 124], [87, 11, 12, 13, 14, 4, 4, 2, 2, 2, 122, 2, 2], diff --git a/libs/floors/test.js b/libs/floors/test.js index c125ab71..4a1fce20 100644 --- a/libs/floors/test.js +++ b/libs/floors/test.js @@ -9,19 +9,19 @@ main.floors.test = { "canUseQuickShop": true, // 该层是否允许使用快捷商店 "defaultGround": "ground", // 默认地面的图块ID（terrains中） "map": [ // 地图数据，需要是13x13，建议使用地图生成器来生成 - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201,201,201,201,201,201,201,201], - [201,201,201,201,201,201, 45,201,201,201,201,201,201], - [201,201,201,201,201,201, 0,201,201,201,201,201,201] + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,237, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "firstArrive": [ // 第一次到该楼层触发的事件 From c99997dca4bc6a2f0cb9efb2b372689ba07eb4a4 Mon Sep 17 00:00:00 2001 From: oc Date: Thu, 28 Dec 2017 19:16:31 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=98=BB=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/core.js | 145 ++++++++++++++++++++++++++++++++++++++++++-- libs/data.js | 2 +- libs/events.js | 18 +++++- libs/floors/test.js | 19 +++--- 更新说明.txt | 8 +-- 5 files changed, 171 insertions(+), 21 deletions(-) diff --git a/libs/core.js b/libs/core.js index f10ea08a..e91d0d08 100644 --- a/libs/core.js +++ b/libs/core.js @@ -886,7 +886,8 @@ core.prototype.onmousewheel = function (direct) { /////////// 寻路代码相关 /////////// core.prototype.clearAutomaticRouteNode = function (x, y) { - core.canvas.ui.clearRect(x * 32 + 5, y * 32 + 5, 27, 27); + if (core.status.event.id==null) + core.canvas.ui.clearRect(x * 32 + 5, y * 32 + 5, 27, 27); } core.prototype.stopAutomaticRoute = function () { @@ -2272,6 +2273,15 @@ core.prototype.setGlobalAnimate = function (speed) { }, speed / 2); } +core.prototype.syncGlobalAnimate = function () { + core.status.twoAnimateObjs.forEach(function (t) { + t.status=0; + }) + core.status.fourAnimateObjs.forEach(function (t) { + t.status=0; + }) +} + core.prototype.setBoxAnimate = function () { clearInterval(core.interval.boxAnimate); if (core.status.boxAnimateObjs.length > 0) { @@ -2328,6 +2338,7 @@ core.prototype.updateCheckBlock = function() { if (core.isset(enemy.zoneSquare)) zoneSquare=enemy.zoneSquare; for (var dx=-range;dx<=range;dx++) { for (var dy=-range;dy<=range;dy++) { + if (dx==0 && dy==0) continue; var nx=x+dx, ny=y+dy; if (nx<0 || nx>12 || ny<0 || ny>12) continue; if (!zoneSquare && Math.abs(dx)+Math.abs(dy)>range) continue; @@ -2339,6 +2350,7 @@ core.prototype.updateCheckBlock = function() { if (core.enemys.hasSpecial(enemy.special, 18)) { for (var dx=-1;dx<=1;dx++) { for (var dy=-1;dy<=1;dy++) { + if (dx==0 && dy==0) continue; var nx=x+dx, ny=y+dy; if (nx<0 || nx>12 || ny<0 || ny>12 || Math.abs(dx)+Math.abs(dy)>1) continue; core.status.checkBlock.damage[13*nx+ny]+=enemy.value; @@ -2404,9 +2416,15 @@ core.prototype.checkBlock = function () { for (var direction in scan) { var nx = x+scan[direction].x, ny=y+scan[direction].y; if (nx<0 || nx>12 || ny<0 || ny>12) continue; + var id=core.status.checkBlock.map[13*nx+ny]; + if (core.isset(id)) { + var enemy = core.enemys.getEnemys(id); + if (core.isset(enemy) && core.enemys.hasSpecial(enemy.special, 18)) { + snipe.push({'direction': direction, 'x': nx, 'y': ny}); + } + } } - if (core.status.checkBlock.betweenAttack[13*x+y]) { core.drawTip('受到夹击，生命变成一半'); } @@ -2423,10 +2441,122 @@ core.prototype.checkBlock = function () { core.events.lose('zone'); return; } + snipe = snipe.filter(function (t) { + var x=t.x, y=t.y, direction = t.direction; + var nx = x+scan[direction].x, ny=y+scan[direction].y; + + return nx>=0 && nx<=12 && ny>=0 && ny<=12 && core.getBlock(nx, ny, core.status.floorId, false)==null; + }); core.updateStatusBar(); + if (snipe.length>0) + core.snipe(snipe); } } +core.prototype.snipe = function (snipes) { + core.waitHeroToStop(function() { + core.lockControl(); + + var scan = { + 'up': {'x': 0, 'y': -1}, + 'left': {'x': -1, 'y': 0}, + 'down': {'x': 0, 'y': 1}, + 'right': {'x': 1, 'y': 0} + }; + + snipes.forEach(function (snipe) { + var x=snipe.x, y=snipe.y, direction = snipe.direction; + snipe.nx = x+scan[snipe.direction].x; + snipe.ny = y+scan[snipe.direction].y; + + core.removeGlobalAnimate(x, y); + + var block = core.getBlock(x,y).block; + + snipe.blockIcon = core.material.icons[block.event.cls][block.event.id]; + snipe.blockImage = core.material.images[block.event.cls]; + var damage = core.enemys.getDamage(block.event.id); + + var color = "#000000"; + if (damage <= 0) color = '#00FF00'; + else if (damage < core.status.hero.hp / 3) color = '#FFFFFF'; + else if (damage < core.status.hero.hp * 2 / 3) color = '#FFFF00'; + else if (damage < core.status.hero.hp) color = '#FF7F00'; + else color = '#FF0000'; + + if (damage >= 999999999) damage = "???"; + else if (damage > 100000) damage = (damage / 10000).toFixed(1) + "w"; + + snipe.damage = damage; + snipe.color = color; + snipe.block = core.clone(block); + }) + + var time = 500, step = 0; + + var animateValue = 2; + var animateCurrent = 0; + var animateTime = 0; + + core.canvas.fg.textAlign = 'left'; + + var animate=window.setInterval(function() { + + step++; + animateTime += time / 16; + if (animateTime >= core.values.animateSpeed * 2 / animateValue) { + animateCurrent++; + animateTime = 0; + if (animateCurrent>=animateValue) animateCurrent=0; + } + + snipes.forEach(function (snipe) { + var x=snipe.x, y=snipe.y, direction = snipe.direction; + + var nowX=32*x+scan[direction].x*2*step, nowY=32*y+scan[direction].y*2*step; + + // 清空上一次 + core.clearMap('event', nowX-2*scan[direction].x, nowY-2*scan[direction].y, 32, 32); + core.clearMap('fg', nowX-2*scan[direction].x, nowY-2*scan[direction].y, 32, 32); + + core.canvas.event.drawImage(snipe.blockImage, animateCurrent*32, snipe.blockIcon*32, 32, 32, nowX, nowY, 32, 32); + + if (core.hasItem('book')) { + // drawFG + core.setFillStyle('fg', '#000000'); + core.canvas.fg.fillText(snipe.damage, nowX + 2, nowY + 30); + core.canvas.fg.fillText(snipe.damage, nowX, nowY + 30); + core.canvas.fg.fillText(snipe.damage, nowX + 2, nowY + 32); + core.canvas.fg.fillText(snipe.damage, nowX, nowY + 32); + + core.setFillStyle('fg', snipe.color); + core.canvas.fg.fillText(snipe.damage, nowX + 1, nowY + 31); + } + + }) + + if (step==16) { // 移动完毕 + clearInterval(animate); + snipes.forEach(function (t) { + core.removeBlock(t.x, t.y); + var nBlock = core.clone(t.block); + nBlock.x = t.nx; nBlock.y = t.ny; + core.status.thisMap.blocks.push(nBlock); + core.addGlobalAnimate(animateValue, 32*t.nx, 32*t.ny, t.blockIcon, t.blockImage); + }); + core.syncGlobalAnimate(); + core.updateStatusBar(); + // 不存在自定义事件 + if (core.status.event.id==null) + core.unLockControl(); + } + }, time/16); + + + + }); +} + core.prototype.setFg = function(color, time, callback) { time = time || 750; @@ -3402,9 +3532,14 @@ core.prototype.checkLvUp = function () { core.status.hero.lv++; var effect = core.firstData.levelUp[core.status.hero.lv-1].effect; if (typeof effect == "string") { - effect.split(";").forEach(function (t) { - core.doEffect(t); - }); + if (effect.indexOf("function")==0) { + eval("("+effect+")()"); + } + else { + effect.split(";").forEach(function (t) { + core.doEffect(t); + }); + } } else if (effect instanceof Function) { effect(); diff --git a/libs/data.js b/libs/data.js index 6c490d77..adb77995 100644 --- a/libs/data.js +++ b/libs/data.js @@ -145,7 +145,7 @@ data.prototype.init = function() { "enableMDef": true, // 是否在状态栏及战斗界面显示魔防（护盾） "enableMoney": true, // 是否在状态栏、怪物手册及战斗界面显示金币 "enableExperience": true, // 是否在状态栏、怪物手册及战斗界面显示经验 - "enableLevelUp": false, // 是否允许等级提升（进阶）；如果上面enableExperience为false，则此项恒视为false + "enableLevelUp": true, // 是否允许等级提升（进阶）；如果上面enableExperience为false，则此项恒视为false "enableDebuff": true, // 是否涉及毒衰咒；如果此项为false则不会在状态栏中显示毒衰咒的debuff ////// 上述的几个开关将直接影响状态栏的显示效果 ////// /****** 道具相关 ******/ diff --git a/libs/events.js b/libs/events.js index 26d62ac6..051996a0 100644 --- a/libs/events.js +++ b/libs/events.js @@ -352,8 +352,14 @@ events.prototype.doAction = function() { core.events.lose(data.reason); break; case "function": - if (core.isset(data["function"])) - data["function"](); + var func = data["function"]; + if (core.isset(func)) { + if ((typeof func == "string") && func.indexOf("function")==0) { + eval('('+func+')()'); + } + else if (func instanceof Function) + func(); + } this.doAction(); break; case "update": @@ -528,6 +534,12 @@ events.prototype.afterBattle = function(enemyId,x,y,callback) { return; } + // 阻击：不处理任何事件 + if (core.enemys.hasSpecial(special, 18)) { + if (core.isset(callback)) callback(); + return; + } + // 检查处理后的事件。 var event = core.floors[core.status.floorId].afterBattle[x+","+y]; if (core.isset(event)) { @@ -536,8 +548,8 @@ events.prototype.afterBattle = function(enemyId,x,y,callback) { //继续行走 else { core.continueAutomaticRoute(); - if (core.isset(callback)) callback(); } + if (core.isset(callback)) callback(); } /****** 开完门 ******/ diff --git a/libs/floors/test.js b/libs/floors/test.js index 4a1fce20..d85b7a2b 100644 --- a/libs/floors/test.js +++ b/libs/floors/test.js @@ -12,14 +12,14 @@ main.floors.test = { [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 1, 0, 237, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 220, 246,0, 246, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 219, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0,237, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], @@ -27,7 +27,10 @@ main.floors.test = { ], "events": { // 该楼的所有可能事件列表 - + "6,4": [ + "test", + {"type": 'hide'} + ] }, "changeFloor": { // 楼层转换事件；该事件不能和上面的events有冲突（同位置点），否则会被覆盖 diff --git a/更新说明.txt b/更新说明.txt index 6e9cc527..cdc48c46 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,11 +1,11 @@ 全键盘操作 √ -进阶 √ +经验升级（进阶） √ +支持阻击 √ +九宫格领域、大范围领域 √ Ctrl快速跳过对话 √ 增加负伤 √ 支持不同层使用不同的地面素材 √ 支持多个Autotile同时存在 √ 直接内嵌了诸多默认的terrains素材 √ 自动定位到上次存/读档位置 √ -设置储存 √ -修改setFg的实现方法 √ -大范围领域伤害 \ No newline at end of file +修改setFg的实现方法 √ \ No newline at end of file From 5f7a03ec70ab4381947560d691d84d6b9e98ef07 Mon Sep 17 00:00:00 2001 From: oc Date: Thu, 28 Dec 2017 22:02:08 +0800 Subject: [PATCH 04/24] FloorMsgGroup --- libs/core.js | 4 ++-- libs/data.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/core.js b/libs/core.js index e91d0d08..b40b7d91 100644 --- a/libs/core.js +++ b/libs/core.js @@ -3735,8 +3735,8 @@ core.prototype.resize = function(clientWidth, clientHeight) { id: 'floorMsgGroup', rules:{ width: (canvasWidth - SPACE*2) + unit, - height:(canvasWidth - SPACE*2) + unit, - top: (canvasTop + SPACE) + unit, + height: (gameGroupHeight - SPACE*2) + unit, + top: SPACE + unit, right: SPACE + unit, } }, diff --git a/libs/data.js b/libs/data.js index adb77995..a454c296 100644 --- a/libs/data.js +++ b/libs/data.js @@ -7,7 +7,7 @@ data.prototype.init = function() { "title": "魔塔样板", // 游戏名，将显示在标题页面以及切换楼层的界面中 "name": "template", // 游戏的唯一英文标识符。由英文、数字、下划线组成，不能超过20个字符。 "version": "Ver 1.0.0 (Beta)", // 当前游戏版本；版本不一致的存档不能通用。 - "floorId": "test", // 初始楼层ID + "floorId": "sample0", // 初始楼层ID "hero": { // 勇士初始数据 "name": "阳光", // 勇士名；可以改成喜欢的 'lv': 1, // 初始等级，该项必须为正整数 From 95686a637cd705c301c39191f330196eec7c8129 Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 29 Dec 2017 12:28:59 +0800 Subject: [PATCH 05/24] Music --- index.html | 1 + libs/core.js | 320 ++++++++++++----- libs/data.js | 6 +- libs/events.js | 80 +++-- libs/floors/test.js | 48 --- libs/items.js | 3 + libs/thirdparty/mid.js | 701 +++++++++++++++++++++++++++++++++++++ libs/thirdparty/mid.min.js | 3 + libs/ui.js | 5 +- main.js | 27 +- sounds/058-Slow01.mid | Bin 0 -> 6183 bytes sounds/G2_koko.mid | Bin 0 -> 31666 bytes sounds/star.mid | Bin 0 -> 15102 bytes test.js | 0 14 files changed, 1016 insertions(+), 178 deletions(-) delete mode 100644 libs/floors/test.js create mode 100644 libs/thirdparty/mid.js create mode 100644 libs/thirdparty/mid.min.js create mode 100644 sounds/058-Slow01.mid create mode 100644 sounds/G2_koko.mid create mode 100644 sounds/star.mid create mode 100644 test.js diff --git a/index.html b/index.html index 44c759a0..ae063d97 100644 --- a/index.html +++ b/index.html @@ -113,5 +113,6 @@ 此浏览器不支持HTML5 + \ No newline at end of file diff --git a/libs/core.js b/libs/core.js index b40b7d91..d89d08cf 100644 --- a/libs/core.js +++ b/libs/core.js @@ -7,12 +7,14 @@ function core() { this.statusBar = {}; this.canvas = {}; this.images = []; - this.sounds = {}; + this.bgms = []; + this.sounds = []; this.floorIds = []; this.floors = {}; this.firstData = {}; this.material = { 'images': {}, + 'bgms': {}, 'sounds': {}, 'ground': null, 'items': {}, @@ -35,12 +37,12 @@ function core() { 'openDoorAnimate': null } this.musicStatus = { - 'isIOS': false, - 'loaded': false, - 'bgmStatus': false, - 'soundStatus': true, - 'playedSound': null, - 'playedBgm': null, + 'audioContext': null, // WebAudioContext + 'startDirectly': false, // 是否直接播放（加载）音乐 + 'bgmStatus': false, // 是否播放BGM + 'soundStatus': true, // 是否播放SE + 'playingBgm': null, // 正在播放的BGM + 'isPlaying': false, } // 样式 this.domStyle = { @@ -102,11 +104,12 @@ function core() { /////////// 系统事件相关 /////////// -core.prototype.init = function (dom, statusBar, canvas, images, sounds, floorIds, floors, coreData) { +core.prototype.init = function (dom, statusBar, canvas, images, bgms, sounds, floorIds, floors, coreData) { core.dom = dom; core.statusBar = statusBar; core.canvas = canvas; core.images = images; + core.bgms = bgms; core.sounds = sounds; core.floorIds = floorIds; core.floors = floors; @@ -134,16 +137,43 @@ core.prototype.init = function (dom, statusBar, canvas, images, sounds, floorIds core.material.icons = core.icons.getIcons(); core.material.events = core.events.getEvents(); - // test if iOS - core.musicStatus.soundStatus = core.getLocalStorage('soundStatus', true); - var userAgent = navigator.userAgent; - if (userAgent.indexOf('iPhone') > -1 || userAgent.indexOf('iPad') > -1) { - console.log("你的设备为iphone，不自动播放音乐！"); - core.musicStatus.isIOS = true; - core.musicStatus.soundStatus = false; + + if (location.protocol.indexOf("http")==0) { + window.AudioContext = window.AudioContext || window.webkitAudioContext || window.mozAudioContext || window.msAudioContext; + try { + core.musicStatus.audioContext = new window.AudioContext(); + } catch (e) { + console.log("该浏览器不支持AudioContext"); + core.musicStatus.audioContext = null; + } } + // 音效设置部分 + var isPC = true; + ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"].forEach(function (t) { + if (navigator.userAgent.indexOf(t)>=0) isPC=false; + }); + if (isPC) { + // 如果是PC端直接加载 + core.musicStatus.startDirectly = true; + } + else { + var connection = navigator.connection; + if (core.isset(connection) && connection.type=='wifi') + core.musicStatus.startDirectly = true; + } + + // 先从存储中读取BGM状态 + core.musicStatus.bgmStatus = core.getLocalStorage('bgmStatus', true); + if (!core.musicStatus.startDirectly) // 如果当前网络环境不允许 + core.musicStatus.bgmStatus = false; + core.setLocalStorage('bgmStatus', core.musicStatus.bgmStatus); + + core.musicStatus.soundStatus = core.getLocalStorage('soundStatus', true); + core.setLocalStorage('soundStatus', core.musicStatus.soundStatus); + + // switchs core.flags.battleAnimate = core.getLocalStorage('battleAnimate', core.flags.battleAnimate); core.flags.displayEnemyDamage = core.getLocalStorage('enemyDamage', core.flags.displayEnemyDamage); @@ -232,7 +262,7 @@ core.prototype.loader = function (callback) { core.material.images.autotile[autotileId]=image; if (Object.keys(core.material.images.autotile).length==autotileIds.length) { // 音频 - core.loadSounds(callback); + core.loadMusic(callback); } }) } @@ -259,65 +289,112 @@ core.prototype.loadImage = function (imgName, callback) { } } -core.prototype.loadSounds = function (callback) { - for (var key in core.sounds) { - for (var i = 0; i < core.sounds[key].length; i++) { - var soundName=core.sounds[key][i]; - soundName = soundName.split('-'); - var sound = new Audio(); - sound.preload = 'none'; - sound.src = 'sounds/' + soundName[0] + '.' + key; - if (soundName[1] == 'loop') { - sound.loop = 'loop'; +core.prototype.loadMusic = function (callback) { + + core.bgms.forEach(function (t) { + + // 判断是不是mid + if (/^.*\.mid$/.test(t)) { + + if (core.musicStatus.audioContext!=null) { + core.material.bgms[t] = 'loading'; + var xhr = new XMLHttpRequest(); + xhr.open('GET', 'sounds/'+t, true); + xhr.overrideMimeType("text/plain; charset=x-user-defined"); + xhr.onload = function(e) { //下载完成 + try { + var ff = []; + var mx = this.responseText.length; + for (var z = 0; z < mx; z++) + ff[z] = String.fromCharCode(this.responseText.charCodeAt(z) & 255); + var shouldStart = core.material.bgms[t] == 'starting'; + core.material.bgms[t] = AudioPlayer(core.musicStatus.audioContext, Replayer(MidiFile(ff.join("")), Synth(44100)), true); + + if (shouldStart) + core.playBgm(t); + } + catch (ee) { + console.log(ee); + core.material.bgms[t] = null; + } + + }; + xhr.ontimeout = function(e) { + console.log(e); + core.material.bgms[t] = null; + } + xhr.onerror = function(e) { + console.log(e); + core.material.bgms[t] = null; + } + xhr.send(); + } + else { + core.material.bgms[t] = null; } - - if (!core.isset(core.material.sounds[key])) - core.material.sounds[key] = {}; - core.material.sounds[key][soundName[0]] = sound; } - } + else { + var music = new Audio(); + if (!core.musicStatus.startDirectly) + music.preload = 'none'; // 默认不加载 + music.src = 'sounds/'+t; + music.loop = 'loop'; + core.material.bgms[t] = music; + } + }); + + core.sounds.forEach(function (t) { + + if (core.musicStatus.audioContext != null) { + var xhr = new XMLHttpRequest(); + xhr.open('GET', 'sounds/'+t, true); + xhr.responseType = 'arraybuffer'; + xhr.onload = function(e) { //下载完成 + try { + core.musicStatus.audioContext.decodeAudioData(this.response, function (buffer) { + core.material.sounds[t] = buffer; + }, function (e) { + console.log(e); + core.material.sounds[t] = null; + }) + } + catch (ee) { + console.log(ee); + core.material.sounds[t] = null; + } + }; + + xhr.ontimeout = function(e) { + console.log(e); + core.material.sounds[t] = null; + } + xhr.onerror = function(e) { + console.log(e); + core.material.sounds[t] = null; + } + xhr.send(); + } + else { + var music = new Audio(); + music.src = 'sounds/'+t; + core.material.sounds[t] = music; + } + + }); + + // 直接开始播放 + if (core.musicStatus.startDirectly && core.bgms.length>0) + core.playBgm(core.bgms[0]); + callback(); } -core.prototype.loadSound = function() { - if (!core.isset(core.material.sounds.mp3)) return; - if (core.musicStatus.isIOS) return; - if (core.musicStatus.loaded) return; - core.musicStatus.loaded=true; - console.log("加载音乐"); - - var toLoadList = []; - - for (var key in core.material.sounds) { - for (var name in core.material.sounds[key]) { - toLoadList.push(core.material.sounds[key][name]); - } - } - core.loadSoundItem(toLoadList); -} - -core.prototype.loadSoundItem = function (toLoadList) { - if (toLoadList.length==0) { - if (core.musicStatus.bgmStatus>0) return; - core.musicStatus.bgmStatus=1; - if (core.musicStatus.soundStatus) - core.playBgm('bgm', 'mp3'); - return; - } - var item = toLoadList.shift(); - item.oncanplay = function() { - core.loadSoundItem(toLoadList); - } - item.load(); -} - core.prototype.isPlaying = function() { if (core.isset(core.status.played) && core.status.played) return true; return false; } - core.prototype.clearStatus = function() { // 停止各个Timeout和Interval for (var i in core.interval) { @@ -1472,7 +1549,7 @@ core.prototype.openDoor = function (id, x, y, needKey, callback) { } } // open - core.playSound("door", "ogg"); + core.playSound("door.ogg"); var state = 0; var doorId = id; if (!(doorId.substring(doorId.length-4)=="Door")) { @@ -1518,7 +1595,7 @@ core.prototype.battle = function (id, x, y, force, callback) { }); } else { - core.playSound('attack', 'ogg'); + core.playSound('attack.ogg'); core.afterBattle(id, x, y, callback); } } @@ -1613,7 +1690,7 @@ core.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback) } window.setTimeout(function () { - core.playSound('floor', 'mp3'); + core.playSound('floor.mp3'); core.mapChangeAnimate('show', time/2, function () { // 根据文字判断是否斜体 @@ -2770,7 +2847,7 @@ core.prototype.getNextItem = function() { core.prototype.getItem = function (itemId, itemNum, itemX, itemY, callback) { // core.getItemAnimate(itemId, itemNum, itemX, itemY); - core.playSound('item', 'ogg'); + core.playSound('item.ogg'); var itemCls = core.material.items[itemId].cls; core.items.getItemEffect(itemId, itemNum); core.removeBlock(itemX, itemY); @@ -3375,23 +3452,106 @@ core.prototype.isset = function (val) { return true } -core.prototype.playSound = function (soundName, soundType) { - if (!core.musicStatus.soundStatus || !core.musicStatus.loaded) { +core.prototype.playBgm = function (bgm) { + + // 如果不允许播放 + if (!core.musicStatus.bgmStatus) return; + // 音频不存在 + if (!core.isset(core.material.bgms[bgm])) return; + + // 延迟播放 + if (core.material.bgms[bgm] == 'loading') { + core.material.bgms[bgm] = 'starting'; return; } - if (!core.isset(core.material.sounds[soundType][soundName])) return; - core.musicStatus.playedSound = core.material.sounds[soundType][soundName]; - core.musicStatus.playedSound.play(); + + try { + // 如果当前正在播放，且和本BGM相同，直接忽略 + if (core.musicStatus.playingBgm == bgm && core.musicStatus.isPlaying) { + return; + } + // 如果正在播放中，暂停 + if (core.isset(core.musicStatus.playingBgm) && core.musicStatus.isPlaying) { + core.material.bgms[core.musicStatus.playingBgm].pause(); + } + // 播放当前BGM + core.musicStatus.playingBgm = bgm; + core.material.bgms[bgm].play(); + core.musicStatus.isPlaying = true; + + } + catch (e) { + console.log("无法播放BGM "+bgm); + console.log(e); + core.musicStatus.playingBgm = null; + } } -core.prototype.playBgm = function (bgmName, bgmType) { - if (core.musicStatus.isIOS || !core.musicStatus.loaded) return; - if (core.isset(core.musicStatus.playedBgm)) { - core.musicStatus.playedBgm.pause(); +core.prototype.pauseBgm = function () { + // 直接暂停播放 + try { + if (core.isset(core.musicStatus.playingBgm)) { + core.material.bgms[core.musicStatus.playingBgm].pause(); + } + core.musicStatus.isPlaying = false; + } + catch (e) { + console.log("无法暂停BGM "+bgm); + console.log(e); + } +} + +core.prototype.resumeBgm = function () { + // 恢复BGM + try { + if (core.isset(core.musicStatus.playingBgm)) { + core.material.bgms[core.musicStatus.playingBgm].play(); + core.musicStatus.isPlaying = true; + } + else { + if (core.bgms.length>0) { + core.playBgm(core.bgms[0]); + core.musicStatus.isPlaying = true; + } + } + } + catch (e) { + console.log("无法恢复BGM "+bgm); + console.log(e); + } +} + +core.prototype.playSound = function (sound) { + + // 如果不允许播放 + if (!core.musicStatus.soundStatus) return; + // 音频不存在 + if (!core.isset(core.material.sounds[sound])) return; + + try { + if (core.musicStatus.audioContext != null) { + var source = core.musicStatus.audioContext.createBufferSource(); + source.buffer = core.material.sounds[sound]; + source.connect(core.musicStatus.audioContext.destination); + try { + source.start(0); + } + catch (e) { + try { + source.noteOn(0); + } + catch (ee) { + } + } + } + else { + core.material.sounds[sound].play(); + } + } + catch (eee) { + console.log("无法播放SE "+bgm); + console.log(eee); } - core.musicStatus.playedBgm = core.material.sounds[bgmType][bgmName]; - if (core.musicStatus.soundStatus) - core.musicStatus.playedBgm.play(); } core.prototype.changeSoundStatus = function () { diff --git a/libs/data.js b/libs/data.js index a454c296..870ffb38 100644 --- a/libs/data.js +++ b/libs/data.js @@ -140,12 +140,12 @@ data.prototype.init = function() { // 系统FLAG，在游戏运行中中请不要修改它。 this.flags = { /****** 状态栏相关 ******/ - "enableFloor": false, // 是否在状态栏显示当前楼层 - "enableLv": true, // 是否在状态栏显示当前等级 + "enableFloor": true, // 是否在状态栏显示当前楼层 + "enableLv": false, // 是否在状态栏显示当前等级 "enableMDef": true, // 是否在状态栏及战斗界面显示魔防（护盾） "enableMoney": true, // 是否在状态栏、怪物手册及战斗界面显示金币 "enableExperience": true, // 是否在状态栏、怪物手册及战斗界面显示经验 - "enableLevelUp": true, // 是否允许等级提升（进阶）；如果上面enableExperience为false，则此项恒视为false + "enableLevelUp": false, // 是否允许等级提升（进阶）；如果上面enableExperience为false，则此项恒视为false "enableDebuff": true, // 是否涉及毒衰咒；如果此项为false则不会在状态栏中显示毒衰咒的debuff ////// 上述的几个开关将直接影响状态栏的显示效果 ////// /****** 道具相关 ******/ diff --git a/libs/events.js b/libs/events.js index 051996a0..7d8f955f 100644 --- a/libs/events.js +++ b/libs/events.js @@ -133,6 +133,17 @@ events.prototype.afterChangeFloor = function (floorId) { this.doEvents(core.floors[floorId].firstArrive); core.setFlag("visited_"+floorId, true); } + + // 播放BGM + if (floorId == 'sample0') { + core.playBgm('bgm.mp3'); + } + if (floorId == 'sample1') { + core.playBgm('star.mid'); + } + if (floorId == 'sample2') { + core.playBgm('058-G2_koko.mid'); + } } ////// 实际事件的处理 ////// @@ -285,11 +296,6 @@ events.prototype.doAction = function() { block = block.block; if (core.isset(block.event) && block.event.trigger=='action') { // 触发 - /* - core.status.event = {'id': 'action', 'data': { - 'list': core.clone(block.event.data), 'x': block.x, 'y': block.y, 'callback': core.status.event.data.callback - }} - */ core.status.event.data.list = core.clone(block.event.data); core.status.event.data.x=block.x; core.status.event.data.y=block.y; @@ -298,11 +304,21 @@ events.prototype.doAction = function() { this.doAction(); break; case "playSound": - var name=data.name.split("."); - if (name.length==2) - core.playSound(name[0],name[1]); + core.playSound(data.name); this.doAction(); break; + case "playBgm": + core.playBgm(data.name); + this.doAction(); + break + case "pauseBgm": + core.pauseBgm(); + this.doAction(); + break + case "resumeBgm": + core.resumeBgm(); + this.doAction(); + break case "setValue": try { var value=core.calValue(data.value); @@ -623,6 +639,12 @@ events.prototype.changeLight = function(x, y) { // 改变灯后的事件 events.prototype.afterChangeLight = function(x,y) { +} + +// 使用炸弹/圣锤后的事件 +events.prototype.afterUseBomb = function () { + + } // 存档事件前一刻的处理 @@ -651,6 +673,13 @@ events.prototype.keyDownCtrl = function () { } } +events.prototype.clickConfirmBox = function (x,y) { + if ((x == 4 || x == 5) && y == 7 && core.isset(core.status.event.data.yes)) + core.status.event.data.yes(); + if ((x == 7 || x == 8) && y == 7 && core.isset(core.status.event.data.no)) + core.status.event.data.no(); +} + events.prototype.keyUpConfirmBox = function (keycode) { if (keycode==37) { core.status.event.selection=0; @@ -673,12 +702,6 @@ events.prototype.keyUpConfirmBox = function (keycode) { } } } -events.prototype.clickConfirmBox = function (x,y) { - if ((x == 4 || x == 5) && y == 7 && core.isset(core.status.event.data.yes)) - core.status.event.data.yes(); - if ((x == 7 || x == 8) && y == 7 && core.isset(core.status.event.data.no)) - core.status.event.data.no(); -} // 正在处理事件时的点击操作... events.prototype.clickAction = function (x,y) { @@ -769,7 +792,6 @@ events.prototype.keyUpBook = function (keycode) { } } -// 飞行器 events.prototype.clickFly = function(x,y) { if ((x==10 || x==11) && y==9) core.ui.drawFly(core.status.event.data-1); if ((x==10 || x==11) && y==5) core.ui.drawFly(core.status.event.data+1); @@ -1115,21 +1137,27 @@ events.prototype.keyUpSL = function (keycode) { events.prototype.clickSwitchs = function (x,y) { if (x<5 || x>7) return; var choices = [ - "背景音乐", "战斗动画", "怪物显伤", "领域显伤", "返回主菜单" + "背景音乐", "背景音效", "战斗动画", "怪物显伤", "领域显伤", "返回主菜单" ]; var topIndex = 6 - parseInt((choices.length - 1) / 2); if (y>=topIndex && y> 4; + event.channel = eventTypeByte & 0x0f; + event.type = 'channel'; + switch (eventType) { + case 0x08: + event.subtype = 'noteOff'; + event.noteNumber = param1; + event.velocity = stream.readInt8(); + return event; + case 0x09: + event.noteNumber = param1; + event.velocity = stream.readInt8(); + if (event.velocity == 0) { + event.subtype = 'noteOff'; + } else { + event.subtype = 'noteOn'; + } + return event; + case 0x0a: + event.subtype = 'noteAftertouch'; + event.noteNumber = param1; + event.amount = stream.readInt8(); + return event; + case 0x0b: + event.subtype = 'controller'; + event.controllerType = param1; + event.value = stream.readInt8(); + return event; + case 0x0c: + event.subtype = 'programChange'; + event.programNumber = param1; + return event; + case 0x0d: + event.subtype = 'channelAftertouch'; + event.amount = param1; + return event; + case 0x0e: + event.subtype = 'pitchBend'; + event.value = param1 + (stream.readInt8() << 7); + return event; + default: + throw "Unrecognised MIDI event type: " + eventType + } + } + } + + stream = Stream(data); + var headerChunk = readChunk(stream); + if (headerChunk.id != 'MThd' || headerChunk.length != 6) { + throw "Bad .mid file - header not found"; + } + var headerStream = Stream(headerChunk.data); + var formatType = headerStream.readInt16(); + var trackCount = headerStream.readInt16(); + var timeDivision = headerStream.readInt16(); + + if (timeDivision & 0x8000) { + throw "Expressing time division in SMTPE frames is not supported yet" + } else { + ticksPerBeat = timeDivision; + } + + var header = { + 'formatType': formatType, + 'trackCount': trackCount, + 'ticksPerBeat': ticksPerBeat + } + var tracks = []; + for (var i = 0; i < header.trackCount; i++) { + tracks[i] = []; + var trackChunk = readChunk(stream); + if (trackChunk.id != 'MTrk') { + throw "Unexpected chunk - expected MTrk, got "+ trackChunk.id; + } + var trackStream = Stream(trackChunk.data); + while (!trackStream.eof()) { + var event = readEvent(trackStream); + tracks[i].push(event); + //console.log(event); + } + } + + return { + 'header': header, + 'tracks': tracks + } +} +function Replayer(midiFile, synth) { + var trackStates = []; + var beatsPerMinute = 120; + var ticksPerBeat = midiFile.header.ticksPerBeat; + var channelCount = 16; + var channels = []; + var nextEventInfo; + var samplesToNextEvent; + + function Channel() { + + var generatorsByNote = {}; + var currentProgram = PianoProgram; + + function noteOn(note, velocity) { + if (generatorsByNote[note] && !generatorsByNote[note].released) { + /* playing same note before releasing the last one. BOO */ + generatorsByNote[note].noteOff(); /* TODO: check whether we ought to be passing a velocity in */ + } + generator = currentProgram.createNote(note, velocity); + synth.addGenerator(generator); + generatorsByNote[note] = generator; + } + function noteOff(note, velocity) { + if (generatorsByNote[note] && !generatorsByNote[note].released) { + generatorsByNote[note].noteOff(velocity); + } + } + function setProgram(programNumber) { + currentProgram = PROGRAMS[programNumber] || PianoProgram; + } + + return { + 'noteOn': noteOn, + 'noteOff': noteOff, + 'setProgram': setProgram + } + } + + function getNextEvent() { + var ticksToNextEvent = null; + var nextEventTrack = null; + var nextEventIndex = null; + + for (var i = 0; i < trackStates.length; i++) { + if ( + trackStates[i].ticksToNextEvent != null + && (ticksToNextEvent == null || trackStates[i].ticksToNextEvent < ticksToNextEvent) + ) { + ticksToNextEvent = trackStates[i].ticksToNextEvent; + nextEventTrack = i; + nextEventIndex = trackStates[i].nextEventIndex; + } + } + if (nextEventTrack != null) { + /* consume event from that track */ + var nextEvent = midiFile.tracks[nextEventTrack][nextEventIndex]; + if (midiFile.tracks[nextEventTrack][nextEventIndex + 1]) { + trackStates[nextEventTrack].ticksToNextEvent += midiFile.tracks[nextEventTrack][nextEventIndex + 1].deltaTime; + } else { + trackStates[nextEventTrack].ticksToNextEvent = null; + } + trackStates[nextEventTrack].nextEventIndex += 1; + /* advance timings on all tracks by ticksToNextEvent */ + for (var i = 0; i < trackStates.length; i++) { + if (trackStates[i].ticksToNextEvent != null) { + trackStates[i].ticksToNextEvent -= ticksToNextEvent + } + } + nextEventInfo = { + 'ticksToEvent': ticksToNextEvent, + 'event': nextEvent, + 'track': nextEventTrack + } + var beatsToNextEvent = ticksToNextEvent / ticksPerBeat; + var secondsToNextEvent = beatsToNextEvent / (beatsPerMinute / 60); + samplesToNextEvent += secondsToNextEvent * synth.sampleRate; + } else { + nextEventInfo = null; + samplesToNextEvent = null; + self.finished = true; + } + } + + function generate(samples) { + var data = new Array(samples*2); + var samplesRemaining = samples; + var dataOffset = 0; + + while (true) { + if (samplesToNextEvent != null && samplesToNextEvent <= samplesRemaining) { + /* generate samplesToNextEvent samples, process event and repeat */ + var samplesToGenerate = Math.ceil(samplesToNextEvent); + if (samplesToGenerate > 0) { + synth.generateIntoBuffer(samplesToGenerate, data, dataOffset); + dataOffset += samplesToGenerate * 2; + samplesRemaining -= samplesToGenerate; + samplesToNextEvent -= samplesToGenerate; + } + + handleEvent(); + getNextEvent(); + } else { + /* generate samples to end of buffer */ + if (samplesRemaining > 0) { + synth.generateIntoBuffer(samplesRemaining, data, dataOffset); + samplesToNextEvent -= samplesRemaining; + } + break; + } + } + return data; + } + + function handleEvent() { + var event = nextEventInfo.event; + switch (event.type) { + case 'meta': + switch (event.subtype) { + case 'setTempo': + beatsPerMinute = 60000000 / event.microsecondsPerBeat + } + break; + case 'channel': + switch (event.subtype) { + case 'noteOn': + channels[event.channel].noteOn(event.noteNumber, event.velocity); + break; + case 'noteOff': + channels[event.channel].noteOff(event.noteNumber, event.velocity); + break; + case 'programChange': + //console.log('program change to ' + event.programNumber); + channels[event.channel].setProgram(event.programNumber); + break; + } + break; + } + } + + function reset() { + for (var i = 0; i < midiFile.tracks.length; i++) { + trackStates[i] = { + 'nextEventIndex': 0, + 'ticksToNextEvent': ( + midiFile.tracks[i].length ? + midiFile.tracks[i][0].deltaTime : + null + ) + }; + } + for (var i = 0; i < channelCount; i++) { + channels[i] = Channel(); + } + samplesToNextEvent = 0; + getNextEvent(); + } + + reset(); + + var self = { + 'reset': reset, + 'generate': generate, + 'finished': false + } + return self; +} +/* Wrapper for accessing strings through sequential reads */ +function Stream(str) { + var position = 0; + + function read(length) { + var result = str.substr(position, length); + position += length; + return result; + } + + /* read a big-endian 32-bit integer */ + function readInt32() { + var result = ( + (str.charCodeAt(position) << 24) + + (str.charCodeAt(position + 1) << 16) + + (str.charCodeAt(position + 2) << 8) + + str.charCodeAt(position + 3)); + position += 4; + return result; + } + + /* read a big-endian 16-bit integer */ + function readInt16() { + var result = ( + (str.charCodeAt(position) << 8) + + str.charCodeAt(position + 1)); + position += 2; + return result; + } + + /* read an 8-bit integer */ + function readInt8(signed) { + var result = str.charCodeAt(position); + if (signed && result > 127) result -= 256; + position += 1; + return result; + } + + function eof() { + return position >= str.length; + } + + /* read a MIDI-style variable-length integer + (big-endian value in groups of 7 bits, + with top bit set to signify that another byte follows) + */ + function readVarInt() { + var result = 0; + while (true) { + var b = readInt8(); + if (b & 0x80) { + result += (b & 0x7f); + result <<= 7; + } else { + /* b is the last byte */ + return result + b; + } + } + } + + return { + 'eof': eof, + 'read': read, + 'readInt32': readInt32, + 'readInt16': readInt16, + 'readInt8': readInt8, + 'readVarInt': readVarInt + } +} +function SineGenerator(freq) { + var self = {'alive': true}; + var period = sampleRate / freq; + var t = 0; + + self.generate = function(buf, offset, count) { + for (; count; count--) { + var phase = t / period; + var result = Math.sin(phase * 2 * Math.PI); + buf[offset++] += result; + buf[offset++] += result; + t++; + } + } + + return self; +} + +function SquareGenerator(freq, phase) { + var self = {'alive': true}; + var period = sampleRate / freq; + var t = 0; + + self.generate = function(buf, offset, count) { + for (; count; count--) { + var result = ( (t / period) % 1 > phase ? 1 : -1); + buf[offset++] += result; + buf[offset++] += result; + t++; + } + } + + return self; +} + +function ADSRGenerator(child, attackAmplitude, sustainAmplitude, attackTimeS, decayTimeS, releaseTimeS) { + var self = {'alive': true} + var attackTime = sampleRate * attackTimeS; + var decayTime = sampleRate * (attackTimeS + decayTimeS); + var decayRate = (attackAmplitude - sustainAmplitude) / (decayTime - attackTime); + var releaseTime = null; /* not known yet */ + var endTime = null; /* not known yet */ + var releaseRate = sustainAmplitude / (sampleRate * releaseTimeS); + var t = 0; + + self.noteOff = function() { + if (self.released) return; + releaseTime = t; + self.released = true; + endTime = releaseTime + sampleRate * releaseTimeS; + } + + self.generate = function(buf, offset, count) { + if (!self.alive) return; + var input = new Array(count * 2); + for (var i = 0; i < count*2; i++) { + input[i] = 0; + } + child.generate(input, 0, count); + + childOffset = 0; + while(count) { + if (releaseTime != null) { + if (t < endTime) { + /* release */ + while(count && t < endTime) { + var ampl = sustainAmplitude - releaseRate * (t - releaseTime); + buf[offset++] += input[childOffset++] * ampl; + buf[offset++] += input[childOffset++] * ampl; + t++; + count--; + } + } else { + /* dead */ + self.alive = false; + return; + } + } else if (t < attackTime) { + /* attack */ + while(count && t < attackTime) { + var ampl = attackAmplitude * t / attackTime; + buf[offset++] += input[childOffset++] * ampl; + buf[offset++] += input[childOffset++] * ampl; + t++; + count--; + } + } else if (t < decayTime) { + /* decay */ + while(count && t < decayTime) { + var ampl = attackAmplitude - decayRate * (t - attackTime); + buf[offset++] += input[childOffset++] * ampl; + buf[offset++] += input[childOffset++] * ampl; + t++; + count--; + } + } else { + /* sustain */ + while(count) { + buf[offset++] += input[childOffset++] * sustainAmplitude; + buf[offset++] += input[childOffset++] * sustainAmplitude; + t++; + count--; + } + } + } + } + + return self; +} + +function midiToFrequency(note) { + return 440 * Math.pow(2, (note-69)/12); +} + +PianoProgram = { + 'attackAmplitude': 0.2, + 'sustainAmplitude': 0.1, + 'attackTime': 0.02, + 'decayTime': 0.3, + 'releaseTime': 0.02, + 'createNote': function(note, velocity) { + var frequency = midiToFrequency(note); + return ADSRGenerator( + SineGenerator(frequency), + this.attackAmplitude * (velocity / 128), this.sustainAmplitude * (velocity / 128), + this.attackTime, this.decayTime, this.releaseTime + ); + } +} + +StringProgram = { + 'createNote': function(note, velocity) { + var frequency = midiToFrequency(note); + return ADSRGenerator( + SineGenerator(frequency), + 0.5 * (velocity / 128), 0.2 * (velocity / 128), + 0.4, 0.8, 0.4 + ); + } +} + +PROGRAMS = { + 41: StringProgram, + 42: StringProgram, + 43: StringProgram, + 44: StringProgram, + 45: StringProgram, + 46: StringProgram, + 47: StringProgram, + 49: StringProgram, + 50: StringProgram +}; + +function Synth(sampleRate) { + + var generators = []; + + function addGenerator(generator) { + generators.push(generator); + } + + function generate(samples) { + var data = new Array(samples*2); + generateIntoBuffer(samples, data, 0); + return data; + } + + function generateIntoBuffer(samplesToGenerate, buffer, offset) { + for (var i = offset; i < offset + samplesToGenerate * 2; i++) { + buffer[i] = 0; + } + for (var i = generators.length - 1; i >= 0; i--) { + generators[i].generate(buffer, offset, samplesToGenerate); + if (!generators[i].alive) generators.splice(i, 1); + } + } + + return { + 'sampleRate': sampleRate, + 'addGenerator': addGenerator, + 'generate': generate, + 'generateIntoBuffer': generateIntoBuffer + } +} diff --git a/libs/thirdparty/mid.min.js b/libs/thirdparty/mid.min.js new file mode 100644 index 00000000..434a8ae9 --- /dev/null +++ b/libs/thirdparty/mid.min.js @@ -0,0 +1,3 @@ +var sampleRate=44100;function AudioPlayer(generator,opts){if(!opts){opts={}}var latency=opts.latency||1;var checkInterval=latency*100;var audioElement=new Audio();var webkitAudio=window.AudioContext||window.webkitAudioContext;var requestStop=false;if(audioElement.mozSetup){audioElement.mozSetup(2,sampleRate);var buffer=[];var minBufferLength=latency*2*sampleRate;var bufferFillLength=Math.floor(latency*sampleRate);function checkBuffer(){if(buffer.length){var written=audioElement.mozWriteAudio(buffer);buffer=buffer.slice(written)}if(buffer.length';document.body.appendChild(c);var swf=document.getElementById("da-swf");var minBufferDuration=latency*1000;var bufferFillLength=latency*sampleRate;function write(data){var out=new Array(data.length);for(var i=data.length-1;i!=0;i--){out[i]=Math.floor(data[i]*32768)}return swf.write(out.join(" "))}function checkBuffer(){if(swf.bufferedDuration()>4;event.channel=eventTypeByte&15;event.type="channel";switch(eventType){case 8:event.subtype="noteOff";event.noteNumber=param1;event.velocity=stream.readInt8();return event;case 9:event.noteNumber=param1;event.velocity=stream.readInt8();if(event.velocity==0){event.subtype="noteOff"}else{event.subtype="noteOn"}return event;case 10:event.subtype="noteAftertouch";event.noteNumber=param1;event.amount=stream.readInt8();return event;case 11:event.subtype="controller";event.controllerType=param1;event.value=stream.readInt8();return event;case 12:event.subtype="programChange";event.programNumber=param1;return event;case 13:event.subtype="channelAftertouch";event.amount=param1;return event;case 14:event.subtype="pitchBend";event.value=param1+(stream.readInt8()<<7);return event;default:throw"Unrecognised MIDI event type: "+eventType}}}stream=Stream(data);var headerChunk=readChunk(stream);if(headerChunk.id!="MThd"||headerChunk.length!=6){throw"Bad .mid file - header not found"}var headerStream=Stream(headerChunk.data);var formatType=headerStream.readInt16();var trackCount=headerStream.readInt16();var timeDivision=headerStream.readInt16();if(timeDivision&32768){throw"Expressing time division in SMTPE frames is not supported yet"}else{ticksPerBeat=timeDivision}var header={"formatType":formatType,"trackCount":trackCount,"ticksPerBeat":ticksPerBeat};var tracks=[];for(var i=0;i0){synth.generateIntoBuffer(samplesToGenerate,data,dataOffset);dataOffset+=samplesToGenerate*2;samplesRemaining-=samplesToGenerate;samplesToNextEvent-=samplesToGenerate}handleEvent();getNextEvent()}else{if(samplesRemaining>0){synth.generateIntoBuffer(samplesRemaining,data,dataOffset); +samplesToNextEvent-=samplesRemaining}break}}return data}function handleEvent(){var event=nextEventInfo.event;switch(event.type){case"meta":switch(event.subtype){case"setTempo":beatsPerMinute=60000000/event.microsecondsPerBeat}break;case"channel":switch(event.subtype){case"noteOn":channels[event.channel].noteOn(event.noteNumber,event.velocity);break;case"noteOff":channels[event.channel].noteOff(event.noteNumber,event.velocity);break;case"programChange":channels[event.channel].setProgram(event.programNumber);break}break}}function replay(audio){console.log("replay");audio.write(generate(44100));setTimeout(function(){replay(audio)},10)}var self={"replay":replay,"generate":generate,"finished":false};return self}function Stream(str){var position=0;function read(length){var result=str.substr(position,length);position+=length;return result}function readInt32(){var result=((str.charCodeAt(position)<<24)+(str.charCodeAt(position+1)<<16)+(str.charCodeAt(position+2)<<8)+str.charCodeAt(position+3));position+=4;return result}function readInt16(){var result=((str.charCodeAt(position)<<8)+str.charCodeAt(position+1));position+=2;return result}function readInt8(signed){var result=str.charCodeAt(position);if(signed&&result>127){result-=256}position+=1;return result}function eof(){return position>=str.length}function readVarInt(){var result=0;while(true){var b=readInt8();if(b&128){result+=(b&127);result<<=7}else{return result+b}}}return{"eof":eof,"read":read,"readInt32":readInt32,"readInt16":readInt16,"readInt8":readInt8,"readVarInt":readVarInt}}function SineGenerator(freq){var self={"alive":true};var period=sampleRate/freq;var t=0;self.generate=function(buf,offset,count){for(;count;count--){var phase=t/period;var result=Math.sin(phase*2*Math.PI);buf[offset++]+=result;buf[offset++]+=result;t++}};return self}function SquareGenerator(freq,phase){var self={"alive":true};var period=sampleRate/freq;var t=0;self.generate=function(buf,offset,count){for(;count;count--){var result=((t/period)%1>phase?1:-1);buf[offset++]+=result;buf[offset++]+=result;t++}};return self}function ADSRGenerator(child,attackAmplitude,sustainAmplitude,attackTimeS,decayTimeS,releaseTimeS){var self={"alive":true};var attackTime=sampleRate*attackTimeS;var decayTime=sampleRate*(attackTimeS+decayTimeS);var decayRate=(attackAmplitude-sustainAmplitude)/(decayTime-attackTime);var releaseTime=null;var endTime=null;var releaseRate=sustainAmplitude/(sampleRate*releaseTimeS);var t=0;self.noteOff=function(){if(self.released){return}releaseTime=t;self.released=true;endTime=releaseTime+sampleRate*releaseTimeS};self.generate=function(buf,offset,count){if(!self.alive){return}var input=new Array(count*2);for(var i=0;i=0;i--){generators[i].generate(buffer,offset,samplesToGenerate);if(!generators[i].alive){generators.splice(i,1)}}}return{"sampleRate":sampleRate,"addGenerator":addGenerator,"generate":generate,"generateIntoBuffer":generateIntoBuffer}}; \ No newline at end of file diff --git a/libs/ui.js b/libs/ui.js index 62ef59e8..ab9e226e 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -334,7 +334,8 @@ ui.prototype.drawSwitchs = function() { core.status.event.id = 'switchs'; var choices = [ - "背景音乐："+(core.musicStatus.soundStatus ? "[ON]" : "[OFF]"), + "背景音乐："+(core.musicStatus.bgmStatus ? "[ON]" : "[OFF]"), + "背景音效："+(core.musicStatus.soundStatus ? "[ON]" : "[OFF]"), "战斗动画： " + (core.flags.battleAnimate ? "[ON]" : "[OFF]"), "怪物显伤： " + (core.flags.displayEnemyDamage ? "[ON]" : "[OFF]"), "领域显伤： " + (core.flags.displayExtraDamage ? "[ON]" : "[OFF]"), @@ -571,7 +572,7 @@ ui.prototype.drawBattleAnimate = function(monsterId, callback) { core.fillText("ui", "S", right_start-8, 208+15, "#FFFFFF", "italic bold 40px Verdana"); var battleInterval = setInterval(function() { - core.playSound("attack", "ogg"); + core.playSound("attack.ogg"); if (turn==0) { // 勇士攻击 diff --git a/main.js b/main.js index fe644e79..e5996f71 100644 --- a/main.js +++ b/main.js @@ -45,12 +45,13 @@ function main() { ]; this.images = [ 'animates', 'enemys', 'hero', 'items', 'npcs', 'terrains' - // Autotile 动态添加 ]; - this.sounds = { - 'mp3': ['bgm-loop', 'floor'], - 'ogg': ['attack', 'door', 'item'] - } + this.bgms = [ // 在此存放所有的bgm，和文件名一致。第一项为默认播放项 + '058-Slow01.mid', 'bgm.mp3', 'G2_koko.mid', 'star.mid' + ]; + this.sounds = [ // 在此存放所有的SE，和文件名一致 + 'floor.mp3', 'attack.ogg', 'door.ogg', 'item.ogg' + ] this.statusBar = { 'image': { 'floor': document.getElementById('img-floor'), @@ -97,7 +98,7 @@ function main() { // 如果要进行剧本的修改请务必将其改成false。 this.floorIds = [ // 在这里按顺序放所有的楼层；其顺序直接影响到楼层传送器的顺序和上楼器/下楼器的顺序 - "sample0", "sample1", "sample2", "test" + "sample0", "sample1", "sample2" ] //------------------------ 用户修改内容 END ------------------------// @@ -119,7 +120,7 @@ main.prototype.init = function () { coreData[name] = main[name]; } main.loaderFloors(function() { - main.core.init(main.dom, main.statusBar, main.canvas, main.images, main.sounds, main.floorIds, main.floors, coreData); + main.core.init(main.dom, main.statusBar, main.canvas, main.images, main.bgms, main.sounds, main.floorIds, main.floors, coreData); main.core.resize(main.dom.body.clientWidth, main.dom.body.clientHeight); }) }); @@ -222,18 +223,6 @@ main.dom.body.onselectstart = function () { return false; } -document.onmousemove = function() { - try { - main.core.loadSound(); - }catch (e) {} -} - -document.ontouchstart = function() { - try { - main.core.loadSound(); - }catch (e) {} -} - main.dom.data.onmousedown = function (e) { try { e.stopPropagation(); diff --git a/sounds/058-Slow01.mid b/sounds/058-Slow01.mid new file mode 100644 index 0000000000000000000000000000000000000000..05ce9228c590fc77d3959b0c8230c51ce44ea5ff GIT binary patch literal 6183 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 literal 0 HcmV?d00001 diff --git a/sounds/star.mid b/sounds/star.mid new file mode 100644 index 0000000000000000000000000000000000000000..cc78e5902ba32478f7d12796376e7e2ef8887485 GIT binary patch literal 15102 zcmeI3O>Z056^8G~N(iXnqJlJMNi-c&mPAXUw1_MSa0&s55r__g z1ZeDqJ!Hwrq6;xJIe$anilj}P?~gx`Ggta^CtkHyLSi>XxVwxJMJvcAAkS$()48c^}ExP{Y%Ab92BpeSiY&$N2#8r@sj(}-SJX#X+jPr zN{dTlrP;eNLu2dnX`wg0&oc>6 zX2zI#l4xEGc?_Dlc8FY&BUp}LG2lf3D+1QZhfyVqHN7K314PVc7(8q!bRC(20Ek26*&Ur%mGB*B%G{w zB2k`##B)LJVPH`>HC(KtMgk=2=)y(eb#&sQ@Osn}6}l*#YR|GPvIgXAxDpe_)mP*MYNkU|aNAQcpZ&_N@J z!*CZNDAa-KaFHrr;&*}Hpp=@E@*qDZ$``5R0ESGv11F)w01ih10m4BR!sSAH7EF-I z?<5OjB_&N+3t5vOO}!RO1Zf@?VgIjp@Bh>%b83zKY_0E(T4O(3V?XY)$@p zf1kSSG`K4p+>}i1mw{L@cde4D_3KNex{5Ax+nz$7~V!H@< z2!e14c?bt_5+2+ML44uCIgSw3DB{4L5?m=Lp+hGG2_X(S5Qw{9nz3nr@~2v$qEw{c8CVIP=nhEqiV=TSm7jaV4}i47hEX_ zp@T*c2X@K;LBfbbM(aaR_7DWk2{?#Tghx9{ERRSgl7Vm$1PLJyf*=_Msd5r%m5I1r}qf<7)y6k0hfORn-?C*Jh`iuJXRkfZ-JL^2dt+VH?v*-PnJ#T&Pl(Rmc zF5kX4y>R?r(+j=#CKx9e#~H^NM;J#KZQF~)DYnHQ<9w_wzHPhh{7m?^^NYuS#`^jm z?fmWQyPJRf{t~ax-g~y~ruDIHx1FB}-*$c`d=o$0b`w9_cH8-x@NMU3!Z-1=Z8!0= zZMU7D3I8h3TUUAB8f6@1%roX0vy53r+x7x+3T^Rooafr&+qT=z&xCI~KNG%*pKZH| zpKZJC{7m?^^E2U__}R9b_}RAG&d-EzJ3kY?iJxt|iJxt|?fgvmw)2a}Z|fC}sLx(i z8}y1c=#OvEE83t}^nhN`2EC#UdPTP$&>wH|JXED$)TCcjrC-#fUsR=E)TCcjrC(&- z&ht!_eo+{oeo>WvQ5fI0{r^1wt_Gfh#!VWtt?_vLV_gk&HPF>SR|8!QbTtrYfM?t) zJ)|Z*q$)k6COxDoJ)|Z*q$)k6rfoaVxK(;cVSIW>ReDHaeA{;0`I+!-=NFH^_dH#t(H9pB`X>5Hi9|+X= z;z9FF!jqXHW}YN^Q4AL`Xy)1>a>W3_1_%}dE-(L+WU`|VWgIH?x59vf;yg$VHSo&> zc$okf7%wnJJ^5;;##b{`ca~+?uX@z;;Fx+HG`2pMFC1!o;XuU#o=JFeFu=@{M9+)i zJO<5NJ4CKH2k~btX$c%nKFMf)h) zL(xEFLFhd+E-Lm=wXg9R0TMpC@KCsqPCOLuM?F!Yhr+4$EXyLRkOg6{rcv*M zyYr{Yw|+@o{ Date: Fri, 29 Dec 2017 12:29:21 +0800 Subject: [PATCH 06/24] Music --- test.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test.js diff --git a/test.js b/test.js deleted file mode 100644 index e69de29b..00000000 From 02b67f3c4023f09bcc29141ebc38d1401aa6e5be Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 29 Dec 2017 12:32:18 +0800 Subject: [PATCH 07/24] Music --- libs/events.js | 2 +- main.js | 2 +- sounds/G2_koko.mid | Bin 31666 -> 0 bytes sounds/heianmigong.mid | Bin 0 -> 13813 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 sounds/G2_koko.mid create mode 100644 sounds/heianmigong.mid diff --git a/libs/events.js b/libs/events.js index 7d8f955f..f4ff1ea8 100644 --- a/libs/events.js +++ b/libs/events.js @@ -142,7 +142,7 @@ events.prototype.afterChangeFloor = function (floorId) { core.playBgm('star.mid'); } if (floorId == 'sample2') { - core.playBgm('058-G2_koko.mid'); + core.playBgm('G2_koko.mid'); } } diff --git a/main.js b/main.js index e5996f71..912a34f8 100644 --- a/main.js +++ b/main.js @@ -47,7 +47,7 @@ function main() { 'animates', 'enemys', 'hero', 'items', 'npcs', 'terrains' ]; this.bgms = [ // 在此存放所有的bgm，和文件名一致。第一项为默认播放项 - '058-Slow01.mid', 'bgm.mp3', 'G2_koko.mid', 'star.mid' + '058-Slow01.mid', 'bgm.mp3', 'heianmigong.mid', 'star.mid' ]; this.sounds = [ // 在此存放所有的SE，和文件名一致 'floor.mp3', 'attack.ogg', 'door.ogg', 'item.ogg' diff --git a/sounds/G2_koko.mid b/sounds/G2_koko.mid deleted file mode 100644 index 430e1a73dff6f1d1d1911bca0df8ebf1f74eecb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31666 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 diff --git a/sounds/heianmigong.mid b/sounds/heianmigong.mid new file mode 100644 index 0000000000000000000000000000000000000000..febdc238fae2323063d02ac821fde8ab591ddd9a GIT binary patch literal 13813 zcmeI3-)~c87{}kUb4F!$B;w9h1B`6WZZxA1NJDeBw00>BSy15ynf)u3yZ4{zesl2Cv**ta4T|Z&ur}RfiRqWGXw#a| zeiaFAI@6*}XIsWDPsHrtM4Xq!E5R#icaFyF0JL#54oyHUs0B?x^$MS`$J)>^v1+2FPxL~2p^}fg0&&|J;v5ru zI_H`!_!2#KWVFXN${L}{e#}lG-^h_;&Fg%SNAzH*2SaK1h%`PNW8oMJ$Dzlek}nJ3 zgLEHhG<=DEeCWpqPa}j$Z$E_(Df`^SN%l{&KfwBc9fC%n#>5Hu6WH;nlX>I->53He z3`hm(DvC0w+CTI}z?=B<=Cf>3(m-+);B!&Kn_5z#kn1pRh%-x?hwL zWv{q(Ud#XpGfjPB20)kr5bgp9GXTO2fG~15+Nb4lAdiQ6yvpN#9#C)q1!$uKD6rP( z01E6kI)DPQjSirIUZ+dfYyb-E1(6G)6GY!R=Ku;AF%i=9RgBZNtBA7J2U*N?M#z`+3=^31jaI6xy%BhSn` zfJ2!&nMV$h?npt;fK-s~q9_BaO?bVyyl7CAC-`oAm7+Kl$gh}`lWC~km%LZ5hQ|xL zw#G6VX;elfd2jz&ge}9B;mds1rpxol4ZGe%d6VHzh&w4RNH7iF$ho8Ej-WSEo`63} zdLhlfI(w?&aPx)z3HK13XZx5*&xO1** z@SOKFkwRT%Cbl8z=9kx;EgzvON&rOz%Xb8Y830~)tpgR?#bBSredg5 zKUIgv?N!xFTVtkuTnpY7KMJt~t}Qhs#1go+1g`xFt}SIOZOOfpO&v&|x_%(tJaq(m zB)wy*Yp~^d*Pt=gm4>D_pigUma69MfoC{4upVm1tu6p*BAM5JgO}@I_KB$+k&GPww z_f z)iHePddKjN$}^3}50%#+m&#|N=KrYw8hS1GbEt+I%D=TbZB~zZ`SW{1`(~4#;Q6+V zv)YC~D$^lF*YfeK^WfKv-#z~n63YRhE%W2#Wj>Qw<}-=E_)KD%A2Tm!!&Rb5@pDM5 jAiBbDb5;;tLG&S_D~PUS!($^4-QVW$M{M-spECXi2&$Em literal 0 HcmV?d00001 From 7e832d0496eddbb9a794e7e46da776d38ab02ac8 Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 29 Dec 2017 12:39:49 +0800 Subject: [PATCH 08/24] Music --- libs/events.js | 2 +- main.js | 2 +- sounds/heianmigong.mid | Bin 13813 -> 0 bytes sounds/qianjin.mid | Bin 0 -> 59708 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 sounds/heianmigong.mid create mode 100644 sounds/qianjin.mid diff --git a/libs/events.js b/libs/events.js index f4ff1ea8..6f1f9710 100644 --- a/libs/events.js +++ b/libs/events.js @@ -142,7 +142,7 @@ events.prototype.afterChangeFloor = function (floorId) { core.playBgm('star.mid'); } if (floorId == 'sample2') { - core.playBgm('G2_koko.mid'); + core.playBgm('qianjin.mid'); } } diff --git a/main.js b/main.js index 912a34f8..57d8f93c 100644 --- a/main.js +++ b/main.js @@ -47,7 +47,7 @@ function main() { 'animates', 'enemys', 'hero', 'items', 'npcs', 'terrains' ]; this.bgms = [ // 在此存放所有的bgm，和文件名一致。第一项为默认播放项 - '058-Slow01.mid', 'bgm.mp3', 'heianmigong.mid', 'star.mid' + '058-Slow01.mid', 'bgm.mp3', 'qianjin.mid', 'star.mid' ]; this.sounds = [ // 在此存放所有的SE，和文件名一致 'floor.mp3', 'attack.ogg', 'door.ogg', 'item.ogg' diff --git a/sounds/heianmigong.mid b/sounds/heianmigong.mid deleted file mode 100644 index febdc238fae2323063d02ac821fde8ab591ddd9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13813 zcmeI3-)~c87{}kUb4F!$B;w9h1B`6WZZxA1NJDeBw00>BSy15ynf)u3yZ4{zesl2Cv**ta4T|Z&ur}RfiRqWGXw#a| zeiaFAI@6*}XIsWDPsHrtM4Xq!E5R#icaFyF0JL#54oyHUs0B?x^$MS`$J)>^v1+2FPxL~2p^}fg0&&|J;v5ru zI_H`!_!2#KWVFXN${L}{e#}lG-^h_;&Fg%SNAzH*2SaK1h%`PNW8oMJ$Dzlek}nJ3 zgLEHhG<=DEeCWpqPa}j$Z$E_(Df`^SN%l{&KfwBc9fC%n#>5Hu6WH;nlX>I->53He z3`hm(DvC0w+CTI}z?=B<=Cf>3(m-+);B!&Kn_5z#kn1pRh%-x?hwL zWv{q(Ud#XpGfjPB20)kr5bgp9GXTO2fG~15+Nb4lAdiQ6yvpN#9#C)q1!$uKD6rP( z01E6kI)DPQjSirIUZ+dfYyb-E1(6G)6GY!R=Ku;AF%i=9RgBZNtBA7J2U*N?M#z`+3=^31jaI6xy%BhSn` zfJ2!&nMV$h?npt;fK-s~q9_BaO?bVyyl7CAC-`oAm7+Kl$gh}`lWC~km%LZ5hQ|xL zw#G6VX;elfd2jz&ge}9B;mds1rpxol4ZGe%d6VHzh&w4RNH7iF$ho8Ej-WSEo`63} zdLhlfI(w?&aPx)z3HK13XZx5*&xO1** z@SOKFkwRT%Cbl8z=9kx;EgzvON&rOz%Xb8Y830~)tpgR?#bBSredg5 zKUIgv?N!xFTVtkuTnpY7KMJt~t}Qhs#1go+1g`xFt}SIOZOOfpO&v&|x_%(tJaq(m zB)wy*Yp~^d*Pt=gm4>D_pigUma69MfoC{4upVm1tu6p*BAM5JgO}@I_KB$+k&GPww z_f z)iHePddKjN$}^3}50%#+m&#|N=KrYw8hS1GbEt+I%D=TbZB~zZ`SW{1`(~4#;Q6+V zv)YC~D$^lF*YfeK^WfKv-#z~n63YRhE%W2#Wj>Qw<}-=E_)KD%A2Tm!!&Rb5@pDM5 jAiBbDb5;;tLG&S_D~PUS!($^4-QVW$M{M-spECXi2&$Em diff --git a/sounds/qianjin.mid b/sounds/qianjin.mid new file mode 100644 index 0000000000000000000000000000000000000000..b4236a960165dbf7f5d17c096866722bc20df101 GIT binary patch literal 59708 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 aF^nz$@LYq~a#3iLIpsunnq36Ex%_`_K{}`a literal 0 HcmV?d00001 From 53ba0d4f5119ea9d0c8614490618cd303439b313 Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 29 Dec 2017 16:47:09 +0800 Subject: [PATCH 09/24] Update BGM --- libs/core.js | 3 +-- libs/enemys.js | 23 +++++++++++++++-------- libs/events.js | 4 ++++ libs/floors/sample0.js | 1 - libs/floors/sample1.js | 5 +++-- libs/items.js | 2 +- libs/thirdparty/mid.min.js | 3 --- libs/ui.js | 4 ++-- main.js | 2 ++ 更新说明.txt | 3 ++- 10 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 libs/thirdparty/mid.min.js diff --git a/libs/core.js b/libs/core.js index d89d08cf..502a5130 100644 --- a/libs/core.js +++ b/libs/core.js @@ -335,8 +335,7 @@ core.prototype.loadMusic = function (callback) { } else { var music = new Audio(); - if (!core.musicStatus.startDirectly) - music.preload = 'none'; // 默认不加载 + music.preload = core.musicStatus.startDirectly?'auto':'none'; music.src = 'sounds/'+t; music.loop = 'loop'; core.material.bgms[t] = music; diff --git a/libs/enemys.js b/libs/enemys.js index c08ae30e..00541d09 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -101,6 +101,8 @@ enemys.prototype.getSpecialText = function (enemyId) { if (this.hasSpecial(special, 16)) text.push("夹击"); if (this.hasSpecial(special, 17)) text.push("仇恨"); if (this.hasSpecial(special, 18)) text.push("阻击"); + if (this.hasSpecial(special, 19)) text.push("自爆"); + if (this.hasSpecial(special, 20)) text.push("无敌"); return text.join(" "); } @@ -161,22 +163,27 @@ enemys.prototype.getCriticalDamage = function (monsterId) { // 1防减伤计算 enemys.prototype.getDefDamage = function (monsterId) { var monster = core.material.enemys[monsterId]; - return this.calDamage(core.status.hero.atk, core.status.hero.def, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special) - - this.calDamage(core.status.hero.atk, core.status.hero.def + 1, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special) + var nowDamage = this.calDamage(core.status.hero.atk, core.status.hero.def, core.status.hero.mdef, + monster.hp, monster.atk, monster.def, monster.special); + if (nowDamage == 999999999) return "???"; + return nowDamage - this.calDamage(core.status.hero.atk, core.status.hero.def + 1, core.status.hero.mdef, + monster.hp, monster.atk, monster.def, monster.special); } enemys.prototype.calDamage = function (hero_atk, hero_def, hero_mdef, mon_hp, mon_atk, mon_def, mon_special) { - // 魔攻 - if (this.hasSpecial(mon_special,2)) hero_def = 0; - // 坚固 - if (this.hasSpecial(mon_special,3) && mon_def < hero_atk - 1) mon_def = hero_atk - 1; + + if (this.hasSpecial(mon_special, 20) && !core.hasItem("cross")) // 如果是无敌属性，且勇士未持有十字架 + return 999999999; // 返回无限大 + // 模仿 if (this.hasSpecial(mon_special,10)) { mon_atk = hero_atk; mon_def = hero_def; } + // 魔攻 + if (this.hasSpecial(mon_special,2)) hero_def = 0; + // 坚固 + if (this.hasSpecial(mon_special,3) && mon_def < hero_atk - 1) mon_def = hero_atk - 1; if (hero_atk <= mon_def) return 999999999; // 不可战斗时请直接返回999999999 var per_damage = mon_atk - hero_def; diff --git a/libs/events.js b/libs/events.js index 6f1f9710..e82bfc8e 100644 --- a/libs/events.js +++ b/libs/events.js @@ -540,6 +540,10 @@ events.prototype.afterBattle = function(enemyId,x,y,callback) { if (core.enemys.hasSpecial(special, 17)) { core.setFlag('hatred', parseInt(core.getFlag('hatred', 0)/2)); } + // 自爆 + if (core.enemys.hasSpecial(special, 19)) { + core.status.hero.hp = 1; + } // 增加仇恨值 core.setFlag('hatred', core.getFlag('hatred',0)+core.values.hatred); core.updateStatusBar(); diff --git a/libs/floors/sample0.js b/libs/floors/sample0.js index 761bc5ed..1fab84e8 100644 --- a/libs/floors/sample0.js +++ b/libs/floors/sample0.js @@ -102,7 +102,6 @@ main.floors.sample0 = { "炸弹是只能炸面前的怪物还是四个方向的怪物，由data.js中的系统Flag所决定。\n如只能炸前方怪物则和上面的圣锤等价。\n不能被炸的怪物在enemys中可以定义，可参见样板里黑衣魔王和黑暗大法师的写法。", ], "10,4": ["“上楼”和“下楼”的目标层由 main.js 的 floorIds顺序所决定。"], - "10,3": ["十字架目前未被定义，可能需要自行实现功能。\n有关如何实现一个道具功能参见doc文档。"], "9,2": ["该道具默认是大黄门钥匙，如需改为钥匙盒直接修改 data.js 中的系统Flag即可。"], "10,2": ["屠龙匕首目前未被定义，可能需要自行实现功能。\n有关如何实现一个道具功能参见doc文档。"], }, diff --git a/libs/floors/sample1.js b/libs/floors/sample1.js index b28c41d1..3934514b 100644 --- a/libs/floors/sample1.js +++ b/libs/floors/sample1.js @@ -31,8 +31,9 @@ main.floors.sample1 = { "4,10": [ // 走到中间时的提示 "\t[样板提示]本层楼将会对各类事件进行介绍。", "左边是一个仿50层的陷阱做法，上方是商店、快捷商店的使用方法，右上是一个典型的杀怪开门的例子，右下是各类可能的NPC事件。", - "本样板目前支持的事件列表大致有：\ntext: 显示一段文字（比如你现在正在看到的）\ntip: 左上角显示提示\nshow: 使一个事件有效（可见、可被交互）\nhide: 使一个事件失效（不可见、不可被交互）\ntrigger: 触发另一个地点的事件\nbattle: 强制和某怪物战斗\nopenDoor: 无需钥匙开门（例如机关门、暗墙）\nopenShop: 打开一个全局商店\ndisableShop: 禁用一个全局商店\nchangeFloor: 传送勇士到某层某位置\nchangePos: 传送勇士到当层某位置；转向\nsetFg: 更改画面色调", - "move: 移动事件效果\nmoveHero: 移动勇士效果\nplaySound: 播放某个音频\nif: 条件判断\nchoices: 提供选项\nsetValue: 设置勇士属性道具，或某个变量/flag\nupdate: 更新状态栏和地图显伤\nwin: 获得胜利（游戏通关）\nlose: 游戏失败\nsleep: 等待多少毫秒\nexit: 立刻结束当前事件\nrevisit: 立刻结束事件并重新触发\nfunction: 自定义JS脚本\n更多支持的事件还在编写中，欢迎您宝贵的意见。", + "本样板目前支持的事件列表大致有：\ntext: 显示一段文字（比如你现在正在看到的）\ntip: 左上角显示提示\nshow: 使一个事件有效（可见、可被交互）\nhide: 使一个事件失效（不可见、不可被交互）\ntrigger: 触发另一个地点的事件\nbattle: 强制和某怪物战斗\nopenDoor: 无需钥匙开门（例如机关门、暗墙）", + "openShop: 打开一个全局商店\ndisableShop: 禁用一个全局商店\nchangeFloor: 传送勇士到某层某位置\nchangePos: 传送勇士到当层某位置；转向\nsetFg: 更改画面色调\nmove: 移动事件效果\nmoveHero: 移动勇士效果\nplayBgm: 播放某个背景音乐\npauseBgm: 暂停背景音乐\nresumeBgm: 恢复背景音乐的播放\nplaySound: 播放某个音频", + "if: 条件判断\nchoices: 提供选项\nsetValue: 设置勇士属性道具，或某个变量/flag\nupdate: 更新状态栏和地图显伤\nwin: 获得胜利（游戏通关）\nlose: 游戏失败\nsleep: 等待多少毫秒\nexit: 立刻结束当前事件\nrevisit: 立刻结束事件并重新触发\nfunction: 自定义JS脚本\n\n更多支持的事件还在编写中，欢迎您宝贵的意见。", "有关各事件的样例，可参见本层一些NPC的写法。\n所有事件样例本层都有介绍。\n\n一个自定义事件处理完后，需要调用{\"type\": \"hide\"}该事件才不会再次出现。", {"type": "hide"} ], diff --git a/libs/items.js b/libs/items.js index 0605a16e..449d2980 100644 --- a/libs/items.js +++ b/libs/items.js @@ -36,7 +36,7 @@ items.prototype.init = function () { 'fly': {'cls': 'constants', 'name': '楼层传送器', 'text': '可以自由往来去过的楼层'}, 'coin': {'cls': 'constants', 'name': '幸运金币', 'text': '持有时打败怪物可得双倍金币'}, 'snow': {'cls': 'constants', 'name': '冰冻徽章', 'text': '可以将四周的熔岩变成平地'}, - 'cross': {'cls': 'constants', 'name': '十字架', 'text': '该道具尚未被定义'}, + 'cross': {'cls': 'constants', 'name': '十字架', 'text': '持有后无视怪物的无敌属性'}, 'knife': {'cls': 'constants', 'name': '屠龙匕首', 'text': '该道具尚未被定义'}, 'shoes': {'cls': 'constants', 'name': '绿鞋', 'text': '持有时无视负面地形'}, diff --git a/libs/thirdparty/mid.min.js b/libs/thirdparty/mid.min.js deleted file mode 100644 index 434a8ae9..00000000 --- a/libs/thirdparty/mid.min.js +++ /dev/null @@ -1,3 +0,0 @@ -var sampleRate=44100;function AudioPlayer(generator,opts){if(!opts){opts={}}var latency=opts.latency||1;var checkInterval=latency*100;var audioElement=new Audio();var webkitAudio=window.AudioContext||window.webkitAudioContext;var requestStop=false;if(audioElement.mozSetup){audioElement.mozSetup(2,sampleRate);var buffer=[];var minBufferLength=latency*2*sampleRate;var bufferFillLength=Math.floor(latency*sampleRate);function checkBuffer(){if(buffer.length){var written=audioElement.mozWriteAudio(buffer);buffer=buffer.slice(written)}if(buffer.length';document.body.appendChild(c);var swf=document.getElementById("da-swf");var minBufferDuration=latency*1000;var bufferFillLength=latency*sampleRate;function write(data){var out=new Array(data.length);for(var i=data.length-1;i!=0;i--){out[i]=Math.floor(data[i]*32768)}return swf.write(out.join(" "))}function checkBuffer(){if(swf.bufferedDuration()>4;event.channel=eventTypeByte&15;event.type="channel";switch(eventType){case 8:event.subtype="noteOff";event.noteNumber=param1;event.velocity=stream.readInt8();return event;case 9:event.noteNumber=param1;event.velocity=stream.readInt8();if(event.velocity==0){event.subtype="noteOff"}else{event.subtype="noteOn"}return event;case 10:event.subtype="noteAftertouch";event.noteNumber=param1;event.amount=stream.readInt8();return event;case 11:event.subtype="controller";event.controllerType=param1;event.value=stream.readInt8();return event;case 12:event.subtype="programChange";event.programNumber=param1;return event;case 13:event.subtype="channelAftertouch";event.amount=param1;return event;case 14:event.subtype="pitchBend";event.value=param1+(stream.readInt8()<<7);return event;default:throw"Unrecognised MIDI event type: "+eventType}}}stream=Stream(data);var headerChunk=readChunk(stream);if(headerChunk.id!="MThd"||headerChunk.length!=6){throw"Bad .mid file - header not found"}var headerStream=Stream(headerChunk.data);var formatType=headerStream.readInt16();var trackCount=headerStream.readInt16();var timeDivision=headerStream.readInt16();if(timeDivision&32768){throw"Expressing time division in SMTPE frames is not supported yet"}else{ticksPerBeat=timeDivision}var header={"formatType":formatType,"trackCount":trackCount,"ticksPerBeat":ticksPerBeat};var tracks=[];for(var i=0;i0){synth.generateIntoBuffer(samplesToGenerate,data,dataOffset);dataOffset+=samplesToGenerate*2;samplesRemaining-=samplesToGenerate;samplesToNextEvent-=samplesToGenerate}handleEvent();getNextEvent()}else{if(samplesRemaining>0){synth.generateIntoBuffer(samplesRemaining,data,dataOffset); -samplesToNextEvent-=samplesRemaining}break}}return data}function handleEvent(){var event=nextEventInfo.event;switch(event.type){case"meta":switch(event.subtype){case"setTempo":beatsPerMinute=60000000/event.microsecondsPerBeat}break;case"channel":switch(event.subtype){case"noteOn":channels[event.channel].noteOn(event.noteNumber,event.velocity);break;case"noteOff":channels[event.channel].noteOff(event.noteNumber,event.velocity);break;case"programChange":channels[event.channel].setProgram(event.programNumber);break}break}}function replay(audio){console.log("replay");audio.write(generate(44100));setTimeout(function(){replay(audio)},10)}var self={"replay":replay,"generate":generate,"finished":false};return self}function Stream(str){var position=0;function read(length){var result=str.substr(position,length);position+=length;return result}function readInt32(){var result=((str.charCodeAt(position)<<24)+(str.charCodeAt(position+1)<<16)+(str.charCodeAt(position+2)<<8)+str.charCodeAt(position+3));position+=4;return result}function readInt16(){var result=((str.charCodeAt(position)<<8)+str.charCodeAt(position+1));position+=2;return result}function readInt8(signed){var result=str.charCodeAt(position);if(signed&&result>127){result-=256}position+=1;return result}function eof(){return position>=str.length}function readVarInt(){var result=0;while(true){var b=readInt8();if(b&128){result+=(b&127);result<<=7}else{return result+b}}}return{"eof":eof,"read":read,"readInt32":readInt32,"readInt16":readInt16,"readInt8":readInt8,"readVarInt":readVarInt}}function SineGenerator(freq){var self={"alive":true};var period=sampleRate/freq;var t=0;self.generate=function(buf,offset,count){for(;count;count--){var phase=t/period;var result=Math.sin(phase*2*Math.PI);buf[offset++]+=result;buf[offset++]+=result;t++}};return self}function SquareGenerator(freq,phase){var self={"alive":true};var period=sampleRate/freq;var t=0;self.generate=function(buf,offset,count){for(;count;count--){var result=((t/period)%1>phase?1:-1);buf[offset++]+=result;buf[offset++]+=result;t++}};return self}function ADSRGenerator(child,attackAmplitude,sustainAmplitude,attackTimeS,decayTimeS,releaseTimeS){var self={"alive":true};var attackTime=sampleRate*attackTimeS;var decayTime=sampleRate*(attackTimeS+decayTimeS);var decayRate=(attackAmplitude-sustainAmplitude)/(decayTime-attackTime);var releaseTime=null;var endTime=null;var releaseRate=sustainAmplitude/(sampleRate*releaseTimeS);var t=0;self.noteOff=function(){if(self.released){return}releaseTime=t;self.released=true;endTime=releaseTime+sampleRate*releaseTimeS};self.generate=function(buf,offset,count){if(!self.alive){return}var input=new Array(count*2);for(var i=0;i=0;i--){generators[i].generate(buffer,offset,samplesToGenerate);if(!generators[i].alive){generators.splice(i,1)}}}return{"sampleRate":sampleRate,"addGenerator":addGenerator,"generate":generate,"generateIntoBuffer":generateIntoBuffer}}; \ No newline at end of file diff --git a/libs/ui.js b/libs/ui.js index ab9e226e..bbb85c16 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -390,12 +390,12 @@ ui.prototype.drawBattleAnimate = function(monsterId, callback) { hero_hp -= core.enemys.getExtraDamage(monster); - if (core.enemys.hasSpecial(mon_special, 2)) hero_def=0; // 魔攻 - if (core.enemys.hasSpecial(mon_special, 3) && mon_def Date: Fri, 29 Dec 2017 18:00:12 +0800 Subject: [PATCH 10/24] Update damage --- libs/enemys.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/enemys.js b/libs/enemys.js index 00541d09..95a19585 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -165,9 +165,10 @@ enemys.prototype.getDefDamage = function (monsterId) { var monster = core.material.enemys[monsterId]; var nowDamage = this.calDamage(core.status.hero.atk, core.status.hero.def, core.status.hero.mdef, monster.hp, monster.atk, monster.def, monster.special); - if (nowDamage == 999999999) return "???"; - return nowDamage - this.calDamage(core.status.hero.atk, core.status.hero.def + 1, core.status.hero.mdef, + var nextDamage = this.calDamage(core.status.hero.atk, core.status.hero.def + 1, core.status.hero.mdef, monster.hp, monster.atk, monster.def, monster.special); + if (nowDamage == 999999999 || nextDamage == 999999999) return "???"; + return nowDamage - nextDamage; } enemys.prototype.calDamage = function (hero_atk, hero_def, hero_mdef, mon_hp, mon_atk, mon_def, mon_special) { From 1a67fec545fced7c0c52a55ad0cdbcf875194ab8 Mon Sep 17 00:00:00 2001 From: echo Date: Fri, 29 Dec 2017 18:35:06 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E9=87=8D=E6=9E=84&=E6=9B=B4=E6=96=B0auto?= =?UTF-8?q?tile=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _server/editor_file.js | 63 ++ _server/vm.js | 247 +++++ drawMapGUI.html | 922 +++++++----------- .../autotile1.png | Bin .../autotile2.png | Bin .../autotile3.png | Bin libs/icons.js | 6 + libs/maps.js | 7 +- 8 files changed, 649 insertions(+), 596 deletions(-) create mode 100644 _server/editor_file.js create mode 100644 _server/vm.js rename images/{常用素材：如需使用请直接替换目录中的对应文件 => }/autotile1.png (100%) rename images/{常用素材：如需使用请直接替换目录中的对应文件 => }/autotile2.png (100%) rename images/{常用素材：如需使用请直接替换目录中的对应文件 => }/autotile3.png (100%) diff --git a/_server/editor_file.js b/_server/editor_file.js new file mode 100644 index 00000000..b076565a --- /dev/null +++ b/_server/editor_file.js @@ -0,0 +1,63 @@ +(function(){ + + editor_file = {}; + editor_file.getFloorFileList = function(editor,callback){ + if (isset(callback)) callback(['simple0.js','simple1.js','simple2.js'],null); + } + //callback(Array,err:String) + editor_file.loadFloorFile = function(editor,filename,callback){ + if (isset(callback)) callback('',null); + } + //callback(String,err:String) + editor_file.saveFloorFile = function(editor,callback){ + if (isset(callback)) callback(null); + } + //callback(err:String) + editor_file.saveFloorFile = function(editor,saveAsFilename,callback){ + if (isset(callback)) callback(null); + } + //callback(err:String) + editor_file.changeIdAndIdnum = function(editor,id,idnum,callback){ + if (isset(callback)) callback(null); + } + //callback(err:String) + editor_file.editItem = function(editor,id,callback){ + if (isset(callback)) callback('',null); + } + //callback(String,err:String) + editor_file.editEnemy = function(editor,id,callback){ + if (isset(callback)) callback({'name': '初级巫师', 'hp': 100, 'atk': 120, 'def': 0, 'money': 16, 'experience': 0, 'special': 15, 'value': 100},null); + } + //callback(obj,err:String) + editor_file.editLoc = function(editor,x,y,input_value,callback){ + if (isset(callback)) callback({"events":` [ // 守着道具的老人 + "\t[老人,man]这些是本样板支持的所有的道具。\n\n道具分为三类：items, constants, tools。\nitems 为即捡即用类道具，例如宝石、血瓶、剑盾等。\nconstants 为永久道具，例如怪物手册、楼层传送器、幸运金币等。\ntools 为消耗类道具，例如破墙镐、炸弹、中心对称飞行器等。\n\n后两类道具在工具栏中可以看到并使用。", + "\t[老人,man]有关道具效果，定义在items.js中。\n目前大多数道具已有默认行为，如有自定义的需求则需在items.js中修改代码。", + "\t[老人,man]constants 和 tools 各最多只允许12种，多了会导致图标溢出。", + "\t[老人,man]拾取道具结束后可触发 afterGetItem 事件。\n\n有关事件的各种信息在下一层会有更为详细的说明。", + {"type": "hide", "time": 500} // 消失 + ],`,"changeFloor":"","afterBattle":"","afterGetItem":"","afterOpenDoor":""},null); + } + //callback(obj,err:String) + editor_file.editFloor = function(editor,input_value,callback){ + if (isset(callback)) callback({"floorId": "sample0", + "title": "样板 0 层", + "name": "0", + "canFlyTo": true, + "canUseQuickShop": true, + "defaultGround": "ground", + "firstArrive":` [ // 第一次到该楼层触发的事件 + "\t[样板提示]首次到达某层可以触发 firstArrive 事件，该事件可类似于RMXP中的“自动执行脚本”。\n\n本事件支持一切的事件类型，常常用来触发对话，例如：", + "\t[hero]我是谁？我从哪来？我又要到哪去？", + "\t[仙子,fairy]你问我...？我也不知道啊...", + "本层主要对道具、门、怪物等进行介绍，有关事件的各种信息在下一层会有更为详细的说明。", + ],`},null); + } + //callback(obj,err:String) + var isset = function (val) { + if (val == undefined || val == null) { + return false; + } + return true + } +})(); \ No newline at end of file diff --git a/_server/vm.js b/_server/vm.js new file mode 100644 index 00000000..4187ccc2 --- /dev/null +++ b/_server/vm.js @@ -0,0 +1,247 @@ +// vue 相关处理 + +document.body.onmousedown = function(e){ + selectBox.isSelected = false; + editor.info = {}; +} +iconLib.onmousedown = function(e){ + e.stopPropagation(); +} +var exportM = new Vue({ + el: '#exportM', + + methods: { + exportMap: function(){ + editor.updateMap(); + if(editArea.error) { + tip.whichShow = 3; + + return; + } + var filestr=''; + for (var yy = 0; yy < 13; yy++){ + filestr+='[' + for (var xx = 0; xx < 13; xx++) { + var mapxy=editor.map[yy][xx]; + if(typeof(mapxy)==typeof({})){ + if ('idnum' in mapxy)mapxy=mapxy.idnum; + else { + // mapxy='!!?'; + tip.whichShow = 3; + return; + } + }else if(typeof(mapxy)=='undefined'){ + tip.whichShow = 3; + return; + } + mapxy=String(mapxy); + mapxy=Array(Math.max(4-mapxy.length,0)).join(' ')+mapxy; + filestr+=mapxy+(xx==12?'':',') + } + + filestr += ']'+(yy==12?'':',\n'); + } + pout.value = filestr; + + tip.whichShow = 2; + } + } +}) +var editArea = new Vue({ + el: '#editArea', + data: { + mapArr: '', + errors: [ // 编号1,2,3,4 + "格式错误！请使用正确格式(13*13数组，如不清楚，可先点击生成地图查看正确格式)", + "当前有未定义ID（在地图区域显示红块），请修改ID或者到icons.js和maps.js中进行定义！", + "ID越界（在地图区域显示红块），当前编辑器暂时支持编号小于400，请修改编号！", + // "发生错误！", + ], + error: 0, + formatTimer: null, + }, + watch: { + mapArr: function (val, oldval) { + var that = this; + if(val=='') return; + if(that.formatArr()){ + that.error = 0; + clearTimeout(that.formatTimer); + setTimeout(function(){ + that.drawMap(); + tip.whichShow = 8 + }, 1000); + that.formatTimer = setTimeout(function(){ + pout.value = that.formatArr(); + }, 5000); //5s后再格式化，不然光标跳到最后很烦 + }else{ + that.error = 1; + } + }, + error: function(){ + // console.log(editArea.mapArr); + } + }, + methods: { + drawMap: function(){ + var that = this; + + // var mapArray = that.mapArr.split(/\D+/).join(' ').trim().split(' '); + var mapArray = JSON.parse('['+that.mapArr+']'); + for(var y=0; y<13; y++) + for(var x=0; x<13; x++){ + var num = mapArray[y][x]; + if(num == 0 ) + editor.map[y][x] = 0; + else if(num >= 400){ + that.error = 3; + editor.map[y][x] = undefined; + }else if(typeof(editor.indexs[num][0]) == 'undefined'){ + that.error = 2; + editor.map[y][x] = undefined; + }else editor.map[y][x] = editor.ids[[editor.indexs[num][0]]]; + } + + editor.updateMap(); + + }, + formatArr: function(){ + var formatArrStr = ''; + + if(this.mapArr.split(/\D+/).join(' ').trim().split(' ').length != 169) return false; + var arr = this.mapArr.replace(/\s+/g, '').split('],['); + + if(arr.length != 13) return ; + for(var i =0; i<13; i++){ + var a = []; + formatArrStr +='['; + if(i==0||i==12) a = arr[i].split(/\D+/).join(' ').trim().split(' '); + else a = arr[i].split(/\D+/); + if(a.length != 13){ + formatArrStr = ''; + return ; + } + + for(var k=0; k<13; k++){ + var num = parseInt(a[k]); + formatArrStr += Array(Math.max(4-String(num).length,0)).join(' ')+num+(k==12?'':','); + } + formatArrStr += ']'+(i==12?'':',\n'); + } + + return formatArrStr; + } + } +}); +var editTip = new Vue({ + el: '#editTip', + data: { + err: '' + }, + methods: { + copyMap: function(){ + + tip.whichShow = 0; + if(pout.value.trim() != ''){ + if(editArea.error) { + this.err = editArea.errors[editArea.error-1]; + tip.whichShow = 5 + return; + } + try{ + pout.select(); + document.execCommand("Copy"); + tip.whichShow = 6; + }catch(e){ + this.err= e; + tip.whichShow = 5; + } + }else{ + tip.whichShow = 7; + } + } + }, +}) +var clear = new Vue({ + el: '#clear', + + methods: { + clearMap: function(){ + editor.mapInit(); + clearTimeout(editArea.formatTimer); + clearTimeout(tip.timer); + pout.value = ''; + editArea.mapArr = ''; + tip.whichShow = 4; + editArea.error = 0; + } + } +}) +var tip = new Vue({ + el: '#tip', + data: { + infos: {}, + hasId: true, + isAutotile: false, + isSelectedBlock: false, + geneMapSuccess: false, + timer: null, + msgs: [ //分别编号1,2,3,4,5,6,7,8；奇数警告，偶数成功 + "当前未选择任何图块，请先在右边选择要画的图块!", + "生成地图成功！可点击复制按钮复制地图数组到剪切板", + "生成失败! 地图中有未定义的图块，建议先用其他有效图块覆盖或点击清除地图！", + "地图清除成功!", + "复制失败！", + "复制成功！可直接粘贴到楼层文件的地图数组中。", + "复制失败！当前还没有数据", + "修改成功！可点击复制按钮复制地图数组到剪切板" + ], + mapMsg: '', + whichShow: 0, + }, + watch: { + infos: { + handler: function(val, oldval){ + if(typeof(val) != 'undefined'){ + this.infos = val; + if('id' in val){ + this.hasId = true; + }else{ + this.hasId = false; + } + this.isAutotile = false; + if(this.infos.images == "autotile" && this.hasId) this.isAutotile = true; + } + }, + deep: true + }, + + whichShow: function(){ + var that = this; + that.mapMsg = ''; + that.msgs[4] = "复制失败！"+editTip.err; + clearTimeout(that.timer); + if(that.whichShow){ + that.mapMsg = that.msgs[that.whichShow-1]; + that.timer = setTimeout(function() { + if(!(that.whichShow%2)) + that.whichShow = 0; + }, 5000); //5秒后自动清除success，warn不清除 + } + } + } +}) + +var selectBox = new Vue({ + el: '#selectBox', + data: { + isSelected: false + }, + watch: { + isSelected: function(){ + tip.isSelectedBlock = this.isSelected; + tip.whichShow = 0; + clearTimeout(tip.timer); + } + } +}) \ No newline at end of file diff --git a/drawMapGUI.html b/drawMapGUI.html index 663d824e..f1df9a1c 100644 --- a/drawMapGUI.html +++ b/drawMapGUI.html @@ -8,9 +8,9 @@ font-family: Roboto,"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;; background-color: #F5F5F5; } - ::-webkit-scrollbar { + /* ::-webkit-scrollbar { width: 5px; - } + } */ .main { max-width: 100%; min-height: 500px; @@ -26,7 +26,7 @@ left: 5px; top: 10px; width: 435px; - height: 400px; + height: 630px; } #editArea{ @@ -108,7 +108,7 @@ border: 1px solid #ccc; border-radius: 2px; font-size: 15px; - line-height: 16px; + line-height: 14px; } .files { width: 50%; @@ -176,7 +176,7 @@ height: 620px; left: 5px; top: 5px; - overflow:auto; + overflow: auto; } .gameCanvas { position: absolute; @@ -186,15 +186,16 @@ /* top:0; left:320px; */ z-index:75; - width:32px;height:32px; - - margin:-2px 0 0 -2px; + width:26px; + height:26px; + margin: 3px 0 0 3px; padding:0; /* display: none; */ - + box-sizing: border-box; background-color:rgba(255, 255, 255, 0.0); - border: 2px solid #30DFF3; - box-shadow: 0px 0px 2px #30DFF3; + border: 1px solid #000; + box-shadow: 0 0 0 2px #fff, + 0 0 0 3px #000; } .warnText{ color: #D50000; @@ -293,14 +294,22 @@
-
-
-
- -

{{ errors[error-1] }}

+
+
+
+
+ +

{{ errors[error-1] }}

+
+
+ +
-
- +
+ +
+
+
@@ -318,7 +327,7 @@

图块编号：{{ infos['idnum'] }}

图块ID：{{ infos['id'] }}

该图块无对应的数字或ID存在，请先前往icons.js和maps.js中进行定义！

-

图块所在素材：{{ infos['images'] }}

+

图块所在素材：{{ infos['images'] + (isAutotile ? '( '+infos['id']+' )' : '') }}

图块索引：{{ infos['y'] }}

@@ -346,8 +355,6 @@
- - + - - - diff --git a/images/常用素材：如需使用请直接替换目录中的对应文件/autotile1.png b/images/autotile1.png similarity index 100% rename from images/常用素材：如需使用请直接替换目录中的对应文件/autotile1.png rename to images/autotile1.png diff --git a/images/常用素材：如需使用请直接替换目录中的对应文件/autotile2.png b/images/autotile2.png similarity index 100% rename from images/常用素材：如需使用请直接替换目录中的对应文件/autotile2.png rename to images/autotile2.png diff --git a/images/常用素材：如需使用请直接替换目录中的对应文件/autotile3.png b/images/autotile3.png similarity index 100% rename from images/常用素材：如需使用请直接替换目录中的对应文件/autotile3.png rename to images/autotile3.png diff --git a/libs/icons.js b/libs/icons.js index 2cd08b4a..4aced479 100644 --- a/libs/icons.js +++ b/libs/icons.js @@ -209,6 +209,12 @@ icons.prototype.init = function () { 'moneyPocket': 46, 'shoes': 47, 'hammer': 48 + }, + 'autotile': { // 所有的Autotile列表；后面的index简单取0即可 + 'autotile': 0, + 'autotile1': 0, + 'autotile2': 0, + 'autotile3': 0, } } } diff --git a/libs/maps.js b/libs/maps.js index aedd7101..b9a26395 100644 --- a/libs/maps.js +++ b/libs/maps.js @@ -79,9 +79,12 @@ maps.prototype.getBlock = function (x, y, id) { if (id == 15) tmp.event = {'cls': 'animates', 'id': 'water', 'noPass': true}; // 水 - // autotile: 20 + // Autotile if (id == 20) tmp.event = {'cls': 'autotile', 'id': 'autotile', 'noPass': true}; // autotile - // 更多的autotile从350继续放 + // 更多的autotile从151到160，只要不和现有的数字冲突即可 + if (id == 151) tmp.event = {'cls': 'autotile', 'id': 'autotile1', 'noPass': true}; + if (id == 152) tmp.event = {'cls': 'autotile', 'id': 'autotile2', 'noPass': true}; + if (id == 153) tmp.event = {'cls': 'autotile', 'id': 'autotile3', 'noPass': true}; // 21-80 物品 From 356dc647b446e436f616f8411be22a0fe744637b Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 29 Dec 2017 21:58:41 +0800 Subject: [PATCH 12/24] Support Hue --- 常用工具/便捷PS工具.exe | Bin 18432 -> 19968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/常用工具/便捷PS工具.exe b/常用工具/便捷PS工具.exe index c27e7010697dfd6e7338f859751e43de674b6a2e..a85e29fdd920ea29a553c1ac2f55718a1362bc92 100644 GIT binary patch delta 8624 zcmaJ{3wTu3wO)JA%$YN19^_2kkT4ShGI=2&DxpC_f*|4pjA#N!Uu(#VdNPpQ6=jAGY|oy;`65R&Uj|)_U)E)mnT1wa=NEB=)=E zn}4sh_S)-Td+o{`> zL|#_$mv8CGu@~n=7Qp*LHs^>+d}DQ`p@T#r=wECisFvam%W?v)f z135?;e`nw$$w$9iLR3~qB%qgK*uqnZ9?%iFQM_ia zk+s#a@VAkZ7>Ob`nJ|eAg<9j0VYyO>IrcN2)k4}8-i6t6b{Ph<*J^|xKBaSgRIixG ztT39YYbi>`!9A;@gBHm)fIYWo0tPuLw(xprwh&F-=d6mU}*B8sm@>!t~Ow6l~lyJvz zr9wYY%|i~?L#(ixRb-Yctrp1smazO%!-TZV9H>Em=0r4!xd1hFjUGgv;4)=J0@1X@ zJao;#s<&t6Lo&2V>m(xk3-3Jt0_bwM++N^2t;UfjC81d-b6ood-=dmHb(X_CpXLQT zBQItYubDI!*{I51h1O@+X)Rcv7?+AJnVQnBb%qAn)W3wZLwq3)=5=BEhls z07N;=F0I#-{fEFT)U4EKHgQ}Gs~w;vma^DkuQqD4I5dW4%>p`!x)Il%)PTfbZLX8U zT$biitPu+%Tx_>i?%Y7g+rJ#$xGPMLRf~ZhYq~<7K}M}tMR4KoFt{SL@HiTeU$;6b zOGY^ANi2g?sTacOEchTSXF-Fof(5_n^KP3#^ibzIXHQ$W1&nR$yGwnhPuWj3T%o7b zhmFpEZ!a3+Sq0kBv3?-25+wblK@i;B zY5GncN0Ik&`KjFua(=lb-M}Z?Hvp;Kjj(MUax#Ne8(OBAK2tZ1o^__tT^eW#n?^Qo z=_w7EI!0wX*Co#6DTmC!con|m)rc7^Eip?fdrrqft4k7BAkD-FhmBA?YFcZ0&9E6V zBZ*ZUZ%R`a3=tT@c|(Wk&B6kwyk(vm1E;(p4g*3I$4pU%a3QMZ*Uc%`SzypByFPzas{M+CBmEA$Vvlo_xplf`XJ=iDbq2)im>$1G5`C_upMu=OQr(&1!MLXW8F1@DO z{6#pfOWnfGo#>ph-5%`IVU)t#9CTXi9K@BL#JOmk+eD)v9&9-C=C369WnwkDGHU>a z%pf;oq>K~Dbg`%|EXP_=w5nSwb3Qv%DXS8zi{jLxh}$L~Oda0LS{{ZI0_$4d|06gj zN`@FKit(aYR}`@a;Clgw;Hq&5h*)=2jMKI*gpTW&#cm~X+OCz;cCDNWi&;3U@+;?r zGnxZcT0Lqw%L%*}7}olNZe65AMY5q_jV+AL&wQOdHx_K^AK=EdHWl>v-B|bdwK)En zBzyK|3tbh~W+ih}=YnzwS=Z8!a-1!27@EyDbE@E4Q8AvAozou|Ia&V-XJKrWb+N@d2PX|Py zM#^t;jmB|0CE~#2OT@aCuH-P2OT=9hOT?D+xp~U0^Um=1Ys9Xok>Xc@+!8smQzDj8 zBE0QPC=nlv`2S$BW8LG|ht27}Jh>dMLjAq5Rk2EUJ18o4s&aRO8gMBO*jDJPv<3{r;?soG^%1ICK%tmoNT2D?6qolm~Q{`Mqx?n&QT zWM@5=oiukgPIcMUfFBguS{K@mg#__Q1@SHh`hkMee7kQND zES`38N}ytMEa+0HFsrbQ|r()Tm!r7g$PTZ3=J%#-+L(Tsq znp{Bki$z>2H7Le|oGro6%L?^9%6WEHT7zm2vOWGG7~@Y(qU9bG$tt*|&vtXjKY!!1 zF(lSf*q5k^8dT!uzzPoCl)|Cgp<>O1IX`Qb(@Dfdz9ma5s^j0nv@$#4XQd0y@t<;j z&lU2^ZY*@A`-*kpSh3oPn@ZVCHy=f|t56eAKG_avUz*7vU}A`)Rwj0F6QAt?<>yS9 zcqZ51+Az+-6P;k->Q6A#O*ZhZo8S?fY~a&2!Glk^GGz0a@WnF0g|E2@ z2EKA982AY=!N3oz2?q5tFn)IG6-^l`6PNO=vlWSNa+}7_3Of>;SgcH3rYu(#s*8mW z^TO|jJu%Fk>RqqGy1XD;BTD2K8EcOcnLF>H@^C!(dF^`el(Vj^%B}`hBvjM{yEm>& z^T7n0_If90X>AoD2RXwOh-$$`^1{eykjq_APVUdP_7U)x2G zfD_-~seZ-UmCMjR2mLG%)prc=<5B%d@LpJZyTJPz(dV;HB9xWIZhXK^peF1ZmHu^T zxn6{NQ_voXpPt<*E{6WUq7!*^$`+~7F4+mo6$wtR|9#r^*!hcuzvBHp#eP%1%=xg^Glu3;THt*{pur5x;0x&~;_A^(+lHF?^9 zF)Y9J|H5z3Og+m4D|HS%sBh2>+6|1-RXPtlpzvY+HeI8);G@y!3d;i=dVYX|-W=eB z4k`SF!dDf(35<|5T4aP8fEq0~cvPQp7yX3(0Sh0c$BetOXnqZoMkPT`qAkeFaS`Mw z9Sw34KT`NhphmC2uF;nY&kC`;18C5LAs+P<~ZN^GN=k6wp zyCKhjY|^=&D}a}Kz6Jbg*7E?Zjw5UOR@EU?K+x4n8>RK45!%aj+&4-oaWZ}}{M6Nk zMH|k<_i%Z0-#%!5%Hfh>?YqLj zpmPeXcD0wFnRKVCy$h|BK6N#(Jdeuhk%TiYDtl1R*Bc$JMz*2Si<(&bG4;q44(&xs z8>OT)sD=jIv`er{@rKI3UJ;E^gJ%yquTk1wRf`(BQE9e*o#z_#z2s^KJvTsm&DHMn z+z9QruJ(xM7OJJtsT}iW{WZ@&Lu*i)Q{P%DRoYn9UEw|G!xK`_A8}1d`V{CPfon;) zs6&=CMOpH4Nr}KujO>%Q{QU^yd;cF9zmT{DrHZWbE1_$ZrP4b}hv*pXQ#hvZfWkux z?@@SI;iC$VDSRH7qT@<_RpC1d-v>TRpHcP@b&?Rg^#U*fm28TXc8sdUrP|M_P8`sV zlPT_p#S~8|{H2zH{5IqU5%9kPxy=6?Y8A8nZvp4}-vcfJE)_fdA3*NG%GV+Or_?}~ z_`jqcuxO%zzMJ(&&~SIZ_`W|T`o&RTtN4@uM1jq&pDfmprniexl~zA3!Ns*ttkF|6 z2Fq%30C)j#6r1Ug__m%B_rS6Z__Uru z9N16SAkM4e*1)^s9dS?K1N0sae1uW|8u$#oPowvJPOFpx>X3Xa{uG!dg*-$vrQJTe zD%-DCW1pC2U`=Ej(3IUqimK(1krMmFHOBM6dyOVpCyyHQWCMnNiqaf27Rr6%1>+da zb1knMOJI2yxAso@v#}iV7e+hES|3~`*AUy+(A;2(mcoBEVy+CHC--GVSMV6Elzr&f zC-wsSX+Q4kembb|J~*wxfF6W<$J*lFcjJ?12jFf1lSTvVUBGIzaAQu zqb^M@bT!6a2m3y8AjFfr3%C!x293$=3!yz|-U;0#$D}8Gi#&jigYuB-HdSp*>I(mt z{8$Wx{~&k5@(J+I26+y{C+ImQ9}DmDR4Y#%&w?Le=XK#X@Hx1TUI5lB+)K^gIrKGp z8I~aJ0hZFUz^1I~K1nI->Gv=VQ$1X}l)Y2oHmZOnLs8F46?!i`R*Aj1xf!QpkHUQSN@M>J1(?gakC za}V%6&rw_z<$Ocow)H`-P*{blUsAQbwqa-FIlRY~XnY?L{U&U`-0*zqKyUxh_T-Lv zKu4D(2X>`sOMhmEmB9<)k^gM@z*E}R zyK8938eFikbD)3ow$pkyZk%iX{^Xh!nbgq63)Fy4Yj6l$#Fo4A#oQp_As*^0c*mX}YhM zy2dj&X|G(SCW?IRyXP-E^564!iPLxrXC>2psm`s*!M>E5Ql2KcWs6%>T8O8(@X65qD}a{fB!=_T{LIdJnO)^j;Q57=X!hpqFHTTtu|^JagQvC z;9u0#;v#BtBSlTLntzPY18#5LTI-KX_R;OP7ER4+(UbAS6dot`6wydTbGJnx>S6N27>Ss< ze=>9T_~Kb9bls2sa(MXTUTC^r68G}}Gj~60X6`UzMk0pa8_ivb%*&+;{kXyNfRmYf z9Mk3z9>37Nd~SR^|0>7&yx;H9qq*mGyvm!oU1 zfXjd$J*(&Gj#v44Q9yiL52-&+NqKSkJ~MNFbtpc=?4zT+(l9@x_(sc}h8Mgh;>fki zVYDuU`9(tJXbbA-b8HPKbRn27A`xt=?pGG-;15ez7J0zeq?dLk-rVDv3`g(Rp3Vx~k4EyI6bV-ZQW5 zTkzrZ_u9S|J2G|}VqVnCd&v3Q!*YDAu0rnU9jhy|UtH35B))u;up{jmGl&0r$Z_4j c_}(MmX}5fVP0s%{v48#%bNNSNY_9+R08uWPIsgCw delta 7462 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 W6viKrapdUta|U8}ejxg%=>HGBouFg@ From 0c61b6d28d140950e02bead3805da1300137d8c5 Mon Sep 17 00:00:00 2001 From: oc Date: Sat, 30 Dec 2017 14:28:21 +0800 Subject: [PATCH 13/24] Add Point' --- libs/core.js | 38 ++++++++++++++++- libs/enemys.js | 30 ++++++++++++- libs/events.js | 95 +++++++++++++++++++++++++++++------------- libs/floors/sample2.js | 1 + 更新说明.txt | 4 +- 5 files changed, 133 insertions(+), 35 deletions(-) diff --git a/libs/core.js b/libs/core.js index 502a5130..a16345c3 100644 --- a/libs/core.js +++ b/libs/core.js @@ -1700,6 +1700,27 @@ core.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback) core.statusBar.floor.style.fontStyle = 'italic'; else core.statusBar.floor.style.fontStyle = 'normal'; + // 不存在事件时，更改画面色调 + if (core.status.event.id == null) { + // 默认画面色调 + if (core.isset(core.floors[floorId].color)) { + var color = core.floors[floorId].color; + + // 直接变色 + var nowR = parseInt(color[0]), nowG = parseInt(color[1]), nowB = parseInt(color[2]); + var toRGB = "#"+((1<<24)+(nowR<<16)+(nowG<<8)+nowB).toString(16).slice(1); + core.dom.curtain.style.background = toRGB; + if (core.isset(color[3])) + core.dom.curtain.style.opacity = color[3]; + else core.dom.curtain.style.opacity=1; + core.status.curtainColor = color; + } + else { + core.dom.curtain.style.background = "#000000"; + core.dom.curtain.style.opacity = 0; + } + } + core.drawMap(floorId, function () { setTimeout(function() { core.mapChangeAnimate('hide', time/4, function () { @@ -1904,7 +1925,7 @@ core.prototype.drawAutotile = function (floorId, canvas, autotileMaps, left, top } var isAutotile = function(x, y) { - if (x<0 || x>12 || y<0 || y>12) return 0; + if (x<0 || x>12 || y<0 || y>12) return 1; return autotileMaps[13*x+y]==autotileId?1:0; } for (var xx=0;xx<13;xx++) { @@ -2634,7 +2655,8 @@ core.prototype.snipe = function (snipes) { } core.prototype.setFg = function(color, time, callback) { - time = time || 750; + if (!core.isset(time)) time=750; + if (time<=0) time=0; if (!core.isset(core.status.curtainColor)) { core.status.curtainColor = [0,0,0,0]; @@ -2649,6 +2671,18 @@ core.prototype.setFg = function(color, time, callback) { if (color[3]<0) color[3]=0; if (color[3]>1) color[3]=1; + + if (time==0) { + // 直接变色 + var nowR = parseInt(color[0]), nowG = parseInt(color[1]), nowB = parseInt(color[2]); + var toRGB = "#"+((1<<24)+(nowR<<16)+(nowG<<8)+nowB).toString(16).slice(1); + core.dom.curtain.style.background = toRGB; + core.dom.curtain.style.opacity = color[3]; + core.status.curtainColor = color; + if (core.isset(callback)) callback(); + return; + } + var step=0; var changeAnimate = setInterval(function() { step++; diff --git a/libs/enemys.js b/libs/enemys.js index 95a19585..b2bc18fa 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -5,7 +5,7 @@ function enemys() { enemys.prototype.init = function () { // 怪物属性初始化定义： this.enemys = { - 'greenSlime': {'name': '绿头怪', 'hp': 100, 'atk': 120, 'def': 0, 'money': 1, 'experience': 1, 'special': 0}, + 'greenSlime': {'name': '绿头怪', 'hp': 100, 'atk': 120, 'def': 0, 'money': 1, 'experience': 1, 'special': 0, 'point': 2}, 'redSlime': {'name': '红头怪', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'blackSlime': {'name': '青头怪', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'slimelord': {'name': '怪王', 'hp': 100, 'atk': 120, 'def': 0, 'money': 10, 'experience': 0, 'special': 9}, @@ -106,6 +106,34 @@ enemys.prototype.getSpecialText = function (enemyId) { return text.join(" "); } +////// 获得每个属性的文字提示 ////// +enemys.prototype.getSpecialHint = function (enemy, special) { + switch (special) { + case 1: return "怪物首先攻击"; + case 2: return "怪物无视勇士的魔防"; + case 3: return "勇士每回合最多只能对怪物造成1点伤害"; + case 4: return "怪物每回合攻击2次"; + case 5: return "怪物每回合攻击3次"; + case 6: return "怪物每回合攻击4次"; + case 7: return "战斗前，怪物附加角色防御的"+parseInt(100*core.values.breakArmor)+"%作为伤害"; + case 8: return "战斗时，怪物每回合附加角色攻击的"+parseInt(100*core.values.counterAttack)+"%作为伤害，无视角色防御"; + case 9: return "战斗前，怪物附加勇士魔防的"+core.values.purify+"倍作为伤害"; + case 10: return "怪物的攻防和勇士攻防相等"; + case 11: return "战斗前，怪物首先吸取角色的"+parseInt(100*enemy.value)+"%生命作为伤害"; + case 12: return "战斗后，勇士陷入中毒状态，每一步损失生命"+core.values.poisonDamage+"点"; + case 13: return "战斗后，勇士陷入衰弱状态，攻防暂时下降"+core.values.weakValue+"点"; + case 14: return "战斗后，勇士陷入诅咒状态，战斗无法获得金币和经验"; + case 15: return "经过怪物周围"+(enemy.range||1)+"格时自动减生命"+enemy.damage+"点"; + case 16: return "经过两只相同的怪物中间，勇士生命值变成一半"; + case 17: return "战斗前，怪物附加之前积累的仇恨值作为伤害；战斗后，释放一半的仇恨值。（每杀死一个怪物获得"+core.values.hatred+"点仇恨值）"; + case 18: return "经过怪物的十字领域时自动减生命"+enemy.value+"点，同时怪物后退一格"; + case 19: return "战斗后勇士的生命值变成1"; + case 20: return "勇士无法打败怪物，除非拥有十字架"; + default: break; + } + return "" +} + enemys.prototype.getDamage = function (monsterId) { var monster = core.material.enemys[monsterId]; var hero_atk = core.status.hero.atk, hero_def = core.status.hero.def, hero_mdef = core.status.hero.mdef; diff --git a/libs/events.js b/libs/events.js index e82bfc8e..b7a906c8 100644 --- a/libs/events.js +++ b/libs/events.js @@ -410,7 +410,12 @@ events.prototype.doAction = function() { ////// 往当前事件列表之前添加一个或多个事件 ////// events.prototype.insertAction = function (action) { - core.unshift(core.status.event.data.list, action) + if (core.status.event.id == null) { + this.doEvents(action); + } + else { + core.unshift(core.status.event.data.list, action) + } } ////// 打开商店 ////// @@ -517,6 +522,30 @@ events.prototype.useItem = function(itemId) { else core.drawTip("当前无法使用"+core.material.items[itemId].name); } +////// 加点 ////// +events.prototype.addPoint = function (enemy) { + var point = enemy.point; + if (!core.isset(point) || point<=0) return []; + + // 加点，返回一个choices事件 + return [ + {"type": "choices", + "choices": [ + {"text": "生命+"+(200*point), "action": [ + {"type": "setValue", "name": "status:hp", "value": "status:hp+"+(200*point)} + ]}, + {"text": "攻击+"+(1*point), "action": [ + {"type": "setValue", "name": "status:atk", "value": "status:atk+"+(1*point)} + ]}, + {"text": "防御+"+(2*point), "action": [ + {"type": "setValue", "name": "status:def", "value": "status:def+"+(2*point)} + ]}, + ] + } + ]; + +} + /****** 打完怪物 ******/ events.prototype.afterBattle = function(enemyId,x,y,callback) { @@ -548,49 +577,55 @@ events.prototype.afterBattle = function(enemyId,x,y,callback) { core.setFlag('hatred', core.getFlag('hatred',0)+core.values.hatred); core.updateStatusBar(); + + // 事件的处理 + var todo = []; + // 如果不为阻击，且该点存在，且有事件 + if (!core.enemys.hasSpecial(special, 18) && core.isset(x) && core.isset(y)) { + var event = core.floors[core.status.floorId].afterBattle[x+","+y]; + if (core.isset(event)) { + // 插入事件 + core.unshift(todo, event); + } + } + // 如果有加点 + var point = core.material.enemys[enemyId].point; + if (core.isset(point) && point>0) { + core.unshift(todo, core.events.addPoint(core.material.enemys[enemyId])); + } + + // 如果事件不为空，将其插入 + if (todo.length>0) { + this.insertAction(todo); + } + // 如果已有事件正在处理中 - if (core.status.lockControl) { - if (core.isset(callback)) callback(); - return; - } - - // 阻击：不处理任何事件 - if (core.enemys.hasSpecial(special, 18)) { - if (core.isset(callback)) callback(); - return; - } - - // 检查处理后的事件。 - var event = core.floors[core.status.floorId].afterBattle[x+","+y]; - if (core.isset(event)) { - core.events.doEvents(event, x, y, callback); - } - //继续行走 - else { + if (core.status.event.id == null) { core.continueAutomaticRoute(); } if (core.isset(callback)) callback(); + } /****** 开完门 ******/ events.prototype.afterOpenDoor = function(doorId,x,y,callback) { - // 如果已有事件正在处理中 - if (core.status.lockControl) { - if (core.isset(callback)) callback(); - return; + var todo = []; + if (core.isset(x) && core.isset(y)) { + var event = core.floors[core.status.floorId].afterOpenDoor[x+","+y]; + if (core.isset(event)) { + core.unshift(todo, event); + } } - // 检查处理后的事件。 - var event = core.floors[core.status.floorId].afterOpenDoor[x+","+y]; - if (core.isset(event)) { - core.events.doEvents(event, x, y, callback); + if (todo.length>0) { + this.insertAction(todo); } - //继续行走 - else { + + if (core.status.event.id == null) { core.continueAutomaticRoute(); - if (core.isset(callback)) callback(); } + if (core.isset(callback)) callback(); } /****** 经过路障 ******/ diff --git a/libs/floors/sample2.js b/libs/floors/sample2.js index 32d227ff..0dcff5ab 100644 --- a/libs/floors/sample2.js +++ b/libs/floors/sample2.js @@ -8,6 +8,7 @@ main.floors.sample2 = { "canFlyTo": false, // 该楼能否被楼传器飞到（不能的话在该楼也不允许使用楼传器） "canUseQuickShop": true, // 该层是否允许使用快捷商店 "defaultGround": "snowGround", // 默认地面的图块ID（terrains中） + "color": [255,0,0,0.3], // 可以设置该层的默认背景色调（RGBA）；本项可省略 "map": [ // 地图数据，需要是13x13，建议使用地图生成器来生成 [5, 5, 5, 5, 5, 5, 87, 5, 5, 5, 5, 5, 5], [5, 4, 4, 4, 4, 1, 0, 1, 4, 4, 4, 4, 5], diff --git a/更新说明.txt b/更新说明.txt index f3e8c2a5..589d35c7 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,6 +1,6 @@ 全键盘操作 √ 经验升级（进阶） √ -增加阻击、自爆、无敌属性 √ +增加阻击等属性；属性显示；加点； √ 九宫格领域、大范围领域 √ Ctrl快速跳过对话 √ 增加负伤 √ @@ -9,4 +9,4 @@ Ctrl快速跳过对话 √ 支持多个Autotile同时存在 √ 直接内嵌了诸多默认的terrains素材 √ 自动定位到上次存/读档位置 √ -修改setFg的实现方法 √ \ No newline at end of file +每一层可以默认色调 √ From c0d67d431c5f5f3e444860748a7a7860b9aec540 Mon Sep 17 00:00:00 2001 From: oc Date: Sat, 30 Dec 2017 15:38:54 +0800 Subject: [PATCH 14/24] =?UTF-8?q?N=E8=BF=9E=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/enemys.js | 25 +++++++++++++------------ libs/ui.js | 2 +- 更新说明.txt | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/libs/enemys.js b/libs/enemys.js index b2bc18fa..2b54da9a 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -81,14 +81,15 @@ enemys.prototype.hasSpecial = function (special, test) { enemys.prototype.getSpecialText = function (enemyId) { if (enemyId == undefined) return ""; - var special = this.enemys[enemyId].special; + var enemy = this.enemys[enemyId]; + var special = enemy.special; var text = []; if (this.hasSpecial(special, 1)) text.push("先攻"); if (this.hasSpecial(special, 2)) text.push("魔攻"); if (this.hasSpecial(special, 3)) text.push("坚固"); if (this.hasSpecial(special, 4)) text.push("2连击"); if (this.hasSpecial(special, 5)) text.push("3连击"); - if (this.hasSpecial(special, 6)) text.push("4连击"); + if (this.hasSpecial(special, 6)) text.push((enemy.n||4)+"连击"); if (this.hasSpecial(special, 7)) text.push("破甲"); if (this.hasSpecial(special, 8)) text.push("反击"); if (this.hasSpecial(special, 9)) text.push("净化"); @@ -114,7 +115,7 @@ enemys.prototype.getSpecialHint = function (enemy, special) { case 3: return "勇士每回合最多只能对怪物造成1点伤害"; case 4: return "怪物每回合攻击2次"; case 5: return "怪物每回合攻击3次"; - case 6: return "怪物每回合攻击4次"; + case 6: return "怪物每回合攻击"+(enemy.n||4)+"次"; case 7: return "战斗前，怪物附加角色防御的"+parseInt(100*core.values.breakArmor)+"%作为伤害"; case 8: return "战斗时，怪物每回合附加角色攻击的"+parseInt(100*core.values.counterAttack)+"%作为伤害，无视角色防御"; case 9: return "战斗前，怪物附加勇士魔防的"+core.values.purify+"倍作为伤害"; @@ -138,7 +139,7 @@ enemys.prototype.getDamage = function (monsterId) { var monster = core.material.enemys[monsterId]; var hero_atk = core.status.hero.atk, hero_def = core.status.hero.def, hero_mdef = core.status.hero.mdef; var mon_hp = monster.hp, mon_atk = monster.atk, mon_def = monster.def, mon_special = monster.special; - var damage = this.calDamage(hero_atk, hero_def, hero_mdef, mon_hp, mon_atk, mon_def, mon_special); + var damage = this.calDamage(hero_atk, hero_def, hero_mdef, mon_hp, mon_atk, mon_def, mon_special, monster.n); if (damage == 999999999) return damage; return damage + this.getExtraDamage(monster); } @@ -161,12 +162,12 @@ enemys.prototype.getCritical = function (monsterId) { var monster = core.material.enemys[monsterId]; if (this.hasSpecial(monster.special, 3) || this.hasSpecial(monster.special, 10)) return "???"; var last = this.calDamage(core.status.hero.atk, core.status.hero.def, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special); + monster.hp, monster.atk, monster.def, monster.special, monster.n); if (last <= 0) return 0; for (var i = core.status.hero.atk + 1; i <= monster.hp + monster.def; i++) { var damage = this.calDamage(i, core.status.hero.def, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special); + monster.hp, monster.atk, monster.def, monster.special, monster.n); if (damage < last) return i - core.status.hero.atk; last = damage; @@ -181,25 +182,25 @@ enemys.prototype.getCriticalDamage = function (monsterId) { if (c <= 0) return 0; var monster = core.material.enemys[monsterId]; var last = this.calDamage(core.status.hero.atk, core.status.hero.def, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special); + monster.hp, monster.atk, monster.def, monster.special, monster.n); if (last == 999999999) return '???'; return last - this.calDamage(core.status.hero.atk + c, core.status.hero.def, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special); + monster.hp, monster.atk, monster.def, monster.special, monster.n); } // 1防减伤计算 enemys.prototype.getDefDamage = function (monsterId) { var monster = core.material.enemys[monsterId]; var nowDamage = this.calDamage(core.status.hero.atk, core.status.hero.def, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special); + monster.hp, monster.atk, monster.def, monster.special, monster.n); var nextDamage = this.calDamage(core.status.hero.atk, core.status.hero.def + 1, core.status.hero.mdef, - monster.hp, monster.atk, monster.def, monster.special); + monster.hp, monster.atk, monster.def, monster.special, monster.n); if (nowDamage == 999999999 || nextDamage == 999999999) return "???"; return nowDamage - nextDamage; } -enemys.prototype.calDamage = function (hero_atk, hero_def, hero_mdef, mon_hp, mon_atk, mon_def, mon_special) { +enemys.prototype.calDamage = function (hero_atk, hero_def, hero_mdef, mon_hp, mon_atk, mon_def, mon_special, n) { if (this.hasSpecial(mon_special, 20) && !core.hasItem("cross")) // 如果是无敌属性，且勇士未持有十字架 return 999999999; // 返回无限大 @@ -221,7 +222,7 @@ enemys.prototype.calDamage = function (hero_atk, hero_def, hero_mdef, mon_hp, mo if (this.hasSpecial(mon_special, 4)) per_damage *= 2; if (this.hasSpecial(mon_special, 5)) per_damage *= 3; - if (this.hasSpecial(mon_special, 6)) per_damage *= 4; + if (this.hasSpecial(mon_special, 6)) per_damage *= (n||4); var counterDamage = 0; // 反击 diff --git a/libs/ui.js b/libs/ui.js index bbb85c16..314ddbf2 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -405,7 +405,7 @@ ui.prototype.drawBattleAnimate = function(monsterId, callback) { var turns = 2; if (core.enemys.hasSpecial(mon_special, 4)) turns=3; if (core.enemys.hasSpecial(mon_special, 5)) turns=4; - if (core.enemys.hasSpecial(mon_special, 6)) turns=5; + if (core.enemys.hasSpecial(mon_special, 6)) turns=1+(monster.n||4); // 初始伤害 diff --git a/更新说明.txt b/更新说明.txt index 589d35c7..83a62ff8 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,6 +1,6 @@ 全键盘操作 √ 经验升级（进阶） √ -增加阻击等属性；属性显示；加点； √ +增加阻击、多连击等属性；属性显示；加点； √ 九宫格领域、大范围领域 √ Ctrl快速跳过对话 √ 增加负伤 √ From 9ecccf35de795ac80f90a305c232431b89880b58 Mon Sep 17 00:00:00 2001 From: oc Date: Sat, 30 Dec 2017 15:58:42 +0800 Subject: [PATCH 15/24] =?UTF-8?q?N=E8=BF=9E=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/enemys.js | 14 +++++++++----- libs/events.js | 4 ++-- libs/items.js | 2 +- libs/ui.js | 14 +++++++------- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/libs/enemys.js b/libs/enemys.js index 2b54da9a..a5c970fe 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -5,10 +5,10 @@ function enemys() { enemys.prototype.init = function () { // 怪物属性初始化定义： this.enemys = { - 'greenSlime': {'name': '绿头怪', 'hp': 100, 'atk': 120, 'def': 0, 'money': 1, 'experience': 1, 'special': 0, 'point': 2}, + 'greenSlime': {'name': '绿头怪', 'hp': 100, 'atk': 120, 'def': 0, 'money': 1, 'experience': 1, 'special': [1,5,7,8]}, 'redSlime': {'name': '红头怪', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'blackSlime': {'name': '青头怪', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, - 'slimelord': {'name': '怪王', 'hp': 100, 'atk': 120, 'def': 0, 'money': 10, 'experience': 0, 'special': 9}, + 'slimelord': {'name': '怪王', 'hp': 100, 'atk': 120, 'def': 0, 'money': 10, 'experience': 0, 'special': [1,9]}, 'bat': {'name': '小蝙蝠', 'hp': 100, 'atk': 120, 'def': 0, 'money': 2, 'experience': 0, 'special': 1}, 'bigBat': {'name': '大蝙蝠', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'redBat': {'name': '红蝙蝠', 'hp': 100, 'atk': 120, 'def': 0, 'money': 5, 'experience': 0, 'special': 4}, @@ -58,7 +58,7 @@ enemys.prototype.init = function () { 'badPrincess': {'name': '痛苦魔女', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'badFairy': {'name': '黑暗仙子', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'grayPriest': {'name': '中级法师', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, - 'redSwordsman': {'name': '剑王', 'hp': 100, 'atk': 120, 'def': 0, 'money': 7, 'experience': 0, 'special': 6}, + 'redSwordsman': {'name': '剑王', 'hp': 100, 'atk': 120, 'def': 0, 'money': 7, 'experience': 0, 'special': 6, 'n': 8}, // 多连击需要在后面指定n代表是几连击 'whiteGhost': {'name': '水银战士', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'poisonZombie': {'name': '绿兽人', 'hp': 100, 'atk': 120, 'def': 0, 'money': 13, 'experience': 0, 'special': 12}, 'magicDragon': {'name': '魔龙', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, @@ -104,7 +104,7 @@ enemys.prototype.getSpecialText = function (enemyId) { if (this.hasSpecial(special, 18)) text.push("阻击"); if (this.hasSpecial(special, 19)) text.push("自爆"); if (this.hasSpecial(special, 20)) text.push("无敌"); - return text.join(" "); + return text; } ////// 获得每个属性的文字提示 ////// @@ -262,6 +262,10 @@ enemys.prototype.getCurrentEnemys = function () { mon_def=core.status.hero.def; } + var specialText = core.enemys.getSpecialText(monsterId); + if (specialText.length>=3) specialText = "多属性..."; + else specialText = specialText.join(" "); + enemys.push({ 'id': monsterId, 'name': monster.name, @@ -270,7 +274,7 @@ enemys.prototype.getCurrentEnemys = function () { 'def': mon_def, 'money': monster.money, 'experience': monster.experience, - 'special': core.enemys.getSpecialText(monsterId), + 'special': specialText, 'damage': this.getDamage(monsterId), 'critical': this.getCritical(monsterId), 'criticalDamage': this.getCriticalDamage(monsterId), diff --git a/libs/events.js b/libs/events.js index b7a906c8..452a4f1b 100644 --- a/libs/events.js +++ b/libs/events.js @@ -805,11 +805,11 @@ events.prototype.keyUpAction = function (keycode) { events.prototype.clickBook = function(x,y) { // 上一页 if ((x == 3 || x == 4) && y == 12) { - core.ui.drawEnemyBook(core.status.event.data - 1); + core.ui.drawEnemyBook(core.status.event.data - 6); } // 下一页 if ((x == 8 || x == 9) && y == 12) { - core.ui.drawEnemyBook(core.status.event.data + 1); + core.ui.drawEnemyBook(core.status.event.data + 6); } // 返回 if (x>=10 && x<=12 && y==12) { diff --git a/libs/items.js b/libs/items.js index 449d2980..ae21b209 100644 --- a/libs/items.js +++ b/libs/items.js @@ -147,7 +147,7 @@ items.prototype.useItem = function (itemId) { if (!this.canUseItem(itemId)) return; var itemCls = core.material.items[itemId].cls; - if (itemId=='book') core.ui.drawEnemyBook(1); + if (itemId=='book') core.ui.drawEnemyBook(0); if (itemId=='fly') core.ui.drawFly(core.status.hero.flyRange.indexOf(core.status.floorId)); if (itemId == 'earthquake' || itemId == 'bomb' || itemId == 'pickaxe' || itemId=='icePickaxe' || itemId == 'snow' || itemId == 'hammer' || itemId=='bigKey') { diff --git a/libs/ui.js b/libs/ui.js index 314ddbf2..4659a055 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -423,7 +423,7 @@ ui.prototype.drawBattleAnimate = function(monsterId, callback) { hero_mdef=0; } - var specialText = core.enemys.getSpecialText(monsterId); + var specialTexts = core.enemys.getSpecialText(monsterId); var background = core.canvas.ui.createPattern(core.material.ground, "repeat"); @@ -466,7 +466,6 @@ ui.prototype.drawBattleAnimate = function(monsterId, callback) { core.canvas.ui.textAlign='center'; core.fillText('ui', core.status.hero.name, left+margin+boxWidth/2, top+margin+heroHeight+40, '#FFD700', 'bold 22px Verdana'); core.fillText('ui', "怪物", left+right-margin-boxWidth/2, top+margin+32+40); - var specialTexts = specialText.split(" "); for (var i=0, j=0; i=enemys.length) index=enemys.length-1; var perpage = 6; + var page=parseInt(index/perpage)+1; var totalPage = parseInt((enemys.length - 1) / perpage) + 1; - if (page < 1) page = 1; - if (page > totalPage) page = totalPage; - core.status.event.data = page; + core.status.event.data = index; var start = (page - 1) * perpage, end = Math.min(page * perpage, enemys.length); enemys = enemys.slice(start, end); From f2bfa7cd8414e40d420eb10d58f765637f33c43c Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 30 Dec 2017 17:25:39 +0800 Subject: [PATCH 16/24] Update Enemy Detail --- libs/enemys.js | 52 ++++++++++++++++++++++++--------------- libs/events.js | 27 +++++++++++++++++++-- libs/ui.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 22 deletions(-) diff --git a/libs/enemys.js b/libs/enemys.js index a5c970fe..759b505a 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -109,27 +109,39 @@ enemys.prototype.getSpecialText = function (enemyId) { ////// 获得每个属性的文字提示 ////// enemys.prototype.getSpecialHint = function (enemy, special) { + if (!core.isset(special)) { + var hints = []; + for (var i=1;i<100;i++) { + if (this.hasSpecial(enemy.special, i)) { + var hint=this.getSpecialHint(enemy, i); + if (hint!='') + hints.push(hint); + } + } + return hints; + } + switch (special) { - case 1: return "怪物首先攻击"; - case 2: return "怪物无视勇士的魔防"; - case 3: return "勇士每回合最多只能对怪物造成1点伤害"; - case 4: return "怪物每回合攻击2次"; - case 5: return "怪物每回合攻击3次"; - case 6: return "怪物每回合攻击"+(enemy.n||4)+"次"; - case 7: return "战斗前，怪物附加角色防御的"+parseInt(100*core.values.breakArmor)+"%作为伤害"; - case 8: return "战斗时，怪物每回合附加角色攻击的"+parseInt(100*core.values.counterAttack)+"%作为伤害，无视角色防御"; - case 9: return "战斗前，怪物附加勇士魔防的"+core.values.purify+"倍作为伤害"; - case 10: return "怪物的攻防和勇士攻防相等"; - case 11: return "战斗前，怪物首先吸取角色的"+parseInt(100*enemy.value)+"%生命作为伤害"; - case 12: return "战斗后，勇士陷入中毒状态，每一步损失生命"+core.values.poisonDamage+"点"; - case 13: return "战斗后，勇士陷入衰弱状态，攻防暂时下降"+core.values.weakValue+"点"; - case 14: return "战斗后，勇士陷入诅咒状态，战斗无法获得金币和经验"; - case 15: return "经过怪物周围"+(enemy.range||1)+"格时自动减生命"+enemy.damage+"点"; - case 16: return "经过两只相同的怪物中间，勇士生命值变成一半"; - case 17: return "战斗前，怪物附加之前积累的仇恨值作为伤害；战斗后，释放一半的仇恨值。（每杀死一个怪物获得"+core.values.hatred+"点仇恨值）"; - case 18: return "经过怪物的十字领域时自动减生命"+enemy.value+"点，同时怪物后退一格"; - case 19: return "战斗后勇士的生命值变成1"; - case 20: return "勇士无法打败怪物，除非拥有十字架"; + case 1: return "先攻：怪物首先攻击"; + case 2: return "魔攻：怪物无视勇士的魔防"; + case 3: return "坚固：勇士每回合最多只能对怪物造成1点伤害"; + case 4: return "2连击：怪物每回合攻击2次"; + case 5: return "3连击：怪物每回合攻击3次"; + case 6: return (enemy.n||4)+"连击： 怪物每回合攻击"+(enemy.n||4)+"次"; + case 7: return "破甲：战斗前，怪物附加角色防御的"+parseInt(100*core.values.breakArmor)+"%作为伤害"; + case 8: return "反击：战斗时，怪物每回合附加角色攻击的"+parseInt(100*core.values.counterAttack)+"%作为伤害，无视角色防御"; + case 9: return "净化：战斗前，怪物附加勇士魔防的"+core.values.purify+"倍作为伤害"; + case 10: return "模仿：怪物的攻防和勇士攻防相等"; + case 11: return "吸血：战斗前，怪物首先吸取角色的"+parseInt(100*enemy.value)+"%生命作为伤害"; + case 12: return "中毒：战斗后，勇士陷入中毒状态，每一步损失生命"+core.values.poisonDamage+"点"; + case 13: return "衰弱：战斗后，勇士陷入衰弱状态，攻防暂时下降"+core.values.weakValue+"点"; + case 14: return "诅咒：战斗后，勇士陷入诅咒状态，战斗无法获得金币和经验"; + case 15: return "领域：经过怪物周围"+(enemy.range||1)+"格时自动减生命"+enemy.damage+"点"; + case 16: return "夹击：经过两只相同的怪物中间，勇士生命值变成一半"; + case 17: return "仇恨：战斗前，怪物附加之前积累的仇恨值作为伤害；战斗后，释放一半的仇恨值。（每杀死一个怪物获得"+core.values.hatred+"点仇恨值）"; + case 18: return "阻击：经过怪物的十字领域时自动减生命"+enemy.value+"点，同时怪物后退一格"; + case 19: return "自爆：战斗后勇士的生命值变成1"; + case 20: return "无敌：勇士无法打败怪物，除非拥有十字架"; default: break; } return "" diff --git a/libs/events.js b/libs/events.js index 452a4f1b..38cda26c 100644 --- a/libs/events.js +++ b/libs/events.js @@ -806,21 +806,37 @@ events.prototype.clickBook = function(x,y) { // 上一页 if ((x == 3 || x == 4) && y == 12) { core.ui.drawEnemyBook(core.status.event.data - 6); + return; } // 下一页 if ((x == 8 || x == 9) && y == 12) { core.ui.drawEnemyBook(core.status.event.data + 6); + return; } // 返回 if (x>=10 && x<=12 && y==12) { core.ui.closePanel(true); + return; + } + // 怪物信息 + // var index = parseInt(y/2); + var data = core.status.event.data; + if (core.isset(data) && y<12) { + var page=parseInt(data/6); + var index=6*page+parseInt(y/2); + core.ui.drawEnemyBook(index); + core.ui.drawEnemyDetail(index); } return; } events.prototype.keyDownBook = function (keycode) { - if (keycode==37 || keycode==38) core.ui.drawEnemyBook(core.status.event.data - 1); - else if (keycode==39 || keycode==40) core.ui.drawEnemyBook(core.status.event.data + 1); + if (keycode==37) core.ui.drawEnemyBook(core.status.event.data-6); + if (keycode==38) core.ui.drawEnemyBook(core.status.event.data-1); + if (keycode==39) core.ui.drawEnemyBook(core.status.event.data+6); + if (keycode==40) core.ui.drawEnemyBook(core.status.event.data+1); + if (keycode==33) core.ui.drawEnemyBook(core.status.event.data-6); + if (keycode==34) core.ui.drawEnemyBook(core.status.event.data+6); return; } @@ -829,6 +845,13 @@ events.prototype.keyUpBook = function (keycode) { core.ui.closePanel(true); return; } + if (keycode==13 || keycode==32 || keycode==67) { + var data=core.status.event.data; + if (core.isset(data)) { + this.clickBook(6, 2*(data%6)); + } + return; + } } events.prototype.clickFly = function(x,y) { diff --git a/libs/ui.js b/libs/ui.js index 4659a055..0c0e60b3 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -835,11 +835,77 @@ ui.prototype.drawEnemyBook = function (index) { core.fillText('ui', '1防', 335, 62 * i + 68, '#DDDDDD', '13px Verdana'); core.fillText('ui', enemy.defDamage, 365, 62 * i + 68, '#DDDDDD', 'bold 13px Verdana'); + if (index == start+i) { + core.strokeRect('ui', 10, 62 * i + 13, 416-10*2, 62, '#FFD700'); + } + } core.setBoxAnimate(); this.drawPagination(page, totalPage); } +ui.prototype.drawEnemyDetail = function (index) { + var enemys = core.enemys.getCurrentEnemys(); + if (enemys.length==0) return; + if (index<0) index=0; + if (index>=enemys.length) index=enemys.length-1; + + var enemy = enemys[index]; + var enemyId=enemy.id; + var hints=core.enemys.getSpecialHint(core.enemys.getEnemys(enemyId)); + + if (hints.length==0) { + core.drawTip("该怪物无特殊属性！"); + return; + } + var content=hints.join("\n"); + + core.status.event.id = 'book-detail'; + clearInterval(core.interval.tipAnimate); + + core.clearMap('data', 0, 0, 416, 416); + core.setOpacity('data', 1); + + var left=10, right=416-2*left; + var content_left = left + 25; + + var validWidth = right-(content_left-left)-13; + var contents = core.splitLines("data", content, validWidth, '16px Verdana'); + + var height = 416 - 10 - Math.min(416-24*(contents.length+1)-65, 250); + var top = (416-height)/2, bottom = height; + + // var left = 97, top = 64, right = 416 - 2 * left, bottom = 416 - 2 * top; + core.setAlpha('data', 0.9); + core.fillRect('data', left, top, right, bottom, '#000000'); + core.setAlpha('data', 1); + core.strokeRect('data', left - 1, top - 1, right + 1, bottom + 1, '#FFFFFF', 2); + + // 名称 + core.canvas.data.textAlign = "left"; + + core.fillText('data', enemy.name, content_left, top + 30, '#FFD700', 'bold 22px Verdana'); + var content_top = top + 57; + + for (var i=0;i=0) { + var x1 = text.substring(0, index+1); + core.fillText('data', x1, content_left, content_top, '#FF6A6A', 'bold 16px Verdana'); + var len=core.canvas.data.measureText(x1).width; + core.fillText('data', text.substring(index+1), content_left+len, content_top, '#FFFFFF', '16px Verdana'); + } + else { + core.fillText('data', contents[i], content_left, content_top, '#FFFFFF', '16px Verdana'); + } + content_top+=24; + } + + core.fillText('data', '<点击任意位置继续>', 270, top+height-13, '#CCCCCC', '13px Verdana'); +} + /** * 绘制楼传器 * @param page From 2d9278f8f68fe9b269b14ae545ac03f67f572815 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 30 Dec 2017 18:05:21 +0800 Subject: [PATCH 17/24] Monster Detail --- libs/core.js | 12 +++++++++++- libs/enemys.js | 2 +- libs/events.js | 9 ++++++++- libs/ui.js | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/libs/core.js b/libs/core.js index a16345c3..e572fe5b 100644 --- a/libs/core.js +++ b/libs/core.js @@ -614,6 +614,10 @@ core.prototype.keyUp = function(keyCode) { core.events.keyUpBook(keyCode); return; } + if (core.status.event.id=='book-detail' && (keyCode==13 || keyCode==32 || keyCode==67)) { + core.events.clickBookDetail(); + return; + } if (core.status.event.id=='fly') { core.events.keyUpFly(keyCode); return; @@ -856,6 +860,12 @@ core.prototype.onclick = function (x, y, stepPostfix) { return; } + // 怪物详细信息 + if (core.status.event.id == 'book-detail') { + core.events.clickBookDetail(x,y); + return; + } + // 楼层飞行器 if (core.status.event.id == 'fly') { core.events.clickFly(x,y); @@ -2081,7 +2091,7 @@ core.prototype.nearStair = function() { core.prototype.enemyExists = function (x, y, id,floorId) { var block = core.getBlock(x,y,floorId); if (block==null) return false; - return block.block.event.cls=='enemys' && block.block.event.id==id; + return block.block.event.cls=='enemys' && (core.isset(id)?block.block.event.id==id:true); } core.prototype.getBlock = function (x, y, floorId, needEnable) { diff --git a/libs/enemys.js b/libs/enemys.js index 759b505a..f9e29705 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -136,7 +136,7 @@ enemys.prototype.getSpecialHint = function (enemy, special) { case 12: return "中毒：战斗后，勇士陷入中毒状态，每一步损失生命"+core.values.poisonDamage+"点"; case 13: return "衰弱：战斗后，勇士陷入衰弱状态，攻防暂时下降"+core.values.weakValue+"点"; case 14: return "诅咒：战斗后，勇士陷入诅咒状态，战斗无法获得金币和经验"; - case 15: return "领域：经过怪物周围"+(enemy.range||1)+"格时自动减生命"+enemy.damage+"点"; + case 15: return "领域：经过怪物周围"+(enemy.range||1)+"格时自动减生命"+enemy.value+"点"; case 16: return "夹击：经过两只相同的怪物中间，勇士生命值变成一半"; case 17: return "仇恨：战斗前，怪物附加之前积累的仇恨值作为伤害；战斗后，释放一半的仇恨值。（每杀死一个怪物获得"+core.values.hatred+"点仇恨值）"; case 18: return "阻击：经过怪物的十字领域时自动减生命"+enemy.value+"点，同时怪物后退一格"; diff --git a/libs/events.js b/libs/events.js index 38cda26c..cd866e90 100644 --- a/libs/events.js +++ b/libs/events.js @@ -825,7 +825,7 @@ events.prototype.clickBook = function(x,y) { var page=parseInt(data/6); var index=6*page+parseInt(y/2); core.ui.drawEnemyBook(index); - core.ui.drawEnemyDetail(index); + core.ui.drawBookDetail(index); } return; } @@ -854,6 +854,13 @@ events.prototype.keyUpBook = function (keycode) { } } +events.prototype.clickBookDetail = function (x,y) { + core.clearMap('data', 0, 0, 416, 416); + + core.status.event.id = 'book'; + +} + events.prototype.clickFly = function(x,y) { if ((x==10 || x==11) && y==9) core.ui.drawFly(core.status.event.data-1); if ((x==10 || x==11) && y==5) core.ui.drawFly(core.status.event.data+1); diff --git a/libs/ui.js b/libs/ui.js index 0c0e60b3..f9480f9c 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -844,7 +844,7 @@ ui.prototype.drawEnemyBook = function (index) { this.drawPagination(page, totalPage); } -ui.prototype.drawEnemyDetail = function (index) { +ui.prototype.drawBookDetail = function (index) { var enemys = core.enemys.getCurrentEnemys(); if (enemys.length==0) return; if (index<0) index=0; From d37c28abdfed3088de71689926caebe8bb0564fc Mon Sep 17 00:00:00 2001 From: echo Date: Sun, 31 Dec 2017 01:07:25 +0800 Subject: [PATCH 18/24] for v1.3 --- _server/vm.js | 23 +++++++++- drawMapGUI.html | 117 +++++++++++++++++++++++++++++++----------------- 2 files changed, 98 insertions(+), 42 deletions(-) diff --git a/_server/vm.js b/_server/vm.js index 4187ccc2..e198d040 100644 --- a/_server/vm.js +++ b/_server/vm.js @@ -184,6 +184,7 @@ var tip = new Vue({ hasId: true, isAutotile: false, isSelectedBlock: false, + isClearBlock: false, geneMapSuccess: false, timer: null, msgs: [ //分别编号1,2,3,4,5,6,7,8；奇数警告，偶数成功 @@ -202,15 +203,19 @@ var tip = new Vue({ watch: { infos: { handler: function(val, oldval){ + this.isClearBlock = false; if(typeof(val) != 'undefined'){ - this.infos = val; + if(val==0) { + this.isClearBlock = true; + return; + } if('id' in val){ this.hasId = true; }else{ this.hasId = false; } this.isAutotile = false; - if(this.infos.images == "autotile" && this.hasId) this.isAutotile = true; + if(val.images == "autotile" && this.hasId) this.isAutotile = true; } }, deep: true @@ -244,4 +249,18 @@ var selectBox = new Vue({ clearTimeout(tip.timer); } } +}) + +var bgSelect = new Vue({ + el: '#bgSelect', + data: { + bgs: {}, + selectedBg: 'ground' + }, + watch:{ + selectedBg: function(){ + editor.bgY = this.bgs.indexOf(this.selectedBg); + editor.drawMapBg(); + } + } }) \ No newline at end of file diff --git a/drawMapGUI.html b/drawMapGUI.html index f1df9a1c..1b76a04a 100644 --- a/drawMapGUI.html +++ b/drawMapGUI.html @@ -129,6 +129,16 @@ border-radius: 3px; box-shadow: inset 0 1px 1px rgba(0,0,0,.075); } + #bgSelect{ + width: 50%; + height: 100px; + margin-top: 10px; + } + #bgSelect span{ + display: block; + font-size: 14px; + line-height: 30px; + } #printOut{ margin-top: 10px; height: 20px; @@ -324,11 +334,14 @@

-

图块编号：{{ infos['idnum'] }}

-

图块ID：{{ infos['id'] }}

-

该图块无对应的数字或ID存在，请先前往icons.js和maps.js中进行定义！

-

图块所在素材：{{ infos['images'] + (isAutotile ? '( '+infos['id']+' )' : '') }}

-

图块索引：{{ infos['y'] }}

+

当前选择为清除块，可擦除地图上块

+
+

图块编号：{{ infos['idnum'] }}

+

图块ID：{{ infos['id'] }}

+

该图块无对应的数字或ID存在，请先前往icons.js和maps.js中进行定义！

+

图块所在素材：{{ infos['images'] + (isAutotile ? '( '+infos['id']+' )' : '') }}

+

图块索引：{{ infos['y'] }}

+

{{ mapMsg }}

@@ -336,13 +349,14 @@
- -
- - - - -
+
+ + 当前地板: {{ selectedBg }}
@@ -378,7 +392,7 @@ - +