From b5c8b13f6cfbd08fec7c282851f561c57aa69ff8 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Thu, 2 Mar 2023 11:11:01 +0800 Subject: [PATCH 1/2] bug fix --- Assets/Scenes/Version2.unity | 225 +++++++++--------- .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 36 +-- 2 files changed, 134 insertions(+), 127 deletions(-) diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 7e5fe1e..6cfb6c7 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -2702,10 +2702,10 @@ RectTransform: m_Father: {fileID: 733646225} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2034.2386, y: -30} - m_SizeDelta: {x: 413.69547, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &127647253 MonoBehaviour: @@ -3808,10 +3808,10 @@ RectTransform: m_Father: {fileID: 733646225} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1620.5432, y: -30} - m_SizeDelta: {x: 413.69547, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &197132282 GameObject: @@ -8288,10 +8288,10 @@ RectTransform: m_Father: {fileID: 1200264883} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 375, y: -15} - m_SizeDelta: {x: 250, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &399621055 MonoBehaviour: @@ -8772,9 +8772,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &418000890 MonoBehaviour: @@ -12955,10 +12955,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -702.18} - m_SizeDelta: {x: 283, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 220} m_Pivot: {x: 1, y: 0.5} --- !u!114 &548276325 MonoBehaviour: @@ -14890,10 +14890,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -912.18} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &673546063 MonoBehaviour: @@ -16327,10 +16327,10 @@ RectTransform: m_Father: {fileID: 1200264883} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 625, y: -45} - m_SizeDelta: {x: 250, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &695996366 MonoBehaviour: @@ -20232,10 +20232,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -1152.1799} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &842158913 MonoBehaviour: @@ -21276,10 +21276,10 @@ RectTransform: m_Father: {fileID: 1200264883} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 375, y: -45} - m_SizeDelta: {x: 250, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &886856743 MonoBehaviour: @@ -21665,10 +21665,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -832.18} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &893956226 MonoBehaviour: @@ -23216,10 +23216,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -20} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &991136001 MonoBehaviour: @@ -24553,10 +24553,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -572.18} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1046617016 MonoBehaviour: @@ -25760,10 +25760,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -1072.1799} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1111810906 MonoBehaviour: @@ -27525,10 +27525,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -1032.1799} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1198130886 MonoBehaviour: @@ -27796,10 +27796,10 @@ RectTransform: m_Father: {fileID: 733646225} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1413.6954, y: 60} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1200264884 MonoBehaviour: @@ -29182,10 +29182,10 @@ RectTransform: m_Father: {fileID: 1200264883} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 875, y: -15} - m_SizeDelta: {x: 250, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1259881232 MonoBehaviour: @@ -31120,10 +31120,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -992.18} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1340983838 MonoBehaviour: @@ -31253,10 +31253,10 @@ RectTransform: m_Father: {fileID: 1200264883} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 125, y: -45} - m_SizeDelta: {x: 250, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1342289416 MonoBehaviour: @@ -33122,10 +33122,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -1112.1799} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1443320127 MonoBehaviour: @@ -37835,10 +37835,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -952.18} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1664478986 MonoBehaviour: @@ -38698,10 +38698,10 @@ RectTransform: m_Father: {fileID: 1200264883} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 625, y: -15} - m_SizeDelta: {x: 250, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1690552083 MonoBehaviour: @@ -39000,7 +39000,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.000030517578} - m_SizeDelta: {x: 0, y: 1172.1799} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1704906817 MonoBehaviour: @@ -45830,10 +45830,10 @@ RectTransform: m_Father: {fileID: 1200264883} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 125, y: -15} - m_SizeDelta: {x: 250, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2011080538 MonoBehaviour: @@ -47017,6 +47017,7 @@ MonoBehaviour: _Global_FogMinDistance: {x: 0, y: 0, z: 0, w: 0} _Global_FogLength: {x: 0, y: 0, z: 0, w: 0} _RimHorizonOffset: 0 + _UVEmissivePower: 1 _AmbientColor: {r: 0, g: 0, b: 0, a: 0} scrollPosition: {x: 0, y: 0} --- !u!4 &2048991191 @@ -47731,10 +47732,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -872.18} - m_SizeDelta: {x: 283, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2091332067 MonoBehaviour: @@ -50652,9 +50653,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -286} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219665895574065 @@ -51160,9 +51161,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -57.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666109573094 @@ -51267,10 +51268,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -296.09} - m_SizeDelta: {x: 283, y: 512.18} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 512.18} m_Pivot: {x: 1, y: 0.5} --- !u!114 &6878219666121841225 MonoBehaviour: @@ -53517,9 +53518,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -171.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666841734894 @@ -54348,9 +54349,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -228.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667203546886 @@ -56060,9 +56061,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667749320559 @@ -56280,9 +56281,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -114.4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!1 &6878219667784581358 diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 01d1689..f00ee8d 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -453,7 +453,10 @@ namespace Gallop public void FacialResetAll() { - + if (Container.FaceOverrideData) + { + OverrideFace(Container.FaceOverrideData); + } FacialReset(BaseLEarMorph.trsArray); FacialReset(BaseREarMorph.trsArray); FacialReset(BaseLEyeBrowMorph.trsArray); @@ -462,10 +465,6 @@ namespace Gallop FacialReset(BaseREyeMorph.trsArray); FacialReset(BaseMouthMorph.trsArray); ApplyRotation(); - if (Container.FaceOverrideData) - { - OverrideFace(Container.FaceOverrideData); - } } public void FacialReset(List trsArrays) @@ -583,36 +582,45 @@ namespace Gallop public void OverrideFace(FaceOverrideData overrideData) { + Action, FaceOverrideReplaceDataSet[]> action = delegate (List morphs, FaceOverrideReplaceDataSet[] datalist) { foreach (var data in datalist) { if (data.IsOnlyBaseReplace) { - var morph = morphs.Find(m => m.weight > 0); + var replacemorph = GetMorphByType(morphs, data.BaseReplaceFaceType); + var morph = morphs.Find(m => (m.weight > 0 && m != replacemorph)); if (morph == null) { - GetMorphByType(morphs, data.BaseReplaceFaceType).weight = 1; + replacemorph.weight = 1; + break; } + replacemorph.weight = 0; } foreach (var arr in data.DataArray) { + List targetMorph = new List(); bool changed = false; - foreach(var src in arr.SrcArray) + foreach (var src in arr.SrcArray) { if (src == LiveTimelineDefine.FacialEyeId.Base) continue; var srcmorph = GetMorphByType(morphs, src); - if (srcmorph.weight > 0 && !changed) + foreach (var dst in arr.DstArray) { - changed = true; - foreach (var dst in arr.DstArray) + var dm = GetMorphByType(morphs, dst.Index); + if (!changed) { - GetMorphByType(morphs, dst.Index).weight = Mathf.Lerp(0, dst.Weight, srcmorph.weight); + var weight = (dst.Weight == 1 ? 1 : Mathf.Lerp(0, dst.Weight, srcmorph.weight)); + targetMorph.Add(delegate () { dm.weight = weight; }); } + if (srcmorph != dm) srcmorph.weight = 0; } - srcmorph.weight = 0; + changed = true; + } + targetMorph.ForEach(a => a.Invoke()); } } }; @@ -622,8 +630,6 @@ namespace Gallop action.Invoke(leftEyeMorph, overrideData.FaceOverrideArray); action.Invoke(rightEyeMorph, overrideData.FaceOverrideArray); } - - } public FacialMorph GetMorphByType(List morphs, LiveTimelineDefine.FacialEyeId Type) From 8165c1d8e76f338f581841dea4b9cf9dc4660287 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Tue, 7 Mar 2023 21:54:33 +0800 Subject: [PATCH 2/2] bug fix --- .../Assemblies/AOT/Newtonsoft.Json.dll.meta | 101 ++-- .../Standalone/Newtonsoft.Json.dll.meta | 95 ++-- Assets/Scenes/Version2.unity | 534 ++++++++++++++++-- Assets/Scripts/UmaViewerBuilder.cs | 212 +++---- Assets/Scripts/UmaViewerUI.cs | 9 + .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 24 +- .../umamusume/Gallop/FaceOverrideData.cs | 6 + 7 files changed, 713 insertions(+), 268 deletions(-) diff --git a/Assets/Plugins/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta b/Assets/Plugins/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta index ea21e1f..80c05ab 100644 --- a/Assets/Plugins/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta +++ b/Assets/Plugins/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta @@ -1,61 +1,90 @@ fileFormatVersion: 2 guid: 6a3c684705042f345975d924f6983e36 -timeCreated: 1466788352 -licenseType: Store PluginImporter: - serializedVersion: 1 + externalObjects: {} + serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - Android: + - first: + : Linux + second: + enabled: 0 + settings: + CPU: x86 + - first: + : OSXIntel + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + : OSXIntel64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + : SamsungTV + second: + enabled: 1 + settings: + STV_MODEL: STANDARD_13 + - first: + : Tizen + second: + enabled: 1 + settings: {} + - first: + Android: Android + second: enabled: 1 settings: CPU: AnyCPU - Any: + - first: + Any: + second: enabled: 0 settings: {} - Editor: + - first: + Editor: Editor + second: enabled: 0 settings: CPU: AnyCPU DefaultValueInitialized: true OS: AnyOS - Linux: - enabled: 0 - settings: - CPU: x86 - Linux64: - enabled: 0 - settings: - CPU: x86_64 - OSXIntel: + - first: + Standalone: Linux64 + second: enabled: 0 settings: CPU: AnyCPU - OSXIntel64: + - first: + Standalone: Win + second: enabled: 0 settings: CPU: AnyCPU - SamsungTV: - enabled: 1 + - first: + Standalone: Win64 + second: + enabled: 0 settings: - STV_MODEL: STANDARD_13 - Tizen: + CPU: AnyCPU + - first: + WebGL: WebGL + second: enabled: 1 settings: {} - WebGL: - enabled: 1 - settings: {} - Win: - enabled: 0 - settings: - CPU: AnyCPU - Win64: - enabled: 0 - settings: - CPU: AnyCPU - WindowsStoreApps: + - first: + Windows Store Apps: WindowsStoreApps + second: enabled: 1 settings: CPU: AnyCPU @@ -63,12 +92,16 @@ PluginImporter: PlaceholderPath: Assets/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll SDK: AnySDK ScriptingBackend: Il2Cpp - iOS: + - first: + iPhone: iOS + second: enabled: 1 settings: CompileFlags: FrameworkDependencies: - tvOS: + - first: + tvOS: tvOS + second: enabled: 1 settings: {} userData: diff --git a/Assets/Plugins/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll.meta b/Assets/Plugins/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll.meta index e130150..51d1c02 100644 --- a/Assets/Plugins/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll.meta +++ b/Assets/Plugins/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll.meta @@ -1,63 +1,92 @@ fileFormatVersion: 2 guid: 17aef65a15b471f468b5fbeb4ff0c6a1 -timeCreated: 1466788349 -licenseType: Store PluginImporter: - serializedVersion: 1 + externalObjects: {} + serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - Android: + - first: + : Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + : LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : OSXIntel + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : SamsungTV + second: + enabled: 0 + settings: + STV_MODEL: STANDARD_13 + - first: + Android: Android + second: enabled: 0 settings: CPU: AnyCPU - Any: + - first: + Any: + second: enabled: 0 settings: {} - Editor: + - first: + Editor: Editor + second: enabled: 1 settings: CPU: AnyCPU DefaultValueInitialized: true OS: AnyOS - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: + - first: + Standalone: Linux64 + second: enabled: 1 settings: CPU: AnyCPU - OSXIntel: + - first: + Standalone: OSXUniversal + second: enabled: 1 settings: CPU: AnyCPU - OSXIntel64: + - first: + Standalone: Win + second: enabled: 1 settings: CPU: AnyCPU - OSXUniversal: + - first: + Standalone: Win64 + second: enabled: 1 settings: CPU: AnyCPU - SamsungTV: - enabled: 0 - settings: - STV_MODEL: STANDARD_13 - Win: - enabled: 1 - settings: - CPU: AnyCPU - Win64: - enabled: 1 - settings: - CPU: AnyCPU - WindowsStoreApps: + - first: + Windows Store Apps: WindowsStoreApps + second: enabled: 0 settings: CPU: AnyCPU @@ -65,7 +94,9 @@ PluginImporter: PlaceholderPath: SDK: AnySDK ScriptingBackend: Il2Cpp - iOS: + - first: + iPhone: iOS + second: enabled: 0 settings: CompileFlags: diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index c36706c..ccf61d1 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -2220,8 +2220,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -972.18} - m_SizeDelta: {x: 283, y: 200} + m_AnchoredPosition: {x: 141.5, y: -485} + m_SizeDelta: {x: 283, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &93905315 MonoBehaviour: @@ -12667,8 +12667,8 @@ RectTransform: m_Father: {fileID: 1509401544} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0} - m_AnchorMax: {x: 0.2, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -13122,7 +13122,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &548276324 RectTransform: m_ObjectHideFlags: 0 @@ -13137,6 +13137,7 @@ RectTransform: - {fileID: 1798338064} - {fileID: 482905334} - {fileID: 1424772036} + - {fileID: 1623614604} - {fileID: 1516585111} m_Father: {fileID: 1704906816} m_RootOrder: 3 @@ -13144,7 +13145,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 220} + m_SizeDelta: {x: 0, y: 270} m_Pivot: {x: 1, y: 0.5} --- !u!114 &548276325 MonoBehaviour: @@ -23541,6 +23542,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 976913101} m_CullTransparentMesh: 1 +--- !u!1 &977343429 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 977343430} + - component: {fileID: 977343432} + - component: {fileID: 977343431} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &977343430 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977343429} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1026628212} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -12.6592, y: 0} + m_SizeDelta: {x: 25.3188, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &977343431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977343429} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Face Override + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 22 + m_fontSizeBase: 22 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &977343432 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977343429} + m_CullTransparentMesh: 1 --- !u!1 &979861613 GameObject: m_ObjectHideFlags: 0 @@ -24587,6 +24722,104 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1026628211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1026628212} + - component: {fileID: 1026628213} + m_Layer: 5 + m_Name: Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1026628212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026628211} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1378204231} + - {fileID: 977343430} + m_Father: {fileID: 1623614604} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -19.999924, y: 0} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1026628213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026628211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1378204232} + toggleTransition: 1 + graphic: {fileID: 1076609932} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: SetFaceOverrideEnable + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 1 --- !u!1 &1027345406 GameObject: m_ObjectHideFlags: 0 @@ -25566,6 +25799,81 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1076609930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1076609931} + - component: {fileID: 1076609933} + - component: {fileID: 1076609932} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1076609931 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1076609930} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1378204231} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1076609932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1076609930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1076609933 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1076609930} + m_CullTransparentMesh: 1 --- !u!1 &1080194893 GameObject: m_ObjectHideFlags: 0 @@ -32646,6 +32954,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1371850116} m_CullTransparentMesh: 1 +--- !u!1 &1378204230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1378204231} + - component: {fileID: 1378204233} + - component: {fileID: 1378204232} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1378204231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378204230} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1076609931} + m_Father: {fileID: 1026628212} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 57, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1378204232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378204230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1378204233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378204230} + m_CullTransparentMesh: 1 --- !u!1 &1385562999 GameObject: m_ObjectHideFlags: 0 @@ -35422,11 +35806,11 @@ RectTransform: m_Children: - {fileID: 833989149} m_Father: {fileID: 548276324} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -150} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: 283, y: 70} m_Pivot: {x: 0, y: 1} --- !u!1 &1522574862 @@ -36308,7 +36692,7 @@ MonoBehaviour: AnimationProgressText: {fileID: 1286450786} BackGroundList: {fileID: 394733025} BackGroundPageCtrl: {fileID: 2093223150} - BG_Canvas: {fileID: 1085021150} + BG_Canvas: {fileID: 0} BG_HSVPickerObj: {fileID: 582796021} BG_Image: {fileID: 1682865917} CharaIconDefault: {fileID: 21300000, guid: fcb07487bdd0f054f81d8865b4800c13, type: 3} @@ -36334,7 +36718,7 @@ MonoBehaviour: VMDButton: {fileID: 668484488} UpdateDBButton: {fileID: 1516377151} WorkModeDropdown: {fileID: 1909384047} - LanguageDropdown: {fileID: 308207822} + LanguageDropdown: {fileID: 0} TogglablePanels: - {fileID: 1974252710} - {fileID: 87578738} @@ -36365,6 +36749,7 @@ MonoBehaviour: isCriware: 0 isHeadFix: 0 EnableEyeTracking: 1 + EnableFaceOverride: 1 currentFaceDrivenKeyTarget: {fileID: 0} --- !u!114 &1564959568 MonoBehaviour: @@ -37497,6 +37882,51 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1623614603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1623614604} + - component: {fileID: 1623614605} + m_Layer: 5 + m_Name: FaceOverride + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1623614604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623614603} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1026628212} + m_Father: {fileID: 548276324} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 283, y: -175} + m_SizeDelta: {x: 283, y: 50} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &1623614605 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623614603} + m_CullTransparentMesh: 1 --- !u!1 &1625876556 GameObject: m_ObjectHideFlags: 0 @@ -46832,7 +47262,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.2, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -51966,9 +52396,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106.5, y: -286} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219665895574065 @@ -52474,9 +52904,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106.5, y: -57.2} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666109573094 @@ -52581,10 +53011,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 512.18} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 283, y: -296.09} + m_SizeDelta: {x: 283, y: 512.18} m_Pivot: {x: 1, y: 0.5} --- !u!114 &6878219666121841225 MonoBehaviour: @@ -52633,7 +53063,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &6878219666163837328 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52810,8 +53240,8 @@ RectTransform: m_Father: {fileID: 6878219666936031748} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.44444445, y: 0} + m_AnchorMax: {x: 0.44444445, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -53371,8 +53801,8 @@ RectTransform: m_Father: {fileID: 6878219666544244009} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.14285715, y: 0} + m_AnchorMax: {x: 0.14285715, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -53399,7 +53829,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.1764706, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -53854,8 +54284,8 @@ RectTransform: m_Father: {fileID: 6878219665908762028} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.18367347, y: 0} + m_AnchorMax: {x: 0.18367347, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -54318,7 +54748,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -54831,9 +55261,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106.5, y: -171.6} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666841734894 @@ -55662,9 +56092,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106.5, y: -228.8} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667203546886 @@ -56505,7 +56935,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.020408163, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -56532,7 +56962,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.14285715, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -56762,8 +57192,8 @@ RectTransform: m_Father: {fileID: 6878219665916883341} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -56790,7 +57220,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.18367347, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -57374,9 +57804,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106.5, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667749320559 @@ -57594,9 +58024,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106.5, y: -114.4} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!1 &6878219667784581358 @@ -57706,7 +58136,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.44444445, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -58049,8 +58479,8 @@ RectTransform: m_Father: {fileID: 6878219667285779259} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.1764706, y: 0} + m_AnchorMax: {x: 0.1764706, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -58262,8 +58692,8 @@ RectTransform: m_Father: {fileID: 6878219667784581359} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.020408163, y: 0} + m_AnchorMax: {x: 0.020408163, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 44e59c8..f289ebc 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -293,75 +293,7 @@ public class UmaViewerBuilder : MonoBehaviour CurrentUMAContainer.LoadPhysics(); //Need to load physics before loading FacialMorph //Load FacialMorph - if (CurrentUMAContainer.Head) - { - var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name.EndsWith("3d/animator/drivenkeylocator")); - var bundle = AssetBundle.LoadFromFile(locatorEntry.FilePath); - Main.LoadedBundles.Add(locatorEntry.Name, bundle); - var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject; - locator.name = "DrivenKeyLocator"; - - var headBone = (GameObject)CurrentUMAContainer.Head.GetComponent()._assetTable["head"]; - var eyeLocator_L = headBone.transform.Find("Eye_target_locator_L"); - var eyeLocator_R = headBone.transform.Find("Eye_target_locator_R"); - - var mangaEntry = Main.AbEffect.FindAll(a => a.Name.StartsWith("3d/effect/charaemotion/pfb_eff_chr_emo_eye")); - var mangaObjects = new List(); - mangaEntry.ForEach(entry => - { - AssetBundle ab = AssetBundle.LoadFromFile(entry.FilePath); - Main.LoadedBundles.Add(entry.Name, ab); - var obj = ab.LoadAsset(Path.GetFileNameWithoutExtension(entry.Name)) as GameObject; - obj.SetActive(false); - - var leftObj = Instantiate(obj, eyeLocator_L.transform); - new List(leftObj.GetComponentsInChildren()).ForEach(a => a.material.renderQueue = -1); - CurrentUMAContainer.LeftMangaObject.Add(leftObj); - - var RightObj = Instantiate(obj, eyeLocator_R.transform); - if (RightObj.TryGetComponent(out var holder)) - { - if (holder._assetTableValue["invert"] > 0) - RightObj.transform.localScale = new Vector3(-1, 1, 1); - } - new List(RightObj.GetComponentsInChildren()).ForEach(a => { a.material.renderQueue = -1; }); - CurrentUMAContainer.RightMangaObject.Add(RightObj); - }); - - var tearEntry = Main.AbChara.FindAll(a => a.Name.StartsWith("3d/chara/common/tear/") && a.Name.Contains("pfb_chr_tear")); - if (tearEntry.Count > 0) - { - tearEntry.ForEach(a => RecursiveLoadAsset(a)); - } - if (CurrentUMAContainer.TearPrefab_0 && CurrentUMAContainer.TearPrefab_1) - { - var p0 = CurrentUMAContainer.TearPrefab_0; - 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), 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)); - } - - var firsehead = CurrentUMAContainer.Head; - var faceDriven = firsehead.GetComponent()._assetTable["facial_target"] as FaceDrivenKeyTarget; - var earDriven = firsehead.GetComponent()._assetTable["ear_target"] as DrivenKeyTarget; - var faceOverride = firsehead.GetComponent()._assetTable["face_override"] as FaceOverrideData; - faceDriven._earTarget = earDriven._targetFaces; - CurrentUMAContainer.FaceDrivenKeyTarget = faceDriven; - CurrentUMAContainer.FaceDrivenKeyTarget.Container = CurrentUMAContainer; - CurrentUMAContainer.FaceOverrideData = faceOverride; - faceDriven.DrivenKeyLocator = locator.transform; - faceDriven.Initialize(firsehead.GetComponentsInChildren().ToList()); - - var emotionDriven = ScriptableObject.CreateInstance(); - emotionDriven.name = $"char{id}_{costumeId}_emotion_target"; - CurrentUMAContainer.FaceEmotionKeyTarget = emotionDriven; - emotionDriven.FaceDrivenKeyTarget = faceDriven; - emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData.ToList(); - emotionDriven.Initialize(); - } + LoadFaceMorph(id, costumeId); CurrentUMAContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir)); CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent()._assetTable["head"]; @@ -581,75 +513,7 @@ public class UmaViewerBuilder : MonoBehaviour CurrentUMAContainer.LoadPhysics(); //Need to load physics before loading FacialMorph //Load FacialMorph - if (CurrentUMAContainer.Head) - { - var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name.EndsWith("3d/animator/drivenkeylocator")); - var bundle = AssetBundle.LoadFromFile(locatorEntry.FilePath); - Main.LoadedBundles.Add(locatorEntry.Name, bundle); - var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject; - locator.name = "DrivenKeyLocator"; - - var headBone = (GameObject)CurrentUMAContainer.Head.GetComponent()._assetTable["head"]; - var eyeLocator_L = headBone.transform.Find("Eye_target_locator_L"); - var eyeLocator_R = headBone.transform.Find("Eye_target_locator_R"); - - var mangaEntry = Main.AbEffect.FindAll(a => a.Name.StartsWith("3d/effect/charaemotion/pfb_eff_chr_emo_eye")); - var mangaObjects = new List(); - mangaEntry.ForEach(entry => - { - AssetBundle ab = AssetBundle.LoadFromFile(entry.FilePath); - Main.LoadedBundles.Add(entry.Name, ab); - var obj = ab.LoadAsset(Path.GetFileNameWithoutExtension(entry.Name)) as GameObject; - obj.SetActive(false); - - var leftObj = Instantiate(obj, eyeLocator_L.transform); - new List(leftObj.GetComponentsInChildren()).ForEach(a => a.material.renderQueue = -1); - CurrentUMAContainer.LeftMangaObject.Add(leftObj); - - var RightObj = Instantiate(obj, eyeLocator_R.transform); - if (RightObj.TryGetComponent(out var holder)) - { - if (holder._assetTableValue["invert"] > 0) - RightObj.transform.localScale = new Vector3(-1, 1, 1); - } - new List(RightObj.GetComponentsInChildren()).ForEach(a => { a.material.renderQueue = -1; }); - CurrentUMAContainer.RightMangaObject.Add(RightObj); - }); - - var tearEntry = Main.AbChara.FindAll(a => a.Name.StartsWith("3d/chara/common/tear/") && a.Name.Contains("pfb_chr_tear")); - if (tearEntry.Count > 0) - { - tearEntry.ForEach(a => RecursiveLoadAsset(a)); - } - if (CurrentUMAContainer.TearPrefab_0 && CurrentUMAContainer.TearPrefab_1) - { - var p0 = CurrentUMAContainer.TearPrefab_0; - 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), 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)); - } - - var firsehead = CurrentUMAContainer.Head; - var faceDriven = firsehead.GetComponent()._assetTable["facial_target"] as FaceDrivenKeyTarget; - var earDriven = firsehead.GetComponent()._assetTable["ear_target"] as DrivenKeyTarget; - var faceOverride = firsehead.GetComponent()._assetTable["face_override"] as FaceOverrideData; - faceDriven._earTarget = earDriven._targetFaces; - CurrentUMAContainer.FaceDrivenKeyTarget = faceDriven; - CurrentUMAContainer.FaceDrivenKeyTarget.Container = CurrentUMAContainer; - CurrentUMAContainer.FaceOverrideData = faceOverride; - faceDriven.DrivenKeyLocator = locator.transform; - faceDriven.Initialize(firsehead.GetComponentsInChildren().ToList()); - - var emotionDriven = ScriptableObject.CreateInstance(); - emotionDriven.name = $"char{id}_{costumeId}_emotion_target"; - CurrentUMAContainer.FaceEmotionKeyTarget = emotionDriven; - emotionDriven.FaceDrivenKeyTarget = faceDriven; - emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData.ToList(); - emotionDriven.Initialize(); - } + LoadFaceMorph(id, costumeId); CurrentUMAContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir)); CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent()._assetTable["head"]; @@ -1500,6 +1364,78 @@ public class UmaViewerBuilder : MonoBehaviour } } + private void LoadFaceMorph(int id, string costumeId) + { + if (!CurrentUMAContainer.Head) return; + var locatorEntry = Main.AbList.FirstOrDefault(a => a.Name.EndsWith("3d/animator/drivenkeylocator")); + var bundle = AssetBundle.LoadFromFile(locatorEntry.FilePath); + Main.LoadedBundles.Add(locatorEntry.Name, bundle); + var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject; + locator.name = "DrivenKeyLocator"; + + var headBone = (GameObject)CurrentUMAContainer.Head.GetComponent()._assetTable["head"]; + var eyeLocator_L = headBone.transform.Find("Eye_target_locator_L"); + var eyeLocator_R = headBone.transform.Find("Eye_target_locator_R"); + + var mangaEntry = Main.AbEffect.FindAll(a => a.Name.StartsWith("3d/effect/charaemotion/pfb_eff_chr_emo_eye")); + var mangaObjects = new List(); + mangaEntry.ForEach(entry => + { + AssetBundle ab = AssetBundle.LoadFromFile(entry.FilePath); + Main.LoadedBundles.Add(entry.Name, ab); + var obj = ab.LoadAsset(Path.GetFileNameWithoutExtension(entry.Name)) as GameObject; + obj.SetActive(false); + + var leftObj = Instantiate(obj, eyeLocator_L.transform); + new List(leftObj.GetComponentsInChildren()).ForEach(a => a.material.renderQueue = -1); + CurrentUMAContainer.LeftMangaObject.Add(leftObj); + + var RightObj = Instantiate(obj, eyeLocator_R.transform); + if (RightObj.TryGetComponent(out var holder)) + { + if (holder._assetTableValue["invert"] > 0) + RightObj.transform.localScale = new Vector3(-1, 1, 1); + } + new List(RightObj.GetComponentsInChildren()).ForEach(a => { a.material.renderQueue = -1; }); + CurrentUMAContainer.RightMangaObject.Add(RightObj); + }); + + var tearEntry = Main.AbChara.FindAll(a => a.Name.StartsWith("3d/chara/common/tear/") && a.Name.Contains("pfb_chr_tear")); + if (tearEntry.Count > 0) + { + tearEntry.ForEach(a => RecursiveLoadAsset(a)); + } + if (CurrentUMAContainer.TearPrefab_0 && CurrentUMAContainer.TearPrefab_1) + { + var p0 = CurrentUMAContainer.TearPrefab_0; + 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), 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)); + } + + var firsehead = CurrentUMAContainer.Head; + var faceDriven = firsehead.GetComponent()._assetTable["facial_target"] as FaceDrivenKeyTarget; + var earDriven = firsehead.GetComponent()._assetTable["ear_target"] as DrivenKeyTarget; + var faceOverride = firsehead.GetComponent()._assetTable["face_override"] as FaceOverrideData; + faceDriven._earTarget = earDriven._targetFaces; + CurrentUMAContainer.FaceDrivenKeyTarget = faceDriven; + CurrentUMAContainer.FaceDrivenKeyTarget.Container = CurrentUMAContainer; + CurrentUMAContainer.FaceOverrideData = faceOverride; + faceOverride?.SetEnable(UI.EnableFaceOverride); + faceDriven.DrivenKeyLocator = locator.transform; + faceDriven.Initialize(firsehead.GetComponentsInChildren().ToList()); + + var emotionDriven = ScriptableObject.CreateInstance(); + emotionDriven.name = $"char{id}_{costumeId}_emotion_target"; + CurrentUMAContainer.FaceEmotionKeyTarget = emotionDriven; + emotionDriven.FaceDrivenKeyTarget = faceDriven; + emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData.ToList(); + emotionDriven.Initialize(); + } + private void LoadAnimation(AnimationClip clip) { if (clip.name.EndsWith("_S")) diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 55f4f2e..10596d9 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -126,6 +126,7 @@ public class UmaViewerUI : MonoBehaviour public bool isCriware = false; public bool isHeadFix = false; public bool EnableEyeTracking = true; + public bool EnableFaceOverride = true; public FaceDrivenKeyTarget currentFaceDrivenKeyTarget; @@ -999,6 +1000,14 @@ public class UmaViewerUI : MonoBehaviour Builder.CurrentUMAContainer.EnableEyeTracking = isOn; } } + public void SetFaceOverrideEnable(bool isOn) + { + EnableFaceOverride = isOn; + if (Builder.CurrentUMAContainer && Builder.CurrentUMAContainer.FaceOverrideData) + { + Builder.CurrentUMAContainer.FaceOverrideData.Enable = isOn; + } + } public void AudioPause() { diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index f00ee8d..e833a7e 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -273,7 +273,7 @@ namespace Gallop }); OtherMorphs.Add(FaceMangaMorph); - foreach(var tear in Container.TearControllers) + foreach (var tear in Container.TearControllers) { var index = Container.TearControllers.IndexOf(tear); FacialOtherMorph FaceTearMorph = new FacialOtherMorph() @@ -421,7 +421,7 @@ namespace Gallop property.BindMaterial.SetFloat(property.PropertyName, property.Value); break; case BindProperty.BindType.Select: - property.BindPrefab.ForEach(a=>a.SetActive((int)property.Value == property.BindPrefab.IndexOf(a))); + property.BindPrefab.ForEach(a => a.SetActive((int)property.Value == property.BindPrefab.IndexOf(a))); break; case BindProperty.BindType.EyeSelect: var count = property.BindPrefab.Count / 2; @@ -432,7 +432,7 @@ namespace Gallop case BindProperty.BindType.Enable: if (property.Value <= 0) { - property.BindPrefab.ForEach(a =>a.SetActive(false)); + property.BindPrefab.ForEach(a => a.SetActive(false)); } break; case BindProperty.BindType.TearSide: @@ -453,7 +453,7 @@ namespace Gallop public void FacialResetAll() { - if (Container.FaceOverrideData) + if (Container.FaceOverrideData&& Container.FaceOverrideData.Enable) { OverrideFace(Container.FaceOverrideData); } @@ -607,18 +607,21 @@ namespace Gallop { if (src == LiveTimelineDefine.FacialEyeId.Base) continue; var srcmorph = GetMorphByType(morphs, src); - foreach (var dst in arr.DstArray) + if (srcmorph.weight > 0 && !changed) { - var dm = GetMorphByType(morphs, dst.Index); - if (!changed) + foreach (var dst in arr.DstArray) { + var dm = GetMorphByType(morphs, dst.Index); var weight = (dst.Weight == 1 ? 1 : Mathf.Lerp(0, dst.Weight, srcmorph.weight)); targetMorph.Add(delegate () { dm.weight = weight; }); } - if (srcmorph != dm) srcmorph.weight = 0; + changed = true; } - changed = true; + if (new List(arr.DstArray).Find(f=>f.Index == src) == null) + { + srcmorph.weight = 0; + } } targetMorph.ForEach(a => a.Invoke()); } @@ -638,6 +641,3 @@ namespace Gallop } } } - - - diff --git a/Assets/Scripts/umamusume/Gallop/FaceOverrideData.cs b/Assets/Scripts/umamusume/Gallop/FaceOverrideData.cs index 0ce62f2..7e6df8d 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceOverrideData.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceOverrideData.cs @@ -6,11 +6,17 @@ namespace Gallop [Serializable] public class FaceOverrideData : ScriptableObject { + public bool Enable; private readonly string[] OverrideTypeText; public bool IsBothEyesSetting; public bool IsDisableEyeBlink; public FaceOverrideReplaceDataSet[] FaceOverrideArray; + public void SetEnable(bool val) + { + Enable = val; + } + public enum OverrideType { Invalid = -1,