Merge branch 'main' of github.com:clansty/MaiChartManager

clansty · clansty · commit 9e8cc36d7557 · 2026-03-23T03:03:46.000+08:00
diff --git a/MaiChartManager/Front/src/locales/en.yaml b/MaiChartManager/Front/src/locales/en.yaml
@@ -320,6 +320,7 @@ mod:
     select2P: 2P Select
     service: Service
     test: Test
+    customFn: 'Custom FnKey '
   adxHid:
     disabled: Disabled
     select1P: 1P Select
diff --git a/MaiChartManager/Front/src/locales/zh-TW.yaml b/MaiChartManager/Front/src/locales/zh-TW.yaml
@@ -298,6 +298,7 @@ mod:
     select2P: 2P 選擇
     service: 服務
     test: 測試
+    customFn: 自訂功能鍵
   adxHid:
     disabled: 停用
     select1P: 1P 選擇
diff --git a/MaiChartManager/Front/src/locales/zh.yaml b/MaiChartManager/Front/src/locales/zh.yaml
@@ -298,6 +298,7 @@ mod:
     select2P: 2P 选择
     service: 服务
     test: 测试
+    customFn: 自定义功能键
   adxHid:
     conflictDetected: 检测到冲突的 Mod
     oneClickDelete: 一键删除
diff --git a/MaiChartManager/Front/src/views/ModManager/ConfigEntry.tsx b/MaiChartManager/Front/src/views/ModManager/ConfigEntry.tsx
@@ -6,10 +6,46 @@ import { KeyCodeName } from "./types/KeyCodeName";
 import { getNameForPath } from "./utils";
 import comments from "./modComments.yaml";
 import { KeyCodeID } from "./types/KeyCodeID";
+import { VKCode } from "./types/VKCode";
 import { useI18n } from 'vue-i18n';
 import { locale } from "@/locales";
 import { ENTRY_LABEL_CLASS } from "./constants";
 
