Skip to content
This repository was archived by the owner on Sep 2, 2023. It is now read-only.

Commit d414391

Browse files
author
Awbugl
committed
Update Code
1 parent 4c9cddd commit d414391

File tree

7 files changed

+30
-27
lines changed

7 files changed

+30
-27
lines changed

‎Andreal/Core/ImgVersion.cs‎

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

‎Andreal/Data/Json/Arcaea/PartnerPosInfoBase/PartnerPosInfoBase.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Collections.Concurrent;
22
using Andreal.Core;
3-
using Andreal.Data.Sqlite;
43

54
namespace Andreal.Data.Json.Arcaea.PartnerPosInfoBase;
65

@@ -20,17 +19,17 @@ private static Dictionary<string, Dictionary<string, PosInfoItem>> Init()
2019
return ls;
2120
}
2221

23-
internal static PosInfoItem? Get(string partner, BotUserInfo.ImgVersion imgVersion)
22+
internal static PosInfoItem? Get(string partner, ImgVersion imgVersion)
2423
{
2524
return imgVersion switch
2625
{
27-
BotUserInfo.ImgVersion.ImgV1 => Dict.Value["1"].TryGetValue(partner, out var result)
26+
ImgVersion.ImgV1 => Dict.Value["1"].TryGetValue(partner, out var result)
2827
? result
2928
: ImgV1,
30-
BotUserInfo.ImgVersion.ImgV2 => Dict.Value["2"].TryGetValue(partner, out var result)
29+
ImgVersion.ImgV2 => Dict.Value["2"].TryGetValue(partner, out var result)
3130
? result
3231
: ImgV2,
33-
BotUserInfo.ImgVersion.ImgV4 => Dict.Value["4"].TryGetValue(partner, out var result)
32+
ImgVersion.ImgV4 => Dict.Value["4"].TryGetValue(partner, out var result)
3433
? result
3534
: ImgV4,
3635
_ => null

‎Andreal/Data/Sqlite/BotUserInfo.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Concurrent;
2+
using Andreal.Core;
23
using Andreal.Utils;
34
using SQLite;
45

@@ -36,12 +37,4 @@ internal static void Set(BotUserInfo user)
3637
_list.Value.TryGetValue(uin, out var user)
3738
? user
3839
: null;
39-
40-
internal enum ImgVersion
41-
{
42-
ImgV1 = 0,
43-
ImgV2,
44-
ImgV3,
45-
ImgV4
46-
}
4740
}

‎Andreal/Executor/ArcExecutor.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private async Task<MessageChain> Bind()
5858
{
5959
var unbinduser = User ?? new BotUserInfo
6060
{
61-
Uin = Info.FromQQ, UiVersion = (BotUserInfo.ImgVersion)new Random().Next(3)
61+
Uin = Info.FromQQ, UiVersion = (ImgVersion)new Random().Next(3)
6262
};
6363

6464
unbinduser.ArcCode = 0;
@@ -81,7 +81,7 @@ private async Task<MessageChain> Bind()
8181

8282
var user = User ?? new BotUserInfo
8383
{
84-
Uin = Info.FromQQ, UiVersion = (BotUserInfo.ImgVersion)new Random().Next(3)
84+
Uin = Info.FromQQ, UiVersion = (ImgVersion)new Random().Next(3)
8585
};
8686

8787
user.ArcCode = content.AccountInfo.Code;
@@ -389,10 +389,10 @@ private MessageChain UiConfig()
389389
string imgversion;
390390
(User.UiVersion, imgversion) = version switch
391391
{
392-
2 => (BotUserInfo.ImgVersion.ImgV2, "ImgV2"),
393-
3 => (BotUserInfo.ImgVersion.ImgV3, "ImgV3"),
394-
4 => (BotUserInfo.ImgVersion.ImgV4, "ImgV4"),
395-
_ => (BotUserInfo.ImgVersion.ImgV1, "ImgV1")
392+
2 => (ImgVersion.ImgV2, "ImgV2"),
393+
3 => (ImgVersion.ImgV3, "ImgV3"),
394+
4 => (ImgVersion.ImgV4, "ImgV4"),
395+
_ => (ImgVersion.ImgV1, "ImgV1")
396396
};
397397
BotUserInfo.Set(User);
398398
return $"Arc查分显示样式已更改为{imgversion}。";

‎Andreal/Model/Arcaea/PlayerInfo.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Andreal.Data.Json.Arcaea.ArcaeaLimited;
1+
using Andreal.Core;
2+
using Andreal.Data.Json.Arcaea.ArcaeaLimited;
23
using Andreal.Data.Sqlite;
34

45
namespace Andreal.Model.Arcaea;
@@ -42,7 +43,7 @@ public PlayerInfo(Data.Json.Arcaea.ArcaeaUnlimited.AccountInfo accountInfo, BotU
4243
? _playerCode
4344
: "xxxxxxxxx";
4445

45-
internal BotUserInfo.ImgVersion ImgVersion { get; }
46+
internal ImgVersion ImgVersion { get; }
4647

4748
internal int Partner { get; }
4849

‎Andreal/Model/Arcaea/RecordData.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Andreal.Data.Api;
1+
using Andreal.Core;
2+
using Andreal.Data.Api;
23
using Andreal.Data.Json.Arcaea.ArcaeaUnlimited;
34
using Andreal.Data.Sqlite;
45
using Andreal.Message;
@@ -30,9 +31,9 @@ internal async Task<MessageChain> GetResult()
3031

3132
switch (UserInfo.UiVersion)
3233
{
33-
case BotUserInfo.ImgVersion.ImgV1: return await imageGenerator.Version1();
34-
case BotUserInfo.ImgVersion.ImgV3: return await imageGenerator.Version3();
35-
case BotUserInfo.ImgVersion.ImgV4:
34+
case ImgVersion.ImgV1: return await imageGenerator.Version1();
35+
case ImgVersion.ImgV3: return await imageGenerator.Version3();
36+
case ImgVersion.ImgV4:
3637
{
3738
var b30data = await ArcaeaUnlimitedApi.UserBest30(UserInfo.ArcCode);
3839
return b30data!.Status != 0

‎Andreal/UI/Model/PartnerModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Drawing;
2+
using Andreal.Core;
23
using Andreal.Data.Json.Arcaea.PartnerPosInfoBase;
3-
using Andreal.Data.Sqlite;
44
using Path = Andreal.Core.Path;
55

66
namespace Andreal.UI.Model;
@@ -11,7 +11,7 @@ internal class PartnerModel : IGraphicsModel
1111
{
1212
private readonly ImageModel _imageModel;
1313

14-
internal PartnerModel(int partner, bool awakened, BotUserInfo.ImgVersion imgVersion)
14+
internal PartnerModel(int partner, bool awakened, ImgVersion imgVersion)
1515
{
1616
var location = PartnerPosInfoBase.Get($"{partner}{(awakened ? "u" : "")}", imgVersion)!;
1717
_imageModel = new(Path.ArcaeaPartner(partner, awakened).Result, location.PositionX, location.PositionY,

0 commit comments

Comments
 (0)