|
@@ -39,17 +39,17 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
for (int index1 = 0; index1 < maxMaidCnt; ++index1)
|
|
|
{
|
|
|
- if ((bool)maidArray[index1])
|
|
|
+ if ((bool) maidArray[index1])
|
|
|
maidArray[index1].StopKuchipakuPattern();
|
|
|
- if ((bool)maidArray[index1])
|
|
|
+ if ((bool) maidArray[index1])
|
|
|
maidArray[index1].body0.trsLookTarget = GameMain.Instance.MainCamera.transform;
|
|
|
- if ((bool)maidArray[index1] && maidArray[index1].Visible && maidArray[index1].body0.isLoadedBody)
|
|
|
+ if ((bool) maidArray[index1] && maidArray[index1].Visible && maidArray[index1].body0.isLoadedBody)
|
|
|
{
|
|
|
maidArray[index1].CrossFade(poseArray[0] + ".anm", false, true, false, 0.0f, 1f);
|
|
|
maidArray[index1].SetAutoTwistAll(true);
|
|
|
}
|
|
|
|
|
|
- if ((bool)maidArray[index1])
|
|
|
+ if ((bool) maidArray[index1])
|
|
|
{
|
|
|
maidArray[index1].boMabataki = true;
|
|
|
if (maidArray[index1].body0.isLoadedBody)
|
|
@@ -317,7 +317,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
muneIKR[index1] = false;
|
|
|
}
|
|
|
|
|
|
- if ((bool)kami)
|
|
|
+ if ((bool) kami)
|
|
|
kami.SetActive(false);
|
|
|
danceCheckIndex = 0;
|
|
|
for (int index = 0; index < danceCheck.Length; ++index)
|
|
@@ -423,11 +423,11 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
for (int index1 = 0; index1 < maxMaidCnt; ++index1)
|
|
|
{
|
|
|
- if ((bool)maidArray[index1])
|
|
|
+ if ((bool) maidArray[index1])
|
|
|
maidArray[index1].StopKuchipakuPattern();
|
|
|
- if ((bool)maidArray[index1])
|
|
|
+ if ((bool) maidArray[index1])
|
|
|
maidArray[index1].body0.trsLookTarget = GameMain.Instance.MainCamera.transform;
|
|
|
- if ((bool)maidArray[index1] && maidArray[index1].Visible && maidArray[index1].body0.isLoadedBody)
|
|
|
+ if ((bool) maidArray[index1] && maidArray[index1].Visible && maidArray[index1].body0.isLoadedBody)
|
|
|
{
|
|
|
maidArray[index1].CrossFade(poseArray[0] + ".anm", false, true, false, 0.0f, 1f);
|
|
|
maidArray[index1].SetAutoTwistAll(true);
|
|
@@ -435,7 +435,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
maidArray[index1].body0.MuneYureR(1f);
|
|
|
}
|
|
|
|
|
|
- if ((bool)maidArray[index1])
|
|
|
+ if ((bool) maidArray[index1])
|
|
|
{
|
|
|
maidArray[index1].body0.SetMask(TBody.SlotID.wear, true);
|
|
|
maidArray[index1].body0.SetMask(TBody.SlotID.skirt, true);
|
|
@@ -469,7 +469,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
{
|
|
|
Maid stockMaid = GameMain.Instance.CharacterMgr.GetStockMaidList()[index];
|
|
|
stockMaid.transform.localScale = new Vector3(1f, 1f, 1f);
|
|
|
- var f_eMode = (TBody.MaskMode)Enum.Parse(typeof(TBody.MaskMode), "None");
|
|
|
+ var f_eMode = (TBody.MaskMode) Enum.Parse(typeof(TBody.MaskMode), "None");
|
|
|
stockMaid.body0.SetMaskMode(f_eMode);
|
|
|
stockMaid.boMabataki = true;
|
|
|
}
|
|
@@ -745,7 +745,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
muneIKR[index1] = false;
|
|
|
}
|
|
|
|
|
|
- if ((bool)kami)
|
|
|
+ if ((bool) kami)
|
|
|
kami.SetActive(false);
|
|
|
danceCheckIndex = 0;
|
|
|
for (int index = 0; index < danceCheck.Length; ++index)
|
|
@@ -839,20 +839,20 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
if (!File.Exists(path1))
|
|
|
Directory.CreateDirectory(path1);
|
|
|
int countS = this.countS;
|
|
|
- var action1 = (Action<string, List<string>>)((path, result_list) =>
|
|
|
- {
|
|
|
- var files = Directory.GetFiles(path);
|
|
|
- this.countS = 0;
|
|
|
- for (int index = 0; index < files.Length; ++index)
|
|
|
- if (Path.GetExtension(files[index]) == ".anm")
|
|
|
- {
|
|
|
- strListS.Add(files[index].Split('\\')[files[index]
|
|
|
- .Split('\\').Length - 1]
|
|
|
- .Split('.')[0] + " /"
|
|
|
- + files[index]);
|
|
|
- ++this.countS;
|
|
|
- }
|
|
|
- });
|
|
|
+ var action1 = (Action<string, List<string>>) ((path, result_list) =>
|
|
|
+ {
|
|
|
+ var files = Directory.GetFiles(path);
|
|
|
+ this.countS = 0;
|
|
|
+ for (int index = 0; index < files.Length; ++index)
|
|
|
+ if (Path.GetExtension(files[index]) == ".anm")
|
|
|
+ {
|
|
|
+ strListS.Add(files[index].Split('\\')[files[index]
|
|
|
+ .Split('\\').Length - 1]
|
|
|
+ .Split('.')[0] + " /"
|
|
|
+ + files[index]);
|
|
|
+ ++this.countS;
|
|
|
+ }
|
|
|
+ });
|
|
|
var stringList1 = new List<string>();
|
|
|
action1(path1, stringList1);
|
|
|
if (this.countS != countS)
|
|
@@ -869,21 +869,21 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
stringList2.Add(string.Empty);
|
|
|
stringList2.AddRange(GameUty.PathList);
|
|
|
var bgList2 = new List<string>();
|
|
|
- var action2 = (Action<string>)(strFileName =>
|
|
|
- {
|
|
|
- if (!GameUty.FileSystem.IsExistentFile(strFileName))
|
|
|
- return;
|
|
|
- using (AFileBase file = GameUty.FileSystem.FileOpen(strFileName))
|
|
|
- {
|
|
|
- using (var csvParser = new CsvParser())
|
|
|
- {
|
|
|
- csvParser.Open(file);
|
|
|
- for (int cell_y = 1; cell_y < csvParser.max_cell_y; ++cell_y)
|
|
|
- if (csvParser.IsCellToExistData(0, cell_y))
|
|
|
- bgList2.Add(csvParser.GetCellAsString(1, cell_y));
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+ var action2 = (Action<string>) (strFileName =>
|
|
|
+ {
|
|
|
+ if (!GameUty.FileSystem.IsExistentFile(strFileName))
|
|
|
+ return;
|
|
|
+ using (AFileBase file = GameUty.FileSystem.FileOpen(strFileName))
|
|
|
+ {
|
|
|
+ using (var csvParser = new CsvParser())
|
|
|
+ {
|
|
|
+ csvParser.Open(file);
|
|
|
+ for (int cell_y = 1; cell_y < csvParser.max_cell_y; ++cell_y)
|
|
|
+ if (csvParser.IsCellToExistData(0, cell_y))
|
|
|
+ bgList2.Add(csvParser.GetCellAsString(1, cell_y));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
action2("edit_bg.nei");
|
|
|
for (int index = 0; index < stringList2.Count; ++index)
|
|
|
action2("edit_bg_" + stringList2[index] + ".nei");
|
|
@@ -901,7 +901,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
if (GameMain.Instance.BgMgr.CreateAssetBundle("SMRoom2") != null)
|
|
|
isVP = true;
|
|
|
- var @object = (Object)null;
|
|
|
+ var @object = (Object) null;
|
|
|
if (GameMain.Instance.BgMgr.CreateAssetBundle("Train") != null)
|
|
|
isPP = true;
|
|
|
@object = null;
|
|
@@ -932,21 +932,23 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
if (afileBase2.IsValid())
|
|
|
stringList5.Add("edit_pose_" + index + "_f");
|
|
|
for (int index1 = 15; index1 < 25; ++index1)
|
|
|
- for (int index2 = 0; index2 < 2; ++index2)
|
|
|
- {
|
|
|
- string str = "s";
|
|
|
- if (index2 == 1)
|
|
|
- str = "w";
|
|
|
- for (int index3 = 1; index3 < 20; ++index3)
|
|
|
- if (index3 < 10)
|
|
|
- using (AFileBase afileBase3 = GameUty.FileSystem.FileOpen("edit_pose_dg" + index1 + str + "_00" + index3 + "_f.anm"))
|
|
|
- if (afileBase3.IsValid())
|
|
|
- stringList5.Add("edit_pose_dg" + index1 + str + "_00" + index3 + "_f");
|
|
|
- else
|
|
|
- using (AFileBase afileBase4 = GameUty.FileSystem.FileOpen("edit_pose_dg" + index1 + str + "_0" + index3 + "_f.anm"))
|
|
|
- if (afileBase4.IsValid())
|
|
|
- stringList5.Add("edit_pose_dg" + index1 + str + "_0" + index3 + "_f");
|
|
|
- }
|
|
|
+ for (int index2 = 0; index2 < 2; ++index2)
|
|
|
+ {
|
|
|
+ string str = "s";
|
|
|
+ if (index2 == 1)
|
|
|
+ str = "w";
|
|
|
+ for (int index3 = 1; index3 < 20; ++index3)
|
|
|
+ if (index3 < 10)
|
|
|
+ using (AFileBase afileBase3 =
|
|
|
+ GameUty.FileSystem.FileOpen("edit_pose_dg" + index1 + str + "_00" + index3 + "_f.anm"))
|
|
|
+ if (afileBase3.IsValid())
|
|
|
+ stringList5.Add("edit_pose_dg" + index1 + str + "_00" + index3 + "_f");
|
|
|
+ else
|
|
|
+ using (AFileBase afileBase4 =
|
|
|
+ GameUty.FileSystem.FileOpen("edit_pose_dg" + index1 + str + "_0" + index3 + "_f.anm"))
|
|
|
+ if (afileBase4.IsValid())
|
|
|
+ stringList5.Add("edit_pose_dg" + index1 + str + "_0" + index3 + "_f");
|
|
|
+ }
|
|
|
|
|
|
if (stringList5.Count > 0)
|
|
|
stringList4.AddRange(stringList5.ToArray());
|
|
@@ -962,19 +964,19 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
stringList4.AddRange(poseArray5);
|
|
|
stringList4.AddRange(poseArray6);
|
|
|
poseArray = stringList4.ToArray();
|
|
|
- ((Action<string, List<string>>)((path, result_list) =>
|
|
|
- {
|
|
|
- var files = Directory.GetFiles(path);
|
|
|
- this.countS = 0;
|
|
|
- for (int index = 0; index < files.Length; ++index)
|
|
|
- if (Path.GetExtension(files[index]) == ".anm")
|
|
|
- {
|
|
|
- strListS.Add(files[index].Split('\\')[files[index].Split('\\').Length - 1]
|
|
|
- .Split('.')[0] + " /"
|
|
|
- + files[index]);
|
|
|
- ++this.countS;
|
|
|
- }
|
|
|
- }))(Path.GetFullPath(".\\") + "Mod\\MultipleMaidsPose", new List<string>());
|
|
|
+ ((Action<string, List<string>>) ((path, result_list) =>
|
|
|
+ {
|
|
|
+ var files = Directory.GetFiles(path);
|
|
|
+ this.countS = 0;
|
|
|
+ for (int index = 0; index < files.Length; ++index)
|
|
|
+ if (Path.GetExtension(files[index]) == ".anm")
|
|
|
+ {
|
|
|
+ strListS.Add(files[index].Split('\\')[files[index].Split('\\').Length - 1]
|
|
|
+ .Split('.')[0] + " /"
|
|
|
+ + files[index]);
|
|
|
+ ++this.countS;
|
|
|
+ }
|
|
|
+ }))(Path.GetFullPath(".\\") + "Mod\\MultipleMaidsPose", new List<string>());
|
|
|
var list = GameUty.FileSystem.GetList("motion", AFileSystemBase.ListType.AllFile);
|
|
|
int num = 0;
|
|
|
var stringList6 = new List<string>();
|
|
@@ -1025,7 +1027,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
bool flag = false;
|
|
|
foreach (string str1 in strListS)
|
|
|
{
|
|
|
- var chArray = new char[1] { '/' };
|
|
|
+ var chArray = new char[1] {'/'};
|
|
|
string str2 = str1.Split(chArray)[0].Replace(" ", "");
|
|
|
if (withoutExtension == str2)
|
|
|
{
|
|
@@ -1098,7 +1100,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
IniKey iniKey = Preferences["pose"][key.Key];
|
|
|
if (iniKey.Value != null && iniKey.Value != "" && iniKey.Value != "del")
|
|
|
{
|
|
|
- stringList4.AddRange(new string[1] { key.Key });
|
|
|
+ stringList4.AddRange(new string[1] {key.Key});
|
|
|
existPose = true;
|
|
|
if (poseIniStr == "")
|
|
|
poseIniStr = key.Key;
|
|
@@ -1127,18 +1129,18 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
poseGroupArray = stringList7.ToArray();
|
|
|
groupList = new ArrayList();
|
|
|
for (int index1 = 0; index1 < poseArray.Length; ++index1)
|
|
|
- for (int index2 = 0; index2 < poseGroupArray.Length; ++index2)
|
|
|
- if (poseGroupArray[index2] == poseArray[index1])
|
|
|
- {
|
|
|
- groupList.Add(index1);
|
|
|
- if (poseGroupArray[index2] == strList2[0])
|
|
|
- sPoseCount = index1;
|
|
|
- }
|
|
|
+ for (int index2 = 0; index2 < poseGroupArray.Length; ++index2)
|
|
|
+ if (poseGroupArray[index2] == poseArray[index1])
|
|
|
+ {
|
|
|
+ groupList.Add(index1);
|
|
|
+ if (poseGroupArray[index2] == strList2[0])
|
|
|
+ sPoseCount = index1;
|
|
|
+ }
|
|
|
|
|
|
- var strArray1 = new string[1] { "Salon_Day" };
|
|
|
- var strArray2 = new string[2] { "SMRoom2", "LockerRoom" };
|
|
|
- var strArray3 = new string[2] { "Oheya", "MyBedRoom_NightOff" };
|
|
|
- var strArray4 = new string[4] { "ClassRoom", "ClassRoom_Play", "HoneymoonRoom", "OutletPark" };
|
|
|
+ var strArray1 = new string[1] {"Salon_Day"};
|
|
|
+ var strArray2 = new string[2] {"SMRoom2", "LockerRoom"};
|
|
|
+ var strArray3 = new string[2] {"Oheya", "MyBedRoom_NightOff"};
|
|
|
+ var strArray4 = new string[4] {"ClassRoom", "ClassRoom_Play", "HoneymoonRoom", "OutletPark"};
|
|
|
var strArray5 = new string[9]
|
|
|
{
|
|
|
"BigSight", "BigSight_Night", "PrivateRoom", "PrivateRoom_Night", "Sea", "Sea_Night", "Yashiki_Day", "Yashiki",
|
|
@@ -1149,7 +1151,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
"rotenburo", "rotenburo_night", "villa", "villa_night", "villa_bedroom", "villa_bedroom_night", "villa_farm",
|
|
|
"villa_farm_night"
|
|
|
};
|
|
|
- var strArray7 = new string[1] { "karaokeroom" };
|
|
|
+ var strArray7 = new string[1] {"karaokeroom"};
|
|
|
var stringList8 = new List<string>(50 + poseArray2.Length);
|
|
|
stringList8.AddRange(bgArray2);
|
|
|
var stringList9 = new List<string>();
|
|
@@ -1177,13 +1179,13 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
}
|
|
|
|
|
|
bgArray = stringList8.ToArray();
|
|
|
- var strArray8 = new string[3] { "dokidokifallinlove_short_inst", "dokidokifallinlove_short", "entrancetoyou_short" };
|
|
|
- var strArray9 = new string[1] { "scarlet leap_short" };
|
|
|
- var strArray10 = new string[3] { "stellarmytears_short", "stellarmytears_short2", "stellarmytears_short3" };
|
|
|
- var strArray11 = new string[1] { "RhythmixToYou" };
|
|
|
- var strArray12 = new string[3] { "happy_happy_scandal1", "happy_happy_scandal2", "happy_happy_scandal3" };
|
|
|
- var strArray13 = new string[1] { "can_know_two_close" };
|
|
|
- var strArray14 = new string[3] { "sweetsweeteveryday_short1", "sweetsweeteveryday_short2", "sweetsweeteveryday_short3" };
|
|
|
+ var strArray8 = new string[3] {"dokidokifallinlove_short_inst", "dokidokifallinlove_short", "entrancetoyou_short"};
|
|
|
+ var strArray9 = new string[1] {"scarlet leap_short"};
|
|
|
+ var strArray10 = new string[3] {"stellarmytears_short", "stellarmytears_short2", "stellarmytears_short3"};
|
|
|
+ var strArray11 = new string[1] {"RhythmixToYou"};
|
|
|
+ var strArray12 = new string[3] {"happy_happy_scandal1", "happy_happy_scandal2", "happy_happy_scandal3"};
|
|
|
+ var strArray13 = new string[1] {"can_know_two_close"};
|
|
|
+ var strArray14 = new string[3] {"sweetsweeteveryday_short1", "sweetsweeteveryday_short2", "sweetsweeteveryday_short3"};
|
|
|
var strArray15 = new string[5]
|
|
|
{
|
|
|
"bloomingdreaming_short", "kiminiaijodelicious_short", "luminousmoment_short", "nightmagicfire_short",
|
|
@@ -1208,30 +1210,30 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
stringList10.AddRange(strArray11);
|
|
|
stringList10.AddRange(strArray15);
|
|
|
bgmArray = stringList10.ToArray();
|
|
|
- var strArray16 = new string[2] { "OutletPark:54", "HoneymoonRoom:102" };
|
|
|
+ var strArray16 = new string[2] {"OutletPark:54", "HoneymoonRoom:102"};
|
|
|
var stringList12 = new List<string>(50 + parArray2.Length);
|
|
|
stringList12.AddRange(parArray2);
|
|
|
var enabled_id_list = new HashSet<int>();
|
|
|
- var action3 = (Action<string>)(file_name =>
|
|
|
- {
|
|
|
- file_name += ".nei";
|
|
|
- if (!GameUty.FileSystem.IsExistentFile(file_name))
|
|
|
- return;
|
|
|
- using (AFileBase file = GameUty.FileSystem.FileOpen(file_name))
|
|
|
- {
|
|
|
- using (var csvParser = new CsvParser())
|
|
|
- {
|
|
|
- NDebug.Assert(csvParser.Open(file), file_name + "\nopen failed.");
|
|
|
- for (int cell_y = 1; cell_y < csvParser.max_cell_y; ++cell_y)
|
|
|
- if (csvParser.IsCellToExistData(0, cell_y))
|
|
|
- {
|
|
|
- int cellAsInteger = csvParser.GetCellAsInteger(0, cell_y);
|
|
|
- if (!enabled_id_list.Contains(cellAsInteger))
|
|
|
- enabled_id_list.Add(cellAsInteger);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+ var action3 = (Action<string>) (file_name =>
|
|
|
+ {
|
|
|
+ file_name += ".nei";
|
|
|
+ if (!GameUty.FileSystem.IsExistentFile(file_name))
|
|
|
+ return;
|
|
|
+ using (AFileBase file = GameUty.FileSystem.FileOpen(file_name))
|
|
|
+ {
|
|
|
+ using (var csvParser = new CsvParser())
|
|
|
+ {
|
|
|
+ NDebug.Assert(csvParser.Open(file), file_name + "\nopen failed.");
|
|
|
+ for (int cell_y = 1; cell_y < csvParser.max_cell_y; ++cell_y)
|
|
|
+ if (csvParser.IsCellToExistData(0, cell_y))
|
|
|
+ {
|
|
|
+ int cellAsInteger = csvParser.GetCellAsInteger(0, cell_y);
|
|
|
+ if (!enabled_id_list.Contains(cellAsInteger))
|
|
|
+ enabled_id_list.Add(cellAsInteger);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
action3("desk_item_enabled_id");
|
|
|
for (int index = 0; index < GameUty.PathList.Count; ++index)
|
|
|
action3("desk_item_enabled_id_" + GameUty.PathList[index]);
|
|
@@ -1248,7 +1250,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
{
|
|
|
var itemData2 = new ItemData2(csv, index);
|
|
|
if (itemData2.asset_name != "")
|
|
|
- stringList12.AddRange(new string[1] { itemData2.name + " #" + itemData2.asset_name });
|
|
|
+ stringList12.AddRange(new string[1] {itemData2.name + " #" + itemData2.asset_name});
|
|
|
}
|
|
|
}
|
|
|
}
|