+/* t需要传入是Vue的i18n翻译函数 */
+export function optionsIoKeyMap(t: (key: string) => string): { label: string, value: string }[] {
+  return [
+    { label: t('mod.ioKeyMap.disabled'), value: 'None' },
+    { label: t('mod.ioKeyMap.select'), value: 'Select' },
+    { label: t('mod.ioKeyMap.select1P'), value: 'Select1P' },
+    { label: t('mod.ioKeyMap.select2P'), value: 'Select2P' },
+    { label: t('mod.ioKeyMap.service'), value: 'Service' },
+    { label: t('mod.ioKeyMap.test'), value: 'Test' },
+    { label: t('mod.ioKeyMap.customFn') + "1", value: 'CustomFn1' },
+    { label: t('mod.ioKeyMap.customFn') + "2", value: 'CustomFn2' },
+    { label: t('mod.ioKeyMap.customFn') + "3", value: 'CustomFn3' },
+    { label: t('mod.ioKeyMap.customFn') + "4", value: 'CustomFn4' },
+  ];
+}
+
+export function optionsKeyCodeOrName(t: (key: string) => string): { label: string, value: string }[] {
+  return Object.entries(KeyCodeName).map(([label, value]) => {
+    if (label.startsWith("CustomFn")) { // "自定义功能键"需要单独i18n
+      const suffix = label.slice('CustomFn'.length);
+      return { label: t('mod.ioKeyMap.customFn') + suffix, value };
+    }
+    return { label, value }; // 其他的则沿用枚举中的值
+  });
+}
+
+export function optionsVKCode(t: (key: string) => string): { label: string, value: string }[] {
+  return Object.entries(VKCode).map(([label, value]) => {
+    if (label == "None") { // 单独翻译为“禁用”
+      return { label: t('mod.disable'), value };
+    }
+    return { label, value }; // 其他的则沿用枚举中的值
+  });
+}
+
 export default defineComponent({
   props: {
     entry: { type: Object as PropType<Entry>, required: true },
@@ -18,15 +54,6 @@ export default defineComponent({
   setup(props, { emit }) {
     const { t, te } = useI18n();
 
-    const optionsIoKeyMap = [
-      { label: t('mod.ioKeyMap.disabled'), value: 'None' },
-      { label: t('mod.ioKeyMap.select'), value: 'Select' },
-      { label: t('mod.ioKeyMap.select1P'), value: 'Select1P' },
-      { label: t('mod.ioKeyMap.select2P'), value: 'Select2P' },
-      { label: t('mod.ioKeyMap.service'), value: 'Service' },
-      { label: t('mod.ioKeyMap.test'), value: 'Test' },
-    ];
-
     const optionsSoundChannel = ['None', 'P1SpeakerLeft', 'P1SpeakerRight', 'P1HeadphoneLeft', 'P1HeadphoneRight', 'P2SpeakerLeft', 'P2SpeakerRight', 'P2HeadphoneLeft', 'P2HeadphoneRight']
       .map(channel => ({ label: t('mod.soundChannel.' + channel), value: channel }));
 
@@ -74,13 +101,14 @@ export default defineComponent({
               case 'System.Single':
                 return <NumberInput innerClass="h-42px!" v-model:value={props.entryState.value} step={.1} decimal={4}/>;
               case 'AquaMai.Config.Types.KeyCodeOrName':
-                return <Select v-model:value={props.entryState.value} options={Object.entries(KeyCodeName).map(([label, value]) => ({ label, value }))}/>;
+                return <Select v-model:value={props.entryState.value} options={optionsKeyCodeOrName(t)}/>;
               case 'AquaMai.Config.Types.KeyCodeID':
                 return <Select v-model:value={props.entryState.value} options={Object.entries(KeyCodeID).map(([label, value]) => ({label, value}))}/>;
               case 'AquaMai.Config.Types.IOKeyMap':
-                return <Select v-model:value={props.entryState.value} options={optionsIoKeyMap}/>;
               case 'AquaMai.Config.Types.AdxKeyMap':
-                return <Select v-model:value={props.entryState.value} options={optionsIoKeyMap}/>;
+                return <Select v-model:value={props.entryState.value} options={optionsIoKeyMap(t)}/>;
+              case 'AquaMai.Config.Types.VKCode':
+                return <Select v-model:value={props.entryState.value} options={optionsVKCode(t)}/>;
               case 'AquaMai.Config.Types.SoundChannel':
                 return <Select v-model:value={props.entryState.value} options={optionsSoundChannel}/>;
             }
diff --git a/MaiChartManager/Front/src/views/ModManager/sectionPanelOverride/GameSystem.AdxHidInput/index.tsx b/MaiChartManager/Front/src/views/ModManager/sectionPanelOverride/GameSystem.AdxHidInput/index.tsx
@@ -4,7 +4,7 @@ import { Button, Select } from '@munet/ui';
 import api from "@/client/api";
 import { modInfo, updateModInfo } from "@/store/refs";
 import { useI18n } from 'vue-i18n';
-import ConfigEntry from '../../ConfigEntry';
+import ConfigEntry, {optionsIoKeyMap} from '../../ConfigEntry';
 import { ENTRY_GROUP_PADDING, ENTRY_LABEL_CLASS } from '../../constants';
 
 export default defineComponent({
@@ -23,14 +23,7 @@ export default defineComponent({
       'GameSystem.AdxHidInput.Button3',
       'GameSystem.AdxHidInput.Button4',
     ];
-    const options = [
-      { label: t('mod.ioKeyMap.disabled'), value: 'None' },
-      { label: t('mod.ioKeyMap.select'), value: 'Select' },
-      { label: t('mod.ioKeyMap.select1P'), value: 'Select1P' },
-      { label: t('mod.ioKeyMap.select2P'), value: 'Select2P' },
-      { label: t('mod.ioKeyMap.service'), value: 'Service' },
-      { label: t('mod.ioKeyMap.test'), value: 'Test' },
-    ];
+    const options = optionsIoKeyMap(t);
 
     const del = async () => {
       load.value = true
diff --git a/MaiChartManager/Front/src/views/ModManager/sectionPanelOverride/GameSystem.MaimollerIO/index.tsx b/MaiChartManager/Front/src/views/ModManager/sectionPanelOverride/GameSystem.MaimollerIO/index.tsx
@@ -5,7 +5,7 @@ import { globalCapture, modInfo, updateModInfo } from '@/store/refs';
 import { useAsyncState } from '@vueuse/core';
 import { Button, Select, CheckBox } from '@munet/ui';
 import { defineComponent, PropType, ref, computed, watch } from 'vue';
-import ConfigEntry from '../../ConfigEntry';
+import ConfigEntry, {optionsIoKeyMap} from '../../ConfigEntry';
 import { ENTRY_GROUP_PADDING, ENTRY_LABEL_CLASS } from '../../constants';
 
 export default defineComponent({
@@ -25,14 +25,7 @@ export default defineComponent({
       },
     })
 
-    const options = [
-      { label: t('mod.ioKeyMap.disabled'), value: 'None' },
-      { label: t('mod.ioKeyMap.select'), value: 'Select' },
-      { label: t('mod.ioKeyMap.select1P'), value: 'Select1P' },
-      { label: t('mod.ioKeyMap.select2P'), value: 'Select2P' },
-      { label: t('mod.ioKeyMap.service'), value: 'Service' },
-      { label: t('mod.ioKeyMap.test'), value: 'Test' },
-    ];
+    const options = optionsIoKeyMap(t);
 
     const PREFIX = 'GameSystem.MaimollerIO.';
     const useLegacyEntryPath = PREFIX + 'UseLegacy';
@@ -62,7 +55,7 @@ export default defineComponent({
     return () => <div class={["flex flex-col gap-2", ENTRY_GROUP_PADDING]}>
       {!isMmlRequirementSatisfied.value ? <div class="flex gap-2 items-center m-l-35">
         <span class="c-orange">{t('mod.mmlIo.notInstalled')}</span>
-        <Button variant="secondary" onClick={() => install.execute()} ing={install.isLoading.value}>{t('mod.oneClickInstall')}</Button>
+        <Button variant="secondary" onClick={() => install.execute()} ing={install.isLoading.value}>{t('mod.mmlIo.oneClickInstall')}</Button>
       </div>
         : <div class="flex gap-2 items-center m-l-35">
           <span class="c-green-6">{t('mod.mmlIo.installed')}</span>
diff --git a/MaiChartManager/Front/src/views/ModManager/types/KeyCodeName.ts b/MaiChartManager/Front/src/views/ModManager/types/KeyCodeName.ts
@@ -46,4 +46,8 @@ export enum KeyCodeName {
   Select2P = "Select2P",
   Service = "Service",
   Test = "Test",
+  CustomFn1 = "CustomFn1",
+  CustomFn2 = "CustomFn2",
+  CustomFn3 = "CustomFn3",
+  CustomFn4 = "CustomFn4",
 }
diff --git a/MaiChartManager/Front/src/views/ModManager/types/VKCode.ts b/MaiChartManager/Front/src/views/ModManager/types/VKCode.ts
@@ -0,0 +1,51 @@
+export enum VKCode {
+  None = "None",
+  Alpha0 = "Alpha0",   // 0 键
+  Alpha1 = "Alpha1",
+  Alpha2 = "Alpha2",
+  Alpha3 = "Alpha3",
+  Alpha4 = "Alpha4",
+  Alpha5 = "Alpha5",
+  Alpha6 = "Alpha6",
+  Alpha7 = "Alpha7",
+  Alpha8 = "Alpha8",
+  Alpha9 = "Alpha9",
+  Keypad0 = "Keypad0",  // 数字键盘 0 键
+  Keypad1 = "Keypad1",
+  Keypad2 = "Keypad2",
+  Keypad3 = "Keypad3",
+  Keypad4 = "Keypad4",
+  Keypad5 = "Keypad5",
+  Keypad6 = "Keypad6",
+  Keypad7 = "Keypad7",
+  Keypad8 = "Keypad8",
+  Keypad9 = "Keypad9",
+  F1 = "F1",
+  F2 = "F2",
+  F3 = "F3",
+  F4 = "F4",
+  F5 = "F5",
+  F6 = "F6",
+  F7 = "F7",
+  F8 = "F8",
+  F9 = "F9",
+  F10 = "F10",
+  F11 = "F11",
+  F12 = "F12",
+  Enter = "Enter",    // VK_RETURN 输入键
+  Space = "Space",    // 空格键
+  Backspace = "Backspace", // VK_BACK
+  Tab = "Tab",
+  Esc = "Esc",      // VK_ESCAPE
+  Insert = "Insert",
+  Delete = "Delete",
+  Home = "Home",
+  End = "End",
+  Pause = "Pause",
+  PageUp = "PageUp",   // VK_PRIOR
+  PageDown = "PageDown", // VK_NEXT
+  UpArrow = "UpArrow",  // VK_UP
+  DownArrow = "DownArrow", // VK_DOWN
+  LeftArrow = "LeftArrow", // VK_LEFT
+  RightArrow = "RightArrow", // VK_RIGHT
+}
diff --git a/MaiChartManager/Services/MaidataImportService.cs b/MaiChartManager/Services/MaidataImportService.cs
@@ -274,6 +274,8 @@ public ImportChartResult ImportMaidata(
         foreach (var (key, value) in kvps)
         {
             maiData[key] = value;
+            if (key.StartsWith("inote") || key.StartsWith("lv") || key.StartsWith("first") ||
+                key.StartsWith("wholebpm")) maiData[key] = maiData[key].Trim();
         }
 
         var allCharts = new Dictionary<int, AllChartsEntry>();

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,8 @@ export enum KeyCodeName {`
`46`	`46`	`Select2P = "Select2P",`
`47`	`47`	`Service = "Service",`
`48`	`48`	`Test = "Test",`
	`49`	`+ CustomFn1 = "CustomFn1",`
	`50`	`+ CustomFn2 = "CustomFn2",`
	`51`	`+ CustomFn3 = "CustomFn3",`
	`52`	`+ CustomFn4 = "CustomFn4",`
`49`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,8 @@ public ImportChartResult ImportMaidata(`
`274`	`274`	`foreach (var (key, value) in kvps)`
`275`	`275`	`{`
`276`	`276`	`maiData[key] = value;`
	`277`	`+ if (key.StartsWith("inote") \|\| key.StartsWith("lv") \|\| key.StartsWith("first") \|\|`
	`278`	`+ key.StartsWith("wholebpm")) maiData[key] = maiData[key].Trim();`
`277`	`279`	`}`
`278`	`280`
`279`	`281`	`var allCharts = new Dictionary<int, AllChartsEntry>();`