Implemented saving DifficultyPlayedArray

GameDatabase/Entities/UserDatum.cs

@@ -17,6 +17,8 @@ namespace GameDatabase.Entities
 		public int NotesPosition { get; set; }
 		public bool IsVoiceOn { get; set; }
 		public bool IsSkipOn { get; set; }
+		public string DifficultyPlayedArray { get; set; } = "[]";
+		public string DifficultySettingArray { get; set; } = "[]";
 		public uint SelectedToneId { get; set; }
 		public DateTime LastPlayDatetime { get; set; }
 		public uint LastPlayMode { get; set; }

GameDatabase/Migrations/20230918052543_AddDifficultyPlayedArrayAndDifficultySettingArrayToUserData.Designer.cs

@@ -0,0 +1,451 @@
+// <auto-generated />
+using System;
+using GameDatabase.Context;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace TaikoLocalServer.Migrations
+{
+    [DbContext(typeof(TaikoDbContext))]
+    [Migration("20230918052543_AddDifficultyPlayedArrayAndDifficultySettingArrayToUserData")]
+    partial class AddDifficultyPlayedArrayAndDifficultySettingArrayToUserData
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.0-rc.1.22426.7");
+
+            modelBuilder.Entity("GameDatabase.Entities.AiScoreDatum", b =>
+                {
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Difficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsWin")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "SongId", "Difficulty");
+
+                    b.ToTable("AiScoreData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.AiSectionScoreDatum", b =>
+                {
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Difficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Crown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DrumrollCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("GoodCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsWin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("MissCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("OkCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Score")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "SongId", "Difficulty", "SectionIndex");
+
+                    b.ToTable("AiSectionScoreData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.Card", b =>
+                {
+                    b.Property<string>("AccessCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("AccessCode");
+
+                    b.HasIndex(new[] { "Baid" }, "IX_Card_Baid")
+                        .IsUnique();
+
+                    b.ToTable("Card", (string)null);
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.DanScoreDatum", b =>
+                {
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DanId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ArrivalSongCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ClearState")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0u);
+
+                    b.Property<uint>("ComboCountTotal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SoulGaugeTotal")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "DanId");
+
+                    b.ToTable("DanScoreData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.DanStageScoreDatum", b =>
+                {
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DanId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BadCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ComboCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DrumrollCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("GoodCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("HighScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("OkCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("PlayScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("TotalHitCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "DanId", "SongNumber");
+
+                    b.ToTable("DanStageScoreData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.SongBestDatum", b =>
+                {
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Difficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestCrown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("BestScoreRank")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Baid", "SongId", "Difficulty");
+
+                    b.ToTable("SongBestData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.SongPlayDatum", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ComboCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Crown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Difficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("DrumrollCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("GoodCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("HitCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("MissCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("OkCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("PlayTime")
+                        .HasColumnType("datetime");
+
+                    b.Property<uint>("Score")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ScoreRank")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ScoreRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Skipped")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SongNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Baid");
+
+                    b.ToTable("SongPlayData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.UserDatum", b =>
+                {
+                    b.Property<ulong>("Baid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("AchievementDisplayDifficulty")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("AiWinCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ColorBody")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ColorFace")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("ColorLimb")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CostumeData")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CostumeFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DifficultyPlayedArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DifficultySettingArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("DisplayAchievement")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayDan")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FavoriteSongsArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GenericInfoFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsSkipOn")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVoiceOn")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastPlayDatetime")
+                        .HasColumnType("datetime");
+
+                    b.Property<uint>("LastPlayMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("MyDonName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("NotesPosition")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<short>("OptionSetting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("SelectedToneId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TitleFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("TitlePlateId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TokenCountDict")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ToneFlgArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnlockedSongIdList")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Baid");
+
+                    b.ToTable("UserData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.AiScoreDatum", b =>
+                {
+                    b.HasOne("GameDatabase.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.AiSectionScoreDatum", b =>
+                {
+                    b.HasOne("GameDatabase.Entities.AiScoreDatum", "Parent")
+                        .WithMany("AiSectionScoreData")
+                        .HasForeignKey("Baid", "SongId", "Difficulty")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Parent");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.DanScoreDatum", b =>
+                {
+                    b.HasOne("GameDatabase.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.DanStageScoreDatum", b =>
+                {
+                    b.HasOne("GameDatabase.Entities.DanScoreDatum", "Parent")
+                        .WithMany("DanStageScoreData")
+                        .HasForeignKey("Baid", "DanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Parent");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.SongBestDatum", b =>
+                {
+                    b.HasOne("GameDatabase.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.SongPlayDatum", b =>
+                {
+                    b.HasOne("GameDatabase.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.UserDatum", b =>
+                {
+                    b.HasOne("GameDatabase.Entities.Card", "Ba")
+                        .WithMany()
+                        .HasForeignKey("Baid")
+                        .HasPrincipalKey("Baid")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ba");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.AiScoreDatum", b =>
+                {
+                    b.Navigation("AiSectionScoreData");
+                });
+
+            modelBuilder.Entity("GameDatabase.Entities.DanScoreDatum", b =>
+                {
+                    b.Navigation("DanStageScoreData");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

GameDatabase/Migrations/20230918052543_AddDifficultyPlayedArrayAndDifficultySettingArrayToUserData.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TaikoLocalServer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddDifficultyPlayedArrayAndDifficultySettingArrayToUserData : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DifficultyPlayedArray",
+                table: "UserData",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: "[]");
+
+            migrationBuilder.AddColumn<string>(
+                name: "DifficultySettingArray",
+                table: "UserData",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: "[]");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DifficultyPlayedArray",
+                table: "UserData");
+
+            migrationBuilder.DropColumn(
+                name: "DifficultySettingArray",
+                table: "UserData");
+        }
+    }
+}

GameDatabase/Migrations/TaikoDbContextModelSnapshot.cs

@@ -276,6 +276,14 @@ namespace TaikoLocalServer.Migrations
                         .IsRequired()
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("DifficultyPlayedArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DifficultySettingArray")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
                     b.Property<bool>("DisplayAchievement")
                         .HasColumnType("INTEGER");
 

TaikoLocalServer/Controllers/Game/PlayResultController.cs

@@ -203,16 +203,17 @@ public class PlayResultController : BaseController<PlayResultController>
         };
         userdata.CostumeData = JsonSerializer.Serialize(costumeData);
 
+        // Skip user setting altogether following official logic
         // Skip user setting saving when in dan mode as dan mode uses its own default setting
-        if (playMode != PlayMode.DanMode)
+        // if (playMode != PlayMode.DanMode)
-        {
+        // {
-            var lastStage = playResultData.AryStageInfoes.Last();
+        //     var lastStage = playResultData.AryStageInfoes.Last();
-            var option = BinaryPrimitives.ReadInt16LittleEndian(lastStage.OptionFlg);
+        //     var option = BinaryPrimitives.ReadInt16LittleEndian(lastStage.OptionFlg);
-            userdata.OptionSetting = option;
+        //     userdata.OptionSetting = option;
-            userdata.IsSkipOn = lastStage.IsSkipOn;
+        //     userdata.IsSkipOn = lastStage.IsSkipOn;
-            userdata.IsVoiceOn = !lastStage.IsVoiceOn;
+        //     userdata.IsVoiceOn = !lastStage.IsVoiceOn;
-            userdata.NotesPosition = lastStage.NotesPosition;
+        //     userdata.NotesPosition = lastStage.NotesPosition;
-        }
+        // }
 
         userdata.LastPlayDatetime = lastPlayDatetime;
         userdata.LastPlayMode = playResultData.PlayMode;
@@ -236,6 +237,14 @@ public class PlayResultController : BaseController<PlayResultController>
         userdata.GenericInfoFlgArray =
             UpdateJsonUintFlagArray(userdata.GenericInfoFlgArray, playResultData.GetGenericInfoNoes, nameof(userdata.GenericInfoFlgArray));
 
+        var difficultyPlayedArray = new List<uint>
+        {
+            playResultData.DifficultyPlayedCourse,
+            playResultData.DifficultyPlayedStar,
+            playResultData.DifficultyPlayedSort
+        };
+        userdata.DifficultyPlayedArray = JsonSerializer.Serialize(difficultyPlayedArray);
+        
         userdata.AiWinCount += playResultData.AryStageInfoes.Count(data => data.IsWin);
         await userDatumService.UpdateUserDatum(userdata);
     }

TaikoLocalServer/Controllers/Game/UserDataController.cs

@@ -110,7 +110,27 @@ public class UserDataController : BaseController<UserDataController>
 
         var defaultOptions = new byte[2];
         BinaryPrimitives.WriteInt16LittleEndian(defaultOptions, userData.OptionSetting);
+
+        var difficultyPlayedArray = Array.Empty<uint>();
+        try
+        {
+            difficultyPlayedArray = JsonSerializer.Deserialize<uint[]>(userData.DifficultyPlayedArray);
+        }
+        catch (JsonException e)
+        {
+            Logger.LogError(e, "Parsing difficulty played json data failed");
+        }
         
+        var difficultySettingArray = Array.Empty<uint>();
+        try
+        {
+            difficultySettingArray = JsonSerializer.Deserialize<uint[]>(userData.DifficultySettingArray);
+        }
+        catch (JsonException e)
+        {
+            Logger.LogError(e, "Parsing difficulty setting json data failed");
+        }
+
         var response = new UserDataResponse
         {
             Result = 1,
@@ -128,6 +148,20 @@ public class UserDataController : BaseController<UserDataController>
             SongRecentCnt = (uint)recentSongs.Length
         };
 
+        if (difficultyPlayedArray is { Length: >= 3 })
+        {
+            response.DifficultyPlayedCourse = difficultyPlayedArray[0];
+            response.DifficultyPlayedStar = difficultyPlayedArray[1];
+            response.DifficultyPlayedSort = difficultyPlayedArray[2];
+        }
+        
+        if (difficultySettingArray is { Length: >= 3 })
+        {
+            response.DifficultySettingCourse = difficultySettingArray[0];
+            response.DifficultySettingStar = difficultySettingArray[1];
+            response.DifficultySettingSort = difficultySettingArray[2];
+        }
+
         return Ok(response);
     }
 }