From 74c5121eb731a52f4051b7317e4db941fc155e40 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Wed, 9 Apr 2025 11:23:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug0409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Images/{ksonglover.ico => superstar.ico} | Bin OverlayFormObj/OverlayForm.cs | 24 +++-------------------- superstar_1.0.0.csproj | 2 +- 3 files changed, 4 insertions(+), 22 deletions(-) rename Images/{ksonglover.ico => superstar.ico} (100%) diff --git a/Images/ksonglover.ico b/Images/superstar.ico similarity index 100% rename from Images/ksonglover.ico rename to Images/superstar.ico diff --git a/OverlayFormObj/OverlayForm.cs b/OverlayFormObj/OverlayForm.cs index 32dff55..2b00d30 100644 --- a/OverlayFormObj/OverlayForm.cs +++ b/OverlayFormObj/OverlayForm.cs @@ -69,7 +69,6 @@ namespace OverlayFormObj MainForm = this; InitializeFormSettings(); ConfigureTimers(); - LoadBackgroundImage(); ConfigureImageDisplay(); InitializeLabels(); ConfigureSegmentTimer(); @@ -404,8 +403,7 @@ private Rectangle FindContentBounds(Bitmap bmp) firstStickerImage = null; this.Invalidate(); } - if (secondStickerImage == null) - LoadBackgroundImage(); + stickerTimer1.Stop(); HideImages(); }; @@ -417,8 +415,7 @@ private Rectangle FindContentBounds(Bitmap bmp) secondStickerImage = null; this.Invalidate(); } - if (firstStickerImage == null) - LoadBackgroundImage(); + stickerTimer2.Stop(); HideImages(); }; @@ -528,19 +525,6 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e) unifiedTimer.Start(); } - private void LoadBackgroundImage() - { - // try - // { - // backgroundImage = Image.FromFile(Path.Combine(Application.StartupPath, "themes\\superstar\\images.jpg")); - // } - // catch (Exception ex) - // { - // Console.WriteLine("Error loading background image: " + ex.Message); - // backgroundImage = null; - // } - } - private void ConfigureImageDisplay() { try @@ -550,7 +534,6 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e) imageYPos = (screenHeight / 3) - firstStickerImage.Height / 6; - LoadBackgroundImage(); stickerTimer1.Start(); @@ -798,8 +781,7 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e) if (firstStickerImage == null) { firstStickerImage = newSticker; - firstStickerXPos = this.Width / 2 - firstStickerImage.Width / 2; - LoadBackgroundImage(); + firstStickerXPos = this.Width / 2 - firstStickerImage.Width / 2; stickerTimer1.Start(); } else if (secondStickerImage == null) diff --git a/superstar_1.0.0.csproj b/superstar_1.0.0.csproj index d78d26c..2084d2d 100644 --- a/superstar_1.0.0.csproj +++ b/superstar_1.0.0.csproj @@ -3,7 +3,7 @@ Exe net8.0-windows - Images/ksonglover.ico + Images/superstar.ico superstar_1.0.0 enable enable