feat: 支持 cue 和 movie 设置了单独的 id 的情况

clansty · clansty · commit c320e071ce83 · 2025-05-17T19:20:37.000+08:00
diff --git a/MaiChartManager/Front/src/client/apiGen.ts b/MaiChartManager/Front/src/client/apiGen.ts
@@ -250,6 +250,10 @@ export interface MusicXmlWithABJacket {
   assetDir?: string | null;
   hasJacket?: boolean;
   isAcbAwbExist?: boolean;
+  /** @format int32 */
+  cueId?: number;
+  /** @format int32 */
+  movieId?: number;
   problems?: string[] | null;
 }
 
diff --git a/MaiChartManager/Front/src/components/MusicEdit/AcbAwb.tsx b/MaiChartManager/Front/src/components/MusicEdit/AcbAwb.tsx
@@ -1,6 +1,6 @@
 import { computed, defineComponent, PropType, ref } from "vue";
 import { HttpResponse, MusicXmlWithABJacket } from "@/client/apiGen";
-import { NButton, NDrawer, NDrawerContent, NFlex, NForm, NFormItem, NInputNumber, NModal, NRadio, useDialog } from "naive-ui";
+import { NButton, NDrawer, NDrawerContent, NFlex, NForm, NFormItem, NInputNumber, NModal, NPopover, NRadio, useDialog } from "naive-ui";
 import noJacket from "@/assets/noJacket.webp";
 import { globalCapture, selectedADir } from "@/store/refs";
 import FileTypeIcon from "@/components/FileTypeIcon";
