chk
/
KoogleApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo and redo gameModelState

This commit is contained in:
beo3000 2025-11-27 13:02:48 +01:00
parent 49be125e74
commit d07c9049e4
9 changed files with 356 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
KoogleApp/Components/Pages/Game.razor
View File

@ -107,12 +107,6 @@
private bool isAuthenticated; private bool isAuthenticated;
protected override void OnInitialized()
{
base.OnInitialized();
}
protected override void OnAfterRender(bool firstRender) protected override void OnAfterRender(bool firstRender)
{ {
if (firstRender) if (firstRender)

2
KoogleApp/Games/IGameService.cs
View File

@ -8,7 +8,7 @@ namespace KoogleApp.Games
{ {
[JsonDerivedType(typeof(TrainingState), typeDiscriminator: "TrainingState")] [JsonDerivedType(typeof(TrainingState), typeDiscriminator: "TrainingState")]
//[JsonDerivedType(typeof(v2), typeDiscriminator: "v2")] //[JsonDerivedType(typeof(v2), typeDiscriminator: "v2")]
public interface IGameModel public interface IGameModel
{ {
} }

17
KoogleApp/Games/Training/GameTrainingService.cs
View File

@ -53,17 +53,20 @@ namespace KoogleApp.Games.Training
} }
var playerId = progress.BeforeParticipantsState.PlayerIds.First(); var playerId = progress.BeforeParticipantsState.PlayerIds.First();
var gm = progress.GameModel as TrainingState;
var newModel = gm.DeepCopy();
var ts = progress.GameModel as TrainingState; var oldThrowStatistic = newModel.Throws[playerId];
var tm = ts.Throws[playerId];
ts.Throws[playerId] = tm with newModel.Throws[playerId] = oldThrowStatistic with
{ {
ThrowCount = tm.ThrowCount + 1, ThrowCount = oldThrowStatistic.ThrowCount + 1,
PinCount = tm.PinCount + progress.PinCount(), PinCount = oldThrowStatistic.PinCount + progress.PinCount(),
CircleCount = tm.CircleCount + Convert.ToInt32(progress.IsCircle()) CircleCount = oldThrowStatistic.CircleCount + Convert.ToInt32(progress.IsCircle())
}; };
var newModel = ((TrainingState)(progress.GameModel)) with { Throws = ts.Throws }; //var newModel = ((TrainingState)(progress.GameModel)) with { Throws = ts.Throws };
//res.Add(new UpdateTrainingStateAction(newModel)); //res.Add(new UpdateTrainingStateAction(newModel));
res.Add(new GameModelChanged(newModel)); res.Add(new GameModelChanged(newModel));

27
KoogleApp/Games/Training/TrainingState.cs
View File

@ -1,5 +1,6 @@
using Fluxor; using Fluxor;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using static MudBlazor.CategoryTypes;
namespace KoogleApp.Games.Training namespace KoogleApp.Games.Training
{ {
@ -26,11 +27,31 @@ namespace KoogleApp.Games.Training
} }
[FeatureState] [FeatureState]
public record TrainingState(Dictionary<int,ThrowModel> Throws) : IGameModel public record TrainingState(Dictionary<int, ThrowModel> Throws) : IGameModel
{ {
public TrainingState():this([]) public TrainingState() : this([])
{ {
} }
} }
public static class TrainingStateExtension
{
public static TrainingState DeepCopy(this TrainingState State)
{
//// Array und alle Elemente kopieren
//var itemsCopy = Throws.Select(item => item with { }).ToArray();
//return this with { Throws = itemsCopy };
// Dictionary und alle Elemente kopieren
// Dictionary und alle Values kopieren
var itemsCopy = State.Throws.ToDictionary(
kvp => kvp.Key, // Key kopieren (int ist value type)
kvp => kvp.Value with { } // Value als Record kopieren
);
return State with { Throws = itemsCopy };
}
}
} }

8
KoogleApp/Store/Game/Effects.cs
View File

