diff --git a/Assets/Resources/Games/sickBeats.prefab b/Assets/Resources/Games/sickBeats.prefab
index 3fc4f2b7c..0542a87fe 100644
--- a/Assets/Resources/Games/sickBeats.prefab
+++ b/Assets/Resources/Games/sickBeats.prefab
@@ -166,7 +166,7 @@ SpriteRenderer:
m_Size: {x: 12.8, y: 7.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
+ m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!210 &3308707171876071503
@@ -773,7 +773,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 +857,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
@@ -1541,7 +1541,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
@@ -1902,7 +1902,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 +2267,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 +2288,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
@@ -3258,7 +3258,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 +3671,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
diff --git a/Assets/Resources/Sfx/games/sickBeats/1.wav b/Assets/Resources/Sfx/games/sickBeats/1.wav
deleted file mode 100644
index bcff0ff55..000000000
Binary files a/Assets/Resources/Sfx/games/sickBeats/1.wav and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/appear.ogg b/Assets/Resources/Sfx/games/sickBeats/appear.ogg
deleted file mode 100644
index be330a1f2..000000000
Binary files a/Assets/Resources/Sfx/games/sickBeats/appear.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/appear0.wav b/Assets/Resources/Sfx/games/sickBeats/appear0.wav
new file mode 100644
index 000000000..cd27714d2
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/appear0.wav differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/resist.ogg.meta b/Assets/Resources/Sfx/games/sickBeats/appear0.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/sickBeats/resist.ogg.meta
rename to Assets/Resources/Sfx/games/sickBeats/appear0.wav.meta
index 317f22165..0b648bdfb 100644
--- a/Assets/Resources/Sfx/games/sickBeats/resist.ogg.meta
+++ b/Assets/Resources/Sfx/games/sickBeats/appear0.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 1a48e2c71ded3f946be69e80369f6b65
+guid: 1795e9bc95e443940a8c5118eff95d26
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/sickBeats/appear1.wav b/Assets/Resources/Sfx/games/sickBeats/appear1.wav
new file mode 100644
index 000000000..d8047db6c
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/appear1.wav differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/1.wav.meta b/Assets/Resources/Sfx/games/sickBeats/appear1.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/sickBeats/1.wav.meta
rename to Assets/Resources/Sfx/games/sickBeats/appear1.wav.meta
index 045d0aa05..3977f3434 100644
--- a/Assets/Resources/Sfx/games/sickBeats/1.wav.meta
+++ b/Assets/Resources/Sfx/games/sickBeats/appear1.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 72b4d7c4f5ee8e542bc0bb2ec55d8f78
+guid: 59e16dbcfc2c5134e948b7feab3035de
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/sickBeats/bad.wav b/Assets/Resources/Sfx/games/sickBeats/bad.wav
new file mode 100644
index 000000000..20d9a3a7f
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/bad.wav differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/stab.ogg.meta b/Assets/Resources/Sfx/games/sickBeats/bad.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/sickBeats/stab.ogg.meta
rename to Assets/Resources/Sfx/games/sickBeats/bad.wav.meta
index 3d5ae2f02..d240aec8c 100644
--- a/Assets/Resources/Sfx/games/sickBeats/stab.ogg.meta
+++ b/Assets/Resources/Sfx/games/sickBeats/bad.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 59b6b431730cc424582506ad90f9ad7b
+guid: b2dc223682575aa42811212576a84ae4
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/sickBeats/dash.wav b/Assets/Resources/Sfx/games/sickBeats/dash.wav
new file mode 100644
index 000000000..2d02465c4
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/dash.wav differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/appear.ogg.meta b/Assets/Resources/Sfx/games/sickBeats/dash.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/sickBeats/appear.ogg.meta
rename to Assets/Resources/Sfx/games/sickBeats/dash.wav.meta
index fe735e34d..15dbbbd35 100644
--- a/Assets/Resources/Sfx/games/sickBeats/appear.ogg.meta
+++ b/Assets/Resources/Sfx/games/sickBeats/dash.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: bfa4f3d0500937e41ac64e35d884a4da
+guid: 71ab5367b79e23e4bbfe67c727a7dcc6
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/sickBeats/fadeout.wav b/Assets/Resources/Sfx/games/sickBeats/fadeout.wav
new file mode 100644
index 000000000..ad277c65c
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/fadeout.wav differ
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 000000000..a9aca30a3
--- /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 b/Assets/Resources/Sfx/games/sickBeats/fork0.wav
new file mode 100644
index 000000000..ad2feb1f6
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/fork0.wav differ
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 000000000..149a377d0
--- /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 b/Assets/Resources/Sfx/games/sickBeats/fork1.wav
new file mode 100644
index 000000000..8083ec2d8
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/fork1.wav differ
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 000000000..0eeb75bb8
--- /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 b/Assets/Resources/Sfx/games/sickBeats/fork2.wav
new file mode 100644
index 000000000..78947c3fe
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/fork2.wav differ
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 000000000..ec64a73f0
--- /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 b/Assets/Resources/Sfx/games/sickBeats/hit.wav
new file mode 100644
index 000000000..978caf8b6
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/hit.wav differ
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 000000000..8034466cb
--- /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 b/Assets/Resources/Sfx/games/sickBeats/miss.wav
new file mode 100644
index 000000000..574130381
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/miss.wav differ
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 000000000..9d1b6b452
--- /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 b/Assets/Resources/Sfx/games/sickBeats/note_land.wav
new file mode 100644
index 000000000..9f16ad6d4
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/note_land.wav differ
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 000000000..eb693f6da
--- /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.ogg b/Assets/Resources/Sfx/games/sickBeats/resist.ogg
deleted file mode 100644
index f607be3ca..000000000
Binary files a/Assets/Resources/Sfx/games/sickBeats/resist.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/resist.wav b/Assets/Resources/Sfx/games/sickBeats/resist.wav
new file mode 100644
index 000000000..ddbb5c19e
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/resist.wav differ
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 000000000..eedc61951
--- /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/stab.ogg b/Assets/Resources/Sfx/games/sickBeats/stab.ogg
deleted file mode 100644
index e3179bb90..000000000
Binary files a/Assets/Resources/Sfx/games/sickBeats/stab.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/virusIn.wav b/Assets/Resources/Sfx/games/sickBeats/virusIn.wav
new file mode 100644
index 000000000..24b22636c
Binary files /dev/null and b/Assets/Resources/Sfx/games/sickBeats/virusIn.wav differ
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 000000000..acb2ef51b
--- /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/Sfx/games/sickBeats/whoosh.ogg b/Assets/Resources/Sfx/games/sickBeats/whoosh.ogg
deleted file mode 100644
index e606c4a81..000000000
Binary files a/Assets/Resources/Sfx/games/sickBeats/whoosh.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/sickBeats/whoosh.ogg.meta b/Assets/Resources/Sfx/games/sickBeats/whoosh.ogg.meta
deleted file mode 100644
index 3c5aa425c..000000000
--- a/Assets/Resources/Sfx/games/sickBeats/whoosh.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 013495df9c47e044ebcb00cb1a7c5453
-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/key.controller b/Assets/Resources/Sprites/Games/SickBeats/Animations/key.controller
index fa292222d..96eaa3034 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/keyKeep.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim
new file mode 100644
index 000000000..8e3d6359a
--- /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: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 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/keyKeep.anim.meta b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim.meta
new file mode 100644
index 000000000..819c794d9
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyKeep.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9175d2482d55fa94ca10451b7d95289a
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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 000000000..99dbb68df
--- /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.083333336
+ 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: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 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.083333336
+ 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.083333336
+ 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.083333336
+ 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.083333336
+ 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/keyUp.anim.meta b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim.meta
new file mode 100644
index 000000000..de676d4a6
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/SickBeats/Animations/keyUp.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 81b3556c982bda3499ecaec2ef9e431e
+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 9c426b556..e2670ab80 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/virusCome.anim b/Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim
similarity index 99%
rename from Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusCome.anim
rename to Assets/Resources/Sprites/Games/SickBeats/Animations/virus/virusSummon.anim
index b53b3cf81..fecb489a5 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
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 b/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png
index 2f47ba66d..dd17b3777 100644
Binary files a/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png and b/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png differ
diff --git a/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png.meta b/Assets/Resources/Sprites/Games/SickBeats/sick_virus.png.meta
index 66acf843b..73a4b342f 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/SickBeats/SickBeats.cs b/Assets/Scripts/Games/SickBeats/SickBeats.cs
index d227d76a2..9b6fde5a0 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,
},
@@ -189,11 +163,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 +172,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 +181,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 +190,19 @@ 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);
// Start is called before the first frame update
void Awake()
@@ -265,22 +222,52 @@ 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");
+ }
+
+ var rand_dir = UnityEngine.Random.Range(0, 4);
+ var InputAction = rand_dir switch {
+ (int)Direction.Right => InputAction_Right,
+ (int)Direction.Up => InputAction_Up,
+ (int)Direction.Left => InputAction_Left,
+ (int)Direction.Down => InputAction_Down,
+ };
+
+ if (PlayerInput.GetIsAction(InputAction) &&
+ !(IsExpectingInputNow(InputAction_Right) || IsExpectingInputNow(InputAction_Up)
+ || IsExpectingInputNow(InputAction_Left) || IsExpectingInputNow(InputAction_Down)))
+ {
+ if (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 +277,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;
@@ -332,14 +319,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 +379,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);}));
diff --git a/Assets/Scripts/Games/SickBeats/Virus.cs b/Assets/Scripts/Games/SickBeats/Virus.cs
index 544f7473c..e40306874 100644
--- a/Assets/Scripts/Games/SickBeats/Virus.cs
+++ b/Assets/Scripts/Games/SickBeats/Virus.cs
@@ -38,7 +38,7 @@ namespace HeavenStudio.Games.Scripts_SickBeats
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 {
@@ -50,12 +50,12 @@ namespace HeavenStudio.Games.Scripts_SickBeats
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 +75,55 @@ namespace HeavenStudio.Games.Scripts_SickBeats
public void Kill()
{
game.ScoreMiss();
- BeatAction.New(game, new() {
- new BeatAction.Action((startBeat+1) + game.RefillBeat, delegate {
+
+ 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),
+ });
+
+ var actions = new List() {
+ 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 {
+ new BeatAction.Action(startBeat + 9, delegate {
game.docShock = false;
game.doctorAnim.DoScaledAnimationAsync("idle", 0.5f);
}),
- });
+ };
+
+ actions.Add(new BeatAction.Action(startBeat + 6, delegate {
+ game.docShock = true;
+ game.doctorAnim.DoScaledAnimationAsync("shock0", 0.5f);
+ }));
+ actions.Add(new BeatAction.Action(startBeat + 7, delegate {
+ game.doctorAnim.DoScaledAnimationAsync("shock1", 0.5f);
+ }));
+ actions.Add(new BeatAction.Action(startBeat + 9, delegate {
+ game.docShock = false;
+ game.doctorAnim.DoScaledAnimationAsync("idle", 0.5f);
+ }));
+
+ BeatAction.New(game, actions);
}
private void Just(PlayerActionEvent caller, float state)
@@ -120,17 +139,19 @@ namespace HeavenStudio.Games.Scripts_SickBeats
{
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");
@@ -186,13 +207,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