REDCODE changes
This commit is contained in:
@@ -3,26 +3,26 @@
|
||||
<PropertyGroup>
|
||||
<AssemblyName>2DGAMELIB</AssemblyName>
|
||||
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
|
||||
<UseWindowsForms>True</UseWindowsForms>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<Platforms>AnyCPU</Platforms>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<LangVersion>9.0</LangVersion>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
|
||||
<GenerateResourceWarnOnBinaryFormatterUse>false</GenerateResourceWarnOnBinaryFormatterUse>
|
||||
<NoWarn>SYSLIB0011;CA1416</NoWarn>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<RootNamespace />
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="glfw-net" Version="3.3.1" />
|
||||
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Silk.NET.OpenGL" Version="2.22.0" />
|
||||
<PackageReference Include="System.Collections" Version="4.3.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="5.0.3" />
|
||||
<PackageReference Include="System.Resources.Extensions" Version="7.0.1" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
|
||||
<PackageReference Include="System.Resources.Extensions" Version="8.0.0">
|
||||
<NoWarn>NU1603</NoWarn>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -2,7 +2,6 @@ using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using static System.Net.Mime.MediaTypeNames;
|
||||
|
||||
namespace _2DGAMELIB
|
||||
{
|
||||
|
||||
@@ -2,7 +2,10 @@
|
||||
"profiles": {
|
||||
"SlaveMatrix": {
|
||||
"commandName": "Project",
|
||||
"workingDirectory": "$(SolutionDir)\\game_folder"
|
||||
"workingDirectory": "../game_folder",
|
||||
"environmentVariables": {
|
||||
"DOTNET_SYSTEM_GLOBALIZATION_INVARIANT": "true"
|
||||
}
|
||||
},
|
||||
"WSL": {
|
||||
"commandName": "WSL2",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<AssemblyName>SlaveMatrix</AssemblyName>
|
||||
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
@@ -14,10 +14,17 @@
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>app.ico</ApplicationIcon>
|
||||
<RootNamespace />
|
||||
<InvariantGlobalization>true</InvariantGlobalization>
|
||||
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
|
||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||
<NoWarn>CA1416</NoWarn>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\2DGAMELIB\2DGAMELIB.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\game_folder\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="Properties\Resources.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
|
||||
@@ -628,7 +628,7 @@ namespace SlaveMatrix
|
||||
|
||||
private static void AutoSave()
|
||||
{
|
||||
string s = Sta.SavePath + "\\0: ";
|
||||
string s = Path.Combine(Sta.SavePath, "0: ");
|
||||
foreach (string item in from e in Directory.EnumerateFiles(Sta.SavePath)
|
||||
where e.StartsWith(s)
|
||||
select e)
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using _2DGAMELIB;
|
||||
|
||||
namespace SlaveMatrix
|
||||
{
|
||||
internal static class Program
|
||||
{
|
||||
static Program()
|
||||
{
|
||||
AppContext.SetSwitch("System.Drawing.EnableUnixSupport", true);
|
||||
}
|
||||
|
||||
[STAThread]
|
||||
private static void Main(string[] A_0)
|
||||
{
|
||||
|
||||
Sta.LoadConfig();
|
||||
|
||||
double percent = 35.0;
|
||||
|
||||
@@ -880,7 +880,7 @@ namespace SlaveMatrix
|
||||
{
|
||||
//if (!EncryptSave)
|
||||
{
|
||||
GameData.SaveExMod(SavePath + "\\" + i + ": " + GameData.GetSaveDateString().Replace("/", "_") + ".sav");
|
||||
GameData.SaveExMod(Path.Combine(SavePath, i + ": " + GameData.GetSaveDateString().Replace("/", "_") + ".sav"));
|
||||
}
|
||||
/*else
|
||||
{
|
||||
@@ -1410,7 +1410,7 @@ namespace SlaveMatrix
|
||||
上着B_クロス初期化 = default(上着B_クロス情報);
|
||||
上着B_前掛け初期化 = default(上着B_前掛け情報);
|
||||
ブーツ初期化 = default(ブーツ情報);
|
||||
CurrentDirectory = Directory.GetCurrentDirectory();
|
||||
CurrentDirectory = AppContext.BaseDirectory;
|
||||
GameData = new GameState();
|
||||
SavePath = Path.Combine(CurrentDirectory, "save");
|
||||
ImiPath = Path.Combine(CurrentDirectory, "text", "Basement", "Training", "Imitation.txt");
|
||||
|
||||
@@ -2440,7 +2440,7 @@ namespace SlaveMatrix
|
||||
{
|
||||
((IDisposable)font)?.Dispose();
|
||||
}
|
||||
調教UI2.Film.DisplayLayer.Save(Path + "\\" + now.ToString("yyyy_MM_dd_HH_mm_ss") + ".png", ImageFormat.Png);
|
||||
調教UI2.Film.DisplayLayer.Save(System.IO.Path.Combine(Path, now.ToString("yyyy_MM_dd_HH_mm_ss") + ".png"), ImageFormat.Png);
|
||||
ip.SubInfoIm = GameText.撮影しました + "\r\n" + GameText.写真はPhotoフォルダに保存されます;
|
||||
if (Sta.GameData.TrainingTarget.Trained && !調教UI2.Cha.Body.Is拘束 && 調教UI2.Cha.Body.Is腕人 && !Sta.GameData.TrainingTarget.ChaD.撮影ピース経験)
|
||||
{
|
||||
|
||||
5
SlaveMatrix/runtimeconfig.template.json
Normal file
5
SlaveMatrix/runtimeconfig.template.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"configProperties": {
|
||||
"System.Drawing.EnableUnixSupport": true
|
||||
}
|
||||
}
|
||||
7
global.json
Normal file
7
global.json
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"sdk": {
|
||||
"version": "8.0.0",
|
||||
"rollForward": "latestMajor",
|
||||
"allowPrerelease": true
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user