diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index ff5f2a2..c178e06 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -1028,6 +1028,139 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &87919061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 87919062} + - component: {fileID: 87919065} + - component: {fileID: 87919064} + - component: {fileID: 87919063} + m_Layer: 5 + m_Name: Clear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &87919062 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87919061} + 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: 1542859407} + m_Father: {fileID: 2059749648} + 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: 311.66666, y: -15} + m_SizeDelta: {x: 106.666664, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &87919063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87919061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 2101350876} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959568} + m_TargetAssemblyTypeName: UmaViewerBuilder, umamusume + m_MethodName: ClearMorphs + m_Mode: 1 + 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 +--- !u!114 &87919064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87919061} + 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: 0.9607844, g: 0.9607844, b: 0.9607844, 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: 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 &87919065 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87919061} + m_CullTransparentMesh: 1 --- !u!1 &92965280 GameObject: m_ObjectHideFlags: 0 @@ -16947,8 +17080,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: 176.66667, y: -15} - m_SizeDelta: {x: 146.66667, y: 30} + m_AnchoredPosition: {x: 180, y: -15} + m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &994710209 MonoBehaviour: @@ -17283,8 +17416,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: 176.66667, y: -15} - m_SizeDelta: {x: 146.66667, y: 30} + m_AnchoredPosition: {x: 136.66666, y: -15} + m_SizeDelta: {x: 106.666664, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1027345408 MonoBehaviour: @@ -19847,8 +19980,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1882365343} m_HandleRect: {fileID: 1882365342} m_Direction: 2 - m_Value: 1 - m_Size: 0.97654355 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -21580,7 +21713,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 15, y: -15} - m_SizeDelta: {x: 146.66667, y: 30} + m_SizeDelta: {x: 106.666664, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!1 &1297525976 GameObject: @@ -24708,6 +24841,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1537165046} m_CullTransparentMesh: 1 +--- !u!1 &1542859406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1542859407} + - component: {fileID: 1542859409} + - component: {fileID: 1542859408} + 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 &1542859407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542859406} + 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: 87919062} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1542859408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542859406} + 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: Clear + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + 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 &1542859409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542859406} + m_CullTransparentMesh: 1 --- !u!1 &1558324556 GameObject: m_ObjectHideFlags: 0 @@ -27461,7 +27728,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -45} - m_SizeDelta: {x: 255, y: -90} + m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1684693615 MonoBehaviour: @@ -27814,7 +28081,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -45} - m_SizeDelta: {x: 255, y: -90} + m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1699478760 MonoBehaviour: @@ -28229,7 +28496,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 15, y: -15} - m_SizeDelta: {x: 146.66667, y: 30} + m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!1 &1716374325 GameObject: @@ -32985,13 +33252,14 @@ RectTransform: m_Children: - {fileID: 1296932688} - {fileID: 1027345407} + - {fileID: 87919062} m_Father: {fileID: 1339030790} 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: 0, y: -60} - m_SizeDelta: {x: 255, y: 30} + m_SizeDelta: {x: 380, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &2059749649 MonoBehaviour: @@ -33998,8 +34266,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: 416.6667, y: -15} - m_SizeDelta: {x: 156.66667, y: 30} + m_AnchoredPosition: {x: 420, y: -15} + m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2101350875 MonoBehaviour: diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index d0ec357..1ca461f 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -20,7 +20,6 @@ public class UmaContainer : MonoBehaviour public AnimatorOverrideController OverrideController; [Header("Face")] - public List FacialClips = new List(); public FaceDrivenKeyTarget FaceDrivenKeyTarget; public FaceEmotionKeyTarget FaceEmotionKeyTarget; diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 12f5f9b..8762b42 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -1043,4 +1043,23 @@ public class UmaViewerBuilder : MonoBehaviour Destroy(CurrentUMAContainer.gameObject); } } + + public void ClearMorphs() + { + if (CurrentUMAContainer != null && CurrentUMAContainer.FaceDrivenKeyTarget != null) + { + foreach (var container in UI.EmotionList.GetComponentsInChildren()) + { + if (container.Slider != null) + container.Slider.value = 0; + } + foreach (var container in UI.FacialList.GetComponentsInChildren()) + { + if (container.Slider != null) + container.Slider.SetValueWithoutNotify(0); + } + CurrentUMAContainer.FaceDrivenKeyTarget.ClearMorph(); + CurrentUMAContainer.FaceDrivenKeyTarget.ChangeMorph(); + } + } } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 2d9d28e..1feaca7 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -93,6 +93,40 @@ public class UmaViewerUI : MonoBehaviour canvasScaler.screenMatchMode = CanvasScaler.ScreenMatchMode.Shrink; } + private void Update() + { + if (Builder.CurrentAudioSources.Count > 0) + { + AudioSource MianSource = Builder.CurrentAudioSources[0]; + if (MianSource.clip) + { + TitleText.text = MianSource.clip.name; + ProgressText.text = string.Format("{0} / {1}", ToTimeFormat(MianSource.time), ToTimeFormat(MianSource.clip.length)); + AudioSlider.SetValueWithoutNotify(MianSource.time / MianSource.clip.length); + LyricsText.text = GetCurrentLyrics(MianSource.time); + } + } + + + if (Builder.CurrentUMAContainer != null && Builder.CurrentUMAContainer.OverrideController != null) + { + if (Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2") + { + bool isLoop = Builder.CurrentUMAContainer.OverrideController["clip_2"].name.EndsWith("_loop"); + var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0); + var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"]; + if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0) + { + var normalizedTime = (isLoop) ? Mathf.Repeat(AnimeState.normalizedTime, 1) : Mathf.Min(AnimeState.normalizedTime, 1); + + AnimationTitleText.text = AnimeClip.name; + AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate)); + AnimationSlider.SetValueWithoutNotify(normalizedTime); + } + } + } + } + public void HighlightChildImage(Transform mainObject, Image child) { foreach(var t in mainObject.GetComponentsInChildren()) @@ -184,7 +218,7 @@ public class UmaViewerUI : MonoBehaviour { var container = Instantiate(UmaContainerSliderPrefab, FacialList.content).GetComponent(); container.Name.text = morph.name + " (" + morph.tag + ")"; - container.Slider.value = morph.Weight; + container.Slider.value = morph.weight; container.Slider.maxValue = 1; container.Slider.minValue = 0; container.Slider.onValueChanged.AddListener((a) => { target.ChangeMorphWeight(morph, a); }); @@ -647,40 +681,6 @@ public class UmaViewerUI : MonoBehaviour Builder.CurrentUMAContainer.UmaAnimator.speed = val; } - private void Update() - { - if (Builder.CurrentAudioSources.Count > 0) - { - AudioSource MianSource = Builder.CurrentAudioSources[0]; - if (MianSource.clip) - { - TitleText.text = MianSource.clip.name; - ProgressText.text = string.Format("{0} / {1}", ToTimeFormat(MianSource.time), ToTimeFormat(MianSource.clip.length)); - AudioSlider.SetValueWithoutNotify(MianSource.time/ MianSource.clip.length); - LyricsText.text = GetCurrentLyrics(MianSource.time); - } - } - - - if (Builder.CurrentUMAContainer != null && Builder.CurrentUMAContainer.OverrideController != null) - { - if(Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2") - { - bool isLoop = Builder.CurrentUMAContainer.OverrideController["clip_2"].name.EndsWith("_loop"); - var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0); - var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"]; - if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0) - { - var normalizedTime = (isLoop) ? Mathf.Repeat(AnimeState.normalizedTime, 1) : Mathf.Min(AnimeState.normalizedTime, 1); - - AnimationTitleText.text = AnimeClip.name; - AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate)); - AnimationSlider.SetValueWithoutNotify(normalizedTime); - } - } - } - } - public void ResetAudioPlayer() { TitleText.text = "No Audio"; diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 5b13487..643e12e 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -142,17 +142,17 @@ namespace Gallop { foreach (FacialMorph morph in EyeBrowMorphs) { - morph._weight = 0; + morph.weight = 0; } foreach (FacialMorph morph in EyeMorphs) { - morph._weight = 0; + morph.weight = 0; } foreach (FacialMorph morph in MouthMorphs) { - morph._weight = 0; + morph.weight = 0; } } @@ -162,9 +162,9 @@ namespace Gallop { if (trs.transform) { - trs.transform.localScale += trs._scale * morph.Weight; - trs.transform.localPosition += trs._position * morph.Weight; - RotationRecorder[trs.transform] += trs._rotation * morph.Weight; + trs.transform.localScale += trs._scale * morph.weight; + trs.transform.localPosition += trs._position * morph.weight; + RotationRecorder[trs.transform] += trs._rotation * morph.weight; }; } } @@ -202,7 +202,7 @@ namespace Gallop public void ChangeMorphWeight(FacialMorph morph,float val) { - morph.Weight = val; + morph.weight = val; ChangeMorph(); } diff --git a/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs index 40da659..961715f 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs @@ -48,7 +48,7 @@ public class FaceEmotionKeyTarget : ScriptableObject } newValue.weight = Convert.ToInt32(splitArray[1]); faceTypeData.emotionKeys.Add(newValue); - Debug.Log(newValue.weight); + //Debug.Log(newValue.weight); } else { @@ -62,7 +62,7 @@ public class FaceEmotionKeyTarget : ScriptableObject } newValue.weight = 100; faceTypeData.emotionKeys.Add(newValue); - Debug.Log(morphName); + //Debug.Log(morphName); } } } @@ -78,7 +78,7 @@ public class FaceEmotionKeyTarget : ScriptableObject { foreach (var key in emotion.emotionKeys) { - key.morph.Weight += key.weight / 100 * emotion.Weight; + key.morph.weight += key.weight / 100 * emotion.Weight; } } diff --git a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs index d158e53..835d64a 100644 --- a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs +++ b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs @@ -14,18 +14,7 @@ namespace Gallop public string tag = ""; public bool direction; public FaceDrivenKeyTarget target; - public float _weight; - public float Weight - { - get - { - return _weight; - } - set - { - _weight = value; - } - } + public float weight; public List trsArray; } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5e415f9..158d8d4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 3.0 + bundleVersion: 2.1.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0