Skip to content

Commit fc24227

Browse files
author
Awbugl
committed
Update Code
1 parent 20e2b6a commit fc24227

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+926
-586
lines changed

‎Data/Json/Arcaea/ArcaeaLimitedApi/Partner.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/ResponseRoot.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/SongListContent.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Data/Json/Arcaea/Songlist/DifficultiesItem.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Data/Json/Arcaea/Songlist/SongsItem.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Data/Json/Arcaea/Songlist/TitleLocalized.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎ImageGenerator.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<AssemblyName>ImageGenerator</AssemblyName>
88
<RootNamespace>ImageGenerator</RootNamespace>
99
<OutputType>Exe</OutputType>
10+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1011
</PropertyGroup>
1112

1213
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -21,8 +22,8 @@
2122
</PropertyGroup>
2223

2324
<ItemGroup>
24-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
25-
<PackageReference Include="System.Drawing.Common" Version="5.0.3" />
25+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
26+
<PackageReference Include="System.Drawing.Common" Version="5.0.3"/>
2627
</ItemGroup>
2728

2829
</Project>

‎ImgVersion.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace ImageGenerator;
2+
3+
internal enum ImgVersion
4+
{
5+
ImgV1 = 0,
6+
ImgV2,
7+
ImgV3,
8+
ImgV4
9+
}

‎Data/Json/Arcaea/ArcaeaLimitedApi/Best30.cs renamed to ‎Json/ArcaeaLimited/Best30.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaLimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaLimited;
46

57
[Serializable]
68
public class Best30

‎Json/ArcaeaLimited/Partner.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Newtonsoft.Json;
2+
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaLimited;
6+
7+
[Serializable]
8+
public class Partner
9+
{
10+
[JsonProperty("partner_id")] public int PartnerID { get; set; }
11+
[JsonProperty("is_awakened")] public bool IsAwakened { get; set; }
12+
}

‎Data/Json/Arcaea/ArcaeaLimitedApi/RecordDataItem.cs renamed to ‎Json/ArcaeaLimited/RecordDataItem.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaLimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaLimited;
46

