etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 03:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minigame "Feel" Adjustments and Additions (#258)

Browse source 
* add alt cue to fan club

* add effects to rhythm somen

update rhythm somen hitsound
add near miss interaction for rhythm somen

* adjust trick on the class animation

* adjust fan club spectator animation timing

fix bug with legacy beatmap conversion
This commit is contained in:
minenice55 2023-02-04 22:05:43 -05:00 committed by GitHub
parent c7d829c033
commit 7374066639
34 changed files with 9255 additions and 413 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
Assets/Resources/Games/fanClub.prefab
View file

@ -22585,6 +22585,63 @@ MonoBehaviour:
looping: 0
offset: 0
parameters: []
- name: arisa_iina
sequence:
game: 1
force: 1
clips:
- clip: fanClub/arisa_ii_jp
beat: 0
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
- clip: fanClub/arisa_in_jp
beat: 0.5
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
- clip: fanClub/arisa_na_jp
beat: 1
pitch: 1
volume: 1
looping: 0
offset: 0.055
parameters: []
- name: arisa_iina_fast
sequence:
game: 1
force: 1
clips:
- clip: fanClub/arisa_ii_fast_jp
beat: 0
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
- clip: fanClub/arisa_na_fast_jp
beat: 0.5
pitch: 1
volume: 1
looping: 0
offset: 0.055
parameters: []
- name: crowd_big_ready
sequence:
game: 1
force: 1
clips:
- clip: fanClub/crowd_big_ready
beat: 0
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
- name: crowd_kamone
sequence:
game: 1
@ -22618,18 +22675,39 @@ MonoBehaviour:
looping: 0
offset: 0
parameters: []
- name: crowd_big_ready
- name: crowd_iina
sequence:
game: 1
force: 1
force: 0
clips:
- clip: fanClub/crowd_big_ready
- clip: fanClub/crowd_ii_jp
beat: 0
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
- clip: fanClub/crowd_in_jp
beat: 1.5
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
- clip: fanClub/crowd_na_jp
beat: 2
pitch: 1
volume: 1
looping: 0
offset: 0.015
parameters: []
- clip: fanClub/crowd_heyAlt_jp
beat: 3
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
EligibleHits: []
scheduledInputs: []
firstEnable: 0

5147
Assets/Resources/Games/rhythmSomen.prefab
View file

File diff suppressed because it is too large Load diff

22
Assets/Resources/Sfx/games/fanClub/arisa_ii_fast_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: f3f8a0844e0252443be797a744642788
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/arisa_ii_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: dec0efea0e7c2f04fb9a44571d70930b
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/arisa_in_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 91d3f2c64a1f76d4abc4b5c4f4f1c378
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/arisa_na_fast_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 2d882f1c30e28654ebcd1a5a0f8ab30e
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/arisa_na_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: d96a1ca10b0830e40905cc975cc31452
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/crowd_heyAlt_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 800e091539b005c47ad6cbdaa5fbd223
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/crowd_ii_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 6e5a2fb8eb4c8964eaeaa7b19aaef8c5
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/crowd_in_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: eb45acafe7fec1b4b8ff50906cb674e0
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/fanClub/crowd_na_jp.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 4a952162b21b30748acefea283a3e0cb
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: ntridol/locale
assetBundleVariant: jp

22
Assets/Resources/Sfx/games/rhythmSomen/somen_catch.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: dabd040b82f64994f852b793c4238c90
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:

0
Assets/Resources/Sfx/games/rhythmSomen/somen_catch.ogg.meta → Assets/Resources/Sfx/games/rhythmSomen/somen_catch_old.ogg.meta
View file

248
Assets/Resources/Sprites/Games/FanClub/Animations/Fan/FanFree.anim
View file

@ -36,7 +36,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: 0, y: 0, z: 21.30953}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -61,7 +61,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.06666667
time: 0.05
value: {x: 0, y: 0, z: 9.13}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -79,7 +79,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: 0, y: 0, z: -6.49}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -122,7 +122,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: 0, y: 0, z: -21.30953}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -147,7 +147,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.06666667
time: 0.05
value: {x: 0, y: 0, z: -13.13}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -165,7 +165,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: 0, y: 0, z: 6.49}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -200,7 +200,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.016666668
value: {x: -0.527, y: 1.991, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -209,7 +209,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.06666667
time: 0.05
value: {x: -0.46, y: 2.076, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -227,7 +227,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: -0.727, y: 1.987, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -252,7 +252,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.016666668
value: {x: 0.042, y: 0.797, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -261,7 +261,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.06666667
time: 0.05
value: {x: -0.067, y: 0.865, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -279,7 +279,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: -0.23, y: 0.901, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -313,7 +313,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.016666668
value: {x: 0.527, y: 1.991, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -322,7 +322,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.06666667
time: 0.05
value: {x: 0.46, y: 2.076, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -340,7 +340,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: 0.727, y: 1.987, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -365,7 +365,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.016666668
value: {x: -0.063, y: 0.834, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -374,7 +374,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.06666667
time: 0.05
value: {x: 0.059, y: 0.844, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -392,7 +392,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: {x: 0.23, y: 0.901, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -426,7 +426,7 @@ AnimationClip:
inWeight: {x: 0, y: 0, z: 0}
outWeight: {x: 0, y: 0, z: 0}
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: {x: 0, y: 0.86, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -435,7 +435,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.06666667
time: 0.05
value: {x: 0, y: 0.87, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -460,7 +460,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.016666668
value: {x: 0, y: 1.15, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -563,13 +563,13 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: -2989691326247451308, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.033333335
- time: 0.016666668
value: {fileID: 3790893458473894746, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.06666667
- time: 0.05
value: {fileID: 7295770420721055256, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.1
value: {fileID: -7942644017914661281, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.13333334
- time: 0.15
value: {fileID: -3806372859529553674, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: root_motion/Body/fan_ArmL
@ -580,7 +580,7 @@ AnimationClip:
value: {fileID: -6190388442968695389, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.1
value: {fileID: 8030186601130789190, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.13333334
- time: 0.15
value: {fileID: -408067975929544184, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: root_motion/Body/fan_ArmL/fan_HandL
@ -589,13 +589,13 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: -2989691326247451308, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.033333335
- time: 0.016666668
value: {fileID: 3790893458473894746, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.06666667
- time: 0.05
value: {fileID: 7295770420721055256, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.1
value: {fileID: -7942644017914661281, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.13333334
- time: 0.15
value: {fileID: -3806372859529553674, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: root_motion/Body/fan_ArmR
@ -606,7 +606,7 @@ AnimationClip:
value: {fileID: 3272263371775538141, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.1
value: {fileID: 8030186601130789190, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.13333334
- time: 0.15
value: {fileID: -408067975929544184, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: root_motion/Body/fan_ArmR/fan_HandR
@ -615,9 +615,9 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 1743681427122389508, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.033333335
- time: 0.016666668
value: {fileID: 2689881232273310843, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 0.06666667
- time: 0.05
value: {fileID: 1026033717333140948, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: root_motion/Body/fan_Body00
@ -817,7 +817,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: -0.527
inSlope: Infinity
outSlope: Infinity
@ -826,7 +826,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: -0.46
inSlope: Infinity
outSlope: Infinity
@ -844,7 +844,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: -0.727
inSlope: Infinity
outSlope: Infinity
@ -872,7 +872,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 1.991
inSlope: Infinity
outSlope: Infinity
@ -881,7 +881,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 2.076
inSlope: Infinity
outSlope: Infinity
@ -899,7 +899,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 1.987
inSlope: Infinity
outSlope: Infinity
@ -927,7 +927,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -936,7 +936,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -954,7 +954,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -991,7 +991,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1028,7 +1028,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1065,7 +1065,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 21.30953
inSlope: Infinity
outSlope: Infinity
@ -1112,7 +1112,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0.042
inSlope: Infinity
outSlope: Infinity
@ -1121,7 +1121,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: -0.067
inSlope: Infinity
outSlope: Infinity
@ -1139,7 +1139,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: -0.23
inSlope: Infinity
outSlope: Infinity
@ -1176,7 +1176,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0.797
inSlope: Infinity
outSlope: Infinity
@ -1185,7 +1185,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0.865
inSlope: Infinity
outSlope: Infinity
@ -1203,7 +1203,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0.901
inSlope: Infinity
outSlope: Infinity
@ -1240,7 +1240,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1249,7 +1249,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1267,7 +1267,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1304,7 +1304,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1322,7 +1322,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1359,7 +1359,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1377,7 +1377,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1414,7 +1414,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 9.13
inSlope: Infinity
outSlope: Infinity
@ -1432,7 +1432,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: -6.49
inSlope: Infinity
outSlope: Infinity
@ -1469,7 +1469,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0.527
inSlope: Infinity
outSlope: Infinity
@ -1478,7 +1478,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0.46
inSlope: Infinity
outSlope: Infinity
@ -1496,7 +1496,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0.727
inSlope: Infinity
outSlope: Infinity
@ -1524,7 +1524,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 1.991
inSlope: Infinity
outSlope: Infinity
@ -1533,7 +1533,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 2.076
inSlope: Infinity
outSlope: Infinity
@ -1551,7 +1551,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 1.987
inSlope: Infinity
outSlope: Infinity
@ -1579,7 +1579,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1588,7 +1588,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1606,7 +1606,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1643,7 +1643,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1680,7 +1680,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1717,7 +1717,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: -21.30953
inSlope: Infinity
outSlope: Infinity
@ -1764,7 +1764,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: -0.063
inSlope: Infinity
outSlope: Infinity
@ -1773,7 +1773,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0.059
inSlope: Infinity
outSlope: Infinity
@ -1791,7 +1791,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0.23
inSlope: Infinity
outSlope: Infinity
@ -1828,7 +1828,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0.834
inSlope: Infinity
outSlope: Infinity
@ -1837,7 +1837,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0.844
inSlope: Infinity
outSlope: Infinity
@ -1855,7 +1855,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0.901
inSlope: Infinity
outSlope: Infinity
@ -1892,7 +1892,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1901,7 +1901,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1919,7 +1919,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1956,7 +1956,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -1974,7 +1974,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2011,7 +2011,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2029,7 +2029,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2066,7 +2066,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: -13.13
inSlope: Infinity
outSlope: Infinity
@ -2084,7 +2084,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.15
value: 6.49
inSlope: Infinity
outSlope: Infinity
@ -2149,7 +2149,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2158,7 +2158,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2186,7 +2186,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0.86
inSlope: Infinity
outSlope: Infinity
@ -2195,7 +2195,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0.87
inSlope: Infinity
outSlope: Infinity
@ -2223,7 +2223,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2232,7 +2232,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2260,7 +2260,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2288,7 +2288,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 1.15
inSlope: Infinity
outSlope: Infinity
@ -2316,7 +2316,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
@ -2351,6 +2351,36 @@ AnimationClip:
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: root_motion/Body/fan_ArmL/fan_HandL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: root_motion/Body/fan_ArmL/fan_HandL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: root_motion/Body/fan_ArmL/fan_HandL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
@ -2411,36 +2441,6 @@ AnimationClip:
path: root_motion/Body/fan_ArmR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: root_motion/Body/fan_ArmL/fan_HandL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: root_motion/Body/fan_ArmL/fan_HandL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: root_motion/Body/fan_ArmL/fan_HandL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []

98
Assets/Resources/Sprites/Games/RhythmSomen/Animations/ArmNothing.anim
View file

@ -16,7 +16,45 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: noodlediag
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: woosh
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -24,14 +62,28 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
genericBindings:
- serializedVersion: 2
path: 2883240411
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3932513237
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -46,7 +98,45 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: noodlediag
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: woosh
classID: 1
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

92
Assets/Resources/Sprites/Games/RhythmSomen/Animations/ArmPluck.anim
View file

@ -68,7 +68,45 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: noodlediag
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: woosh
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@ -99,6 +137,20 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2883240411
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3932513237
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@ -298,6 +350,44 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: noodlediag
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: woosh
classID: 1
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0

1501
Assets/Resources/Sprites/Games/RhythmSomen/Animations/ArmPluckNG.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/RhythmSomen/Animations/ArmPluckNG.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7e6fc2edd69b401409d30a7dc9f439d5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

1601
Assets/Resources/Sprites/Games/RhythmSomen/Animations/ArmPluckOK.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/RhythmSomen/Animations/ArmPluckOK.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4cafd5b59a5aaa34a881ce3532e0e75c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

58
Assets/Resources/Sprites/Games/RhythmSomen/Animations/FrontArm.controller
View file

@ -15,6 +15,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 8701196872580986896}
m_Position: {x: 235, y: 65, z: 0}
- serializedVersion: 1
m_State: {fileID: 7665876450286056060}
m_Position: {x: 270, y: 130, z: 0}
- serializedVersion: 1
m_State: {fileID: 7986906781981003602}
m_Position: {x: 305, y: 195, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -73,6 +79,58 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &7665876450286056060
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ArmPluckOK
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: 4cafd5b59a5aaa34a881ce3532e0e75c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7986906781981003602
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ArmPluckNG
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: 7e6fc2edd69b401409d30a7dc9f439d5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8701196872580986896
AnimatorState:
serializedVersion: 6

476
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Dodge.anim
View file

File diff suppressed because it is too large Load diff

10
Assets/Scripts/BeatmapFormats/Beatmap.cs
View file

@ -71,7 +71,15 @@ namespace HeavenStudio
{
get
{
return typeof(Entity).GetField(propertyName).GetValue(this);
try
{
return typeof(Entity).GetField(propertyName).GetValue(this);
}
catch (NullReferenceException ex)
{
UnityEngine.Debug.LogWarning($"{propertyName} doesn't exist in this Legacy Entity. Conversion needs to create this field... Exception log: {ex}");
return null;
}
}
set
{

5
Assets/Scripts/BeatmapFormats/DynamicBeatmap.cs
View file

@ -250,6 +250,11 @@ namespace HeavenStudio
{
foreach (var param in action.parameters)
{
if (e[param.propertyName] == null)
{
dynamicData.Add(param.propertyName, param.parameter);
continue;
}
type = param.parameter.GetType();
pType = e[param.propertyName].GetType();
// Debug.Log($"adding parameter {param.propertyName} of type {type}");

29
Assets/Scripts/Games/FanClub/FanClub.cs
View file

@ -36,15 +36,16 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("I suppose", "I Suppose!")
{
function = delegate { var e = eventCaller.currentEntity; FanClub.instance.CallKamone(e.beat, e["toggle"], 0, e["type"]); },
function = delegate { var e = eventCaller.currentEntity; FanClub.instance.CallKamone(e.beat, e["toggle"], 0, e["type"], e["alt"]); },
defaultLength = 6,
parameters = new List<Param>()
{
new Param("type", FanClub.KamoneResponseType.Through, "Response type", "Type of response to use"),
new Param("toggle", false, "Disable call", "Disable the idol's call")
new Param("toggle", false, "Disable call", "Disable the idol's call"),
new Param("alt", false, "Alternate cue", "Use an alternate cue")
},
inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnKamone(e.beat, e["toggle"], 0, e["type"]);},
preFunction = delegate { var e = eventCaller.currentEntity; FanClub.KamoneSound(e.beat, e["toggle"], 0, e["type"]); }
inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnKamone(e.beat, e["toggle"], 0, e["type"], e["alt"]);},
preFunction = delegate { var e = eventCaller.currentEntity; FanClub.KamoneSound(e.beat, e["toggle"], 0, e["type"], e["alt"]); }
},
new GameAction("double clap", "Double Clap")
{
@ -173,6 +174,7 @@ namespace HeavenStudio.Games
private static float wantHais = Single.MinValue;
private static float wantKamone = Single.MinValue;
private static int wantKamoneType = (int) KamoneResponseType.Through;
private static bool wantKamoneAlt = false;
private static float wantBigReady = Single.MinValue;
public float idolJumpStartTime = Single.MinValue;
private bool hasJumped = false;
@ -265,7 +267,7 @@ namespace HeavenStudio.Games
}
if (wantKamone != Single.MinValue)
{
ContinueKamone(wantKamone, 0, wantKamoneType);
ContinueKamone(wantKamone, 0, wantKamoneType, wantKamoneAlt);
wantKamone = Single.MinValue;
}
if (wantBigReady != Single.MinValue)
@ -572,7 +574,7 @@ namespace HeavenStudio.Games
}
const float CALL_LENGTH = 2.5f;
public void CallKamone(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through)
public void CallKamone(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through, bool alt = false)
{
bool doJump = (responseType == (int) KamoneResponseType.Jump || responseType == (int) KamoneResponseType.JumpFast);
bool isBig = (responseType == (int) KamoneResponseType.ThroughFast || responseType == (int) KamoneResponseType.JumpFast);
@ -609,31 +611,32 @@ namespace HeavenStudio.Games
}),
});
PlaySoundSequence("fanClub", "crowd_kamone", beat + 2f);
PlaySoundSequence("fanClub", alt ? "crowd_iina" : "crowd_kamone", beat + 2f);
}
public static void WarnKamone(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through)
public static void WarnKamone(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through, bool alt = false)
{
wantKamone = beat;
wantKamoneType = responseType;
wantKamoneAlt = alt;
}
public static void KamoneSound(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through)
public static void KamoneSound(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through, bool alt = false)
{
if (noSound) return;
if (responseType == (int) KamoneResponseType.ThroughFast || responseType == (int) KamoneResponseType.JumpFast)
{
PlaySoundSequence("fanClub", "arisa_kamone_fast", beat);
PlaySoundSequence("fanClub", alt ? "arisa_iina_fast" : "arisa_kamone_fast", beat);
}
else
{
PlaySoundSequence("fanClub", "arisa_kamone", beat);
PlaySoundSequence("fanClub", alt ? "arisa_iina" : "arisa_kamone", beat);
}
}
public void ContinueKamone(float beat, int type = 0, int responseType = (int) KamoneResponseType.Through)
public void ContinueKamone(float beat, int type = 0, int responseType = (int) KamoneResponseType.Through, bool alt = false)
{
CallKamone(beat, true, type, responseType);
CallKamone(beat, true, type, responseType, alt);
}
const float BIGCALL_LENGTH = 2.75f;

4
Assets/Scripts/Games/PlayerActionEvent.cs
View file

@ -161,9 +161,9 @@ namespace HeavenStudio.Games
GameManager.instance.AvgInputOffset = offset;
OnHit(this, (float) state);
CleanUp();
if (countsForAccuracy && !(noAutoplay || autoplayOnly))
if (countsForAccuracy && !(noAutoplay || autoplayOnly) && isEligible)
GameManager.instance.ScoreInputAccuracy(TimeToAccuracy(time), time > 1.0, 1.0);
CleanUp();
} else
{
Blank();

12
Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs
View file

@ -41,6 +41,7 @@ namespace HeavenStudio.Games
// using Scripts_RhythmSomen;
public class RhythmSomen : Minigame
{
[SerializeField] ParticleSystem splashEffect;
public Animator SomenPlayer;
public Animator FrontArm;
public Animator EffectHit;
@ -155,8 +156,17 @@ namespace HeavenStudio.Games
public void CatchSuccess(PlayerActionEvent caller, float state)
{
splashEffect.Play();
if (state >= 1f || state <= -1f)
{
Jukebox.PlayOneShotGame("rhythmSomen/somen_splash");
FrontArm.Play("ArmPluckNG", -1, 0);
EffectSweat.Play("BlobSweating", -1, 0);
return;
}
Jukebox.PlayOneShotGame("rhythmSomen/somen_catch");
FrontArm.Play("ArmPluck", -1, 0);
Jukebox.PlayOneShotGame("rhythmSomen/somen_catch_old", volume: 0.25f);
FrontArm.Play("ArmPluckOK", -1, 0);
EffectHit.Play("HitAppear", -1, 0);
}

8
Assets/Scripts/Games/TrickClass/MobTrickObj.cs
View file

@ -138,6 +138,14 @@ namespace HeavenStudio.Games.Scripts_TrickClass
});
}
}
else
{
Jukebox.PlayOneShotGame(GetDodgeSound());
DoObjMiss();
game.PlayerThrough();
caller.isEligible = false;
game.ScoreMiss();
}
}
public void DodgeMiss(PlayerActionEvent caller)

BIN
Assets/StreamingAssets/StreamingAssets
View file

Binary file not shown.

42
Assets/StreamingAssets/StreamingAssets.manifest
View file

@ -1,42 +1,42 @@
ManifestFileVersion: 0
CRC: 4103698125
CRC: 3384655662
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: ntrsamurai/common
Dependencies: {}
Info_1:
Name: ntridol/common
Dependencies: {}
Info_2:
Name: ntrdj/common
Dependencies: {}
Info_3:
Name: karate/locale.en
Dependencies: {}
Info_4:
Name: ctrpillow/common
Dependencies: {}
Info_5:
Name: karate/common
Dependencies: {}
Info_6:
Info_1:
Name: ctrpillow/locale.en
Dependencies: {}
Info_7:
Info_2:
Name: ctrpillow/locale.jp
Dependencies: {}
Info_3:
Name: ctrpillow/locale.ko
Dependencies: {}
Info_4:
Name: ntridol/common
Dependencies: {}
Info_5:
Name: ntridol/locale.jp
Dependencies: {}
Info_6:
Name: ntrsamurai/common
Dependencies: {}
Info_7:
Name: ntrsamurai/locale.en
Dependencies: {}
Info_8:
Name: ntrcoin/common
Dependencies: {}
Info_9:
Name: ctrpillow/locale.ko
Name: ntrdj/common
Dependencies: {}
Info_10:
Name: ctrpillow/locale.jp
Name: karate/common
Dependencies: {}
Info_11:
Name: ntrsamurai/locale.en
Name: karate/locale.en
Dependencies: {}
Info_12:
Name: ctrcatchy/common

BIN
Assets/StreamingAssets/ntridol/common
View file

Binary file not shown.

4
Assets/StreamingAssets/ntridol/common.manifest
View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2573056641
CRC: 3089759461
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: dd7c85e283c4b3e8204cd54995fa7e32
Hash: 9151b8871b5d0effd38c85af29ad719e
TypeTreeHash:
serializedVersion: 2
Hash: 6c542f6873f7e3067be67f888d87c947

BIN
Assets/StreamingAssets/ntridol/locale.jp
View file

Binary file not shown.

13
Assets/StreamingAssets/ntridol/locale.jp.manifest
View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3826804671
CRC: 3010532164
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 98b6b7bcfec93ca57915abffcecba4f2
Hash: 904237a68a92d681bedf1fdec26db8d3
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
@ -13,18 +13,27 @@ ClassTypes:
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers: []
Assets:
- Assets/Resources/Sfx/games/fanClub/arisa_in_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_ne_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_mo_fast_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_ne_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_hey_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_mo_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_heyAlt_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_hai_2_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_na_fast_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_in_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_ii_fast_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_ka_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_hai_3_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_mo_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_hai_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_ne_fast_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_na_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_ka_jp.wav
- Assets/Resources/Sfx/games/fanClub/crowd_ii_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_hai_1_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_ii_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_ka_fast_jp.wav
- Assets/Resources/Sfx/games/fanClub/arisa_na_jp.wav
Dependencies: []