2.4.5

Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml.vb

@@ -12,12 +12,11 @@
             Btn3.Name = Btn3.Name & GetUuid()
             MyConverter = Converter
             LabTitle.Text = Converter.Title
-            LabCaption.Text = Converter.Content
+            LabCaption.Text = Converter.Text
             Btn1.Text = Converter.Button1
             If Converter.IsWarn Then
                 Btn1.ColorType = MyButton.ColorState.Red
                 LabTitle.SetResourceReference(TextBlock.ForegroundProperty, "ColorBrushRedLight")
-                ShapeLine.SetResourceReference(Rectangle.FillProperty, "ColorBrushRedLight")
             End If
             Btn2.Text = Converter.Button2
             Btn3.Text = Converter.Button3
@@ -35,37 +34,15 @@
 
             'UI 初始化
             If Btn2.IsVisible AndAlso Not Btn1.ColorType = MyButton.ColorState.Red Then Btn1.ColorType = MyButton.ColorState.Highlight
-            Measure(New Size(FrmMain.Width - 20, FrmMain.Height - 20))
-            Arrange(New Rect(0, 0, FrmMain.Width - 20, FrmMain.Height - 20))
             Btn1.Focus()
             '动画
+            Opacity = 0
+            AniStart(AaColor(FrmMain.PanMsg, Grid.BackgroundProperty, If(MyConverter.IsWarn, New MyColor(140, 80, 0, 0), New MyColor(90, 0, 0, 0)) - FrmMain.PanMsg.Background, 200), "PanMsg Background")
             AniStart({
-                AaColor(FrmMain.PanMsg, BackgroundProperty, New MyColor(60, 0, 0, 0), 250, , New AniEaseInFluent),
-                AaColor(PanBorder, Border.BackgroundProperty, New MyColor(255, 0, 0, 0), 150, , New AniEaseInFluent),
-                AaOpacity(EffectShadow, 0.75, 400, 50),
-                AaWidth(ShapeLine, ShapeLine.ActualWidth, 250, 100, New AniEaseOutFluent),
-                AaOpacity(ShapeLine, 1, 200, 100),
-                AaWidth(LabTitle, LabTitle.ActualWidth, 200, 150, New AniEaseOutFluent),
-                AaOpacity(LabTitle, 1, 150, 150),
-                AaOpacity(PanCaption, 1, 150, 150),
-                AaOpacity(Btn1, 1, 150, 100),
-                AaOpacity(Btn2, 1, 150, 150),
-                AaOpacity(Btn3, 1, 150, 200),
-                AaCode(Sub()
-                           ShapeLine.MinWidth = ShapeLine.ActualWidth
-                           ShapeLine.HorizontalAlignment = HorizontalAlignment.Stretch
-                           ShapeLine.Width = Double.NaN
-                           LabTitle.Width = Double.NaN
-                           LabTitle.TextTrimming = TextTrimming.CharacterEllipsis
-                       End Sub, 350)
-            }, "MyMsgBox Start " & Uuid)
-            '动画初始化
-            ShapeLine.Width = 0
-            ShapeLine.HorizontalAlignment = HorizontalAlignment.Center
-            LabTitle.Width = 0
-            LabTitle.Opacity = 0
-            LabTitle.TextWrapping = TextWrapping.NoWrap
-            PanCaption.Opacity = 0
+                AaOpacity(Me, 1, 120, 60),
+                AaDouble(Sub(i) TransformPos.Y += i, -TransformPos.Y, 300, 60, New AniEaseOutBack(AniEasePower.Weak)),
+                AaDouble(Sub(i) TransformRotate.Angle += i, -TransformRotate.Angle, 300, 60, New AniEaseOutFluent(AniEasePower.Weak))
+            }, "MyMsgBox " & Uuid)
             '记录日志
             Log("[Control] 普通弹窗：" & LabTitle.Text & vbCrLf & LabCaption.Text)
 
@@ -77,25 +54,18 @@
         '结束线程阻塞
         If MyConverter.ForceWait OrElse Not MyConverter.Button2 = "" Then MyConverter.WaitFrame.Continue = False
         Interop.ComponentDispatcher.PopModal()
-        '弹窗动画
-        LabTitle.TextTrimming = TextTrimming.None
-        LabTitle.TextWrapping = TextWrapping.NoWrap
+        '动画
         AniStart({
-            AaColor(FrmMain.PanMsg, Grid.BackgroundProperty, New MyColor(-60, 0, 0, 0), 350, , New AniEaseInFluent),
-            AaColor(PanBorder, Border.BackgroundProperty, New MyColor(-255, 0, 0, 0), 300, 100, New AniEaseInFluent),
-            AaOpacity(EffectShadow, -0.75, 150),
-            AaWidth(ShapeLine, -ShapeLine.ActualWidth, 250, , New AniEaseInFluent(AniEasePower.Weak)),
-            AaOpacity(ShapeLine, -1, 200),
-            AaWidth(LabTitle, -LabTitle.ActualWidth, 250),
-            AaOpacity(LabTitle, -1, 200),
-            AaOpacity(PanCaption, -1, 200),
-            AaOpacity(Btn1, -1, 150),
-            AaOpacity(Btn2, -1, 150, 50),
-            AaOpacity(Btn3, -1, 150, 100),
+            AaCode(Sub()
+                       If WaitingMyMsgBox.Count = 0 Then
+                           AniStart(AaColor(FrmMain.PanMsg, Grid.BackgroundProperty, New MyColor(0, 0, 0, 0) - FrmMain.PanMsg.Background, 200, Ease:=New AniEaseOutFluent(AniEasePower.Weak)))
+                       End If
+                   End Sub, 30),
+            AaOpacity(Me, -Opacity, 80, 20),
+            AaDouble(Sub(i) TransformPos.Y += i, 20 - TransformPos.Y, 150, 0, New AniEaseOutFluent),
+            AaDouble(Sub(i) TransformRotate.Angle += i, 6 - TransformRotate.Angle, 150, 0, New AniEaseInFluent(AniEasePower.Weak)),
             AaCode(Sub() CType(Parent, Grid).Children.Remove(Me), , True)
-        }, "MyMsgBox Close " & Uuid)
-        '动画初始化
-        ShapeLine.MinWidth = 0
+        }, "MyMsgBox " & Uuid)
     End Sub
 
     Public Sub Btn1_Click() Handles Btn1.Click