diff --git a/project/data.js b/project/data.js index 6240c41..21705cd 100644 --- a/project/data.js +++ b/project/data.js @@ -603,15 +603,15 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "toolsBackground": "url(project/materials/1.png) repeat", "floorChangingStyle": "background-color: black; color: red", "statusBarColor": [ - 255, - 255, - 255, + 230, + 230, + 230, 1 ], "borderColor": [ - 221, - 242, - 11, + 186, + 204, + 9, 1 ], "selectColor": [ @@ -1038,7 +1038,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "startText": [ { "type": "function", - "function": "function(){\nflags._statusgry_ = 0;\nflags._statusbrg_ = 0.75;\ncore.createSpr0();\ncore.createSprBack();\n}" + "function": "function(){\nflags._statusgry_ = 0;\nflags._statusbrg_ = 0.6;\ncore.createSpr0();\ncore.createSprBack();\n}" }, { "type": "comment", diff --git a/project/floors/GM1.js b/project/floors/GM1.js index f84a18f..a595f67 100644 --- a/project/floors/GM1.js +++ b/project/floors/GM1.js @@ -509,17 +509,17 @@ main.floors.GM1= ], "bg2map": [ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0,30196,30196,30196,30196,30196,30196,30196,30196,30196,30196,30196, 0], + [ 0,30196,30196, 0,30196,30196, 0,30196,30196, 0,30196,30196, 0], + [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], - [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], - [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], - [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], - [ 0,30196, 0, 0, 0, 0, 0, 0, 0, 0, 0,30196, 0], - [ 0,30196,30196,30196,30196,30196,30196,30196,30196,30196,30196,30196, 0], + [ 0,30196,30196, 0,30196,30196, 0,30196,30196, 0,30196,30196, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fg2map": [ diff --git a/project/functions.js b/project/functions.js index 70b3682..22a100c 100644 --- a/project/functions.js +++ b/project/functions.js @@ -1231,44 +1231,48 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = return data; }, "loadData": function (data, callback) { - // 读档操作;从存储中读取了内容后的行为 + // 读档操作;从存储中读取了内容后的行为 - // 重置游戏和路线 - core.resetGame(data.hero, data.hard, data.floorId, core.maps.loadMap(data.maps, null, data.hero.flags), data.values); - core.status.route = core.decodeRoute(data.route); - core.control._bindRoutePush(); - // 文字属性,全局属性 - core.status.textAttribute = core.getFlag('textAttribute', core.status.textAttribute); - var toAttribute = core.getFlag('globalAttribute', core.status.globalAttribute); - if (!core.same(toAttribute, core.status.globalAttribute)) { - core.status.globalAttribute = toAttribute; - core.resize(); - } - // 重置音量 - core.events.setVolume(core.getFlag("__volume__", 1), 0); - // 加载勇士图标 - var icon = core.status.hero.image; - icon = core.getMappedName(icon); - if (core.material.images.images[icon]) { - core.material.images.hero = core.material.images.images[icon]; - core.material.icons.hero.width = core.material.images.images[icon].width / 4; - core.material.icons.hero.height = core.material.images.images[icon].height / 4; - } - core.setFlag('__fromLoad__', true); + // 重置游戏和路线 + core.resetGame(data.hero, data.hard, data.floorId, core.maps.loadMap(data.maps, null, data.hero.flags), data.values); + core.status.route = core.decodeRoute(data.route); + core.control._bindRoutePush(); + // 文字属性,全局属性 + core.status.textAttribute = core.getFlag('textAttribute', core.status.textAttribute); + var toAttribute = core.getFlag('globalAttribute', core.status.globalAttribute); + if (!core.same(toAttribute, core.status.globalAttribute)) { + core.status.globalAttribute = toAttribute; + core.resize(); + } + // 重置音量 + core.events.setVolume(core.getFlag("__volume__", 1), 0); + // 加载勇士图标 + var icon = core.status.hero.image; + icon = core.getMappedName(icon); + if (core.material.images.images[icon]) { + core.material.images.hero = core.material.images.images[icon]; + core.material.icons.hero.width = core.material.images.images[icon].width / 4; + core.material.icons.hero.height = core.material.images.images[icon].height / 4; + } + core.setFlag('__fromLoad__', true); - // TODO:增加自己的一些读档处理 + // TODO:增加自己的一些读档处理 + if (!flags.version) { + flags._statusbrg_ -= 0.15 + flags.version = 1 + core.createSpr0() + } + // 切换到对应的楼层 + core.changeFloor(data.floorId, null, data.hero.loc, 0, function () { + // TODO:可以在这里设置读档后播放BGM + if (core.hasFlag("__bgm__")) { // 持续播放 + core.playBgm(core.getFlag("__bgm__")); + } - // 切换到对应的楼层 - core.changeFloor(data.floorId, null, data.hero.loc, 0, function () { - // TODO:可以在这里设置读档后播放BGM - if (core.hasFlag("__bgm__")) { // 持续播放 - core.playBgm(core.getFlag("__bgm__")); - } - - core.removeFlag('__fromLoad__'); - if (callback) callback(); - }); - }, + core.removeFlag('__fromLoad__'); + if (callback) callback(); + }); +}, "getStatusLabel": function (name) { // 返回某个状态英文名的对应中文标签,如atk -> 攻击,def -> 防御等。 // 请注意此项仅影响 libs/ 下的内容(如绘制怪物手册、数据统计等) diff --git a/project/plugins.js b/project/plugins.js index ba7b8d6..e3a121d 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -2853,7 +2853,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = var m = ''; if (hero[name] < 0) m = 'invert(100%)'; - core.setFilter(ctx, 'hue-rotate(' + (col2 || 0) + 'deg)brightness(1.25)contrast(1.25)' + m) + core.setFilter(ctx, 'hue-rotate(' + (col2 || 0) + 'deg)brightness(1)contrast(1)' + m)