From e77762b10ffc050e41cc00c81977349d9aac7a2c Mon Sep 17 00:00:00 2001 From: oc Date: Sun, 17 Dec 2017 14:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=AA=E7=89=A9=E5=8F=8C=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/autotile.png | Bin 0 -> 3476 bytes libs/core.js | 114 +++++++----- libs/data.js | 7 +- libs/enemys.js | 67 +++---- libs/events.js | 12 +- libs/ui.js | 54 +++--- test/autotile.png | Bin 0 -> 3476 bytes test/grassAutotile.html | 377 ++++++++++++++++++++++++++++++++++++++++ 更新内容.txt | 6 + 9 files changed, 531 insertions(+), 106 deletions(-) create mode 100644 images/autotile.png create mode 100644 test/autotile.png create mode 100644 test/grassAutotile.html create mode 100644 更新内容.txt diff --git a/images/autotile.png b/images/autotile.png new file mode 100644 index 0000000000000000000000000000000000000000..18e92ecf67f14cc3fd87ca19d10a03b4b462911b GIT binary patch literal 3476 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 literal 0 HcmV?d00001 diff --git a/libs/core.js b/libs/core.js index 82d7ddd6..831c1e41 100644 --- a/libs/core.js +++ b/libs/core.js @@ -425,49 +425,48 @@ core.prototype.keyDown = function(keyCode) { } core.prototype.keyUp = function(keyCode) { - if(!core.status.played) { - return; -} + if(!core.status.played) + return; -if (core.status.lockControl) { - if (core.status.event.id == 'book' && (keyCode==27 || keyCode==88)) - core.ui.closePanel(true); - if (core.status.event.id == 'fly' && (keyCode==71 || keyCode==27)) - core.ui.closePanel(); - if (core.status.event.id == 'fly' && keyCode==13) { - var index=core.status.hero.flyRange.indexOf(core.status.floorId); - var stair=core.status.event.data1) { // 1血夹击不死 core.status.hero.hp = parseInt(core.status.hero.hp/2); @@ -490,19 +490,19 @@ events.prototype.afterBattle = function(enemyId,x,y,callback) { // 毒衰咒的处理 var special = core.material.enemys[enemyId].special; // 中毒 - if (special==12 && !core.hasFlag('poison')) { + if (core.enemys.hasSpecial(special, 12) && !core.hasFlag('poison')) { core.setFlag('poison', true); core.updateStatusBar(); } // 衰弱 - if (special==13 && !core.hasFlag('weak')) { + if (core.enemys.hasSpecial(special, 13) && !core.hasFlag('weak')) { core.setFlag('weak', true); core.status.hero.atk-=core.values.weakValue; core.status.hero.def-=core.values.weakValue; core.updateStatusBar(); } // 诅咒 - if (special==14 && !core.hasFlag('curse')) { + if (core.enemys.hasSpecial(special, 14) && !core.hasFlag('curse')) { core.setFlag('curse', true); core.updateStatusBar(); } diff --git a/libs/ui.js b/libs/ui.js index bd62e491..9ee04878 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -377,28 +377,34 @@ ui.prototype.drawBattleAnimate = function(monsterId, callback) { hero_hp -= core.enemys.getExtraDamage(monster); - if (mon_special==2) hero_def=0; // 魔攻 - if (mon_special==3 && mon_defH9Xy06pc{#>6s_KfXGg)O_b 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 literal 0 HcmV?d00001 diff --git a/test/grassAutotile.html b/test/grassAutotile.html new file mode 100644 index 00000000..4d452305 --- /dev/null +++ b/test/grassAutotile.html @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + +

通过鼠标拖拽或点击添加草地

+ + + + + + \ No newline at end of file diff --git a/更新内容.txt b/更新内容.txt new file mode 100644 index 00000000..d67dbba6 --- /dev/null +++ b/更新内容.txt @@ -0,0 +1,6 @@ +新增：支持Autotile +新增：怪物支持双属性 √ +新增：单向箭头、感叹号 +快捷道具使用：1破2炸3飞；读档改为D键 √ +更多的默认素材；无需P图，直接替换即可 +破甲、反击、净化等效果放全局变量