diff --git a/Assets/Scenes/LiveScene.unity b/Assets/Scenes/LiveScene.unity index 7db8986..25c5bb1 100644 --- a/Assets/Scenes/LiveScene.unity +++ b/Assets/Scenes/LiveScene.unity @@ -555,7 +555,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 912298140} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -1444,6 +1444,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 827083129} m_CullTransparentMesh: 1 +--- !u!1 &831711796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 831711797} + - component: {fileID: 831711799} + - component: {fileID: 831711798} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &831711797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831711796} + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 955938935} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} + 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 &831711798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831711796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2830189, g: 0.22899327, b: 0.16420436, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u3013\r" +--- !u!222 &831711799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831711796} + m_CullTransparentMesh: 1 --- !u!1 &912298139 GameObject: m_ObjectHideFlags: 0 @@ -1473,6 +1552,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 955938935} - {fileID: 374273518} - {fileID: 1839609385} - {fileID: 1378933079} @@ -1549,6 +1629,140 @@ MonoBehaviour: m_EditorClassIdentifier: is_Touched: 0 is_Outed: 0 + PauseButton: {fileID: 955938936} +--- !u!1 &955938934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 955938935} + - component: {fileID: 955938938} + - component: {fileID: 955938937} + - component: {fileID: 955938936} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &955938935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 955938934} + 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: 831711797} + m_Father: {fileID: 912298140} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -10, y: 0.000015258789} + m_SizeDelta: {x: 40, y: 25} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &955938936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 955938934} + 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: 955938937} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 912298139} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &955938937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 955938934} + 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: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3} + 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: 3 +--- !u!222 &955938938 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 955938934} + m_CullTransparentMesh: 1 --- !u!1 &993298146 GameObject: m_ObjectHideFlags: 0 @@ -2225,7 +2439,7 @@ RectTransform: m_Children: - {fileID: 993298147} m_Father: {fileID: 912298140} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3014,7 +3228,7 @@ RectTransform: m_Children: - {fileID: 1006231794} m_Father: {fileID: 912298140} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 7bc1760..18ce3c6 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -25079,6 +25079,7 @@ MonoBehaviour: SavedPoses: [] HandleCanvas: {fileID: 580437086} HelpPanel: {fileID: 745782920} + PoseIK: {fileID: 0} --- !u!4 &776305455 Transform: m_ObjectHideFlags: 0 @@ -43221,8 +43222,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "H - show/hide this\n\nUndo:\t\tCtrl + Z\nRedo:\t\tCtrl + Y\n\nMove only: - \tCtrl + W\nRotate only: Ctrl + E\nScale only: \tCtrl + R\nAll:\t \tCtrl + Y" + m_text: "H - show/hide this\n\nUndo:\t\tCtrl + Z\nRedo:\t\tCtrl + Y\n\nIK Mode: + Space\nMove only: \tCtrl + W\nRotate only: Ctrl + E\nScale only: \tCtrl + R\nAll:\t + \tCtrl + Y" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -45983,7 +45985,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1468470379 Animator: - serializedVersion: 5 + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -45996,12 +45998,10 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1476177399 GameObject: m_ObjectHideFlags: 0 @@ -47983,8 +47983,8 @@ MonoBehaviour: type: 3} LineRendererMaterial: {fileID: 2100000, guid: 61428e99656e4544aa16be34cad7a789, type: 2} - EnabledHandles: 03000000 EnabledLines: 1 + IKMode: 0 --- !u!4 &1561038521 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/LiveToolBox/SliderControl.cs b/Assets/Scripts/LiveToolBox/SliderControl.cs index 10b512b..03abf14 100644 --- a/Assets/Scripts/LiveToolBox/SliderControl.cs +++ b/Assets/Scripts/LiveToolBox/SliderControl.cs @@ -1,23 +1,47 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.UI; public class SliderControl : MonoBehaviour, IPointerDownHandler, IPointerUpHandler { public bool is_Touched = false; public bool is_Outed = false; + public Button PauseButton; + + private void Awake() + { + PauseButton.onClick.AddListener(OnPauseButtonClick); + } + + private void OnPauseButtonClick() + { + if (is_Touched) + { + OnPointerUp(null); + } + else + { + OnPointerDown(null); + } + } + public void OnPointerDown(PointerEventData eventData) { is_Touched = true; - Debug.Log("Dowm"); + PauseButton.GetComponentInChildren().text = "¡ø"; + Debug.Log("Pause"); } public void OnPointerUp(PointerEventData eventData) { is_Touched = false; is_Outed = true; - Debug.Log("Up"); + PauseButton.GetComponentInChildren().text = "¡þ"; + Debug.Log("Play"); } + } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs index 0f7007f..731890d 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs @@ -105,12 +105,12 @@ namespace Gallop.Live.Cutt LiveTimelineKeyIndex curKey = LiveTimelineControl.AlterUpdate_Key(_currentKey, currentTime); _curIndex = curKey.index; + LiveTimelineKeyCharaMotionData arg = curKey.key as LiveTimelineKeyCharaMotionData; + AnimationClip anim = arg.clip; if ((curKey != null && _curIndex != -1 && _curIndex != _prevIndex) || Director.instance.sliderControl.is_Touched || Director.instance._syncTime == false || director.IsRecordVMD) { - LiveTimelineKeyCharaMotionData arg = curKey.key as LiveTimelineKeyCharaMotionData; - - AnimationClip anim = arg.clip; + double start; if(arg.isMotionHeadFrameAll) { @@ -124,11 +124,27 @@ namespace Gallop.Live.Cutt _tempAnim.wrapMode = (arg.loop ? WrapMode.Loop : WrapMode.Default); _tempAnim[anim.name].time = (float)(start + interval); + + if (Mathf.Abs(_prevFrameAnimationTime - currentTime) < 0.01f) + { + if (_tempAnim.IsPlaying(anim.name)) + { + _tempAnim.Stop(); + } + } + else + { + _tempAnim.Play(anim.name); + } + } + else if (!_tempAnim.IsPlaying(anim.name)) + { _tempAnim.Play(anim.name); } _prevIndex = _curIndex; } + _prevFrameAnimationTime = currentTime; } } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 79c16ba..c37bfc3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,13 +27,13 @@ EditorUserSettings: value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23663b3aece13811c9a809cdc217100f7634dd152f71370ddb214943de021e4b230bfc0d05f61f1d588b0dcb13dc06 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c731900122b292926237e38271427fb + value: 22424703114646680e1c05320430102019041d651e3d282424241814ebfa3937adc22ee8ea2a33390a01ea3201701431fb1e10 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c691504041125227a68252320092a + value: 22424703114646680e0b0227036c731900122b292926237e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e1c05320430102019041d651e3d282424241814ebfa3937adc22ee8ea2a33390a01ea3201701431fb1e10 + value: 22424703114646680e0b0227036c691504041125227a68252320092a flags: 0 UnityRemoteCompression: value: 29617121