diff --git a/Assets/Resources/Games/powerCalligraphy.prefab b/Assets/Resources/Games/powerCalligraphy.prefab index 05be47235..b319691f7 100644 --- a/Assets/Resources/Games/powerCalligraphy.prefab +++ b/Assets/Resources/Games/powerCalligraphy.prefab @@ -374,6 +374,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startBeat: 0 + ongoingBeat: 0 + nextBeat: 0 AnimPattern: [] scrollSpeed: {x: 0, y: 0, z: 0} onGoing: 0 @@ -726,6 +728,7 @@ MonoBehaviour: endPaper: {fileID: 4875815582367856927} fudePosAnim: {fileID: 4347490169930534314} fudeAnim: {fileID: 6423473967584127419} + fude: {fileID: 6326012645740434990} scrollSpeed: {x: 6, y: -10, z: 0} --- !u!1 &6023311813748602782 GameObject: @@ -940,6 +943,8 @@ GameObject: - component: {fileID: 4580293426434208483} - component: {fileID: 6423473967584127419} - component: {fileID: 6433100017780520295} + - component: {fileID: 6326012645740434990} + - component: {fileID: 2411567639668323485} m_Layer: 0 m_Name: sprite m_TagString: Untagged @@ -996,6 +1001,78 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 +--- !u!114 &6326012645740434990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7215827396965205491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73db3026877efe94896eff1fcc86ab8a, type: 3} + m_Name: + m_EditorClassIdentifier: + handRenderer: {fileID: 4730078629507482847} + thumbRenderer: {fileID: 5926307297603466818} + stickRenderer: {fileID: 5621727360072000593} + tipRenderer: {fileID: 5943167968857377852} + ballRenderer: {fileID: 3986224421685190917} + REDRATE_1: 0.1 + REDRATE_2: 0.25 + redRate: 0 +--- !u!212 &2411567639668323485 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7215827396965205491} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8376708635690674870 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt0.anim similarity index 89% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt0.anim index 8f1be985f..5b2d6b481 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt0.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fude-halt + m_Name: fude-halt0 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -183,33 +183,7 @@ AnimationClip: path: blush/stick classID: 212 script: {fileID: 0} - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 1641867280, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.016666668 - value: {fileID: -480801223, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.033333335 - value: {fileID: -649290134, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.05 - value: {fileID: -592982681, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - attribute: m_Sprite - path: blush/tip - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -614226590, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.016666668 - value: {fileID: 1078653857, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.033333335 - value: {fileID: -2145719836, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.05 - value: {fileID: 2024406486, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - attribute: m_Sprite - path: blush/stick - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -245,29 +219,7 @@ AnimationClip: typeID: 212 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3337579041 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 4147446444 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 1641867280, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -480801223, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -649290134, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -592982681, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -614226590, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: 1078653857, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -2145719836, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: 2024406486, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -653,4 +605,39 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: HaltTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.016666668 + functionName: HaltTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 2 + messageOptions: 0 + - time: 0.033333335 + functionName: HaltTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 3 + messageOptions: 0 + - time: 0.06666667 + functionName: HaltTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 + - time: 0.06666667 + functionName: HaltTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt0.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt0.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt1.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt1.anim new file mode 100644 index 000000000..64e23109e --- /dev/null +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt1.anim @@ -0,0 +1,352 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fude-halt1 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.9, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.1, y: 3.1, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: blush/stick + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.05, y: 0.3, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: blush/tip + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: blush/stick + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4147446444 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3337579041 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4147446444 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: blush/stick + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: blush/stick + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: blush/stick + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: blush/stick + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.05 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: blush/tip + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: blush/tip + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: blush/tip + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0 + functionName: HaltTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 + - time: 0.016666668 + functionName: HaltTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt1.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt1.anim.meta new file mode 100644 index 000000000..1fd98a01c --- /dev/null +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-halt1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: efc67af38c17c364fb691f3d52dc625b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-none.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-none.anim index 8e8b0e83d..44a381502 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-none.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-none.anim @@ -16,7 +16,26 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: blush/stick + classID: 212 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -24,19 +43,26 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 4147446444 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -46,8 +72,41 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: blush/stick + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: Idle + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.016666668 + functionName: Idle + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim index abfbc3b61..60108a42a 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim @@ -22,6 +22,15 @@ AnimationClip: time: 0 value: {x: 0, y: -0.1, z: 0} inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: -2.6718748, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0, y: -0.14453125, z: 0} + inSlope: {x: 0, y: -2.25, z: 0} outSlope: {x: 0, y: -2.25, z: 0} tangentMode: 0 weightedMode: 0 @@ -95,6 +104,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: -0.03, y: 3.6421876, z: 0} + inSlope: {x: 0, y: -0.46874997, z: 0} + outSlope: {x: 0, y: -0.46874997, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 value: {x: -0.03, y: 3.6, z: 0} @@ -110,22 +128,7 @@ AnimationClip: path: blush/stick m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 430081996, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.016666668 - value: {fileID: -192802799, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.033333335 - value: {fileID: -1422397272, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.05 - value: {fileID: 1158996790, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.06666667 - value: {fileID: -268905281, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - attribute: m_Sprite - path: blush/tip - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -154,25 +157,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3337579041 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 430081996, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -192802799, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -1422397272, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: 1158996790, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -268905281, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.083333336 + m_StopTime: 0.06666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -200,6 +191,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 value: 0 @@ -223,11 +223,20 @@ AnimationClip: time: 0 value: -0.1 inSlope: 0 - outSlope: -2.25 + outSlope: -2.6718748 tangentMode: 65 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.14453125 + inSlope: -2.25 + outSlope: -2.25 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 value: -0.25 @@ -256,6 +265,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -347,8 +365,17 @@ AnimationClip: outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -368,6 +395,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -387,6 +423,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 3.6421876 + inSlope: -0.46874997 + outSlope: -0.46874997 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 value: 3.6 @@ -415,6 +460,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -425,4 +479,39 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.016666668 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 2 + messageOptions: 0 + - time: 0.033333335 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 3 + messageOptions: 0 + - time: 0.05 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 + - time: 0.06666667 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 5 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim index 1fcd59f5e..76b06aa2c 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim @@ -21,21 +21,30 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0.1, y: -0.3, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0, y: -0.3, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.016666668 - value: {x: 0, y: -0.3, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + time: 0.033333335 + value: {x: 0.1, y: -0.3, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -52,6 +61,24 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: -0.1, y: 3.7, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.033333335 + value: {x: -0.1, y: 3.7, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -77,6 +104,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.033333335 + value: {x: -0.1, y: 1, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -99,23 +135,7 @@ AnimationClip: path: blush/ball m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 1855151953, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - attribute: m_Sprite - path: blush/stick - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -268905281, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.016666668 - value: {fileID: 1158996790, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - attribute: m_Sprite - path: blush/tip - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -137,20 +157,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4147446444 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 3337579041 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - serializedVersion: 2 path: 4147446444 attribute: 1 @@ -165,10 +171,7 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - pptrCurveMapping: - - {fileID: 1855151953, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -268905281, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: 1158996790, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -196,18 +199,27 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.016666668 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -224,9 +236,27 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -0.3 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -0.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -249,6 +279,24 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -268,6 +316,24 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 3.7 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 3.7 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -287,6 +353,24 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -300,9 +384,27 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -334,6 +436,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -362,6 +473,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -390,6 +510,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -457,4 +586,25 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 6 + messageOptions: 0 + - time: 0.016666668 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 7 + messageOptions: 0 + - time: 0.033333335 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 6 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim index afa081f2f..3885640cf 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim @@ -110,22 +110,7 @@ AnimationClip: path: blush/tip m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -268905281, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.016666668 - value: {fileID: 1158996790, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.033333335 - value: {fileID: -1422397272, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.05 - value: {fileID: -192802799, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - time: 0.06666667 - value: {fileID: 430081996, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - attribute: m_Sprite - path: blush/tip - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -154,25 +139,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3337579041 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -268905281, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: 1158996790, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -1422397272, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: -192802799, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - - {fileID: 430081996, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.083333336 + m_StopTime: 0.06666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -434,4 +407,39 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 5 + messageOptions: 0 + - time: 0.016666668 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 + - time: 0.033333335 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 3 + messageOptions: 0 + - time: 0.05 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 2 + messageOptions: 0 + - time: 0.06666667 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim index ea866a289..f33e43141 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim @@ -14,7 +14,55 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.1, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 3.65, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: blush/stick + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.75, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: blush/tip m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -24,14 +72,35 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4147446444 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3337579041 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -46,8 +115,117 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.1 + inSlope: 0 + outSlope: -2.25 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.65 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: blush/stick + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: blush/tip + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.75 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 2 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: blush/tip + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.016666668 + functionName: SweepTurnRed + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim.meta index 18b92af4a..e049e4a87 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim.meta +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep3.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3814b675c675a134b82794b2ffda9e44 +guid: 16c0decc4b2d5924fb893fb50c0b5f7b NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-tap.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-tap.anim index b6f6e9b19..2c7f92117 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-tap.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-tap.anim @@ -32,15 +32,27 @@ AnimationClip: m_RotationOrder: 4 path: blush/tip m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: + m_FloatCurves: - curve: - - time: 0 - value: {fileID: 520835334, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} - attribute: m_Sprite - path: blush/tip + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: blush/stick classID: 212 script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -49,12 +61,12 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 3337579041 - attribute: 0 + path: 4147446444 + attribute: 555744692 script: {fileID: 0} typeID: 212 - customType: 23 - isPPtrCurve: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3337579041 attribute: 1 @@ -62,8 +74,7 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - pptrCurveMapping: - - {fileID: 520835334, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -74,7 +85,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -142,7 +153,40 @@ AnimationClip: path: blush/tip classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: blush/stick + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: Tap + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.016666668 + functionName: Tap + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller index 7fdea91bd..4400cafda 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller @@ -36,7 +36,8 @@ AnimatorState: m_Name: fude-halt m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -2326731695472977482} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -62,7 +63,8 @@ AnimatorState: m_Name: fude-sweep-end m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3113523291968716472} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -78,6 +80,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3113523291968716472 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4073325096536606112} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2626943099776081149 AnimatorState: serializedVersion: 6 @@ -104,6 +128,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-2326731695472977482 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1760258024615482421} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 6.55 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-672294744991727388 AnimatorState: serializedVersion: 6 @@ -192,9 +238,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -227,6 +273,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1760258024615482421 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fude-halt1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: efc67af38c17c364fb691f3d52dc625b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &2145829562529642143 AnimatorStateMachine: serializedVersion: 6 @@ -252,6 +324,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2626943099776081149} +--- !u!1102 &4073325096536606112 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fude-sweep3 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 16c0decc4b2d5924fb893fb50c0b5f7b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &6224554050268844766 AnimatorState: serializedVersion: 6 @@ -333,7 +431,13 @@ AnimatorStateMachine: m_Position: {x: 530, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -5247693770382366089} - m_Position: {x: 760, y: 200, z: 0} + m_Position: {x: 760, y: 220, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1760258024615482421} + m_Position: {x: 500, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4073325096536606112} + m_Position: {x: 877.5176, y: 295.92908, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos-none.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos-none.anim index 7edf61e31..acbcf47d7 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos-none.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos-none.anim @@ -59,7 +59,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta index b6f56d531..01d406dbf 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta @@ -189,7 +189,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_stick_0 + name: fude_stick_0_0 rect: serializedVersion: 2 x: 634 @@ -210,7 +210,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_0 + name: fude_tip_0_0 rect: serializedVersion: 2 x: 363 @@ -231,7 +231,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_ball + name: fude_ball_0 rect: serializedVersion: 2 x: 802 @@ -252,7 +252,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_stick_2 + name: fude_stick_2_0 rect: serializedVersion: 2 x: 746 @@ -273,7 +273,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_stick_3 + name: fude_stick_3_0 rect: serializedVersion: 2 x: 802 @@ -294,7 +294,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_stick_4 + name: fude_stick_4_0 rect: serializedVersion: 2 x: 858 @@ -315,7 +315,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_stick_5 + name: fude_stick_5_0 rect: serializedVersion: 2 x: 914 @@ -336,7 +336,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_stick_6 + name: fude_stick_6_0 rect: serializedVersion: 2 x: 970 @@ -357,7 +357,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_1 + name: fude_tip_1_0 rect: serializedVersion: 2 x: 426 @@ -378,7 +378,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_2 + name: fude_tip_2_0 rect: serializedVersion: 2 x: 490 @@ -399,7 +399,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_3 + name: fude_tip_3_0 rect: serializedVersion: 2 x: 554 @@ -420,7 +420,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_4 + name: fude_tip_4_0 rect: serializedVersion: 2 x: 362 @@ -441,7 +441,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_5 + name: fude_tip_5_0 rect: serializedVersion: 2 x: 442 @@ -462,7 +462,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_6 + name: fude_tip_6_0 rect: serializedVersion: 2 x: 522 @@ -483,7 +483,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_stick_1 + name: fude_stick_1_0 rect: serializedVersion: 2 x: 690 @@ -504,7 +504,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_7 + name: fude_tip_7_0 rect: serializedVersion: 2 x: 362 @@ -525,11 +525,11 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_8 + name: fude_tip_8_0 rect: serializedVersion: 2 x: 442 - y: 761 + y: 762 width: 77 height: 109 alignment: 0 @@ -546,7 +546,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_9 + name: fude_tip_9_0 rect: serializedVersion: 2 x: 522 @@ -567,7 +567,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_10 + name: fude_tip_10_0 rect: serializedVersion: 2 x: 610 @@ -588,7 +588,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_11 + name: fude_tip_11_0 rect: serializedVersion: 2 x: 666 @@ -1008,7 +1008,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_tap + name: fude_tip_12_0 rect: serializedVersion: 2 x: 362 @@ -1029,7 +1029,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_tap_1 + name: fude_tip_12_1 rect: serializedVersion: 2 x: 362 @@ -1050,7 +1050,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_tip_tap_2 + name: fude_tip_12_2 rect: serializedVersion: 2 x: 362 @@ -1184,7 +1184,7 @@ TextureImporter: width: 77 height: 85 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1196,6 +1196,384 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: thumb_1 + rect: + serializedVersion: 2 + x: 610 + y: 401 + width: 109 + height: 93 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1810089ab48d00545bd0d7c6dbbc0e6f + internalID: 1852659906 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: thumb_2 + rect: + serializedVersion: 2 + x: 610 + y: 81 + width: 109 + height: 93 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 09803883ba6cc9545b53075e28539559 + internalID: 124380288 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_ball_1 + rect: + serializedVersion: 2 + x: 802 + y: 385 + width: 53 + height: 53 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 279141ff7cc78f74daa6b27a28176be4 + internalID: 277226038 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_ball_2 + rect: + serializedVersion: 2 + x: 802 + y: 65 + width: 53 + height: 53 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2627ee09b8e8668448447b59725afe84 + internalID: 1134664130 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_3_1 + rect: + serializedVersion: 2 + x: 802 + y: 441 + width: 53 + height: 261 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e67d303ebfc9cdf4096f30a4111e6782 + internalID: -2058660780 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_3_2 + rect: + serializedVersion: 2 + x: 802 + y: 121 + width: 53 + height: 261 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fd62d8795dd4bd94a81b916a52fbcc83 + internalID: 777756369 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_4_1 + rect: + serializedVersion: 2 + x: 858 + y: 385 + width: 53 + height: 317 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 29c203bd1f0ba494c874a9d75f77530b + internalID: -140696638 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_5_1 + rect: + serializedVersion: 2 + x: 914 + y: 385 + width: 53 + height: 317 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3efa9a1e315946841b7316c5f6371cd0 + internalID: -1790203426 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_6_1 + rect: + serializedVersion: 2 + x: 970 + y: 385 + width: 53 + height: 317 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9b1b0705d78e43f4ca8881d29ca66283 + internalID: 1736510413 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_4_2 + rect: + serializedVersion: 2 + x: 858 + y: 65 + width: 53 + height: 317 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ec2719ab09aa73646beafa9a098b6851 + internalID: -982131032 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_5_2 + rect: + serializedVersion: 2 + x: 914 + y: 65 + width: 53 + height: 317 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7cfee8942a6ad6449a3d481f54bfdbb6 + internalID: 1146433817 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_6_2 + rect: + serializedVersion: 2 + x: 970 + y: 65 + width: 53 + height: 317 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9060843d76761274a82673d27b054056 + internalID: -1180162089 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_2_1 + rect: + serializedVersion: 2 + x: 746 + y: 473 + width: 53 + height: 229 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3920bc1ee52fc104ca640e29009a8667 + internalID: -2067347227 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_2_2 + rect: + serializedVersion: 2 + x: 746 + y: 153 + width: 53 + height: 229 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dfe5b4120f0d63c4c9a00e1fb2934286 + internalID: -1162339490 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_1_1 + rect: + serializedVersion: 2 + x: 690 + y: 617 + width: 53 + height: 85 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 45, z: 0, w: 39} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c852baca4f15b794f9cc645ac48efdd4 + internalID: -1970949977 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_1_2 + rect: + serializedVersion: 2 + x: 690 + y: 297 + width: 53 + height: 85 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 45, z: 0, w: 39} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7f7b589f0747db349baebb75b8bfde28 + internalID: 598492357 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_0_1 + rect: + serializedVersion: 2 + x: 634 + y: 617 + width: 53 + height: 85 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 44, z: 0, w: 19} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c59bc28ee6bcdb14bbb05e3f7ff1f8e0 + internalID: 1157383834 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_stick_0_2 + rect: + serializedVersion: 2 + x: 634 + y: 297 + width: 53 + height: 85 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 44, z: 0, w: 19} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 45e25d21bf5d48e4aac9647b8f0a87d9 + internalID: -1969129795 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -1208,57 +1586,75 @@ TextureImporter: secondaryTextures: [] nameFileIdTable: end: -1526549691 - fude_ball: 213573052 - fude_stick_0: 1419783882 - fude_stick_1: -614226590 - fude_stick_2: 1855151953 - fude_stick_3: -1492556270 - fude_stick_4: 1078653857 - fude_stick_5: -2145719836 - fude_stick_6: 2024406486 - fude_tip_0: -1714488886 + fude_ball_0: 213573052 + fude_ball_1: 277226038 + fude_ball_2: 1134664130 + fude_stick_0_0: 1419783882 + fude_stick_0_1: 1157383834 + fude_stick_0_2: -1969129795 + fude_stick_1_0: -614226590 + fude_stick_1_1: -1970949977 + fude_stick_1_2: 598492357 + fude_stick_2_0: 1855151953 + fude_stick_2_1: -2067347227 + fude_stick_2_2: -1162339490 + fude_stick_3_0: -1492556270 + fude_stick_3_1: -2058660780 + fude_stick_3_2: 777756369 + fude_stick_4_0: 1078653857 + fude_stick_4_1: -140696638 + fude_stick_4_2: -982131032 + fude_stick_5_0: -2145719836 + fude_stick_5_1: -1790203426 + fude_stick_5_2: 1146433817 + fude_stick_6_0: 2024406486 + fude_stick_6_1: 1736510413 + fude_stick_6_2: -1180162089 + fude_tip_0_0: -1714488886 fude_tip_0_1: -10973233 fude_tip_0_2: -2089882262 - fude_tip_1: 430081996 - fude_tip_10: -649290134 + fude_tip_10_0: -649290134 fude_tip_10_1: 1246628787 fude_tip_10_2: 550138584 - fude_tip_11: -592982681 + fude_tip_11_0: -592982681 fude_tip_11_1: -1197008802 fude_tip_11_2: -1581479422 + fude_tip_12_0: 520835334 + fude_tip_12_1: -1431647073 + fude_tip_12_2: -518709021 + fude_tip_1_0: 430081996 fude_tip_1_1: 113927036 fude_tip_1_2: 633974780 - fude_tip_2: -721978998 + fude_tip_2_0: -721978998 fude_tip_2_1: 1358628071 fude_tip_2_2: 1499430905 - fude_tip_3: -192802799 + fude_tip_3_0: -192802799 fude_tip_3_1: 713300749 fude_tip_3_2: -2054920168 - fude_tip_4: -1422397272 + fude_tip_4_0: -1422397272 fude_tip_4_1: -465287483 fude_tip_4_2: -107425171 - fude_tip_5: 1158996790 + fude_tip_5_0: 1158996790 fude_tip_5_1: 1308238058 fude_tip_5_2: -919740534 - fude_tip_6: -268905281 + fude_tip_6_0: -268905281 fude_tip_6_1: 972981366 fude_tip_6_2: 899306074 - fude_tip_7: 1641867280 + fude_tip_7_0: 1641867280 fude_tip_7_1: 2008361993 fude_tip_7_2: 583608701 - fude_tip_8: -480801223 + fude_tip_8_0: -480801223 fude_tip_8_1: 2026442160 fude_tip_8_2: 1496283225 - fude_tip_9: -436236477 + fude_tip_9_0: -436236477 fude_tip_9_1: 1649257871 fude_tip_9_2: 201460108 - fude_tip_tap: 520835334 - fude_tip_tap_1: -1431647073 - fude_tip_tap_2: -518709021 hand_0: 2142888950 hand_1: 1981511391 hand_2: 1325106110 thumb_0: -223110643 + thumb_1: 1852659906 + thumb_2: 124380288 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Scripts/Games/PowerCalligraphy/Fude.cs b/Assets/Scripts/Games/PowerCalligraphy/Fude.cs new file mode 100644 index 000000000..8d27c1d5e --- /dev/null +++ b/Assets/Scripts/Games/PowerCalligraphy/Fude.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; + +using HeavenStudio.Util; + +namespace HeavenStudio.Games.Scripts_PowerCalligraphy +{ + public class Fude : MonoBehaviour + { + [Header("References")] + [SerializeField] SpriteRenderer handRenderer; + [SerializeField] SpriteRenderer thumbRenderer; + [SerializeField] SpriteRenderer stickRenderer; + [SerializeField] SpriteRenderer tipRenderer; + [SerializeField] SpriteRenderer ballRenderer; + + [Header("Variables")] + [SerializeField] float REDRATE_1; + [SerializeField] float REDRATE_2; + + public float redRate = 0; + private int red + { + get + { + if (redRate >= REDRATE_2) + { + return 2; + } + else if (redRate >= REDRATE_1) + { + return 1; + } + else + { + return 0; + } + } + } + + public static Sprite GetSprite(string spriteName) { + Sprite[] sprites = Resources.LoadAll("Sprites/Games/PowerCalligraphy/fude"); + return System.Array.Find(sprites, (sprite) => sprite.name.Equals(spriteName)); + } + + public void HaltTurnRed(int frame) + { + int stick = 0, tip = 0; + if (frame==0) + { + stick = 1; + } + else + { + stick = frame + 2; + } + tip = frame + 7; + TurnRed(stick, tip, red); + } + public void SweepTurnRed(int frame) + { + int stick = 0, tip = 0; + if (frame<=5) + { + tip = frame + 1; + } + else + { + stick = 2; + tip = frame%2 + 5; + } + TurnRed(stick, tip, red); + } + public void TurnRed(int stick, int tip, int red) + { + handRenderer.sprite = GetSprite($"hand_{red}"); + thumbRenderer.sprite = GetSprite($"thumb_{red}"); + stickRenderer.sprite = GetSprite($"fude_stick_{stick}_{red}"); + tipRenderer.sprite = GetSprite($"fude_tip_{tip}_{red}"); + ballRenderer.sprite = GetSprite($"fude_ball_{red}"); + } + public void Tap() + { + TurnRed(0, 12, red); + } + public void Idle() + { + TurnRed(0, 0, red); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/PowerCalligraphy/Fude.cs.meta b/Assets/Scripts/Games/PowerCalligraphy/Fude.cs.meta new file mode 100644 index 000000000..2741568c0 --- /dev/null +++ b/Assets/Scripts/Games/PowerCalligraphy/Fude.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 73db3026877efe94896eff1fcc86ab8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs b/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs index 11e6bb659..802b3f190 100644 --- a/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs +++ b/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs @@ -102,6 +102,7 @@ namespace HeavenStudio.Games public Animator fudePosAnim; public Animator fudeAnim; + public Fude fude; public static int queuedType; diff --git a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs index 42c57a292..89da7ea32 100644 --- a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs +++ b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs @@ -47,6 +47,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy } public double startBeat; + public double ongoingBeat = Double.MinValue; public double nextBeat; [SerializeField] PatternItem[] AnimPattern; @@ -124,7 +125,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy current_anim_num_1 = anim_num; actions.Add(new BeatAction.Action(itemBeat, delegate { Halt(); stroke = StrokeType.TOME; process_num = current_anim_num_1;})); - actions.Add(new BeatAction.Action(itemBeat, delegate { onGoing = true;})); + actions.Add(new BeatAction.Action(itemBeat, delegate { onGoing = true; ongoingBeat = itemBeat;})); game.ScheduleInput(itemBeat, 1f, PowerCalligraphy.InputAction_BasicPress, writeSuccess, writeMiss, Empty, CanSuccess); break; case StrokeType.HANE: @@ -132,7 +133,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy current_anim_num_1 = anim_num; actions.Add(new BeatAction.Action(itemBeat, delegate { Sweep(); stroke = StrokeType.HANE; process_num = current_anim_num_1;})); - actions.Add(new BeatAction.Action(itemBeat+1, delegate { onGoing = true;})); + actions.Add(new BeatAction.Action(itemBeat+1, delegate { onGoing = true; ongoingBeat = itemBeat + 1;})); game.ScheduleInput(itemBeat, 2f, PowerCalligraphy.InputAction_FlickPress, writeSuccess, writeMiss, Empty, CanSuccess); break; case StrokeType.HARAI: @@ -140,7 +141,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy current_anim_num_1 = anim_num; actions.Add(new BeatAction.Action(itemBeat, delegate { Sweep(); stroke = StrokeType.HARAI; process_num = current_anim_num_1;})); - actions.Add(new BeatAction.Action(itemBeat+1, delegate { onGoing = true;})); + actions.Add(new BeatAction.Action(itemBeat+1, delegate { onGoing = true; ongoingBeat = itemBeat + 1;})); game.ScheduleInput(itemBeat, 2f, PowerCalligraphy.InputAction_FlickPress, writeSuccess, writeMiss, Empty, CanSuccess); break; default: @@ -219,17 +220,15 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy case "late": case "fast": + game.fudeAnim.DoScaledAnimationAsync("fude-none", 0.5f); switch (stroke) { // WIP case StrokeType.TOME: - game.fudeAnim.DoScaledAnimationAsync("fude-none", 0.5f); SoundByte.PlayOneShotGame("powerCalligraphy/8"); break; case StrokeType.HANE: - game.fudeAnim.DoScaledAnimationAsync("fude-none", 0.5f); SoundByte.PlayOneShotGame("powerCalligraphy/6"); break; case StrokeType.HARAI: - game.fudeAnim.DoScaledAnimationAsync("fude-none", 0.5f); SoundByte.PlayOneShotGame("powerCalligraphy/9"); break; } @@ -271,6 +270,12 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy if (cond.isPlaying && !cond.isPaused) { + if (ongoingBeat > 0) + { + float normalizedBeat = cond.GetPositionFromBeat(ongoingBeat, 1); + float redRate = (normalizedBeat <= 0.5f) ? normalizedBeat/0.5f : (1.5f-normalizedBeat); + if (game is not null) game.fude.redRate = redRate; + } if (isFinish) { double beat = cond.songPositionInBeats;