@ -1,5 +1,6 @@
using Fluxor; using Fluxor;
using KoogleApp.Services; using KoogleApp.Services;
using KoogleApp.Store.Game.ThrowPanel;
namespace KoogleApp.Store.Game namespace KoogleApp.Store.Game
{ {
@ -14,7 +15,12 @@ namespace KoogleApp.Store.Game
var gameModel = current.Status.GameModel; var gameModel = current.Status.GameModel;
dispatcher.Dispatch(new GameModelChanged(gameModel)); dispatcher.Dispatch(new GameModelChanged(gameModel));
} }
}
[EffectMethod]
public async Task HandleUpdateStateAfterUndoRedo(UpdateStateAfterUndoRedo action, IDispatcher dispatcher)
{
dispatcher.Dispatch(new GameModelChanged(action.GameModel));
} }
} }
} }

2
KoogleApp/Store/Game/ThrowPanel/Actions.cs
View File

@ -39,7 +39,7 @@ namespace KoogleApp.Store.Game.ThrowPanel
public record ThrowUpdateAction(ThrowPanelState State); public record ThrowUpdateAction(ThrowPanelState State);
public record UpdateStateAfterUndoRedo(ThrowPanelState ThrowPanelState, ParticipantsState ParticipantsState); public record UpdateStateAfterUndoRedo(ThrowPanelState ThrowPanelState, ParticipantsState ParticipantsState, IGameModel GameModel);
public record EnsureBeforeThrowStatusAction(ParticipantsState ParticipantsState, IGameModel GameModel); public record EnsureBeforeThrowStatusAction(ParticipantsState ParticipantsState, IGameModel GameModel);

3
KoogleApp/Store/Game/ThrowPanel/Effects.cs
View File

@ -15,6 +15,7 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.Text.Json; using System.Text.Json;
using KoogleApp.Games.Training; using KoogleApp.Games.Training;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace KoogleApp.Store.Game.ThrowPanel namespace KoogleApp.Store.Game.ThrowPanel
{ {
@ -168,7 +169,7 @@ namespace KoogleApp.Store.Game.ThrowPanel
StartParams: dataService.StartParams, StartParams: dataService.StartParams,
GameModel: beforeStates.Status.GameModel, GameModel: beforeStates.Status.GameModel,
NextThrowState: nextState); NextThrowState: nextState);
dispatcher.Dispatch(generalGameProgress); // currently unused dispatcher.Dispatch(generalGameProgress); // currently unused
//var participants = throwAction.ParticipantsState; //var participants = throwAction.ParticipantsState;

4
KoogleApp/Store/Game/UndoRedo/Effects.cs
View File

@ -33,7 +33,7 @@ namespace KoogleApp.Store.Game.UndoRedo
if (success) if (success)
{ {
var currentData = _dataService.GetCurrentData(); var currentData = _dataService.GetCurrentData();
dispatcher.Dispatch(new UpdateStateAfterUndoRedo(currentData.Status.ThrowPanelState, currentData.Status.ParticipantsState)); dispatcher.Dispatch(new UpdateStateAfterUndoRedo(currentData.Status.ThrowPanelState, currentData.Status.ParticipantsState, currentData.Status.GameModel));
} }
dispatcher.Dispatch(new UpdateUndoRedoStateAction()); dispatcher.Dispatch(new UpdateUndoRedoStateAction());
@ -48,7 +48,7 @@ namespace KoogleApp.Store.Game.UndoRedo
if (success) if (success)
{ {
var currentData = _dataService.GetCurrentData(); var currentData = _dataService.GetCurrentData();
dispatcher.Dispatch(new UpdateStateAfterUndoRedo(currentData.Status.ThrowPanelState, currentData.Status.ParticipantsState)); dispatcher.Dispatch(new UpdateStateAfterUndoRedo(currentData.Status.ThrowPanelState, currentData.Status.ParticipantsState, currentData.Status.GameModel));
} }
dispatcher.Dispatch(new UpdateUndoRedoStateAction()); dispatcher.Dispatch(new UpdateUndoRedoStateAction());

309
KoogleApp/appdata.json Normal file
View File

