This commit is contained in:
CroakFang
2022-11-21 23:28:04 +08:00
parent de0c02e755
commit 168337893b
2 changed files with 9 additions and 6 deletions
+3 -2
View File
@@ -318,8 +318,8 @@ public class UmaViewerBuilder : MonoBehaviour
var p1 = CurrentUMAContainer.TearPrefab_1;
var t = headBone.transform;
CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 1));
CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 0));
CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 1));
CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 0));
CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 0));
}
@@ -338,9 +338,10 @@ public class UmaViewerBuilder : MonoBehaviour
emotionDriven.FaceDrivenKeyTarget = faceDriven;
emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData.ToList();
emotionDriven.Initialize();
CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent<AssetHolder>()._assetTable["head"];
}
CurrentUMAContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir));
CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent<AssetHolder>()._assetTable["head"];
CurrentUMAContainer.EyeHeight = CurrentUMAContainer.Head.GetComponent<AssetHolder>()._assetTableValue["head_center_offset_y"];
CurrentUMAContainer.MergeModel();
CurrentUMAContainer.Initialize();
@@ -39,6 +39,7 @@ public class TearController
TearObject_0 = tearPrefab_0;
AssetHolder0 = TearObject_0.GetComponent<AssetHolder>();
TearMaterial_0 = TearObject_0.GetComponentInChildren<SkinnedMeshRenderer>().material;
TearMaterial_0.SetFloat("_OffsetFactor", -100);
Animator_0 = TearObject_0.GetComponent<Animator>();
var clip = AssetHolder0._assetTable["default_animation"] as AnimationClip;
var controller = new AnimatorOverrideController(Animator_0.runtimeAnimatorController);
@@ -48,6 +49,7 @@ public class TearController
TearObject_1 = tearPrefab_1;
AssetHolder1 = TearObject_1.GetComponent<AssetHolder>();
TearMaterial_1 = TearObject_1.GetComponentInChildren<SkinnedMeshRenderer>().material;
TearMaterial_1.SetFloat("_OffsetFactor", -100);
Animator_1 = TearObject_1.GetComponent<Animator>();
clip = AssetHolder1._assetTable["default_animation"] as AnimationClip;
controller = new AnimatorOverrideController(Animator_1.runtimeAnimatorController);
@@ -68,15 +70,15 @@ public class TearController
CurrentDir = dir;
if (dir > 0)//RightEye
{
TearObject_0.transform.position = AttachBone_3_R.position + AttachBone_3_R.forward * 0.004f;
TearObject_1.transform.position = AttachBone_2_R.position + AttachBone_2_R.forward * 0.004f;
TearObject_0.transform.position = AttachBone_3_R.position;
TearObject_1.transform.position = AttachBone_2_R.position;
TearObject_0.transform.localScale = new Vector3(-1, 1, 1);
TearObject_1.transform.localScale = new Vector3(-1, 1, 1);
}
else//LeftEye
{
TearObject_0.transform.position = AttachBone_3_L.position + AttachBone_3_L.forward * 0.004f;
TearObject_1.transform.position = AttachBone_2_L.position + AttachBone_2_L.forward * 0.004f;
TearObject_0.transform.position = AttachBone_3_L.position;
TearObject_1.transform.position = AttachBone_2_L.position;
TearObject_0.transform.localScale = new Vector3(1, 1, 1);
TearObject_1.transform.localScale = new Vector3(1, 1, 1);
}