ghorsington 5 years ago
parent
commit
c034e88e84

+ 5 - 5
Assembly-CSharp.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{48FC93A8-9592-437F-BCF4-565C49CC7BF4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{D409514A-2DD8-4933-BBDE-B525B44CB2EC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{48FC93A8-9592-437F-BCF4-565C49CC7BF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48FC93A8-9592-437F-BCF4-565C49CC7BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48FC93A8-9592-437F-BCF4-565C49CC7BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48FC93A8-9592-437F-BCF4-565C49CC7BF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D409514A-2DD8-4933-BBDE-B525B44CB2EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D409514A-2DD8-4933-BBDE-B525B44CB2EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D409514A-2DD8-4933-BBDE-B525B44CB2EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D409514A-2DD8-4933-BBDE-B525B44CB2EC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 16 - 16
Assembly-CSharp/Assembly-CSharp.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{48FC93A8-9592-437F-BCF4-565C49CC7BF4}</ProjectGuid>
+    <ProjectGuid>{D409514A-2DD8-4933-BBDE-B525B44CB2EC}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Assembly-CSharp</RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>
@@ -34,49 +34,49 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>..\..\com_diff_tmp\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-UnityScript-firstpass">
-      <HintPath>..\..\com_diff_tmp\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="FoveUnityPlugin">
-      <HintPath>..\..\com_diff_tmp\Managed\FoveUnityPlugin.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\FoveUnityPlugin.dll</HintPath>
     </Reference>
     <Reference Include="Ionic.Zlib">
-      <HintPath>..\..\com_diff_tmp\Managed\Ionic.Zlib.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\Ionic.Zlib.dll</HintPath>
     </Reference>
     <Reference Include="JsonFx.Json">
-      <HintPath>..\..\com_diff_tmp\Managed\JsonFx.Json.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\JsonFx.Json.dll</HintPath>
     </Reference>
     <Reference Include="LeapCSharp.NET3.5">
-      <HintPath>..\..\com_diff_tmp\Managed\LeapCSharp.NET3.5.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\LeapCSharp.NET3.5.dll</HintPath>
     </Reference>
     <Reference Include="System">
-      <HintPath>..\..\com_diff_tmp\Managed\System.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\System.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">
-      <HintPath>..\..\com_diff_tmp\Managed\System.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\System.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing">
-      <HintPath>..\..\com_diff_tmp\Managed\System.Drawing.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\System.Drawing.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms">
-      <HintPath>..\..\com_diff_tmp\Managed\System.Windows.Forms.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\System.Windows.Forms.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml">
-      <HintPath>..\..\com_diff_tmp\Managed\System.Xml.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\System.Xml.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq">
-      <HintPath>..\..\com_diff_tmp\Managed\System.Xml.Linq.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\System.Xml.Linq.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine">
-      <HintPath>..\..\com_diff_tmp\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\com_diff_tmp\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="zxing.unity">
-      <HintPath>..\..\com_diff_tmp\Managed\zxing.unity.dll</HintPath>
+      <HintPath>..\..\..\..\..\Programs\COM3D2\COM3D2\COM3D2x64_Data\Managed\zxing.unity.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

+ 1 - 1
Assembly-CSharp/ConfigManager.cs

@@ -113,7 +113,7 @@ public class ConfigManager : MonoBehaviour
 		this.ejaculationSe.onGetValue = (() => GameMain.Instance.CMSystem.EjaculationSeEnabled);
 		this.ejaculationSe.onSetValue = delegate(bool setValue)
 		{
-			GameMain.Instance.CMSystem.EjaculationSeEnabled = this.enabled;
+			GameMain.Instance.CMSystem.EjaculationSeEnabled = setValue;
 		};
 		if (Product.VBA)
 		{

+ 1 - 0
Assembly-CSharp/Product.cs

@@ -52,6 +52,7 @@ public static class Product
 		{
 			if (!Product.SPP)
 			{
+				LocalizationManager.CurrentLanguage = Product.EnumConvert.ToI2LocalizeLanguageName(Product.Language.INKD);
 				return;
 			}
 			LocalizationManager.CurrentLanguage = Product.EnumConvert.ToI2LocalizeLanguageName(value);