diff --git a/Wpf_AiSportsMicrospace/Common/SportOperate.cs b/Wpf_AiSportsMicrospace/Common/SportOperate.cs index f48371c..01ebc37 100644 --- a/Wpf_AiSportsMicrospace/Common/SportOperate.cs +++ b/Wpf_AiSportsMicrospace/Common/SportOperate.cs @@ -225,7 +225,7 @@ namespace Wpf_AiSportsMicrospace.Common bool pass = calculator.Calculating(human, ruleLeft); - return pass ? (int)WavingAction.Raising : (int)WavingAction.None; + return pass ? (int)WavingAction.RaiseHand : (int)WavingAction.None; } public bool IsAnyFootInCircle(Human h, double cx, double cy, double halfW, double halfH) diff --git a/Wpf_AiSportsMicrospace/Views/Home.xaml.cs b/Wpf_AiSportsMicrospace/Views/Home.xaml.cs index 31fa8bf..f942443 100644 --- a/Wpf_AiSportsMicrospace/Views/Home.xaml.cs +++ b/Wpf_AiSportsMicrospace/Views/Home.xaml.cs @@ -175,8 +175,8 @@ namespace Wpf_AiSportsMicrospace else { //var newPage = new TrainingRecords(); - var newPage = new WhackAMole(); - //var newPage = new StandingLeap(); + //var newPage = new WhackAMole(); + var newPage = new StandingLeap(); mainWin?.SwitchPageWithMaskAnimation(newPage, true); } } diff --git a/Wpf_AiSportsMicrospace/Views/JumpRope/MusicJumpRope.xaml.cs b/Wpf_AiSportsMicrospace/Views/JumpRope/MusicJumpRope.xaml.cs index 6a4a5e5..aba1054 100644 --- a/Wpf_AiSportsMicrospace/Views/JumpRope/MusicJumpRope.xaml.cs +++ b/Wpf_AiSportsMicrospace/Views/JumpRope/MusicJumpRope.xaml.cs @@ -81,7 +81,7 @@ namespace Wpf_AiSportsMicrospace.Views.JumpRope var cfg = await db.GroupPoints.FirstOrDefaultAsync(x => x.Code == AppSettings.Code); //var pointlist = JsonSerializer.Deserialize>(cfg!.PointsJson); - List<(double XNorm, double YNorm)> pointlist = [(cfg.ControlPoint.X, cfg.ControlPoint.Y), (cfg.Point3.X, cfg.Point3.Y)]; + List<(double XNorm, double YNorm)> pointlist = [(cfg.ControlPoint.X, cfg.ControlPoint.Y), (cfg.Point5.X, cfg.Point5.Y)]; _musicJumpRopeContext.UpdateCirclePositions(pointlist); _mainWin.HumanFrameUpdated += OnHumanFrameUpdated;