diff --git a/public/project/enemys.js b/public/project/enemys.js index 754d36d..77a2fa5 100644 --- a/public/project/enemys.js +++ b/public/project/enemys.js @@ -167,5 +167,9 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E616": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"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} + "E643": {"name":"苍蓝史莱姆","hp":17500,"atk":2800,"def":2000,"money":3,"exp":175,"point":0,"special":[28],"paleShield":30}, + "E644": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E645": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E646": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E647": {"name":"苍蓝之灵-虚","hp":30000,"atk":5000,"def":3000,"money":10,"exp":2500,"point":0,"special":[28],"paleShield":10} } \ No newline at end of file diff --git a/public/project/floors/MT48.js b/public/project/floors/MT48.js index 86e120f..9301880 100644 --- a/public/project/floors/MT48.js +++ b/public/project/floors/MT48.js @@ -25,15 +25,13 @@ main.floors.MT48= "type": "setValue", "name": "status:hp", "operator": "/=", - "value": "10", - "norefresh": true + "value": "10" }, { "type": "setValue", "name": "status:hp", "operator": "+=", - "value": "item:yellowKey*2000+item:blueKey*5000+item:redKey*10000", - "norefresh": true + "value": "item:yellowKey*2000+item:blueKey*5000+item:redKey*10000" }, { "type": "function", @@ -43,6 +41,26 @@ main.floors.MT48= "type": "win", "reason": "第二章测试" } + ], + "7,10": [ + "\t[苍蓝之灵-虚,E647]\b[up,7,7]你来了,智慧之神看中的人。", + "\t[中级智人]\b[up,hero]你是什么人?", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]苍蓝之灵。", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]我跟你之前见到的智慧之神是同一时期的产物。", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]你应该也知道当时发生了什么。", + "\t[中级智人]\b[up,hero]那你又为何出现在这里呢?", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]抬头,看到那宏伟的宫殿了吗?(玩家视角应该看不到)", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]那便是未来之人做下的最后赌注 - 苍蓝之殿。", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]你现在还有很多疑虑吧,那里便有你想要找的答案。", + "\t[中级智人]\b[up,hero]那么我怎么过去?", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]打败我,你便有资格进入。", + "\t[中级智人]\b[up,hero]为什么又是要打架?", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]......", + "\t[苍蓝之灵-虚,E647]\b[up,7,7]之后,你会明白的。", + { + "type": "hide", + "remove": true + } ] }, "changeFloor": { @@ -55,7 +73,18 @@ main.floors.MT48= } }, "beforeBattle": {}, - "afterBattle": {}, + "afterBattle": { + "7,7": [ + "\t[中级智人]\b[up,hero]为什么,为什么一定要打架,决定胜负呢?", + { + "type": "openDoor", + "loc": [ + 7, + 3 + ] + } + ] + }, "afterGetItem": {}, "afterOpenDoor": {}, "autoEvent": {}, @@ -66,13 +95,13 @@ main.floors.MT48= [146,146,146,146, 0, 0,604, 0,604, 0,146,146, 0, 0,146], [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0,146,146, 0,146], [587, 0,584,584,584,584,584, 85,584,584,584,584,584, 0,146], - [587, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], - [587, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584,588,588], - [587, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0,588], - [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0,588], - [ 0, 0,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0,588], - [ 0,588,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584, 0, 0], - [ 0,588,584, 0, 0, 0, 0, 0, 0, 0, 0, 0,584,604, 0], + [587, 0,584, 0, 0, 0,584, 0,584, 0, 0, 0,584, 0, 0], + [587, 0,584, 0, 0, 0,584, 0,584, 0, 0, 0,584,588,588], + [587, 0,584, 0,466, 0,584, 0,584, 0,467, 0,584, 0,588], + [ 0, 0,584, 0, 0,491, 0,647, 0,491, 0, 0,584, 0,588], + [ 0, 0,584, 0,468, 0,584, 0,584, 0,468, 0,584, 0,588], + [ 0,588,584, 0, 0, 0,584, 0,584, 0, 0, 0,584, 0, 0], + [ 0,588,584, 0, 0, 0,584, 0,584, 0, 0, 0,584,604, 0], [588,588,584,584,584,584,584,492,584,584,584,584,584,604, 0], [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0, 0, 0,604, 0], [ 0, 0, 0, 0, 0, 0,604, 0,604, 0, 0, 0, 0, 0, 0], diff --git a/public/project/icons.js b/public/project/icons.js index 25731eb..4f22b6d 100644 --- a/public/project/icons.js +++ b/public/project/icons.js @@ -404,7 +404,11 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "E616": 160, "E617": 161, "E618": 162, - "E643": 163 + "E643": 163, + "E644": 164, + "E645": 165, + "E646": 166, + "E647": 167 }, "enemy48": { "angel": 0, diff --git a/public/project/items.js b/public/project/items.js index 02df829..540f35e 100644 --- a/public/project/items.js +++ b/public/project/items.js @@ -1221,7 +1221,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "canUseItemEffect": "true", "text": "!!html饰品。与寒冰没有任何关系,但是为什么叫寒冰护符呢?攻击和额外攻击各增加5%", "equip": { - "type": "饰品", + "type": "首饰", "value": {}, "percentage": { "mana": 5, diff --git a/public/project/maps.js b/public/project/maps.js index 62d21b2..4357abe 100644 --- a/public/project/maps.js +++ b/public/project/maps.js @@ -572,6 +572,10 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "641": {"cls":"items","id":"I641"}, "642": {"cls":"items","id":"I642"}, "643": {"cls":"enemys","id":"E643"}, + "644": {"cls":"enemys","id":"E644"}, + "645": {"cls":"enemys","id":"E645"}, + "646": {"cls":"enemys","id":"E646"}, + "647": {"cls":"enemys","id":"E647"}, "20032": {"cls":"tileset","id":"X20032","cannotOut":["up","left"],"cannotIn":["up","left"]}, "20033": {"cls":"tileset","id":"X20033","cannotOut":["up"],"cannotIn":["up"]}, "20034": {"cls":"tileset","id":"X20034","cannotOut":["up","right"],"cannotIn":["up","right"]}, diff --git a/public/project/materials/enemys.png b/public/project/materials/enemys.png index c74bcc2..81ec6cd 100644 Binary files a/public/project/materials/enemys.png and b/public/project/materials/enemys.png differ diff --git a/public/project/plugin/fiveLayer.js b/public/project/plugin/fiveLayer.js index 7efa072..8c95842 100644 --- a/public/project/plugin/fiveLayer.js +++ b/public/project/plugin/fiveLayer.js @@ -6,7 +6,7 @@ function createCanvas(name, zIndex) { if (!name) return; var canvas = document.createElement('canvas'); canvas.id = name; - canvas.className = 'gameCanvas'; + canvas.className = 'gameCanvas no-anti-aliasing'; // 编辑器模式下设置zIndex会导致加入的图层覆盖优先级过高 if (main.mode != 'editor') canvas.style.zIndex = zIndex || 0; // 将图层插入进游戏内容 diff --git a/public/project/plugin/skills.js b/public/project/plugin/skills.js index d748317..862e2d9 100644 --- a/public/project/plugin/skills.js +++ b/public/project/plugin/skills.js @@ -33,7 +33,8 @@ export const jumpIgnoreFloor = [ 'MT44', 'MT45', 'MT46', - 'MT47' + 'MT47', + 'MT48' ]; // 跳跃 export function jumpSkill() { diff --git a/src/panel/enemySpecial.vue b/src/panel/enemySpecial.vue index ce5bf10..bd7596d 100644 --- a/src/panel/enemySpecial.vue +++ b/src/panel/enemySpecial.vue @@ -94,10 +94,6 @@ const format = core.formatBigNumber; font-size: 3.8vw; } - #special-scroll { - height: 50vh; - } - #critical-des, .critical { font-size: 3.6vw; diff --git a/src/source/cls.d.ts b/src/source/cls.d.ts index 9e3d3e3..27e445c 100644 --- a/src/source/cls.d.ts +++ b/src/source/cls.d.ts @@ -571,6 +571,10 @@ interface IdToCls { I641: 'items'; I642: 'items'; E643: 'enemys'; + E644: 'enemys'; + E645: 'enemys'; + E646: 'enemys'; + E647: 'enemys'; X20032: 'tileset'; X20033: 'tileset'; X20034: 'tileset'; diff --git a/src/source/maps.d.ts b/src/source/maps.d.ts index e52c84f..b2214b8 100644 --- a/src/source/maps.d.ts +++ b/src/source/maps.d.ts @@ -571,6 +571,10 @@ interface IdToNumber { I641: 641; I642: 642; E643: 643; + E644: 644; + E645: 645; + E646: 646; + E647: 647; X20032: 20032; X20033: 20033; X20034: 20034; @@ -1227,6 +1231,10 @@ interface NumberToId { 641: 'I641'; 642: 'I642'; 643: 'E643'; + 644: 'E644'; + 645: 'E645'; + 646: 'E646'; + 647: 'E647'; 20032: 'X20032'; 20033: 'X20033'; 20034: 'X20034';