1
0
mirror of synced 2024-11-30 17:04:28 +01:00

Add experimental online matching

This commit is contained in:
asesidaa 2022-08-01 16:27:57 +08:00
parent 16d8c25ea0
commit 1de4d8c406
6 changed files with 168 additions and 23 deletions

View File

@ -128,6 +128,8 @@ public static class Configs
public const string ONLINE_MATCHING_XPATH = $"{ROOT_XPATH}/online_matching/record"; public const string ONLINE_MATCHING_XPATH = $"{ROOT_XPATH}/online_matching/record";
public const string ONLINE_BATTLE_RESULT_XPATH = $"{ROOT_XPATH}/online_battle_result";
public const int FIRST_CONFIG_PCOL1 = 0; public const int FIRST_CONFIG_PCOL1 = 0;
public const int SECOND_CONFIG_PCOL1 = 1; public const int SECOND_CONFIG_PCOL1 = 1;
public const int CONFIG_PCOL2 = 0; public const int CONFIG_PCOL2 = 0;

View File

@ -1,4 +1,5 @@
using System.Net.Mime; using System.Collections.Concurrent;
using System.Net.Mime;
using System.Text; using System.Text;
using System.Xml.Linq; using System.Xml.Linq;
using ChoETL; using ChoETL;
@ -18,7 +19,7 @@ public class CardServiceController : WebApiController
private readonly SQLiteConnection cardSqLiteConnection; private readonly SQLiteConnection cardSqLiteConnection;
private readonly SQLiteConnection musicSqLiteConnection; private readonly SQLiteConnection musicSqLiteConnection;
private static Dictionary<long, OnlineMatchingEntry> OnlineMatchingEntries = new(); private static readonly ConcurrentDictionary<long, OnlineMatchingEntry> OnlineMatchingEntries = new();
public CardServiceController() public CardServiceController()
{ {
@ -227,6 +228,17 @@ public class CardServiceController : WebApiController
return ConstructResponse(StartOnlineMatching(cardId, xmlData)); return ConstructResponse(StartOnlineMatching(cardId, xmlData));
} }
case CardRequestType.UpdateOnlineMatching:
{
$"Update Online Matching, data is {xmlData}".Info();
return ConstructResponse(UpdateOnlineMatching(cardId, xmlData));
}
case CardRequestType.UploadOnlineMatchingResult:
{
$"Get Online Matching result, data is {xmlData}".Info();
return ConstructResponse(UploadOnlineMatchingResult(cardId, xmlData));
}
#endregion #endregion
default: default:
@ -606,28 +618,13 @@ public class CardServiceController : WebApiController
var reader = new ChoXmlReader<OnlineMatchingEntry>(new StringReader(xmlData)).WithXPath(Configs.DATA_XPATH); var reader = new ChoXmlReader<OnlineMatchingEntry>(new StringReader(xmlData)).WithXPath(Configs.DATA_XPATH);
var entry = reader.Read(); var entry = reader.Read();
/*var fake = entry.CopyPropertiesToNew<OnlineMatchingEntry>();
fake.MachineId--;
fake.MatchingId = 0xB16B00B5;
fake.EntryStart = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
fake.CardId = cardId - 1;
fake.AvatarId--;
fake.PlayerName = "FAKE";
fake.EntryNo = 0x4B1D;
fake.TitleId--;
fake.MatchingTimeout = 90;
fake.MatchingRemainingTime = 89;
fake.MatchingWaitTime = 1;
fake.Status = 1;
OnlineMatchingEntries[fake.CardId] = fake;*/
entry.CardId = cardId; entry.CardId = cardId;
entry.MatchingId = 0xB16B00B5; entry.MatchingId = 0xDEADBEEF;
entry.EntryNo = 0; entry.EntryNo = OnlineMatchingEntries.Count;
entry.EntryStart = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); entry.EntryStart = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
entry.MatchingTimeout = 90 * 1000; entry.MatchingTimeout = 10;
entry.MatchingRemainingTime = 89 * 1000; entry.MatchingRemainingTime = 3;
entry.MatchingWaitTime = 1; entry.MatchingWaitTime = 3;
entry.Status = 1; entry.Status = 1;
entry.Dump().Info(); entry.Dump().Info();
OnlineMatchingEntries[cardId] = entry; OnlineMatchingEntries[cardId] = entry;
@ -635,6 +632,56 @@ public class CardServiceController : WebApiController
return GenerateRecordsXml(OnlineMatchingEntries.Values.ToList(), Configs.ONLINE_MATCHING_XPATH); return GenerateRecordsXml(OnlineMatchingEntries.Values.ToList(), Configs.ONLINE_MATCHING_XPATH);
} }
private static string UpdateOnlineMatching(long cardId, string xmlData)
{
var reader = new ChoXmlReader<OnlineMatchingUpdateData>(new StringReader(xmlData));
var data = reader.Read();
var entry = OnlineMatchingEntries.GetValueOrDefault(cardId);
if (entry is null)
{
throw new HttpException(400,"Entry for this card id does not exist!");
}
if (data.Action != 0)
{
$"Action is {data.Action}".Info();
}
entry.MessageId = data.MessageId;
if (entry.MatchingRemainingTime <= 0)
{
entry.Status = 3;
entry.Dump().Info();
return GenerateRecordsXml(OnlineMatchingEntries.Values.ToList(), Configs.ONLINE_MATCHING_XPATH);
}
entry.MatchingRemainingTime--;
entry.Dump().Info();
return GenerateRecordsXml(OnlineMatchingEntries.Values.ToList(), Configs.ONLINE_MATCHING_XPATH);
}
private static string UploadOnlineMatchingResult(long cardId, string xmlData)
{
var reader = new ChoXmlReader<OnlineMatchingResultData>(new StringReader(xmlData));
var data = reader.Read();
var entry = OnlineMatchingEntries.GetValueOrDefault(cardId);
if (entry is null)
{
throw new HttpException(400,"Entry for this card id does not exist!");
}
if (entry.MatchingId != data.MatchingId)
{
throw new HttpException(400,"Matching Id mismatch!");
}
var result = new OnlineMatchingResult
{
Status = 1
};
return GenerateSingleXml(result, Configs.ONLINE_BATTLE_RESULT_XPATH);
}
#endregion #endregion
private enum CardRequestType private enum CardRequestType
@ -680,7 +727,9 @@ public class CardServiceController : WebApiController
WriteSoundEffect = 8969, WriteSoundEffect = 8969,
// Online matching // Online matching
StartOnlineMatching = 8705 StartOnlineMatching = 8705,
UpdateOnlineMatching = 8961,
UploadOnlineMatchingResult = 8709
} }
private enum Command private enum Command

