diff --git a/idea.md b/idea.md index 75522c4..3888ba8 100644 --- a/idea.md +++ b/idea.md @@ -36,7 +36,7 @@ - 宝石目标设定 - 自动宝物规划,选中两个或更多宝物后自动在本地图中规划出最优拾取路线,原则是尽量减少其余宝物的捡拾,自动切换主动技能,怪物造成的伤害最低的路线 - 临界显示方式,宝石数还是数值 -- 怪物目标设定 +- 怪物目标设定(完成) - 木牌查看系统 - 宝物目标设定 - 每个怪物加一个怪物说明 @@ -54,3 +54,4 @@ - 真能刷:勇气之路的刷血怪刷到 15w 以上的血 - 满腹经纶:把所有能学的怪物技能都学一遍 - 冰与火之舞:通过第二章特殊战的困难难度 +- 你是怎么做到的?!:山路地图与勇气之路地图中与若干个神秘的木牌对话 diff --git a/public/project/data.js b/public/project/data.js index ae1a138..dfdd2cf 100644 --- a/public/project/data.js +++ b/public/project/data.js @@ -570,12 +570,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = { "need": "0", "title": "原始人", - "action": [ - { - "type": "comment", - "text": "此处是初始等级,只需填写称号" - } - ] + "action": [] }, { "need": "3000", @@ -610,7 +605,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = }, { "need": "10000", - "title": "智人", + "title": "低级智人", "clear": true, "action": [ { @@ -624,7 +619,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = }, { "need": "50000", - "title": "领导者", + "title": "古人", "clear": true, "action": [] } diff --git a/public/project/floors/MT0.js b/public/project/floors/MT0.js index 9b7d66e..fc7a2e2 100644 --- a/public/project/floors/MT0.js +++ b/public/project/floors/MT0.js @@ -22,9 +22,9 @@ main.floors.MT0= [141, 34, 34,141, 0,141, 0, 0, 0,141, 0,494,482,482,20040], [141, 33, 33,492, 0,141, 0, 0, 0,141, 0,141, 33, 33,20040], [141, 34, 34,141, 0,141, 0,559, 0,141, 0,141,141,141,20040], - [141,141,141,141, 0,129,558, 46,560, 0, 0,141, 33, 33,20040], + [141,141,141,141, 0, 0,558, 46,560, 0, 0,141, 33, 33,20040], [141, 33, 33,141, 0,141,367, 0,129,141, 0,494,482,482,20040], - [141, 33, 33,492, 0,141, 0, 0,129,141, 0,141, 33, 33,20040], + [141, 33, 33,492, 0,141,129, 0,129,141, 0,141, 33, 33,20040], [141,141,141,141,141,141,141,141,141,141,141,141,141,141,20040] ], "firstArrive": [ @@ -51,7 +51,7 @@ main.floors.MT0= "8,12": [ "该塔计分方式:生命+5000*黄钥匙+15000*蓝钥匙" ], - "5,11": [ + "6,13": [ "原声音乐可以在网易云音乐搜索:魔塔 人类:开天辟地 bgm,部分音乐因为版权问题可能无法播放或者不在歌单内" ] }, @@ -66,20 +66,14 @@ main.floors.MT0= }, "afterBattle": {}, "afterGetItem": { - "7,11": [ - { - "type": "setValue", - "name": "flag:usePlatFly", - "value": "true" - }, - { - "type": "setValue", - "name": "flag:__useMinimap__", - "value": "true" - } - ], "6,11": [ "这个可以查看bgm,也可以设置bgm,也可以清空设置的bgm" + ], + "8,11": [ + "请仔细阅读这个道具内的说明" + ], + "7,10": [ + "里面包含了所有游戏的设置,请仔细查看设置" ] }, "afterOpenDoor": {}, diff --git a/public/project/floors/MT1.js b/public/project/floors/MT1.js index 4866aff..3309eb8 100644 --- a/public/project/floors/MT1.js +++ b/public/project/floors/MT1.js @@ -79,7 +79,7 @@ main.floors.MT1= [20042, 0, 0,201, 0, 0,141, 0,141,202, 17, 0, 0, 0,20040], [20042,202, 17, 17, 0, 0,205, 31, 0, 28, 17, 28, 0, 32,20040], [20042, 0, 27, 17, 31,141,141,141,141,201, 17, 17, 17, 17,20040], - [20042, 32, 0, 17, 0,201, 36, 35,201, 31,202, 0, 32, 0,20040], + [20042, 32, 0, 17, 0,201, 0, 0,201, 31,202, 0, 32, 0,20040], [20036,20033,20033,20033,20033,20033,20034, 93,20032,20033,20033,20033,20033,20033,20035] ], "bgmap": [ diff --git a/public/project/plugins.js b/public/project/plugins.js index 3027321..4f2a453 100644 --- a/public/project/plugins.js +++ b/public/project/plugins.js @@ -2,7 +2,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { init: function () { - this._afterLoadResources = function () {}; + this._afterLoadResources = function () { + core.resetSettings(); + }; }, sprite: function () { const sprites = {}; diff --git a/src/components/enemyOne.vue b/src/components/enemyOne.vue index fffce61..cd2a42d 100644 --- a/src/components/enemyOne.vue +++ b/src/components/enemyOne.vue @@ -64,7 +64,7 @@
经验    {{ - core.formatBigNumber(enemy.money) + core.formatBigNumber(enemy.exp) }}
diff --git a/src/data/desc.json b/src/data/desc.json index 20e547b..c02b42b 100644 --- a/src/data/desc.json +++ b/src/data/desc.json @@ -8,7 +8,7 @@ "变宽,然后拖动。电脑端点击状态栏也可以使边框变宽。", "
", "
", - "状态栏可以纵向滚动,如果你发现状态栏显示不全,可以尝试拉大状态栏,或者纵向拖动状态栏,就像网页上下拖动一样。", + "状态栏可以纵向滚动,如果你发现状态栏显示不全,可以尝试拉大状态栏,或者纵向拖动状态栏,就像网页上下滚动一样。", "电脑端还可以使用滚轮上下滚动。", "
", "
", @@ -36,5 +36,11 @@ "
", "这个功能可以用于标记boss或者较强的挡路怪,当这些怪能够攻击时你可以直接收到信息,不需要再时刻费心注意怪物的伤害。" ] + }, + "book": { + "text": "怪物手册", + "desc": [ + "" + ] } } \ No newline at end of file diff --git a/src/initPlugin.ts b/src/initPlugin.ts index 1af14ed..4016439 100644 --- a/src/initPlugin.ts +++ b/src/initPlugin.ts @@ -6,6 +6,7 @@ import animate from './plugin/animateController'; import utils from './plugin/utils'; import status from './plugin/ui/statusBar'; import mark from './plugin/mark'; +import setting from './plugin/settings'; window.addEventListener('load', () => { // 每个引入的插件都要在这里执行,否则不会被转发 @@ -16,7 +17,8 @@ window.addEventListener('load', () => { animate(), utils(), status(), - mark() + mark(), + setting() ]; // 初始化所有插件,并转发到core上 diff --git a/src/plugin/settings.ts b/src/plugin/settings.ts index 5b6c414..39f5f02 100644 --- a/src/plugin/settings.ts +++ b/src/plugin/settings.ts @@ -10,6 +10,13 @@ watch(transition, n => { core.setLocalStorage('transition', n); }); -window.addEventListener('load', () => { +/** + * 重置设置信息,从localStorage读取即可 + */ +function reset() { transition.value = core.getLocalStorage('transition'); -}); +} + +export default function init() { + return { resetSettings: reset }; +} diff --git a/src/plugin/uiController.ts b/src/plugin/uiController.ts index 170c133..09e6fb5 100644 --- a/src/plugin/uiController.ts +++ b/src/plugin/uiController.ts @@ -75,16 +75,12 @@ async function hideApp(index: number) { app.style.transition = 'all 0.6s linear'; app.style.opacity = '0'; await sleep(600); - uiStack.value.splice(index, 1); - app.style.display = 'none'; - if (!noClosePanel.value) core.closePanel(); - noClosePanel.value = false; } else { app.style.transition = ''; app.style.opacity = '0'; - uiStack.value.splice(index, 1); - app.style.display = 'none'; - if (!noClosePanel.value) core.closePanel(); - noClosePanel.value = false; } + uiStack.value.splice(index, 1); + app.style.display = 'none'; + if (!noClosePanel.value) core.closePanel(); + noClosePanel.value = false; } diff --git a/src/types/plugin.d.ts b/src/types/plugin.d.ts index 1d37702..10d4f50 100644 --- a/src/types/plugin.d.ts +++ b/src/types/plugin.d.ts @@ -115,7 +115,12 @@ interface PluginDeclaration extends PluginUtils { /** * 检查被标记怪物的状态,是否需要更新 */ - checkMarkedEnemy(); + checkMarkedEnemy(): void; + + /** + * 重置设置信息 + */ + resetSettings(): void; } interface PluginUtils { diff --git a/src/ui/book.vue b/src/ui/book.vue index 202b8de..77bfd68 100644 --- a/src/ui/book.vue +++ b/src/ui/book.vue @@ -202,9 +202,8 @@ function keydown(e: KeyboardEvent) { onMounted(async () => { const div = document.getElementById('book') as HTMLDivElement; - div.style.opacity = '1'; if (core.plugin.transition.value) await sleep(600); - else await sleep(100); + else await sleep(50); document.addEventListener('keyup', keyup); document.addEventListener('keydown', keydown); }); @@ -217,7 +216,6 @@ onUnmounted(async () => {