|
@@ -2272,10 +2272,11 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
TMorph morph = maid.body0.Face.morph;
|
|
|
float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
|
|
|
float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
|
|
|
+ float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
|
|
|
string str118 = str117
|
|
|
+ fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] + ","
|
|
|
+ fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] + ","
|
|
|
- + fieldValue2[(int)morph.hash["eyeclose3"]] + ","
|
|
|
+ + eyeclose3Arr[(int)morph.hash["eyeclose3"]] + ","
|
|
|
+ fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] + ","
|
|
|
+ fieldValue1[(int)morph.hash["hitomih"]] + ","
|
|
|
+ fieldValue1[(int)morph.hash["hitomis"]] + ","
|
|
@@ -4071,6 +4072,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
TMorph morph = maid.body0.Face.morph;
|
|
|
float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
|
|
|
float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
|
|
|
+ float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
|
|
|
if (!isVR)
|
|
|
{
|
|
|
maid.boMabataki = false;
|
|
@@ -4078,7 +4080,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] = float.Parse(strArray9[0]);
|
|
|
fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] = float.Parse(strArray9[1]);
|
|
|
- fieldValue2[(int)morph.hash["eyeclose3"]] = float.Parse(strArray9[2]);
|
|
|
+ eyeclose3Arr[(int)morph.hash["eyeclose3"]] = float.Parse(strArray9[2]);
|
|
|
fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] = float.Parse(strArray9[3]);
|
|
|
fieldValue1[(int)morph.hash["hitomih"]] = float.Parse(strArray9[4]);
|
|
|
fieldValue1[(int)morph.hash["hitomis"]] = float.Parse(strArray9[5]);
|
|
@@ -6353,10 +6355,11 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
TMorph morph = maidArray[selectMaidIndex].body0.Face.morph;
|
|
|
float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
|
|
|
float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
|
|
|
+ float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
|
|
|
|
|
|
eyeclose = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]];
|
|
|
eyeclose2 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]];
|
|
|
- eyeclose3 = fieldValue2[(int)morph.hash["eyeclose3"]];
|
|
|
+ eyeclose3 = eyeclose3Arr[(int)morph.hash["eyeclose3"]];
|
|
|
eyeclose6 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]];
|
|
|
hitomih = fieldValue1[(int)morph.hash["hitomih"]];
|
|
|
hitomis = fieldValue1[(int)morph.hash["hitomis"]];
|
|
@@ -6703,6 +6706,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
TMorph morph = maidArray[selectMaidIndex].body0.Face.morph;
|
|
|
float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
|
|
|
float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
|
|
|
+ float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
|
|
|
Maid maid = maidArray[selectMaidIndex];
|
|
|
maidArray[selectMaidIndex].boMabataki = false;
|
|
|
morph.EyeMabataki = 0.0f;
|
|
@@ -6710,7 +6714,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
maidArray[selectMaidIndex].body0.Face.morph.FixBlendValues_Face();
|
|
|
eyeclose = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]];
|
|
|
eyeclose2 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]];
|
|
|
- eyeclose3 = fieldValue2[(int)morph.hash["eyeclose3"]];
|
|
|
+ eyeclose3 = eyeclose3Arr[(int)morph.hash["eyeclose3"]];
|
|
|
eyeclose6 = fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]];
|
|
|
hitomih = fieldValue1[(int)morph.hash["hitomih"]];
|
|
|
hitomis = fieldValue1[(int)morph.hash["hitomis"]];
|
|
@@ -6935,10 +6939,11 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
TMorph morph = maidArray[selectMaidIndex].body0.Face.morph;
|
|
|
float[] fieldValue1 = GetFieldValue<TMorph, float[]>(morph, "BlendValues");
|
|
|
float[] fieldValue2 = GetFieldValue<TMorph, float[]>(morph, "BlendValuesBackup");
|
|
|
+ float[] eyeclose3Arr = morph.bodyskin.PartsVersion >= 120 ? fieldValue1 : fieldValue2;
|
|
|
|
|
|
fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose")]] = eyeclose;
|
|
|
fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose2")]] = eyeclose2;
|
|
|
- fieldValue2[(int)morph.hash["eyeclose3"]] = eyeclose3;
|
|
|
+ eyeclose3Arr[(int)morph.hash["eyeclose3"]] = eyeclose3;
|
|
|
fieldValue2[(int)morph.hash[EyeCloseFaceKey(morph.bodyskin, "eyeclose6")]] = eyeclose6;
|
|
|
fieldValue1[(int)morph.hash["hitomih"]] = hitomih;
|
|
|
fieldValue1[(int)morph.hash["hitomis"]] = hitomis;
|