From fbdea12330ae82bda55687b7bebe85879982971f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=95=E3=83=9E=E3=82=B8=E3=83=A1?=
<161014075+fu-majime@users.noreply.github.com>
Date: Thu, 14 Mar 2024 01:47:40 +0900
Subject: [PATCH] Sick Beats Fixed (#788)
* Sick Beats (WIP)
* sfx
* I wish create ScheduleMissableInput sometime
* deleted: Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusCome.anim
* Simple Flick
* ScheduleMissableInput
---
Assets/Resources/Games/sickBeats.prefab | 135 ++---------
.../Sfx/games/sickBeats/appear0.wav.meta | 22 ++
.../Sfx/games/sickBeats/appear1.wav.meta | 22 ++
.../Sfx/games/sickBeats/bad.wav.meta | 22 ++
.../Sfx/games/sickBeats/dash.wav.meta | 22 ++
.../Sfx/games/sickBeats/fadeout.wav.meta | 22 ++
.../Sfx/games/sickBeats/fork0.wav.meta | 22 ++
.../Sfx/games/sickBeats/fork1.wav.meta | 22 ++
.../Sfx/games/sickBeats/fork2.wav.meta | 22 ++
.../Sfx/games/sickBeats/hit.wav.meta | 22 ++
.../Sfx/games/sickBeats/miss.wav.meta | 22 ++
.../Sfx/games/sickBeats/note_land.wav.meta | 22 ++
.../Sfx/games/sickBeats/resist.wav.meta | 22 ++
.../Sfx/games/sickBeats/virusIn.wav.meta | 22 ++
.../SickBeats/Animations/doctor.controller | 2 +-
.../Games/SickBeats/Animations/doctorBop.anim | 38 +--
.../SickBeats/Animations/doctorIdle.anim | 53 -----
.../SickBeats/Animations/doctorShock0.anim | 85 ++++++-
.../SickBeats/Animations/doctorShock1.anim | 20 +-
.../SickBeats/Animations/doctorVsign.anim | 24 +-
.../SickBeats/Animations/fork/forkIdle.anim | 2 +-
.../SickBeats/Animations/fork/forkOut.anim | 2 +-
.../SickBeats/Animations/fork/forkRepop.anim | 2 +-
.../Animations/fork/forkResist-h0.anim | 2 +-
.../Animations/fork/forkResist-h1.anim | 2 +-
.../Animations/fork/forkResist-v0.anim | 2 +-
.../Animations/fork/forkResist-v1.anim | 2 +-
.../SickBeats/Animations/fork/forkStab-h.anim | 2 +-
.../SickBeats/Animations/fork/forkStab-v.anim | 2 +-
.../Animations/fork/forkStabFast-h.anim | 2 +-
.../Animations/fork/forkStabFast-v.anim | 2 +-
.../Animations/fork/forkStabLate-h.anim | 2 +-
.../Animations/fork/forkStabLate-v.anim | 2 +-
.../Games/SickBeats/Animations/key.controller | 81 +++++++
.../Games/SickBeats/Animations/keyIdle.anim | 53 -----
.../SickBeats/Animations/keyIdle.anim.meta | 8 -
.../Games/SickBeats/Animations/keyKeep.anim | 133 +++++++++++
.../{orgIdle.anim.meta => keyKeep.anim.meta} | 2 +-
.../Games/SickBeats/Animations/keyPush.anim | 12 +-
.../Games/SickBeats/Animations/keyUp.anim | 169 ++++++++++++++
.../{doctorIdle.anim.meta => keyUp.anim.meta} | 2 +-
.../Games/SickBeats/Animations/orgAppear.anim | 22 +-
.../Games/SickBeats/Animations/orgBop.anim | 8 +-
.../Games/SickBeats/Animations/orgDamage.anim | 6 +-
.../Games/SickBeats/Animations/orgIdle.anim | 53 -----
.../Games/SickBeats/Animations/orgVanish.anim | 66 ++++--
.../SickBeats/Animations/organism.controller | 2 +-
.../Games/SickBeats/Animations/radioBop.anim | 8 +-
.../Games/SickBeats/Animations/radioIdle.anim | 53 -----
.../SickBeats/Animations/radioIdle.anim.meta | 8 -
.../SickBeats/Animations/virus.controller | 2 +-
.../Animations/virus/virusAppear.anim | 2 +-
.../Animations/virus/virusAppearDown.anim | 2 +-
.../Animations/virus/virusAppearLeft.anim | 2 +-
.../Animations/virus/virusAppearRight.anim | 2 +-
.../Animations/virus/virusAppearUp.anim | 2 +-
.../SickBeats/Animations/virus/virusDash.anim | 2 +-
.../Animations/virus/virusDashDown.anim | 2 +-
.../Animations/virus/virusDashLeft.anim | 2 +-
.../Animations/virus/virusDashRight.anim | 2 +-
.../Animations/virus/virusDashUp.anim | 2 +-
.../Animations/virus/virusEnter.anim | 2 +-
.../SickBeats/Animations/virus/virusHide.anim | 2 +-
.../SickBeats/Animations/virus/virusIdle.anim | 2 +-
.../Animations/virus/virusLaugh.anim | 2 +-
.../Animations/virus/virusResist0.anim | 2 +-
.../Animations/virus/virusResist1.anim | 2 +-
.../Animations/virus/virusResistDown0.anim | 2 +-
.../Animations/virus/virusResistDown1.anim | 2 +-
.../Animations/virus/virusResistLeft0.anim | 2 +-
.../Animations/virus/virusResistLeft1.anim | 2 +-
.../Animations/virus/virusResistRight0.anim | 2 +-
.../Animations/virus/virusResistRight1.anim | 2 +-
.../Animations/virus/virusResistUp0.anim | 2 +-
.../Animations/virus/virusResistUp1.anim | 2 +-
.../SickBeats/Animations/virus/virusStab.anim | 2 +-
.../Animations/virus/virusStabDown.anim | 2 +-
.../Animations/virus/virusStabFast.anim | 2 +-
.../Animations/virus/virusStabFastDown.anim | 2 +-
.../Animations/virus/virusStabFastLeft.anim | 2 +-
.../Animations/virus/virusStabFastRight.anim | 2 +-
.../Animations/virus/virusStabFastUp.anim | 2 +-
.../Animations/virus/virusStabLate.anim | 2 +-
.../Animations/virus/virusStabLateDown.anim | 2 +-
.../Animations/virus/virusStabLateLeft.anim | 2 +-
.../Animations/virus/virusStabLateRight.anim | 2 +-
.../Animations/virus/virusStabLateUp.anim | 2 +-
.../Animations/virus/virusStabLeft.anim | 2 +-
.../Animations/virus/virusStabRight.anim | 2 +-
.../Animations/virus/virusStabUp.anim | 2 +-
.../{virusCome.anim => virusSummon.anim} | 4 +-
...usCome.anim.meta => virusSummon.anim.meta} | 0
.../Games/SickBeats/sick_virus.png.meta | 22 ++
Assets/Scripts/Games/PlayerActionEvent.cs | 4 +-
Assets/Scripts/Games/SickBeats/SickBeats.cs | 216 +++++++++++-------
Assets/Scripts/Games/SickBeats/Virus.cs | 122 +++++++---
...mes.Minigames.MinigameLoaderGenerator.g.cs | 20 +-
97 files changed, 1192 insertions(+), 631 deletions(-)
create mode 100644 Assets/Resources/Sfx/games/sickBeats/appear0.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/appear1.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/bad.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/dash.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/fadeout.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/fork0.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/fork1.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/fork2.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/hit.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/miss.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/note_land.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/resist.wav.meta
create mode 100644 Assets/Resources/Sfx/games/sickBeats/virusIn.wav.meta
delete mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim
delete mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/keyIdle.anim
delete mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/keyIdle.anim.meta
create mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim
rename Assets/Resources/Sprites/Games/SickBeats/Animations/{orgIdle.anim.meta => keyKeep.anim.meta} (79%)
create mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim
rename Assets/Resources/Sprites/Games/SickBeats/Animations/{doctorIdle.anim.meta => keyUp.anim.meta} (79%)
delete mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim
delete mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/radioIdle.anim
delete mode 100644 Assets/Resources/Sprites/Games/SickBeats/Animations/radioIdle.anim.meta
rename Assets/Resources/Sprites/Games/SickBeats/Animations/virus/{virusCome.anim => virusSummon.anim} (98%)
rename Assets/Resources/Sprites/Games/SickBeats/Animations/virus/{virusCome.anim.meta => virusSummon.anim.meta} (100%)
diff --git a/Assets/Resources/Games/sickBeats.prefab b/Assets/Resources/Games/sickBeats.prefab
index 3fc4f2b7..44513272 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: 1
- 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:
@@ -773,7 +677,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2221015856695332081}
- m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.24, y: 0.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -857,7 +761,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2237929108723570280}
- m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.24, y: -0.14, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -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:
@@ -1541,7 +1445,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3774277760501316908}
- m_LocalRotation: {x: -0, y: -0, z: -1, w: 0}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.24, y: -0.14, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -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:
@@ -1902,7 +1806,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4469412137596833312}
- m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: -0.7071068}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.24, y: 0.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -2267,7 +2171,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 178a9004094e8764f94b9ea8b900fe92, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -2288,8 +2192,8 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 10
- m_Sprite: {fileID: 761777244, guid: 2cbed287815b20940b4f246101a71547, type: 3}
- m_Color: {r: 0, g: 1, b: 1, a: 0}
+ m_Sprite: {fileID: 1961343541, guid: 8e57212f27f477f4da1acb6977f5394c, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -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:
@@ -3258,7 +3161,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7813825568024236096}
- m_LocalRotation: {x: -0, y: -0, z: -1, w: 0}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.24, y: 0.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -3671,7 +3574,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8758935354619488690}
- m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: -0.7071068}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.24, y: -0.14, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -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/Sfx/games/sickBeats/appear0.wav.meta b/Assets/Resources/Sfx/games/sickBeats/appear0.wav.meta
new file mode 100644
index 00000000..0b648bdf
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/appear0.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1795e9bc95e443940a8c5118eff95d26
+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/Sfx/games/sickBeats/appear1.wav.meta b/Assets/Resources/Sfx/games/sickBeats/appear1.wav.meta
new file mode 100644
index 00000000..3977f343
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/appear1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 59e16dbcfc2c5134e948b7feab3035de
+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/Sfx/games/sickBeats/bad.wav.meta b/Assets/Resources/Sfx/games/sickBeats/bad.wav.meta
new file mode 100644
index 00000000..d240aec8
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/bad.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b2dc223682575aa42811212576a84ae4
+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/Sfx/games/sickBeats/dash.wav.meta b/Assets/Resources/Sfx/games/sickBeats/dash.wav.meta
new file mode 100644
index 00000000..15dbbbd3
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/dash.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 71ab5367b79e23e4bbfe67c727a7dcc6
+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/Sfx/games/sickBeats/fadeout.wav.meta b/Assets/Resources/Sfx/games/sickBeats/fadeout.wav.meta
new file mode 100644
index 00000000..a9aca30a
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/fadeout.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c265204cdce761147bd2644bc9082a7c
+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/Sfx/games/sickBeats/fork0.wav.meta b/Assets/Resources/Sfx/games/sickBeats/fork0.wav.meta
new file mode 100644
index 00000000..149a377d
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/fork0.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 19fbdd97f0ecd814aad23fedc254d573
+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/Sfx/games/sickBeats/fork1.wav.meta b/Assets/Resources/Sfx/games/sickBeats/fork1.wav.meta
new file mode 100644
index 00000000..0eeb75bb
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/fork1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e3b33c26ae013b045a1ec2b91d1f4761
+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/Sfx/games/sickBeats/fork2.wav.meta b/Assets/Resources/Sfx/games/sickBeats/fork2.wav.meta
new file mode 100644
index 00000000..ec64a73f
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/fork2.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1e6f8ef9071cf8848a5c337f414c5a0d
+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/Sfx/games/sickBeats/hit.wav.meta b/Assets/Resources/Sfx/games/sickBeats/hit.wav.meta
new file mode 100644
index 00000000..8034466c
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/hit.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 0e1889772010362429a96620038657ce
+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/Sfx/games/sickBeats/miss.wav.meta b/Assets/Resources/Sfx/games/sickBeats/miss.wav.meta
new file mode 100644
index 00000000..9d1b6b45
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/miss.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f42a6a65545c1604eb24608e2656206e
+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/Sfx/games/sickBeats/note_land.wav.meta b/Assets/Resources/Sfx/games/sickBeats/note_land.wav.meta
new file mode 100644
index 00000000..eb693f6d
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/note_land.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bc42cc5c881029248bd625885f5d8b0d
+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/Sfx/games/sickBeats/resist.wav.meta b/Assets/Resources/Sfx/games/sickBeats/resist.wav.meta
new file mode 100644
index 00000000..eedc6195
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/resist.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 2d2fbc63aef61334d8ba8be3021792ce
+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/Sfx/games/sickBeats/virusIn.wav.meta b/Assets/Resources/Sfx/games/sickBeats/virusIn.wav.meta
new file mode 100644
index 00000000..acb2ef51
--- /dev/null
+++ b/Assets/Resources/Sfx/games/sickBeats/virusIn.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: ddbc1566338854846a421918605ce177
+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/SickBeats/Animations/doctor.controller b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctor.controller
index e7a5430f..5815b52a 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 fd0e9c03..a7389aab 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 8f311407..00000000
--- 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/doctorShock0.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorShock0.anim
index 196f07df..b676b411 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 ea2df617..f3d95551 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 26ca11b8..eac64b2b 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 d1afcfa3..dd46b7dc 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 35478976..05b16f43 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 fe982a31..9dbf59b3 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 040e2b85..8445f210 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 745da7fa..6e1f456c 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 fbbf21f9..c6c4cc80 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 a2e5d1cf..a3554814 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 adbe2c16..1c58e7b5 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 ecc4c552..041a2e26 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 932ada00..07e5dc11 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 f02e08b8..0b57a66a 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 d7761d4b..6b47b0ff 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 a4b8556a..8605dee3 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/key.controller b/Assets/Resources/Sprites/Games/SickBeats/Animations/key.controller
index fa292222..96eaa303 100644
--- a/Assets/Resources/Sprites/Games/SickBeats/Animations/key.controller
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/key.controller
@@ -1,5 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-7824247509033267447
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1626256674453526812}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1107 &-5726229905484320108
AnimatorStateMachine:
serializedVersion: 6
@@ -15,6 +37,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 3462061232227593783}
m_Position: {x: 270, y: 120, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 4551143686679283743}
+ m_Position: {x: 305, y: 185, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -3619454562662930214}
+ m_Position: {x: 470, y: 10, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -47,6 +75,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1102 &-3619454562662930214
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: up
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -7824247509033267447}
+ 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: 81b3556c982bda3499ecaec2ef9e431e, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &-1626256674453526812
AnimatorState:
serializedVersion: 6
@@ -122,3 +177,29 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &4551143686679283743
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: keep
+ 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: 9175d2482d55fa94ca10451b7d95289a, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
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 4126dcae..00000000
--- 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 3ef19edd..00000000
--- 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
new file mode 100644
index 00000000..dd0b5407
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim
@@ -0,0 +1,133 @@
+%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: keyKeep
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 4, y: 4, z: 4}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 30
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 4
+ 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:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 4
+ 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:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 4
+ 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:
+ classID: 4
+ script: {fileID: 0}
+ 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/keyKeep.anim.meta
similarity index 79%
rename from Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim.meta
rename to Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim.meta
index a9024ff8..819c794d 100644
--- a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgIdle.anim.meta
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: ce89d40be0ff49441a220515fe14be65
+guid: 9175d2482d55fa94ca10451b7d95289a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/keyPush.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyPush.anim
index 75e73de0..aec28181 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
new file mode 100644
index 00000000..981cf1ac
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim
@@ -0,0 +1,169 @@
+%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: keyUp
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 4, y: 4, z: 4}
+ 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.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}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 30
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.16666667
+ 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: 4
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 4.4
+ 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:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 4
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 4.4
+ 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:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 4
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 4.4
+ 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:
+ classID: 4
+ script: {fileID: 0}
+ 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/keyUp.anim.meta
similarity index 79%
rename from Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim.meta
rename to Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim.meta
index 62f3f868..de676d4a 100644
--- a/Assets/Resources/Sprites/Games/SickBeats/Animations/doctorIdle.anim.meta
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: eca0ae4a93253874cb5d7fe4658f3775
+guid: 81b3556c982bda3499ecaec2ef9e431e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/orgAppear.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgAppear.anim
index 6607cda8..c015f6dc 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 5f739ed9..8a471f03 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 94da1320..ebb6ca29 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 2dcf3c75..00000000
--- 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/orgVanish.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/orgVanish.anim
index b15c00f5..3a726d1e 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 f89e0d0b..c32278aa 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 10fb3426..b0dfe738 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 7a19b874..00000000
--- 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 25463ab8..00000000
--- 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.controller b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus.controller
index 9c426b55..e2670ab8 100644
--- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus.controller
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus.controller
@@ -944,7 +944,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: come
+ m_Name: summon
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
diff --git a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppear.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusAppear.anim
index 8f7940c5..6d5d6971 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 41e31334..45d67cdb 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 e2575148..f98d36af 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 3eb94ca3..92e0b6a5 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 2120f30f..01e90a0b 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 9c546c45..b389ceb5 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 b573ac26..f5d0ffc2 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 a9b6caa4..f33606e6 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 6d59e8a9..803363a1 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 1996fd88..734c0211 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 cd703157..39bf2581 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 8931e051..22a4e56d 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 c3465efd..67f408a5 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 74883a47..e7ebe2ae 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 bb748d96..5502a4bd 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 fbff002d..e2ad0fe3 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 1fddc47e..4d269161 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 a80819cc..21eed4cf 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 af20023b..4ab98e81 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 5ed8a5f8..3f9dac3c 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 d643468c..21c2d8aa 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 936e5a44..ced8a4fb 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 524616d7..bcaa2911 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 89789d27..f6a27b1f 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 5a29ad02..a0345bd8 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 590b4651..f7fd7869 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 e4b34b75..5c5c1747 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 36441dc0..2cd9ac2d 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 a14bfcaa..c8c0db36 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 4fc2de92..8cba73e7 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 775b681e..214fad2c 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 60b9dc5f..fd067b4d 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 4e601f21..93147393 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 4bb40144..8b343b3f 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 be382fdb..33c8f011 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 ef586900..3dccfafd 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 e1f960fe..869b428c 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 fa74be09..84e11907 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 b3b1ceba..fe2f0662 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/virusCome.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim
similarity index 98%
rename from Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusCome.anim
rename to Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim
index b53b3cf8..86b2738b 100644
--- a/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusCome.anim
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: virusCome
+ m_Name: virusSummon
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
@@ -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/virusCome.anim.meta b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusCome.anim.meta
rename to Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim.meta
diff --git a/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png.meta b/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png.meta
index 66acf843..73a4b342 100644
--- a/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png.meta
+++ b/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png.meta
@@ -608,6 +608,27 @@ TextureImporter:
indices:
edges: []
weights: []
+ - serializedVersion: 2
+ name: virus_dash
+ rect:
+ serializedVersion: 2
+ x: 322
+ y: 18
+ width: 124
+ height: 44
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 530b71ada83d240439c4c11c94b045df
+ internalID: 1961343541
+ vertices: []
+ indices:
+ edges: []
+ weights: []
outline: []
physicsShape: []
bones: []
@@ -638,6 +659,7 @@ TextureImporter:
virus_7: 802062514
virus_8: -66270973
virus_9: 1534430004
+ virus_dash: 1961343541
virus_resist_0: -446508002
virus_resist_1: -1126524847
virus_resist_2: 136832528
diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs b/Assets/Scripts/Games/PlayerActionEvent.cs
index d2fdbe56..4e3b65d2 100644
--- a/Assets/Scripts/Games/PlayerActionEvent.cs
+++ b/Assets/Scripts/Games/PlayerActionEvent.cs
@@ -46,6 +46,8 @@ namespace HeavenStudio.Games
public bool countsForAccuracy = true; //Indicates if the input counts for the accuracy or not. If set to false, it'll not be counted in the accuracy calculation
+ public bool missable = false; //Indicates if the miss input counts for the accuracy or not. If set to true, it'll not be counted in the accuracy calculation
+
public void setHitCallback(ActionEventCallbackState OnHit)
{
this.OnHit = OnHit;
@@ -332,7 +334,7 @@ namespace HeavenStudio.Games
OnMiss(this);
}
- if (countsForAccuracy && gm.canInput && !(noAutoplay || autoplayOnly))
+ if (countsForAccuracy && !missable && gm.canInput && !(noAutoplay || autoplayOnly))
{
gm.ScoreInputAccuracy(startBeat + timer, 0, true, 2.0, weight, false);
GoForAPerfect.instance.Miss();
diff --git a/Assets/Scripts/Games/SickBeats/SickBeats.cs b/Assets/Scripts/Games/SickBeats/SickBeats.cs
index d227d76a..2df3eb68 100644
--- a/Assets/Scripts/Games/SickBeats/SickBeats.cs
+++ b/Assets/Scripts/Games/SickBeats/SickBeats.cs
@@ -25,53 +25,27 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
parameters = new List()
{
- new Param("toggle2", true, "Bop", "Toggle if Boss should bop for the duration of this event."),
- new Param("toggle", false, "Bop (Auto)", "Toggle if the man should automatically bop until another Bop event is reached.")
+ new Param("toggle2", true, "Bop", "Toggle if the doctor should bop for the duration of this event."),
+ new Param("toggle", false, "Bop (Auto)", "Toggle if the doctor should automatically bop until another Bop event is reached.")
}
},
- new GameAction("virusLeft", "Virus (Right)")
+ new GameAction("virus", "Move Virus")
{
- function = delegate { var e = eventCaller.currentEntity; SickBeats.instance.PresenceVirus(e.beat, (int)SickBeats.Direction.Right, e["type"]); },
+ function = delegate { var e = eventCaller.currentEntity; SickBeats.instance.MoveVirus(e.beat, e["direction"], e["type"]); },
parameters = new List()
{
- new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type"),
+ new Param("direction", SickBeats.Direction.Right, "Direction", "Determine which direction the virus will spawn from."),
+ new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type."),
},
- defaultLength = 4f,
- },
- new GameAction("virusUp", "Virus (Up)")
- {
- function = delegate { var e = eventCaller.currentEntity; SickBeats.instance.PresenceVirus(e.beat, (int)SickBeats.Direction.Up, e["type"]); },
- parameters = new List()
- {
- new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type"),
- },
- defaultLength = 6f,
- },
- new GameAction("virusRight", "Virus (Left)")
- {
- function = delegate { var e = eventCaller.currentEntity; SickBeats.instance.PresenceVirus(e.beat, (int)SickBeats.Direction.Left, e["type"]); },
- parameters = new List()
- {
- new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type"),
- },
- defaultLength = 6f,
- },
- new GameAction("virusDown", "Virus (Down)")
- {
- function = delegate { var e = eventCaller.currentEntity; SickBeats.instance.PresenceVirus(e.beat, (int)SickBeats.Direction.Down, e["type"]); },
- parameters = new List()
- {
- new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type"),
- },
- defaultLength = 6f,
+ defaultLength = 2f,
},
new GameAction("appear", "Appear")
{
function = delegate {var e = eventCaller.currentEntity; SickBeats.instance.VirusAppearMnl(e.beat, e["direction"], e["type"]); },
parameters = new List()
{
- new Param("direction", SickBeats.Direction.Right, "Direction", "Determine which direction the virus will spawn from"),
- new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type"),
+ new Param("direction", SickBeats.Direction.Right, "Direction", "Determine which direction the virus will spawn from."),
+ new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type."),
},
defaultLength = 2f,
},
@@ -81,20 +55,20 @@ namespace HeavenStudio.Games.Loaders
e["direction"], e["type"], new double[]{e["param1"], e["param2"], e["param3"]}); },
parameters = new List()
{
- new Param("direction", SickBeats.Direction.Up, "Direction", "Determine which direction the virus will spawn from"),
- new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type"),
- new Param("param1", new EntityTypes.Float(0, 1, 0), "1"),
- new Param("param2", new EntityTypes.Float(0, 1, 0.125f), "2"),
- new Param("param3", new EntityTypes.Float(0, 1, 0.25f), "3"),
+ new Param("direction", SickBeats.Direction.Up, "Direction", "Determine which direction the virus will spawn from."),
+ new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type."),
+ new Param("param1", new EntityTypes.Float(0, 1, 0), "Right Beat", "Decide the right Dash beat."),
+ new Param("param2", new EntityTypes.Float(0, 1, 0.125f), "Up Beat", "Decide the up Dash beat."),
+ new Param("param3", new EntityTypes.Float(0, 1, 0.25f), "Left Beat", "Decide the left Dash beat."),
},
defaultLength = 1f,
},
- new GameAction("come", "Come")
+ new GameAction("summon", "Summon")
{
- function = delegate {var e = eventCaller.currentEntity; SickBeats.instance.VirusComeMnl(e.beat, e["type"]); },
+ function = delegate {var e = eventCaller.currentEntity; SickBeats.instance.VirusSummonMnl(e.beat, e["type"]); },
parameters = new List()
{
- new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type"),
+ new Param("type", SickBeats.VirusType.Blue, "Type", "Determine virus type."),
},
defaultLength = 2f,
},
@@ -156,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
{
@@ -189,11 +166,7 @@ namespace HeavenStudio.Games
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.East, out dt);
}
- protected static bool IA_TouchRight(out double dt)
- {
- return PlayerInput.GetTouchDown(InputController.ActionsTouch.Right, out dt)
- && (instance.IsExpectingInputNow(InputAction_Right) || instance.IsExpectingInputNow(InputAction_Left));
- }
+
protected static bool IA_PadUp(out double dt)
{
return PlayerInput.GetPadDown(InputController.ActionsPad.Up, out dt);
@@ -202,11 +175,7 @@ namespace HeavenStudio.Games
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.North, out dt);
}
- protected static bool IA_TouchUp(out double dt)
- {
- return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)
- && instance.IsExpectingInputNow(InputAction_Up);
- }
+
protected static bool IA_PadLeft(out double dt)
{
return PlayerInput.GetPadDown(InputController.ActionsPad.Left, out dt);
@@ -215,11 +184,7 @@ namespace HeavenStudio.Games
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.West, out dt);
}
- protected static bool IA_TouchLeft(out double dt)
- {
- return PlayerInput.GetTouchDown(InputController.ActionsTouch.Left, out dt)
- && (instance.IsExpectingInputNow(InputAction_Right) || instance.IsExpectingInputNow(InputAction_Left));
- }
+
protected static bool IA_PadDown(out double dt)
{
return PlayerInput.GetPadDown(InputController.ActionsPad.Down, out dt);
@@ -228,24 +193,32 @@ namespace HeavenStudio.Games
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.South, out dt);
}
- protected static bool IA_TouchDown(out double dt)
- {
- return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)
- && instance.IsExpectingInputNow(InputAction_Down);
- }
public static PlayerInput.InputAction InputAction_Right =
new("AgbSickBeatsRight", new int[] { IA_RightPress, IA_RightPress, IA_RightPress },
- IA_PadRight, IA_TouchRight, IA_BatonRight);
+ IA_PadRight, IA_TouchFlick, IA_BatonRight);
public static PlayerInput.InputAction InputAction_Up =
new("AgbSickBeatsUp", new int[] { IA_UpPress, IA_UpPress, IA_UpPress },
- IA_PadUp, IA_TouchUp, IA_BatonUp);
+ IA_PadUp, IA_TouchFlick, IA_BatonUp);
public static PlayerInput.InputAction InputAction_Left =
new("AgbSickBeatsLeft", new int[] { IA_LeftPress, IA_LeftPress, IA_LeftPress },
- IA_PadLeft, IA_TouchLeft, IA_BatonLeft);
+ IA_PadLeft, IA_TouchFlick, IA_BatonLeft);
public static PlayerInput.InputAction InputAction_Down =
new("AgbSickBeatsDown", new int[] { IA_DownPress, IA_DownPress, IA_DownPress },
- IA_PadDown, IA_TouchDown, IA_BatonDown);
+ IA_PadDown, IA_TouchFlick, IA_BatonDown);
+
+ public PlayerActionEvent ScheduleMissableInput(double startBeat,
+ double timer,
+ PlayerInput.InputAction inputAction,
+ PlayerActionEvent.ActionEventCallbackState OnHit,
+ PlayerActionEvent.ActionEventCallback OnMiss,
+ PlayerActionEvent.ActionEventCallback OnBlank,
+ PlayerActionEvent.ActionEventHittableQuery HittableQuery = null)
+ {
+ PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputAction, OnHit, OnMiss, OnBlank, HittableQuery);
+ evt.missable = true;
+ return evt;
+ }
// Start is called before the first frame update
void Awake()
@@ -257,7 +230,21 @@ namespace HeavenStudio.Games
public override void OnBeatPulse(double beat)
{
- if (BeatIsInBopRegion(beat)) Bop();
+ if (BeatIsInBopRegion(beat)) Bop(beat);
+ }
+
+ [NonSerialized] public double gameEndBeat = double.MaxValue;
+ public override void OnGameSwitch(double beat)
+ {
+ var entities = GameManager.instance.Beatmap.Entities;
+ // find out when the next game switch (or remix end) happens
+ RiqEntity firstEnd = entities.Find(c => (c.datamodel.StartsWith("gameManager/switchGame") || c.datamodel.Equals("gameManager/end")) && c.beat > beat);
+ gameEndBeat = firstEnd?.beat ?? double.MaxValue;
+ }
+
+ public override void OnPlay(double beat)
+ {
+ OnGameSwitch(beat);
}
void Update()
@@ -265,22 +252,43 @@ namespace HeavenStudio.Games
var cond = Conductor.instance;
if (!cond.isPlaying || cond.isPaused) return;
- if (PlayerInput.GetIsAction(InputAction_Right) && !IsExpectingInputNow(InputAction_Right))
+ if (PlayerInput.PlayerHasControl() && PlayerInput.CurrentControlStyle is InputSystem.InputController.ControlStyles.Touch)
{
- if (isForkPop[0]) OutFork(0);
+ if (PlayerInput.GetIsAction(InputAction_BasicPress))
+ {
+ keyAnim.Play("keep");
+ }
+ if (PlayerInput.GetIsAction(InputAction_BasicRelease))
+ {
+ keyAnim.Play("up");
+ }
+
+ if (PlayerInput.GetIsAction(InputAction_FlickPress) && !IsExpectingInputNow(InputAction_FlickPress))
+ {
+ var rand_dir = ChooseDirection(isMiss, isPrepare, isForkPop);
+ if (isForkPop[rand_dir]) OutFork(rand_dir);
+ }
}
- if (PlayerInput.GetIsAction(InputAction_Up) && !IsExpectingInputNow(InputAction_Up))
+ else
{
- if (isForkPop[1]) OutFork(1);
- }
- if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left))
- {
- if (isForkPop[2]) OutFork(2);
- }
- if (PlayerInput.GetIsAction(InputAction_Down) && !IsExpectingInputNow(InputAction_Down))
- {
- if (isForkPop[3]) OutFork(3);
+ if (PlayerInput.GetIsAction(InputAction_Right) && !IsExpectingInputNow(InputAction_Right))
+ {
+ if (isForkPop[(int)Direction.Right]) OutFork((int)Direction.Right);
+ }
+ if (PlayerInput.GetIsAction(InputAction_Up) && !IsExpectingInputNow(InputAction_Up))
+ {
+ if (isForkPop[(int)Direction.Up]) OutFork((int)Direction.Up);
+ }
+ if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left))
+ {
+ if (isForkPop[(int)Direction.Left]) OutFork((int)Direction.Left);
+ }
+ if (PlayerInput.GetIsAction(InputAction_Down) && !IsExpectingInputNow(InputAction_Down))
+ {
+ if (isForkPop[(int)Direction.Down]) OutFork((int)Direction.Down);
+ }
}
+
}
private void OutFork(int dir)
@@ -290,7 +298,7 @@ namespace HeavenStudio.Games
var actions = new List();
keyAnim.Play("push");
forkAnims[dir].Play("out");
- SoundByte.PlayOneShotGame("sickBeats/1", pitch: UnityEngine.Random.Range(2.75f, 3.25f));
+ SoundByte.PlayOneShotGame("sickBeats/fork"+UnityEngine.Random.Range(0, 3).ToString());
BeatAction.New(instance, new() {new BeatAction.Action(currentBeat + RefillBeat, delegate {RepopFork(dir);})});
isForkPop[dir] = false;
@@ -308,15 +316,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);
}
@@ -332,14 +340,14 @@ namespace HeavenStudio.Games
return newVirus;
}
- public void PresenceVirus(double beat, int dir, int type)
+ public void MoveVirus(double beat, int dir, int type)
{
var newVirus = SpawnVirus(beat, -1, type);
var actions = new List();
actions.Add(new BeatAction.Action(beat, delegate {
- newVirus.Come();
+ newVirus.Summon();
newVirus.position++;
}));
@@ -392,14 +400,14 @@ namespace HeavenStudio.Games
BeatAction.New(instance, actions);
}
- public void VirusComeMnl(double beat, int type)
+ public void VirusSummonMnl(double beat, int type)
{
var newVirus = SpawnVirus(beat, -1, type);
var actions = new List();
actions.Add(new BeatAction.Action(beat, delegate {
- newVirus.Come();
+ newVirus.Summon();
newVirus.position++;
}));
actions.Add(new BeatAction.Action(beat + 2, delegate {Destroy(newVirus.gameObject);}));
@@ -424,5 +432,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 544f7473..18c1d55b 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,33 +31,58 @@ 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,
- };
-
+ if (startBeat >= game.gameEndBeat) return;
MultiSound.Play(new MultiSound.Sound[]
{
- new MultiSound.Sound("sickBeats/appear", startBeat, pitch: UnityEngine.Random.Range(0.9f, 1.1f)),
+ new MultiSound.Sound("sickBeats/appear"+UnityEngine.Random.Range(0, 2).ToString(), startBeat),
});
BeatAction.New(game, new() {new BeatAction.Action(startBeat, delegate {
VirusAnim("appear");
})});
- game.ScheduleInput(startBeat, 1, InputAction, Just, Miss, Empty, CanJust);
+ 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);
+ // }
+ // else
+ // {
+ // 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()
{
- SoundByte.PlayOneShotGame("sickBeats/whoosh");
+ SoundByte.PlayOneShotGame("sickBeats/dash");
VirusAnim("dash");
}
- public void Come()
+ public void Summon()
{
- VirusAnim("come");
+ VirusAnim("summon");
}
public void Move()
@@ -75,36 +102,58 @@ namespace HeavenStudio.Games.Scripts_SickBeats
public void Kill()
{
game.ScoreMiss();
+
+ MultiSound.Play(new MultiSound.Sound[]
+ {
+ new MultiSound.Sound("sickBeats/virusIn", startBeat + 2),
+ new MultiSound.Sound("sickBeats/miss", startBeat + 4),
+ new MultiSound.Sound("sickBeats/fadeout", startBeat + 5),
+ });
+
BeatAction.New(game, new() {
- new BeatAction.Action((startBeat+1) + game.RefillBeat, delegate {
+ new BeatAction.Action(startBeat + 2, delegate {
virusAnim.DoScaledAnimationAsync("laugh", 0.5f);
virusAnim.DoScaledAnimationAsync("enter", 0.5f);
}),
- new BeatAction.Action((startBeat+3) + game.RefillBeat, delegate {
+ new BeatAction.Action(startBeat + 4, delegate {
virusAnim.DoScaledAnimationAsync("hide", 0.5f);
game.orgAnim.DoScaledAnimationAsync("damage", 0.5f);
game.orgAlive = false;
}),
- new BeatAction.Action((startBeat+4) + game.RefillBeat, delegate {
+ new BeatAction.Action(startBeat + 5, delegate {
game.orgAnim.DoScaledAnimationAsync("vanish", 0.5f);
}),
- new BeatAction.Action((startBeat+5) + game.RefillBeat, delegate {
+ new BeatAction.Action(startBeat + 6, delegate {
virusAnim.DoScaledAnimationAsync("laugh", 0.5f);
- game.docShock = true;
- game.doctorAnim.DoScaledAnimationAsync("shock0", 0.5f);
}),
- new BeatAction.Action((startBeat+6) + game.RefillBeat, delegate {
+ new BeatAction.Action(startBeat + 7, delegate {
game.orgAnim.DoScaledAnimationAsync("idleAdd", 0.5f);
game.orgAnim.DoScaledAnimationAsync("appear", 0.5f);
game.orgAlive = true;
Destroy(gameObject);
- game.doctorAnim.DoScaledAnimationAsync("shock1", 0.5f);
- }),
- new BeatAction.Action((startBeat+8) + game.RefillBeat, delegate {
- game.docShock = false;
- game.doctorAnim.DoScaledAnimationAsync("idle", 0.5f);
}),
});
+
+ 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)
@@ -114,23 +163,25 @@ 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)
{
if (state >= 1f)
{
+ SoundByte.PlayOneShotGame("sickBeats/bad");
VirusAnim("stabLate");
KeyAnim("stabLate");
}
else if (state <= -1f)
{
+ SoundByte.PlayOneShotGame("sickBeats/bad");
VirusAnim("stabFast");
KeyAnim("stabFast");
}
else
{
- SoundByte.PlayOneShotGame("sickBeats/stab");
+ SoundByte.PlayOneShotGame("sickBeats/hit");
VirusAnim("stab");
KeyAnim("stab");
@@ -151,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();
}
@@ -159,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)
@@ -186,13 +243,10 @@ namespace HeavenStudio.Games.Scripts_SickBeats
void ChangeColor()
{
- renderers[0].material = game.RecolorMats[life];
-
- renderers[1].material = game.RecolorMats[life];
-
- Color newColor = game.color[life];
- renderers[2].color = new Color(newColor.r, newColor.g, newColor.b, renderers[2].color.a);
-
+ foreach (var renderer in renderers)
+ {
+ renderer.material = game.RecolorMats[life];
+ }
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
index e8907bb3..fed44d33 100644
--- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
+++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
@@ -102,16 +102,6 @@ namespace HeavenStudio
{
Debug.LogWarning("Game loader RvlBookLoader failed!");
}
-
- game = NtrFreezeFrameLoader.AddGame(eventCaller);
- if (game != null)
- {
- eventCaller.minigames.Add(game.name, game);
- }
- else
- {
- Debug.LogWarning("Game loader NtrCameraManLoader failed!");
- }
game = AgbClapLoader.AddGame(eventCaller);
if (game != null)
@@ -243,6 +233,16 @@ namespace HeavenStudio
Debug.LogWarning("Game loader RvlForkLoader failed!");
}
+ game = NtrFreezeFrameLoader.AddGame(eventCaller);
+ if (game != null)
+ {
+ eventCaller.minigames.Add(game.name, game);
+ }
+ else
+ {
+ Debug.LogWarning("Game loader NtrFreezeFrameLoader failed!");
+ }
+
game = NtrGleeClubLoader.AddGame(eventCaller);
if (game != null)
{