|
@@ -4833,24 +4833,102 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
if ((ikMode[i] != 3 && ikMode[i] != 5 && ikMode[i] != 8) || ikMode[i] != ikModeOld[i]
|
|
if ((ikMode[i] != 3 && ikMode[i] != 5 && ikMode[i] != 8) || ikMode[i] != ikModeOld[i]
|
|
|| isChange[i])
|
|
|| isChange[i])
|
|
{
|
|
{
|
|
|
|
+ float gizmoSizeSpine = 0.2f;
|
|
|
|
+
|
|
|
|
+ gizmoNeck[i].Visible = false;
|
|
gizmoFootL[i].Visible = false;
|
|
gizmoFootL[i].Visible = false;
|
|
gizmoHandR[i].Visible = false;
|
|
gizmoHandR[i].Visible = false;
|
|
gizmoHandL[i].Visible = false;
|
|
gizmoHandL[i].Visible = false;
|
|
gizmoFootR[i].Visible = false;
|
|
gizmoFootR[i].Visible = false;
|
|
|
|
+ gizmoPelvis[i].Visible = false;
|
|
|
|
+
|
|
|
|
+ if (ikMode[i] == 2 || ikMode[i] == 1)
|
|
|
|
+ {
|
|
|
|
+ bool isDragging = GetFieldValue<GizmoRender, bool>(gizmoHandL[i], "is_drag_");
|
|
|
|
+
|
|
|
|
+ gizmoHandL[i].offsetScale = gizmoSizeSpine;
|
|
|
|
+ gizmoHandR[i].offsetScale = gizmoSizeSpine;
|
|
|
|
+ gizmoFootL[i].offsetScale = gizmoSizeSpine;
|
|
|
|
+ gizmoFootR[i].offsetScale = gizmoSizeSpine;
|
|
|
|
+
|
|
|
|
+ if (ikMode[i] == 2)
|
|
|
|
+ {
|
|
|
|
+ gizmoNeck[i].transform.position = Neck[i].transform.position;
|
|
|
|
+ gizmoHandL[i].transform.position = Spine1a2[i].transform.position;
|
|
|
|
+ gizmoHandR[i].transform.position = Spine12[i].transform.position;
|
|
|
|
+ gizmoFootL[i].transform.position = Spine0a2[i].transform.position;
|
|
|
|
+ gizmoFootR[i].transform.position = Spine2[i].transform.position;
|
|
|
|
+
|
|
|
|
+ if (isDragging)
|
|
|
|
+ {
|
|
|
|
+ Neck[i].transform.rotation = gizmoNeck[i].transform.rotation;
|
|
|
|
+ Spine1a2[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
|
|
+ Spine12[i].transform.rotation = gizmoHandR[i].transform.rotation;
|
|
|
|
+ Spine0a2[i].transform.rotation = gizmoFootL[i].transform.rotation;
|
|
|
|
+ Spine2[i].transform.rotation = gizmoFootR[i].transform.rotation;
|
|
|
|
+ }
|
|
|
|
+ gizmoNeck[i].transform.rotation = Neck[i].transform.rotation;
|
|
|
|
+ gizmoHandL[i].transform.rotation = Spine1a2[i].transform.rotation;
|
|
|
|
+ gizmoHandR[i].transform.rotation = Spine12[i].transform.rotation;
|
|
|
|
+ gizmoFootL[i].transform.rotation = Spine0a2[i].transform.rotation;
|
|
|
|
+ gizmoFootR[i].transform.rotation = Spine2[i].transform.rotation;
|
|
|
|
+
|
|
|
|
+ gizmoNeck[i].Visible = true;
|
|
|
|
+ gizmoHandL[i].Visible = true;
|
|
|
|
+ gizmoHandR[i].Visible = true;
|
|
|
|
+ gizmoFootL[i].Visible = true;
|
|
|
|
+ gizmoFootR[i].Visible = true;
|
|
|
|
+
|
|
|
|
+ gNeck[i].SetActive(false);
|
|
|
|
+ gSpine[i].SetActive(false);
|
|
|
|
+ gSpine0a[i].SetActive(false);
|
|
|
|
+ gSpine1[i].SetActive(false);
|
|
|
|
+ gSpine1a[i].SetActive(false);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ gizmoPelvis[i].transform.position = Pelvis2[i].transform.position;
|
|
|
|
+
|
|
|
|
+ if (isDragging)
|
|
|
|
+ {
|
|
|
|
+ Pelvis2[i].transform.rotation = gizmoPelvis[i].transform.rotation;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ gizmoPelvis[i].transform.rotation = Pelvis2[i].transform.rotation;
|
|
|
|
+
|
|
|
|
+ gizmoPelvis[i].Visible = true;
|
|
|
|
+
|
|
|
|
+ gPelvis[i].SetActive(false);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!isLock[i])
|
|
|
|
+ {
|
|
|
|
+ if (isDragging)
|
|
|
|
+ {
|
|
|
|
+ isStop[i] = true;
|
|
|
|
+ isLock[i] = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- bool fieldValue4 = GetFieldValue<GizmoRender, bool>(gizmoHandL[i], "is_drag_");
|
|
|
|
- bool fieldValue5 = GetFieldValue<GizmoRender, bool>(gizmoHandR[i], "is_drag_");
|
|
|
|
- bool fieldValue6 = GetFieldValue<GizmoRender, bool>(gizmoFootL[i], "is_drag_");
|
|
|
|
- bool fieldValue7 = GetFieldValue<GizmoRender, bool>(gizmoFootR[i], "is_drag_");
|
|
|
|
|
|
+ float gizmoSizeLimb = 0.25f;
|
|
|
|
+
|
|
|
|
+ gizmoHandL[i].offsetScale = gizmoSizeLimb;
|
|
|
|
+ gizmoHandR[i].offsetScale = gizmoSizeLimb;
|
|
|
|
+ gizmoFootL[i].offsetScale = gizmoSizeLimb;
|
|
|
|
+ gizmoFootR[i].offsetScale = gizmoSizeLimb;
|
|
|
|
+
|
|
|
|
+ bool isDragging = GetFieldValue<GizmoRender, bool>(gizmoHandL[i], "is_drag_");
|
|
|
|
+
|
|
if (ikMode[i] == 3)
|
|
if (ikMode[i] == 3)
|
|
{
|
|
{
|
|
gizmoHandL[i].transform.position = HandL1[i].transform.position;
|
|
gizmoHandL[i].transform.position = HandL1[i].transform.position;
|
|
gizmoHandR[i].transform.position = HandR1[i].transform.position;
|
|
gizmoHandR[i].transform.position = HandR1[i].transform.position;
|
|
gizmoFootL[i].transform.position = HandL2[i].transform.position;
|
|
gizmoFootL[i].transform.position = HandL2[i].transform.position;
|
|
gizmoFootR[i].transform.position = HandR2[i].transform.position;
|
|
gizmoFootR[i].transform.position = HandR2[i].transform.position;
|
|
- if (fieldValue4 || fieldValue5 || fieldValue6 || fieldValue7)
|
|
|
|
|
|
+ if (isDragging)
|
|
{
|
|
{
|
|
HandL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
HandL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
HandR1[i].transform.rotation = gizmoHandR[i].transform.rotation;
|
|
HandR1[i].transform.rotation = gizmoHandR[i].transform.rotation;
|
|
@@ -4871,7 +4949,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
gizmoHandR[i].transform.position = UpperArmR1[i].transform.position;
|
|
gizmoHandR[i].transform.position = UpperArmR1[i].transform.position;
|
|
gizmoFootL[i].transform.position = UpperArmL2[i].transform.position;
|
|
gizmoFootL[i].transform.position = UpperArmL2[i].transform.position;
|
|
gizmoFootR[i].transform.position = UpperArmR2[i].transform.position;
|
|
gizmoFootR[i].transform.position = UpperArmR2[i].transform.position;
|
|
- if (fieldValue4 || fieldValue5 || fieldValue6 || fieldValue7)
|
|
|
|
|
|
+ if (isDragging)
|
|
{
|
|
{
|
|
UpperArmL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
UpperArmL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
UpperArmR1[i].transform.rotation = gizmoHandR[i].transform.rotation;
|
|
UpperArmR1[i].transform.rotation = gizmoHandR[i].transform.rotation;
|
|
@@ -4893,7 +4971,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
gizmoHandR[i].transform.position = ForearmR1[i].transform.position;
|
|
gizmoHandR[i].transform.position = ForearmR1[i].transform.position;
|
|
gizmoFootL[i].transform.position = ForearmL2[i].transform.position;
|
|
gizmoFootL[i].transform.position = ForearmL2[i].transform.position;
|
|
gizmoFootR[i].transform.position = ForearmR2[i].transform.position;
|
|
gizmoFootR[i].transform.position = ForearmR2[i].transform.position;
|
|
- if (fieldValue4 || fieldValue5 || fieldValue6 || fieldValue7)
|
|
|
|
|
|
+ if (isDragging)
|
|
{
|
|
{
|
|
ForearmL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
ForearmL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
ForearmR1[i].transform.rotation = gizmoHandR[i].transform.rotation;
|
|
ForearmR1[i].transform.rotation = gizmoHandR[i].transform.rotation;
|
|
@@ -4914,13 +4992,15 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
gizmoHandR[i].Visible = true;
|
|
gizmoHandR[i].Visible = true;
|
|
gizmoFootL[i].Visible = true;
|
|
gizmoFootL[i].Visible = true;
|
|
gizmoFootR[i].Visible = true;
|
|
gizmoFootR[i].Visible = true;
|
|
|
|
+
|
|
gHandL[i].SetActive(false);
|
|
gHandL[i].SetActive(false);
|
|
gFootL[i].SetActive(false);
|
|
gFootL[i].SetActive(false);
|
|
gHandR[i].SetActive(false);
|
|
gHandR[i].SetActive(false);
|
|
gFootR[i].SetActive(false);
|
|
gFootR[i].SetActive(false);
|
|
|
|
+
|
|
if (!isLock[i])
|
|
if (!isLock[i])
|
|
{
|
|
{
|
|
- if (fieldValue4 || fieldValue5 || fieldValue6 || fieldValue7)
|
|
|
|
|
|
+ if (isDragging)
|
|
{
|
|
{
|
|
isStop[i] = true;
|
|
isStop[i] = true;
|
|
isLock[i] = true;
|
|
isLock[i] = true;
|
|
@@ -7041,7 +7121,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
kankyo2Flg = false;
|
|
kankyo2Flg = false;
|
|
bGui = true;
|
|
bGui = true;
|
|
|
|
|
|
- for(int i = 0; i < 10; i++)
|
|
|
|
|
|
+ for (int i = 0; i < 10; i++)
|
|
{
|
|
{
|
|
date[i] = "未保存";
|
|
date[i] = "未保存";
|
|
ninzu[i] = "";
|
|
ninzu[i] = "";
|
|
@@ -8821,7 +8901,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
if (isDanceChu)
|
|
if (isDanceChu)
|
|
{
|
|
{
|
|
- for(int j = 0; j < maidCnt; j++)
|
|
|
|
|
|
+ for (int j = 0; j < maidCnt; j++)
|
|
{
|
|
{
|
|
if (maidArray[j] && maidArray[j].Visible)
|
|
if (maidArray[j] && maidArray[j].Visible)
|
|
{
|
|
{
|
|
@@ -16997,7 +17077,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- for (i = 0; i < lightIndex.Count; i++)
|
|
|
|
|
|
+ for (i = 0; i < lightIndex.Count; i++)
|
|
{
|
|
{
|
|
if (gLight[0] == null)
|
|
if (gLight[0] == null)
|
|
{
|
|
{
|
|
@@ -17422,4 +17502,4 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-}
|
|
|
|
|
|
+}
|