Compare commits
No commits in common. "trunk" and "v0.1.2" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
@ -489,5 +489,5 @@ fabric.properties
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/csharp,rider,dotnetcore
|
||||
|
||||
External/*
|
||||
!External/.gitkeep
|
||||
External
|
||||
!External/.gitkeep
|
0
External/.gitkeep
vendored
0
External/.gitkeep
vendored
150
README.md
150
README.md
@ -1,81 +1,69 @@
|
||||
# Rizu
|
||||
A Tachi score hook for maimai DX.
|
||||
|
||||
Tested versions:
|
||||
- BUDDiES
|
||||
|
||||
## Installation
|
||||
First, get the [config file](https://kamai.tachi.ac/client-file-flow/CIaa7b4d91041688189231cfc696c0754120b1790b) and
|
||||
place it in the same folder as the game executable (Sinmai.exe), then follow **only** one of three methods:
|
||||
- [BepInEx (fast)](#bepinex-fast)
|
||||
- [BepInEx](#bepinex)
|
||||
- [Hard-patching using MonoMod](#hard-patching-using-monomod)
|
||||
|
||||
### BepInEx (fast)
|
||||
- Update [segatools](https://gitea.tendokyu.moe/Dniel97/segatools/releases/latest).
|
||||
- Download [Rizu-BepInEx-v0.1.2.zip](https://gitea.tendokyu.moe/beerpsi/Rizu/releases/download/v0.1.2/Rizu-BepInEx-v0.1.2.zip).
|
||||
- Extract the zip into the base game folder (containing `Sinmai.exe`).
|
||||
- Edit `segatools.ini`, adding this entry:
|
||||
```ini
|
||||
[unity]
|
||||
targetAssembly=BepInEx\core\BepInEx.Preloader.dll
|
||||
```
|
||||
|
||||
> **Warning**
|
||||
>
|
||||
> If you have MelonLoader installed (for YuanCon ADX HID input or other mods):
|
||||
> - Grab [MLLoader-UnityMono-BepInEx5-v0.5.7.zip](https://github.com/BepInEx/BepInEx.MelonLoader.Loader/releases/download/v2.1.0/MLLoader-UnityMono-BepInEx5-v0.5.7.zip) and extract this zip into the base game folder, overwriting any conflicts. This allow BepInEx to also load MelonLoader mods.
|
||||
> - Delete `version.dll`, which is used to load MelonLoader, from the game folder.
|
||||
|
||||
### BepInEx
|
||||
#### Installing BepInEx
|
||||
- Update [segatools](https://gitea.tendokyu.moe/Dniel97/segatools/releases/latest).
|
||||
- Download [BepInEx v5.4.22](https://github.com/BepInEx/BepInEx/releases/tag/v5.4.22) (>=v5.4.23 does not work on stable segatools!).
|
||||
- Extract the `BepInEx` folder from the archive into the base game folder, ignoring other files.
|
||||
- Edit `segatools.ini`, adding this entry:
|
||||
```ini
|
||||
[unity]
|
||||
targetAssembly=BepInEx\core\BepInEx.Preloader.dll
|
||||
```
|
||||
|
||||
#### Installing the score hook
|
||||
- Download [Rizu-v0.1.2.zip](https://gitea.tendokyu.moe/beerpsi/Rizu/releases/download/v0.1.2/Rizu-v0.1.2.zip).
|
||||
- Extract it into the base game folder.
|
||||
|
||||
In the end, your game directory should look like this:
|
||||
```
|
||||
└───BepInEx
|
||||
└───plugins
|
||||
└───Rizu
|
||||
├───Rizu.dll
|
||||
└───Rizu.Core.dll
|
||||
├───Sinmai_Data
|
||||
├───Rizu.cfg
|
||||
├───Sinmai.exe
|
||||
└───segatools.ini
|
||||
```
|
||||
|
||||
> **Warning**
|
||||
>
|
||||
> If you have MelonLoader installed (for YuanCon ADX HID input or other mods):
|
||||
> - Grab [MLLoader-UnityMono-BepInEx5-v0.5.7.zip](https://github.com/BepInEx/BepInEx.MelonLoader.Loader/releases/download/v2.1.0/MLLoader-UnityMono-BepInEx5-v0.5.7.zip) and extract this zip into the base game folder, overwriting any conflicts. This allow BepInEx to also load MelonLoader mods.
|
||||
> - Delete `version.dll`, which is used to load MelonLoader, from the game folder.
|
||||
|
||||
### Hard-patching using MonoMod
|
||||
- Download [MonoMod](https://github.com/MonoMod/MonoMod/releases/latest).
|
||||
- Download `Assembly-CSharp.Rizu.mm.dll` from [releases](https://gitea.tendokyu.moe/beerpsi/Rizu/releases/latest)
|
||||
and place it in `Sinmai_Data/Managed`.
|
||||
- Run `MonoMod.exe path\to\Sinmai_Data\Managed\Assembly-CSharp.dll` in a command prompt.
|
||||
- Rename `MONOMODDED_Assembly-CSharp.dll` to `Assembly-CSharp.dll`, optionally backing up the original file.
|
||||
|
||||
## Development
|
||||
Copy these files from `Sinmai_Data/Managed` into `External`:
|
||||
- `Assembly-CSharp.dll`
|
||||
- `UnityEngine.dll`
|
||||
- `UnityEngine.CoreModule.dll`
|
||||
- `UnityEngine.JSONSerializeModule.dll`
|
||||
- `UnityEngine.UnityWebRequestModule.dll`
|
||||
|
||||
You will also need to download [MonoMod](https://github.com/MonoMod/MonoMod/releases/latest). and extract to `External`.
|
||||
|
||||
After that, the project can be restored and built normally.
|
||||
# Rizu
|
||||
A Tachi score hook for maimai DX.
|
||||
|
||||
Tested versions:
|
||||
- BUDDiES
|
||||
|
||||
## Installation
|
||||
First, get the [config file](https://kamai.tachi.ac/client-file-flow/CIaa7b4d91041688189231cfc696c0754120b1790b) and
|
||||
place it in the same folder as the game executable (Sinmai.exe), then follow **only** one of three methods:
|
||||
- [BepInEx (fast)](#bepinex-fast)
|
||||
- [BepInEx](#bepinex)
|
||||
- [Hard-patching using MonoMod](#hard-patching-using-monomod)
|
||||
|
||||
### BepInEx (fast)
|
||||
- Update [segatools](https://gitea.tendokyu.moe/Dniel97/segatools/releases/latest).
|
||||
- Download [Rizu-BepInEx-v0.1.2.zip](https://gitea.tendokyu.moe/beerpsi/Rizu/releases/download/v0.1.2/Rizu-BepInEx-v0.1.2.zip).
|
||||
- Extract the zip into the base game folder (containing `Sinmai.exe`).
|
||||
- Edit `segatools.ini`, adding this entry:
|
||||
```ini
|
||||
[unity]
|
||||
targetAssembly=BepInEx\core\BepInEx.Preloader.dll
|
||||
```
|
||||
|
||||
### BepInEx
|
||||
#### Installing BepInEx
|
||||
- Update [segatools](https://gitea.tendokyu.moe/Dniel97/segatools/releases/latest).
|
||||
- Download [BepInEx 5](https://github.com/BepInEx/BepInEx/releases/tag/v5.4.23.1).
|
||||
- Extract the `BepInEx` folder from the archive into the base game folder, ignoring other files.
|
||||
- Edit `segatools.ini`, adding this entry:
|
||||
```ini
|
||||
[unity]
|
||||
targetAssembly=BepInEx\core\BepInEx.Preloader.dll
|
||||
```
|
||||
|
||||
#### Installing the score hook
|
||||
- Download [Rizu-v0.1.2.zip](https://gitea.tendokyu.moe/beerpsi/Rizu/releases/download/v0.1.2/Rizu-v0.1.2.zip).
|
||||
- Extract it into the base game folder.
|
||||
|
||||
In the end, your game directory should look like this:
|
||||
```
|
||||
└───BepInEx
|
||||
└───plugins
|
||||
└───Rizu
|
||||
├───Rizu.dll
|
||||
└───Rizu.Core.dll
|
||||
├───Sinmai_Data
|
||||
├───Rizu.cfg
|
||||
├───Sinmai.exe
|
||||
└───segatools.ini
|
||||
```
|
||||
|
||||
### Hard-patching using MonoMod
|
||||
- Download [MonoMod](https://github.com/MonoMod/MonoMod/releases/latest).
|
||||
- Download `Assembly-CSharp.Rizu.mm.dll` from [releases](https://gitea.tendokyu.moe/beerpsi/Rizu/releases/latest)
|
||||
and place it in `Sinmai_Data/Managed`.
|
||||
- Run `MonoMod.exe path\to\Sinmai_Data\Managed\Assembly-CSharp.dll` in a command prompt.
|
||||
- Rename `MONOMODDED_Assembly-CSharp.dll` to `Assembly-CSharp.dll`, optionally backing up the original file.
|
||||
|
||||
## Development
|
||||
Copy these files from `Sinmai_Data/Managed` into `External`:
|
||||
- `Assembly-CSharp.dll`
|
||||
- `UnityEngine.dll`
|
||||
- `UnityEngine.CoreModule.dll`
|
||||
- `UnityEngine.JSONSerializeModule.dll`
|
||||
- `UnityEngine.UnityWebRequestModule.dll`
|
||||
|
||||
You will also need to download [MonoMod](https://github.com/MonoMod/MonoMod/releases/latest). and extract to `External`.
|
||||
|
||||
After that, the project can be restored and built normally.
|
||||
|
@ -20,22 +20,24 @@
|
||||
https://nuget.bepinex.dev/v3/index.json
|
||||
</RestoreAdditionalProjectSources>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BepInEx (Debug)|AnyCPU' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<OutputPath>bin\BepInEx (Debug)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BepInEx (Release)|AnyCPU' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<OutputPath>bin\BepInEx (Release)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System"/>
|
||||
|
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?><configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
@ -29,21 +29,11 @@ public class Exporter
|
||||
{
|
||||
yield break;
|
||||
}
|
||||
|
||||
|
||||
var user = Singleton<UserDataManager>.Instance.GetUserData(score.PlayerIndex);
|
||||
string import = "";
|
||||
|
||||
try
|
||||
{
|
||||
import = ScoreConversion.CreateScoreBatchManual(score);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Logger.Error(exception.ToString());
|
||||
}
|
||||
|
||||
if (import != "")
|
||||
yield return SubmitImport(import, user.Detail.AccessCode);
|
||||
var import = ScoreConversion.CreateScoreBatchManual(score);
|
||||
|
||||
yield return SubmitImport(import, user.Detail.AccessCode);
|
||||
}
|
||||
|
||||
public IEnumerator ExportDan(UserDetail userDetail)
|
||||
@ -133,10 +123,9 @@ public class Exporter
|
||||
|
||||
TachiResponse<BatchManualResponseBody> resp;
|
||||
|
||||
Logger.Debug("Received response from Tachi (Response code {1}): {0}", req.downloadHandler.text, req.responseCode);
|
||||
try
|
||||
{
|
||||
resp = JsonShim.Deserialize<TachiResponse<BatchManualResponseBody>>(req.downloadHandler.text);
|
||||
resp = JsonUtility.FromJson<TachiResponse<BatchManualResponseBody>>(req.downloadHandler.text);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@ -150,11 +139,12 @@ public class Exporter
|
||||
yield break;
|
||||
}
|
||||
|
||||
Logger.Info("{0}", resp.description);
|
||||
|
||||
var pollUrl = resp.body?.url;
|
||||
|
||||
if (string.IsNullOrEmpty(pollUrl))
|
||||
{
|
||||
Logger.Debug("Received no poll uri!");
|
||||
yield break;
|
||||
}
|
||||
|
||||
@ -180,7 +170,7 @@ public class Exporter
|
||||
|
||||
try
|
||||
{
|
||||
pollResp = JsonShim.Deserialize<TachiResponse<ImportStatusResponseBody>>(pollReq.downloadHandler.text);
|
||||
pollResp = JsonUtility.FromJson<TachiResponse<ImportStatusResponseBody>>(pollReq.downloadHandler.text);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
@ -1,39 +0,0 @@
|
||||
namespace Rizu.Core;
|
||||
|
||||
/*
|
||||
* JsonShim creates a single place that JSON APIs get called from, to avoid having to manually write precompiler directives every time.
|
||||
* Never call a JSON package directly, always call via JsonShim.
|
||||
*/
|
||||
|
||||
#if MONOMOD
|
||||
using UnityEngine;
|
||||
using System;
|
||||
#else
|
||||
using System.Text.Json;
|
||||
#endif
|
||||
|
||||
public class JsonShim
|
||||
{
|
||||
public static string Serialize(object Target)
|
||||
{
|
||||
#if MONOMOD
|
||||
return JsonUtility.ToJson(Target);
|
||||
#else
|
||||
return JsonSerializer.Serialize(Target);
|
||||
#endif
|
||||
}
|
||||
|
||||
public static T Deserialize<T>(string data)
|
||||
{
|
||||
#if MONOMOD
|
||||
return JsonUtility.FromJson<T>(data);
|
||||
#else
|
||||
return JsonSerializer.Deserialize<T>(data);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#if MONOMOD
|
||||
[AttributeUsage(AttributeTargets.Property | System.AttributeTargets.Field, AllowMultiple = false)]
|
||||
public class JsonIncludeAttribute : Attribute { }
|
||||
#endif
|
@ -1,18 +1,11 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManual
|
||||
{
|
||||
[JsonInclude]
|
||||
public BatchManualMeta meta = new();
|
||||
[JsonInclude]
|
||||
public BatchManualScore[] scores;
|
||||
[JsonInclude]
|
||||
public BatchManualScore[] scores;
|
||||
public BatchManualMatchingClass classes;
|
||||
}
|
||||
|
@ -1,14 +1,9 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualDan
|
||||
{
|
||||
[JsonInclude]
|
||||
public string dan;
|
||||
}
|
@ -1,14 +1,9 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualMatchingClass
|
||||
{
|
||||
[JsonInclude]
|
||||
public string matchingClass;
|
||||
}
|
||||
|
@ -1,18 +1,11 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualMeta
|
||||
{
|
||||
[JsonInclude]
|
||||
public string game = "maimaidx";
|
||||
[JsonInclude]
|
||||
public string playtype = "Single";
|
||||
[JsonInclude]
|
||||
public string service = "Rizu";
|
||||
}
|
||||
|
@ -1,18 +1,11 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualOptional
|
||||
{
|
||||
[JsonInclude]
|
||||
public uint fast;
|
||||
[JsonInclude]
|
||||
public uint slow;
|
||||
[JsonInclude]
|
||||
public uint maxCombo;
|
||||
}
|
||||
|
@ -1,18 +1,11 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualRankUp
|
||||
{
|
||||
[JsonInclude]
|
||||
public BatchManualMeta meta = new();
|
||||
[JsonInclude]
|
||||
public BatchManualScore[] scores;
|
||||
[JsonInclude]
|
||||
public BatchManualDan classes;
|
||||
}
|
@ -1,14 +1,9 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualResponseBody
|
||||
{
|
||||
[JsonInclude]
|
||||
public string url;
|
||||
}
|
||||
|
@ -1,28 +1,16 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualScore
|
||||
{
|
||||
[JsonInclude]
|
||||
public float percent;
|
||||
[JsonInclude]
|
||||
public string lamp;
|
||||
[JsonInclude]
|
||||
public string matchType = "songTitle";
|
||||
[JsonInclude]
|
||||
public string identifier;
|
||||
[JsonInclude]
|
||||
public string difficulty;
|
||||
[JsonInclude]
|
||||
public long timeAchieved;
|
||||
[JsonInclude]
|
||||
public BatchManualScoreJudgements judgements;
|
||||
[JsonInclude]
|
||||
public BatchManualOptional optional;
|
||||
}
|
||||
|
@ -1,22 +1,13 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class BatchManualScoreJudgements
|
||||
{
|
||||
[JsonInclude]
|
||||
public uint pcrit;
|
||||
[JsonInclude]
|
||||
public uint perfect;
|
||||
[JsonInclude]
|
||||
public uint great;
|
||||
[JsonInclude]
|
||||
public uint good;
|
||||
[JsonInclude]
|
||||
public uint miss;
|
||||
}
|
||||
|
@ -1,18 +1,11 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class ImportDocument
|
||||
{
|
||||
[JsonInclude]
|
||||
public string[] scoreIDs;
|
||||
[JsonInclude]
|
||||
public ImportErrContent[] errors;
|
||||
[JsonInclude]
|
||||
public SessionInfoReturn[] createdSessions;
|
||||
}
|
||||
|
@ -1,16 +1,10 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class ImportErrContent
|
||||
{
|
||||
[JsonInclude]
|
||||
public string type;
|
||||
[JsonInclude]
|
||||
public string message;
|
||||
}
|
@ -1,16 +1,10 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class ImportProgress
|
||||
{
|
||||
[JsonInclude]
|
||||
public string description;
|
||||
[JsonInclude]
|
||||
public int value;
|
||||
}
|
||||
|
@ -1,18 +1,11 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class ImportStatusResponseBody
|
||||
{
|
||||
[JsonInclude]
|
||||
public string importStatus;
|
||||
[JsonInclude]
|
||||
public ImportProgress progress;
|
||||
[JsonInclude]
|
||||
public ImportDocument import;
|
||||
}
|
||||
|
@ -1,16 +1,10 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class SessionInfoReturn
|
||||
{
|
||||
[JsonInclude]
|
||||
public string type;
|
||||
[JsonInclude]
|
||||
public string sessionID;
|
||||
}
|
@ -1,18 +1,11 @@
|
||||
using System;
|
||||
|
||||
#if BEPINEX // When we're building for BepInEx, the dummy JsonInclude is *not* defined, so let's cover that base.
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
|
||||
namespace Rizu.Core.Models;
|
||||
|
||||
[Serializable]
|
||||
public class TachiResponse<T>
|
||||
{
|
||||
[JsonInclude]
|
||||
public bool success;
|
||||
[JsonInclude]
|
||||
public string description;
|
||||
[JsonInclude]
|
||||
public T body;
|
||||
}
|
||||
|
@ -15,83 +15,25 @@
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<LangVersion>latest</LangVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MonoMod (Release)|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>MONOMOD;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<OutputPath>bin\MonoMod (Release)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MonoMod (Debug)|AnyCPU' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>MONOMOD;DEBUG;TRACE</DefineConstants>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<OutputPath>bin\MonoMod (Debug)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="$(DefineConstants.Contains(MONOMOD))">
|
||||
<Reference Include="UnityEngine.JSONSerializeModule">
|
||||
<HintPath>..\External\UnityEngine.JSONSerializeModule.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BepInEx (Debug)|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>BEPINEX;DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<OutputPath>bin\BepInEx (Debug)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BepInEx (Release)|AnyCPU' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>BEPINEX;TRACE</DefineConstants>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<OutputPath>bin\BepInEx (Release)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="$(DefineConstants.Contains(BEPINEX))">
|
||||
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
|
||||
</Reference>
|
||||
|
||||
<None Include="App.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="System"/>
|
||||
<Reference Include="System.Core"/>
|
||||
@ -105,6 +47,10 @@
|
||||
<HintPath>..\External\UnityEngine.CoreModule.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="UnityEngine.JSONSerializeModule">
|
||||
<HintPath>..\External\UnityEngine.JSONSerializeModule.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="UnityEngine.UnityWebRequestModule">
|
||||
<HintPath>..\External\UnityEngine.UnityWebRequestModule.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
@ -114,7 +60,6 @@
|
||||
<Compile Include="Config.cs" />
|
||||
<Compile Include="Exporter.cs" />
|
||||
<Compile Include="ForceAcceptAllCertificateHandler.cs" />
|
||||
<Compile Include="JsonShim.cs" />
|
||||
<Compile Include="Logger.cs" />
|
||||
<Compile Include="Models\BatchManual.cs" />
|
||||
<Compile Include="Models\BatchManualDan.cs" />
|
||||
|
@ -3,6 +3,7 @@ using DB;
|
||||
using MAI2.Util;
|
||||
using Manager;
|
||||
using Rizu.Core.Models;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Rizu.Core;
|
||||
|
||||
@ -88,7 +89,7 @@ public static class ScoreConversion
|
||||
score.matchType = "tachiSongID";
|
||||
}
|
||||
|
||||
return JsonShim.Serialize(new BatchManual
|
||||
return JsonUtility.ToJson(new BatchManual
|
||||
{
|
||||
meta = new BatchManualMeta(),
|
||||
scores = [score],
|
||||
@ -107,7 +108,7 @@ public static class ScoreConversion
|
||||
return null;
|
||||
}
|
||||
|
||||
return JsonShim.Serialize(new BatchManualRankUp
|
||||
return JsonUtility.ToJson(new BatchManualRankUp
|
||||
{
|
||||
meta = new BatchManualMeta(),
|
||||
scores = [],
|
||||
|
@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
|
||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||
<package id="System.Memory" version="4.5.5" targetFramework="net462" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
|
||||
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
|
||||
<package id="System.Text.Json" version="8.0.4" targetFramework="net462" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
|
||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
|
||||
</packages>
|
@ -15,11 +15,24 @@
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<LangVersion>latest</LangVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MonoMod (Debug)|AnyCPU' ">
|
||||
<OutputPath>bin\MonoMod (Debug)\</OutputPath>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MonoMod (Release)|AnyCPU' ">
|
||||
<OutputPath>bin\MonoMod (Release)\</OutputPath>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System"/>
|
||||
|
38
Rizu.sln
38
Rizu.sln
@ -8,31 +8,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rizu.BepInEx", "Rizu.BepInE
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
MonoMod (Debug)|Any CPU = MonoMod (Debug)|Any CPU
|
||||
MonoMod (Release)|Any CPU = MonoMod (Release)|Any CPU
|
||||
BepInEx (Release)|Any CPU = BepInEx (Release)|Any CPU
|
||||
BepInEx (Debug)|Any CPU = BepInEx (Debug)|Any CPU
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.MonoMod (Debug)|Any CPU.ActiveCfg = BepInEx (Debug)|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.MonoMod (Release)|Any CPU.ActiveCfg = BepInEx (Release)|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.BepInEx (Release)|Any CPU.ActiveCfg = BepInEx (Release)|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.BepInEx (Release)|Any CPU.Build.0 = BepInEx (Release)|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.BepInEx (Debug)|Any CPU.ActiveCfg = BepInEx (Debug)|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.BepInEx (Debug)|Any CPU.Build.0 = BepInEx (Debug)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.MonoMod (Debug)|Any CPU.ActiveCfg = MonoMod (Debug)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.MonoMod (Debug)|Any CPU.Build.0 = MonoMod (Debug)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.MonoMod (Release)|Any CPU.ActiveCfg = MonoMod (Release)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.MonoMod (Release)|Any CPU.Build.0 = MonoMod (Release)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.BepInEx (Release)|Any CPU.ActiveCfg = BepInEx (Release)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.BepInEx (Release)|Any CPU.Build.0 = BepInEx (Release)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.BepInEx (Debug)|Any CPU.ActiveCfg = BepInEx (Debug)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.BepInEx (Debug)|Any CPU.Build.0 = BepInEx (Debug)|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.MonoMod (Debug)|Any CPU.ActiveCfg = MonoMod (Debug)|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.MonoMod (Debug)|Any CPU.Build.0 = MonoMod (Debug)|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.MonoMod (Release)|Any CPU.ActiveCfg = MonoMod (Release)|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.MonoMod (Release)|Any CPU.Build.0 = MonoMod (Release)|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.BepInEx (Release)|Any CPU.ActiveCfg = MonoMod (Release)|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.BepInEx (Debug)|Any CPU.ActiveCfg = MonoMod (Debug)|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4241A369-1619-4450-8182-CB66F447985F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{888E076C-8A77-453F-87DC-BC0186FDBB55}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4DDF918E-7A74-4266-B56A-028D66ED336F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
Loading…
Reference in New Issue
Block a user