v1.51

Assembly-CSharp.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{A26CA03A-4339-487D-875B-38D0FBCFEDDB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{39553857-894F-46FF-B421-6D5BEA960691}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A26CA03A-4339-487D-875B-38D0FBCFEDDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A26CA03A-4339-487D-875B-38D0FBCFEDDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A26CA03A-4339-487D-875B-38D0FBCFEDDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A26CA03A-4339-487D-875B-38D0FBCFEDDB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39553857-894F-46FF-B421-6D5BEA960691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39553857-894F-46FF-B421-6D5BEA960691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39553857-894F-46FF-B421-6D5BEA960691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39553857-894F-46FF-B421-6D5BEA960691}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Assembly-CSharp/Assembly-CSharp.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A26CA03A-4339-487D-875B-38D0FBCFEDDB}</ProjectGuid>
+    <ProjectGuid>{39553857-894F-46FF-B421-6D5BEA960691}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Assembly-CSharp</RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>
@@ -34,52 +34,52 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-UnityScript-firstpass">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="FoveUnityPlugin">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\FoveUnityPlugin.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\FoveUnityPlugin.dll</HintPath>
     </Reference>
     <Reference Include="Ionic.Zlib">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\Ionic.Zlib.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\Ionic.Zlib.dll</HintPath>
     </Reference>
     <Reference Include="JsonFx.Json">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\JsonFx.Json.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\JsonFx.Json.dll</HintPath>
     </Reference>
     <Reference Include="LeapCSharp.NET3.5">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\LeapCSharp.NET3.5.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\LeapCSharp.NET3.5.dll</HintPath>
     </Reference>
     <Reference Include="System">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\System.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\System.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\System.Core.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\System.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\System.Drawing.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\System.Drawing.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\System.Windows.Forms.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\System.Windows.Forms.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\System.Xml.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\System.Xml.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\System.Xml.Linq.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\System.Xml.Linq.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="Win32">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\Win32.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\Win32.dll</HintPath>
     </Reference>
     <Reference Include="zxing.unity">
-      <HintPath>A:\com3d2_up148\data\COM3D2x64_Data\Managed\zxing.unity.dll</HintPath>
+      <HintPath>G:\com3d2_up151\data\COM3D2x64_Data\Managed\zxing.unity.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Assembly-CSharp/BaseKagManager.cs

