From eb86a4d1505910466bee67ef1c0b6794989fec22 Mon Sep 17 00:00:00 2001 From: kaminaka rikuya Date: Thu, 11 Aug 2022 23:00:13 +0900 Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=81=AE=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Control.cs | 2 +- src/SportsCoderForVolleyball/Models/Data.cs | 2 +- src/SportsCoderForVolleyball/Models/Option.cs | 34 +++++++++---------- .../ViewModels/ScoreBoardViewModel.cs | 2 +- .../Views/ScoreBoard.xaml | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/SportsCoderForVolleyball/Models/Control.cs b/src/SportsCoderForVolleyball/Models/Control.cs index 1f62dba..f5d4968 100644 --- a/src/SportsCoderForVolleyball/Models/Control.cs +++ b/src/SportsCoderForVolleyball/Models/Control.cs @@ -145,7 +145,7 @@ private async Task GameSetAsync() //セットごとのポイント await Task.Delay(4000); Instance.Option.InfomationPointParSet(); - Instance.IsAnimation.Value = false; + Instance.IsDisplayScoreboard.Value = false; //セットごとのポイントを削除 await Task.Delay(10000); diff --git a/src/SportsCoderForVolleyball/Models/Data.cs b/src/SportsCoderForVolleyball/Models/Data.cs index fe4f11e..9075054 100644 --- a/src/SportsCoderForVolleyball/Models/Data.cs +++ b/src/SportsCoderForVolleyball/Models/Data.cs @@ -20,7 +20,7 @@ public class Data public Control Control { get; set; } = new(); //アニメーション - public ReactiveProperty IsAnimation = new(true); + public ReactiveProperty IsDisplayScoreboard = new(true); public ReactiveProperty IsDisplayTechnicalTimeout = new(false); public ReactiveProperty IsDisplayLeftTimeout = new(false); public ReactiveProperty IsDisplayRightTimeout = new(false); diff --git a/src/SportsCoderForVolleyball/Models/Option.cs b/src/SportsCoderForVolleyball/Models/Option.cs index 5e76bd9..ea2cd8d 100644 --- a/src/SportsCoderForVolleyball/Models/Option.cs +++ b/src/SportsCoderForVolleyball/Models/Option.cs @@ -69,9 +69,9 @@ public async void LeftTimeout() else { Instance.TimeOutLeft.Value++; - if (Instance.IsAnimation.Value == false) + if (Instance.IsDisplayScoreboard.Value == false) { - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; await Task.Delay(1000); } @@ -115,9 +115,9 @@ public async void RightTimeOut() else { Instance.TimeOutRight.Value++; - if (Instance.IsAnimation.Value == false) + if (Instance.IsDisplayScoreboard.Value == false) { - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; await Task.Delay(1000); } @@ -159,9 +159,9 @@ public async void TechnicalTimeOut() } else { - if (Instance.IsAnimation.Value == false) + if (Instance.IsDisplayScoreboard.Value == false) { - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; await Task.Delay(1000); } @@ -185,7 +185,7 @@ public async void TechnicalTimeOut() } public async void InfomationScore() { - if (Instance.IsAnimation.Value) + if (Instance.IsDisplayScoreboard.Value) { //表示されているとき if (Instance.IsDisplayGetSet.Value) @@ -195,14 +195,14 @@ public async void InfomationScore() else { await DeleteOption(); - Instance.IsAnimation.Value = false; + Instance.IsDisplayScoreboard.Value = false; } } else { //未表示のとき - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; if (Instance.IsDisplayGetSet.Value) { Instance.IsDisplayGetSet.Value = false; @@ -276,9 +276,9 @@ public async void InfomationAttackPoint() } else { - if (Instance.IsAnimation.Value == false) + if (Instance.IsDisplayScoreboard.Value == false) { - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; await Task.Delay(1000); } @@ -296,9 +296,9 @@ public async void InfomationBlockPoint() } else { - if (Instance.IsAnimation.Value == false) + if (Instance.IsDisplayScoreboard.Value == false) { - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; await Task.Delay(1000); } await DeleteOption(); @@ -315,9 +315,9 @@ public async void InfomationServePoint() } else { - if (Instance.IsAnimation.Value == false) + if (Instance.IsDisplayScoreboard.Value == false) { - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; await Task.Delay(1000); } await DeleteOption(); @@ -334,9 +334,9 @@ public async void InfomationServeError() } else { - if (Instance.IsAnimation.Value == false) + if (Instance.IsDisplayScoreboard.Value == false) { - Instance.IsAnimation.Value = true; + Instance.IsDisplayScoreboard.Value = true; await Task.Delay(1000); } await DeleteOption(); diff --git a/src/SportsCoderForVolleyball/ViewModels/ScoreBoardViewModel.cs b/src/SportsCoderForVolleyball/ViewModels/ScoreBoardViewModel.cs index 348fe07..9f6bf2f 100644 --- a/src/SportsCoderForVolleyball/ViewModels/ScoreBoardViewModel.cs +++ b/src/SportsCoderForVolleyball/ViewModels/ScoreBoardViewModel.cs @@ -7,7 +7,7 @@ namespace SportsCoderForVolleyball.ViewModels { public class ScoreBoardViewModel : BindableBase { - public ReactiveProperty IsAnimation { get; set; } = Data.Instance.IsAnimation.ObserveProperty(x => x.Value).ToReactiveProperty(); + public ReactiveProperty IsDisplayScoreboard { get; set; } = Data.Instance.IsDisplayScoreboard.ObserveProperty(x => x.Value).ToReactiveProperty(); //UI部品 public ReactiveProperty Set { get; set; } = Data.Instance.Set.ObserveProperty(x => x.Value).ToReactiveProperty(); diff --git a/src/SportsCoderForVolleyball/Views/ScoreBoard.xaml b/src/SportsCoderForVolleyball/Views/ScoreBoard.xaml index ceb9571..c95015a 100644 --- a/src/SportsCoderForVolleyball/Views/ScoreBoard.xaml +++ b/src/SportsCoderForVolleyball/Views/ScoreBoard.xaml @@ -82,7 +82,7 @@