Merge branch 'dev' of http://8.153.108.90:3000/YD/Wpf_AiSportsMicrospace into dev
# Conflicts: # Wpf_AiSportsMicrospace/Views/JumpRope/MusicJumpRope.xaml.cs
This commit is contained in:
commit
290ba96aa2
@ -20,18 +20,18 @@ namespace Dto
|
||||
public List<SportBase> Sports { get; private set; }
|
||||
public List<string> UseNameList { get; private set; } = new()
|
||||
{
|
||||
"一号位", "四号位", "二号位", "五号位", "三号位", "六号位"
|
||||
"游客-A", "游客-B", "游客-C", "游客-D", "游客-E", "游客-F"
|
||||
};
|
||||
public GroupJumpRopeContext()
|
||||
{
|
||||
CirclePositions = new List<(double XNorm, double YNorm)>
|
||||
{
|
||||
(0.21, 0.88 ),
|
||||
(0.36, 0.68 ),
|
||||
(0.36, 0.58 ),
|
||||
(0.50, 0.88),
|
||||
(0.64, 0.68 ),
|
||||
(0.64, 0.58 ),
|
||||
(0.78, 0.88),
|
||||
(0.92, 0.68 )
|
||||
(0.92, 0.58 )
|
||||
};
|
||||
|
||||
UserList = new List<SportUserItem>();
|
||||
|
||||
@ -18,7 +18,7 @@ namespace Dto
|
||||
public List<string> UserNumberList { get; private set; }
|
||||
public List<double> UserScoreList { 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 Dictionary<string, List<double>> MusicBeats { get; private set; } = new()
|
||||
@ -56,7 +56,7 @@ namespace Dto
|
||||
{
|
||||
CirclePositions = new List<(double XNorm, double YNorm)>
|
||||
{
|
||||
(0.21, 0.88),
|
||||
(0.78, 0.88),
|
||||
(0.50, 0.88),
|
||||
};
|
||||
|
||||
|
||||
@ -631,6 +631,7 @@ namespace Wpf_AiSportsMicrospace.Views.JumpRope
|
||||
return lastState;
|
||||
}
|
||||
|
||||
userItem.Margin = new Thickness(centerX + 120, centerY - 700, 0, 0);
|
||||
|
||||
private void Image_MouseDown(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user