From b0086f8dfbba0c40ee449946e936dbe1b57a8da2 Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Fri, 21 Apr 2023 22:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E5=8C=BA=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 1 - public/project/data.js | 48 +++- public/project/enemys.js | 14 +- public/project/floors/MT0.js | 2 +- public/project/floors/MT21.js | 354 ++++++++++++++++------------- public/project/floors/MT22.js | 210 +++++++++-------- public/project/floors/MT36.js | 16 +- public/project/floors/MT37.js | 12 +- public/project/floors/MT38.js | 6 +- public/project/floors/MT39.js | 20 +- public/project/floors/MT40.js | 14 +- public/project/floors/MT41.js | 6 +- public/project/floors/MT42.js | 16 +- public/project/floors/MT43.js | 14 +- public/project/floors/MT44.js | 10 +- public/project/floors/MT45.js | 4 +- public/project/floors/MT46.js | 44 +++- public/project/floors/MT47.js | 14 +- public/project/floors/MT48.js | 76 +++++-- public/project/floors/snowTown.js | 8 +- public/project/items.js | 4 +- public/project/maps.js | 4 +- public/project/plugin/skillTree.js | 15 +- src/data/desc.json | 9 + src/plugin/shadow/gameShadow.ts | 25 +- src/source/cls.d.ts | 2 + src/source/maps.d.ts | 4 + src/ui/completeAchievement.vue | 2 +- src/ui/statusBar.vue | 2 +- 29 files changed, 542 insertions(+), 414 deletions(-) diff --git a/components.d.ts b/components.d.ts index 46765fe..ee98312 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,7 +11,6 @@ declare module '@vue/runtime-core' { AProgress: typeof import('ant-design-vue/es')['Progress'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] - ASlider: typeof import('ant-design-vue/es')['Slider'] ASwitch: typeof import('ant-design-vue/es')['Switch'] Box: typeof import('./src/components/box.vue')['default'] BoxAnimate: typeof import('./src/components/boxAnimate.vue')['default'] diff --git a/public/project/data.js b/public/project/data.js index bd0da08..3ac8b6b 100644 --- a/public/project/data.js +++ b/public/project/data.js @@ -693,7 +693,53 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "need": "25000", "title": "中级智人", "clear": true, - "action": [] + "action": [ + { + "type": "setValue", + "name": "status:mdef", + "operator": "+=", + "value": "2000" + }, + { + "type": "setValue", + "name": "status:atk", + "operator": "+=", + "value": "25" + }, + { + "type": "setValue", + "name": "status:def", + "operator": "+=", + "value": "25" + }, + "恭喜升级!攻防+25,智慧+2000!" + ] + }, + { + "need": "100000", + "title": "中级智人", + "clear": true, + "action": [ + { + "type": "setValue", + "name": "status:mdef", + "operator": "+=", + "value": "2000" + }, + { + "type": "setValue", + "name": "status:atk", + "operator": "+=", + "value": "25" + }, + { + "type": "setValue", + "name": "status:def", + "operator": "+=", + "value": "25" + }, + "恭喜升级!攻防+25,智慧+2000!" + ] } ] }, diff --git a/public/project/enemys.js b/public/project/enemys.js index eb332e0..754d36d 100644 --- a/public/project/enemys.js +++ b/public/project/enemys.js @@ -149,23 +149,23 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E597": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E598": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E599": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E600": {"name":"寒冰巨石","hp":3000,"atk":2250,"def":0,"money":2,"exp":100,"point":0,"special":[3]}, + "E600": {"name":"寒冰巨石","hp":3000,"atk":2500,"def":0,"money":2,"exp":100,"point":0,"special":[3]}, "E601": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E602": {"name":"永夜蝙","hp":6000,"atk":2000,"def":800,"money":1,"exp":65,"point":0,"special":[22],"night":100}, "E603": {"name":"极昼蝠","hp":8000,"atk":1750,"def":1000,"money":1,"exp":65,"point":0,"special":[23],"day":100}, "E605": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E606": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E607": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E608": {"name":"寒冰护卫","hp":25000,"atk":3500,"def":2250,"money":3,"exp":225,"point":0,"special":[]}, - "E609": {"name":"具形雪人","hp":7500,"atk":2250,"def":1000,"money":2,"exp":90,"point":0,"special":[25],"melt":15}, - "E610": {"name":"高冷雪人","hp":10000,"atk":2750,"def":1500,"money":2,"exp":150,"point":0,"special":[25],"melt":25}, - "E611": {"name":"具形雪人法师","hp":12500,"atk":2750,"def":1750,"money":2,"exp":175,"point":0,"special":[13,25],"melt":30}, + "E608": {"name":"寒冰护卫","hp":20000,"atk":2750,"def":2000,"money":3,"exp":225,"point":0,"special":[]}, + "E609": {"name":"具形雪人","hp":7500,"atk":2250,"def":1250,"money":2,"exp":90,"point":0,"special":[25],"melt":15}, + "E610": {"name":"高冷雪人","hp":10000,"atk":2500,"def":1500,"money":2,"exp":150,"point":0,"special":[25],"melt":25}, + "E611": {"name":"具形雪人法师","hp":15000,"atk":2500,"def":1750,"money":2,"exp":175,"point":0,"special":[13,25],"melt":30}, "E612": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E613": {"name":"寒冰核心","hp":20000,"atk":3000,"def":1500,"money":3,"exp":150,"point":0,"special":[26],"iceCore":20}, + "E613": {"name":"寒冰核心","hp":20000,"atk":2750,"def":1500,"money":3,"exp":150,"point":0,"special":[26],"iceCore":20}, "E614": {"name":"火焰核心","hp":15000,"atk":2750,"def":1750,"money":3,"exp":140,"point":0,"special":[27],"fireCore":20}, "E615": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E616": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E617": {"name":"冰封雕像","hp":12500,"atk":2500,"def":2000,"money":2,"exp":150,"point":0,"special":[]}, + "E617": {"name":"冰封雕像","hp":12500,"atk":2750,"def":2000,"money":2,"exp":150,"point":0,"special":[]}, "E618": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E643": {"name":"苍蓝史莱姆","hp":17500,"atk":2800,"def":2000,"money":3,"exp":175,"point":0,"special":[28],"paleShield":30} } \ No newline at end of file diff --git a/public/project/floors/MT0.js b/public/project/floors/MT0.js index c871c8f..042c19c 100644 --- a/public/project/floors/MT0.js +++ b/public/project/floors/MT0.js @@ -50,7 +50,7 @@ main.floors.MT0= "打开百科全书的快捷键是H" ], "8,12": [ - "该塔计分方式:生命+5000*黄钥匙+15000*蓝钥匙" + "第一章计分方式:生命+5000*黄钥匙+15000*蓝钥匙" ], "6,13": [ "原声音乐可以在网易云音乐搜索:魔塔 人类:开天辟地 bgm,部分音乐因为版权问题可能无法播放或者不在歌单内" diff --git a/public/project/floors/MT21.js b/public/project/floors/MT21.js index 720679e..1068e93 100644 --- a/public/project/floors/MT21.js +++ b/public/project/floors/MT21.js @@ -1,194 +1,220 @@ -main.floors.MT21 = { - floorId: 'MT21', - title: '勇气之路', - name: '21', - width: 15, - height: 15, - canFlyTo: true, - canFlyFrom: true, - canUseQuickShop: true, - cannotViewMap: false, - images: [], - ratio: 2, - defaultGround: 'grass', - bgm: 'plot1.mp3', - firstArrive: [], - eachArrive: [], - parallelDo: '', - events: { - '14,8': [ +main.floors.MT21= +{ + "floorId": "MT21", + "title": "勇气之路", + "name": "21", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "plot1.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": { + "14,8": [ { - type: 'if', - condition: '(flag:chapter===1)', - true: [ + "type": "if", + "condition": "(flag:chapter===1)", + "true": [ { - type: 'setCurtain', - color: [0, 0, 0, 1], - time: 1500, - keep: true + "type": "confirm", + "text": "是否提交第一章成绩?", + "yes": [ + "计分方式:生命+黄*5000+蓝*15000", + { + "type": "win", + "reason": "智慧之始" + }, + { + "type": "exit" + } + ], + "no": [] }, { - type: 'setText', - text: [0, 0, 0, 1], - background: 'winskin3.png' - }, - '人类简史——起源篇', - { - type: 'playSound', - name: 'paper.mp3' - }, - '他踏出了寻找智慧的第一步。', - { - type: 'playSound', - name: 'paper.mp3' - }, - '他所练就的勇气,也成为他寻找智慧路上的一大利器。', - { - type: 'playSound', - name: 'paper.mp3' - }, - '人类简史——起源篇,完。', - { - type: 'playSound', - name: 'paper.mp3' + "type": "setCurtain", + "color": [ + 0, + 0, + 0, + 1 + ], + "time": 1500, + "keep": true }, { - type: 'setValue', - name: 'flag:chapter', - value: '2' + "type": "setText", + "text": [ + 0, + 0, + 0, + 1 + ], + "background": "winskin3.png" + }, + "人类简史——起源篇", + { + "type": "playSound", + "name": "paper.mp3" + }, + "他踏出了寻找智慧的第一步。", + { + "type": "playSound", + "name": "paper.mp3" + }, + "他所练就的勇气,也成为他寻找智慧路上的一大利器。", + { + "type": "playSound", + "name": "paper.mp3" + }, + "人类简史——起源篇,完。", + { + "type": "playSound", + "name": "paper.mp3" }, { - type: 'sleep', - time: 1000 - }, - '人类简史——进化篇', - { - type: 'playSound', - name: 'paper.mp3' - }, - '或许,他真的不理解智慧。', - { - type: 'playSound', - name: 'paper.mp3' - }, - '或许,他已经理解了一些。', - { - type: 'playSound', - name: 'paper.mp3' - }, - '但这不重要。', - { - type: 'playSound', - name: 'paper.mp3' - }, - '他的轨迹已经注定了他对未来的影响。', - { - type: 'playSound', - name: 'paper.mp3' + "type": "setValue", + "name": "flag:chapter", + "value": "2" }, { - type: 'playSound', - name: 'paper.mp3' + "type": "sleep", + "time": 1000 }, - '这个世界,甚至这个宇宙,都因为他的存在而改变。', + "人类简史——进化篇", { - type: 'playSound', - name: 'paper.mp3' + "type": "playSound", + "name": "paper.mp3" }, - '在这里,智慧小径,将是他智慧的飞跃点。', + "或许,他真的不理解智慧。", { - type: 'changeFloor', - floorId: 'MT22', - loc: [0, 8] + "type": "playSound", + "name": "paper.mp3" + }, + "或许,他已经理解了一些。", + { + "type": "playSound", + "name": "paper.mp3" + }, + "但这不重要。", + { + "type": "playSound", + "name": "paper.mp3" + }, + "他的轨迹已经注定了他对未来的影响。", + { + "type": "playSound", + "name": "paper.mp3" }, { - type: 'setCurtain', - time: 1000 + "type": "playSound", + "name": "paper.mp3" + }, + "这个世界,甚至这个宇宙,都因为他的存在而改变。", + { + "type": "playSound", + "name": "paper.mp3" + }, + "在这里,智慧小径,将是他智慧的飞跃点。", + { + "type": "changeFloor", + "floorId": "MT22", + "loc": [ + 0, + 8 + ] }, { - type: 'setText', - text: [255, 255, 255, 1], - background: 'winskin2.png' - }, - '\t[低级智人]\b[up,hero]智慧吗...', - '\t[低级智人]\b[up,hero]智慧又是什么呢?', - '\t[低级智人]\b[up,hero]智慧之神说它可以掌控万物,真的这么神奇吗...', - '\t[低级智人]\b[up,hero]完全摸不到头脑。', - '\t[低级智人]\b[up,hero]或许智慧结晶会告诉我答案吧。', - { - type: 'function', - function: - "function(){\ncore.plugin.gameUi.showChapter('第二章 智慧');\ncore.plugin.removeMap.removeMaps('tower1', 'tower7', true);\ndelete flags.tower1;\ndelete flags.wordsTimeOut;\ndelete flags.boom;\ndelete flags.booming;\n}" + "type": "setCurtain", + "time": 1000 }, { - type: 'setValue', - name: 'item:pickaxe', - value: '0' + "type": "setText", + "text": [ + 255, + 255, + 255, + 1 + ], + "background": "winskin2.png" + }, + "\t[低级智人]\b[up,hero]智慧吗...", + "\t[低级智人]\b[up,hero]智慧又是什么呢?", + "\t[低级智人]\b[up,hero]智慧之神说它可以掌控万物,真的这么神奇吗...", + "\t[低级智人]\b[up,hero]完全摸不到头脑。", + "\t[低级智人]\b[up,hero]或许智慧结晶会告诉我答案吧。", + { + "type": "function", + "function": "function(){\ncore.plugin.gameUi.showChapter('第二章 智慧');\ncore.plugin.removeMap.removeMaps('tower1', 'tower7', true);\ndelete flags.tower1;\ndelete flags.wordsTimeOut;\ndelete flags.boom;\ndelete flags.booming;\n}" + }, + { + "type": "setValue", + "name": "item:pickaxe", + "value": "0" } ], - false: [ + "false": [ { - type: 'changeFloor', - floorId: 'MT22', - loc: [0, 8] + "type": "changeFloor", + "floorId": "MT22", + "loc": [ + 0, + 8 + ] } ] } ] }, - changeFloor: { - '0,6': { - floorId: 'MT19', - loc: [14, 6] + "changeFloor": { + "0,6": { + "floorId": "MT19", + "loc": [ + 14, + 6 + ] } }, - afterBattle: {}, - afterGetItem: {}, - afterOpenDoor: {}, - autoEvent: {}, - cannotMove: {}, - map: [ - [ - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142 - ], - [ - 142, 142, 142, 142, 142, 142, 142, 142, 142, 487, 142, 142, 142, - 142, 142 - ], - [ - 142, 142, 142, 487, 494, 378, 0, 142, 378, 494, 142, 142, 142, 142, - 142 - ], - [142, 142, 142, 142, 142, 142, 520, 33, 518, 142, 142, 0, 0, 142, 142], - [142, 142, 142, 142, 33, 376, 0, 142, 381, 0, 33, 376, 0, 142, 142], - [ - 142, 142, 378, 142, 0, 142, 142, 142, 142, 142, 142, 142, 545, 142, - 142 - ], - [92, 0, 33, 142, 142, 142, 487, 142, 0, 381, 33, 0, 0, 0, 142], - [ - 143, 518, 142, 142, 0, 33, 494, 142, 143, 143, 143, 520, 143, 143, - 142 - ], - [143, 0, 33, 376, 545, 381, 0, 520, 0, 143, 0, 0, 143, 0, 94], - [143, 143, 143, 143, 143, 0, 143, 0, 376, 143, 0, 545, 0, 378, 143], - [143, 0, 33, 0, 518, 0, 143, 0, 0, 519, 33, 143, 33, 0, 143], - [ - 143, 143, 143, 143, 381, 143, 143, 143, 33, 143, 376, 143, 143, 143, - 143 - ], - [143, 143, 0, 33, 545, 0, 378, 143, 0, 143, 381, 0, 0, 143, 143], - [143, 143, 143, 378, 143, 33, 0, 519, 0, 143, 0, 143, 143, 143, 143], - [ - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143 - ] - ], - beforeBattle: {}, - bgmap: [], - fgmap: [], - bg2map: [], - fg2map: [], - cannotMoveIn: {} -}; + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "map": [ + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,487,142,142,142,142,142], + [142,142,142,487,494,378, 0,142,378,494,142,142,142,142,142], + [142,142,142,142,142,142,520, 33,518,142,142, 0, 0,142,142], + [142,142,142,142, 33,376, 0,142,381, 0, 33,376, 0,142,142], + [142,142,378,142, 0,142,142,142,142,142,142,142,545,142,142], + [ 92, 0, 33,142,142,142,487,142, 0,381, 33, 0, 0, 0,142], + [143,518,142,142, 0, 33,494,142,143,143,143,520,143,143,142], + [143, 0, 33,376,545,381, 0,520, 0,143, 0, 0,143, 0, 94], + [143,143,143,143,143, 0,143, 0,376,143, 0,545, 0,378,143], + [143, 0, 33, 0,518, 0,143, 0, 0,519, 33,143, 33, 0,143], + [143,143,143,143,381,143,143,143, 33,143,376,143,143,143,143], + [143,143, 0, 33,545, 0,378,143, 0,143,381, 0, 0,143,143], + [143,143,143,378,143, 33, 0,519, 0,143, 0,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143] +], + "beforeBattle": {}, + "bgmap": [ + +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +], + "cannotMoveIn": {} +} \ No newline at end of file diff --git a/public/project/floors/MT22.js b/public/project/floors/MT22.js index eb7ece7..c49805a 100644 --- a/public/project/floors/MT22.js +++ b/public/project/floors/MT22.js @@ -1,118 +1,116 @@ -main.floors.MT22 = { - floorId: 'MT22', - title: '智慧小径', - name: '智慧小径', - width: 15, - height: 15, - canFlyTo: true, - canFlyFrom: true, - canUseQuickShop: true, - cannotViewMap: false, - images: [], - ratio: 2, - defaultGround: 'grass', - bgm: 'road.mp3', - firstArrive: [], - eachArrive: [], - parallelDo: '', - events: { - '0,8': [ +main.floors.MT22= +{ + "floorId": "MT22", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": { + "0,8": [ { - type: 'if', - condition: 'flag:inWinter', - true: ['\t[低级智人]\b[up,hero]没必要再回去了'], - false: [ + "type": "if", + "condition": "flag:inWinter", + "true": [ + "\t[低级智人]\b[up,hero]没必要再回去了" + ], + "false": [ { - type: 'changeFloor', - floorId: 'MT21', - loc: [14, 8] + "type": "changeFloor", + "floorId": "MT21", + "loc": [ + 14, + 8 + ] } ] } ], - '3,9': [ - '第二章的加点已开启,可以在技能树的前置技能下方选择', - '注意学习是一个非常重要的技能,需要尽快点开', - '如果你玩过上个版本,直接跳到了本章,记得查看背包里面的各种道具,尤其是百科全书,同时注意左边是你来的方向,那里还有些怪物', - '从现在开始,跳跃技能不再消耗生命值,别忘了你还有跳跃技能' + "3,9": [ + "第二章的加点已开启,可以在技能树的前置技能下方选择", + "注意学习是一个非常重要的技能,需要尽快点开", + "如果你玩过上个版本,直接跳到了本章,记得查看背包里面的各种道具,尤其是百科全书,同时注意左边是你来的方向,那里还有些怪物", + "从现在开始,跳跃技能不再消耗生命值,别忘了你还有跳跃技能" ], - '7,9': [ - '百科全书中已解锁第二章需要特别说明的怪物属性,你可以在百科全书中查看' + "7,9": [ + "百科全书中已解锁第二章需要特别说明的怪物属性,你可以在百科全书中查看", + "本章计分方式:血量/10+黄*2000+蓝*5000+红*10000" ] }, - changeFloor: { - '14,4': { - floorId: 'MT23', - loc: [0, 4] + "changeFloor": { + "14,4": { + "floorId": "MT23", + "loc": [ + 0, + 4 + ] }, - '9,0': { - floorId: 'MT24', - loc: [9, 14] + "9,0": { + "floorId": "MT24", + "loc": [ + 9, + 14 + ] } }, - beforeBattle: {}, - afterBattle: {}, - afterGetItem: {}, - afterOpenDoor: {}, - autoEvent: {}, - cannotMove: {}, - cannotMoveIn: {}, - map: [ - [ - 142, 142, 142, 142, 142, 142, 142, 142, 142, 91, 143, 143, 143, 143, - 143 - ], - [ - 142, 142, 142, 142, 142, 142, 142, 142, 142, 0, 143, 143, 143, 143, - 143 - ], - [142, 142, 482, 482, 492, 0, 0, 0, 0, 0, 143, 491, 484, 143, 143], - [142, 142, 142, 142, 142, 0, 0, 0, 0, 0, 143, 143, 494, 143, 143], - [142, 142, 482, 482, 492, 0, 0, 484, 0, 441, 0, 0, 0, 0, 94], - [142, 142, 142, 142, 142, 0, 0, 0, 0, 143, 143, 143, 143, 143, 143], - [142, 142, 482, 482, 492, 0, 0, 484, 0, 494, 484, 491, 484, 143, 143], - [142, 142, 142, 142, 142, 0, 0, 0, 0, 143, 143, 143, 143, 143, 143], - [92, 0, 0, 0, 441, 0, 0, 484, 0, 0, 0, 0, 0, 143, 143], - [143, 143, 0, 129, 0, 0, 0, 129, 0, 0, 0, 0, 0, 143, 143], - [ - 143, 143, 492, 143, 492, 143, 492, 143, 492, 143, 492, 143, 492, - 143, 143 - ], - [ - 143, 143, 482, 143, 482, 143, 482, 143, 482, 143, 482, 143, 482, - 143, 143 - ], - [ - 143, 143, 482, 143, 482, 143, 482, 143, 482, 143, 482, 143, 482, - 143, 143 - ], - [ - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143 - ], - [ - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143 - ] - ], - bgmap: [ - [0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144], - [0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, 0], - [144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] - ], - fgmap: [], - bg2map: [], - fg2map: [] -}; + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [142,142,142,142,142,142,142,142,142, 91,143,143,143,143,143], + [142,142,142,142,142,142,142,142,142, 0,143,143,143,143,143], + [142,142,482,482,492, 0, 0, 0, 0, 0,143,491,484,143,143], + [142,142,142,142,142, 0, 0, 0, 0, 0,143,143,494,143,143], + [142,142,482,482,492, 0, 0,484, 0,441, 0, 0, 0, 0, 94], + [142,142,142,142,142, 0, 0, 0, 0,143,143,143,143,143,143], + [142,142,482,482,492, 0, 0,484, 0,494,484,491,484,143,143], + [142,142,142,142,142, 0, 0, 0, 0,143,143,143,143,143,143], + [ 92, 0, 0, 0,441, 0, 0,484, 0, 0, 0, 0, 0,143,143], + [143,143, 0,129, 0, 0, 0,129, 0, 0, 0, 0, 0,143,143], + [143,143,492,143,492,143,492,143,492,143,492,143,492,143,143], + [143,143,482,143,482,143,482,143,482,143,482,143,482,143,143], + [143,143,482,143,482,143,482,143,482,143,482,143,482,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143] +], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144,144,144,144,144,144,144,144], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0], + [144,144,144,144,144,144,144,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/public/project/floors/MT36.js b/public/project/floors/MT36.js index 7067c01..1d36742 100644 --- a/public/project/floors/MT36.js +++ b/public/project/floors/MT36.js @@ -114,16 +114,16 @@ main.floors.MT36= "cannotMoveIn": {}, "map": [ [ 0, 0, 0, 0,604,604,604,604,604, 91,604, 0,70086, 0, 0], - [ 0, 0, 0, 0,396,604, 0,595, 33, 0,604, 0, 0, 0, 0], + [ 0, 0, 0, 0,378,604, 0,595, 33, 0,604, 0, 0, 0, 0], [ 0, 0, 0, 0,617,604,403,604, 0,604,70176,70177,70177,70177,70177], - [604,617,604,420, 0,376,482,492,378, 0,617,390,441,484, 94], - [ 92, 0, 85,468,592,604,604,492,604,274,70208,70209,70209,70209,70209], - [604,617,604,430,604, 0,602, 0,609, 27,403, 0, 0, 0, 0], - [587,403,396,482,600, 33,584,381,492, 33, 28, 0, 0, 0, 0], - [587,587,587,587,587, 0,584,376,586,274,586,586,586,484,378], - [ 92, 0, 34,381, 0,603,492,482, 28, 0,595, 34,494,390, 21], + [604,617,604,390, 0, 27, 34,492,378, 0,617,376,403,482, 94], + [ 92, 0, 85,403,592,604,604,492,604,274,70208,70209,70209,70209,70209], + [604,617,604,396,604, 0,602, 0,609, 27,381, 0, 0, 0, 0], + [587,381,378, 33,600, 33,584,381,492, 33, 28, 0, 0, 0, 0], + [587,587,587,587,587, 0,584,376,586,274,586,586,586,482, 28], + [ 92, 0, 34,381, 0,603,492, 34, 28, 0,595, 34,494,376, 21], [584,584,584,584,584,584,584,584,584,584,584, 0,586,614,586], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,590, 0, 27,482], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,590, 0, 27, 33], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,604,492,604, 28], [482,482,482,494, 34, 34,604,403,587,590, 0, 28, 34,604, 0], [482,482,482,585, 34, 34,492, 0,609,482,585,585, 0,274, 0], diff --git a/public/project/floors/MT37.js b/public/project/floors/MT37.js index 74cea55..3cebfd8 100644 --- a/public/project/floors/MT37.js +++ b/public/project/floors/MT37.js @@ -43,18 +43,18 @@ main.floors.MT37= "map": [ [147,147,147,147,147,147,147,147,147,147,147,147,147,147,70072], [147, 0,147, 34, 0,147, 29, 0,274, 0,147,147,147,147,70072], - [147, 0,600, 0, 34,603, 0, 32, 0, 0,376, 33,381, 0,70080], - [147,378,147, 27,484,376,617,390, 0,494,484,378,602,604,604], - [147,482,147,602,378,441,70007, 0,484,586,376,403, 0, 0, 94], + [147, 0,600, 0, 34,603, 0, 32, 0, 0, 27, 33,381, 0,70080], + [147,378,147, 27,482,376,617,376, 0,494,482,378,602,604,604], + [147,482,147,602,378,403,70007, 0,482,586,376,381, 0, 0, 94], [147,381,492, 0,604,494,70015,613,586,586,586,614, 32, 0,604], [147, 0,595, 0, 33, 0,609,482,609,376, 0, 33,595, 21,587], [147,147,147, 33,587,587,587,590,70022,70023,274,584, 0,587,587], [147,390,494, 28, 0, 0, 33, 0,492, 0,378,584, 32, 0, 94], [147, 33,147, 0,584,584,602,584,584,584,584,584,584,584,584], - [147,441,147,609, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [147,403,147,609, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [147, 22,608, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [147, 33,147, 0, 27, 0,381, 0,590, 0, 33,585,482,390,585], - [147,396,147, 0,147,147,147,147,147,147, 0,600,403,482,585], + [147, 33,147, 0, 27, 0,381, 0,590, 0, 33,585, 34,376,585], + [147,396,147, 0,147,147,147,147,147,147, 0,600,403, 34,585], [147,147,147,147,147,147,147,147,147,147,585,585,585,585,585] ], "bgmap": [ diff --git a/public/project/floors/MT38.js b/public/project/floors/MT38.js index 2b63547..75eb68a 100644 --- a/public/project/floors/MT38.js +++ b/public/project/floors/MT38.js @@ -52,8 +52,8 @@ main.floors.MT38= "map": [ [ 0, 0, 0, 0, 0,604,604, 91,604,604, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0,604,604,274,604,604, 0, 0, 0, 0, 0], - [70177,70177,70177,70177,70177,70178, 0,396, 0,70176,70177,70177,70177,70177,70177], - [ 92, 0,590,381, 34,595,390,614,403,600,376,403,482,378, 94], + [70177,70177,70177,70177,70177,70178, 0,378, 0,70176,70177,70177,70177,70177,70177], + [ 92, 0,590,381, 34,595,376,614,381,600,376,403,482,378, 94], [70209,70209,70209,70209,70209,70210, 0,491, 0,70208,70209,70209,70209,70209,70209], [ 0, 0, 0, 0, 0,584,70187,617,70189,584, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0,70187,376,70189, 0, 0, 0, 0, 0, 0], @@ -61,7 +61,7 @@ main.floors.MT38= [ 0, 0, 0, 0, 0, 0,70187,403,70189, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0,70187,484,70189, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0,70187,608,70189, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0,70195,491,70197, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,70195,484,70197, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0,584,584,584, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/public/project/floors/MT39.js b/public/project/floors/MT39.js index 67cd5b9..2dcda7b 100644 --- a/public/project/floors/MT39.js +++ b/public/project/floors/MT39.js @@ -71,17 +71,17 @@ main.floors.MT39= "map": [ [ 0, 0, 0, 0, 0,604,604, 91,604,604, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0,472,604,611,604,472, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0,613,420,608,430,614, 0, 0, 0, 0, 0], - [604, 21,390,403,482,584,584,584,584,584,600,403,396,482, 94], + [ 0, 0, 0, 0, 0,613,390,608,396,614, 0, 0, 0, 0, 0], + [604, 21,376,403,482,584,584,584,584,584,600,381,378,482, 94], [484,587, 34, 34,617, 0, 0, 0, 0, 0, 0,70022,70023,70022,70023], - [491,494, 34, 34, 33, 0, 0, 0, 0, 0, 33,376,482,600,604], - [587,587,492,584,378,403, 0,602,604, 0, 28,378,584, 0, 94], - [376,587, 0,584,378,70020,70021, 0,604,592,604,403,584, 34,604], - [482,595, 33,274,482, 34,587, 27,70007,376,484,584,584,584,584], - [584,584,492,584,584, 28,587,403,70015,586,595, 0, 0,70126, 0], - [70007, 21, 0,586,586, 0,609, 33, 0,274, 27, 0, 0,543, 0], - [70015, 0,403,595, 0,274,604,587,70022,70023,609, 0, 32, 0, 94], - [584,584,584,584,587,376,587, 0,590, 0, 0,584,584,584,584], + [491,494, 34, 34, 33, 0, 0, 0, 0, 0, 33,376, 33,600,604], + [587,587,492,584, 28,381, 0,602,604, 0, 28,378,584, 0, 94], + [ 27,587, 0,584, 28,70020,70021, 0,604,592,604,403,584, 34,604], + [ 34,595, 33,274, 34, 34,587, 27,70007,376, 0,584,584,584,584], + [584,584,492,584,584, 28,587,381,70015,492,595, 0, 0,70126, 0], + [70007, 21, 0,586,586, 0,609, 34, 0,274, 27, 0, 0,543, 0], + [70015, 0,381,595, 0,274,604,587,70022,70023,609, 0, 32, 0, 94], + [584,584,584,584,587, 27,587, 0,590, 0, 0,584,584,584,584], [ 0, 0, 0, 0,482,492, 0,381,604, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0,604,604,604,604,604, 93,604, 0, 0, 0, 0] ], diff --git a/public/project/floors/MT40.js b/public/project/floors/MT40.js index e6f7be3..4a76828 100644 --- a/public/project/floors/MT40.js +++ b/public/project/floors/MT40.js @@ -91,19 +91,19 @@ main.floors.MT40= "cannotMoveIn": {}, "map": [ [70074, 0,70126,584,584, 91,585,585, 91, 0, 0, 0, 0, 0, 0], - [70074, 0,543,403,274, 0, 33,381, 0, 0, 0, 0, 0, 0, 0], + [70074, 0,543,381,274, 0, 34,381, 0, 0, 0, 0, 0, 0, 0], [70108, 33, 0, 27,70007,585,585, 0,617, 32,381, 32,274, 0,604], - [ 92,614, 21, 34,70015,378,595, 0,604,604, 0,604, 33,604,604], + [ 92,614, 21, 34,70015, 28,595, 0,604,604, 0,604, 33,604,604], [604,604, 0,492, 0,586, 0,492, 0,70179,603,70181, 27, 28, 94], [604, 34,602, 0, 27,586, 0, 34,584,70187,381,70189,584,584,584], - [ 92,403,584,590,70022,70023,604, 0, 0,70187,376,70189, 0, 0, 0], - [604, 34,584,381, 34,592, 0, 34, 0,70187,378,70189, 0, 0, 0], + [ 92,381,584,590,70022,70023,604, 0, 0,70187, 27,70189, 0, 0, 0], + [604, 34,584,381, 34,592, 0, 34, 0,70187, 28,70189, 0, 0, 0], [584,584,584,592,584,584,584,584, 0,70187,484,70189, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0,70195,600,70197,482,482,492], - [ 0, 0, 0,381, 0, 0, 0, 0,376,604, 0,584,584,584, 94], - [ 92, 0, 0,274, 27, 28,482,492, 0,484, 28, 0,602, 0,403], + [ 0, 0, 0,381, 0, 0, 0, 0, 27,604, 0,584,584,584, 94], + [ 92, 0, 0,274, 27, 28, 33,492, 0,482, 28, 0,602, 0,381], [584,584,584,584,584,595,584,492,584,595,584,584,584,584,584], - [ 0, 0, 0, 0, 0,482,609, 0,609,482, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 33,609, 0,609, 33, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0,604,604, 93,604,604, 0, 0, 0, 0, 0] ], "bgmap": [ diff --git a/public/project/floors/MT41.js b/public/project/floors/MT41.js index 0ec0a78..7015d01 100644 --- a/public/project/floors/MT41.js +++ b/public/project/floors/MT41.js @@ -68,12 +68,12 @@ main.floors.MT41= "5,7": [ "你竟然能发现这里?!", "那我就送你回到标题界面吧!", - { - "type": "restart" - }, { "type": "function", "function": "function(){\ncore.completeAchievement('explore', 3);\n}" + }, + { + "type": "restart" } ] }, diff --git a/public/project/floors/MT42.js b/public/project/floors/MT42.js index 72b37bc..6d71330 100644 --- a/public/project/floors/MT42.js +++ b/public/project/floors/MT42.js @@ -124,21 +124,21 @@ main.floors.MT42= [ 0, 0, 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [604, 21,617,604, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 92,611,604,604,482, 0, 0, 0, 0,543, 0, 27, 28,482, 94], - [604, 0,376,378,403, 28, 0,604,390,396,588,588,492,614,584], - [584,584,584,584,584, 34, 29,604,484,441, 34,592, 33,376,584], + [604, 0, 27, 28,381, 28, 0,604,390,396,588,588,492,614,584], + [584,584,584,584,584, 34, 29,604,482,403, 34,592, 33,376,584], [ 0, 0, 0, 0, 0,595,604,604,608,604,584,588,403,584,584], [ 0, 0, 0, 0, 0,381, 0,274, 34, 0, 0,588, 0, 0, 0], [ 92, 0, 27, 0,617, 34,587,587, 0, 0,586,588,617,586,586], - [584,584,617,70022,70023,611,70022,70023, 0,600,492,376,482,378,586], - [584, 28, 34,584,608,482,608,584, 0, 33,587,587,587,614,586], - [584, 34,403,584,584, 85,584,584, 0,602, 0, 27,381, 0,586], - [584,584,584,584,466,484,467,584,602, 0,604,604,604,643,586], - [584, 0, 0,584,584,468,585,585, 0, 28,604,378,604,468,586], + [584,584,617,70022,70023,611,70022,70023, 0,600,492, 27,482, 28,586], + [584, 28, 34,584,608,484,608,584, 0, 33,587,587,492,614,586], + [584, 34,381,584,584, 85,584,584, 0,602, 0, 27,381, 0,586], + [584,584,584,584,420,491,430,584,602, 0,492,604,604,643,586], + [584, 0, 0,584,584,468,585,585, 0, 28,604, 27,604,441,586], [ 0, 0, 0,584,584,497,585,585, 0, 0,600,403,494, 0, 94], [ 0, 0, 0,584,584, 93,585,585, 93,584,584,584,584,584,584] ], "bgmap": [ - [70073,70073,70073,70073,70073,70073,70073,70073,70073,70073,70073,70073,70073,70097,70073], + [70073,70073, 0,70073,70073,70073,70073,70073,70073,70073,70073,70073,70073,70097,70073], [70049,70049, 0,70049,70073,70073,70073,70097,70073, 0,70073,70073,70073,70073,70073], [ 0, 0, 0, 0,70058,70105,70081,70081,70081, 0,70105,70049,70049,70049,70049], [ 0, 0, 0, 0,70058, 0, 0, 0, 0, 0,70056, 0, 0, 0, 0], diff --git a/public/project/floors/MT43.js b/public/project/floors/MT43.js index a05597c..d5e84b7 100644 --- a/public/project/floors/MT43.js +++ b/public/project/floors/MT43.js @@ -52,15 +52,15 @@ main.floors.MT43= [ 0, 0,378, 0,617, 33,586,586,586, 27, 0, 0,611, 32,604], [ 0,492,585,585,585,610, 0, 0,274, 0,381,604,604,595, 94], [70031, 0,585,403,585, 0, 21, 0,602,588,492,592, 0, 32,604], - [70031, 32,595,378,610,376, 0, 31, 0,588,376, 33,588,584,584], - [70031,600,584,584,584,608, 0, 0, 32,617, 21,378,588, 0, 0], - [ 0, 34,381, 27,584,390, 29, 0,584,584,584,584,584, 0, 0], + [70031, 32,595, 28,610,376, 0, 31, 0,588, 27, 33,588,584,584], + [70031,600,584,584,584,608, 0, 0, 32,617, 21, 28,588, 0, 0], + [ 0, 34,381, 27,584,376, 29, 0,584,584,584,584,584, 0, 0], [ 0,586,586,614,584,441, 0, 0, 0, 0, 0, 0, 0, 0, 94], - [70030,378, 34,381,494,396,602,584, 0, 0, 0, 0, 0, 34,584], + [70030,378, 34,381,494,378,602,584, 0, 0, 0, 0, 0, 33,584], [70030,584,584,584,584,584, 0,584,584, 0,608,403,614, 0,584], - [70030, 0, 0, 0, 0, 0,484,376,403,378,584,584,584, 0,584], - [70030, 0, 0, 0, 0, 0,643,604,604,494,602,376, 0,600,584], - [584,584,584,584,584,584,390, 0,604, 32,584,584,584,584,584], + [70030, 0, 0, 0, 0, 0,482,376,403,378,584,584,584, 0,584], + [70030, 0, 0, 0, 0, 0,643,604,604,494,602,376, 33,600,584], + [584,584,584,584,584,584,376, 0,604, 32,584,584,584,584,584], [ 0, 0, 0, 0, 0,584, 33,403,492, 32, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0,604,604, 93,604,604, 0, 0, 0, 0, 0] ], diff --git a/public/project/floors/MT44.js b/public/project/floors/MT44.js index 91fb746..8c30607 100644 --- a/public/project/floors/MT44.js +++ b/public/project/floors/MT44.js @@ -65,14 +65,14 @@ main.floors.MT44= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0,617, 34,403, 34,600, 0, 0], [ 92, 0,584,584,584, 0,543, 0, 34,604,604,604, 34, 0, 0], - [584, 0,584,390, 33,390,403,396,378, 0,492, 0,378, 0, 0], - [584, 0,643, 33,441,381, 32,595, 0,602,604,610,70176,70177,70177], + [584,643,584, 0, 33,390,403,396, 28, 0,492, 0, 28, 0, 0], + [584,376, 0,403, 0,381, 32,595, 0,602,604,610,70176,70177,70177], [584,584,584,584,584, 0,584,584,494, 0, 34, 0,608, 0, 94], - [ 0, 0, 0, 0, 0,274,376, 32,584,614,584,584,70208,70209,70209], + [ 0, 0, 0, 0, 0,274, 27, 32,584,614,584,584,70208,70209,70209], [586, 0, 33,403, 0,492, 0,381,584, 21, 0,584,584, 0, 0], - [586,617,588,588,588,588,602,584,584,584, 0,584,584, 0, 0], + [586,617,588,492,588,588,602,584,584,584, 0,584,584, 0, 0], [586, 0, 33, 0,274, 32, 0, 0, 0, 0, 33, 0, 0, 0, 0], - [586,586,586,610,587,587,595, 0,376, 0, 0,585,585, 0, 0], + [586,586,586,610,587,587,595, 0, 27, 0, 0,585,585, 0, 0], [586, 0,600, 0,378,587, 33,617,585,585,492, 33, 33, 0, 0], [586, 33,586,614,587,587,492, 0,584,584,584,584,584, 0, 0], [ 92, 0,492, 0,376,381, 0, 0, 0, 0, 0, 0, 0, 0, 0], diff --git a/public/project/floors/MT45.js b/public/project/floors/MT45.js index 7973163..f4e3026 100644 --- a/public/project/floors/MT45.js +++ b/public/project/floors/MT45.js @@ -46,8 +46,8 @@ main.floors.MT45= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [70177,70178, 34, 0, 34,70176,70177,70177,70177,70178,390, 0, 22, 0, 0], - [ 92, 0, 0,441, 0,608, 0, 0, 0,643, 0,441, 0, 0, 0], - [70209,70210,70179, 0,70181,70208,70209,70209,70209,70210,482, 0,396, 0, 0], + [ 92, 0, 0,403, 0,643, 0, 0, 0,608, 0,403, 0, 0, 0], + [70209,70210,70179, 0,70181,70208,70209,70209,70209,70210,491, 0,396, 0, 0], [ 0, 0,70187,608,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0,70187, 33,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0,70187, 21,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], diff --git a/public/project/floors/MT46.js b/public/project/floors/MT46.js index 0624c6e..1880d8c 100644 --- a/public/project/floors/MT46.js +++ b/public/project/floors/MT46.js @@ -17,11 +17,31 @@ main.floors.MT46= "eachArrive": [], "parallelDo": "", "events": { - "7,12": [ + "7,11": [ "\t[初级智人]\b[up,hero]这里也有水!", "\t[初级智人]\b[up,hero]看来下面的水的源头是这里吗。", "\t[初级智人]\b[up,hero]喝一口吧,说不定有什么奇效。", "攻防增加20点,智慧增加1000点", + { + "type": "setValue", + "name": "status:atk", + "operator": "+=", + "value": "20", + "norefresh": true + }, + { + "type": "setValue", + "name": "status:def", + "operator": "+=", + "value": "20", + "norefresh": true + }, + { + "type": "setValue", + "name": "status:mdef", + "operator": "+=", + "value": "1000" + }, "\t[初级智人]\b[up,hero]...", "\t[初级智人]\b[up,hero]果然。", "\t[初级智人]\b[up,hero]这就是智慧之神给我的引导吗。", @@ -63,14 +83,14 @@ main.floors.MT46= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0,376, 33,378, 0,608, 0,494, 0,608, 0,378, 33,376, 0], - [ 0,336,336,336,336, 0,345,494,345, 0,333,333,333,333, 0], + [ 0,376, 33,378, 0,608, 0,492, 0,608, 0,378, 33,376, 0], + [ 0,336,336,336,336, 0,345,492,345, 0,333,333,333,333, 0], [ 0, 0,617, 34, 0, 0,610, 33,610, 0, 0, 34,600, 0, 0], - [ 0,403,336, 0, 0, 0, 0,643, 0, 0, 0, 0,333,403, 0], - [ 0,378,336,600, 0, 0, 0, 93, 0, 0, 0,617,333,376, 0], - [ 0,336,336, 0, 0, 0, 0,141, 0, 0, 0, 0,333,333, 0], - [ 0,484,492, 0, 0, 0, 0,141, 0, 0, 0, 0,492,484, 0], - [ 0, 0, 0,540, 0, 0, 0,141, 0, 0, 0,540, 0, 0, 0] + [ 0,381,336, 0, 0, 0, 0,643, 0, 0, 0, 0,333,381, 0], + [ 0, 28,336,600, 0, 0, 0, 0, 0, 0, 0,617,333, 27, 0], + [ 0,336,336, 0, 0, 0, 0, 17, 0, 0, 0, 0,333,333, 0], + [ 0,484,492, 0, 0, 0, 0, 17, 0, 0, 0, 0,492,484, 0], + [ 0, 0, 0,540, 0, 0, 0, 17, 0, 0, 0,540, 0, 0, 0] ], "bgmap": [ [20041,20041,20041,20041,20041,20041,20041,20041,20041,20041,20041,20041,20041,20041,20041], @@ -84,10 +104,10 @@ main.floors.MT46= [20042, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,20040], [20042, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,20040], [20042, 0, 0, 0,20032,20033,20034, 0,20032,20033,20034, 0, 0, 0,20040], - [20042, 0, 0, 0,20040,20041,20042, 0,20040,20041,20042, 0, 0, 0,20040], - [20042, 0, 0, 0,20040,20041,20042, 0,20040,20041,20042, 0, 0, 0,20040], - [20042, 0, 0, 0,20040,20041,20042, 0,20040,20041,20042, 0, 0, 0,20040], - [20036,20033,20034, 0,20040,20041,20042, 0,20040,20041,20042, 0,20032,20033,20035] + [20042, 0, 0, 0,20040,20041,20042,142,20040,20041,20042, 0, 0, 0,20040], + [20042, 0, 0, 0,20040,20041,20042,142,20040,20041,20042, 0, 0, 0,20040], + [20042, 0, 0, 0,20040,20041,20042,142,20040,20041,20042, 0, 0, 0,20040], + [20036,20033,20034, 0,20040,20041,20042,142,20040,20041,20042, 0,20032,20033,20035] ], "fgmap": [ diff --git a/public/project/floors/MT47.js b/public/project/floors/MT47.js index eaa3989..ff53385 100644 --- a/public/project/floors/MT47.js +++ b/public/project/floors/MT47.js @@ -83,15 +83,15 @@ main.floors.MT47= [ 0, 0,70030, 0,70031, 0,604,468,604, 0, 0, 0,70028,70030,70030], [70030,70030,70030,70031,70031,70031,604,608,604,70028,70028,70028,70028, 0, 0], [ 0, 0, 0,70031, 0, 0,611, 85,611, 0, 0, 0,70029,70029,70029], - [70031, 0, 0, 0, 0,613, 0, 0, 0, 0,604,643, 0, 0,604], - [70031,586,586,586,586,586,602,604,608,604,604, 0,604, 0,604], - [70031, 0, 0,494, 32,586, 0,604, 0,602, 0, 0,604, 0,604], - [70031, 0, 0,585,592, 0, 0,604, 0,587,587,587,587,587,587], + [70031, 0,381, 33,378,613, 0,376, 33,378,604,643, 0,441,604], + [70031,586,586,586,586,586,602,604,608,604,604, 0,604,378,604], + [70031,376, 34,494, 32,586, 0,604, 0,602, 0,381,604, 33,604], + [70031, 0,403,585,592, 0, 34,604, 34,587,587,587,587,587,587], [ 0,617,585,585,492,586,586,586,378,587,587, 0,492,482,587], - [ 0, 0,611, 0,376, 0, 0,492, 0, 0,602, 0,587,482,587], + [ 0, 0,611, 0,376, 34, 0,492, 0, 0,602, 0,587,482,587], [ 0,643,584,584,584,614,584,584,584,600,584,608,585,585,585], - [70029, 0, 0, 0,584,376, 0,584, 0,378,584, 0, 0, 0,585], - [70029, 0, 0, 0,584, 34,381,643,381, 34,584, 0, 0, 0,585], + [70029,376, 21,378,584,376, 0,584, 0,378,584, 34,403, 34,585], + [70029, 33,403, 33,584, 34,381,643,381, 34,584,376, 21,378,585], [70029,584,584,584,584,584,584, 0,584,584,584,584,584,584,584], [70029, 0, 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, 0, 0, 0] ], diff --git a/public/project/floors/MT48.js b/public/project/floors/MT48.js index 2db2d6b..da5fb2f 100644 --- a/public/project/floors/MT48.js +++ b/public/project/floors/MT48.js @@ -16,7 +16,35 @@ main.floors.MT48= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": {}, + "events": { + "7,0": [ + "本塔的第二章测试版已结束。", + "本章还剩余最后一个大区域,约30层,较为复杂,请期待下次更新。", + "计分方式:血量/10+黄*2000+蓝*5000+红*10000", + { + "type": "setValue", + "name": "status:hp", + "operator": "/=", + "value": "10", + "norefresh": true + }, + { + "type": "setValue", + "name": "status:hp", + "operator": "+=", + "value": "item:yellowKey*2000+item:blueKey*5000+item:redKey*10000", + "norefresh": true + }, + { + "type": "function", + "function": "function(){\ncore.status.hero.hp = Math.ceil(core.status.hero.hp);\n}" + }, + { + "type": "win", + "reason": "第二章测试" + } + ] + }, "changeFloor": { "7,14": { "floorId": "MT47", @@ -34,24 +62,38 @@ main.floors.MT48= "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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, 0, 0, 0] + [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0, 0, 0, 0, 0], + [ 0, 0,584,584,584,584,584, 85,584,584,584,584,584, 0, 0], + [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], + [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], + [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], + [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], + [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], + [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], + [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], + [ 0, 0,584,584,584,584,584,492,584,584,584,584,584, 0, 0], + [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,604, 93,604, 0, 0, 0, 0, 0, 0] ], "bgmap": [ - + [ 0, 0, 0, 0, 0, 0,70056, 91,70058, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,70056, 0,70058, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,70056, 0,70058, 0, 0, 0, 0, 0, 0], + [ 0, 0,70048,70049,70049,70049,70051, 0,70052,70049,70049,70049,70050, 0, 0], + [ 0, 0,70056, 0, 0, 0, 0, 0, 0, 0, 0, 0,70058, 0, 0], + [ 0, 0,70056, 0, 0, 0, 0, 0, 0, 0, 0, 0,70058, 0, 0], + [ 0, 0,70056, 0, 0, 0, 0, 0, 0, 0, 0, 0,70058, 0, 0], + [ 0, 0,70056, 0, 0, 0, 0, 0, 0, 0, 0, 0,70058, 0, 0], + [ 0, 0,70056, 0, 0, 0, 0, 0, 0, 0, 0, 0,70058, 0, 0], + [ 0, 0,70056, 0, 0, 0, 0, 0, 0, 0, 0, 0,70058, 0, 0], + [ 0, 0,70056, 0, 0, 0, 0, 0, 0, 0, 0, 0,70058, 0, 0], + [ 0, 0,70064,70065,70065,70065,70059, 0,70060,70065,70065,70065,70066, 0, 0], + [ 0, 0,70072,70073,70073,70073,70056, 0,70058,70073,70073,70073,70074, 0, 0], + [ 0, 0,70080,70081,70081,70081,70056, 0,70058,70081,70081,70081,70082, 0, 0], + [ 0, 0, 0, 0, 0, 0,70056, 0,70058, 0, 0, 0, 0, 0, 0] ], "fgmap": [ diff --git a/public/project/floors/snowTown.js b/public/project/floors/snowTown.js index 0bb5ade..9479644 100644 --- a/public/project/floors/snowTown.js +++ b/public/project/floors/snowTown.js @@ -142,16 +142,16 @@ main.floors.snowTown= "map": [ [ 0, 0, 0, 0, 0, 0, 0, 91, 0, 0, 0, 0, 0, 0, 0, 0, 0,70187, 91,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70187, 0,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [604,381,376, 33,611, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70195, 0,70197, 0, 0, 0,70160,70161,70162,70163, 0, 0, 0, 0, 0,80296,80297,80298,80299,80300, 0, 0, 0, 0, 0, 0, 0, 0], + [604,381, 27, 33,611, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70195, 0,70197, 0, 0, 0,70160,70161,70162,70163, 0, 0, 0, 0, 0,80296,80297,80298,80299,80300, 0, 0, 0, 0, 0, 0, 0, 0], [604,595,584,584,584,274,604,604, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70019,70168,70169,70170,70171, 0, 0, 0, 0, 0,80304,80305,80306,80307,80308, 0, 0, 0, 0, 0, 0, 0, 0], - [ 92, 0,492,484,584, 33,378,381, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,80312,80313,80314,80315,80316, 0, 0, 0, 0, 0, 0, 0, 0], + [ 92, 0,492,484,584, 33, 28,381, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,80312,80313,80314,80315,80316, 0, 0, 0, 0, 0, 0, 0, 0], [584,584,584,584,584,584,584,584, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70019, 0, 0, 0, 0,80320,80321,80325,80326,80327, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70014,80328,80329,80333,80334,80335, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,584,584,584,584,584,584,584,584,584, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,80160,80161,80162,80163, 0, 0,70003,70003,70003, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [584,584, 0,376, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,80168,80169,80170,80171, 0, 0, 0, 0, 0, 0,70179, 0, 0,70181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [584,584, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,80168,80169,80170,80171, 0, 0, 0, 0, 0, 0,70179, 0, 0,70181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 92,617,381,484, 0, 0, 0, 0, 0, 0, 0, 0, 0,584,584,584,584,584,584,584,584,584,584,584,70187, 0, 0,70189,584, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [584,584, 0,378, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70187, 0, 0,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [584,584, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70187, 0, 0,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [584,584,584,584, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70187, 0, 0,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70187, 0, 0,70189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,70195, 0, 0,70197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], diff --git a/public/project/items.js b/public/project/items.js index d133040..2ba2f2b 100644 --- a/public/project/items.js +++ b/public/project/items.js @@ -1050,8 +1050,8 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "cls": "items", "name": "新物品", "text": ",防御+${core.values.blueGem}", - "itemEffect": "core.status.hero.def += 8 * core.status.thisMap.ratio", - "itemEffectTip": ",防御+${8 * core.status.thisMap.ratio}", + "itemEffect": "core.status.hero.mdef += 640 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.plugin.skillTree.getSkillLevel(11) / 20 + 1)", + "itemEffectTip": ",智慧+${640 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.plugin.skillTree.getSkillLevel(11) / 20 + 1)}", "useItemEffect": "core.status.hero.def += core.values.blueGem", "canUseItemEffect": "true" }, diff --git a/public/project/maps.js b/public/project/maps.js index 3cfa587..62d21b2 100644 --- a/public/project/maps.js +++ b/public/project/maps.js @@ -618,6 +618,8 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "70050": {"cls":"tileset","id":"X70050","cannotOut":["up","right"],"cannotIn":["up","right"]}, "70056": {"cls":"tileset","id":"X70056","cannotOut":["left"],"cannotIn":["left"]}, "70058": {"cls":"tileset","id":"X70058","cannotOut":["right"],"cannotIn":["right"]}, + "70059": {"cls":"tileset","id":"X70059","cannotOut":["left"],"cannotIn":["left"]}, + "70060": {"cls":"tileset","id":"X70060","cannotOut":["right"],"cannotIn":["right"]}, "70064": {"cls":"tileset","id":"X70064","cannotOut":["down","left"],"cannotIn":["up","down","left","right"]}, "70065": {"cls":"tileset","id":"X70065","cannotIn":["up","down","left","right"],"cannotOut":["up","down","left","right"]}, "70066": {"cls":"tileset","id":"X70066","cannotOut":["down","right"],"cannotIn":["up","down","left","right"]}, @@ -642,7 +644,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "70128": {"cls":"tileset","id":"X70128","cannotIn":[]}, "70130": {"cls":"tileset","id":"X70130","cannotIn":[]}, "70131": {"cls":"tileset","id":"X70131","cannotOut":["left","right"],"cannotIn":["left","right"]}, - "70132": {"cls":"tileset","id":"X70132","cannotOut":["left","right"],"cannotIn":["left","right"]}, + "70132": {"cls":"tileset","id":"X70132","cannotOut":[],"cannotIn":[]}, "70184": {"cls":"tileset","id":"X70184","canPass":true}, "70185": {"cls":"tileset","id":"X70185","canPass":true}, "70186": {"cls":"tileset","id":"X70186","canPass":true}, diff --git a/public/project/plugin/skillTree.js b/public/project/plugin/skillTree.js index 4e6650d..2cb568e 100644 --- a/public/project/plugin/skillTree.js +++ b/public/project/plugin/skillTree.js @@ -130,7 +130,7 @@ const skills = { '主动技能,快捷键3,', '减少一定的攻击,增加一定的防御' ], - consume: '500 * level + 1000', + consume: '1000 * level ** 2 + 1000', front: [[9, 5]], loc: [2, 5], max: 5, @@ -144,7 +144,7 @@ const skills = { '主动技能,可以消耗500智慧学习一个怪物的技能,', '持续5场战斗,每学习一次消耗的智慧点增加250,每次升级使持续的战斗次数增加3次。更多信息可在学习后在百科全书查看。' ], - consume: '2500 * level ** 2 + 2500', + consume: '2500 * 2 ** level + 5000', front: [ [8, 10], [12, 5] @@ -215,13 +215,10 @@ export function getSkillLevel(skill) { export function getSkillConsume(skill) { return eval( - this.getSkillFromIndex(skill).consume.replace( - /level(:\d+)?/g, - (str, $1) => { - if ($1) return `core.plugin.skillTree.getSkillLevel(${$1})`; - else return `core.plugin.skillTree.getSkillLevel(${skill})`; - } - ) + getSkillFromIndex(skill).consume.replace(/level(:\d+)?/g, (str, $1) => { + if ($1) return `core.plugin.skillTree.getSkillLevel(${$1})`; + else return `core.plugin.skillTree.getSkillLevel(${skill})`; + }) ); } diff --git a/src/data/desc.json b/src/data/desc.json index b8dce66..bb6c35e 100644 --- a/src/data/desc.json +++ b/src/data/desc.json @@ -429,6 +429,15 @@ "调试模式下无法完成成就!" ] }, + "score": { + "text": "计分方式", + "condition": "true", + "desc": [ + "第一章计分方式:血量 + 黄 * 5000 + 蓝 * 15000", + "
", + "第二章计分方式:血量 / 10 + 黄 * 2000 + 蓝 * 5000 + 红 * 10000" + ] + }, "skillTree": { "text": "技能树", "condition": "flags.chapter > 0", diff --git a/src/plugin/shadow/gameShadow.ts b/src/plugin/shadow/gameShadow.ts index 7c56cab..b027e38 100644 --- a/src/plugin/shadow/gameShadow.ts +++ b/src/plugin/shadow/gameShadow.ts @@ -31,27 +31,10 @@ export default function init() { return { updateShadow, clearShadowCache, setCalShadow }; } -const shadowInfo: Partial> = { - MT48: [ - { - id: 'mt48_1', - x: 0, - y: 48, - decay: 0, - r: 300, - color: '#0000' - } - ] -}; -const backgroundInfo: Partial> = { - MT48: '#0008' -}; -const blurInfo: Partial> = { - MT48: 4 -}; -const immersionInfo: Partial> = { - MT48: 4 -}; +const shadowInfo: Partial> = {}; +const backgroundInfo: Partial> = {}; +const blurInfo: Partial> = {}; +const immersionInfo: Partial> = {}; const shadowCache: Partial> = {}; let calMapShadow = true; diff --git a/src/source/cls.d.ts b/src/source/cls.d.ts index 237930c..9e3d3e3 100644 --- a/src/source/cls.d.ts +++ b/src/source/cls.d.ts @@ -617,6 +617,8 @@ interface IdToCls { X70050: 'tileset'; X70056: 'tileset'; X70058: 'tileset'; + X70059: 'tileset'; + X70060: 'tileset'; X70064: 'tileset'; X70065: 'tileset'; X70066: 'tileset'; diff --git a/src/source/maps.d.ts b/src/source/maps.d.ts index a3f03f5..e52c84f 100644 --- a/src/source/maps.d.ts +++ b/src/source/maps.d.ts @@ -617,6 +617,8 @@ interface IdToNumber { X70050: 70050; X70056: 70056; X70058: 70058; + X70059: 70059; + X70060: 70060; X70064: 70064; X70065: 70065; X70066: 70066; @@ -1271,6 +1273,8 @@ interface NumberToId { 70050: 'X70050'; 70056: 'X70056'; 70058: 'X70058'; + 70059: 'X70059'; + 70060: 'X70060'; 70064: 'X70064'; 70065: 'X70065'; 70066: 'X70066'; diff --git a/src/ui/completeAchievement.vue b/src/ui/completeAchievement.vue index 229f696..89d122d 100644 --- a/src/ui/completeAchievement.vue +++ b/src/ui/completeAchievement.vue @@ -44,7 +44,7 @@ const point = achi.point; const nowPoint = getNowPoint() - point; const now = ref(nowPoint); -const progress = computed(() => now.value / totalPoint); +const progress = computed(() => Math.floor(now.value / totalPoint)); onMounted(async () => { await sleep(500); diff --git a/src/ui/statusBar.vue b/src/ui/statusBar.vue index d84cfbd..d6b9385 100644 --- a/src/ui/statusBar.vue +++ b/src/ui/statusBar.vue @@ -132,7 +132,7 @@ import { isMobile } from '../plugin/use'; import { has } from '../plugin/utils'; const width = ref( - isMobile ? window.innerWidth - 100 : window.innerWidth * 0.175 + isMobile ? window.innerWidth - 60 : window.innerWidth * 0.175 ); const height = ref(isMobile ? 250 : window.innerHeight - 100); const updateStatus = ref(false);