@ -0,0 +1,309 @@
{
"CurrentData": {
"Status": {
"StartParams": null,
"ThrowPanelState": {
"IsStated": true,
"BellValue": false,
"Pin1State": 0,
"Pin2State": 0,
"Pin3State": 0,
"Pin4State": 0,
"Pin5State": 0,
"Pin6State": 0,
"Pin7State": 0,
"Pin8State": 0,
"Pin9State": 0,
"ThrowsPerRound": 1,
"ThrowCounterPerRound": 1,
"ThrowMode": 0,
"ThrowPanelStateStatus": 3,
"ThrowCounter": 1,
"DayId": 35
},
"ParticipantsState": {
"PlayerIds": [
3,
10,
12,
9,
5
],
"Eliminated": []
},
"GameModel": {
"$type": "TrainingState",
"Throws": {
"5": {
"PlayerId": 5,
"TeamNr": 0,
"PinCount": 1,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 1,
"BellCount": 0
},
"3": {
"PlayerId": 3,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"10": {
"PlayerId": 10,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"12": {
"PlayerId": 12,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"9": {
"PlayerId": 9,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
}
}
}
},
"Version": 3,
"LastModified": "2025-11-27T08:57:54.4108241+01:00",
"LastModifiedBy": "test1@test.de"
},
"UndoHistory": [
{
"Status": {
"StartParams": null,
"ThrowPanelState": {
"IsStated": true,
"BellValue": false,
"Pin1State": 0,
"Pin2State": 0,
"Pin3State": 0,
"Pin4State": 0,
"Pin5State": 0,
"Pin6State": 0,
"Pin7State": 0,
"Pin8State": 0,
"Pin9State": 1,
"ThrowsPerRound": 1,
"ThrowCounterPerRound": 1,
"ThrowMode": 0,
"ThrowPanelStateStatus": 2,
"ThrowCounter": 0,
"DayId": 35
},
"ParticipantsState": {
"PlayerIds": [
5,
3,
10,
12,
9
],
"Eliminated": []
},
"GameModel": {
"$type": "TrainingState",
"Throws": {
"5": {
"PlayerId": 5,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"3": {
"PlayerId": 3,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"10": {
"PlayerId": 10,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"12": {
"PlayerId": 12,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"9": {
"PlayerId": 9,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
}
}
}
},
"Version": 2,
"LastModified": "2025-11-27T08:57:54.3513899+01:00",
"LastModifiedBy": "test1@test.de"
},
{
"Status": {
"StartParams": {
"DayId": 35,
"ThrowMode": 0,
"ThrowsPerRound": 1,
"Participants": [
5,
3,
10,
12,
9
],
"ParticipantsMode": 0,
"KnownGameType": "GameTraining"
},
"ThrowPanelState": {
"IsStated": true,
"BellValue": false,
"Pin1State": 0,
"Pin2State": 0,
"Pin3State": 0,
"Pin4State": 0,
"Pin5State": 0,
"Pin6State": 0,
"Pin7State": 0,
"Pin8State": 0,
"Pin9State": 0,
"ThrowsPerRound": 1,
"ThrowCounterPerRound": 1,
"ThrowMode": 0,
"ThrowPanelStateStatus": 1,
"ThrowCounter": 0,
"DayId": 35
},
"ParticipantsState": {
"PlayerIds": [
5,
3,
10,
12,
9
],
"Eliminated": []
},
"GameModel": {
"$type": "TrainingState",
"Throws": {
"5": {
"PlayerId": 5,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"3": {
"PlayerId": 3,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"10": {
"PlayerId": 10,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"12": {
"PlayerId": 12,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
},
"9": {
"PlayerId": 9,
"TeamNr": 0,
"PinCount": 0,
"CircleCount": 0,
"SinkCount": 0,
"StrikeCount": 0,
"ClearedCount": 0,
"ThrowCount": 0,
"BellCount": 0
}
}
}
},
"Version": 1,
"LastModified": "2025-11-27T07:56:55.6527668Z",
"LastModifiedBy": "test1@test.de"
}
],
"RedoHistory": []
}