From fece4442a9410622c11a451bdbfc980e5688820d Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Fri, 18 Nov 2022 20:44:46 +0800 Subject: [PATCH] Add Extrar Morph Support(WIP) --- Assets/Scenes/Version2.unity | 439 +----------------- Assets/Scripts/UmaContainer.cs | 53 ++- .../UmaDatabase/UmaDatabaseController.cs | 2 + Assets/Scripts/UmaViewerBuilder.cs | 161 +++++-- Assets/Scripts/UmaViewerMain.cs | 2 + Assets/Scripts/UmaViewerUI.cs | 78 +++- .../Scripts/umamusume/Gallop/AssetHolder.cs | 2 +- .../umamusume/Gallop/CySpringDataContainer.cs | 40 +- .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 322 ++++++++----- .../Scripts/umamusume/Gallop/FacialMorph.cs | 51 +- Assets/Scripts/umamusume/GallopExtras.cs | 31 ++ 11 files changed, 540 insertions(+), 641 deletions(-) diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index cffdaec..9701489 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -6977,104 +6977,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402119806} m_CullTransparentMesh: 1 ---- !u!1 &403583324 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 403583325} - - component: {fileID: 403583326} - m_Layer: 5 - m_Name: Toggle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &403583325 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 403583324} - 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: 517123990} - - {fileID: 2094966542} - m_Father: {fileID: 1757977351} - 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: 160, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &403583326 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 403583324} - 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: 517123991} - toggleTransition: 1 - graphic: {fileID: 538422403} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume - m_MethodName: SetBlushing - 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: 0 --- !u!1 &406861037 GameObject: m_ObjectHideFlags: 0 @@ -10330,82 +10232,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 512008711} m_CullTransparentMesh: 1 ---- !u!1 &517123989 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 517123990} - - component: {fileID: 517123992} - - component: {fileID: 517123991} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &517123990 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517123989} - 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: 538422402} - m_Father: {fileID: 403583325} - 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: 35.3, y: 0} - m_SizeDelta: {x: 35, y: 35} - m_Pivot: {x: 1, y: 0.5} ---- !u!114 &517123991 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517123989} - 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 &517123992 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517123989} - m_CullTransparentMesh: 1 --- !u!1 &523153147 GameObject: m_ObjectHideFlags: 0 @@ -10742,81 +10568,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 538060552} m_CullTransparentMesh: 1 ---- !u!1 &538422401 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 538422402} - - component: {fileID: 538422404} - - component: {fileID: 538422403} - m_Layer: 5 - m_Name: Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &538422402 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538422401} - 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: 517123990} - 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 &538422403 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538422401} - 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 &538422404 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538422401} - m_CullTransparentMesh: 1 --- !u!1 &538877080 GameObject: m_ObjectHideFlags: 0 @@ -11319,14 +11070,13 @@ RectTransform: - {fileID: 1798338064} - {fileID: 482905334} - {fileID: 1424772036} - - {fileID: 1757977351} m_Father: {fileID: 1704906816} 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_SizeDelta: {x: 0, y: 200} + m_SizeDelta: {x: 0, y: 149.6035} m_Pivot: {x: 1, y: 0.5} --- !u!114 &548276325 MonoBehaviour: @@ -23655,8 +23405,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1882365343} m_HandleRect: {fileID: 1882365342} m_Direction: 2 - m_Value: 1 - m_Size: 0.88527817 + m_Value: 0.9999985 + m_Size: 0.9257714 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -30437,6 +30187,7 @@ MonoBehaviour: EyeBrowList: {fileID: 1453269662} EyeList: {fileID: 1916293860} MouthList: {fileID: 586292660} + OtherList: {fileID: 1294280878} LiveList: {fileID: 1970310175} LiveSoundList: {fileID: 1678768233} LiveCharaSoundList: {fileID: 931406429} @@ -30488,7 +30239,6 @@ MonoBehaviour: isCriware: 0 isHeadFix: 0 EnableEyeTracking: 1 - IsCheekBlushing: 0 currentFaceDrivenKeyTarget: {fileID: 0} --- !u!114 &1564959568 MonoBehaviour: @@ -30515,6 +30265,8 @@ MonoBehaviour: cheekShader: {fileID: 0} eyebrowShader: {fileID: 0} alphaShader: {fileID: 0} + bodyAlphaShader: {fileID: 0} + bodyBehindAlphaShader: {fileID: 0} CurrentAudioSources: [] OverrideController: {fileID: 22100000, guid: 130057757529b0f40a4fdc08bf0861ef, type: 2} FaceOverrideController: {fileID: 22100000, guid: 21f82840716293147bcb9f4bfb58cc99, @@ -34458,51 +34210,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1756215861} m_CullTransparentMesh: 1 ---- !u!1 &1757977350 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1757977351} - - component: {fileID: 1757977352} - m_Layer: 5 - m_Name: CheekBlush - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1757977351 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757977350} - 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: 403583325} - 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 &1757977352 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757977350} - m_CullTransparentMesh: 1 --- !u!1 &1759556420 GameObject: m_ObjectHideFlags: 0 @@ -40782,140 +40489,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2094428665} m_CullTransparentMesh: 1 ---- !u!1 &2094966541 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2094966542} - - component: {fileID: 2094966544} - - component: {fileID: 2094966543} - 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 &2094966542 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2094966541} - 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: 403583325} - 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: -22.849878, y: 0} - m_SizeDelta: {x: 45.700245, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2094966543 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2094966541} - 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: Cheek Blushing - 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: 2 - 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 &2094966544 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2094966541} - m_CullTransparentMesh: 1 --- !u!1 &2097908526 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index f03b57d..80bd51d 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -19,9 +19,13 @@ public class UmaContainer : MonoBehaviour public AnimatorOverrideController OverrideController; public Animator UmaFaceAnimator; public AnimatorOverrideController FaceOverrideController; - public bool isAnimatorControl; + [Header("Body")] + public GameObject UpBodyBone; + public Vector3 UpBodyPosition; + public Quaternion UpBodyRotation; + [Header("Face")] public FaceDrivenKeyTarget FaceDrivenKeyTarget; public FaceEmotionKeyTarget FaceEmotionKeyTarget; @@ -29,15 +33,20 @@ public class UmaContainer : MonoBehaviour public GameObject TrackTarget; public float EyeHeight; public bool EnableEyeTracking = true; - - [Header("Body")] - public GameObject UpBodyBone; - public Vector3 UpBodyPosition; - public Quaternion UpBodyRotation; + public Material FaceMaterial; [Header("Cheek")] - public Texture CheekTex; - public Material CheekMaterial; + public Texture CheekTex_0; + public Texture CheekTex_1; + public Texture CheekTex_2; + + [Header("Manga")] + public List LeftMangaObject = new List(); + public List RightMangaObject = new List(); + + [Header("Tear")] + public List TearObjects_0 = new List(); + public List TearObjects_1 = new List(); [Header("Generic")] public bool IsGeneric = false; @@ -52,15 +61,16 @@ public class UmaContainer : MonoBehaviour public bool EnablePhysics = true; public List cySpringDataContainers; - [Header("Shader")] - public Material FaceMaterial; public void Initialize() { - EyeHeight = 0.1f; TrackTarget = Camera.main.gameObject; UpBodyPosition = UpBodyBone.transform.localPosition; UpBodyRotation = UpBodyBone.transform.localRotation; + + //Models must be merged before handling extra morphs + if (FaceDrivenKeyTarget) + FaceDrivenKeyTarget.ChangeMorphWeight(FaceDrivenKeyTarget.MouthMorphs[3], 1); } public void MergeModel() @@ -108,16 +118,16 @@ public class UmaContainer : MonoBehaviour child.SetParent(transform); } Tail.SetActive(false); //for debugging - emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); }); } + + emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); }); + //MergeAvatar UmaAnimator = gameObject.AddComponent(); UmaAnimator.avatar = AvatarBuilder.BuildGenericAvatar(gameObject, gameObject.name); OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController); UmaAnimator.runtimeAnimatorController = OverrideController; - - FaceMaterial = transform.Find("M_Face").GetComponent().material; } public void SetHeight(int scale) @@ -156,12 +166,17 @@ public class UmaContainer : MonoBehaviour public void LoadPhysics() { - cySpringDataContainers = new List(); - var springs = PhysicsController.GetComponentsInChildren(); - foreach (CySpringDataContainer spring in springs) + cySpringDataContainers = new List(PhysicsController.GetComponentsInChildren()); + var bones = new List(GetComponentsInChildren()); + var colliders = new List(); + + foreach (CySpringDataContainer spring in cySpringDataContainers) { - cySpringDataContainers.Add(spring); - spring.InitializePhysics(); + colliders.AddRange(spring.InitiallizeCollider(bones)); + } + foreach (CySpringDataContainer spring in cySpringDataContainers) + { + spring.InitializePhysics(bones, colliders); } } diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs index 5567310..3c07c85 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs @@ -36,6 +36,8 @@ public class UmaDatabaseController public static string MotionPath = "3d/motion/"; /// 3d/chara/ public static string CharaPath = "3d/chara/"; + /// 3d/effect/ + public static string EffectPath = "3d/effect/"; public IEnumerable MetaEntries; public IEnumerable CharaData; diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 22bd451..1785e0e 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -33,6 +33,8 @@ public class UmaViewerBuilder : MonoBehaviour public Shader cheekShader; public Shader eyebrowShader; public Shader alphaShader; + public Shader bodyAlphaShader; + public Shader bodyBehindAlphaShader; public List CurrentAudioSources = new List(); public List CurrentLyrics = new List(); @@ -239,7 +241,6 @@ public class UmaViewerBuilder : MonoBehaviour } } - if (tailId != 0) { string tailName = $"tail{tailId.ToString().PadLeft(4, '0')}_00"; @@ -268,33 +269,76 @@ 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(UmaDatabaseController.GetABPath(locatorEntry)); + 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(UmaDatabaseController.GetABPath(entry)); + 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); + bool invert = false; + if (RightObj.TryGetComponent(out var holder)) + { + if (holder._assetTableValue["invert"] > 0) + invert = true; + } + new List(RightObj.GetComponentsInChildren()).ForEach(a => { + a.material.renderQueue = -1; + if (invert) a.material.mainTextureScale = new Vector2(-1, 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)); + } + var firsehead = CurrentUMAContainer.Head; - var FaceDriven = firsehead.GetComponent()._assetTable.list.Find(a => a.Key.Equals("facial_target")).Value as FaceDrivenKeyTarget; - var EarDriven = firsehead.GetComponent()._assetTable.list.Find(a => a.Key.Equals("ear_target")).Value as DrivenKeyTarget; - FaceDriven._earTarget = EarDriven._targetFaces; - CurrentUMAContainer.FaceDrivenKeyTarget = FaceDriven; + var faceDriven = firsehead.GetComponent()._assetTable["facial_target"] as FaceDrivenKeyTarget; + var earDriven = firsehead.GetComponent()._assetTable["ear_target"] as DrivenKeyTarget; + faceDriven._earTarget = earDriven._targetFaces; + CurrentUMAContainer.FaceDrivenKeyTarget = faceDriven; CurrentUMAContainer.FaceDrivenKeyTarget.Container = CurrentUMAContainer; - FaceDriven.Initialize(firsehead.GetComponentsInChildren().ToList()); + 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.FaceDrivenKeyTarget = faceDriven; emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData.ToList(); emotionDriven.Initialize(); - CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent()._assetTable.list.FindLast(a => a.Key.Equals("head")).Value; + CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent()._assetTable["head"]; } - + CurrentUMAContainer.EyeHeight = CurrentUMAContainer.Head.GetComponent()._assetTableValue["head_center_offset_y"]; CurrentUMAContainer.MergeModel(); CurrentUMAContainer.Initialize(); - + CurrentUMAContainer.SetHeight(Convert.ToInt32(CurrentUMAContainer.CharaData["scale"])); LoadAsset(UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.EndsWith($"anm_eve_chr{id}_00_idle01_loop"))); } @@ -648,6 +692,8 @@ public class UmaViewerBuilder : MonoBehaviour cheekShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactermultiplycheek.shader"); eyebrowShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonmayu.shader"); alphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonhairtser.shader"); + bodyAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoontser.shader"); + bodyBehindAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonbehindtser.shader"); Main.ShadersLoaded = true; } } @@ -667,8 +713,11 @@ public class UmaViewerBuilder : MonoBehaviour LoadAnimation(aClip); } - if (!CurrentLiveContainer) - UnloadBundle(bundle, false); + if (CurrentLiveContainer|| aClip.name.Contains("tear")) + { + break; + } + UnloadBundle(bundle, false); break; } case GameObject go: @@ -694,6 +743,10 @@ public class UmaViewerBuilder : MonoBehaviour { LoadTail(go); } + else if (bundle.name.Contains("pfb_chr_tear")) + { + LoadTear(go); + } else { if (!IsSubAsset) @@ -736,7 +789,7 @@ public class UmaViewerBuilder : MonoBehaviour } else { - CurrentUMAContainer.UpBodyBone = CurrentUMAContainer.Body.GetComponent()._assetTable.list.Find(a => a.Key.Equals("upbody_ctrl")).Value as GameObject; + CurrentUMAContainer.UpBodyBone = CurrentUMAContainer.Body.GetComponent()._assetTable["upbody_ctrl"] as GameObject; } if (CurrentUMAContainer.IsGeneric) @@ -754,6 +807,7 @@ public class UmaViewerBuilder : MonoBehaviour foreach (Material m in r.sharedMaterials) { string mainTex = "", toonMap = "", tripleMap = "", optionMap = "", zekkenNumberTex = ""; + if (CurrentUMAContainer.IsMini) { @@ -761,6 +815,12 @@ public class UmaViewerBuilder : MonoBehaviour } else { + //BodyAlapha's shader need to change manually. + if (m.name.Contains("bdy") && m.name.Contains("Alpha")) + { + m.shader = bodyAlphaShader; + } + switch (costumeIdShort.Split('_')[0]) //costume ID { case "0001": @@ -827,6 +887,20 @@ public class UmaViewerBuilder : MonoBehaviour } } } + else + { + foreach (Renderer r in CurrentUMAContainer.Body.GetComponentsInChildren()) + { + foreach (Material m in r.sharedMaterials) + { + //BodyAlapha's shader need to change manually. + if (m.name.Contains("bdy") && m.name.Contains("Alpha")) + { + m.shader = bodyAlphaShader; + } + } + } + } } private void LoadHead(GameObject go) @@ -876,19 +950,14 @@ public class UmaViewerBuilder : MonoBehaviour { m.shader = alphaShader; } + //Blush Setting if (r.name.Contains("Cheek")) { - CurrentUMAContainer.CheekMaterial = m; - CurrentUMAContainer.CheekTex = CurrentUMAContainer.Head.GetComponent()._assetTable.list.Find(a => a.Key.Equals("cheek1")).Value as Texture; - if (UI.IsCheekBlushing) - { - m.SetTexture("_MainTex", CurrentUMAContainer.CheekTex); - } - else - { - m.SetTexture("_MainTex", null); - } + var table = CurrentUMAContainer.Head.GetComponent()._assetTable.list; + CurrentUMAContainer.CheekTex_0 = table.FindLast(a => a.Key.Equals("cheek0")).Value as Texture; + CurrentUMAContainer.CheekTex_1 = table.FindLast(a => a.Key.Equals("cheek1")).Value as Texture; + CurrentUMAContainer.CheekTex_2 = table.FindLast(a => a.Key.Equals("cheek2")).Value as Texture; } switch (m.shader.name) { @@ -926,9 +995,9 @@ public class UmaViewerBuilder : MonoBehaviour //} } - private void LoadTail(GameObject gameObject) + private void LoadTail(GameObject go) { - CurrentUMAContainer.Tail = Instantiate(gameObject, CurrentUMAContainer.transform); + CurrentUMAContainer.Tail = Instantiate(go, CurrentUMAContainer.transform); var textures = CurrentUMAContainer.TailTextures; foreach (Renderer r in CurrentUMAContainer.Tail.GetComponentsInChildren()) { @@ -956,6 +1025,45 @@ public class UmaViewerBuilder : MonoBehaviour } } + private void LoadTear(GameObject go) + { + if (CurrentUMAContainer) + { + var headBone = (GameObject)CurrentUMAContainer.Head.GetComponent()._assetTable["head"]; + var attachBone_2_L = headBone.transform.Find("Eye_tear_attach_02_L"); + var attachBone_2_R = headBone.transform.Find("Eye_tear_attach_02_R"); + var attachBone_3_L = headBone.transform.Find("Eye_tear_attach_03_L"); + var attachBone_3_R = headBone.transform.Find("Eye_tear_attach_03_R"); + var ani = go.GetComponent(); + var controller = new AnimatorOverrideController(ani.runtimeAnimatorController); + controller["anm_tear000_00"] = go.GetComponent()._assetTable["default_animation"] as AnimationClip; + ani.runtimeAnimatorController = controller; + + if (go.name.EndsWith("000")) + { + for(int i = 0; i < 4; i++) + { + var obj = Instantiate(go, headBone.transform); + var attachBone = (i % 2 == 0 ? attachBone_3_L : attachBone_3_R); + obj.transform.SetPositionAndRotation(attachBone.TransformPoint(Vector3.zero), attachBone.transform.rotation); + CurrentUMAContainer.TearObjects_0.Add(obj); + } + } + else if(go.name.EndsWith("001")) + { + for (int i = 0; i < 4; i++) + { + var obj = Instantiate(go, headBone.transform); + var animator = obj.GetComponent(); + Debug.LogError(animator.GetCurrentAnimatorClipInfo(0)[0].clip.name); + var attachBone = (i % 2 == 0 ? attachBone_2_L : attachBone_2_R); + obj.transform.SetPositionAndRotation(attachBone.TransformPoint(Vector3.zero), attachBone.transform.rotation); + CurrentUMAContainer.TearObjects_1.Add(obj); + } + } + } + } + private void LoadAnimation(AnimationClip clip) { bool needTransit = false; @@ -1169,6 +1277,7 @@ public class UmaViewerBuilder : MonoBehaviour Destroy(CurrentLiveContainer.gameObject); } } + public void UnloadUma() { if (CurrentUMAContainer != null) diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index edae346..cde8f8f 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -18,6 +18,7 @@ public class UmaViewerMain : MonoBehaviour public List AbMotions = new List(); public List AbSounds = new List(); public List AbChara = new List(); + public List AbEffect = new List(); [Header("Asset Memory")] public bool ShadersLoaded = false; @@ -30,6 +31,7 @@ public class UmaViewerMain : MonoBehaviour AbList = UmaDatabaseController.Instance.MetaEntries.ToList(); AbChara = AbList.Where(ab => ab.Name.StartsWith(UmaDatabaseController.CharaPath)).ToList(); AbMotions = AbList.Where(ab => ab.Name.StartsWith(UmaDatabaseController.MotionPath)).ToList(); + AbEffect = AbList.Where(ab => ab.Name.StartsWith(UmaDatabaseController.EffectPath)).ToList(); AbSounds = AbList.Where(ab => ab.Name.EndsWith(".awb") || ab.Name.EndsWith(".acb")).ToList(); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 0ad1d41..bcc3241 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -38,6 +38,7 @@ public class UmaViewerUI : MonoBehaviour public ScrollRect EyeBrowList; public ScrollRect EyeList; public ScrollRect MouthList; + public ScrollRect OtherList; public ScrollRect LiveList; public ScrollRect LiveSoundList; public ScrollRect LiveCharaSoundList; @@ -84,7 +85,6 @@ public class UmaViewerUI : MonoBehaviour public bool isCriware = false; public bool isHeadFix = false; public bool EnableEyeTracking = true; - public bool IsCheekBlushing = false; public FaceDrivenKeyTarget currentFaceDrivenKeyTarget; @@ -219,12 +219,55 @@ public class UmaViewerUI : MonoBehaviour { foreach (FacialMorph morph in targetMorph) { - var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent(); - container.Name = morph.name + " (" + morph.tag + ")"; - container.Slider.value = morph.weight; - container.Slider.maxValue = 1; - container.Slider.minValue = morph.tag.Contains("Range") ? -1 : 0; - container.Slider.onValueChanged.AddListener((a) => { target.ChangeMorphWeight(morph, a); }); + if(morph is FacialExtraMorph extraMorph) + { + foreach(var prop in extraMorph.BindProperties) + { + var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent(); + container.Name = $"{morph.name}_{extraMorph.BindProperties.IndexOf(prop)}_{prop.Type}"; + container.Slider.value = prop.Value; + switch (prop.Type) + { + case BindProperty.BindType.Shader: + case BindProperty.BindType.Texture: + container.Slider.maxValue = 1; + container.Slider.minValue = 0; + break; + case BindProperty.BindType.Select: + container.Slider.wholeNumbers = true; + container.Slider.maxValue = prop.BindPrefab.Count - 1; + container.Slider.minValue = 0; + break; + case BindProperty.BindType.EyeSelect: + container.Slider.wholeNumbers = true; + container.Slider.maxValue = prop.BindPrefab.Count/2 - 1; + container.Slider.minValue = 0; + break; + case BindProperty.BindType.Bool: + container.Slider.wholeNumbers = true; + container.Slider.maxValue = 1; + container.Slider.minValue = 0; + break; + } + container.Slider.onValueChanged.AddListener((a) => { + target.ChangeMorphWeight(prop, a); + if(prop.Type == BindProperty.BindType.Bool&& morph.name.Contains("Manga")) + { + target.ChangeMorphWeight(target.EyeMorphs[42], container.Slider.value > 0 ? 1 : 0); + target.ChangeMorphWeight(target.EyeMorphs[43], container.Slider.value > 0 ? 1 : 0); + } + }); + } + } + else + { + var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent(); + container.Name = $"{morph.name}({morph.tag})"; + container.Slider.value = morph.weight; + container.Slider.maxValue = 1; + container.Slider.minValue = morph.tag.Contains("Range") ? -1 : 0; + container.Slider.onValueChanged.AddListener((a) => { target.ChangeMorphWeight(morph, a); }); + } } } @@ -244,6 +287,8 @@ public class UmaViewerUI : MonoBehaviour InstantiateFacialPart(UmaContainerSliderPrefab, target, target.EyeMorphs, EyeList); InstantiateFacialPart(UmaContainerSliderPrefab, target, target.MouthMorphs, MouthList); + List targetMorph = new List(target.OtherMorphs); + InstantiateFacialPart(UmaContainerSliderPrefab, target, targetMorph, OtherList); } public void UpdateFacialPanels() @@ -658,24 +703,7 @@ public class UmaViewerUI : MonoBehaviour } } - public void SetBlushing(bool isOn) - { - IsCheekBlushing = isOn; - if (Builder.CurrentUMAContainer) - { - if (Builder.CurrentUMAContainer.CheekMaterial) - { - if (isOn) - { - Builder.CurrentUMAContainer.CheekMaterial.SetTexture("_MainTex", Builder.CurrentUMAContainer.CheekTex); - } - else - { - Builder.CurrentUMAContainer.CheekMaterial.SetTexture("_MainTex", null); - } - } - } - } + public void AudioPause() { diff --git a/Assets/Scripts/umamusume/Gallop/AssetHolder.cs b/Assets/Scripts/umamusume/Gallop/AssetHolder.cs index 828f921..07cb264 100644 --- a/Assets/Scripts/umamusume/Gallop/AssetHolder.cs +++ b/Assets/Scripts/umamusume/Gallop/AssetHolder.cs @@ -7,6 +7,6 @@ namespace Gallop public class AssetHolder : MonoBehaviour { [SerializeField] public AssetTable _assetTable; - [SerializeField] private AssetTableValue _assetTableValue; + [SerializeField] public AssetTableValue _assetTableValue; } } diff --git a/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs b/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs index 92a97ab..70eee15 100644 --- a/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs +++ b/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs @@ -26,24 +26,14 @@ namespace Gallop public float HipMoveInfluenceMaxDistance; public List DynamicBones = new List(); - - private void Awake() - { - //InitializePhysics(); - } - public void InitializePhysics() - { - DynamicBones.Clear(); - List gameObjects = new List(); - gameObjects.AddRange(transform.parent.transform.parent.GetComponentsInChildren()); - - List colliders = new List(); + public List InitiallizeCollider(List bones) + { + var colliders = new List(); foreach (CySpringCollisionData collider in collisionParam) { if (collider._isInner) continue; - - var bone = gameObjects.Find(a => { return a.name == collider._targetObjectName; }); + var bone = bones.Find(a => { return a.name == collider._targetObjectName; }); if (bone) { @@ -52,6 +42,7 @@ namespace Gallop child.transform.localPosition = Vector3.zero; child.transform.localRotation = Quaternion.identity; child.transform.localScale = Vector3.one; + colliders.Add(child); switch (collider._type) { @@ -64,7 +55,6 @@ namespace Gallop dynamic.m_Height = (collider._offset - collider._offset2).magnitude + collider._radius; dynamic.m_Radius = collider._radius; dynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; - colliders.Add(dynamic); break; case CySpringCollisionData.CollisionType.Sphere: var Spheredynamic = child.AddComponent(); @@ -73,25 +63,27 @@ namespace Gallop Spheredynamic.m_Radius = collider._radius; Spheredynamic.m_Height = collider._distance; Spheredynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; - colliders.Add(Spheredynamic); break; case CySpringCollisionData.CollisionType.Plane: var planedynamic = child.AddComponent(); planedynamic.ColliderName = collider._collisionName; child.transform.localPosition = collider._offset; planedynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; - colliders.Add(planedynamic); break; case CySpringCollisionData.CollisionType.None: break; } } } + return colliders; + } - - foreach(CySpringParamDataElement spring in springParam) + public void InitializePhysics(List bones, List colliders) + { + DynamicBones.Clear(); + foreach (CySpringParamDataElement spring in springParam) { - var bone = gameObjects.Find(a => { return a.name == spring._boneName; }); + var bone = bones.Find(a => { return a.name == spring._boneName; }); if (bone) { bool isTail = gameObject.name.Contains("tail");//The tail needs less traction @@ -112,14 +104,13 @@ namespace Gallop dynamic.m_Damping = 0.2f; dynamic.m_Stiffness = Mathf.Clamp01(45 / spring._stiffnessForce); dynamic.m_Elasticity = Mathf.Clamp01(45 / spring._dragForce); - + } dynamic.m_Radius = spring._collisionRadius; - dynamic.m_Friction = 0.5f; dynamic.m_Inert = spring.MoveSpringApplyRate / 3; dynamic.SetupParticles(); DynamicBones.Add(dynamic); - + foreach (string collisionName in spring._collisionNameList) { var tmp = colliders.Find(a => { return a.gameObject.name == collisionName; }); @@ -130,7 +121,7 @@ namespace Gallop } foreach (CySpringParamDataChildElement Childcollision in spring._childElements) { - + var tempParticle = dynamic.Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; }); if (tempParticle != null) { @@ -146,7 +137,6 @@ namespace Gallop tempParticle.m_Stiffness = Mathf.Clamp01(45 / Childcollision._stiffnessForce); tempParticle.m_Elasticity = Mathf.Clamp01(45 / Childcollision._dragForce); } - tempParticle.m_Friction = 0.5f; tempParticle.m_Inert = Childcollision.MoveSpringApplyRate / 3; tempParticle.m_Radius = Childcollision._collisionRadius; tempParticle.m_LimitAngel_Min = Childcollision._limitAngleMin; diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index b58e77d..747507b 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -8,6 +8,8 @@ namespace Gallop { public class FaceDrivenKeyTarget : ScriptableObject { + public UmaContainer Container; + public List _eyeTarget; public List _eyebrowTarget; public List _mouthTarget; @@ -20,18 +22,19 @@ namespace Gallop private FacialMorph BaseMouthMorph; public FacialMorph LeftEyeXrange, LeftEyeYrange, RightEyeXrange, RightEyeYrange; + public List EarMorphs = new List(); public List EyeBrowMorphs = new List(); public List EyeMorphs = new List(); public List MouthMorphs = new List(); + public List OtherMorphs = new List(); - public GameObject DrivenKeyLocator; - public GameObject EyeballCtrl_L_Locator, EyeballCtrl_R_Locator, EyeballCtrl_All_Locator; - - public UmaContainer Container; + public Transform DrivenKeyLocator; + public Transform EyeballCtrl_L_Locator, EyeballCtrl_R_Locator, EyeballCtrl_All_Locator; Dictionary RotationRecorder = new Dictionary(); Dictionary ParticleRecorder = new Dictionary(); + public void Initialize(List objs) { Objs = objs; @@ -50,7 +53,6 @@ namespace Gallop for (int j = 0; j < _earTarget[i]._faceGroupInfo.Count; j++) { FacialMorph morph = new FacialMorph(); - morph.target = this; morph.direction = j > 0; morph.name = "Ear_" + i + "_" + (morph.direction ? "L" : "R"); morph.tag = Enum.GetName(typeof(EarType), i); @@ -82,7 +84,6 @@ namespace Gallop for (int j = 0; j < _eyebrowTarget[i]._faceGroupInfo.Count; j++) { FacialMorph morph = new FacialMorph(); - morph.target = this; morph.direction = j > 0; morph.name = "EyeBrow_" + i + "_" + (morph.direction ? "L" : "R"); morph.tag = Enum.GetName(typeof(LiveTimelineDefine.FacialEyebrowId), i); @@ -108,7 +109,6 @@ namespace Gallop for (int j = 0; j < _eyeTarget[i]._faceGroupInfo.Count; j++) { FacialMorph morph = new FacialMorph(); - morph.target = this; morph.direction = j > 0; morph.name = "Eye_" + i + "_" + (morph.direction ? "L" : "R"); morph.tag = Enum.GetName(typeof(LiveTimelineDefine.FacialEyeId), i); @@ -145,7 +145,6 @@ namespace Gallop for (int j = 0; j < _mouthTarget[i]._faceGroupInfo.Count; j++) { FacialMorph morph = new FacialMorph(); - morph.target = this; morph.direction = j > 0; morph.name = "Mouth_" + i + "_" + j; morph.tag = Enum.GetName(typeof(LiveTimelineDefine.FacialMouthId), i); @@ -165,105 +164,168 @@ namespace Gallop } } - ChangeMorphWeight(MouthMorphs[3], 1); + InitializeExtra(); SetupAnimator(); + if (UmaViewerUI.Instance) - { UmaViewerUI.Instance.LoadFacialPanels(this); + } + + public void InitializeExtra() + { + if (Container.CheekTex_0) + { + var CheekMorph = new FacialExtraMorph + { + name = "Cheek_Ctrl", + locator = DrivenKeyLocator.Find("Cheek_Ctrl"), + BindGameObject = Container.Head.transform.Find("M_Cheek").gameObject + }; + var bindMaterial = CheekMorph.BindGameObject.GetComponent().material; + + BindProperty cheekProperty = new BindProperty() + { + BindMaterial = bindMaterial, + Part = BindProperty.LocatorPart.ScaX, + Type = BindProperty.BindType.Texture, + BindTexture = Container.CheekTex_0, + PropertyName = "_CheekRate" + }; + CheekMorph.BindProperties.Add(cheekProperty); + + if (Container.CheekTex_1) + { + BindProperty cheekProperty1 = new BindProperty() + { + BindMaterial = bindMaterial, + Part = BindProperty.LocatorPart.ScaY, + Type = BindProperty.BindType.Texture, + BindTexture = Container.CheekTex_1, + PropertyName = "_CheekRate" + }; + CheekMorph.BindProperties.Add(cheekProperty1); + } + + if (Container.CheekTex_2) + { + BindProperty cheekProperty2 = new BindProperty() + { + BindMaterial = bindMaterial, + Part = BindProperty.LocatorPart.ScaZ, + Type = BindProperty.BindType.Texture, + BindTexture = Container.CheekTex_2, + PropertyName = "_CheekRate" + }; + CheekMorph.BindProperties.Add(cheekProperty2); + } + OtherMorphs.Add(CheekMorph); } + + Container.FaceMaterial = Container.Head.transform.Find("M_Face").GetComponent().material; + if (Container.FaceMaterial) + { + FacialExtraMorph FaceShadowMorph = new FacialExtraMorph() + { + name = "Shade_Ctrl", + locator = DrivenKeyLocator.Find("Shade_Ctrl") + }; + FaceShadowMorph.BindProperties.Add( + new BindProperty() + { + BindMaterial = Container.FaceMaterial, + Part = BindProperty.LocatorPart.ScaX, + Type = BindProperty.BindType.Shader, + PropertyName = "_faceShadowAlpha" + }); + OtherMorphs.Add(FaceShadowMorph); + } + + FacialExtraMorph FaceMangaMorph = new FacialExtraMorph() + { + name = "Manga_Ctrl", + locator = DrivenKeyLocator.Find("Manga_Ctrl") + }; + + var mangaObjects = new List(); + mangaObjects.AddRange(Container.LeftMangaObject); + mangaObjects.AddRange(Container.RightMangaObject); + FaceMangaMorph.BindProperties.Add(new BindProperty() + { + Part = BindProperty.LocatorPart.ScaY, + Type = BindProperty.BindType.EyeSelect, + BindPrefab = mangaObjects + }); + FaceMangaMorph.BindProperties.Add(new BindProperty() + { + Part = BindProperty.LocatorPart.ScaX, + Type = BindProperty.BindType.Bool, + BindPrefab = mangaObjects + }); + OtherMorphs.Add(FaceMangaMorph); } public void SetupAnimator() { - DrivenKeyLocator = new GameObject("DrivenKeyLocator"); - DrivenKeyLocator.transform.SetParent(Container.transform); - SetupLocator("Ear_L_Ctrl", "Ear_L__", EarMorphs.FindAll(a => a.direction == true)); - SetupLocator("Ear_R_Ctrl", "Ear_R__", EarMorphs.FindAll(a => a.direction == false)); - SetupLocator("Eye_L_Base_Ctrl", "Eye_L__", EyeMorphs.FindAll(a => a.direction == true)); - SetupLocator("Eye_R_Base_Ctrl", "Eye_R__", EyeMorphs.FindAll(a => a.direction == false)); - SetupLocator("Eyebrow_L_Base_Ctrl", "Eyebrow_L__", EyeBrowMorphs.FindAll(a => a.direction == true)); - SetupLocator("Eyebrow_R_Base_Ctrl", "Eyebrow_R__", EyeBrowMorphs.FindAll(a => a.direction == false)); - SetupLocator("Mouth_Base_Ctrl", "Mouth__", MouthMorphs.FindAll(a => a.direction == false)); + if (!DrivenKeyLocator) return; - var root = new GameObject("Eyeball_L_Ctrl"); - root.transform.SetParent(DrivenKeyLocator.transform); - EyeballCtrl_L_Locator = root; - - root = new GameObject("Eyeball_R_Ctrl"); - root.transform.SetParent(DrivenKeyLocator.transform); - EyeballCtrl_R_Locator = root; - - root = new GameObject("Eyeball_all_Ctrl"); - root.transform.SetParent(DrivenKeyLocator.transform); - EyeballCtrl_All_Locator = root; + SetupLocator("Ear_L_Ctrl", EarMorphs.FindAll(a => a.direction == true)); + SetupLocator("Ear_R_Ctrl", EarMorphs.FindAll(a => a.direction == false)); + SetupLocator("Eye_L_Base_Ctrl", EyeMorphs.FindAll(a => a.direction == true)); + SetupLocator("Eye_R_Base_Ctrl", EyeMorphs.FindAll(a => a.direction == false)); + SetupLocator("Eyebrow_L_Base_Ctrl", EyeBrowMorphs.FindAll(a => a.direction == true)); + SetupLocator("Eyebrow_R_Base_Ctrl", EyeBrowMorphs.FindAll(a => a.direction == false)); + SetupLocator("Mouth_Base_Ctrl", MouthMorphs.FindAll(a => a.direction == false)); - Container.UmaFaceAnimator = DrivenKeyLocator.AddComponent(); - Container.UmaFaceAnimator.avatar = AvatarBuilder.BuildGenericAvatar(DrivenKeyLocator, "DrivenKeyLocator"); + EyeballCtrl_L_Locator = DrivenKeyLocator.transform.Find("Eyeball_L_Ctrl"); + EyeballCtrl_R_Locator = DrivenKeyLocator.transform.Find("Eyeball_R_Ctrl"); + EyeballCtrl_All_Locator = DrivenKeyLocator.transform.Find("Eyeball_all_Ctrl"); + + Container.UmaFaceAnimator = DrivenKeyLocator.GetComponent(); + Container.UmaFaceAnimator.avatar = AvatarBuilder.BuildGenericAvatar(DrivenKeyLocator.gameObject, "DrivenKeyLocator"); Container.FaceOverrideController = Instantiate(UmaViewerBuilder.Instance.FaceOverrideController); Container.UmaFaceAnimator.runtimeAnimatorController = Container.FaceOverrideController; } - public void SetupLocator(string rootName, string prefix, List morphs) + public void SetupLocator(string rootName, List morphs) { - var root = new GameObject(rootName); - root.transform.SetParent(DrivenKeyLocator.transform); + var root = DrivenKeyLocator.transform.Find(rootName); + var locators = new List(root.GetComponentsInChildren()); morphs.ForEach(morph => { - var locator = new GameObject(prefix + morph.tag); - locator.transform.SetParent(root.transform); - morph.locator = locator.transform; + var locator = locators.Find(a => a.name.EndsWith(morph.tag)); + if (locator) + { + morph.locator = locator; + } }); } public void ChangeMorph() { FacialResetAll(); - - foreach (FacialMorph morph in EarMorphs) - { - ProcessMorph(morph); - } - - foreach (FacialMorph morph in EyeBrowMorphs) - { - ProcessMorph(morph); - } - - foreach (FacialMorph morph in EyeMorphs) - { - ProcessMorph(morph); - } - - foreach (FacialMorph morph in MouthMorphs) - { - ProcessMorph(morph); - } - + EarMorphs.ForEach(morph => ProcessMorph(morph)); + EyeBrowMorphs.ForEach(morph => ProcessMorph(morph)); + EyeMorphs.ForEach(morph => ProcessMorph(morph)); + MouthMorphs.ForEach(morph => ProcessMorph(morph)); + OtherMorphs.ForEach(morph => ProcessExtraMorph(morph)); ApplyRotation(); } public void ClearMorph() { - foreach (FacialMorph morph in EarMorphs) - { - morph.weight = 0; - } + EarMorphs.ForEach(morph => morph.weight = 0); + EyeBrowMorphs.ForEach(morph => morph.weight = 0); + EyeMorphs.ForEach(morph => morph.weight = 0); + MouthMorphs.ForEach(morph => morph.weight = 0); - foreach (FacialMorph morph in EyeBrowMorphs) + OtherMorphs.ForEach(morph => { - morph.weight = 0; - } - - foreach (FacialMorph morph in EyeMorphs) - { - morph.weight = 0; - } - - foreach (FacialMorph morph in MouthMorphs) - { - morph.weight = 0; - } + morph.BindProperties.ForEach(property => + { + property.Value = morph.GetLocatorValue(property.Part); + }); + }); } private void ProcessMorph(FacialMorph morph) @@ -275,7 +337,7 @@ namespace Gallop trs.physicsParticle.m_InitLocalPosition += trs._position * morph.weight; ParticleRecorder[trs.physicsParticle] += trs._rotation * morph.weight; } - else if(trs.transform) + else if (trs.transform) { trs.transform.localScale += trs._scale * morph.weight; trs.transform.localPosition += trs._position * morph.weight; @@ -284,6 +346,50 @@ namespace Gallop } } + private void ProcessExtraMorph(FacialExtraMorph morph) + { + foreach (var property in morph.BindProperties) + { + switch (property.Type) + { + case BindProperty.BindType.Texture: + if (property.Value > 0.01f) + { + morph.BindGameObject.SetActive(true); + property.BindMaterial.mainTexture = property.BindTexture; + property.BindMaterial.SetFloat(property.PropertyName, property.Value); + return; + } + else + { + if (morph.BindProperties.IndexOf(property) == morph.BindProperties.Count - 1) + { + morph.BindGameObject.SetActive(false); + } + } + break; + case BindProperty.BindType.Shader: + 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))); + break; + case BindProperty.BindType.EyeSelect: + var count = property.BindPrefab.Count / 2; + var val = (int)property.Value; + property.BindPrefab.ForEach(a => + a.SetActive(val + count < property.BindPrefab.Count && (val == property.BindPrefab.IndexOf(a) || val + count == property.BindPrefab.IndexOf(a)))); + break; + case BindProperty.BindType.Bool: + if (property.Value <= 0) + { + property.BindPrefab.ForEach(a =>a.SetActive(false)); + } + break; + } + } + } + public void FacialResetAll() { FacialReset(BaseLEarMorph.trsArray); @@ -336,6 +442,13 @@ namespace Gallop ChangeMorph(); } + public void ChangeMorphWeight(BindProperty property, float val) + { + Container.isAnimatorControl = false; + property.Value = val < 0 ? 0 : val; + ChangeMorph(); + } + public void SetEyeRange(float lx, float ly, float rx, float ry) { LeftEyeXrange.weight = lx; @@ -349,26 +462,32 @@ namespace Gallop { EyeBrowMorphs.ForEach(morph => { - morph.weight = morph.locator.transform.localPosition.x * -100; + if (morph.locator) + morph.weight = morph.locator.transform.localPosition.x * -100; }); EarMorphs.ForEach(morph => { - morph.weight = morph.locator.transform.localPosition.x * -100; + if (morph.locator) + morph.weight = morph.locator.transform.localPosition.x * -100; }); MouthMorphs.ForEach(morph => { - morph.weight = morph.locator.transform.localPosition.x * -100; - if (morph.weight < 0) - morph.weight = -morph.weight; + if (morph.locator) + { + morph.weight = morph.locator.transform.localPosition.x * -100; + if (morph.weight < 0) + morph.weight = -morph.weight; + } }); EyeMorphs.ForEach(morph => { if (!(morph == LeftEyeXrange || morph == LeftEyeYrange || morph == RightEyeXrange || morph == RightEyeYrange)) { - morph.weight = morph.locator.transform.localPosition.x * -100; + if (morph.locator) + morph.weight = morph.locator.transform.localPosition.x * -100; } }); @@ -378,39 +497,20 @@ namespace Gallop LeftEyeYrange.weight = -(EyeballCtrl_L_Locator.transform.localPosition.y * -100 + EyeballCtrl_All_Locator.transform.localPosition.y * -100); RightEyeYrange.weight = (EyeballCtrl_R_Locator.transform.localPosition.y * -100 + EyeballCtrl_All_Locator.transform.localPosition.y * -100); + OtherMorphs.ForEach(morph => + { + morph.BindProperties.ForEach(property => + { + property.Value = morph.GetLocatorValue(property.Part); + }); + }); + ChangeMorph(); } public void ResetLocator() { - EarMorphs.ForEach(morph => - { - morph.weight = 0; - morph.locator.transform.localPosition = Vector3.zero; - }); - - EyeBrowMorphs.ForEach(morph => - { - morph.weight = 0; - morph.locator.transform.localPosition = Vector3.zero; - }); - - EyeMorphs.ForEach(morph => - { - morph.weight = 0; - morph.locator.transform.localPosition = Vector3.zero; - }); - - MouthMorphs.ForEach(morph => - { - morph.weight = 0; - morph.locator.transform.localPosition = Vector3.zero; - }); - - - EyeballCtrl_L_Locator.transform.localPosition = Vector3.zero; - EyeballCtrl_R_Locator.transform.localPosition = Vector3.zero; - EyeballCtrl_All_Locator.transform.localPosition = Vector3.zero; + Container.UmaFaceAnimator.Rebind(); ChangeMorph(); } } diff --git a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs index 1c8a8d7..6ac414d 100644 --- a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs +++ b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs @@ -13,9 +13,58 @@ namespace Gallop public string name; public string tag = ""; public bool direction; - public FaceDrivenKeyTarget target; public float weight; public List trsArray; public Transform locator; } + + [System.Serializable] + public class FacialExtraMorph : FacialMorph + { + public GameObject BindGameObject; + public List BindProperties = new List(); + public float GetLocatorValue(BindProperty.LocatorPart part) + { + switch (part) + { + case BindProperty.LocatorPart.PosX: return locator.localPosition.x; + case BindProperty.LocatorPart.PosY: return locator.localPosition.y; + case BindProperty.LocatorPart.PosZ: return locator.localPosition.z; + case BindProperty.LocatorPart.ScaX: return locator.localScale.x; + case BindProperty.LocatorPart.ScaY: return locator.localScale.y; + case BindProperty.LocatorPart.ScaZ: return locator.localScale.z; + default: return locator.position.x; + } + } + } + + [System.Serializable] + public class BindProperty + { + public enum LocatorPart + { + PosX, + PosY, + PosZ, + ScaX, + ScaY, + ScaZ, + } + + public enum BindType + { + Shader, + Select, + EyeSelect, + Texture, + Bool + } + public Material BindMaterial; + public Texture BindTexture; + public List BindPrefab = new List(); + public string PropertyName; + public LocatorPart Part; + public BindType Type; + public float Value; + } } diff --git a/Assets/Scripts/umamusume/GallopExtras.cs b/Assets/Scripts/umamusume/GallopExtras.cs index fcf3fbb..bbcd20f 100644 --- a/Assets/Scripts/umamusume/GallopExtras.cs +++ b/Assets/Scripts/umamusume/GallopExtras.cs @@ -6,6 +6,22 @@ using static DynamicBone; [System.Serializable] public class AssetTable { + public Object this[string key] + { + get + { + var item = list.Find(a => a.Key.Equals(key)); + if(item != null) + { + return item.Value; + } + else + { + return null; + } + } + } + public List list; } @@ -13,6 +29,21 @@ public class AssetTable [System.Serializable] public class AssetTableValue { + public float this[string key] + { + get + { + var item = list.Find(a => a.Key.Equals(key)); + if (item != null) + { + return item.Value; + } + else + { + return -1; + } + } + } public List list; }