diff --git a/.prettierignore b/.prettierignore index e6321af..38d01af 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,6 +5,7 @@ public/project/floors/*.js public/project/items.js public/project/floors/*.js public/project/maps.js +public/project/icons.js public/_server/**/*.js script/**/*.js public/editor.html diff --git a/public/project/enemys.js b/public/project/enemys.js index ba24374..0083992 100644 --- a/public/project/enemys.js +++ b/public/project/enemys.js @@ -199,5 +199,9 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E686": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E687": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E688": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E689": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]} + "E689": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E690": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E691": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E692": {"name":"苍蓝之灵-圣","hp":150000,"atk":15000,"def":5000,"money":20,"exp":5000,"point":0,"special":[4,28],"paleShield":25}, + "E693": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]} } \ No newline at end of file diff --git a/public/project/floors/MT50.js b/public/project/floors/MT50.js index fab539a..767e494 100644 --- a/public/project/floors/MT50.js +++ b/public/project/floors/MT50.js @@ -41,10 +41,10 @@ main.floors.MT50= "本区域极大,建议打开小地图游玩。如果打开小地图后打怪出现卡顿,可以尝试在 设置->ui设置 里面打开小地图懒更新设置", "此区域建议多多使用定点查看功能,鼠标移动到怪物上按C或E即可打开(如果你没有设置自己的快捷键的话)。手机端暂时无法定点查看", "打完左下角和右下角的boss之后,开四个机关门", - "注意不要忘记购买装备,到了下一章之后本章的商店将不能到达,快捷商店也会消失。这些装备在下一章都会有向上合成", + "注意不要忘记购买装备,到了下一章之后本章的商店将不能到达,不过快捷商店还会保留。这些装备在下一章都会有向上合成", "建议优先点出学习技能,对于特定场景将会非常有帮助", "本区域可以使用跳跃技能,不要忘记了。", - "注意火炬可通行,而且跳跃时会跳过火炬,不会跳到火炬上。以及由于不可抗力,修改游戏缩放后需要刷新页面才能使光照正常。" + "注意火炬可通行,而且跳跃时会跳过火炬,不会跳到火炬上。" ] }, "changeFloor": { diff --git a/public/project/floors/MT83.js b/public/project/floors/MT83.js index 070f775..ee20ef6 100644 --- a/public/project/floors/MT83.js +++ b/public/project/floors/MT83.js @@ -31,6 +31,13 @@ main.floors.MT83= 7, 14 ] + }, + "0,7": { + "floorId": "MT84", + "loc": [ + 14, + 7 + ] } }, "beforeBattle": {}, diff --git a/public/project/floors/MT84.js b/public/project/floors/MT84.js index d29caa4..97ad4ff 100644 --- a/public/project/floors/MT84.js +++ b/public/project/floors/MT84.js @@ -1,45 +1,65 @@ main.floors.MT84= { -"floorId": "MT84", -"title": "苍蓝之殿-左上", -"name": "84", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 8, -"defaultGround": "T650", -"bgm": "palaceNorth.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"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, 0, 0, 0, 0, 0, 0, 0, 0] + "floorId": "MT84", + "title": "苍蓝之殿-左上", + "name": "84", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 8, + "defaultGround": "T650", + "bgm": "palaceNorth.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "14,7": { + "floorId": "MT83", + "loc": [ + 0, + 7 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648], + [648,671, 0,491,378, 0,679,648,578, 0, 28,484,658,482,648], + [648, 0,648,648,648,648, 0,648, 0,648,648,648,648,658,648], + [648,378,648, 0,491,648,491,648,484,648,484, 0,648, 28,648], + [648,232,648,648,538,648,378,648, 28,648,513,648,648, 0,648], + [648, 0,491,381, 0,648, 0,648, 0,648, 0, 29,484,677,648], + [648,648,648,648,648,648,618,648,682,648,648,648,648,648,648], + [648,466,467,468,695,692,487,648, 0, 0,484, 0,484, 0, 94], + [648,648,648,648,648,648,618,648,682,648,648,648,648,648,648], + [648, 0,491,381, 0,648, 0,648, 0,648, 0, 29,484,677,648], + [648,232,648,648,538,648,376,648, 27,648,513,648,648, 0,648], + [648,376,648, 0,491,648,491,648,484,648,484, 0,648, 27,648], + [648, 0,648,648,648,648, 0,648, 0,648,648,648,648,658,648], + [648,671, 0,491,376, 0,679,648,578, 0, 27,484,658,482,648], + [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648] ], + "bgmap": [ + +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/icons.js b/public/project/icons.js index 4fa6805..a39dc0e 100644 --- a/public/project/icons.js +++ b/public/project/icons.js @@ -447,7 +447,11 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "E686": 192, "E687": 193, "E688": 194, - "E689": 195 + "E689": 195, + "E690": 196, + "E691": 197, + "E692": 198, + "E693": 199 }, "enemy48": { "angel": 0, @@ -647,7 +651,11 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "I662": 104, "I663": 105, "I664": 106, - "I665": 107 + "I665": 107, + "I694": 108, + "I695": 109, + "I696": 110, + "I697": 111 }, "autotile": { "autotile": 0, diff --git a/public/project/items.js b/public/project/items.js index d8733de..b51f06e 100644 --- a/public/project/items.js +++ b/public/project/items.js @@ -1269,5 +1269,33 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "cls": "items", "name": "新物品", "canUseItemEffect": "true" + }, + "I694": { + "cls": "items", + "name": "高级红血瓶", + "canUseItemEffect": "true", + "itemEffect": "core.status.hero.hp += Math.round(10000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))", + "itemEffectTip": ",生命+${Math.round(10000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))}" + }, + "I695": { + "cls": "items", + "name": "高级蓝血瓶", + "canUseItemEffect": "true", + "itemEffect": "core.status.hero.hp += Math.round(20000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))", + "itemEffectTip": ",生命+${Math.round(20000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))}" + }, + "I696": { + "cls": "items", + "name": "高级绿血瓶", + "canUseItemEffect": "true", + "itemEffect": "core.status.hero.hp += Math.round(40000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))", + "itemEffectTip": ",生命+${Math.round(40000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))}" + }, + "I697": { + "cls": "items", + "name": "高级紫血瓶", + "canUseItemEffect": "true", + "itemEffect": "core.status.hero.hp += Math.round(80000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))", + "itemEffectTip": ",生命+${Math.round(80000 * core.status.thisMap.ratio * (1 + Mota.Plugin.require('skillTree_g').getSkillLevel(13) / 50))}" } } \ No newline at end of file diff --git a/public/project/maps.js b/public/project/maps.js index c5616cb..2a6239d 100644 --- a/public/project/maps.js +++ b/public/project/maps.js @@ -618,6 +618,14 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "687": {"cls":"enemys","id":"E687"}, "688": {"cls":"enemys","id":"E688"}, "689": {"cls":"enemys","id":"E689"}, + "690": {"cls":"enemys","id":"E690"}, + "691": {"cls":"enemys","id":"E691"}, + "692": {"cls":"enemys","id":"E692"}, + "693": {"cls":"enemys","id":"E693"}, + "694": {"cls":"items","id":"I694"}, + "695": {"cls":"items","id":"I695"}, + "696": {"cls":"items","id":"I696"}, + "697": {"cls":"items","id":"I697"}, "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 8c6433d..4c5417b 100644 Binary files a/public/project/materials/enemys.png and b/public/project/materials/enemys.png differ diff --git a/public/project/materials/items.png b/public/project/materials/items.png index 777caee..141eb48 100644 Binary files a/public/project/materials/items.png and b/public/project/materials/items.png differ diff --git a/src/game/mechanism/misc.ts b/src/game/mechanism/misc.ts index 74de9a2..52c904d 100644 --- a/src/game/mechanism/misc.ts +++ b/src/game/mechanism/misc.ts @@ -125,6 +125,10 @@ export namespace BluePalace { { fx: 5, fy: 3, dir: 'left', tx: 9, ty: 3, toDir: 'right' }, { fx: 2, fy: 2, dir: 'up', tx: 2, ty: 12, toDir: 'down' }, { fx: 12, fy: 2, dir: 'up', tx: 12, ty: 12, toDir: 'down' } + ], + MT84: [ + { fx: 2, fy: 3, dir: 'right', tx: 12, ty: 3, toDir: 'left' }, + { fx: 2, fy: 11, dir: 'right', tx: 12, ty: 11, toDir: 'left' } ] }; loading.once('coreInit', initPortals); diff --git a/src/plugin/fx/itemDetail.ts b/src/plugin/fx/itemDetail.ts index 8013c95..380d3de 100644 --- a/src/plugin/fx/itemDetail.ts +++ b/src/plugin/fx/itemDetail.ts @@ -227,7 +227,7 @@ export class FloorItemDetail implements ILayerGroupRenderExtends { for (const [key, value] of Object.entries(diff)) { if (!value) continue; const color = FloorItemDetail.detailColor[key] ?? '#fff'; - const text = Math.floor(value).toString(); + const text = core.formatBigNumber(value, 4); const renderable: DamageRenderable = { x: x * this.sprite.cellSize + 2, y: y * this.sprite.cellSize + 31 - n * 10, diff --git a/src/plugin/game/skill.ts b/src/plugin/game/skill.ts index ace4975..1a0c005 100644 --- a/src/plugin/game/skill.ts +++ b/src/plugin/game/skill.ts @@ -44,7 +44,8 @@ export const jumpIgnoreFloor: FloorIds[] = [ 'MT72', 'MT73', 'MT74', - 'MT75' + 'MT75', + 'MT84' ]; // 跳跃 export function jumpSkill() { diff --git a/src/source/cls.d.ts b/src/source/cls.d.ts index 42306db..3fb1080 100644 --- a/src/source/cls.d.ts +++ b/src/source/cls.d.ts @@ -617,6 +617,14 @@ interface IdToCls { E687: 'enemys'; E688: 'enemys'; E689: 'enemys'; + E690: 'enemys'; + E691: 'enemys'; + E692: 'enemys'; + E693: 'enemys'; + I694: 'items'; + I695: 'items'; + I696: 'items'; + I697: 'items'; X20032: 'tileset'; X20033: 'tileset'; X20034: 'tileset'; diff --git a/src/source/items.d.ts b/src/source/items.d.ts index 86242d9..f1dea7f 100644 --- a/src/source/items.d.ts +++ b/src/source/items.d.ts @@ -191,4 +191,8 @@ interface ItemDeclaration { I663: 'equips'; I664: 'items'; I665: 'items'; + I694: 'items'; + I695: 'items'; + I696: 'items'; + I697: 'items'; } \ No newline at end of file diff --git a/src/source/maps.d.ts b/src/source/maps.d.ts index 4010574..6cac3ac 100644 --- a/src/source/maps.d.ts +++ b/src/source/maps.d.ts @@ -617,6 +617,14 @@ interface IdToNumber { E687: 687; E688: 688; E689: 689; + E690: 690; + E691: 691; + E692: 692; + E693: 693; + I694: 694; + I695: 695; + I696: 696; + I697: 697; X20032: 20032; X20033: 20033; X20034: 20034; @@ -1319,6 +1327,14 @@ interface NumberToId { 687: 'E687'; 688: 'E688'; 689: 'E689'; + 690: 'E690'; + 691: 'E691'; + 692: 'E692'; + 693: 'E693'; + 694: 'I694'; + 695: 'I695'; + 696: 'I696'; + 697: 'I697'; 20032: 'X20032'; 20033: 'X20033'; 20034: 'X20034';