diff --git a/project/enemys.js b/project/enemys.js index 811acf2..ff7453e 100644 --- a/project/enemys.js +++ b/project/enemys.js @@ -10,7 +10,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "vampire": {"name":"冥灵魔王","hp":888,"atk":888,"def":888,"money":888,"exp":888,"point":0,"special":[6],"n":8,"mdef":0,"spell":0,"speed":1}, "skeleton": {"name":"骷髅人","hp":77,"atk":77,"def":7,"money":0,"exp":2,"point":0,"special":0,"mdef":0,"spell":0,"speed":17}, "skeletonCaptain": {"name":"骷髅队长","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18}, - "zombie": {"name":"兽人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[22],"mdef":0,"spell":0,"speed":1}, + "zombie": {"name":"兽人","hp":444,"atk":43,"def":9,"money":0,"exp":3,"point":0,"special":[],"mdef":0,"spell":0,"speed":27}, "zombieKnight": {"name":"兽人武士","hp":10000,"atk":100,"def":100,"money":0,"exp":0,"point":0,"special":[22],"speed":10,"mdef":0,"damage2":20,"spell":0}, "rock": {"name":"石头人","hp":50,"atk":50,"def":0,"money":3,"exp":0,"point":0,"special":3,"damage2":15,"mdef":0,"spell":0,"speed":1}, "bluePriest": {"name":"初级法师","hp":108,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":270,"speed":12}, @@ -30,7 +30,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "skeletonKing": {"name":"骷髅王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, "evilHero": {"name":"迷失勇者","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, "demonPriest": {"name":"魔神法师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, - "goldHornSlime": {"name":"金角怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, + "goldHornSlime": {"name":"小恶魔","hp":126,"atk":48,"def":12,"money":0,"exp":2,"point":0,"special":0,"mdef":0,"spell":0,"speed":16}, "silverSlime": {"name":"银头怪","hp":100,"atk":120,"def":0,"money":15,"exp":0,"point":0,"special":14,"mdef":0,"spell":0,"speed":1}, "whiteHornSlime": {"name":"尖角怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0}, "redSwordsman": {"name":"剑王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":0,"speed":1}, @@ -43,7 +43,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "evilBat": {"name":"邪恶蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, "silverSlimelord": {"name":"银怪王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, "goldSlimelord": {"name":"金怪王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, - "skeletonWarrior": {"name":"骷髅士兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, + "skeletonWarrior": {"name":"骷髅士兵","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18,"displayIdInBook":null}, "whiteSlimeman": {"name":"水银战士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, "slimeman": {"name":"影子战士","hp":243,"atk":28,"def":5,"money":0,"exp":0,"point":0,"special":[],"atkValue":2,"defValue":3,"mdef":0,"spell":0,"speed":69}, "yellowGateKeeper": {"name":"初级卫兵","hp":80,"atk":25,"def":5,"money":3,"exp":1,"point":0,"special":0,"mdef":0,"spell":0,"speed":1}, @@ -82,5 +82,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "bearRight": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"mdef":0,"spell":0,"speed":1}, "bearUp": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"mdef":0,"spell":0,"speed":1}, "E421": {"name":"蓝头怪","hp":104,"atk":33,"def":8,"money":0,"exp":1,"point":0,"special":[],"value":null,"mdef":0,"spell":0,"speed":19,"displayIdInBook":null}, - "E422": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]} + "E422": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]}, + "E425": {"name":"黄骷髅","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18,"displayIdInBook":null}, + "E426": {"name":"小偷","hp":377,"atk":53,"def":17,"mdef":0,"speed":23,"money":50,"exp":10,"point":0,"special":[],"spell":0} } \ No newline at end of file diff --git a/project/floors/jiaocheng01.js b/project/floors/jiaocheng01.js index 2b82f13..61b259a 100644 --- a/project/floors/jiaocheng01.js +++ b/project/floors/jiaocheng01.js @@ -262,9 +262,9 @@ main.floors.jiaocheng01= [ 1, 0, 0, 82, 0, 1, 81, 1, 82, 1, 1, 1, 1], [ 1, 21, 1, 1, 0, 1, 22, 1, 0, 0, 21, 23, 1], [ 1, 1, 1, 1, 83, 1, 1, 1, 1, 1, 1, 1, 1], - [ 27, 0, 28, 1, 0,124, 82, 0, 22, 1, 31, 0, 32], + [401, 0,402, 1, 0,124, 82, 0, 22, 1, 31, 0, 32], [ 0, 0, 0, 1, 21, 1, 1, 1, 0, 1, 0, 0, 0], - [ 29, 0, 30, 1, 23, 1, 21, 1, 0, 1, 34, 0, 33], + [403, 0,404, 1, 23, 1, 21, 1, 0, 1, 34, 0, 33], [ 1, 1, 1, 1, 1, 1, 0, 1, 81, 1, 1, 1, 1], [129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,129], [ 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1] diff --git a/project/floors/jiaocheng02.js b/project/floors/jiaocheng02.js index 0d540ee..8cea02c 100644 --- a/project/floors/jiaocheng02.js +++ b/project/floors/jiaocheng02.js @@ -310,19 +310,19 @@ main.floors.jiaocheng02= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 0, 31, 0,217, 33, 0, 91, 1, 28, 1, 30, 1,203], - [216, 1, 0, 1, 1, 1, 1, 1, 28, 1, 30, 1, 1], - [216, 1, 31, 1, 0, 0, 0, 81, 0, 1, 0, 1,211], - [211, 1, 21, 1,216, 1,216, 1, 1, 1, 81, 1, 1], - [ 0, 1, 1, 1, 0, 1, 0, 0, 0,211, 0, 0, 0], - [ 31, 1, 32, 1, 0, 1, 1, 0, 1, 1, 1, 1,211], + [ 0, 31, 0,217, 33, 0, 91, 1,402, 1,404, 1,203], + [216, 1, 0, 1, 1, 1, 1, 1,402, 1,404, 1, 1], + [216, 1, 31, 1, 0, 0, 0, 81, 0, 1, 0, 1,425], + [425, 1, 21, 1,216, 1,216, 1, 1, 1, 81, 1, 1], + [ 0, 1, 1, 1, 0, 1, 0, 0, 0,425, 0, 0, 0], + [ 31, 1, 32, 1, 0, 1, 1, 0, 1, 1, 1, 1,425], [ 0, 82, 0, 1, 0, 1, 21, 33, 1, 33, 0, 81, 0], [ 0, 1, 1, 1,217, 1, 1, 1, 1, 1, 1, 1, 22], - [203, 1, 33, 0, 0, 29, 29, 29, 29, 1, 0, 0, 0], + [203, 1, 33, 0, 0,403,403,403,403, 1, 0, 0, 0], [ 0, 1, 1, 1, 0, 1, 1, 1, 1, 1,203, 1, 82], - [ 33, 0,211, 1, 0, 1, 0,203, 0,124, 0, 1, 0], + [ 33, 0,425, 1, 0, 1, 0,203, 0,124, 0, 1, 0], [ 0, 82, 0, 1,217, 1, 0, 1, 1, 81, 1, 1, 21], - [216, 0, 0, 22, 0, 1, 93, 1, 27, 0, 27, 1, 21] + [216, 0, 0, 22, 0, 1, 93, 1,401, 0,401, 1, 21] ], "areas": "教程", "bgmap": [ diff --git a/project/floors/jiaocheng03.js b/project/floors/jiaocheng03.js index a037050..cc919bd 100644 --- a/project/floors/jiaocheng03.js +++ b/project/floors/jiaocheng03.js @@ -137,18 +137,18 @@ main.floors.jiaocheng03= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [129, 1, 27, 1, 28, 1, 91, 1, 29, 1, 30, 1,129], + [129, 1,401, 1,402, 1, 91, 1,403, 1,404, 1,129], [ 70, 1, 82, 1, 82, 1,236, 1, 82, 1, 82, 1,375], - [ 0, 83, 0, 29, 0, 33, 0, 31, 0, 23, 0, 83, 0], + [ 0, 83, 0,403, 0, 33, 0, 31, 0, 23, 0, 83, 0], [ 1, 1, 1, 1, 1, 1,219, 1, 1, 1, 1, 1, 1], - [ 0, 22, 0, 31, 0, 31, 0, 1, 27, 1, 30, 1, 30], - [ 81, 1, 81, 1, 81, 1, 22, 1, 27, 1, 30, 1, 27], - [ 29, 1, 31, 1, 31, 1,218, 1, 82, 1, 82, 1, 82], - [ 28, 1, 28, 1, 29, 1, 0, 81, 0, 33, 0, 21, 0], + [ 0, 22, 0, 31, 0, 31, 0, 1,401, 1,404, 1,404], + [ 81, 1, 81, 1, 81, 1, 22, 1,401, 1,404, 1,401], + [403, 1, 31, 1, 31, 1,218, 1, 82, 1, 82, 1, 82], + [402, 1,402, 1,403, 1, 0, 81, 0, 33, 0, 21, 0], [ 1, 1, 1, 1, 1, 1,240, 1, 1, 1, 1, 1, 1], - [ 0, 33, 0, 21, 0, 29, 0, 1, 27, 1, 28, 1, 31], + [ 0, 33, 0, 21, 0,403, 0, 1,401, 1,402, 1, 31], [ 83, 1, 83, 1, 83, 1,204, 1, 81, 1, 81, 1, 81], - [ 28, 1, 30, 1, 27,129,124,204, 0, 33, 0, 23, 0], + [402, 1,404, 1,401,129,124,204, 0, 33, 0, 23, 0], [ 1, 1, 1, 1, 1, 1, 93, 1, 1, 1, 1, 1, 1] ], "areas": "牢狱", diff --git a/project/floors/yiqu2.js b/project/floors/yiqu2.js index 2ec9eca..16400e4 100644 --- a/project/floors/yiqu2.js +++ b/project/floors/yiqu2.js @@ -44,11 +44,11 @@ main.floors.yiqu2= [ 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [ 1, 81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 22], [ 1, 81, 1, 1, 1, 1, 1, 1, 1, 0, 83, 0,403], - [ 31, 0,401,209, 0,402, 1, 0, 32, 0, 1,205, 0], + [ 31, 0,401,209, 0,402, 1, 0, 34, 0, 1,209, 0], [ 0,202, 0, 1, 32, 0, 1,405, 0,408, 1, 81, 1], - [ 1, 81, 1, 1, 0,421, 1, 0,240, 0, 1, 0, 94], + [ 1, 81, 1, 1, 0,421, 1, 0,204, 0, 1, 0, 94], [ 92, 0, 21, 1, 1, 81, 1, 1, 82, 1, 1,205, 1], - [ 1, 1, 0,202, 0, 0, 32,421, 0, 1, 21, 0, 1], + [ 1, 1, 0,202, 0, 0, 32,209, 0, 1, 21, 0, 1], [ 0,201, 0, 1, 81, 1, 1, 1, 0,205, 0, 0,421], [202, 1, 1, 1, 0, 1,402, 1,201, 1, 31, 1, 0], [ 0, 21, 21, 1, 0,202, 0,201, 0, 1, 1, 1, 22] diff --git a/project/floors/yiqu3.js b/project/floors/yiqu3.js index 5ae7ffe..6acf6a5 100644 --- a/project/floors/yiqu3.js +++ b/project/floors/yiqu3.js @@ -15,7 +15,22 @@ main.floors.yiqu3= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "0,7": { + "floorId": "yiqu2", + "loc": [ + 12, + 7 + ] + }, + "5,0": { + "floorId": "yiqu4", + "loc": [ + 5, + 12 + ] + } + }, "beforeBattle": {}, "afterBattle": {}, "afterGetItem": {}, @@ -24,19 +39,19 @@ main.floors.yiqu3= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 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, 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] + [ 1, 1, 1, 1, 1, 91, 1, 1, 1, 1, 1, 1, 1], + [ 1, 1, 1, 1, 1, 0, 1, 1, 1, 31, 21, 1, 1], + [ 1, 1, 1, 1, 1,203, 1, 1, 1, 1, 21, 1, 1], + [ 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1], + [ 1, 1, 1, 1, 1,205, 1, 1, 1, 1, 82, 1, 1], + [ 1, 0,202, 0,421, 0,421, 0, 31, 0, 0, 1, 1], + [ 1,201, 1, 1, 81, 1, 1, 1, 1, 1, 81, 1, 1], + [ 92, 0, 1, 31, 0,209, 0, 1,403, 0,209, 1, 1], + [ 1, 81, 1, 0,244, 0, 31, 1, 0,403, 0, 1, 23], + [205, 0, 1, 1, 1, 1, 82, 1,205, 1, 1, 1, 0], + [ 0,209, 1,401,402, 0, 0, 1, 0, 1,244, 0, 31], + [205, 0, 1, 1, 1, 1,216, 1, 81, 1, 0, 81, 0], + [ 21, 0,203, 0, 31, 21, 0, 81, 0, 82,216, 0,203] ], "bgmap": [ diff --git a/project/floors/yiqu4.js b/project/floors/yiqu4.js index c3c0f66..7462679 100644 --- a/project/floors/yiqu4.js +++ b/project/floors/yiqu4.js @@ -15,7 +15,22 @@ main.floors.yiqu4= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "5,12": { + "floorId": "yiqu3", + "loc": [ + 5, + 0 + ] + }, + "12,11": { + "floorId": "yiqu5", + "loc": [ + 0, + 11 + ] + } + }, "beforeBattle": {}, "afterBattle": {}, "afterGetItem": {}, @@ -24,19 +39,19 @@ main.floors.yiqu4= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 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, 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] + [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + [ 1, 1, 1,421, 0,205, 0,421, 1, 1, 1, 1, 1], + [ 1, 1, 1, 0, 1, 81, 1, 0, 81, 81, 0,205, 0], + [ 0,244, 0, 31, 1, 0, 1, 31, 1, 1,216, 1, 31], + [ 0, 1,425, 1, 1, 31, 1, 1, 22, 1, 0, 1, 1], + [ 31, 1, 0, 1,401, 1,402, 1, 0, 1, 32, 1,403], + [ 0, 81, 21, 1, 0, 1, 0, 1,244, 81, 0, 81, 0], + [403, 1, 0, 1, 82, 1, 82, 1, 1, 1,216, 1, 1], + [ 0, 1,421, 0, 21, 0, 32, 0,240, 21, 0,425, 94], + [ 0,216, 0, 1, 1, 93, 1, 1, 1, 1, 1, 1, 1] ], "bgmap": [ diff --git a/project/floors/yiqu5.js b/project/floors/yiqu5.js index b2cdbe7..2ebfddd 100644 --- a/project/floors/yiqu5.js +++ b/project/floors/yiqu5.js @@ -15,7 +15,15 @@ main.floors.yiqu5= "eachArrive": [], "parallelDo": "", "events": {}, - "changeFloor": {}, + "changeFloor": { + "0,11": { + "floorId": "yiqu4", + "loc": [ + 12, + 11 + ] + } + }, "beforeBattle": {}, "afterBattle": {}, "afterGetItem": {}, @@ -24,19 +32,19 @@ main.floors.yiqu5= "cannotMove": {}, "cannotMoveIn": {}, "map": [ - [ 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, 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] + [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + [ 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1], + [ 1, 0, 32, 1, 1, 1,426, 1, 1, 1, 1, 1, 1], + [ 1, 82, 1, 1, 1, 1, 0, 1, 1, 31, 1, 1, 1], + [216, 0,216, 1, 1, 1, 83, 1, 1, 0, 1, 1, 1], + [ 0, 1, 0, 1, 1,209, 0,209, 1, 81, 1, 1, 1], + [ 32, 1, 32, 0, 81, 0, 82, 0, 32, 0,216, 0, 22], + [ 1, 1, 0, 1, 1,244, 1, 1, 81, 1, 1, 1, 1], + [ 31, 1,209, 1, 31, 0,403, 1,203, 0,244, 1, 31], + [ 0,216, 0, 1, 1, 1, 1, 1, 0,203, 0, 1, 0], + [ 1, 1, 32, 82, 0,402, 1, 1,209, 0, 34, 1, 81], + [ 92, 0, 0, 1, 1, 1, 1, 21, 1, 1, 21, 1, 22], + [ 1, 1, 31, 82, 0,401, 1, 32, 0,425, 0,213, 0] ], "bgmap": [ diff --git a/project/functions.js b/project/functions.js index 1b19e5a..d341984 100644 --- a/project/functions.js +++ b/project/functions.js @@ -391,8 +391,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = } // 退化 if (core.enemys.hasSpecial(special, 21)) { - core.status.hero.atk -= (enemy.atkValue || 0); - core.status.hero.def -= (enemy.defValue || 0); + core.status.hero.atk -= core.getEnemyValue(enemy, "atkValue", x, y) || 0; + core.status.hero.def -= core.getEnemyValue(enemy, "defValue", x, y) || 0; if (core.status.hero.atk < 0) core.status.hero.atk = 0; if (core.status.hero.def < 0) core.status.hero.def = 0; } @@ -774,29 +774,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = mon_mdef = core.getEnemyValue(enemy, "mdef", x, y, floorId) || 0, mon_spell = core.getEnemyValue(enemy, "spell", x, y, floorId) || 0, mon_speed = core.getEnemyValue(enemy, "speed", x, y, floorId) || 1, - mon_special = core.getEnemyValue(enemy, "special", x, y, floorId), - mon_zone = core.getEnemyValue(enemy, "zone", x, y, floorId), - mon_repulse = core.getEnemyValue(enemy, "repulse", x, y, floorId), - mon_laser = core.getEnemyValue(enemy, "laser", x, y, floorId), - mon_breakArmor = core.getEnemyValue(enemy, "breakArmor", x, y, floorId), - mon_counterAttack = core.getEnemyValue(enemy, "counterAttack", x, y, floorId), - mon_vampire = core.getEnemyValue(enemy, "vampire", x, y, floorId), - mon_hpBuff = core.getEnemyValue(enemy, "hpBuff", x, y, floorId), - mon_atkBuff = core.getEnemyValue(enemy, "atkBuff", x, y, floorId), - mon_defBuff = core.getEnemyValue(enemy, "defBuff", x, y, floorId), - mon_zoneSquare = core.getEnemyValue(enemy, "zoneSquare", x, y, floorId), - mon_haloSquare = core.getEnemyValue(enemy, "haloSquare", x, y, floorId), - mon_haloRange = core.getEnemyValue(enemy, "haloRange", x, y, floorId), - mon_range = core.getEnemyValue(enemy, "range", x, y, floorId), - mon_notBomb = core.getEnemyValue(enemy, "notBomb", x, y, floorId), - mon_n = core.getEnemyValue(enemy, "n", x, y, floorId), - mon_purify = core.getEnemyValue(enemy, "purify", x, y, floorId), - mon_add = core.getEnemyValue(enemy, "add", x, y, floorId), - mon_haloAdd = core.getEnemyValue(enemy, "haloAdd", x, y, floorId), - mon_atkValue = core.getEnemyValue(enemy, "atkValue", x, y, floorId), - mon_defValue = core.getEnemyValue(enemy, "defValue", x, y, floorId), - mon_damage2 = core.getEnemyValue(enemy, "damage2", x, y, floorId), - mon_value = core.getEnemyValue(enemy, "value", x, y, floorId); + mon_special = core.getEnemyValue(enemy, "special", x, y, floorId); var mon_money = core.getEnemyValue(enemy, "money", x, y, floorId), mon_exp = core.getEnemyValue(enemy, "exp", x, y, floorId), mon_point = core.getEnemyValue(enemy, "point", x, y, floorId); @@ -922,29 +900,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = exp: Math.floor(mon_exp), point: Math.floor(mon_point), special: mon_special, - guards: guards, // 返回支援情况 - zone: mon_zone, - repulse: mon_repulse, - laser: mon_laser, - breakArmor: mon_breakArmor, - counterAttack: mon_counterAttack, - vampire: mon_vampire, - hpBuff: mon_hpBuff, - atkBuff: mon_atkBuff, - defBuff: mon_defBuff, - zoneSquare: mon_zoneSquare, - haloSquare: mon_haloSquare, - haloRange: mon_haloRange, - range: mon_range, - notBomb: mon_notBomb, - n: mon_n, - purify: mon_purify, - add: mon_add, - haloAdd: mon_haloAdd, - atkValue: mon_atkValue, - defValue: mon_defValue, - damage2: mon_damage2, - value: mon_value + guards: guards // 返回支援情况 + }; }, "getDamageInfo": function (enemy, hero, x, y, floorId) { diff --git a/project/icons.js b/project/icons.js index 18db1ef..14e3c91 100644 --- a/project/icons.js +++ b/project/icons.js @@ -257,7 +257,9 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "tulipFairy": 72, "purpleBowman": 65, "E421": 73, - "E422": 73 + "E422": 73, + "E425": 74, + "E426": 75 }, "enemy48": { "angel": 0, diff --git a/project/maps.js b/project/maps.js index 4cf3aac..e9b9cf2 100644 --- a/project/maps.js +++ b/project/maps.js @@ -323,6 +323,8 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "422": {"cls":"enemys","id":"E422"}, "423": {"cls":"items","id":"I423"}, "424": {"cls":"items","id":"I424"}, + "425": {"cls":"enemys","id":"E425"}, + "426": {"cls":"enemys","id":"E426"}, "20034": {"cls":"tileset","id":"X20034","canPass":true}, "20154": {"cls":"tileset","id":"X20154","canPass":true}, "20216": {"cls":"tileset","id":"X20216","canPass":true}, diff --git a/project/materials/enemys.png b/project/materials/enemys.png index 1e79d19..44fb811 100644 Binary files a/project/materials/enemys.png and b/project/materials/enemys.png differ