57
[Serializable]
68
public class RecordDataItem
79
{
8-
[JsonProperty("song_id")] public string SongId { get; set; }
10+
[JsonProperty("song_id")] public string SongID { get; set; }
911
[JsonProperty("difficulty")] public sbyte Difficulty { get; set; }
10-
[JsonProperty("score")] public string Score { get; set; }
12+
[JsonProperty("score")] public int Score { get; set; }
1113
[JsonProperty("shiny_pure_count")] public string ShinyPureCount { get; set; }
1214
[JsonProperty("pure_count")] public string PureCount { get; set; }
1315
[JsonProperty("far_count")] public string FarCount { get; set; }

‎Data/Json/Arcaea/ArcaeaLimitedApi/ScoreinfoData.cs renamed to ‎Json/ArcaeaLimited/ScoreinfoData.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaLimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaLimited;
46

57
[Serializable]
68
public class ScoreinfoData

‎Data/Json/Arcaea/ArcaeaLimitedApi/UserinfoData.cs renamed to ‎Json/ArcaeaLimited/UserinfoData.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaLimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaLimited;
46

57
[Serializable]
68
public class UserinfoData

‎Data/Json/Arcaea/ArcaeaLimitedApi/UserinfoDataItem.cs renamed to ‎Json/ArcaeaLimited/UserinfoDataItem.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaLimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaLimited;
46

57
[Serializable]
68
public class UserinfoDataItem

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/AccountInfo.cs renamed to ‎Json/ArcaeaUnlimited/AccountInfo.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaUnlimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaUnlimited;
46

57
public class AccountInfo
68
{

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/ArcSongdata.cs renamed to ‎Json/ArcaeaUnlimited/ArcSongdata.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaUnlimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaUnlimited;
46

57
public class ArcSongdata
68
{
7-
[JsonProperty("song_id")] public string SongId { get; set; }
9+
[JsonProperty("song_id")] public string SongID { get; set; }
810

911
[JsonProperty("difficulty")] public sbyte Difficulty { get; set; }
1012

11-
[JsonProperty("score")] public string Score { get; set; }
13+
[JsonProperty("score")] public int Score { get; set; }
1214

1315
[JsonProperty("shiny_perfect_count")] public string MaxPure { get; set; }
1416

‎Json/ArcaeaUnlimited/ResponseRoot.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using Newtonsoft.Json;
2+
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaUnlimited;
6+
7+
public class ResponseRoot
8+
{
9+
[JsonProperty("status")] public int Status { get; set; }
10+
11+
[JsonProperty("message")] public string Message { get; set; }
12+
13+
[JsonProperty("content")] public dynamic Content { get; set; }
14+
15+
internal T DeserializeContent<T>() => JsonConvert.DeserializeObject<T>(Content.ToString());
16+
}

‎Json/ArcaeaUnlimited/SongListContent.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using ImageGenerator.Model;
2+
using Newtonsoft.Json;
3+
4+
#pragma warning disable CS8618
5+
6+
namespace ImageGenerator.Json.ArcaeaUnlimited;
7+
8+
public class SongListContent
9+
{
10+
[JsonProperty("songs")] public List<SongsItem> Songs { get; set; }
11+
}
12+
13+
public class SongsItem
14+
{
15+
[JsonProperty("song_id")] public string SongID { get; set; }
16+
[JsonProperty("difficulties")] public ArcaeaSong Difficulties { get; set; }
17+
[JsonProperty("alias")] public List<string> Alias { get; set; }
18+
}

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/TooManySongsContent.cs renamed to ‎Json/ArcaeaUnlimited/TooManySongsContent.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaUnlimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaUnlimited;
46

57
public class TooManySongsContent
68
{

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/UserBestContent.cs renamed to ‎Json/ArcaeaUnlimited/UserBestContent.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaUnlimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaUnlimited;
46

57
public class UserBestContent
68
{

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/UserBest30Content.cs renamed to ‎Json/ArcaeaUnlimited/UserBestsContent.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaUnlimitedApi;
3+
#pragma warning disable CS8618
44

5-
public class UserBest30Content
5+
namespace ImageGenerator.Json.ArcaeaUnlimited;
6+
7+
public class UserBestsContent
68
{
79
[JsonProperty("best30_avg")] public double Best30Avg { get; set; }
810
[JsonProperty("recent10_avg")] public double Recent10Avg { get; set; }
911
[JsonProperty("account_info")] public AccountInfo AccountInfo { get; set; }
1012
[JsonProperty("best30_list")] public List<ArcSongdata> Best30List { get; set; }
13+
[JsonProperty("best30_overflow")] public List<ArcSongdata>? OverflowList { get; set; }
1114
}

‎Data/Json/Arcaea/ArcaeaUnlimitedApi/UserInfoContent.cs renamed to ‎Json/ArcaeaUnlimited/UserInfoContent.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using Newtonsoft.Json;
22

3-
namespace ImageGenerator.Data.Json.Arcaea.ArcaeaUnlimitedApi;
3+
#pragma warning disable CS8618
4+
5+
namespace ImageGenerator.Json.ArcaeaUnlimited;
46

57
public class UserInfoContent
68
{

‎Data/Json/Arcaea/PartnerPosInfoBase/PartnerPosInfoBase.cs renamed to ‎Json/PartnerPosInfoBase/PartnerPosInfoBase.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System.Collections.Concurrent;
2-
using ImageGenerator.Model;
32
using Newtonsoft.Json;
43

5-
namespace ImageGenerator.Data.Json.Arcaea.PartnerPosInfoBase;
4+
namespace ImageGenerator.Json.PartnerPosInfoBase;
65

76
internal static class PartnerPosInfoBase
87
{

‎Data/Json/Arcaea/PartnerPosInfoBase/PosInfoItem.cs renamed to ‎Json/PartnerPosInfoBase/PosInfoItem.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
namespace ImageGenerator.Data.Json.Arcaea.PartnerPosInfoBase;
1+
namespace ImageGenerator.Json.PartnerPosInfoBase;
22

3+
#pragma warning disable CS8618
4+
// ReSharper disable MemberCanBeInternal
35
public class PosInfoItem
46
{
57
public string Partner { get; set; }

0 commit comments

Comments
 (0)