@@ -5502,7 +5502,7 @@ public class BaseKagManager : IDisposable
 	public void Serialize(BinaryWriter binary)
 	{
 		binary.Write("CM3D2_KAG");
-		binary.Write(1480);
+		binary.Write(1510);
 		byte[] array = this.kag_.Serialize();
 		int value = array.Length;
 		binary.Write(value);

Assembly-CSharp/BasePhotoCustomObject.cs

@@ -173,7 +173,7 @@ public abstract class BasePhotoCustomObject : MonoBehaviour, IComparable<BasePho
 			using (BinaryWriter binaryWriter = new BinaryWriter(memoryStream))
 			{
 				binaryWriter.Write("COM3D2_PHOTO_CUSTOM_OBJECT");
-				binaryWriter.Write(1480);
+				binaryWriter.Write(1510);
 				binaryWriter.Write(this.type.ToString());
 				binaryWriter.Write(this.scale_);
 				binaryWriter.Write(this.enabledTextureColor_);

Assembly-CSharp/BasePhotoWindowManager.cs

@@ -153,7 +153,7 @@ public abstract class BasePhotoWindowManager : MonoBehaviour
 			using (BinaryWriter binaryWriter = new BinaryWriter(memoryStream))
 			{
 				binaryWriter.Write(this.save_header_uidata);
-				binaryWriter.Write(1480);
+				binaryWriter.Write(1510);
 				binaryWriter.Write(this.save_data_.Count);
 				foreach (KeyValuePair<string, Dictionary<string, Dictionary<string, string>>> keyValuePair3 in this.save_data_)
 				{

Assembly-CSharp/CMSystem.cs

@@ -855,7 +855,7 @@ public class CMSystem
 	{
 		XElement xelement = new XElement("Config", new object[]
 		{
-			new XAttribute("Version", 1480),
+			new XAttribute("Version", 1510),
 			new XElement("System", new XElement("SysButtonShowAlways", this.SysButtonShowAlways)),
 			new XElement("Screen", new object[]
 			{
@@ -1204,7 +1204,7 @@ public class CMSystem
 		MemoryStream memoryStream = new MemoryStream();
 		BinaryWriter binaryWriter = new BinaryWriter(memoryStream);
 		binaryWriter.Write("CM3D2_SYSTEM2");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		binaryWriter.Write(this.m_dicEditColorPresetData.Count);
 		foreach (KeyValuePair<int, Dictionary<string, int>> keyValuePair in this.m_dicEditColorPresetData)
 		{
@@ -1910,7 +1910,7 @@ public class CMSystem
 
 		public void OnBeforeSerialize()
 		{
-			this.m_nVersion = 1480;
+			this.m_nVersion = 1510;
 		}
 
 		public void OnAfterDeserialize()
@@ -1918,7 +1918,7 @@ public class CMSystem
 		}
 
 		[SerializeField]
-		private int m_nVersion = 1480;
+		private int m_nVersion = 1510;
 
 		[SerializeField]
 		private string m_strDShowFilter = "Microsoft DTV-DVD Video Decoder";

Assembly-CSharp/CharacterMgr.cs

@@ -1000,7 +1000,7 @@ public class CharacterMgr : MonoBehaviour
 		BinaryWriter binaryWriter = new BinaryWriter(memoryStream);
 		string result = string.Empty;
 		binaryWriter.Write("CM3D2_PRESET_S");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		binaryWriter.Write((char)presset_type);
 		maid.SerializePropLowCapacity(binaryWriter);
 		maid.SerializeMultiColor(binaryWriter);
@@ -1017,7 +1017,7 @@ public class CharacterMgr : MonoBehaviour
 		MemoryStream memoryStream = new MemoryStream();
 		BinaryWriter binaryWriter = new BinaryWriter(memoryStream);
 		binaryWriter.Write("CM3D2_PRESET");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		binaryWriter.Write((int)f_type);
 		if (texture2D != null)
 		{
@@ -1062,7 +1062,7 @@ public class CharacterMgr : MonoBehaviour
 		MemoryStream memoryStream = new MemoryStream();
 		BinaryWriter binaryWriter = new BinaryWriter(memoryStream);
 		binaryWriter.Write("CM3D2_PRESET");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		binaryWriter.Write((int)f_type);
 		if (texture2D != null)
 		{
@@ -1324,7 +1324,7 @@ public class CharacterMgr : MonoBehaviour
 	public bool Serialize(BinaryWriter bwWrite)
 	{
 		bwWrite.Write("CM3D2_CHR_MGR");
-		bwWrite.Write(1480);
+		bwWrite.Write(1510);
 		this.m_PlayerStatus.Serialize(bwWrite);
 		bwWrite.Write(this.m_listStockMan.Count);
 		for (int i = 0; i < this.m_listStockMan.Count; i++)

Assembly-CSharp/ControllerShortcutSettingData.cs

@@ -33,7 +33,7 @@ public static class ControllerShortcutSettingData
 	{
 		public void OnBeforeSerialize()
 		{
-			this.m_nVersion = 1480;
+			this.m_nVersion = 1510;
 		}
 
 		public void OnAfterDeserialize()
@@ -261,7 +261,7 @@ public static class ControllerShortcutSettingData
 		private const string CONF_NAME = "OvrControllerShortcutConfig.json";
 
 		[SerializeField]
-		private int m_nVersion = 1480;
+		private int m_nVersion = 1510;
 
 		[SerializeField]
 		private bool IsDirectShortcutMode = true;

Assembly-CSharp/DanceMain.cs

@@ -790,6 +790,30 @@ public class DanceMain : MonoBehaviour
 								disposable.Dispose();
 							}
 						}
+						if (this.m_AutoTwistShoulderL != null && num2 < this.m_AutoTwistShoulderL.Length)
+						{
+							maid.SetAutoTwist(Maid.AutoTwist.ShoulderL, this.m_AutoTwistShoulderL[num2]);
+						}
+						if (this.m_AutoTwistShoulderR != null && num2 < this.m_AutoTwistShoulderR.Length)
+						{
+							maid.SetAutoTwist(Maid.AutoTwist.ShoulderR, this.m_AutoTwistShoulderR[num2]);
+						}
+						if (this.m_AutoTwistWristL != null && num2 < this.m_AutoTwistWristL.Length)
+						{
+							maid.SetAutoTwist(Maid.AutoTwist.WristL, this.m_AutoTwistWristL[num2]);
+						}
+						if (this.m_AutoTwistWristR != null && num2 < this.m_AutoTwistWristR.Length)
+						{
+							maid.SetAutoTwist(Maid.AutoTwist.WristR, this.m_AutoTwistWristR[num2]);
+						}
+						if (this.m_AutoTwistThighL != null && num2 < this.m_AutoTwistThighL.Length)
+						{
+							maid.SetAutoTwist(Maid.AutoTwist.ThighL, this.m_AutoTwistThighL[num2]);
+						}
+						if (this.m_AutoTwistThighR != null && num2 < this.m_AutoTwistThighR.Length)
+						{
+							maid.SetAutoTwist(Maid.AutoTwist.ThighR, this.m_AutoTwistThighR[num2]);
+						}
 						if (!string.IsNullOrEmpty(this.m_listAnimName[num2]))
 						{
 							string name = maid.CrossFade(this.m_listAnimName[num2] + ".anm", false, false, false, 0f, 1f);
@@ -1120,7 +1144,7 @@ public class DanceMain : MonoBehaviour
 	public GameObject[] m_EyeTarget;
 
 	[SerializeField]
-	[Header("特定メイド番号からダミーメイドへの容姿のコピー(Elementが元メイド番号/値が先メイド番号")]
+	[Header("特定メイド番号からダミーメイドへの容姿のコピー(Elementが先メイド番号/値が元メイド番号")]
 	public int[] m_PresetCopyToDummyChara;
 
 	[SerializeField]
@@ -1139,6 +1163,30 @@ public class DanceMain : MonoBehaviour
 
 	public float[] m_KuchipakuAudioStartTimeAtMaid;
 
+	[SerializeField]
+	[Header("自動捻りボーン(ShoulderL)(Elementがメイド番号)指定無しでON")]
+	public bool[] m_AutoTwistShoulderL;
+
+	[SerializeField]
+	[Header("自動捻りボーン(ShoulderR)(Elementがメイド番号)指定無しでON")]
+	public bool[] m_AutoTwistShoulderR;
+
+	[SerializeField]
+	[Header("自動捻りボーン(WristL)(Elementがメイド番号)指定無しでON")]
+	public bool[] m_AutoTwistWristL;
+
+	[SerializeField]
+	[Header("自動捻りボーン(WristR)(Elementがメイド番号)指定無しでON")]
+	public bool[] m_AutoTwistWristR;
+
+	[SerializeField]
+	[Header("自動捻りボーン(ThighL)(Elementがメイド番号)指定無しでON")]
+	public bool[] m_AutoTwistThighL;
+
+	[SerializeField]
+	[Header("自動捻りボーン(ThighR)(Elementがメイド番号)指定無しでON")]
+	public bool[] m_AutoTwistThighR;
+
 	private List<DanceMain.AnimTime> m_focePauseAnim = new List<DanceMain.AnimTime>();
 
 	private bool m_pauseBack;

Assembly-CSharp/DeskManager.cs

@@ -143,7 +143,7 @@ internal class DeskManager
 	public static void SerializeSingleSaveData(BinaryWriter binary)
 	{
 		binary.Write("CM3D2_DeskCustomize");
-		binary.Write(1480);
+		binary.Write(1510);
 		binary.Write(DeskManager.item_inst_data_.Count);
 		for (int i = 0; i < DeskManager.item_inst_data_.Count; i++)
 		{

Assembly-CSharp/DynamicBone.cs

@@ -30,7 +30,7 @@ public class DynamicBone : MonoBehaviour
 			return false;
 		};
 		f_bw.Write("CM3D21_PHY");
-		f_bw.Write(1480);
+		f_bw.Write(1510);
 		if (this.m_Root == null)
 		{
 			NDebug.MessageBox("エラー", "×物理ルートボーンが設定されていません。");
@@ -94,7 +94,7 @@ public class DynamicBone : MonoBehaviour
 	public bool SerializeWriteCollider(BinaryWriter f_bw, string f_strFileName)
 	{
 		f_bw.Write("CM3D21_COL");
-		f_bw.Write(1480);
+		f_bw.Write(1510);
 		if (this.m_Colliders == null || this.m_Colliders.Count == 0)
 		{
 			NDebug.MessageBox("エラー", "×物理Collidersは空です。");
@@ -110,7 +110,7 @@ public class DynamicBone : MonoBehaviour
 			else
 			{
 				f_bw.Write(this.m_Colliders[i].TypeName);
-				this.m_Colliders[i].Serialize(f_bw, 1480);
+				this.m_Colliders[i].Serialize(f_bw, 1510);
 			}
 		}
 		this.m_ColliderFileName = f_strFileName;

Assembly-CSharp/DynamicSkirtBone.cs

@@ -18,7 +18,7 @@ public class DynamicSkirtBone : MonoBehaviour
 	public bool SerializeWrite(BinaryWriter f_bw)
 	{
 		f_bw.Write("CM3D21_PSK");
-		f_bw.Write(1480);
+		f_bw.Write(1510);
 		f_bw.Write(this.m_fPanierRadius);
 		this.SerializeWriteAnimationCurve(f_bw, this.m_PanierRadiusDistrib);
 		int num = (this.m_PanierRadiusDistribGroup == null) ? 0 : this.m_PanierRadiusDistribGroup.Length;

Assembly-CSharp/EditMod.cs

@@ -303,7 +303,7 @@ public class EditMod : MonoBehaviour
 		MemoryStream memoryStream = new MemoryStream();
 		BinaryWriter binaryWriter = new BinaryWriter(memoryStream);
 		binaryWriter.Write("CM3D2_MOD");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		binaryWriter.Write(value);
 		binaryWriter.Write(text2.ToLower());
 		binaryWriter.Write(value2);

Assembly-CSharp/EmpireLifeModeManager.cs

@@ -477,7 +477,7 @@ public class EmpireLifeModeManager : MonoBehaviour
 	public bool Serialize(BinaryWriter brWrite)
 	{
 		brWrite.Write("CM3D21_LIFE_MODE_MGR");
-		brWrite.Write(1480);
+		brWrite.Write(1510);
 		brWrite.Write("2");
 		DataArray<int, byte> saveDataScenarioExecuteCountArray = this.m_SaveDataScenarioExecuteCountArray;
 		if (EmpireLifeModeManager.<>f__mg$cache1 == null)

Assembly-CSharp/FacilityManager.cs

@@ -657,7 +657,7 @@ public class FacilityManager : MonoBehaviour
 		Stopwatch stopwatch = new Stopwatch();
 		stopwatch.Start();
 		brWrite.Write("CM3D21_FACILITY_MGR");
-		brWrite.Write(1480);
+		brWrite.Write(1510);
 		brWrite.Write("5");
 		int num = 0;
 		for (int i = 0; i < this.m_FacilityArray.Count; i++)

Assembly-CSharp/GameMain.cs

@@ -684,7 +684,7 @@ public class GameMain : MonoSingleton<GameMain>
 		serializeHeader.strComment = f_strComment;
 		serializeHeader.productTypeID = (int)Product.type;
 		binaryWriter.Write("COM3D2_SAVE");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		this.SerializeWriteHeader(binaryWriter, serializeHeader);
 		binaryWriter.Write("bookmark_kk_01");
 		GameMain.BinaryBookmark binaryBookmark = new GameMain.BinaryBookmark(binaryWriter);
@@ -806,7 +806,7 @@ public class GameMain : MonoSingleton<GameMain>
 		MemoryStream memoryStream = new MemoryStream();
 		BinaryWriter binaryWriter = new BinaryWriter(memoryStream);
 		binaryWriter.Write("COM3D2_SAVE");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		this.SerializeWriteHeader(binaryWriter, saveDataHeader);
 		binaryWriter.Write(array, (int)saveDataHeader.lHeaderSize, (int)((long)array.Length - saveDataHeader.lHeaderSize));
 		File.WriteAllBytes(path, memoryStream.ToArray());

Assembly-CSharp/GameModeManager.cs

@@ -32,7 +32,7 @@ public static class GameModeManager
 	public static bool Serialize(BinaryWriter brWrite)
 	{
 		brWrite.Write("CM3D21_GAME_MODE_MGR");
-		brWrite.Write(1480);
+		brWrite.Write(1510);
 		brWrite.Write(1);
 		brWrite.Write((int)GameModeManager.m_NowGameModeType);
 		return true;

Assembly-CSharp/GameUty.cs

@@ -272,8 +272,8 @@ public class GameUty
 		int check_ver_no = 3;
 		Func<string, bool> AddFolderOrArchive = delegate(string name)
 		{
-			bool flag3 = GameUty.m_FileSystem.AddArchive(gameDataPath + "\\" + name + ".arc");
-			if (flag3)
+			bool flag4 = GameUty.m_FileSystem.AddArchive(gameDataPath + "\\" + name + ".arc");
+			if (flag4)
 			{
 				Debug.Log(string.Concat(new string[]
 				{
@@ -284,61 +284,61 @@ public class GameUty
 					".arc]を読み込みました"
 				}));
 			}
-			if (flag3)
+			if (flag4)
 			{
 				GameUty.loadArchiveList.Add(name.ToLower());
 			}
-			return flag3;
+			return flag4;
 		};
 		HashSet<string> addedLegacyArchives = new HashSet<string>();
 		Action<string> action = delegate(string name)
 		{
-			foreach (string text30 in GameUty.PathList)
+			foreach (string text32 in GameUty.PathList)
 			{
-				string text31 = name + "_" + text30;
-				bool flag3 = AddFolderOrArchive(text31);
-				if (flag3 && !addedLegacyArchives.Contains(text31))
+				string text33 = name + "_" + text32;
+				bool flag4 = AddFolderOrArchive(text33);
+				if (flag4 && !addedLegacyArchives.Contains(text33))
 				{
-					addedLegacyArchives.Add(text31);
+					addedLegacyArchives.Add(text33);
 				}
-				if (flag3)
+				if (flag4)
 				{
 					if (name == "csv")
 					{
-						GameUty.ExistCsvPathList.Add(text30);
+						GameUty.ExistCsvPathList.Add(text32);
 					}
-					for (int num13 = 2; num13 <= check_ver_no; num13++)
+					for (int num15 = 2; num15 <= check_ver_no; num15++)
 					{
-						AddFolderOrArchive(text31 + "_" + num13);
+						AddFolderOrArchive(text33 + "_" + num15);
 					}
 				}
 			}
 		};
 		Action<string> action2 = delegate(string name)
 		{
-			foreach (string text30 in GameUty.PathList)
+			foreach (string text32 in GameUty.PathList)
 			{
-				string text31 = name + "_" + text30;
-				bool flag3 = AddFolderOrArchive(text31);
-				if (!flag3 && addedLegacyArchives.Contains(text31))
+				string text33 = name + "_" + text32;
+				bool flag4 = AddFolderOrArchive(text33);
+				if (!flag4 && addedLegacyArchives.Contains(text33))
 				{
-					flag3 = true;
+					flag4 = true;
 				}
-				if (flag3)
+				if (flag4)
 				{
 					if (name == "csv")
 					{
-						GameUty.ExistCsvPathList.Add(text30);
+						GameUty.ExistCsvPathList.Add(text32);
 					}
-					for (int num13 = 2; num13 <= check_ver_no; num13++)
+					for (int num15 = 2; num15 <= check_ver_no; num15++)
 					{
 						AddFolderOrArchive(string.Concat(new object[]
 						{
 							name,
 							"_",
-							text30,
+							text32,
 							"_",
-							num13
+							num15
 						}));
 					}
 				}
@@ -346,23 +346,23 @@ public class GameUty
 		};
 		Action<string> action3 = delegate(string name)
 		{
-			foreach (string text30 in GameUty.PathList)
+			foreach (string text32 in GameUty.PathList)
 			{
-				if (AddFolderOrArchive(name + "_" + text30))
+				if (AddFolderOrArchive(name + "_" + text32))
 				{
 					if (name == "csv")
 					{
-						GameUty.ExistCsvPathList.Add(text30);
+						GameUty.ExistCsvPathList.Add(text32);
 					}
-					for (int num13 = 2; num13 <= check_ver_no; num13++)
+					for (int num15 = 2; num15 <= check_ver_no; num15++)
 					{
 						AddFolderOrArchive(string.Concat(new object[]
 						{
 							name,
 							"_",
-							text30,
+							text32,
 							"_",
-							num13
+							num15
 						}));
 					}
 				}
@@ -710,9 +710,57 @@ public class GameUty
 			NDebug.Assert(AddFolderOrArchive(text27), str + text27);
 			foreach (string text28 in GameUty.PathList)
 			{
+				if (Product.isJapan && !Product.isPublic)
+				{
+					string text29 = "parts_cw005cloth4.arc";
+					string path = "parts_cw005cloth4_2.arc";
+					if (string.Equals(text27 + "_" + text28, Path.GetFileNameWithoutExtension(text29), StringComparison.OrdinalIgnoreCase))
+					{
+						string text30 = Path.Combine(UTY.gameDataPath, text29);
+						if (File.Exists(text30) && File.Exists(Path.Combine(UTY.gameDataPath, path)))
+						{
+							byte[] bytes = Resources.Load<TextAsset>(Path.Combine("System", text29)).bytes;
+							if (new FileInfo(text30).Length > (long)bytes.Length)
+							{
+								FileSystemArchive fileSystemArchive = new FileSystemArchive();
+								fileSystemArchive.SetBaseDirectory(text);
+								fileSystemArchive.AddArchive(Path.Combine(gameDataPath, text29));
+								fileSystemArchive.AddArchive(Path.Combine(gameDataPath, path));
+								fileSystemArchive.Dispose();
+								bool flag3 = true;
+								using (FileStream fileStream = File.OpenRead(Path.Combine(UTY.gameDataPath, path)))
+								{
+									using (BinaryReader binaryReader = new BinaryReader(fileStream))
+									{
+										foreach (int num10 in new int[]
+										{
+											119,
+											97,
+											114,
+											99
+										})
+										{
+											byte b = binaryReader.ReadByte();
+											if ((int)b != num10)
+											{
+												flag3 = false;
+												break;
+											}
+										}
+									}
+								}
+								if (flag3)
+								{
+									File.Delete(text30);
+									File.WriteAllBytes(text30, bytes);
+								}
+							}
+						}
+					}
+				}
 				if (AddFolderOrArchive(text27 + "_" + text28))
 				{
-					for (int num9 = 2; num9 <= check_ver_no; num9++)
+					for (int num11 = 2; num11 <= check_ver_no; num11++)
 					{
 						AddFolderOrArchive(string.Concat(new object[]
 						{
@@ -720,7 +768,7 @@ public class GameUty
 							"_",
 							text28,
 							"_",
-							num9
+							num11
 						}));
 					}
 				}
@@ -743,9 +791,9 @@ public class GameUty
 		string[] list = GameUty.m_FileSystem.GetList("bg", AFileSystemBase.ListType.AllFile);
 		if (list != null && 0 < list.Length)
 		{
-			foreach (string path in list)
+			foreach (string path2 in list)
 			{
-				string fileName = Path.GetFileName(path);
+				string fileName = Path.GetFileName(path2);
 				if (!(Path.GetExtension(fileName) != ".asset_bg") && !GameUty.BgFiles.ContainsKey(fileName))
 				{
 					GameUty.BgFiles.Add(fileName, GameUty.m_FileSystem);
@@ -757,9 +805,9 @@ public class GameUty
 			list = GameUty.m_FileSystem.GetList("language", AFileSystemBase.ListType.AllFile);
 			if (list != null && 0 < list.Length)
 			{
-				foreach (string path2 in list)
+				foreach (string path3 in list)
 				{
-					string fileName2 = Path.GetFileName(path2);
+					string fileName2 = Path.GetFileName(path3);
 					if (!(Path.GetExtension(fileName2) != ".asset_language"))
 					{
 						using (AFileBase afileBase = GameUty.m_FileSystem.FileOpen(fileName2))
@@ -787,11 +835,11 @@ public class GameUty
 			GameUty.m_ModFileSystem.SetBaseDirectory(text);
 			GameUty.m_ModFileSystem.AddFolder("Mod");
 			string[] list2 = GameUty.m_ModFileSystem.GetList(string.Empty, AFileSystemBase.ListType.AllFolder);
-			foreach (string text29 in list2)
+			foreach (string text31 in list2)
 			{
-				if (!GameUty.m_ModFileSystem.AddAutoPath(text29))
+				if (!GameUty.m_ModFileSystem.AddAutoPath(text31))
 				{
-					Debug.Log("m_ModFileSystemのAddAutoPathには既に " + text29 + " がありました。");
+					Debug.Log("m_ModFileSystemのAddAutoPathには既に " + text31 + " がありました。");
 				}
 			}
 		}
@@ -1378,14 +1426,14 @@ public class GameUty
 
 	public static string GetBuildVersionText()
 	{
-		int num = 1480;
+		int num = 1510;
 		return (num >= 1000) ? ((float)num / 1000f).ToString("F2") : ((float)num / 100f).ToString("F2");
 	}
 
 	public static string GetGameVersionText()
 	{
 		string text = "COM3D2x64.exe";
-		int num = 1480;
+		int num = 1510;
 		string path = UTY.gameProjectPath + "\\update.lst";
 		string[] array = new string[0];
 		if (File.Exists(path))

Assembly-CSharp/HandSignShortcut.cs

@@ -506,7 +506,7 @@ public class HandSignShortcut : MonoBehaviour
 	{
 		public void OnBeforeSerialize()
 		{
-			this.m_nVersion = 1480;
+			this.m_nVersion = 1510;
 		}
 
 		public void OnAfterDeserialize()
@@ -815,7 +815,7 @@ public class HandSignShortcut : MonoBehaviour
 		private const string CONF_NAME = "MaidFingerDataList.json";
 
 		[SerializeField]
-		private int m_nVersion = 1480;
+		private int m_nVersion = 1510;
 
 		[SerializeField]
 		private List<HandSignShortcut.MaidFingerData> MaidFingerDataList = new List<HandSignShortcut.MaidFingerData>();

Assembly-CSharp/Kasizuki/KasizukiManager.cs

@@ -872,7 +872,7 @@ namespace Kasizuki
 		public void Serialize(BinaryWriter bw)
 		{
 			bw.Write("COM3D2_KASIZUKI");
-			bw.Write(1480);
+			bw.Write(1510);
 			this.SerializeOriginHeader(bw);
 			foreach (KeyValuePair<int, KasizukiManager.SaveData> keyValuePair in this.m_SaveDataArray)
 			{

Assembly-CSharp/Maid.cs

@@ -1486,7 +1486,7 @@ public class Maid : MonoBehaviour
 	public bool SerializeProp(BinaryWriter f_bwWrite)
 	{
 		f_bwWrite.Write("CM3D2_MPROP_LIST");
-		f_bwWrite.Write(1480);
+		f_bwWrite.Write(1510);
 		f_bwWrite.Write(this.m_dicMaidProp.Count);
 		int num = 0;
 		foreach (KeyValuePair<string, MaidProp> keyValuePair in this.m_dicMaidProp)
@@ -1520,7 +1520,7 @@ public class Maid : MonoBehaviour
 	public bool SerializeMisc(BinaryWriter f_bwWrite)
 	{
 		f_bwWrite.Write("CM3D2_MAID_MISC");
-		f_bwWrite.Write(1480);
+		f_bwWrite.Write(1510);
 		f_bwWrite.Write(this.m_nActiveSlotNo);
 		if (this.m_texIcon != null)
 		{
@@ -1545,7 +1545,7 @@ public class Maid : MonoBehaviour
 	public bool SerializeBody(BinaryWriter f_bwWrite)
 	{
 		f_bwWrite.Write("CM3D2_MAID_BODY");
-		f_bwWrite.Write(1480);
+		f_bwWrite.Write(1510);
 		return true;
 	}
 

Assembly-CSharp/MaidParts.cs

@@ -37,7 +37,7 @@ public class MaidParts : MonoBehaviour
 	public unsafe bool Serialize(BinaryWriter f_bwWrite)
 	{
 		f_bwWrite.Write("CM3D2_MULTI_COL");
-		f_bwWrite.Write(1480);
+		f_bwWrite.Write(1510);
 		f_bwWrite.Write(this.m_aryPartsColor.Length);
 		for (int i = 0; i < this.m_aryPartsColor.Length; i++)
 		{

Assembly-CSharp/MaidProp.cs

@@ -8,7 +8,7 @@ public class MaidProp
 	public bool Serialize(BinaryWriter f_bwWrite)
 	{
 		f_bwWrite.Write("CM3D2_MPROP");
-		f_bwWrite.Write(1480);
+		f_bwWrite.Write(1510);
 		f_bwWrite.Write(this.idx);
 		f_bwWrite.Write(this.name);
 		f_bwWrite.Write(this.type);

Assembly-CSharp/MaidStatus/Status.cs

@@ -1372,7 +1372,7 @@ namespace MaidStatus
 		{
 			this.SetFlag("__1330_specialrelation__", (int)this.specialRelation);
 			binary.Write("CM3D2_MAID_STATUS");
-			binary.Write(1480);
+			binary.Write(1510);
 			binary.Write(this.guid);
 			binary.Write(this.creationTime);
 			binary.Write((short)this.heroineType);

Assembly-CSharp/Menu.cs

@@ -974,7 +974,7 @@ public class Menu : MonoBehaviour
 			Directory.CreateDirectory(text);
 		}
 		StreamWriter streamWriter = new StreamWriter(text + "\\" + text2 + ".txt", false, Encoding.UTF8);
-		streamWriter.WriteLine("出力バージョン\t" + 1480);
+		streamWriter.WriteLine("出力バージョン\t" + 1510);
 		streamWriter.WriteLine("基本アイテム\t" + filename.Replace(" ", ":"));
 		try
 		{

Assembly-CSharp/Misc.cs

@@ -2,7 +2,7 @@
 
 public class Misc
 {
-	public const int GAME_VERSION = 1480;
+	public const int GAME_VERSION = 1510;
 
 	public const string GAME_DATA_PATH = "GameData";
 

Assembly-CSharp/ModCompile.cs

@@ -604,7 +604,7 @@ public class ModCompile : MonoBehaviour
 		MemoryStream memoryStream = new MemoryStream();
 		BinaryWriter binaryWriter = new BinaryWriter(memoryStream);
 		binaryWriter.Write("CM3D2_MESH");
-		binaryWriter.Write(1480);
+		binaryWriter.Write(1510);
 		string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(f_strMqoFile);
 		binaryWriter.Write(fileNameWithoutExtension);
 		binaryWriter.Write(exObjIn2.strName);

Assembly-CSharp/OvrIK.cs

@@ -1568,7 +1568,7 @@ public class OvrIK : MonoBehaviour
 	{
 		public void OnBeforeSerialize()
 		{
-			this.m_nVersion = 1480;
+			this.m_nVersion = 1510;
 		}
 
 		public void OnAfterDeserialize()
@@ -1628,7 +1628,7 @@ public class OvrIK : MonoBehaviour
 		private const string CONF_NAME = "OvrIK.json";
 
 		[SerializeField]
-		private int m_nVersion = 1480;
+		private int m_nVersion = 1510;
 
 		[SerializeField]
 		private float solver_locomotion_weight = 1f;

Assembly-CSharp/PhotoModeSaveAndLoad.cs

@@ -450,7 +450,7 @@ public class PhotoModeSaveAndLoad : MonoBehaviour
 	private XElement CreateCommonData(string title, string comment)
 	{
 		string value = DateTime.ParseExact(DateTime.Now.ToString("yyyyMMddHHmmss"), "yyyyMMddHHmmss", null).ToString("yyyy.MM.dd HH:mm");
-		XElement xelement = new XElement("GameVersion", 1480);
+		XElement xelement = new XElement("GameVersion", 1510);
 		XElement xelement2 = new XElement("SaveTime", value);
 		XElement xelement3 = new XElement("Title", title);
 		XElement xelement4 = new XElement("Comment", comment);

Assembly-CSharp/PlayerStatus/Status.cs

@@ -831,7 +831,7 @@ namespace PlayerStatus
 		public void Serialize(BinaryWriter binary)
 		{
 			binary.Write("CM3D2_PLAYER_STATUS");
-			binary.Write(1480);
+			binary.Write(1510);
 			binary.Write(this.playerName_);
 			binary.Write(this.days_);
 			binary.Write(this.totalPurchasePrice_);

Assembly-CSharp/SceneEdit.cs

@@ -1009,6 +1009,7 @@ public class SceneEdit : MonoBehaviour
 		mi.m_boDelOnly = menuDataBase.GetBoDelOnly();
 		mi.m_fPriority = menuDataBase.GetPriority();
 		mi.m_bMan = menuDataBase.GetIsMan();
+		mi.m_collabo = menuDataBase.GetIsCollabo();
 		mi.m_bOld = (menuDataBase.GetVersion() < 2000);
 		string iconS = menuDataBase.GetIconS();
 		if (!string.IsNullOrEmpty(iconS) && GameUty.FileSystem.IsExistentFile(iconS))
@@ -1198,7 +1199,7 @@ public class SceneEdit : MonoBehaviour
 		SceneEditInfo.CCateNameType cateType;
 		if (!string.IsNullOrEmpty(f_mi.m_strMenuFileName) && Product.type == Product.Type.JpAdult)
 		{
-			if (SceneEditInfo.m_listCollaboCategory.Contains(f_mi.m_strMenuFileName.ToLower()))
+			if (SceneEditInfo.m_listCollaboCategory.Contains(f_mi.m_strMenuFileName.ToLower()) || f_mi.m_collabo)
 			{
 				if (mpn != MPN.null_mpn && SceneEditInfo.m_dicPartsTypePair.TryGetValue(mpn, out cateType))
 				{
@@ -1452,9 +1453,16 @@ public class SceneEdit : MonoBehaviour
 									{
 										mi.m_fPriority = float.Parse(stringList[1]);
 									}
-									else if (stringCom == "メニューフォルダ" && stringList[1].ToLower() == "man")
+									else if (stringCom == "メニューフォルダ")
 									{
-										mi.m_bMan = true;
+										if (stringList[1].ToLower() == "man")
+										{
+											mi.m_bMan = true;
+										}
+									}
+									else if (stringCom == "collabo")
+									{
+										mi.m_collabo = true;
 									}
 								}
 							}
@@ -3688,7 +3696,10 @@ public class SceneEdit : MonoBehaviour
 			flag |= (this.m_boDelOnly == item.m_boDelOnly);
 			flag |= (this.m_fPriority == item.m_fPriority);
 			flag |= (this.m_bMan == item.m_bMan);
-			return flag | this.m_bOld == item.m_bOld;
+			flag |= (this.m_bOld == item.m_bOld);
+			flag |= (this.m_requestNewFace == item.m_requestNewFace);
+			flag |= (this.m_requestFBFace == item.m_requestFBFace);
+			return flag | this.m_collabo == item.m_collabo;
 		}
 
 		public SceneEdit.SPartsType m_ParentPartsType;
@@ -3723,6 +3734,8 @@ public class SceneEdit : MonoBehaviour
 
 		public string m_strInfo = string.Empty;
 
+		public bool m_collabo;
+
 		public Texture2D m_texIcon;
 
 		public Texture2D m_texIconRandomColor;

Assembly-CSharp/SceneNPCEdit/SaveData.cs

@@ -10,7 +10,7 @@ namespace SceneNPCEdit
 		public static void Serialize(BinaryWriter binary)
 		{
 			binary.Write("CM3D2_NPCEDIT");
-			binary.Write(1480);
+			binary.Write(1510);
 			binary.Write(SaveData.presetData.Count);
 			foreach (KeyValuePair<int, byte[]> keyValuePair in SaveData.presetData)
 			{

Assembly-CSharp/ScriptManager.cs

@@ -3399,7 +3399,7 @@ public class ScriptManager : IDisposable
 	public void Serialize(BinaryWriter binary)
 	{
 		binary.Write("CM3D2_SCRIPT");
-		binary.Write(1480);
+		binary.Write(1510);
 		this.adv_kag_.Serialize(binary);
 	}
 

Assembly-CSharp/WindowPartsFingerPreset.cs

@@ -182,7 +182,7 @@ public class WindowPartsFingerPreset : MonoBehaviour
 	{
 		WindowPartsFingerBlend.Type blendType = tareget_blend.BlendType;
 		FingerBlend.BaseFinger baseFingerClass = tareget_blend.GetBaseFingerClass(tareget_blend.mgr.select_maid, blendType);
-		XElement xelement = new XElement("GameVersion", 1480);
+		XElement xelement = new XElement("GameVersion", 1510);
 		XElement xelement2 = new XElement("RightData", blendType == WindowPartsFingerBlend.Type.RightArm || blendType == WindowPartsFingerBlend.Type.RightLeg);
 		XElement xelement3 = new XElement("BinaryData", Convert.ToBase64String(baseFingerClass.GetBinary()));
 		XNode[] contents = new XNode[]