up A32版测试完成

Coloryr · Nov 2, 2024 · d7deda3 · d7deda3
1 parent 20d08ac
commit d7deda3
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 79 deletions.
diff --git a/src/ColorMC.Core/CoreMain.cs b/src/ColorMC.Core/CoreMain.cs
@@ -15,7 +15,7 @@ namespace ColorMC.Core;
 public static class ColorMCCore
 {
     public const string TopVersion = "A32";
-    public const string DateVersion = "20241030";
+    public const string DateVersion = "20241102";
 
     /// <summary>
     /// 版本号

diff --git a/src/ColorMC.Gui/UI/Controls/GameLog/GameLogControl.axaml b/src/ColorMC.Gui/UI/Controls/GameLog/GameLogControl.axaml
@@ -18,79 +18,80 @@
             Classes="t2"
             DockPanel.Dock="Top">
             <StackPanel Margin="15">
-                <StackPanel Margin="0,0,0,10">
-                    <panel:WrapPanelWithStretch AutoMax="{Binding MinMode}">
-                        <ToggleSwitch
-                            Margin="0,0,10,10"
-                            VerticalAlignment="Center"
-                            IsChecked="{Binding IsWordWrap}"
-                            OffContent="{setting:Localize GameLogWindow.Text1}"
-                            OnContent="{setting:Localize GameLogWindow.Text1}" />
-                        <ToggleSwitch
-                            Margin="0,0,10,10"
-                            IsChecked="{Binding IsAuto}"
-                            OffContent="{setting:Localize GameLogWindow.Text2}"
-                            OnContent="{setting:Localize GameLogWindow.Text2}" />
-                        <ComboBox
-                            MinWidth="200"
-                            Margin="0,0,10,10"
-                            HorizontalAlignment="Stretch"
-                            ItemsSource="{Binding FileList}"
-                            SelectedItem="{Binding File}" />
-                    </panel:WrapPanelWithStretch>
-                    <WrapPanel Margin="0,0,0,-10">
-                        <Button
-                            Width="100"
-                            Height="35"
-                            Margin="-2,-3,3,7"
-                            VerticalAlignment="Center"
-                            Classes="top"
-                            Command="{Binding Launch}"
-                            Content="{setting:Localize GameLogWindow.Text4}"
-                            IsEnabled="{Binding !IsGameRun}"
-                            ToolTip.Tip="{setting:Localize ToolTip.Text44}"
-                            ToolTip.VerticalOffset="-30" />
-                        <Button
-                            Width="100"
-                            Height="35"
-                            Margin="-2,-3,3,7"
-                            VerticalAlignment="Center"
-                            Classes="top"
-                            Command="{Binding Stop}"
-                            Content="{setting:Localize GameLogWindow.Text3}"
-                            IsEnabled="{Binding IsGameRun}"
-                            ToolTip.Tip="{setting:Localize ToolTip.Text44}"
-                            ToolTip.VerticalOffset="-30" />
-                        <Button
-                            Width="100"
-                            Height="35"
-                            Margin="-2,-3,3,7"
-                            VerticalAlignment="Center"
-                            Classes="top"
-                            Command="{Binding Load1}"
-                            Content="{setting:Localize GameLogWindow.Text6}"
-                            ToolTip.VerticalOffset="-30" />
-                        <Button
-                            Width="100"
-                            Height="35"
-                            Margin="-2,-3,3,7"
-                            VerticalAlignment="Center"
-                            Classes="top"
-                            Command="{Binding Search}"
-                            Content="{setting:Localize GameLogWindow.Text7}"
-                            ToolTip.VerticalOffset="-30" />
-                        <Button
-                            Width="100"
-                            Height="35"
-                            Margin="-2,-3,3,7"
-                            VerticalAlignment="Center"
-                            Classes="top"
-                            Command="{Binding Push}"
-                            Content="{setting:Localize GameLogWindow.Text8}"
-                            ToolTip.VerticalOffset="-30" />
-                    </WrapPanel>
-                </StackPanel>
-                <WrapPanel Margin="0,0,0,0" IsEnabled="{Binding !IsFile}">
+                <panel:WrapPanelWithStretch AutoMax="{Binding MinMode}">
+                    <ToggleSwitch
+                        Margin="0,0,10,10"
+                        VerticalAlignment="Center"
+                        IsChecked="{Binding IsWordWrap}"
+                        OffContent="{setting:Localize GameLogWindow.Text1}"
+                        OnContent="{setting:Localize GameLogWindow.Text1}" />
+                    <ToggleSwitch
+                        Margin="0,0,10,10"
+                        IsChecked="{Binding IsAuto}"
+                        OffContent="{setting:Localize GameLogWindow.Text2}"
+                        OnContent="{setting:Localize GameLogWindow.Text2}" />
+                    <ComboBox
+                        MinWidth="200"
+                        Margin="0,0,10,10"
+                        HorizontalAlignment="Stretch"
+                        ItemsSource="{Binding FileList}"
+                        SelectedItem="{Binding File}" />
+                </panel:WrapPanelWithStretch>
+                <WrapPanel Margin="0,0,0,-10">
+                    <Button
+                        Width="100"
+                        Height="35"
+                        Margin="-2,-3,3,7"
+                        VerticalAlignment="Center"
+                        Classes="top"
+                        Command="{Binding Launch}"
+                        Content="{setting:Localize GameLogWindow.Text4}"
+                        IsEnabled="{Binding !IsGameRun}"
+                        ToolTip.Tip="{setting:Localize ToolTip.Text44}"
+                        ToolTip.VerticalOffset="-30" />
+                    <Button
+                        Width="100"
+                        Height="35"
+                        Margin="-2,-3,3,7"
+                        VerticalAlignment="Center"
+                        Classes="top"
+                        Command="{Binding Stop}"
+                        Content="{setting:Localize GameLogWindow.Text3}"
+                        IsEnabled="{Binding IsGameRun}"
+                        ToolTip.Tip="{setting:Localize ToolTip.Text44}"
+                        ToolTip.VerticalOffset="-30" />
+                    <Button
+                        Width="100"
+                        Height="35"
+                        Margin="-2,-3,3,7"
+                        VerticalAlignment="Center"
+                        Classes="top"
+                        Command="{Binding Load1}"
+                        Content="{setting:Localize GameLogWindow.Text6}"
+                        ToolTip.VerticalOffset="-30" />
+                    <Button
+                        Width="100"
+                        Height="35"
+                        Margin="-2,-3,3,7"
+                        VerticalAlignment="Center"
+                        Classes="top"
+                        Command="{Binding Search}"
+                        Content="{setting:Localize GameLogWindow.Text7}"
+                        ToolTip.VerticalOffset="-30" />
+                    <Button
+                        Width="100"
+                        Height="35"
+                        Margin="-2,-3,3,7"
+                        VerticalAlignment="Center"
+                        Classes="top"
+                        Command="{Binding Push}"
+                        Content="{setting:Localize GameLogWindow.Text8}"
+                        ToolTip.VerticalOffset="-30" />
+                </WrapPanel>
+                <WrapPanel
+                    Margin="0,10,0,0"
+                    IsEnabled="{Binding !IsFile}"
+                    IsVisible="{Binding !IsFile}">
                     <TextBlock Margin="0,0,10,0" Text="{setting:Localize GameLogWindow.Text9}" />
                     <CheckBox
                         Margin="0,0,10,0"
@@ -116,7 +117,8 @@
                 <panel:WrapPanelWithStretch
                     Margin="0,0,0,-10"
                     AutoMax="{Binding MinMode}"
-                    IsEnabled="{Binding !IsFile}">
+                    IsEnabled="{Binding !IsFile}"
+                    IsVisible="{Binding !IsFile}">
                     <DockPanel MinWidth="230" Margin="0,0,10,10">
                         <TextBlock Margin="0,0,10,0" Text="{setting:Localize GameLogWindow.Text15}" />
                         <ComboBox

diff --git a/src/ColorMC.Launcher/Program.cs b/src/ColorMC.Launcher/Program.cs
@@ -56,10 +56,10 @@ public static class Program
 
     public static readonly string[] BaseSha1 =
     [
-        "544607e13a4ead6d162fe206f02a881a42338ea0",
-        "849b9aa10ce2fb4f9db71ab66a870c2e3173fbb7",
-        "18042a0b4c7697bdd44f3a5e1e660775145422d1",
-        "468a1a7b45dbb6989632250a077baf2c61c37010"
+        "94aeb1995f740116b8513f37a1f7c7844409d7b8",
+        "dcb5ec92181a71a721ef3deb77f143b2e0c91536",
+        "8e0169c2ba35396a2a9b495e79e342b44e1aafff",
+        "0b09c362b016a4febc6b06e963edb5d03594145b"
     ];
 
     public delegate void IN(string[] args);