From cd7cda7cab5d25c94efff9b3dc84594c0e0ccfcc Mon Sep 17 00:00:00 2001 From: fu-majime Date: Wed, 6 Mar 2024 02:49:30 +0900 Subject: [PATCH] modified: Assets/Scripts/Games/PowerCalligraphy/Writing.cs --- .../Animations/fude-prepare.anim | 128 ++++++++++- .../Animations/fude-sweep.anim | 2 +- .../Animations/fude.controller | 29 +++ .../Animations/fudePos.controller | 152 +++++++++++-- .../Animations/letter.controller | 215 +++++++++++++++++- .../Scripts/Games/PowerCalligraphy/Writing.cs | 23 +- 6 files changed, 508 insertions(+), 41 deletions(-) diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-prepare.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-prepare.anim index bb7c484a9..f2f28e8eb 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-prepare.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-prepare.anim @@ -14,7 +14,41 @@ 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, 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, 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} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 0, y: 0, 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: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -24,19 +58,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: 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: 1 + m_StopTime: 0.06666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -46,8 +87,83 @@ 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 + 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 + - serializedVersion: 3 + time: 0.06666667 + 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.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} m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim index eecddeec3..ba9dd3506 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim @@ -36,7 +36,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller index 78d4cbe5a..3b51024d9 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude.controller @@ -52,6 +52,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-672294744991727388 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fude-prepare + 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: 2b2d654c7b2e6e14caf10134013ac462, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -147,6 +173,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1755833088712450402} m_Position: {x: 305, y: 195, z: 0} + - serializedVersion: 1 + m_State: {fileID: -672294744991727388} + m_Position: {x: 340, y: 260, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller index d0a4bb351..3c5c31482 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten03-miss + m_Name: fudePos-ten02-miss m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -52,6 +52,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-7695259267961688207 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fudePos-re02 + 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: 301c3f9ca6ecaae41b6ba59f2a05047f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6544540281406755334 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fudePos-re03-late + 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: 60c64cd901892f949a2785ff86140717, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-5045694569336194735 AnimatorStateMachine: serializedVersion: 6 @@ -64,30 +116,42 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 688716125649721742} m_Position: {x: 200, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 7606232898028533691} - m_Position: {x: 250, y: 70, z: 0} - serializedVersion: 1 m_State: {fileID: 2918795362906277945} - m_Position: {x: 285, y: 135, z: 0} + m_Position: {x: 30, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: -8570468295486733057} - m_Position: {x: 320, y: 200, z: 0} + m_Position: {x: 80, y: 330, z: 0} - serializedVersion: 1 m_State: {fileID: 3260831569143889301} - m_Position: {x: 355, y: 265, z: 0} + m_Position: {x: 80, y: 400, z: 0} - serializedVersion: 1 m_State: {fileID: 5882042523823724615} - m_Position: {x: 390, y: 330, z: 0} + m_Position: {x: 80, y: 470, z: 0} - serializedVersion: 1 m_State: {fileID: -2898621561750013274} - m_Position: {x: 425, y: 395, z: 0} + m_Position: {x: 80, y: 540, z: 0} - serializedVersion: 1 m_State: {fileID: -8184168049185127996} - m_Position: {x: 460, y: 460, z: 0} + m_Position: {x: 0, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -3989720767082847083} - m_Position: {x: 495, y: 525, z: 0} + m_Position: {x: 400, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6893683294278431745} + m_Position: {x: 430, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7695259267961688207} + m_Position: {x: 470, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5989796956022979887} + m_Position: {x: 500, y: 400, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1920335506474462021} + m_Position: {x: 510, y: 460, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6544540281406755334} + m_Position: {x: 510, y: 530, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -131,7 +195,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten03-late + m_Name: fudePos-ten02-late m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -150,6 +214,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-1920335506474462021 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fudePos-re03-fast + 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: 0665d4095eb136e40a439b5f51260e14, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -205,7 +295,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02 + m_Name: fudePos-ten01 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -231,7 +321,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten03-fast + m_Name: fudePos-ten02-fast m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -257,7 +347,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten03-just + m_Name: fudePos-ten02-just m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -276,14 +366,14 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &7606232898028533691 +--- !u!1102 &5989796956022979887 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten01 + m_Name: fudePos-re03-just m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -296,7 +386,33 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 7f2feba07fae62f439212389460b1d04, type: 2} + m_Motion: {fileID: 7400000, guid: 9e39db294b8d2ed42badc262d5646d28, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6893683294278431745 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fudePos-re01 + 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: 3eedbf04c3cea64499a492d792db4724, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller index cd58e787d..cc9c4fc25 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9028063261873104851 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: paper-re03-just + 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: a607b4b413b26c7468fd4bd0fbd12f9c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-6292010483678719761 AnimatorState: serializedVersion: 6 @@ -26,6 +52,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-6284373825970273870 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: paper-re01 + 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: 9144db3b374e1c34fb3e83b07ec18dd3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-5593357924424937150 AnimatorStateMachine: serializedVersion: 6 @@ -37,22 +89,43 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -6292010483678719761} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 260, y: 20, z: 0} - serializedVersion: 1 m_State: {fileID: 8786292936139707480} - m_Position: {x: 330, y: 160, z: 0} + m_Position: {x: 30, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: -2809595864687422053} - m_Position: {x: 300, y: 100, z: 0} + m_Position: {x: 0, y: 190, z: 0} - serializedVersion: 1 m_State: {fileID: 2652860380271456673} - m_Position: {x: 330, y: 220, z: 0} + m_Position: {x: 30, y: 320, z: 0} - serializedVersion: 1 m_State: {fileID: -2749694015844619861} - m_Position: {x: 330, y: 280, z: 0} + m_Position: {x: 30, y: 380, z: 0} - serializedVersion: 1 m_State: {fileID: 8108316008410973255} - m_Position: {x: 370, y: 340, z: 0} + m_Position: {x: 70, y: 440, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3351064918583297504} + m_Position: {x: 300, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6284373825970273870} + m_Position: {x: 330, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4515971188078934360} + m_Position: {x: 370, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9028063261873104851} + m_Position: {x: 400, y: 400, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3061722880113446351} + m_Position: {x: 400, y: 460, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4964938421491347055} + m_Position: {x: 400, y: 520, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5375773717256993161} + m_Position: {x: 500, y: 580, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -63,6 +136,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -6292010483678719761} +--- !u!1102 &-4515971188078934360 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: paper-re02 + 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: c771ec5b07bc95645893f55f03514e0c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-2809595864687422053 AnimatorState: serializedVersion: 6 @@ -163,6 +262,110 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &3061722880113446351 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: paper-re03-fast + 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: c7d9a7407d1292c4790e51ac5ef94728, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3351064918583297504 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: paper-re00 + 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: 64d4cd8faa564ee48a66a0e5cefeeadb, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &4964938421491347055 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: paper-re03-late + 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: b5ba81ada41ad4a46b713a83b405eaed, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &5375773717256993161 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: paper-re04-end + 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: 5ceb755578e6b9c4c802f7d0bedee71f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &8108316008410973255 AnimatorState: serializedVersion: 6 diff --git a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs index b96849d71..b0120adc6 100644 --- a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs +++ b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs @@ -81,7 +81,8 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy { onGoing = true; fudeAnim.DoScaledAnimationAsync("fude-sweep", 0.5f); - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1", forcePlay: true); + if (releaseSound is null) Debug.Log("!?"); }), new BeatAction.Action(targetBeat+6f, delegate { paperAnim.Play("paper-re04-end");}), new BeatAction.Action(targetBeat+7f, delegate @@ -112,7 +113,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy { onGoing = true; fudeAnim.DoScaledAnimationAsync("fude-pause", 0.5f); - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseB1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseB1", forcePlay: true); }), new BeatAction.Action(targetBeat+6f, delegate { paperAnim.Play("paper-ten02-end");}), new BeatAction.Action(targetBeat+7f, delegate @@ -139,7 +140,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy new BeatAction.Action(targetBeat+4f, delegate { onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1", forcePlay: true); }), new BeatAction.Action(targetBeat+7f, delegate { @@ -166,7 +167,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy new BeatAction.Action(targetBeat+4f, delegate { onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1", forcePlay: true); }), new BeatAction.Action(targetBeat+7f, delegate { @@ -192,13 +193,13 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy { num = 1; onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1", forcePlay: true); }), new BeatAction.Action(targetBeat+5f, delegate { num = 2; onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseB1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseB1", forcePlay: true); }), new BeatAction.Action(targetBeat+7f, delegate { @@ -225,13 +226,13 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy { num = 1; onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1", forcePlay: true); }), new BeatAction.Action(targetBeat+5f, delegate { num = 2; onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseB1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseB1", forcePlay: true); }), new BeatAction.Action(targetBeat+7f, delegate { @@ -267,7 +268,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy new BeatAction.Action(targetBeat+8f, delegate { onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1", forcePlay: true); }), new BeatAction.Action(targetBeat+11f, delegate { @@ -302,7 +303,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy new BeatAction.Action(targetBeat+8f, delegate { onGoing = true; - releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1"); + releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseA1", forcePlay: true); }), new BeatAction.Action(targetBeat+11f, delegate { @@ -471,8 +472,10 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy break; } + if (releaseSound is null) Debug.Log("!"); if (releaseSound is not null) { + Debug.Log("?"); releaseSound.Stop(); releaseSound = null; }