YD/Wpf_AiSportsMicrospace
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://8.153.108.90:3000/YD/Wpf_AiSportsMicrospace into dev

Browse Source 
# Conflicts:
#	Wpf_AiSportsMicrospace/Views/JumpRope/MusicJumpRope.xaml.cs
This commit is contained in:
ltx 2025-10-19 19:27:35 +08:00
commit 290ba96aa2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Wpf_AiSportsMicrospace/Dto/GroupJumpRopeContext.cs
View File

@ -20,18 +20,18 @@ namespace Dto
public List<SportBase> Sports { get; private set; } public List<SportBase> Sports { get; private set; }
public List<string> UseNameList { get; private set; } = new() public List<string> UseNameList { get; private set; } = new()
{ {
"一号位", "四号位", "二号位", "五号位", "三号位", "六号位" "游客-A", "游客-B", "游客-C", "游客-D", "游客-E", "游客-F"
}; };
public GroupJumpRopeContext() public GroupJumpRopeContext()
{ {
CirclePositions = new List<(double XNorm, double YNorm)> CirclePositions = new List<(double XNorm, double YNorm)>
{ {
(0.21, 0.88 ), (0.21, 0.88 ),
(0.36, 0.68 ), (0.36, 0.58 ),
(0.50, 0.88), (0.50, 0.88),
(0.64, 0.68 ), (0.64, 0.58 ),
(0.78, 0.88), (0.78, 0.88),
(0.92, 0.68 ) (0.92, 0.58 )
}; };
UserList = new List<SportUserItem>(); UserList = new List<SportUserItem>();

4
Wpf_AiSportsMicrospace/Dto/MusicJumpRopeContext.cs
View File

@ -18,7 +18,7 @@ namespace Dto
public List<string> UserNumberList { get; private set; } public List<string> UserNumberList { get; private set; }
public List<double> UserScoreList { get; private set; } public List<double> UserScoreList { get; private set; }
public List<SportBase> Sports { get; private set; } public List<SportBase> Sports { get; private set; }
public List<string> UseNameList { get; private set; } = new() { "一号位", "二号位" }; public List<string> UseNameList { get; private set; } = new() { "蓝方选手", "红方选手" };
public List<int> UserBeatSyncList = new List<int>(); public List<int> UserBeatSyncList = new List<int>();
public Dictionary<string, List<double>> MusicBeats { get; private set; } = new() public Dictionary<string, List<double>> MusicBeats { get; private set; } = new()
@ -56,7 +56,7 @@ namespace Dto
{ {
CirclePositions = new List<(double XNorm, double YNorm)> CirclePositions = new List<(double XNorm, double YNorm)>
{ {
(0.21, 0.88), (0.78, 0.88),
(0.50, 0.88), (0.50, 0.88),
}; };

1
Wpf_AiSportsMicrospace/Views/JumpRope/MusicJumpRope.xaml.cs
View File

@ -631,6 +631,7 @@ namespace Wpf_AiSportsMicrospace.Views.JumpRope
return lastState; return lastState;
} }
userItem.Margin = new Thickness(centerX + 120, centerY - 700, 0, 0);
private void Image_MouseDown(object sender, MouseButtonEventArgs e) private void Image_MouseDown(object sender, MouseButtonEventArgs e)
{ {