From f5df2c141619c019958c6d07c472c2c4e4de705b Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sun, 4 Feb 2024 21:32:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=9C=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 1 +
public/project/data.js | 2 +-
src/core/main/setting.ts | 13 +++----------
src/core/main/storage.ts | 2 +-
src/data/settings.json | 17 -----------------
src/panel/keyboard.vue | 13 ++++++++-----
src/ui/start.vue | 12 +++++-------
7 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/index.html b/index.html
index 3ffbbd7..7f2c736 100644
--- a/index.html
+++ b/index.html
@@ -165,6 +165,7 @@
+
diff --git a/public/project/data.js b/public/project/data.js
index e4c0a57..82a874f 100644
--- a/public/project/data.js
+++ b/public/project/data.js
@@ -124,7 +124,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"武器",
"盾牌"
],
- "startBgm": null,
+ "startBgm": "bgm.mp3",
"styles": {
"startBackground": "project/images/bg.jpg",
"startVerticalBackground": "project/images/bg.jpg",
diff --git a/src/core/main/setting.ts b/src/core/main/setting.ts
index e109f26..f2fa97c 100644
--- a/src/core/main/setting.ts
+++ b/src/core/main/setting.ts
@@ -314,7 +314,7 @@ export class SettingDisplayer extends EventEmitter {
export const mainSetting = new MotaSetting();
// 添加不参与全局存储的设置
-MotaSetting.noStorage.push('action.autoSkill', 'screen.fullscreen');
+MotaSetting.noStorage.push('screen.fullscreen');
const storage = new GameStorage(GameStorage.fromAuthor('AncTe', 'setting'));
@@ -402,9 +402,7 @@ mainSetting
'显示设置',
new MotaSetting()
.register('fullscreen', '全屏游戏', false, COM.Boolean)
- .register('halo', '光环显示', true, COM.Boolean)
.register('itemDetail', '宝石血瓶显伤', true, COM.Boolean)
- .register('heroDetail', '勇士显伤', false, COM.Boolean)
.register('transition', '界面动画', false, COM.Boolean)
.register('antiAlias', '抗锯齿', false, COM.Boolean)
.register('fontSize', '字体大小', 16, COM.Number, [8, 28, 1])
@@ -417,7 +415,6 @@ mainSetting
'action',
'操作设置',
new MotaSetting()
- .register('autoSkill', '自动切换技能', true, COM.Boolean)
.register('fixed', '定点查看', true, COM.Boolean)
.register('hotkey', '快捷键', false, COM.HotkeySetting)
.setDisplayFunc('hotkey', () => '')
@@ -436,16 +433,12 @@ mainSetting
.register(
'utils',
'系统设置',
- new MotaSetting()
- .register('betterLoad', '优化加载', true, COM.Boolean)
- .register('autoScale', '自动放缩', true, COM.Boolean)
+ new MotaSetting().register('autoScale', '自动放缩', true, COM.Boolean)
)
.register(
'fx',
'特效设置',
- new MotaSetting()
- .register('paraLight', '野外阴影', true, COM.Boolean)
- .register('frag', '打怪特效', true, COM.Boolean)
+ new MotaSetting().register('frag', '打怪特效', true, COM.Boolean)
)
.register(
'ui',
diff --git a/src/core/main/storage.ts b/src/core/main/storage.ts
index d1ac4bb..2fa0711 100644
--- a/src/core/main/storage.ts
+++ b/src/core/main/storage.ts
@@ -87,7 +87,7 @@ export class GameStorage {
* @param key 存储名称
*/
static fromAuthor(_: any, key: string) {
- return `${core.firstData.author}@${key}`;
+ return `${data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d.firstData.author}@${key}`;
}
/**
diff --git a/src/data/settings.json b/src/data/settings.json
index ccf6533..cd143ae 100644
--- a/src/data/settings.json
+++ b/src/data/settings.json
@@ -4,7 +4,6 @@
"是否全屏进行游戏，全屏后按ESC退出全屏，开启后将不能通过按ESC开启系统设置菜单，",
"请按下方的按钮打开。进入或退出全屏后请存读档一下，以解决一部分绘制问题。"
],
- "halo": ["开启后，会在地图上显示范围光环。"],
"itemDetail": ["是否在地图上显示宝石血瓶装备等增加的属性值"],
"transition": [
"是否展示当一个ui界面，如怪物手册等的打开与关闭时的动画。当此项开启时，",
@@ -19,10 +18,6 @@
"criticalGem": ["临界是否显示为在当前地图要吃的宝石数"]
},
"action": {
- "autoSkill": [
- "开启后，打怪物的时候会自动选择伤害最低的技能。同时显伤也会显示此状态下的伤害，",
- "临界也会考虑技能在内"
- ],
"fixed": [
"开启后，当鼠标移动到怪物上时，会以盒子的形式展示该点的怪物信息。手机端此功能无效。",
"
",
@@ -36,15 +31,6 @@
]
},
"utils": {
- "betterLoad": [
- "试验性功能",
- "
",
- "开启后游戏将对加载进行优化，缩短进入游戏时的加载时长，而在游戏中对资源进行部分性按需加载，从而对加载进行优化。",
- "该设置不会影响你的正常游戏，但如果网络环境较差，可能会导致部分楼层转换时间明显变长。",
- "
",
- "
",
- "注：修改后刷新页面起效。"
- ],
"autoScale": [
"开启后，每次进入游戏时会自动缩放游戏画面至合适值。该项只对电脑端有效。",
"
",
@@ -57,9 +43,6 @@
]
},
"fx": {
- "paraLight": [
- "是否开启野外的平行光阴影，在野外将会显示平行光阴影，模拟太阳光，拥有不错的视觉效果"
- ],
"frag": ["开启后，在打败怪物后会触发怪物碎裂特效。"]
}
}
diff --git a/src/panel/keyboard.vue b/src/panel/keyboard.vue
index 7264858..bb7af69 100644
--- a/src/panel/keyboard.vue
+++ b/src/panel/keyboard.vue
@@ -6,10 +6,10 @@
@click="keyboard.emitKey(key, i)"
:active="checkAssist(assist, key.key)"
:style="{
- left: `${key.x}px`,
- top: `${key.y}px`,
- width: `${key.width}px`,
- height: `${key.height}px`
+ left: `${key.x * scale}px`,
+ top: `${key.y * scale}px`,
+ width: `${key.width * scale}px`,
+ height: `${key.height * scale}px`
}"
>
();
+const scale = mainSetting.getValue('screen.keyScale', 100) / 100;
+
const assist = ref(props.keyboard.assist);
-const fontSize = `${props.keyboard.fontSize}px`;
+const fontSize = `${props.keyboard.fontSize * scale}px`;
const [width, height] = (() => {
const key = props.keyboard;
diff --git a/src/ui/start.vue b/src/ui/start.vue
index 9e793a4..db120a9 100644
--- a/src/ui/start.vue
+++ b/src/ui/start.vue
@@ -321,7 +321,7 @@ onUnmounted(() => {
z-index: 1;
flex-direction: column;
transition: height 0.2s ease;
- width: 20%;
+ width: 25%;
.start-button {
position: relative;
@@ -376,7 +376,6 @@ onUnmounted(() => {
rgb(255, 255, 255),
rgb(255, 251, 0)
);
- margin-bottom: 2%;
}
#back {
@@ -385,7 +384,6 @@ onUnmounted(() => {
rgb(255, 255, 255),
rgb(132, 132, 132)
);
- margin-bottom: 2%;
}
}
@@ -394,22 +392,22 @@ onUnmounted(() => {
display: flex;
align-items: center;
flex-direction: row-reverse;
- justify-content: flex-start;
+ justify-content: space-around;
right: 5%;
bottom: 10%;
font-size: 1.3em;
z-index: 1;
- width: 50%;
+ width: 12%;
+ background-color: #0008;
+ border-radius: 10px;
.setting-buttons {
- margin-left: 4%;
color: white;
transition: color 0.2s linear;
cursor: pointer;
}
.setting-buttons2 {
- margin-left: 4%;
position: relative;
top: 1px;
}