diff --git a/COM3D2.LiveLink.sln b/COM3D2.LiveLink.sln
index 257c6ce..af938ac 100644
--- a/COM3D2.LiveLink.sln
+++ b/COM3D2.LiveLink.sln
@@ -14,9 +14,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiveLink.Tests", "LiveLink.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiveLink.CLI", "LiveLink.CLI\LiveLink.CLI.csproj", "{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CM3D2.Serialization", "..\CM3D2.Serialization\CM3D2.Serialization\CM3D2.Serialization.csproj", "{59786FC6-0C86-495E-AB89-7CFABCC966E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CM3D2.Serialization", "..\CM3D2.Serialization\CM3D2.Serialization\CM3D2.Serialization.csproj", "{59786FC6-0C86-495E-AB89-7CFABCC966E6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CM3D2.Serialization.Tests", "..\CM3D2.Serialization\CM3D2.Serialization.Tests\CM3D2.Serialization.Tests.csproj", "{3A4C2284-D50C-4F0F-A6E3-9303B423595D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CM3D2.Serialization.Tests", "..\CM3D2.Serialization\CM3D2.Serialization.Tests\CM3D2.Serialization.Tests.csproj", "{3A4C2284-D50C-4F0F-A6E3-9303B423595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B0235D70-D8D6-4AF7-8D1F-25DD22CC681C}"
ProjectSection(SolutionItems) = preProject
@@ -25,34 +25,45 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug_UnityEditor|Any CPU = Debug_UnityEditor|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
+ {7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
+ {4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
+ {36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
+ {3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
+ {59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
+ {3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/LiveLink.CLI/LiveLink.CLI.csproj b/LiveLink.CLI/LiveLink.CLI.csproj
index f2801bc..d2b3c46 100644
--- a/LiveLink.CLI/LiveLink.CLI.csproj
+++ b/LiveLink.CLI/LiveLink.CLI.csproj
@@ -33,6 +33,15 @@
prompt
4
+
+ true
+ bin\Debug_UnityEditor\
+ DEBUG;TRACE
+ full
+ AnyCPU
+ 7.3
+ prompt
+
diff --git a/LiveLink.Plugin/InternalSingleton.cs b/LiveLink.Plugin/InternalSingleton.cs
index 7dcbf39..4f105d9 100644
--- a/LiveLink.Plugin/InternalSingleton.cs
+++ b/LiveLink.Plugin/InternalSingleton.cs
@@ -8,7 +8,7 @@ namespace COM3D2.LiveLink.Plugin
internal abstract class InternalSingleton : MonoSingleton
where T : InternalSingleton
{
- protected static T Instance;
+ internal protected static T Instance;
public sealed override void OnInitialize()
{
Instance = this as T;
diff --git a/LiveLink.Plugin/LiveLink.Plugin.csproj b/LiveLink.Plugin/LiveLink.Plugin.csproj
index 6e52d97..e3ec905 100644
--- a/LiveLink.Plugin/LiveLink.Plugin.csproj
+++ b/LiveLink.Plugin/LiveLink.Plugin.csproj
@@ -1,5 +1,4 @@
-
-
+
Debug
x64
@@ -13,29 +12,34 @@
COM3D2.LiveLink.Plugin
COM3D2.LiveLink.Plugin
latest
- v3.5
- 512
+ net35
C:\DJN\KISS\COM3D2
bin\$(Configuration)\$(Platform)
$(COM3D2InstallPath)\COM3D2x64.exe
+ Debug;Release;Debug_UnityEditor
true
full
false
DEBUG;TRACE
- prompt
- 4
- bin\Debug\AnyCPU\
- false
+
+
+ true
+ full
+ false
+ DEBUG;TRACE
+
+
+ true
+ full
+ false
+ DEBUG;TRACE;UNITY_EDITOR
none
true
TRACE
- prompt
- 4
- false
$(RestoreSources);https://nuget.bepinex.dev/v3/index.json
@@ -44,33 +48,17 @@
all
-
+
+
+
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
$(COM3D2InstallPath)\COM3D2x64_Data\Managed\Assembly-CSharp.dll
False
@@ -95,22 +83,6 @@
$(ReferencePath);$(COM3D2InstallPath)\Sybaris
$(ReferencePath);$(COM3D2InstallPath)\Sybaris\UnityInjector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{59786FC6-0C86-495E-AB89-7CFABCC966E6}
@@ -125,14 +97,28 @@
LiveLink
-
-
+
for /f "usebackq delims=|" %25%25f in (`dir /b *.dll`) do "$(ProjectDir)\pdb2mdb.exe" "%25%25f" 1>nul
rd "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(ProjectName)"
mklink /J "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(ProjectName)" .
-
+
+
+
+ False
+ False
+
+ False
+ False
+
+
+ False
+ False
+
+
+
+