Leecheng/superstar_v2
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.251.18.130:3000/Leecheng/superstar_v2

Browse Source
This commit is contained in:
allen.yan 2025-08-11 10:42:31 +08:00
commit 744f66c1ee
6 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DBObj/SongData.cs
View File

@ -103,22 +103,11 @@ namespace DBObj
} }
public Color GetStateColor(){ public Color GetStateColor(){
Color c = Color.White; Color c = Color.White;
if (state == PlayState.Played) if (state == PlayState.Played) c = Color.Gray;//Color.FromArgb(200, 75, 125); // 播畢顏色：紫紅色
{ else if (state == PlayState.Skipped)c = Color.Gray;
c = Color.Gray;//Color.FromArgb(200, 75, 125); // 播畢顏色：紫紅色 else if (state == PlayState.NoFile)c = Color.Gray;
} else if (state == PlayState.Playing)c = Color.LimeGreen;
else if (state == PlayState.NoFile) else if (state == PlayState.InsertPlayback)c = Color.Gold;
{
c = Color.Gray;
}
else if (state == PlayState.Playing)
{
c = Color.LimeGreen;
}
else if (state == PlayState.InsertPlayback)
{
c = Color.Gold;
}
return c; return c;
} }
public string GetStateTxt(bool IsSimplified){ public string GetStateTxt(bool IsSimplified){

4
DBObj/SongList.cs
View File

@ -103,8 +103,8 @@ namespace DBObj
public static void Cancel(SongData song) public static void Cancel(SongData song)
{ {
not_played.Remove(song); not_played.Remove(song);
played.Remove(song); song.SetState(PlayState.Skipped);
chkCut(); played.Add(song);
} }
public static void Insert(SongData song) public static void Insert(SongData song)

1
Env.cs
View File

@ -10,6 +10,7 @@ namespace Utils
private static readonly List<string> KtvPaths = new() private static readonly List<string> KtvPaths = new()
{ {
@"\\sshost\KTVSuperstar", @"\\sshost\KTVSuperstar",
@"\\sshost1\KTVSuperstar",
@"\\pc101\KTVSuperstar" @"\\pc101\KTVSuperstar"
}; };

2
PlayState.cs
View File

@ -19,7 +19,7 @@ namespace DualScreenDemo
[LocalizedDescription("無文件", "无文件")] [LocalizedDescription("無文件", "无文件")]
NoFile, NoFile,
[LocalizedDescription("已跳過", "已跳过")] [LocalizedDescription("刪除", "删除")]
Skipped Skipped
} }

6
PrimaryFormParts/PrimaryForm.MultiPagePanel.cs
View File

@ -333,7 +333,7 @@ namespace DualScreenDemo
EventHandler mouseEnter = (sender, e) => EventHandler mouseEnter = (sender, e) =>
{ {
// 變更歌手名稱為黃色 // 變更歌手名稱為黃色
artistLabel.ForeColor = Color.Yellow; //artistLabel.ForeColor = Color.Yellow;
// 增強分隔線的亮度，使其更明顯 // 增強分隔線的亮度，使其更明顯
separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255); separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255);
@ -522,8 +522,8 @@ namespace DualScreenDemo
// 定義滑鼠進入 (MouseEnter) 事件的處理程序 // 定義滑鼠進入 (MouseEnter) 事件的處理程序
EventHandler mouseEnter = (sender, e) => EventHandler mouseEnter = (sender, e) =>
{ {
songLabel.ForeColor = Color.Yellow; //songLabel.ForeColor = Color.Yellow;
artistLabel.ForeColor = Color.Yellow; //artistLabel.ForeColor = Color.Yellow;
separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255); separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255);
}; };

2
Program.cs
View File

@ -13,7 +13,7 @@ namespace DualScreenDemo
private static PrimaryForm primaryForm; // 儲存實例的參考 private static PrimaryForm primaryForm; // 儲存實例的參考
public static Room room = new Room(); public static Room room = new Room();
public static string verSion = "Server V2.8 202508081600"; public static string verSion = "Server V2.8 202508081823";
[STAThread] [STAThread]
static void Main() static void Main()