View File

@ -73,14 +73,23 @@ public class OnlineMatchingEntry: Record
[ChoXmlElementRecordField(FieldName = "message_id")] [ChoXmlElementRecordField(FieldName = "message_id")]
public long MessageId { get; set; } public long MessageId { get; set; }
/// <summary>
/// Communication timeout?
/// </summary>
[XmlElement(ElementName = "matching_timeout")] [XmlElement(ElementName = "matching_timeout")]
[ChoXmlElementRecordField(FieldName = "matching_timeout")] [ChoXmlElementRecordField(FieldName = "matching_timeout")]
public long MatchingTimeout { get; set; } = 99; public long MatchingTimeout { get; set; } = 99;
/// <summary>
/// Wait time
/// </summary>
[XmlElement(ElementName = "matching_wait_time")] [XmlElement(ElementName = "matching_wait_time")]
[ChoXmlElementRecordField(FieldName = "matching_wait_time")] [ChoXmlElementRecordField(FieldName = "matching_wait_time")]
public long MatchingWaitTime { get; set; } = 10; public long MatchingWaitTime { get; set; } = 10;
/// <summary>
/// Seems not used
/// </summary>
[XmlElement(ElementName = "matching_remaining_time")] [XmlElement(ElementName = "matching_remaining_time")]
[ChoXmlElementRecordField(FieldName = "matching_remaining_time")] [ChoXmlElementRecordField(FieldName = "matching_remaining_time")]
public long MatchingRemainingTime { get; set; } = 89; public long MatchingRemainingTime { get; set; } = 89;

View File

@ -0,0 +1,9 @@
using System.Xml.Serialization;
namespace GCLocalServerRewrite.models;
public class OnlineMatchingResult
{
[XmlElement(ElementName = "status")]
public int Status { get; set; }
}

View File

@ -0,0 +1,56 @@
using ChoETL;
namespace GCLocalServerRewrite.models;
[ChoXmlRecordObject(XPath = "/root/data")]
public class OnlineMatchingResultData
{
[ChoXmlElementRecordField(FieldName = "event_id")]
public int EventId { get; set; }
[ChoXmlElementRecordField(FieldName = "matching_id")]
public int MatchingId { get; set; }
[ChoXmlElementRecordField(FieldName = "class_id")]
public int ClassId { get; set; }
[ChoXmlElementRecordField(FieldName = "group_id")]
public int GroupId { get; set; }
[ChoXmlElementRecordField(FieldName = "result_score")]
public int ResultScore { get; set; }
[ChoXmlElementRecordField(FieldName = "result_star")]
public int ResultStar { get; set; }
[ChoXmlElementRecordField(FieldName = "result_rank")]
public int ResultRank { get; set; }
[ChoXmlElementRecordField(FieldName = "music_id_1st")]
public int MusicIdFirst { get; set; }
[ChoXmlElementRecordField(FieldName = "music_id_2nd")]
public int MusicIdSecond { get; set; }
[ChoXmlElementRecordField(FieldName = "music_id_3rd")]
public int MusicIdThird { get; set; }
[ChoXmlElementRecordField(FieldName = "difficulty_lv_1st")]
public int DifficultyFirst { get; set; }
[ChoXmlElementRecordField(FieldName = "difficulty_lv_2nd")]
public int DifficultySecond { get; set; }
[ChoXmlElementRecordField(FieldName = "difficulty_lv_3rd")]
public int DifficultyThird { get; set; }
[ChoXmlElementRecordField(FieldName = "item_id_1st")]
public int ItemIdFirst { get; set; }
[ChoXmlElementRecordField(FieldName = "item_id_2nd")]
public int ItemIdSecond { get; set; }
[ChoXmlElementRecordField(FieldName = "item_id_3rd")]
public int ItemIdThird { get; set; }
}

View File

@ -0,0 +1,20 @@
using ChoETL;
namespace GCLocalServerRewrite.models;
[ChoXmlRecordObject(XPath = "/root/data")]
// ReSharper disable once ClassNeverInstantiated.Global
public class OnlineMatchingUpdateData
{
[ChoXmlElementRecordField(FieldName = "action")]
public long Action { get; set; }
[ChoXmlElementRecordField(FieldName = "event_id")]
public long EventId { get; set; }
[ChoXmlElementRecordField(FieldName = "matching_id")]
public long MatchingId { get; set; }
[ChoXmlElementRecordField(FieldName = "message_id")]
public long MessageId { get; set; }
}