diff --git a/Assets/Resources/Games/trickClass.prefab b/Assets/Resources/Games/trickClass.prefab index cc3250e9..6603b626 100644 --- a/Assets/Resources/Games/trickClass.prefab +++ b/Assets/Resources/Games/trickClass.prefab @@ -27,7 +27,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.35, y: -1.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 5506760278121746696} m_Father: {fileID: 7488929755866823519} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -152,7 +153,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -253,7 +254,7 @@ Transform: - {fileID: 7024444778115842674} - {fileID: 4984981779500137945} m_Father: {fileID: 7799781267437701720} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &682738480984676191 GameObject: @@ -453,89 +454,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1232419183106384156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1321397820395048751} - - component: {fileID: 5310578754555517206} - - component: {fileID: 4582054608725175433} - m_Layer: 0 - m_Name: Debug - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1321397820395048751 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1232419183106384156} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7799781267437701720} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &5310578754555517206 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1232419183106384156} - m_Enabled: 0 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!81 &4582054608725175433 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1232419183106384156} - m_Enabled: 0 --- !u!1 &1293664498170733624 GameObject: m_ObjectHideFlags: 0 @@ -581,8 +499,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 3288589490341909789} handleType: 0 - leftHandleLocalPosition: {x: 0.68322885, y: 1.0293169, z: -0.42796063} - rightHandleLocalPosition: {x: -0.68322885, y: -1.0293169, z: 0.42796063} + leftHandleLocalPosition: {x: 0.71996224, y: 1.0152967, z: -0.45946717} + rightHandleLocalPosition: {x: -0.71996224, y: -1.0152967, z: 0.45946717} --- !u!1 &1319698407843468154 GameObject: m_ObjectHideFlags: 0 @@ -946,7 +864,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2386269478641536153} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.832, y: 0.067329824, z: 2.436} + m_LocalPosition: {x: 1.2985466, y: 0.24284542, z: 2.1663225} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2005696115261101270} @@ -966,8 +884,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 3288589490341909789} handleType: 0 - leftHandleLocalPosition: {x: -1.2123687, y: -0.4792779, z: 0.77124846} - rightHandleLocalPosition: {x: 1.2123687, y: 0.4792779, z: -0.77124846} + leftHandleLocalPosition: {x: -1.0581713, y: -0.9601151, z: 0.72837055} + rightHandleLocalPosition: {x: 1.0581713, y: 0.9601151, z: -0.72837055} --- !u!1 &3206296460510988408 GameObject: m_ObjectHideFlags: 0 @@ -1166,6 +1084,88 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: 5.4743524, y: -0.42018557, z: 1.7583859} rightHandleLocalPosition: {x: -5.4743524, y: 0.42018557, z: -1.7583859} +--- !u!1 &3657839666287537226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5614176317311911057} + - component: {fileID: 2534472409663008169} + m_Layer: 0 + m_Name: warnObj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5614176317311911057 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3657839666287537226} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.159, y: 0.078, z: 0} + m_LocalScale: {x: 0.525, y: 0.525, z: 1} + m_Children: [] + m_Father: {fileID: 8297413771377288495} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2534472409663008169 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3657839666287537226} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: -9 + m_Sprite: {fileID: -6102311414589244448, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.67, y: 4.160256} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3750683135787769820 GameObject: m_ObjectHideFlags: 0 @@ -1245,6 +1245,88 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: -4.179342, y: 9.434406, z: 3.0711536} rightHandleLocalPosition: {x: 4.179342, y: -9.434406, z: -3.0711536} +--- !u!1 &4128444714450696620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5506760278121746696} + - component: {fileID: 6949688006082389136} + m_Layer: 0 + m_Name: handL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5506760278121746696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4128444714450696620} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.98, y: -0.8, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5996926452457285680} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6949688006082389136 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4128444714450696620} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: 4 + 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: 2.95, y: 2.4601512} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4289023322268810471 GameObject: m_ObjectHideFlags: 0 @@ -1290,8 +1372,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 3288589490341909789} handleType: 0 - leftHandleLocalPosition: {x: -2.2244952, y: 0.08774805, z: 1.4541802} - rightHandleLocalPosition: {x: 2.2244952, y: -0.08774805, z: -1.4541802} + leftHandleLocalPosition: {x: -2.327126, y: 0.19955647, z: 1.5433838} + rightHandleLocalPosition: {x: 2.327126, y: -0.19955647, z: -1.5433838} --- !u!1 &4622791582068443419 GameObject: m_ObjectHideFlags: 0 @@ -1636,6 +1718,89 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: 0.38255858, y: 3.2152529, z: -0.8895941} rightHandleLocalPosition: {x: -0.38255858, y: -3.2152529, z: 0.8895941} +--- !u!1 &5155605184468058309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8297413771377288495} + - component: {fileID: 2978180836756112886} + m_Layer: 0 + m_Name: warnBubble + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8297413771377288495 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5155605184468058309} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.024, y: 0.009, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5614176317311911057} + m_Father: {fileID: 3414547825366335459} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2978180836756112886 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5155605184468058309} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: -10 + m_Sprite: {fileID: -91470071303476930, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.2999997, y: 7.500461} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5360420740636381101 GameObject: m_ObjectHideFlags: 0 @@ -1667,7 +1832,7 @@ Transform: - {fileID: 2205484085421406530} - {fileID: 1961949143142789026} m_Father: {fileID: 7799781267437701720} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6570045643125407281 Animator: @@ -1925,8 +2090,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 3288589490341909789} handleType: 0 - leftHandleLocalPosition: {x: -1.8526663, y: -0.47393608, z: 1.1977413} - rightHandleLocalPosition: {x: 1.8526663, y: 0.47393608, z: -1.1977413} + leftHandleLocalPosition: {x: -1.8398379, y: -0.5588179, z: 1.1977415} + rightHandleLocalPosition: {x: 1.8398379, y: 0.5588179, z: -1.1977415} --- !u!1 &6229372592850255122 GameObject: m_ObjectHideFlags: 0 @@ -2040,7 +2205,7 @@ Transform: - {fileID: 7488929755866823519} - {fileID: 6310967655046720561} m_Father: {fileID: 7799781267437701720} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &4171281603420513773 Animator: @@ -2090,11 +2255,11 @@ Transform: m_LocalScale: {x: 0.95, y: 0.95, z: 1} m_Children: - {fileID: 2049491332800905642} + - {fileID: 3414547825366335459} - {fileID: 2712533505047173825} - {fileID: 9050201431690794528} - {fileID: 4058401002516718396} - {fileID: 6646177278795284587} - - {fileID: 1321397820395048751} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2115,6 +2280,7 @@ MonoBehaviour: firstEnable: 0 playerAnim: {fileID: 4171281603420513773} girlAnim: {fileID: 6570045643125407281} + warnAnim: {fileID: 3154933179428504539} ballPrefab: {fileID: 7208854294000353610} planePrefab: {fileID: 6092229326248261130} shockPrefab: {fileID: 7208854294000353610} @@ -2348,7 +2514,7 @@ Transform: - {fileID: 1376113234299623101} - {fileID: 1873571147433010504} m_Father: {fileID: 7799781267437701720} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7441100361811456812 GameObject: @@ -2375,7 +2541,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7441100361811456812} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.31, y: 2.7111413, z: 2.14} + m_LocalPosition: {x: 1.3992692, y: 2.7532198, z: 2.1399999} m_LocalScale: {x: 0.95693785, y: 1.0526316, z: 0.5} m_Children: [] m_Father: {fileID: 2005696115261101270} @@ -2395,8 +2561,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 3288589490341909789} handleType: 0 - leftHandleLocalPosition: {x: 0.5171946, y: -0.5816976, z: -0.66142654} - rightHandleLocalPosition: {x: -0.5171946, y: 0.5816976, z: 0.66142654} + leftHandleLocalPosition: {x: 0.5434784, y: -0.5558186, z: -0.69707227} + rightHandleLocalPosition: {x: -0.5434784, y: 0.5558186, z: 0.69707227} --- !u!1 &7519947778766731560 GameObject: m_ObjectHideFlags: 0 @@ -2700,8 +2866,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 6743229856556330732} handleType: 0 - leftHandleLocalPosition: {x: -4.2578077, y: -0.36216742, z: 1.6976349} - rightHandleLocalPosition: {x: 4.2578077, y: 0.36216742, z: -1.6976349} + leftHandleLocalPosition: {x: -3.1263292, y: -0.35040247, z: 2.2349122} + rightHandleLocalPosition: {x: 3.1263292, y: 0.35040247, z: -2.2349122} --- !u!1 &8303722412302536607 GameObject: m_ObjectHideFlags: 0 @@ -2794,8 +2960,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 6743229856556330732} handleType: 0 - leftHandleLocalPosition: {x: -3.9994874, y: -1.4485235, z: 2.652832} - rightHandleLocalPosition: {x: 3.9994874, y: 1.4485235, z: -2.652832} + leftHandleLocalPosition: {x: -3.755517, y: -1.4524713, z: 2.7038217} + rightHandleLocalPosition: {x: 3.755517, y: 1.4524713, z: -2.7038217} --- !u!1 &8449703856471841507 GameObject: m_ObjectHideFlags: 0 @@ -3060,3 +3226,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9041054952499779364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3414547825366335459} + - component: {fileID: 3154933179428504539} + m_Layer: 0 + m_Name: objWarn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3414547825366335459 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9041054952499779364} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.34, y: 1.08, z: 0} + m_LocalScale: {x: 0.455, y: 0.455, z: 1} + m_Children: + - {fileID: 8297413771377288495} + m_Father: {fileID: 7799781267437701720} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3154933179428504539 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9041054952499779364} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 1a850dec721b9f242b3c4ef19e703350, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Resources/Sfx/games/trickClass/player_dodge_success.wav.meta b/Assets/Resources/Sfx/games/trickClass/player_dodge_success.wav.meta new file mode 100644 index 00000000..7a1f8415 --- /dev/null +++ b/Assets/Resources/Sfx/games/trickClass/player_dodge_success.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a8d3cf6d45388b44bae13d35d2715508 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/girl.controller b/Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/girl.controller index 9ce82890..be7d4bef 100644 --- a/Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/girl.controller +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/girl.controller @@ -37,13 +37,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 4673474409635209322} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 240, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -6317080433405410528} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 240, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: 4440819358770172556} - m_Position: {x: 270, y: 130, z: 0} + m_Position: {x: 240, y: 220, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Dodge.anim b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Dodge.anim index 89081c75..bce32b1e 100644 --- a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Dodge.anim +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Dodge.anim @@ -45,7 +45,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: 0, y: 0, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -54,7 +54,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} @@ -106,7 +106,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: 0, y: 0, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -115,7 +115,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} @@ -167,7 +167,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: 0, y: 0, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -176,7 +176,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} @@ -228,7 +228,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: {x: 0, y: 0, z: -25} inSlope: {x: 0, y: 0, z: 240} outSlope: {x: 0, y: 0, z: 240} @@ -237,18 +237,18 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: 0, y: 0, z: -15} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: 0, z: 150.00002} + outSlope: {x: 0, y: 0, z: 112.49999} 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.25 + time: 0.33333334 value: {x: 0, y: 0, z: 0} - inSlope: {x: -0, y: -0, z: 150.00002} + inSlope: {x: -0, y: -0, z: 112.49999} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -267,6 +267,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: head + - 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, 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: body/armL/handL m_PositionCurves: - curve: serializedVersion: 2 @@ -299,7 +315,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: {x: 0.25, y: 0, z: 0} inSlope: {x: -2.3999999, y: 0, z: 0} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -308,7 +324,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: 0, y: 0, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -317,7 +333,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} @@ -369,7 +385,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: 2.35, y: -1.1, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -378,7 +394,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: {x: 2.35, y: -1.1, z: 0} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} @@ -430,7 +446,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: -2, y: -1.1, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -439,7 +455,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: {x: -2, y: -1.1, z: 0} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} @@ -491,7 +507,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: {x: 3.6, y: 3.9, z: 0} inSlope: {x: -18, y: 21.600002, z: 0} outSlope: {x: -18, y: 21.600002, z: 0} @@ -500,18 +516,18 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.15 + time: 0.2 value: {x: 0.9, y: 6.5, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: -9, y: 4.0000014, z: 0} + outSlope: {x: -6.7499995, y: 3.0000005, 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.25 + time: 0.33333334 value: {x: 0, y: 6.9, z: 0} - inSlope: {x: -9, y: 4.0000014, z: -0} + inSlope: {x: -6.7499995, y: 3.0000005, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -530,6 +546,40 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: head + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.48, y: -0.8, 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.083333336 + value: {x: 0.48, y: -0.8, 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.18333334 + value: {x: 0.73, y: -0.8, 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: body/armL/handL m_ScaleCurves: - curve: serializedVersion: 2 @@ -565,9 +615,9 @@ AnimationClip: value: {fileID: 2346517677788077603, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.083333336 value: {fileID: 2346517677788077603, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.15 + - time: 0.2 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.25 + - time: 0.33333334 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.5 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -582,9 +632,9 @@ AnimationClip: value: {fileID: 0} - time: 0.083333336 value: {fileID: 0} - - time: 0.15 + - time: 0.2 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.25 + - time: 0.33333334 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.5 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -599,9 +649,9 @@ AnimationClip: value: {fileID: 0} - time: 0.083333336 value: {fileID: 0} - - time: 0.15 + - time: 0.2 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.25 + - time: 0.33333334 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.5 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -610,9 +660,9 @@ AnimationClip: classID: 212 script: {fileID: 0} - curve: - - time: 0.15 + - time: 0.2 value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.25 + - time: 0.33333334 value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.5 value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -620,6 +670,15 @@ AnimationClip: path: head classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 1136722714597198076, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - time: 0.2 + value: {fileID: 0} + attribute: m_Sprite + path: body/armL/handL + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -655,6 +714,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1296747703 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3685223346 attribute: 4 @@ -718,6 +784,20 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1296747703 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1296747703 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: 2346517677788077603, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - {fileID: 2346517677788077603, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -740,6 +820,8 @@ AnimationClip: - {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - {fileID: 1136722714597198076, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -792,7 +874,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 0.25 inSlope: -2.3999999 outSlope: Infinity @@ -801,7 +883,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -810,7 +892,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -865,7 +947,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 0 inSlope: 0 outSlope: Infinity @@ -874,7 +956,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -883,7 +965,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -938,7 +1020,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 0 inSlope: 0 outSlope: Infinity @@ -947,7 +1029,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -956,7 +1038,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1011,7 +1093,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1020,7 +1102,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1075,7 +1157,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1084,7 +1166,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1139,7 +1221,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1148,7 +1230,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1203,7 +1285,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 2.35 inSlope: Infinity outSlope: Infinity @@ -1212,7 +1294,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 2.35 inSlope: -0 outSlope: 0 @@ -1267,7 +1349,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: -1.1 inSlope: Infinity outSlope: Infinity @@ -1276,7 +1358,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: -1.1 inSlope: -0 outSlope: 0 @@ -1331,7 +1413,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1340,7 +1422,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1395,7 +1477,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1404,7 +1486,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1459,7 +1541,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1468,7 +1550,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1523,7 +1605,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1532,7 +1614,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1587,7 +1669,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: -2 inSlope: Infinity outSlope: Infinity @@ -1596,7 +1678,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: -2 inSlope: -0 outSlope: 0 @@ -1651,7 +1733,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: -1.1 inSlope: Infinity outSlope: Infinity @@ -1660,7 +1742,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: -1.1 inSlope: -0 outSlope: 0 @@ -1715,7 +1797,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1724,7 +1806,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1779,7 +1861,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1788,7 +1870,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1843,7 +1925,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1852,7 +1934,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1907,7 +1989,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1916,7 +1998,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -1971,7 +2053,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 3.6 inSlope: -18 outSlope: -18 @@ -1980,18 +2062,18 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0.9 inSlope: Infinity - outSlope: -9 + outSlope: -6.7499995 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 - inSlope: -9 + inSlope: -6.7499995 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -2044,7 +2126,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 3.9 inSlope: 21.600002 outSlope: 21.600002 @@ -2053,18 +2135,18 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 6.5 inSlope: Infinity - outSlope: 4.0000014 + outSlope: 3.0000005 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 6.9 - inSlope: 4.0000014 + inSlope: 3.0000005 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -2117,7 +2199,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 0 inSlope: 0 outSlope: 0 @@ -2126,7 +2208,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: 0 @@ -2135,7 +2217,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -2190,7 +2272,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 0 inSlope: 0 outSlope: 0 @@ -2199,7 +2281,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: 0 @@ -2208,7 +2290,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -2263,7 +2345,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: 0 inSlope: 0 outSlope: 0 @@ -2272,7 +2354,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: 0 inSlope: Infinity outSlope: 0 @@ -2281,7 +2363,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 inSlope: -0 outSlope: 0 @@ -2336,7 +2418,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.18333334 value: -25 inSlope: 240 outSlope: 240 @@ -2345,18 +2427,18 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.2 value: -15 inSlope: Infinity - outSlope: 150.00002 + outSlope: 112.49999 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.33333334 value: 0 - inSlope: 150.00002 + inSlope: 112.49999 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -2462,37 +2544,175 @@ AnimationClip: path: head classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.48 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.48 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.18333334 + value: 0.73 + 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: body/armL/handL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.18333334 + value: -0.8 + 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: body/armL/handL + 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.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.18333334 + 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: body/armL/handL + 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: localEulerAnglesRaw.x + path: body/armL/handL + 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: localEulerAnglesRaw.y + path: body/armL/handL + 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: localEulerAnglesRaw.z + path: body/armL/handL + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: body/armR - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: body/armR - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: body/armR - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -2553,6 +2773,36 @@ AnimationClip: path: body/armL classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/armR + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/armR + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/armR + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -2583,6 +2833,36 @@ AnimationClip: path: head classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/armL/handL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/armL/handL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/armL/handL + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/NoPose.anim b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/NoPose.anim index 0f62292d..84de16e7 100644 --- a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/NoPose.anim +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/NoPose.anim @@ -78,6 +78,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: head + - 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, 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: body/armL/handL m_PositionCurves: - curve: serializedVersion: 2 @@ -143,6 +159,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: head + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.98, y: -0.8, 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: body/armL/handL m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -174,6 +206,13 @@ AnimationClip: path: head classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: body/armL/handL + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -209,6 +248,13 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1296747703 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 - serializedVersion: 2 path: 3685223346 attribute: 1 @@ -237,6 +283,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1296747703 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3685223346 attribute: 4 @@ -265,11 +318,19 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1296747703 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -747,6 +808,120 @@ AnimationClip: path: head classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.98 + 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: body/armL/handL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: body/armL/handL + 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: body/armL/handL + 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: localEulerAnglesRaw.x + path: body/armL/handL + 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: localEulerAnglesRaw.y + path: body/armL/handL + 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: localEulerAnglesRaw.z + path: body/armL/handL + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -868,6 +1043,36 @@ AnimationClip: path: head classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/armL/handL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/armL/handL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/armL/handL + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Player.controller b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Player.controller index 8f51ce92..c721056d 100644 --- a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Player.controller +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Player.controller @@ -137,19 +137,19 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -1826418598434636915} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 280, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -1576244774494964117} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 280, y: 190, z: 0} - serializedVersion: 1 m_State: {fileID: 7485310372438117339} - m_Position: {x: 270, y: 130, z: 0} + m_Position: {x: 280, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: 3344526055661378143} - m_Position: {x: 305, y: 195, z: 0} + m_Position: {x: 280, y: 290, z: 0} - serializedVersion: 1 m_State: {fileID: -6301654628326570588} - m_Position: {x: 340, y: 260, z: 0} + m_Position: {x: 280, y: 340, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Through.anim b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Through.anim index cd0c599d..76dec961 100644 --- a/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Through.anim +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Through.anim @@ -36,7 +36,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -45,7 +45,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -54,7 +54,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -115,7 +115,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 0, y: 0, z: 15} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -124,7 +124,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 0, y: 0, z: 15} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -133,10 +133,10 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 0, y: 0, z: 10} - inSlope: {x: 0, y: 0, z: -99.99999} - outSlope: {x: 0, y: 0, z: -99.99999} + inSlope: {x: 0, y: 0, z: -112.50001} + outSlope: {x: 0, y: 0, z: -112.50001} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -194,7 +194,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 0, y: 0, z: -15} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -203,7 +203,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 0, y: 0, z: -15} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -212,10 +212,10 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 0, y: 0, z: -10} - inSlope: {x: 0, y: 0, z: 99.99999} - outSlope: {x: 0, y: 0, z: 99.99999} + inSlope: {x: 0, y: 0, z: 112.50001} + outSlope: {x: 0, y: 0, z: 112.50001} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -273,7 +273,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -282,7 +282,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -291,7 +291,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -353,7 +353,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 0, y: -0.2, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -362,7 +362,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 0, y: -0.2, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -371,7 +371,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 0, y: -0.2, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -432,7 +432,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 2.577, y: -0.92, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -441,7 +441,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 2.577, y: -0.92, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -450,10 +450,10 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 2.488, y: -1.05, z: 0} - inSlope: {x: -1.5133332, y: -1.2, z: 0} - outSlope: {x: -1.5133332, y: -1.2, z: 0} + inSlope: {x: -1.7025001, y: -1.3500001, z: 0} + outSlope: {x: -1.7025001, y: -1.3500001, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -511,7 +511,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: -2.335, y: -1.09, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -520,7 +520,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: -2.335, y: -1.09, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -529,10 +529,10 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: -2.217, y: -1.09, z: 0} - inSlope: {x: 2.2333336, y: 0, z: 0} - outSlope: {x: 2.2333336, y: 0, z: 0} + inSlope: {x: 2.5125005, y: 0, z: 0} + outSlope: {x: 2.5125005, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -590,7 +590,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 0, y: 2.9, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -599,19 +599,19 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 0, y: 4, z: 0} - inSlope: {x: 0, y: 10.499999, z: 0} - outSlope: {x: 0, y: 10.499999, z: 0} + inSlope: {x: 0, y: 11.454546, z: 0} + outSlope: {x: 0, y: 11.454546, 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.36666667 + time: 0.38333333 value: {x: 0, y: 5, z: 0} - inSlope: {x: 0, y: 19.333334, z: 0} - outSlope: {x: 0, y: 19.333334, z: 0} + inSlope: {x: 0, y: 21.750002, z: 0} + outSlope: {x: 0, y: 21.750002, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -670,7 +670,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 1, y: 0.9, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -679,7 +679,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 1, y: 0.9, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -688,7 +688,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 1, y: 0.9, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -749,7 +749,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 1, y: 1.1111112, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -758,7 +758,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 1, y: 1.1111112, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -767,7 +767,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 1, y: 1.1111112, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -828,7 +828,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: {x: 1, y: 1.1111112, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -837,7 +837,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: {x: 1, y: 1.1111112, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -846,7 +846,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: {x: 1, y: 1.1111112, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -892,11 +892,11 @@ AnimationClip: value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.016666668 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.16666667 + - time: 0.2 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.28333333 + - time: 0.3 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.36666667 + - time: 0.38333333 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.43333334 value: {fileID: 333524933372927641, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -913,11 +913,11 @@ AnimationClip: value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.016666668 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.16666667 + - time: 0.2 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.28333333 + - time: 0.3 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.36666667 + - time: 0.38333333 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.43333334 value: {fileID: -4454273697595807397, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -934,11 +934,11 @@ AnimationClip: value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.016666668 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.16666667 + - time: 0.2 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.28333333 + - time: 0.3 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.36666667 + - time: 0.38333333 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.43333334 value: {fileID: 6975551133593416859, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -955,11 +955,11 @@ AnimationClip: value: {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.016666668 value: {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.16666667 + - time: 0.2 value: {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.28333333 + - time: 0.3 value: {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - - time: 0.36666667 + - time: 0.38333333 value: {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} - time: 0.41666666 value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} @@ -1162,7 +1162,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1171,7 +1171,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -1180,7 +1180,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -1244,7 +1244,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: -0.2 inSlope: 0 outSlope: 0 @@ -1253,7 +1253,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: -0.2 inSlope: 0 outSlope: 0 @@ -1262,7 +1262,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: -0.2 inSlope: 0 outSlope: 0 @@ -1326,7 +1326,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1335,7 +1335,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -1344,7 +1344,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -1408,7 +1408,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1417,7 +1417,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -1426,7 +1426,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -1490,7 +1490,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1499,7 +1499,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -1508,7 +1508,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -1572,7 +1572,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1581,7 +1581,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -1590,7 +1590,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -1654,7 +1654,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 2.577 inSlope: 0 outSlope: 0 @@ -1663,7 +1663,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 2.577 inSlope: 0 outSlope: 0 @@ -1672,10 +1672,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 2.488 - inSlope: -1.5133332 - outSlope: -1.5133332 + inSlope: -1.7025001 + outSlope: -1.7025001 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1736,7 +1736,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: -0.92 inSlope: 0 outSlope: 0 @@ -1745,7 +1745,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: -0.92 inSlope: 0 outSlope: 0 @@ -1754,10 +1754,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: -1.05 - inSlope: -1.2 - outSlope: -1.2 + inSlope: -1.3500001 + outSlope: -1.3500001 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1818,7 +1818,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1827,7 +1827,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -1836,7 +1836,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -1900,7 +1900,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1909,7 +1909,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -1918,7 +1918,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -1982,7 +1982,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1991,7 +1991,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2000,7 +2000,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -2064,7 +2064,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 15 inSlope: 0 outSlope: 0 @@ -2073,7 +2073,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 15 inSlope: 0 outSlope: 0 @@ -2082,10 +2082,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 10 - inSlope: -99.99999 - outSlope: -99.99999 + inSlope: -112.50001 + outSlope: -112.50001 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -2146,7 +2146,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: -2.335 inSlope: 0 outSlope: 0 @@ -2155,7 +2155,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: -2.335 inSlope: 0 outSlope: 0 @@ -2164,10 +2164,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: -2.217 - inSlope: 2.2333336 - outSlope: 2.2333336 + inSlope: 2.5125005 + outSlope: 2.5125005 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -2228,7 +2228,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: -1.09 inSlope: 0 outSlope: 0 @@ -2237,7 +2237,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: -1.09 inSlope: 0 outSlope: 0 @@ -2246,7 +2246,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: -1.09 inSlope: 0 outSlope: 0 @@ -2310,7 +2310,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -2319,7 +2319,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2328,7 +2328,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -2392,7 +2392,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -2401,7 +2401,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2410,7 +2410,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -2474,7 +2474,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -2483,7 +2483,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2492,7 +2492,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -2556,7 +2556,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: -15 inSlope: 0 outSlope: 0 @@ -2565,7 +2565,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: -15 inSlope: 0 outSlope: 0 @@ -2574,10 +2574,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: -10 - inSlope: 99.99999 - outSlope: 99.99999 + inSlope: 112.50001 + outSlope: 112.50001 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -2638,7 +2638,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -2647,7 +2647,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2656,7 +2656,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -2720,7 +2720,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 2.9 inSlope: 0 outSlope: 0 @@ -2729,19 +2729,19 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 4 - inSlope: 10.499999 - outSlope: 10.499999 + inSlope: 11.454546 + outSlope: 11.454546 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 5 - inSlope: 19.333334 - outSlope: 19.333334 + inSlope: 21.750002 + outSlope: 21.750002 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -2802,7 +2802,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -2811,7 +2811,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2820,7 +2820,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -2884,7 +2884,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -2893,7 +2893,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2902,7 +2902,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -2966,7 +2966,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -2975,7 +2975,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -2984,7 +2984,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -3048,7 +3048,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -3057,7 +3057,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: 0 outSlope: 0 @@ -3066,7 +3066,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0 inSlope: 0 outSlope: 0 @@ -3130,7 +3130,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -3139,7 +3139,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1 inSlope: 0 outSlope: 0 @@ -3148,7 +3148,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1 inSlope: 0 outSlope: 0 @@ -3212,7 +3212,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0.9 inSlope: 0 outSlope: 0 @@ -3221,7 +3221,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0.9 inSlope: 0 outSlope: 0 @@ -3230,7 +3230,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 0.9 inSlope: 0 outSlope: 0 @@ -3294,7 +3294,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -3303,7 +3303,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1 inSlope: 0 outSlope: 0 @@ -3312,7 +3312,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1 inSlope: 0 outSlope: 0 @@ -3376,7 +3376,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -3385,7 +3385,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1 inSlope: 0 outSlope: 0 @@ -3394,7 +3394,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1 inSlope: 0 outSlope: 0 @@ -3458,7 +3458,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1.1111112 inSlope: 0 outSlope: 0 @@ -3467,7 +3467,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1.1111112 inSlope: 0 outSlope: 0 @@ -3476,7 +3476,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1.1111112 inSlope: 0 outSlope: 0 @@ -3540,7 +3540,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -3549,7 +3549,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1 inSlope: 0 outSlope: 0 @@ -3558,7 +3558,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1 inSlope: 0 outSlope: 0 @@ -3622,7 +3622,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -3631,7 +3631,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1 inSlope: 0 outSlope: 0 @@ -3640,7 +3640,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1 inSlope: 0 outSlope: 0 @@ -3704,7 +3704,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1.1111112 inSlope: 0 outSlope: 0 @@ -3713,7 +3713,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1.1111112 inSlope: 0 outSlope: 0 @@ -3722,7 +3722,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1.1111112 inSlope: 0 outSlope: 0 @@ -3786,7 +3786,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -3795,7 +3795,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 1 inSlope: 0 outSlope: 0 @@ -3804,7 +3804,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.38333333 value: 1 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble.meta b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble.meta new file mode 100644 index 00000000..93520501 --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 230d72d16e0c84a4b8f9f95c8defb344 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/NoPose.anim b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/NoPose.anim new file mode 100644 index 00000000..1b1024f8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/NoPose.anim @@ -0,0 +1,83 @@ +%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: NoPose + 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: + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: warnBubble + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: warnBubble/warnObj + 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: 3568670535 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1238842833 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 0} + - {fileID: 0} + 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: 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/NoPose.anim.meta b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/NoPose.anim.meta new file mode 100644 index 00000000..9dd1281e --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/NoPose.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e91e2976f4422ca4db6ac91e33157029 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnBall.anim b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnBall.anim new file mode 100644 index 00000000..fb574029 --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnBall.anim @@ -0,0 +1,89 @@ +%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: WarnBall + 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: + - curve: + - time: 0 + value: {fileID: -91470071303476930, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - time: 0.5 + value: {fileID: 0} + attribute: m_Sprite + path: warnBubble + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -6102311414589244448, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - time: 0.5 + value: {fileID: 0} + attribute: m_Sprite + path: warnBubble/warnObj + 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: 3568670535 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1238842833 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -91470071303476930, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - {fileID: 0} + - {fileID: -6102311414589244448, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.51666665 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnBall.anim.meta b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnBall.anim.meta new file mode 100644 index 00000000..4099dbc1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnBall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b64c07f3415b4b347bb14ac68eb8a79d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPlane.anim b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPlane.anim new file mode 100644 index 00000000..ba23873c --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPlane.anim @@ -0,0 +1,321 @@ +%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: WarnPlane + 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.159, y: -0.19, 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.5 + value: {x: -0.159, y: -0.19, 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: warnBubble/warnObj + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.5, y: 0.5, z: 1} + 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.5 + value: {x: 0.5, y: 0.5, z: 1} + 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: warnBubble/warnObj + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -91470071303476930, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - time: 0.5 + value: {fileID: 0} + attribute: m_Sprite + path: warnBubble + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 7171732435601072149, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - time: 0.5 + value: {fileID: 0} + attribute: m_Sprite + path: warnBubble/warnObj + 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: 3568670535 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1238842833 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1238842833 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1238842833 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: -91470071303476930, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - {fileID: 0} + - {fileID: 7171732435601072149, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.51666665 + 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.159 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.159 + 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: warnBubble/warnObj + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.19 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.19 + 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: warnBubble/warnObj + 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.5 + 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: warnBubble/warnObj + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.5 + 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_LocalScale.x + path: warnBubble/warnObj + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.5 + 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_LocalScale.y + path: warnBubble/warnObj + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + 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 + attribute: m_LocalScale.z + path: warnBubble/warnObj + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPlane.anim.meta b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPlane.anim.meta new file mode 100644 index 00000000..d1cfad0d --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPlane.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b3f27d3bf64955479ffd24af9035e95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/objWarn.controller b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/objWarn.controller new file mode 100644 index 00000000..e203ff9e --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/objWarn.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8551579839221924897 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WarnBall + 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: b64c07f3415b4b347bb14ac68eb8a79d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7055674614395819121 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoPose + 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: e91e2976f4422ca4db6ac91e33157029, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: objWarn + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2269194568810353733} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &2269194568810353733 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7055674614395819121} + m_Position: {x: 240, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8551579839221924897} + m_Position: {x: 240, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5922798250668347908} + m_Position: {x: 240, y: 240, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7055674614395819121} +--- !u!1102 &5922798250668347908 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WarnPlane + 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: 0b3f27d3bf64955479ffd24af9035e95, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/objWarn.controller.meta b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/objWarn.controller.meta new file mode 100644 index 00000000..70584a21 --- /dev/null +++ b/Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/objWarn.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a850dec721b9f242b3c4ef19e703350 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/TrickClass/MobTrickObj.cs b/Assets/Scripts/Games/TrickClass/MobTrickObj.cs index 57d8bfe1..0bb11632 100644 --- a/Assets/Scripts/Games/TrickClass/MobTrickObj.cs +++ b/Assets/Scripts/Games/TrickClass/MobTrickObj.cs @@ -132,6 +132,7 @@ namespace HeavenStudio.Games.Scripts_TrickClass { //just game.PlayerDodge(); + Jukebox.PlayOneShotGame("trickClass/player_dodge_success", volume: 0.8f, pitch: UnityEngine.Random.Range(0.95f, 1.15f)); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound(GetDodgeSound(), startBeat + flyBeats, volume: 0.4f), }); diff --git a/Assets/Scripts/Games/TrickClass/TrickClass.cs b/Assets/Scripts/Games/TrickClass/TrickClass.cs index 933c4d70..ec8bc129 100644 --- a/Assets/Scripts/Games/TrickClass/TrickClass.cs +++ b/Assets/Scripts/Games/TrickClass/TrickClass.cs @@ -45,6 +45,7 @@ namespace HeavenStudio.Games [Header("Objects")] public Animator playerAnim; public Animator girlAnim; + public Animator warnAnim; [Header("References")] public GameObject ballPrefab; @@ -88,6 +89,29 @@ namespace HeavenStudio.Games PlayerDodge(true); playerCanDodge = Conductor.instance.songPositionInBeats + 0.6f; } + + // bruh + var tossEvents = GameManager.instance.Beatmap.entities.FindAll(en => en.datamodel == "trickClass/toss"); + for (int i = 0; i < tossEvents.Count; i++) + { + var e = tossEvents[i]; + float timeToEvent = e.beat - cond.songPositionInBeats; + if (timeToEvent > 0f && timeToEvent <= 1f) + { + string anim = "WarnBall"; + switch (e.type) + { + case (int) TrickObjType.Plane: + anim = "WarnPlane"; + break; + default: + anim = "WarnBall"; + break; + } + warnAnim.DoScaledAnimation(anim, e.beat - 1f, 1f); + break; + } + } } public void Bop(float beat, float length) @@ -156,14 +180,14 @@ namespace HeavenStudio.Games { playerAnim.DoScaledAnimationAsync("DodgeNg"); playerBopStart = Conductor.instance.songPositionInBeats + 0.75f; - + playerCanDodge = Conductor.instance.songPositionInBeats + 0.15f; } public void PlayerThrough() { playerAnim.DoScaledAnimationAsync("Through"); playerBopStart = Conductor.instance.songPositionInBeats + 0.75f; - + playerCanDodge = Conductor.instance.songPositionInBeats + 0.15f; } } } \ No newline at end of file