fix

NyagekiFumenProject · Mar 7, 2024 · 553c85c · 553c85c
1 parent 134f263
commit 553c85c
Show file tree

Hide file tree

Showing 7 changed files with 1,606 additions and 1,576 deletions.
diff --git a/OngekiFumenEditor/Base/OngekiObjects/BulletPallete.cs b/OngekiFumenEditor/Base/OngekiObjects/BulletPallete.cs
@@ -34,10 +34,11 @@ public double CalculateToXGridTotalUnit(IBulletPalleteReferencable refObject, On
             var randomOffset = 0;
             if (RandomOffsetRange > 0)
             {
+                var id = ((OngekiObjectBase)refObject).Id;
                 //不想用Random类，直接异或计算吧
-                var seed = (60045 * Id + 123) % 2147483648 * Id ^ Id;
+                var seed = Math.Abs((RandomSeed * id + 123) * id ^ id);
                 var r = RandomOffsetRange;
-                randomOffset = (-r) + (int)(seed % (r - (-r) + 1));
+                randomOffset = (-r) + (seed % (r - (-r) + 1));
             }
 
             return xGridTotalUnit + randomOffset;

diff --git a/...enEditor/Modules/FumenBulletPalleteListViewer/Views/FumenBulletPalleteListViewerView.xaml b/...enEditor/Modules/FumenBulletPalleteListViewer/Views/FumenBulletPalleteListViewerView.xaml
@@ -8,8 +8,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:OngekiFumenEditor.Modules.FumenMetaInfoBrowser.Views"
+    xmlns:markup="clr-namespace:OngekiFumenEditor.UI.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:res="clr-namespace:OngekiFumenEditor.Properties" xmlns:markup="clr-namespace:OngekiFumenEditor.UI.Markup"
+    xmlns:res="clr-namespace:OngekiFumenEditor.Properties"
     xmlns:s="clr-namespace:OngekiFumenEditor.Base.OngekiObjects.BulletPalleteEnums"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
     xmlns:valueconverters="clr-namespace:OngekiFumenEditor.Modules.FumenBulletPalleteListViewer.ValueConverters"
@@ -139,6 +140,14 @@
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
+                    <GridViewColumn Width="75" Header="{markup:Translate [RandomOffsetRange]}">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding RandomOffsetRange}" />
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+
                     <!--<GridViewColumn Width="80" Header="辅助线颜色">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>

diff --git a/...Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs b/...Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs
@@ -740,6 +740,8 @@ public void KeyboardAction_HideOrShow()
 
         public void SwitchMode(bool isPreviewMode)
         {
+            BulletPallete.RandomSeed = DateTime.Now.ToString().GetHashCode();
+
             var tGrid = GetCurrentTGrid();
             IsUserRequestHideEditorObject = isPreviewMode;
             convertToY = IsDesignMode ?

diff --git a/OngekiFumenEditor/Properties/Resources.Designer.cs b/OngekiFumenEditor/Properties/Resources.Designer.cs