Skip to content

Commit 6a84766

Browse files
StarrahStarrah
committed
[+] MA2Parser（没测）
1 parent 6249931 commit 6a84766

7 files changed

Lines changed: 446 additions & 15 deletions

File tree

‎Locale.Designer.cs‎

Lines changed: 93 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Locale.resx‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,51 @@
9898
<value>DEBUG:</value>
9999
</data>
100100
<data name="SimaiGrammarFailed" xml:space="preserve">
101-
<value>Failed to parse simai syntax: </value>
101+
<value>Failed to parse simai syntax! </value>
102102
</data>
103103
<data name="AbsoluteStepNotImplemented" xml:space="preserve">
104104
<value>Absolute step tags are not supported. Use BPM + division notation such as "(120){4}".</value>
105105
</data>
106106
<data name="ExtraModifiersIgnored" xml:space="preserve">
107-
<value>Unexpected modifier(s): {0}. They have been ignored.</value>
107+
<value>Unexpected modifier(s): {0}. Ignored.</value>
108108
</data>
109109
<data name="InvalidWaitTime" xml:space="preserve">
110110
<value>For multi-segment slides with per-segment durations, a wait-time fragment (e.g. {0.5##...}) may only appear on the first segment. Invalid wait-time markers were ignored.</value>
111111
</data>
112112
<data name="InstanceMultipleUsage" xml:space="preserve">
113-
<value>Parser and generator instances are single-use; do not call Parse or Generate more than once. Create a new instance for each chart.</value>
113+
<value>Parser/Generator instances are single-use; do not call Parse or Generate repeatedly! Create a new Parser/Generator for each chart you convert.</value>
114114
</data>
115115
<data name="InvalidMaidataFile" xml:space="preserve">
116116
<value>Not a valid maidata file: no '&amp;' field markers were found.</value>
117117
</data>
118+
<data name="InvalidMA2Sentence" xml:space="preserve">
119+
<value>Unrecognized or invalid MA2 statement!</value>
120+
</data>
121+
<data name="InvalidMA2SentenceWarning" xml:space="preserve">
122+
<value>Unrecognized MA2 statement; this line was ignored.</value>
123+
</data>
124+
<data name="InvalidMA2HeaderSentenceAfterHeader" xml:space="preserve">
125+
<value>Invalid MA2 statement: after the header section ended, a header-only line appeared again!</value>
126+
</data>
127+
<data name="NoBPMInMA2" xml:space="preserve">
128+
<value>The chart has no BPM line; parsing cannot continue!</value>
129+
</data>
130+
<data name="UnsuppoertedMA2Version" xml:space="preserve">
131+
<value>This MA2 version is not supported yet. Currently only MA2 1.03–1.05 are supported.</value>
132+
</data>
133+
<data name="UnsuppoertedMA2MET_DEF" xml:space="preserve">
134+
<value>Charts whose MET_DEF is not "4 4" are not supported yet!</value>
135+
</data>
136+
<data name="NoNotesInMA2" xml:space="preserve">
137+
<value>The chart has no notes!</value>
138+
</data>
139+
<data name="MA2NoteSentenceTooManyParam" xml:space="preserve">
140+
<value>This MA2 line has more parameters than required; the extras were ignored.</value>
141+
</data>
142+
<data name="MA2CNSlideHasWait" xml:space="preserve">
143+
<value>Parse error: MA2 CN___ (connecting slide) has a non-zero wait time.</value>
144+
</data>
145+
<data name="MA2CNSlideNoPrevious" xml:space="preserve">
146+
<value>Parse error: MA2 CN___ (connecting slide) has no preceding slide segment!</value>
147+
</data>
118148
</root>

‎Locale.zh-hans.resx‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,34 @@
115115
<data name="InvalidMaidataFile" xml:space="preserve">
116116
<value>不合法的maidata文件！输入的文件中不含&amp;标记，似乎不是一个maidata文件。</value>
117117
</data>
118+
<data name="InvalidMA2Sentence" xml:space="preserve">
119+
<value>无法识别或不合法的MA2语句！</value>
120+
</data>
121+
<data name="InvalidMA2SentenceWarning" xml:space="preserve">
122+
<value>无法识别的MA2语句，已忽略此语句。</value>
123+
</data>
124+
<data name="InvalidMA2HeaderSentenceAfterHeader" xml:space="preserve">
125+
<value>不合法的MA2语句：在头段落结束后，再次出现了只能在头段落中出现的语句！</value>
126+
</data>
127+
<data name="NoBPMInMA2" xml:space="preserve">
128+
<value>谱面中没有BPM语句，无法完成解析！</value>
129+
</data>
130+
<data name="UnsuppoertedMA2Version" xml:space="preserve">
131+
<value>此MA2的版本尚不支持！目前仅支持MA2 1.03~1.05。</value>
132+
</data>
133+
<data name="UnsuppoertedMA2MET_DEF" xml:space="preserve">
134+
<value>暂不支持MET_DEF不为"4 4"的谱面！</value>
135+
</data>
136+
<data name="NoNotesInMA2" xml:space="preserve">
137+
<value>谱面中没有音符！</value>
138+
</data>
139+
<data name="MA2NoteSentenceTooManyParam" xml:space="preserve">
140+
<value>MA2语句中的参数超过所需数量！多余的参数已忽略。</value>
141+
</data>
142+
<data name="MA2CNSlideHasWait" xml:space="preserve">
143+
<value>解析错误：MA2 CN___ 连接星星语句出现了非0的等待时间。</value>
144+
</data>
145+
<data name="MA2CNSlideNoPrevious" xml:space="preserve">
146+
<value>解析错误：MA2 CN___ 连接星星，未能找到前一段的星星！</value>
147+
</data>
118148
</root>

‎Locale.zh-hant.resx‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
6060
</resheader>
6161
<data name="AssertionFailed" xml:space="preserve">
62-
<value>很抱歉，MuConvert 發生內部錯誤（AssertionFailed）。請至 https://github.com/MuNet-OSS/MuConvert/issues 回報此問題。（{0}）</value>
62+
<value>很抱歉，MuConvert 發生內部錯誤（AssertionFailed）。您可將問題報告至 https://github.com/MuNet-OSS/MuConvert/issues 。（{0}）</value>
6363
</data>
6464
<data name="InvalidKey" xml:space="preserve">
6565
<value>鍵位編號不合法（須為 1–8）：{0}</value>
@@ -77,10 +77,10 @@
7777
<value>於</value>
7878
</data>
7979
<data name="MessageLine" xml:space="preserve">
80-
<value>第 {0} 行</value>
80+
<value>第{0}行</value>
8181
</data>
8282
<data name="MessageTime" xml:space="preserve">
83-
<value>第 {0:W} 小節（{1:F2} 秒）</value>
83+
<value>第{0:W}小節({1:F2}秒)</value>
8484
</data>
8585
<data name="MessageParsing" xml:space="preserve">
8686
<value>解析 {0} 時</value>
@@ -98,21 +98,51 @@
9898
<value>偵錯：</value>
9999
</data>
100100
<data name="SimaiGrammarFailed" xml:space="preserve">
101-
<value>解析 Simai 語法時失敗！</value>
101+
<value>解析Simai語法時失敗！ </value>
102102
</data>
103103
<data name="AbsoluteStepNotImplemented" xml:space="preserve">
104-
<value>本程式暫不支援直接指定絕對時間步長的寫法。請改用「(120){4}」這類 BPM 加幾分音符的表示方式。</value>
104+
<value>本程式暫不支援直接指定絕對時間步長的寫法。請使用類似「(120){4}」這種 BPM 加幾分音符的表示形式。</value>
105105
</data>
106106
<data name="ExtraModifiersIgnored" xml:space="preserve">
107-
<value>不應出現的修飾符：{0}。已忽略。</value>
107+
<value>不應出現的修飾符：{0}. 已忽略。</value>
108108
</data>
109109
<data name="InvalidWaitTime" xml:space="preserve">
110110
<value>對分別指定每段時長的多段星星，類似 {0.5##...} 的等待時間標記應僅可在第一段星星上出現。不合法的等待時間標記已忽略。</value>
111111
</data>
112112
<data name="InstanceMultipleUsage" xml:space="preserve">
113-
<value>Parser／Generator 實例僅能使用一次，不可重複呼叫 Parse 與 Generate。若需轉換多份譜面，請在每次轉換前 new 一個新實例。</value>
113+
<value>Parser/Generator 實例都僅能使用一次，不能重複呼叫 Parse 與 Generate 方法！若您需要轉換多個譜面，請在每次轉換前 new 一個新的 Parser/Generator 實例。</value>
114114
</data>
115115
<data name="InvalidMaidataFile" xml:space="preserve">
116116
<value>不合法的 maidata 檔案！輸入的檔案中不含&amp;標記，似乎不是 maidata 檔案。</value>
117117
</data>
118+
<data name="InvalidMA2Sentence" xml:space="preserve">
119+
<value>無法辨識或不合法的 MA2 語句！</value>
120+
</data>
121+
<data name="InvalidMA2SentenceWarning" xml:space="preserve">
122+
<value>無法辨識的 MA2 語句，已忽略此語句。</value>
123+
</data>
124+
<data name="InvalidMA2HeaderSentenceAfterHeader" xml:space="preserve">
125+
<value>不合法的 MA2 語句：在頭段落結束後，再次出現了只能在頭段落中出現的語句！</value>
126+
</data>
127+
<data name="NoBPMInMA2" xml:space="preserve">
128+
<value>譜面中沒有 BPM 語句，無法完成解析！</value>
129+
</data>
130+
<data name="UnsuppoertedMA2Version" xml:space="preserve">
131+
<value>此 MA2 的版本尚不支援！目前僅支援 MA2 1.03～1.05。</value>
132+
</data>
133+
<data name="UnsuppoertedMA2MET_DEF" xml:space="preserve">
134+
<value>暫不支援 MET_DEF 不為 "4 4" 的譜面！</value>
135+
</data>
136+
<data name="NoNotesInMA2" xml:space="preserve">
137+
<value>譜面中沒有音符！</value>
138+
</data>
139+
<data name="MA2NoteSentenceTooManyParam" xml:space="preserve">
140+
<value>MA2 語句中的參數超過所需數量！多餘的參數已忽略。</value>
141+
</data>
142+
<data name="MA2CNSlideHasWait" xml:space="preserve">
143+
<value>解析錯誤：MA2 CN___ 連接星星語句出現了非 0 的等待時間。</value>
144+
</data>
145+
<data name="MA2CNSlideNoPrevious" xml:space="preserve">
146+
<value>解析錯誤：MA2 CN___ 連接星星，未能找到前一段的星星！</value>
147+
</data>
118148
</root>

‎generator/MA2Generator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private void AddTap(Tap tap, int bar, int tick)
8181
string head = string.Format(headTemplate,
8282
$"{MA2Version / 100}.{MA2Version % 100:D2}.00", chart.IsUtage?1:0,
8383
bpmStatistics.Item1, bpmStatistics.Item2, bpmStatistics.Item3, bpmStatistics.Item4,
84-
RSL, 96*chart.ClockCount, Utils.AppVersion);
84+
RSL, RSL/4 * chart.ClockCount, Utils.AppVersion);
8585
result.Append(head);
8686

8787
// bpm段

0 commit comments

Comments
 (0)