@@ -12,11 +12,11 @@ import SetMovieButton from "@/components/MusicEdit/SetMovieButton";
 
 export default defineComponent({
   props: {
-    song: {type: Object as PropType<MusicXmlWithABJacket>, required: true},
+    song: { type: Object as PropType<MusicXmlWithABJacket>, required: true },
   },
   setup(props) {
     const updateTime = ref(0)
-    const url = computed(() => getUrl(`GetMusicWavApi/${selectedADir.value}/${props.song.id}?${updateTime.value}`))
+    const url = computed(() => getUrl(`GetMusicWavApi/${selectedADir.value}/${props.song.cueId}?${updateTime.value}`))
     const tipShow = ref(false)
     const tipSelectAwbShow = ref(false)
     const setOffsetShow = ref(false)
@@ -25,6 +25,8 @@ export default defineComponent({
     const okResolve = ref<Function>(() => {
     })
     const dialog = useDialog();
+    const cueIdNotMatch = computed(() => props.song.nonDxId !== props.song.cueId)
+    const movieIdNotMatch = computed(() => props.song.nonDxId !== props.song.movieId)
 
     const uploadFlow = async () => {
       tipShow.value = true
@@ -65,7 +67,7 @@ export default defineComponent({
 
           load.value = true;
           const awb = await fileHandle.getFile() as File;
-          res = await api.SetAudio(props.song.id!, selectedADir.value, {file, awb, padding: 0});
+          res = await api.SetAudio(props.song.id!, selectedADir.value, { file, awb, padding: 0 });
         } else {
           offset.value = 0;
           setOffsetShow.value = true;
@@ -74,11 +76,11 @@ export default defineComponent({
           });
           load.value = true;
           setOffsetShow.value = false;
-          res = await api.SetAudio(props.song.id!, selectedADir.value, {file, padding: offset.value});
+          res = await api.SetAudio(props.song.id!, selectedADir.value, { file, padding: offset.value });
         }
         if (res.error) {
           const error = res.error as any;
-          dialog.warning({title: '设置失败', content: error.message || error});
+          dialog.warning({ title: '设置失败', content: error.message || error });
           return;
         }
         updateTime.value = Date.now()
@@ -97,9 +99,24 @@ export default defineComponent({
 
     return () => <NFlex align="center">
       {props.song.isAcbAwbExist && <audio controls src={url.value} class="w-0 grow"/>}
-      {selectedADir.value !== 'A000' && <NButton secondary class={`${!props.song.isAcbAwbExist && "w-full"}`} onClick={uploadFlow} loading={load.value}>{props.song.isAcbAwbExist ? '替换' : '设置'}音频</NButton>}
-      {selectedADir.value !== 'A000' && props.song.isAcbAwbExist && <AudioPreviewEditorButton/>}
-      {selectedADir.value !== 'A000' && props.song.isAcbAwbExist && <SetMovieButton song={props.song}/>}
+      {selectedADir.value !== 'A000' &&
+        <NPopover trigger="hover" disabled={!cueIdNotMatch.value}>{{
+          trigger: () => <NButton secondary class={`${!props.song.isAcbAwbExist && "w-full"}`} onClick={uploadFlow} loading={load.value} disabled={cueIdNotMatch.value}>{props.song.isAcbAwbExist ? '替换' : '设置'}音频</NButton>,
+          default: () => '由于 XML 内自行设置了不同的 CueID，不支持在这里替换音频'
+        }}</NPopover>
+      }
+      {selectedADir.value !== 'A000' && props.song.isAcbAwbExist &&
+        <NPopover trigger="hover" disabled={!cueIdNotMatch.value}>{{
+          trigger: () => <AudioPreviewEditorButton disabled={cueIdNotMatch.value}/>,
+          default: () => '由于 XML 内自行设置了不同的 CueID，不支持在这里修改设置'
+        }}</NPopover>
+      }
+      {selectedADir.value !== 'A000' && props.song.isAcbAwbExist &&
+        <NPopover trigger="hover" disabled={!movieIdNotMatch.value}>{{
+          trigger: () => <SetMovieButton song={props.song} disabled={movieIdNotMatch.value}/>,
+          default: () => '由于 XML 内自行设置了不同的 MovieID，不支持在这里替换 PV'
+        }}</NPopover>
+      }
 
       {/* 打开文件对话框一般在左上角，所以在下边显示一个 Drawer */}
       <NDrawer v-model:show={tipShow.value} height={200} placement="bottom">
diff --git a/MaiChartManager/Front/src/components/MusicEdit/AudioPreviewEditorButton.tsx b/MaiChartManager/Front/src/components/MusicEdit/AudioPreviewEditorButton.tsx
@@ -4,6 +4,9 @@ import AudioPreviewEditor from "@/components/MusicEdit/AudioPreviewEditor";
 import { showNeedPurchaseDialog, version } from "@/store/refs";
 
 export default defineComponent({
+  props: {
+    disabled: Boolean,
+  },
   setup(props) {
     const show = ref(false)
 
@@ -15,7 +18,7 @@ export default defineComponent({
       show.value = true
     }
 
-    return () => <NButton secondary onClick={handleClick}>
+    return () => <NButton secondary onClick={handleClick} disabled={props.disabled}>
       编辑预览
 
       <NModal
diff --git a/MaiChartManager/Front/src/components/MusicEdit/SetMovieButton.tsx b/MaiChartManager/Front/src/components/MusicEdit/SetMovieButton.tsx
@@ -17,6 +17,7 @@ enum STEP {
 
 export default defineComponent({
   props: {
+    disabled: Boolean,
     song: { type: Object as PropType<MusicXmlWithABJacket>, required: true },
   },
   setup(props) {
@@ -131,7 +132,7 @@ export default defineComponent({
       }
     }
 
-    return () => <NButton secondary onClick={uploadFlow} loading={load.value}>
+    return () => <NButton secondary onClick={uploadFlow} loading={load.value} disabled={props.disabled}>
       设置 PV
 
       <NDrawer show={step.value === STEP.Select} height={250} placement="bottom">
diff --git a/MaiChartManager/Models/MusicXmlWithABJacket.cs b/MaiChartManager/Models/MusicXmlWithABJacket.cs
@@ -38,7 +38,7 @@ public override void Refresh()
         }
     }
 
-    public bool isAcbAwbExist => StaticSettings.AcbAwb.ContainsKey($"music{NonDxId:000000}.acb") && StaticSettings.AcbAwb.ContainsKey($"music{NonDxId:000000}.awb");
+    public bool isAcbAwbExist => StaticSettings.AcbAwb.ContainsKey($"music{CueId:000000}.acb") && StaticSettings.AcbAwb.ContainsKey($"music{CueId:000000}.awb");
 
     public XmlDocument GetInnerXmlClone()
     {
@@ -60,6 +60,28 @@ public XmlDocument GetXmlWithoutEventsAndRights()
         return clone;
     }
 
+    public int CueId
+    {
+        get => int.Parse(RootNode.SelectSingleNode("cueName/id")?.InnerText);
+        set
+        {
+            Modified = true;
+            var nonDxId = value % 10000;
+            RootNode.SelectSingleNode("cueName/id").InnerText = nonDxId.ToString();
+        }
+    }
+
+    public int MovieId
+    {
+        get => int.Parse(RootNode.SelectSingleNode("movieName/id")?.InnerText);
+        set
+        {
+            Modified = true;
+            var nonDxId = value % 10000;
+            RootNode.SelectSingleNode("movieName/id").InnerText = nonDxId.ToString();
+        }
+    }
+
     public List<string> Problems
     {
         get
diff --git a/Sitreamai/Models/MusicXml.cs b/Sitreamai/Models/MusicXml.cs
@@ -210,7 +210,7 @@ public static MusicXml CreateNew(int dxId, string gamePath, string assetDir)
         return new MusicXml(Path.Combine(path, "Music.xml"), gamePath);
     }
 
-    private XmlNode RootNode => xmlDoc.SelectSingleNode("/MusicData");
+    protected XmlNode RootNode => xmlDoc.SelectSingleNode("/MusicData");
 
     public int Id
     {
@@ -228,7 +228,7 @@ public int Id
 
     public int NonDxId => Id % 10000;
 
-    public bool Modified { get; private set; }
+    public bool Modified { get; protected set; }
 
     // netOpenName 和 releaseTagName 游戏里看起来没有用到
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ enum STEP {`
`17`	`17`
`18`	`18`	`export default defineComponent({`
`19`	`19`	`props: {`
	`20`	`+ disabled: Boolean,`
`20`	`21`	`song: { type: Object as PropType<MusicXmlWithABJacket>, required: true },`
`21`	`22`	`},`
`22`	`23`	`setup(props) {`
`@@ -131,7 +132,7 @@ export default defineComponent({`
`131`	`132`	`}`
`132`	`133`	`}`
`133`	`134`
`134`		`- return () => <NButton secondary onClick={uploadFlow} loading={load.value}>`
	`135`	`+ return () => <NButton secondary onClick={uploadFlow} loading={load.value} disabled={props.disabled}>`
`135`	`136`	`设置 PV`
`136`	`137`
`137`	`138`	`<NDrawer show={step.value === STEP.Select} height={250} placement="bottom">`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public static MusicXml CreateNew(int dxId, string gamePath, string assetDir)`
`210`	`210`	`return new MusicXml(Path.Combine(path, "Music.xml"), gamePath);`
`211`	`211`	`}`
`212`	`212`
`213`		`- private XmlNode RootNode => xmlDoc.SelectSingleNode("/MusicData");`
	`213`	`+ protected XmlNode RootNode => xmlDoc.SelectSingleNode("/MusicData");`
`214`	`214`
`215`	`215`	`public int Id`
`216`	`216`	`{`
`@@ -228,7 +228,7 @@ public int Id`
`228`	`228`
`229`	`229`	`public int NonDxId => Id % 10000;`
`230`	`230`
`231`		`- public bool Modified { get; private set; }`
	`231`	`+ public bool Modified { get; protected set; }`
`232`	`232`
`233`	`233`	`// netOpenName 和 releaseTagName 游戏里看起来没有用到`
`234`	`234`