From ce577c56b1b9306f8f84feeff845cba3dc98ab3f Mon Sep 17 00:00:00 2001 From: oc Date: Tue, 20 Feb 2018 22:05:10 +0800 Subject: [PATCH 1/2] Update --- libs/enemys.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/enemys.js b/libs/enemys.js index 5d3033ae..573fa3a9 100644 --- a/libs/enemys.js +++ b/libs/enemys.js @@ -45,7 +45,7 @@ enemys.prototype.init = function () { '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}, + 'redSkeletonCaption': {'name': '骷髅武士', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'badHero': {'name': '迷失勇者', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'demon': {'name': '魔神武士', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, 'demonPriest': {'name': '魔神法师', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'special': 0}, From 8396f283073ce55f4269e698d81333d7cf2cd237 Mon Sep 17 00:00:00 2001 From: oc Date: Tue, 20 Feb 2018 22:53:57 +0800 Subject: [PATCH 2/2] Fix setBlock Bug --- libs/events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/events.js b/libs/events.js index eb8bc9cc..fdb43ac8 100644 --- a/libs/events.js +++ b/libs/events.js @@ -359,7 +359,7 @@ events.prototype.doAction = function() { y=data.loc[1]; } var floorId = data.floorId||core.status.floorId; - var originBlock=core.getBlock(x,y,toId,false); + var originBlock=core.getBlock(x,y,floorId,false); var block = core.maps.getBlock(x,y,data.number); core.maps.addInfo(block); core.maps.addEvent(block,x,y,core.floors[floorId].events[x+","+y]);