diff --git a/Assets/Resources/Games/sickBeats.prefab b/Assets/Resources/Games/sickBeats.prefab index 0542a87fe..44513272d 100644 --- a/Assets/Resources/Games/sickBeats.prefab +++ b/Assets/Resources/Games/sickBeats.prefab @@ -84,102 +84,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &316358597830589484 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7504830150123212274} - - component: {fileID: 5095541933332226242} - - component: {fileID: 3308707171876071503} - m_Layer: 0 - m_Name: a01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7504830150123212274 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316358597830589484} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.39, y: 1.39, z: 1.39} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5095541933332226242 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316358597830589484} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: b27700857852b354a8113467afd38b2c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.38431373} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 12.8, y: 7.2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!210 &3308707171876071503 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316358597830589484} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 --- !u!1 &325919588443345528 GameObject: m_ObjectHideFlags: 0 @@ -462,7 +366,7 @@ Transform: m_Children: - {fileID: 6766528818503559458} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &931860579937449824 GameObject: @@ -553,7 +457,7 @@ Transform: - {fileID: 6868621304053130204} - {fileID: 1232340788429764128} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2474622290440863168 Animator: @@ -607,7 +511,7 @@ Transform: m_Children: - {fileID: 5573088380138460906} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &536273548693950899 Animator: @@ -747,7 +651,7 @@ Transform: - {fileID: 846032523793744198} - {fileID: 682339296626369903} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2221015856695332081 GameObject: @@ -1001,7 +905,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8901463518339414129 SpriteRenderer: @@ -1178,7 +1082,7 @@ Transform: - {fileID: 5696406338648130929} - {fileID: 2737209416591403053} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3185513616660069273 GameObject: @@ -1379,7 +1283,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2406300221426876016 SpriteRenderer: @@ -1803,7 +1707,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7457914205184788737 SpriteRenderer: @@ -2412,7 +2316,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7504830150123212274} - {fileID: 5422907639184827830} - {fileID: 5514553089897904754} - {fileID: 6298925751026560721} @@ -2809,7 +2712,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7299721463831160812 GameObject: @@ -3846,7 +3749,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8979225644572526072 SpriteRenderer: diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctor.controller b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctor.controller index e7a5430fa..5815b52a6 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctor.controller +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctor.controller @@ -135,7 +135,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: shock0 - m_Speed: 0.5 + m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorBop.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorBop.anim index fd0e9c039..a7389aaba 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorBop.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorBop.anim @@ -28,7 +28,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.05 + time: 0.033333335 value: {x: -7.1, y: -1.7, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -37,16 +37,16 @@ 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.1 + time: 0.06666667 value: {x: -7.2, y: -1.65, z: 0} - inSlope: {x: 0, y: 1.0000001, z: 0} - outSlope: {x: 0, y: 1.0000001, z: 0} + inSlope: {x: 0, y: 1.5000005, z: 0} + outSlope: {x: 0, y: 1.5000005, 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.15 + time: 0.1 value: {x: -7.2, y: -1.6, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -64,7 +64,7 @@ AnimationClip: - curve: - time: 0 value: {fileID: -1942480849, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.1 + - time: 0.06666667 value: {fileID: 1077573537, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: body @@ -73,13 +73,13 @@ AnimationClip: - curve: - time: 0 value: {fileID: -1999160733, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.1 + - time: 0.06666667 value: {fileID: 310217554, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: leg classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -117,7 +117,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.15 + m_StopTime: 0.10000001 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -146,7 +146,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.033333335 value: -7.1 inSlope: 0 outSlope: 0 @@ -155,7 +155,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.06666667 value: -7.2 inSlope: 0 outSlope: 0 @@ -164,7 +164,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.1 value: -7.2 inSlope: 0 outSlope: 0 @@ -192,7 +192,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.033333335 value: -1.7 inSlope: 0 outSlope: 0 @@ -201,16 +201,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.06666667 value: -1.65 - inSlope: 1.0000001 - outSlope: 1.0000001 + inSlope: 1.5000005 + outSlope: 1.5000005 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.1 value: -1.6 inSlope: 0 outSlope: 0 @@ -238,7 +238,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.06666667 value: 0 inSlope: 0 outSlope: 0 @@ -247,7 +247,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.1 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim deleted file mode 100644 index 8f311407e..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim +++ /dev/null @@ -1,53 +0,0 @@ -%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: doctorIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 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/SickBeats/Animations/doctorIdle.anim.meta b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim.meta deleted file mode 100644 index 62f3f868f..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eca0ae4a93253874cb5d7fe4658f3775 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock0.anim index 196f07dfd..b676b4114 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock0.anim @@ -28,7 +28,7 @@ AnimationClip: inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.016666668 + time: 0.033333335 value: {x: -7.3, y: -1.6, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -36,6 +36,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -7.2, y: -1.6, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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 @@ -55,7 +64,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.016666668 + time: 0.033333335 value: 0 inSlope: Infinity outSlope: Infinity @@ -63,6 +72,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -74,8 +92,10 @@ AnimationClip: - curve: - time: 0 value: {fileID: 1955314201, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.016666668 + - time: 0.033333335 value: {fileID: -7863152, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.06666667 + value: {fileID: 1955314201, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: leg classID: 212 @@ -83,6 +103,8 @@ AnimationClip: - curve: - time: 0 value: {fileID: -1154026639, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.06666667 + value: {fileID: -1154026639, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: arm classID: 212 @@ -90,11 +112,13 @@ AnimationClip: - curve: - time: 0 value: {fileID: 1111879098, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.06666667 + value: {fileID: 1111879098, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: head classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -139,14 +163,17 @@ AnimationClip: pptrCurveMapping: - {fileID: 1955314201, guid: 2cbed287815b20940b4f246101a71547, type: 3} - {fileID: -7863152, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: 1955314201, guid: 2cbed287815b20940b4f246101a71547, type: 3} - {fileID: -1154026639, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: -1154026639, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: 1111879098, guid: 2cbed287815b20940b4f246101a71547, type: 3} - {fileID: 1111879098, guid: 2cbed287815b20940b4f246101a71547, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.033333335 + m_StopTime: 0.10000001 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -175,7 +202,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.016666668 + time: 0.033333335 value: 0 inSlope: Infinity outSlope: Infinity @@ -183,6 +210,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -203,7 +239,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.016666668 + time: 0.033333335 value: -7.3 inSlope: 0 outSlope: 0 @@ -211,6 +247,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -7.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -228,8 +273,17 @@ AnimationClip: outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -1.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -247,8 +301,17 @@ AnimationClip: outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock1.anim index ea2df617f..f3d95551e 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock1.anim @@ -28,7 +28,7 @@ AnimationClip: inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.033333335 + time: 0.06666667 value: {x: -7.3, y: -1.6, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -55,7 +55,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.033333335 + time: 0.06666667 value: 0 inSlope: Infinity outSlope: Infinity @@ -74,7 +74,7 @@ AnimationClip: - curve: - time: 0 value: {fileID: -1154026639, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.033333335 + - time: 0.06666667 value: {fileID: -2065133732, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: arm @@ -90,17 +90,17 @@ AnimationClip: - curve: - time: 0 value: {fileID: 1955314201, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.016666668 - value: {fileID: -688939494, guid: 2cbed287815b20940b4f246101a71547, type: 3} - time: 0.033333335 + value: {fileID: -688939494, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.06666667 value: {fileID: -1823771351, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.05 + - time: 0.1 value: {fileID: -1999160733, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: leg classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -155,7 +155,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.06666667 + m_StopTime: 0.13333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -184,7 +184,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.033333335 + time: 0.06666667 value: -7.3 inSlope: 0 outSlope: 0 @@ -250,7 +250,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.033333335 + time: 0.06666667 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorVsign.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorVsign.anim index 26ca11b87..eac64b2bb 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorVsign.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorVsign.anim @@ -28,7 +28,7 @@ AnimationClip: inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.33333334 value: {x: -6.5, y: -2.7, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} @@ -37,7 +37,7 @@ AnimationClip: inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.23333333 + time: 0.4 value: {x: -6.5, y: -2.7, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} @@ -55,9 +55,9 @@ AnimationClip: - curve: - time: 0 value: {fileID: -1370700235, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.16666667 + - time: 0.33333334 value: {fileID: -1028063574, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.23333333 + - time: 0.4 value: {fileID: -2065133732, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: arm @@ -66,7 +66,7 @@ AnimationClip: - curve: - time: 0 value: {fileID: -1999160733, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.23333333 + - time: 0.4 value: {fileID: 310217554, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: leg @@ -75,17 +75,17 @@ AnimationClip: - curve: - time: 0 value: {fileID: 1513514991, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.16666667 + - time: 0.33333334 value: {fileID: 1348183726, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.2 + - time: 0.36666667 value: {fileID: -1429813814, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.23333333 + - time: 0.4 value: {fileID: 1933536464, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: head classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -135,7 +135,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.43333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -164,7 +164,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.16666667 + time: 0.33333334 value: -6.5 inSlope: Infinity outSlope: Infinity @@ -173,7 +173,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.23333333 + time: 0.4 value: -6.5 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkIdle.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkIdle.anim index d1afcfa3f..dd46b7dc7 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkIdle.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkIdle.anim @@ -37,7 +37,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkOut.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkOut.anim index 35478976b..05b16f431 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkOut.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkOut.anim @@ -50,7 +50,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkRepop.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkRepop.anim index fe982a31e..9dbf59b3a 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkRepop.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkRepop.anim @@ -69,7 +69,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h0.anim index 040e2b850..8445f2106 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h0.anim @@ -61,7 +61,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h1.anim index 745da7faf..6e1f456cf 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-h1.anim @@ -78,7 +78,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v0.anim index fbbf21f93..c6c4cc80b 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v0.anim @@ -61,7 +61,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v1.anim index a2e5d1cf7..a3554814a 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkResist-v1.anim @@ -78,7 +78,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-h.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-h.anim index adbe2c16c..1c58e7b5c 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-h.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-h.anim @@ -154,7 +154,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-v.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-v.anim index ecc4c5522..041a2e268 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-v.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStab-v.anim @@ -154,7 +154,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-h.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-h.anim index 932ada00a..07e5dc11e 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-h.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-h.anim @@ -117,7 +117,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-v.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-v.anim index f02e08b8f..0b57a66a4 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-v.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabFast-v.anim @@ -117,7 +117,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-h.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-h.anim index d7761d4b9..6b47b0fff 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-h.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-h.anim @@ -117,7 +117,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-v.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-v.anim index a4b8556a4..8605dee39 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-v.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/fork/forkStabLate-v.anim @@ -117,7 +117,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyIdle.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyIdle.anim deleted file mode 100644 index 4126dcaee..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyIdle.anim +++ /dev/null @@ -1,53 +0,0 @@ -%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: keyIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 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/SickBeats/Animations/keyIdle.anim.meta b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyIdle.anim.meta deleted file mode 100644 index 3ef19eddc..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyIdle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eee5bff8cdd4c2b47a98b442ead04089 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim index 8e3d6359a..dd0b54070 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim @@ -34,7 +34,7 @@ AnimationClip: path: m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyPush.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyPush.anim index 75e73de05..aec281815 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyPush.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyPush.anim @@ -29,7 +29,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.033333335 + time: 0.06666667 value: {x: 4.4, y: 4.4, z: 4.4} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -43,7 +43,7 @@ AnimationClip: path: m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -63,7 +63,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.033333335 + m_StopTime: 0.06666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -92,7 +92,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.06666667 value: 4.4 inSlope: 0 outSlope: 0 @@ -120,7 +120,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.06666667 value: 4.4 inSlope: 0 outSlope: 0 @@ -148,7 +148,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.06666667 value: 4.4 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim index 99dbb68df..981cf1acf 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim @@ -29,7 +29,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.083333336 + time: 0.16666667 value: {x: 4.4, y: 4.4, z: 4.4} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -43,7 +43,7 @@ AnimationClip: path: m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -63,7 +63,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.083333336 + m_StopTime: 0.16666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -92,7 +92,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 4.4 inSlope: 0 outSlope: 0 @@ -120,7 +120,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 4.4 inSlope: 0 outSlope: 0 @@ -148,7 +148,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 4.4 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgAppear.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgAppear.anim index 6607cda80..c015f6dc9 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgAppear.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgAppear.anim @@ -23,15 +23,15 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 1} inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 12, y: 12, z: 0} + outSlope: {x: 10, y: 10, 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 + time: 0.1 value: {x: 1, y: 1, z: 1} - inSlope: {x: 12, y: 12, z: 0} + inSlope: {x: 10, y: 10, z: 0} outSlope: {x: Infinity, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 @@ -62,7 +62,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -89,7 +89,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.083333336 + m_StopTime: 0.1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -131,15 +131,15 @@ AnimationClip: time: 0 value: 0 inSlope: 0 - outSlope: 12 + outSlope: 10 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1 - inSlope: 12 + inSlope: 10 outSlope: Infinity tangentMode: 69 weightedMode: 0 @@ -159,15 +159,15 @@ AnimationClip: time: 0 value: 0 inSlope: Infinity - outSlope: 12 + outSlope: 10 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1 - inSlope: 12 + inSlope: 10 outSlope: Infinity tangentMode: 69 weightedMode: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgBop.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgBop.anim index 5f739ed94..8a471f032 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgBop.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgBop.anim @@ -21,15 +21,15 @@ AnimationClip: - curve: - time: 0 value: {fileID: 1126666570, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.05 + - time: 0.033333335 value: {fileID: 1369098790, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.1 + - time: 0.06666667 value: {fileID: 164032264, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -52,7 +52,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.11666667 + m_StopTime: 0.10000001 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgDamage.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgDamage.anim index 94da13201..ebb6ca293 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgDamage.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgDamage.anim @@ -21,13 +21,13 @@ AnimationClip: - curve: - time: 0 value: {fileID: -703621988, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.016666668 + - time: 0.033333335 value: {fileID: 227706867, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -49,7 +49,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.033333335 + m_StopTime: 0.06666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim deleted file mode 100644 index 2dcf3c75c..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim +++ /dev/null @@ -1,53 +0,0 @@ -%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: orgIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 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/SickBeats/Animations/orgIdle.anim.meta b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim.meta deleted file mode 100644 index a9024ff88..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ce89d40be0ff49441a220515fe14be65 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgVanish.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgVanish.anim index b15c00f52..3a726d1e5 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgVanish.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgVanish.anim @@ -23,22 +23,22 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: -12, z: 0} + outSlope: {x: 0, y: -6, 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 + time: 0.16666667 value: {x: 0, y: 0, z: 1} - inSlope: {x: 0, y: -12, z: 0} + inSlope: {x: 0, y: -6, z: 0} outSlope: {x: Infinity, y: Infinity, 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.1 + time: 0.2 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -64,7 +64,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.26666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 value: 0 inSlope: Infinity outSlope: Infinity @@ -81,15 +90,27 @@ AnimationClip: script: {fileID: 0} m_PPtrCurves: - curve: + - time: 0 + value: {fileID: -703621988, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.033333335 + value: {fileID: 227706867, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.06666667 + value: {fileID: -703621988, guid: 2cbed287815b20940b4f246101a71547, type: 3} - time: 0.1 + value: {fileID: 227706867, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.13333334 + value: {fileID: -703621988, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.16666667 + value: {fileID: 227706867, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - time: 0.2 value: {fileID: -1349292856, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.11666667 + - time: 0.23333333 value: {fileID: 819373935, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -118,6 +139,12 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: + - {fileID: -703621988, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: 227706867, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: -703621988, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: 227706867, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: -703621988, guid: 2cbed287815b20940b4f246101a71547, type: 3} + - {fileID: 227706867, guid: 2cbed287815b20940b4f246101a71547, type: 3} - {fileID: -1349292856, guid: 2cbed287815b20940b4f246101a71547, type: 3} - {fileID: 819373935, guid: 2cbed287815b20940b4f246101a71547, type: 3} m_AnimationClipSettings: @@ -125,7 +152,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.13333334 + m_StopTime: 0.3 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -154,7 +181,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.26666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 value: 0 inSlope: Infinity outSlope: Infinity @@ -182,7 +218,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 0 inSlope: 0 outSlope: Infinity @@ -191,7 +227,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -213,22 +249,22 @@ AnimationClip: time: 0 value: 1 inSlope: Infinity - outSlope: -12 + outSlope: -6 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 0 - inSlope: -12 + inSlope: -6 outSlope: Infinity tangentMode: 101 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/organism.controller b/Assets/Resources/Sprites/Games/SickBeats/Animations/organism.controller index f89e0d0bc..c32278aa8 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/organism.controller +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/organism.controller @@ -227,7 +227,7 @@ AnimatorState: m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/radioBop.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/radioBop.anim index 10fb3426f..b0dfe7384 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/radioBop.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/radioBop.anim @@ -21,15 +21,15 @@ AnimationClip: - curve: - time: 0 value: {fileID: -760195743, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.05 + - time: 0.033333335 value: {fileID: -457557280, guid: 2cbed287815b20940b4f246101a71547, type: 3} - - time: 0.1 + - time: 0.06666667 value: {fileID: -1354905193, guid: 2cbed287815b20940b4f246101a71547, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -52,7 +52,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.11666667 + m_StopTime: 0.10000001 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/radioIdle.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/radioIdle.anim deleted file mode 100644 index 7a19b8742..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/radioIdle.anim +++ /dev/null @@ -1,53 +0,0 @@ -%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: radioIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 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/SickBeats/Animations/radioIdle.anim.meta b/Assets/Resources/Sprites/Games/SickBeats/Animations/radioIdle.anim.meta deleted file mode 100644 index 25463ab81..000000000 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/radioIdle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fb1bbdc621953ef42ab97c42aee0a4ef -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppear.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppear.anim index 8f7940c51..6d5d69716 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppear.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppear.anim @@ -68,7 +68,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearDown.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearDown.anim index 41e313342..45d67cdb3 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearDown.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearDown.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearLeft.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearLeft.anim index e2575148a..f98d36af4 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearLeft.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearLeft.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearRight.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearRight.anim index 3eb94ca35..92e0b6a56 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearRight.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearRight.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearUp.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearUp.anim index 2120f30fe..01e90a0b6 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearUp.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppearUp.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDash.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDash.anim index 9c546c45b..b389ceb51 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDash.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDash.anim @@ -65,7 +65,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashDown.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashDown.anim index b573ac26e..f5d0ffc25 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashDown.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashDown.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashLeft.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashLeft.anim index a9b6caa4f..f33606e6c 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashLeft.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashLeft.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashRight.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashRight.anim index 6d59e8a94..803363a1f 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashRight.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashRight.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashUp.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashUp.anim index 1996fd883..734c02115 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashUp.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusDashUp.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusEnter.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusEnter.anim index cd703157d..39bf25810 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusEnter.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusEnter.anim @@ -43,7 +43,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusHide.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusHide.anim index 8931e0511..22a4e56dc 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusHide.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusHide.anim @@ -102,7 +102,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusIdle.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusIdle.anim index c3465efdd..67f408a51 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusIdle.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusIdle.anim @@ -56,7 +56,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusLaugh.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusLaugh.anim index 74883a471..e7ebe2ae6 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusLaugh.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusLaugh.anim @@ -46,7 +46,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist0.anim index bb748d969..5502a4bdb 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist0.anim @@ -70,7 +70,7 @@ AnimationClip: path: sprite/resist classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist1.anim index fbff002d2..e2ad0fe32 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResist1.anim @@ -65,7 +65,7 @@ AnimationClip: classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown0.anim index 1fddc47ea..4d2691617 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown0.anim @@ -68,7 +68,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown1.anim index a80819cc0..21eed4cfe 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistDown1.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft0.anim index af20023be..4ab98e81b 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft0.anim @@ -68,7 +68,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft1.anim index 5ed8a5f81..3f9dac3cb 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistLeft1.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight0.anim index d643468c3..21c2d8aa8 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight0.anim @@ -68,7 +68,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight1.anim index 936e5a440..ced8a4fb3 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistRight1.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp0.anim index 524616d7e..bcaa29116 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp0.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp0.anim @@ -68,7 +68,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp1.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp1.anim index 89789d27c..f6a27b1f1 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp1.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusResistUp1.anim @@ -59,7 +59,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStab.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStab.anim index 5a29ad025..a0345bd8d 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStab.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStab.anim @@ -57,7 +57,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabDown.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabDown.anim index 590b4651b..f7fd78696 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabDown.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabDown.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFast.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFast.anim index e4b34b751..5c5c17476 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFast.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFast.anim @@ -55,7 +55,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastDown.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastDown.anim index 36441dc01..2cd9ac2df 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastDown.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastDown.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastLeft.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastLeft.anim index a14bfcaae..c8c0db362 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastLeft.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastLeft.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastRight.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastRight.anim index 4fc2de929..8cba73e7e 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastRight.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastRight.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastUp.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastUp.anim index 775b681e9..214fad2c0 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastUp.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabFastUp.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLate.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLate.anim index 60b9dc5f7..fd067b4d3 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLate.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLate.anim @@ -55,7 +55,7 @@ AnimationClip: path: sprite classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateDown.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateDown.anim index 4e601f211..931473932 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateDown.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateDown.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateLeft.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateLeft.anim index 4bb401446..8b343b3fd 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateLeft.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateLeft.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateRight.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateRight.anim index be382fdb6..33c8f0113 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateRight.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateRight.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateUp.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateUp.anim index ef5869002..3dccfafdb 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateUp.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLateUp.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLeft.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLeft.anim index e1f960fed..869b428ca 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLeft.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabLeft.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabRight.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabRight.anim index fa74be093..84e119070 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabRight.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabRight.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabUp.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabUp.anim index b3b1ceba3..fe2f06621 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabUp.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusStabUp.anim @@ -50,7 +50,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim index fecb489a5..86b2738b7 100644 --- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim +++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim @@ -43,7 +43,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Games/SickBeats/SickBeats.cs b/Assets/Scripts/Games/SickBeats/SickBeats.cs index 8bb102862..dbc35f81e 100644 --- a/Assets/Scripts/Games/SickBeats/SickBeats.cs +++ b/Assets/Scripts/Games/SickBeats/SickBeats.cs @@ -130,8 +130,11 @@ namespace HeavenStudio.Games [SerializeField] DashPatternItem[] DashPatterns; [System.NonSerialized] public bool[] isForkPop = {true, true, true, true}; + [System.NonSerialized] public bool[] isMiss = {false, false, false, false}; + [System.NonSerialized] public bool[] isPrepare = {false, false, false, false}; [System.NonSerialized] public bool orgAlive = true; [System.NonSerialized] public bool docShock = false; + [System.NonSerialized] public double docShockBeat = Double.MinValue; public enum Direction { @@ -226,7 +229,7 @@ namespace HeavenStudio.Games public override void OnBeatPulse(double beat) { - if (BeatIsInBopRegion(beat)) Bop(); + if (BeatIsInBopRegion(beat)) Bop(beat); } void Update() @@ -245,18 +248,9 @@ namespace HeavenStudio.Games keyAnim.Play("up"); } - var rand_dir = UnityEngine.Random.Range(0, 4); - var InputAction = rand_dir switch { - (int)Direction.Right => InputAction_Right, - (int)Direction.Up => InputAction_Up, - (int)Direction.Left => InputAction_Left, - (int)Direction.Down => InputAction_Down, - }; - - if (PlayerInput.GetIsAction(InputAction) && - !(IsExpectingInputNow(InputAction_Right) || IsExpectingInputNow(InputAction_Up) - || IsExpectingInputNow(InputAction_Left) || IsExpectingInputNow(InputAction_Down))) + if (PlayerInput.GetIsAction(InputAction_FlickPress) && !IsExpectingInputNow(InputAction_FlickPress)) { + var rand_dir = ChooseDirection(isMiss, isPrepare, isForkPop); if (isForkPop[rand_dir]) OutFork(rand_dir); } } @@ -307,15 +301,15 @@ namespace HeavenStudio.Games { for (int i = 0; i < length; i++) { - BeatAction.New(instance, new() {new BeatAction.Action(beat + i, delegate {Bop();}) }); + BeatAction.New(instance, new() {new BeatAction.Action(beat + i, delegate {Bop(beat);}) }); } } } - public void Bop() + public void Bop(double beat) { radioAnim.DoScaledAnimationAsync("bop", 0.5f); - if (!docShock) doctorAnim.DoScaledAnimationAsync("bop", 0.5f); + if (beat < docShockBeat || beat > docShockBeat + 2) doctorAnim.DoScaledAnimationAsync("bop", 0.5f); if (orgAlive) orgAnim.DoScaledAnimationAsync("bop", 0.5f); } @@ -423,5 +417,37 @@ namespace HeavenStudio.Games RecolorMats[i].SetColor("_ColorDelta", color3); } } + + public static int ChooseDirection(bool[] misses, bool[] preparing, bool[] isForkPop) + { + var missedDirections = Enumerable.Range(0, 4) + .Where(i => misses[i] && isForkPop[i]) + .ToList(); + if (missedDirections.Count > 0) + { + int index = UnityEngine.Random.Range(0, missedDirections.Count); + return missedDirections[index]; + } + + var preparingDirections = Enumerable.Range(0, 4) + .Where(i => preparing[i] && isForkPop[i]) + .ToList(); + if (preparingDirections.Count > 0) + { + int index = UnityEngine.Random.Range(0, preparingDirections.Count); + return preparingDirections[index]; + } + + var remainingDirections = Enumerable.Range(0, 4) + .Where(i => isForkPop[i]) + .ToList(); + if (remainingDirections.Count > 0) + { + int index = UnityEngine.Random.Range(0, remainingDirections.Count); + return remainingDirections[index]; + } + + return UnityEngine.Random.Range(0, 4); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/SickBeats/Virus.cs b/Assets/Scripts/Games/SickBeats/Virus.cs index 08f851f09..eeed980c6 100644 --- a/Assets/Scripts/Games/SickBeats/Virus.cs +++ b/Assets/Scripts/Games/SickBeats/Virus.cs @@ -19,6 +19,8 @@ namespace HeavenStudio.Games.Scripts_SickBeats public int position; public int life = 1; + bool isJust = false; // not fundamental solution + private SickBeats game; public void Init() @@ -29,12 +31,6 @@ namespace HeavenStudio.Games.Scripts_SickBeats public void Appear() { - var InputAction = position switch { - 0 => SickBeats.InputAction_Right, - 1 => SickBeats.InputAction_Up, - 2 => SickBeats.InputAction_Left, - 3 => SickBeats.InputAction_Down, - }; MultiSound.Play(new MultiSound.Sound[] { @@ -45,6 +41,23 @@ namespace HeavenStudio.Games.Scripts_SickBeats VirusAnim("appear"); })}); + isJust = false; + + PlayerInput.InputAction InputAction; + if (PlayerInput.PlayerHasControl() && PlayerInput.CurrentControlStyle is InputSystem.InputController.ControlStyles.Touch) + { + InputAction = SickBeats.InputAction_FlickPress; + } + else + { + InputAction = position switch { + 0 => SickBeats.InputAction_Right, + 1 => SickBeats.InputAction_Up, + 2 => SickBeats.InputAction_Left, + 3 => SickBeats.InputAction_Down, + }; + } + // if (GameManager.instance.autoplay) // { // game.ScheduleAutoplayInput(startBeat, 1, InputAction, Just, Miss, Empty); @@ -54,6 +67,12 @@ namespace HeavenStudio.Games.Scripts_SickBeats // game.ScheduleUserInput(startBeat, 1, InputAction, Just, Miss, Empty, CanJust); // } game.ScheduleMissableInput(startBeat, 1, InputAction, Just, Miss, Empty, CanJust); + + var dir = position; + BeatAction.New(game, new() { + new BeatAction.Action(startBeat, delegate { game.isPrepare[dir] = true;}), + new BeatAction.Action((startBeat+1.5f), delegate { game.isPrepare[dir] = false;}), + }); } public void Dash() @@ -91,7 +110,7 @@ namespace HeavenStudio.Games.Scripts_SickBeats new MultiSound.Sound("sickBeats/fadeout", startBeat + 5), }); - var actions = new List() { + BeatAction.New(game, new() { new BeatAction.Action(startBeat + 2, delegate { virusAnim.DoScaledAnimationAsync("laugh", 0.5f); virusAnim.DoScaledAnimationAsync("enter", 0.5f); @@ -113,25 +132,28 @@ namespace HeavenStudio.Games.Scripts_SickBeats game.orgAlive = true; Destroy(gameObject); }), - new BeatAction.Action(startBeat + 9, delegate { - game.docShock = false; - game.doctorAnim.DoScaledAnimationAsync("idle", 0.5f); - }), - }; - - actions.Add(new BeatAction.Action(startBeat + 6, delegate { - game.docShock = true; - game.doctorAnim.DoScaledAnimationAsync("shock0", 0.5f); - })); - actions.Add(new BeatAction.Action(startBeat + 7, delegate { - game.doctorAnim.DoScaledAnimationAsync("shock1", 0.5f); - })); - actions.Add(new BeatAction.Action(startBeat + 9, delegate { - game.docShock = false; - game.doctorAnim.DoScaledAnimationAsync("idle", 0.5f); - })); - - BeatAction.New(game, actions); + }); + + Debug.Log(startBeat); + Debug.Log(game.docShockBeat); + if (startBeat + 6 >= game.docShockBeat + 3) + { + game.docShockBeat = startBeat + 6; + BeatAction.New(game, new() { + new BeatAction.Action(startBeat + 6, delegate { + game.docShock = true; + game.doctorAnim.DoScaledAnimationAsync("shock0", 0.5f); + }), + new BeatAction.Action(startBeat + 7, delegate { + game.doctorAnim.DoScaledAnimationAsync("shock1", 0.5f); + }), + new BeatAction.Action(startBeat + 9, delegate { + game.docShock = false; + game.doctorAnim.DoScaledAnimationAsync("idle", 0.5f); + }), + }); + } + } private void Just(PlayerActionEvent caller, float state) @@ -141,7 +163,7 @@ namespace HeavenStudio.Games.Scripts_SickBeats var dir = position; BeatAction.New(game, new() {new BeatAction.Action((startBeat+1) + game.RefillBeat, delegate { game.RepopFork(dir);})}); game.isForkPop[dir] = false; - + isJust = true; if (life < 0) { @@ -180,6 +202,12 @@ namespace HeavenStudio.Games.Scripts_SickBeats private void Miss(PlayerActionEvent caller) { + var dir = position; + if (dir >= 0 && dir <= 3) + { + game.isMiss[dir] = true; + BeatAction.New(game, new() {new BeatAction.Action((startBeat+1.5f), delegate { game.isMiss[dir] = false;})}); + } Dash(); Move(); } @@ -188,7 +216,7 @@ namespace HeavenStudio.Games.Scripts_SickBeats private bool CanJust() { if (position < 0 || position > 3) return false; - return game.isForkPop[position]; + return game.isForkPop[position] || isJust; } void VirusAnim(string animation)