feat: 导入为宴会场时优化

Author: clansty

MaiChartManager/Controllers/ImportChartController.cs

@@ -135,6 +135,7 @@ public record ImportChartResult(IEnumerable<ImportChartMessage> Errors, bool Fat
     public ImportChartResult ImportChart([FromForm] int id, IFormFile file, [FromForm] bool ignoreLevelNum, [FromForm] int addVersionId, [FromForm] int genreId, [FromForm] int version,
         [FromForm] bool debug = false, [FromForm] bool noShiftChart = false)
     {
+        var isUtage = id > 100000;
         var errors = new List<ImportChartMessage>();
         var music = settings.MusicList.First(it => it.Id == id);
         var maiData = new Dictionary<string, string>(new SimaiFile(file.OpenReadStream()).ToKeyValuePairs());
@@ -167,6 +168,9 @@ public ImportChartResult ImportChart([FromForm] int id, IFormFile file, [FromFor
 
         foreach (var (level, chart) in allCharts)
         {
+            // 宴会场只导入第一个谱面
+            if (isUtage && music.Charts[0].Enable) break;
+
             // var levelPadding = Converter.CalcMusicPadding(chart, first);
             var bpm = chart.TimingChanges[0].tempo;
             music.Bpm = (int)Math.Floor(bpm);
@@ -190,6 +194,8 @@ public ImportChartResult ImportChart([FromForm] int id, IFormFile file, [FromFor
             // |       | 原先音频的开头
             // | 加了 padding 的音频开头
 
+            # region 设定 targetLevel
+
             var targetLevel = level - 2;
 
             // 处理非标准难度
@@ -214,6 +220,10 @@ public ImportChartResult ImportChart([FromForm] int id, IFormFile file, [FromFor
                 }
             }
 
+            if (isUtage) targetLevel = 0;
+
+            # endregion
+
             var targetChart = music.Charts[targetLevel];
             targetChart.Path = $"{id:000000}_0{targetLevel}.ma2";
             var levelNumStr = maiData.GetValueOrDefault($"lv_{level}");

MaiChartManager/Controllers/MusicController.cs

@@ -124,9 +124,7 @@ public string AddMusic(int id)
             return "当前资源目录里已经存在这个 ID 了";
         }
 
-        var isDx = id >= 10000;
-
-        var music = MusicXmlWithABJacket.CreateNew(id % 10000, StaticSettings.GamePath, settings.AssetDir, isDx);
+        var music = MusicXmlWithABJacket.CreateNew(id, StaticSettings.GamePath, settings.AssetDir);
         settings.MusicList.Add(music);
 
         return "";

MaiChartManager/Front/src/components/ImportChartButton/ErrorDisplayIdInput.tsx

@@ -1,11 +1,12 @@
-import { computed, defineComponent, PropType } from "vue";
+import { computed, defineComponent, effect, PropType, watch } from "vue";
 import { NAlert, NButton, NCheckbox, NCollapse, NCollapseItem, NFlex, NForm, NFormItem, NInputNumber, NModal, NScrollbar, NSelect, SelectOption } from "naive-ui";
 import { ImportChartMessage, MessageLevel } from "@/client/apiGen";
 import { ImportChartMessageEx, ImportMeta } from "@/components/ImportChartButton/index";
 import noJacket from '@/assets/noJacket.webp';
 import { addVersionList, genreList } from "@/store/refs";
 import GenreInput from "@/components/GenreInput";
 import VersionInput from "@/components/VersionInput";
+import { UTAGE_GENRE } from "@/consts";
 
 export default defineComponent({
   props: {
@@ -46,14 +47,20 @@ export default defineComponent({
       set: (val) => emit('update:noShiftChart', val)
     })
 
+    watch([() => genreId.value, () => show.value], ([val]) => {
+      for (const meta of props.meta) {
+        meta.id = meta.id % 1e5 + (val === UTAGE_GENRE ? 1e5 : 0);
+      }
+    })
+
     return () => <NModal
       preset="card"
       class="w-[min(50vw,50em)]"
       title="导入提示"
       v-model:show={show.value}
     >{{
       default: () => <NFlex vertical size="large">
-        <NScrollbar class="max-h-35vh">
+        <NScrollbar class="max-h-30vh">
           <NFlex vertical>
             {
               props.errors.map((error, i) => {
@@ -91,7 +98,7 @@ export default defineComponent({
         </NScrollbar>
         {!!props.meta.length && <>
           为新导入的歌曲指定 ID
-          <NScrollbar class="max-h-30vh">
+          <NScrollbar class="max-h-25vh">
             <NFlex vertical size="large">
               {props.meta.map((meta, i) => <MusicIdInput key={i} meta={meta}/>)}
             </NFlex>
@@ -130,7 +137,11 @@ const MusicIdInput = defineComponent({
     meta: {type: Object as PropType<ImportMeta>, required: true},
   },
   setup(props) {
-    const dxBase = computed(() => props.meta.id >= 1e4 ? 1e4 : 0);
+    const dxBase = computed(() => {
+      const dx = props.meta.id % 1e5 >= 1e4 ? 1e4 : 0
+      const utage = props.meta.id >= 1e5 ? 1e5 : 0
+      return dx + utage;
+    });
     const img = computed(() => props.meta.bg ? URL.createObjectURL(props.meta.bg) : noJacket);
 
     return () => <NFlex align="center" size="large">

MaiChartManager/Front/src/components/MusicEdit/index.tsx

@@ -7,7 +7,7 @@ import JacketBox from "./JacketBox";
 import dxIcon from "@/assets/dxIcon.png";
 import stdIcon from "@/assets/stdIcon.png";
 import ChartPanel from "./ChartPanel";
-import { DIFFICULTY, LEVEL_COLOR } from "@/consts";
+import { DIFFICULTY, LEVEL_COLOR, UTAGE_GENRE } from "@/consts";
 import ProblemsDisplay from "@/components/ProblemsDisplay";
 import AcbAwb from "@/components/MusicEdit/AcbAwb";
 import GenreInput from "@/components/GenreInput";
@@ -82,7 +82,7 @@ const Component = defineComponent({
         <NFormItem label="版本分类">
           <GenreInput options={addVersionList.value} v-model:value={info.value.addVersionId}/>
         </NFormItem>
-        {info.value.genreId === 107 && // 宴会场
+        {info.value.genreId === UTAGE_GENRE && // 宴会场
           <>
             <NFormItem label="宴谱种类">
               <NInput v-model:value={info.value.utageKanji}/>

MaiChartManager/Front/src/consts.ts

@@ -2,3 +2,4 @@ export const LEVELS = [0, 1, 2, 3, 4, 5, 6, 7, '7+', 8, '8+', 9, '9+', 10, '10+'
 export const LEVEL_COLOR = ['rgb(34, 187, 91)', 'rgb(251, 156, 45)', 'rgb(246, 72, 97)', 'rgb(158, 69, 226)',
   'rgb(228, 166, 255)'] as const;
 export const DIFFICULTY = ['Basic', 'Advanced', 'Expert', 'Master', 'Re:Master'] as const;
+export const UTAGE_GENRE = 107;

MaiChartManager/Models/MusicXmlWithABJacket.cs

@@ -28,9 +28,9 @@ public MusicBrief GetBrief()
         return new MusicBrief(Id, NonDxId, Name, HasJacket, Modified, chartsAvailable, Problems);
     }
 
-    public new static MusicXmlWithABJacket CreateNew(int id, string gamePath, string assetDir, bool isDx)
+    public new static MusicXmlWithABJacket CreateNew(int id, string gamePath, string assetDir)
     {
-        var old = MusicXml.CreateNew(id, gamePath, assetDir, isDx);
+        var old = MusicXml.CreateNew(id, gamePath, assetDir);
         return new MusicXmlWithABJacket(old.FilePath, old.GamePath);
     }
 
@@ -61,6 +61,16 @@ public List<string> Problems
                 res.Add("没有启用的谱面");
             }
 
+            if (GenreId == 107 && !Charts[0].Enable)
+            {
+                res.Add("宴会场必须启用绿谱");
+            }
+
+            if (GenreId == 107 && Id < 100000)
+            {
+                res.Add("宴会场歌曲的 ID 小于 100000");
+            }
+
             return res;
         }
     }

Sitreamai/Models/MusicXml.cs

@@ -27,14 +27,11 @@ public MusicXml(string filePath, string gamePath)
         }
     }
 
-    public static MusicXml CreateNew(int id, string gamePath, string assetDir, bool isDx)
+    public static MusicXml CreateNew(int dxId, string gamePath, string assetDir)
     {
-        if (id > 10000)
-        {
-            throw new ArgumentException("id must be less than 10000");
-        }
-
-        var dxId = isDx ? id + 10000 : id;
+        var id = dxId % 10000;
+        // var isDx = dxId % 100000 >= 10000;
+        // var isUtage = dxId >= 100000;
         var data = $"""
                     <?xml version="1.0" encoding="utf-8"?>
                     <MusicData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">