diff --git a/Assets/Resources/Games/powerCalligraphy.prefab b/Assets/Resources/Games/powerCalligraphy.prefab index f35b046fc..c8007ee07 100644 --- a/Assets/Resources/Games/powerCalligraphy.prefab +++ b/Assets/Resources/Games/powerCalligraphy.prefab @@ -277,7 +277,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522914056597294617} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.4, y: 0, z: 0} + m_LocalPosition: {x: 0.4, y: -0.1, z: 0} m_LocalScale: {x: 2.2, y: 2.2, z: 2.2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -525,7 +525,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8901463518339414129 SpriteRenderer: @@ -863,90 +863,6 @@ Transform: m_Father: {fileID: 637382826217532765} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3868116688290541539 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5919150378284272573} - - component: {fileID: 3626604933646784038} - m_Layer: 0 - m_Name: a - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5919150378284272573 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3868116688290541539} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.4, y: 1.4, z: 1.4} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3626604933646784038 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3868116688290541539} - 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: 151 - m_Sprite: {fileID: 21300000, guid: b9c68db2d1bb02d4795ac6f7442f92c9, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.5254902} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 12.8, y: 7.2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &3898396248611073112 GameObject: m_ObjectHideFlags: 0 @@ -1109,7 +1025,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 1 - m_Size: {x: 0.55, y: 2.5} + m_Size: {x: 0.55, y: 2.45} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1241,7 +1157,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4714056575665057956} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.66, z: 0} + m_LocalPosition: {x: 0, y: 0.7, z: 0} m_LocalScale: {x: 2.1, y: 2.1, z: 2.1} m_ConstrainProportionsScale: 1 m_Children: [] @@ -1690,7 +1606,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5919150378284272573} - {fileID: 9061701609461501601} - {fileID: 637382826217532765} m_Father: {fileID: 0} @@ -1752,7 +1667,7 @@ Transform: - {fileID: 5519490823886977826} - {fileID: 1672921316959716958} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6192786242490518283 GameObject: @@ -1779,7 +1694,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6192786242490518283} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.1, y: 0.6, z: 0} + m_LocalPosition: {x: -0.1, y: 0.5, z: 0} m_LocalScale: {x: 2.2, y: 2.2, z: 2.2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -1897,14 +1812,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6854551435124601147} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: -0.0073303473, z: 0, w: 0.9999731} m_LocalPosition: {x: 0, y: 6, z: 0} m_LocalScale: {x: 2.1, y: 2.1, z: 2.1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2609182281090089549} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -0.84, z: 0} --- !u!212 &3986224421685190917 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2457,7 +2372,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8376708635690674870} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.59, y: -0.26, z: 0} + m_LocalPosition: {x: -0.25, y: -2.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim new file mode 100644 index 000000000..9b88f4e7c --- /dev/null +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim @@ -0,0 +1,362 @@ +%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-sweep0 + 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, 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.05 + value: {x: 0, y: -0.25, 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.03, y: 3.65, z: 0} + inSlope: {x: 0, 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, y: 0.7, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.05 + value: {x: 0, y: 0.95, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: blush/tip + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 430081996, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + - time: 0.016666668 + value: {fileID: -721978998, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + - time: 0.033333335 + value: {fileID: -192802799, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + - time: 0.05 + value: {fileID: -1422397272, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + attribute: m_Sprite + path: blush/tip + classID: 212 + script: {fileID: 0} + 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: 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 + - serializedVersion: 2 + path: 3337579041 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 430081996, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + - {fileID: -721978998, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + - {fileID: -192802799, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + - {fileID: -1422397272, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.06666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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 + - serializedVersion: 3 + time: 0.05 + 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.05 + value: -0.25 + 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.03 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + 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.65 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + 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.z + 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 + outWeight: 0 + 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.7 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0.95 + 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/tip + 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 + outWeight: 0 + 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: [] diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep0.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim similarity index 96% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim index ba9dd3506..22893edd5 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fude-sweep + m_Name: fude-sweep1 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -36,7 +36,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/Animations/fude-sweep1.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim.meta new file mode 100644 index 000000000..51d0af0af --- /dev/null +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f63f3c0a3a9d9fe47b5b35b71c1122cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim new file mode 100644 index 000000000..1b925ecac --- /dev/null +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim @@ -0,0 +1,53 @@ +%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-sweep2 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim.meta new file mode 100644 index 000000000..050aa567b --- /dev/null +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fude-sweep2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9830309eaa843bd48bdb53d9b0d4b442 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta index 560a3b600..af7452145 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta @@ -903,7 +903,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_2 + name: fude_tip_2_2 rect: serializedVersion: 2 x: 490 @@ -1012,9 +1012,9 @@ TextureImporter: rect: serializedVersion: 2 x: 362 - y: 966 + y: 969 width: 61 - height: 56 + height: 53 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1033,9 +1033,9 @@ TextureImporter: rect: serializedVersion: 2 x: 362 - y: 646 + y: 649 width: 61 - height: 56 + height: 53 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1054,9 +1054,9 @@ TextureImporter: rect: serializedVersion: 2 x: 362 - y: 326 + y: 329 width: 61 - height: 56 + height: 53 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1079,7 +1079,7 @@ TextureImporter: width: 77 height: 109 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: [] @@ -1100,7 +1100,7 @@ TextureImporter: width: 77 height: 109 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: [] @@ -1121,7 +1121,7 @@ TextureImporter: width: 85 height: 109 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: [] @@ -1142,7 +1142,7 @@ TextureImporter: width: 53 height: 117 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: [] @@ -1163,7 +1163,7 @@ TextureImporter: width: 53 height: 117 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: [] @@ -1186,7 +1186,6 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - fude_2: 1499430905 fude_ball: 213573052 fude_stick_0: 1419783882 fude_stick_1: -614226590 @@ -1209,6 +1208,7 @@ TextureImporter: fude_tip_1_2: 633974780 fude_tip_2: -721978998 fude_tip_2_1: 1358628071 + fude_tip_2_2: 1499430905 fude_tip_3: -192802799 fude_tip_3_1: 713300749 fude_tip_3_2: -2054920168 diff --git a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs index cff715654..d86170ef7 100644 --- a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs +++ b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs @@ -410,6 +410,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy break; case (int)CharacterType.chikara: + fudeAnim.DoScaledAnimationAsync("fude-sweep-end", 0.5f); break; case (int)CharacterType.onore: