Taiko_Stuff/TaikoLocalServer
1
0
Fork 0
mirror of synced 2025-02-25 22:38:09 +01:00
Code Releases Activity

Update dan score update logic

Browse Source
This commit is contained in:
asesidaa 2022-09-08 00:35:23 +08:00
parent 32191187fe
commit 743af36752
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TaikoLocalServer/Common/Utils/ObjectMappers.cs
View File

@ -9,8 +9,6 @@ public static class ObjectMappers
public static readonly IObjectMap<DanStageScoreDatum, DanScoreDataStage> DanStageDbToResponseMap; public static readonly IObjectMap<DanStageScoreDatum, DanScoreDataStage> DanStageDbToResponseMap;
public static readonly IObjectMap<DanScoreDataStage, DanStageScoreDatum> DanStageResponseToDbMap;
static ObjectMappers() static ObjectMappers()
{ {
var mapper = new ObjectMapper(); var mapper = new ObjectMapper();
@ -23,15 +21,5 @@ public static class ObjectMappers
.Add(t => t.PoundCnt, s => s.DrumrollCount) .Add(t => t.PoundCnt, s => s.DrumrollCount)
.Add(t => t.PlayScore, s => s.PlayScore) .Add(t => t.PlayScore, s => s.PlayScore)
.Add(t => t.HighScore, s => s.HighScore); .Add(t => t.HighScore, s => s.HighScore);
DanStageResponseToDbMap = mapper.AddMap<DanScoreDataStage, DanStageScoreDatum>()
.Add(t => t.ComboCount, s => s.ComboCnt)
.Add(t => t.GoodCount, s => s.GoodCnt)
.Add(t => t.OkCount, s => s.OkCnt)
.Add(t => t.BadCount, s => s.NgCnt)
.Add(t => t.TotalHitCount, s => s.HitCnt)
.Add(t => t.DrumrollCount, s => s.PoundCnt)
.Add(t => t.PlayScore, s => s.PlayScore)
.Add(t => t.HighScore, s => s.HighScore);
} }
} }

24
TaikoLocalServer/Controllers/Game/PlayResultController.cs
View File

@ -79,10 +79,10 @@ public class PlayResultController : BaseController<PlayResultController>
danScoreData = danScoreDataQuery.First(); danScoreData = danScoreDataQuery.First();
insert = false; insert = false;
} }
danScoreData.ClearState = (DanClearState)playResultDataRequest.DanResult; danScoreData.ClearState = (DanClearState)Math.Max(playResultDataRequest.DanResult, (uint)danScoreData.ClearState);
danScoreData.ArrivalSongCount = (uint)playResultDataRequest.AryStageInfoes.Count; danScoreData.ArrivalSongCount = Math.Max((uint)playResultDataRequest.AryStageInfoes.Count, danScoreData.ArrivalSongCount);
danScoreData.ComboCountTotal = playResultDataRequest.ComboCntTotal; danScoreData.ComboCountTotal = Math.Max(playResultDataRequest.ComboCntTotal, danScoreData.ComboCountTotal);
danScoreData.SoulGaugeTotal = playResultDataRequest.SoulGaugeTotal; danScoreData.SoulGaugeTotal = Math.Max(playResultDataRequest.SoulGaugeTotal, danScoreData.SoulGaugeTotal);
UpdateDanStageData(playResultDataRequest, danScoreData); UpdateDanStageData(playResultDataRequest, danScoreData);
@ -112,23 +112,21 @@ public class PlayResultController : BaseController<PlayResultController>
add = false; add = false;
} }
// FIXME: Add proper logic for high score update danStageData.HighScore = Math.Max(danStageData.HighScore, stageData.PlayScore);
if (danStageData.HighScore >= stageData.PlayScore) danStageData.ComboCount = Math.Max(danStageData.ComboCount, stageData.ComboCnt);
{ danStageData.DrumrollCount = Math.Max(danStageData.DrumrollCount, stageData.PoundCnt);
continue; danStageData.GoodCount = Math.Max(danStageData.GoodCount, stageData.GoodCnt);
} danStageData.TotalHitCount = Math.Max(danStageData.TotalHitCount, stageData.HitCnt);
danStageData.OkCount = Math.Min(danStageData.OkCount, stageData.OkCnt);
ObjectMappers.DanStageResponseToDbMap.Apply(stageData, danStageData); danStageData.BadCount = Math.Min(danStageData.BadCount, stageData.NgCnt);
if (add) if (add)
{ {
context.DanStageScoreData.Add(danStageData); context.DanStageScoreData.Add(danStageData);
// danScoreData.DanStageScoreData.Add(danStageData);
continue; continue;
} }
context.DanStageScoreData.Update(danStageData); context.DanStageScoreData.Update(danStageData);
// danScoreData.DanStageScoreData[songNumber] = danStageData;
} }
} }