This commit is contained in:
CroakFang
2023-09-18 01:28:05 +08:00
parent 2a0b8082c0
commit 423b22df4a
2 changed files with 25 additions and 16 deletions
@@ -995,32 +995,32 @@ namespace Gallop
EyeMorphs.ForEach(morph => morph.weight = 0);
if (updateInfo_.eyeNext != null)
if (updateInfo_.eyePrev != null)
{
if (weightRatio != 1)
{
foreach (var part in updateInfo_.eyeNext.facialPartsDataArrayL)
foreach (var part in updateInfo_.eyePrev.facialPartsDataArrayL)
{
if (part.FacialPartsId == 0) { continue; }
leftEyeMorph[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * weightRatio * ((float)updateInfo_.eyeCur.weight / 100));
leftEyeMorph[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * (1 - weightRatio)) * ((float)updateInfo_.eyePrev.weight / 100);
}
foreach (var part in updateInfo_.eyeNext.facialPartsDataArrayR)
foreach (var part in updateInfo_.eyePrev.facialPartsDataArrayR)
{
if (part.FacialPartsId == 0) { continue; }
rightEyeMorph[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * weightRatio * ((float)updateInfo_.eyeCur.weight / 100));
rightEyeMorph[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * (1 - weightRatio)) * ((float)updateInfo_.eyePrev.weight / 100);
}
}
else
{
foreach (var part in updateInfo_.eyeNext.facialPartsDataArrayL)
foreach (var part in updateInfo_.eyePrev.facialPartsDataArrayL)
{
if (part.FacialPartsId == 0) { continue; }
leftEyeMorph[part.FacialPartsId - 1].weight = part.WeightPer / 100;
leftEyeMorph[part.FacialPartsId - 1].weight = 0;
}
foreach (var part in updateInfo_.eyeNext.facialPartsDataArrayR)
foreach (var part in updateInfo_.eyePrev.facialPartsDataArrayR)
{
if (part.FacialPartsId == 0) { continue; }
rightEyeMorph[part.FacialPartsId - 1].weight = part.WeightPer / 100;
rightEyeMorph[part.FacialPartsId - 1].weight = 0;
}
}
}
@@ -387,18 +387,27 @@ namespace Gallop.Live
var characterStandPos = _liveTimelineControl.transform.Find("CharacterStandPos");
int counter = 0;
foreach (Transform trans in characterStandPos.GetComponentsInChildren<Transform>())
var standPos = characterStandPos.GetComponentsInChildren<Transform>();
var count = _liveTimelineControl.data.characterSettings.useHighPolygonModel.Length;
for (int i = 0; i < count; i++)
{
if (trans == characterStandPos)
if (i < characterStandPos.childCount)
{
continue;
var newObj = Instantiate(standPos[i + 1], transform);
newObj.gameObject.name = string.Format("CharacterObject{0}", counter);
charaObjs.Add(newObj.transform);
counter++;
}
else
{
var newObj = Instantiate(standPos[i % characterStandPos.childCount + 1], transform);
newObj.gameObject.name = string.Format("CharacterObject{0}", counter);
charaObjs.Add(newObj.transform);
counter++;
}
var newObj = Instantiate(trans, transform);
newObj.gameObject.name = string.Format("CharacterObject{0}", counter);
charaObjs.Add(newObj.transform);
counter++;
};
//Get live parts info
UmaDatabaseEntry partAsset = UmaViewerMain.Instance.AbList[string.Format(LIVE_PART_PATH, live.MusicId)];