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

Merge branch 'release_1'

Browse source
This commit is contained in:
minenice55 2024-01-12 21:41:45 -05:00
commit ec63e00b98
48 changed files with 41284 additions and 400 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1334
Assets/Resources/Games/trickClass.prefab
View file

File diff suppressed because it is too large Load diff

22
Assets/Resources/Sfx/games/trickClass/blast_dodge.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 3a773d9c50de0924b912c1a3eeef7d5c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Resources/Sfx/games/trickClass/blast_dodge_return.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 8b22ce86120aa314ebcfe5696e0fe490
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Resources/Sfx/games/trickClass/blast_miss.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 815d8b83691257949b66fae211731784
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Resources/Sfx/games/trickClass/girl_charge_0.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 49ecbcd4f7cb82d48a615ec2416b2ba5
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Resources/Sfx/games/trickClass/girl_charge_1.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 770734d13a4d8fa4e904aa6616e6591c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Resources/Sfx/games/trickClass/girl_charge_2.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 04530f49b3ebcec4dbce11c998af7d75
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Resources/Sfx/games/trickClass/player_dodge_success_alt.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: db184e49b54841747828dd71e8a2db04
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

2938
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/BlastDodged.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/BlastDodged.anim.meta Normal file
View file

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

3629
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/BlastNg.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/BlastNg.anim.meta Normal file
View file

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

1716
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/Charge0.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/Charge0.anim.meta Normal file
View file

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

1716
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/Charge1.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/Charge1.anim.meta Normal file
View file

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

1815
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/ThrowAlt.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/ThrowAlt.anim.meta Normal file
View file

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

145
Assets/Resources/Sprites/Games/TrickClass/Anime/Girl/girl.controller
View file

@ -44,6 +44,21 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 4440819358770172556}
m_Position: {x: 240, y: 220, z: 0}
- serializedVersion: 1
m_State: {fileID: 9164054501690875898}
m_Position: {x: 240, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: -3614521715096152578}
m_Position: {x: 275, y: 335, z: 0}
- serializedVersion: 1
m_State: {fileID: 1683814594974535240}
m_Position: {x: 310, y: 400, z: 0}
- serializedVersion: 1
m_State: {fileID: 3688430570973861587}
m_Position: {x: 345, y: 465, z: 0}
- serializedVersion: 1
m_State: {fileID: -2107012691116880678}
m_Position: {x: 380, y: 530, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -54,6 +69,58 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4673474409635209322}
--- !u!1102 &-3614521715096152578
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Charge0
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: a8aa069252b991b428e8e8e37b54e8e9, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-2107012691116880678
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlastNg
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: 8a97142be58c9a1478c795fb91e3efd1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -76,6 +143,58 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1683814594974535240
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Charge1
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: 8444f5421a6fac34e90dd29f0a158a6d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &3688430570973861587
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlastDodged
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: eba145acf3d6cbd4987d6949aae1bc4b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &4440819358770172556
AnimatorState:
serializedVersion: 6
@ -128,3 +247,29 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &9164054501690875898
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ThrowAlt
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: 49dc4ddec49eecc4284d4b5520e7cd4d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

3966
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeAlt.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeAlt.anim.meta Normal file
View file

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

1899
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeBlast0.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeBlast0.anim.meta Normal file
View file

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

2202
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeBlast1.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeBlast1.anim.meta Normal file
View file

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

3876
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeNgShock.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeNgShock.anim.meta Normal file
View file

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

174
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Player.controller
View file

@ -26,6 +26,84 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3455455386993811032
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DodgeBlast1
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: 09b82a1f5d7c272449a7f2284e51a239, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-2416107700260665494
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ThroughBlast
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: ed573d6228b35774cbf61a55b63ac419, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-2383741878387557530
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DodgeBlast0
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: cc8bef0ccb784c242a258f16b3ba71f1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-1826418598434636915
AnimatorState:
serializedVersion: 6
@ -78,6 +156,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-906070713377663971
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DodgeAlt
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: 02e394438807c5844a2cec902c25f4b1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -100,6 +204,32 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2063189850963811223
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DodgeNgShock
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: f85113dceaefabc46a78a97f038baf0c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &3344526055661378143
AnimatorState:
serializedVersion: 6
@ -156,6 +286,24 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 6780057120146691061}
m_Position: {x: 500, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: 6654028805906475515}
m_Position: {x: 535, y: 305, z: 0}
- serializedVersion: 1
m_State: {fileID: 2063189850963811223}
m_Position: {x: 570, y: 370, z: 0}
- serializedVersion: 1
m_State: {fileID: -906070713377663971}
m_Position: {x: 605, y: 435, z: 0}
- serializedVersion: 1
m_State: {fileID: -2416107700260665494}
m_Position: {x: 640, y: 500, z: 0}
- serializedVersion: 1
m_State: {fileID: -2383741878387557530}
m_Position: {x: 675, y: 565, z: 0}
- serializedVersion: 1
m_State: {fileID: -3455455386993811032}
m_Position: {x: 710, y: 630, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -166,6 +314,32 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1826418598434636915}
--- !u!1102 &6654028805906475515
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ThroughShock
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: d7171ac271d517e4996730edbb16ae94, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &6780057120146691061
AnimatorState:
serializedVersion: 6

209
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Through.anim
View file

@ -885,7 +885,60 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: body/armL
m_FloatCurves: []
- 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: -6.6666665, y: -6.6666665, z: -6.6666665}
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.3
value: {x: 2, y: 2, z: 2}
inSlope: {x: -6.6666665, y: -6.6666665, z: -6.6666665}
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: effect1
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -3.3333333
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 0
inSlope: -3.3333333
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: effect1
classID: 212
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@ -962,17 +1015,18 @@ AnimationClip:
- time: 0.38333333
value: {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- time: 0.41666666
value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- time: 0.43333334
value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- time: 0.48333332
value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- time: 0.5
value: {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
value: {fileID: -2051166924, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
attribute: m_Sprite
path: head
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: -1969113684, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
attribute: m_Sprite
path: effect1
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
@ -1043,6 +1097,20 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3503889430
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3503889430
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3685223346
attribute: 0
@ -1071,6 +1139,13 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 3503889430
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 3685223346
attribute: 4
@ -1115,10 +1190,8 @@ AnimationClip:
- {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: 2274011879247696229, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: 259028287349437060, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: -2051166924, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
- {fileID: -1969113684, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
@ -3846,6 +3919,118 @@ AnimationClip:
path: body/armL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 4
inSlope: 0
outSlope: -6.6666665
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 2
inSlope: -6.6666665
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: effect1
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 4
inSlope: 0
outSlope: -6.6666665
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 2
inSlope: -6.6666665
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: effect1
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 4
inSlope: 0
outSlope: -6.6666665
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 2
inSlope: -6.6666665
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: effect1
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -3.3333333
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 0
inSlope: -3.3333333
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: effect1
classID: 212
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

8366
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/ThroughBlast.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/ThroughBlast.anim.meta Normal file
View file

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

5642
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/ThroughShock.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/ThroughShock.anim.meta Normal file
View file

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

68
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnChair.anim Normal file
View file

@ -0,0 +1,68 @@
%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: WarnChair
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 1967864003, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
attribute: m_Sprite
path: warnBubble/warnObj
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1238842833
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1967864003, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnChair.anim.meta Normal file
View file

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

68
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnNx.anim Normal file
View file

@ -0,0 +1,68 @@
%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: WarnNx
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 762809910, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
attribute: m_Sprite
path: warnBubble/warnObj
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1238842833
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 762809910, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnNx.anim.meta Normal file
View file

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

68
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPhone.anim Normal file
View file

@ -0,0 +1,68 @@
%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: WarnPhone
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 1376003920, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
attribute: m_Sprite
path: warnBubble/warnObj
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1238842833
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1376003920, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPhone.anim.meta Normal file
View file

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

68
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnShock.anim Normal file
View file

@ -0,0 +1,68 @@
%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: WarnShock
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -618648720, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
attribute: m_Sprite
path: warnBubble/warnObj
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1238842833
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -618648720, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnShock.anim.meta Normal file
View file

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

116
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/objWarn.controller
View file

@ -52,6 +52,58 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4482175379901932263
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WarnShock
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: a0a8e93ebc4e6de4785b3a1eab82c9fb, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3998591409194070612
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WarnChair
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: 576d110bca5a69e4897f1e9bb623789b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -92,6 +144,18 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 5922798250668347908}
m_Position: {x: 240, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: -3998591409194070612}
m_Position: {x: 275, y: 305, z: 0}
- serializedVersion: 1
m_State: {fileID: -4482175379901932263}
m_Position: {x: 310, y: 370, z: 0}
- serializedVersion: 1
m_State: {fileID: 7905119148226771895}
m_Position: {x: 345, y: 435, z: 0}
- serializedVersion: 1
m_State: {fileID: 4391100156467920704}
m_Position: {x: 380, y: 500, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -102,6 +166,32 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -7055674614395819121}
--- !u!1102 &4391100156467920704
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WarnNx
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: 9f3ac069a9ac48b44badb290727beb82, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5922798250668347908
AnimatorState:
serializedVersion: 6
@ -128,3 +218,29 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7905119148226771895
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WarnPhone
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: dcbd7609d0f3e704396b51edca46716b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

52
Assets/Resources/Sprites/Games/TrickClass/mobTrick_bg00.png.meta
View file

@ -59,7 +59,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 145.84201
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -79,7 +79,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -120,16 +120,16 @@ TextureImporter:
name: mobTrick_bg00_0
rect:
serializedVersion: 2
x: 91
y: 3934
width: 5838
height: 3658
x: 0
y: 5904
width: 8206
height: 5086
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: b66ab78f37351e7f0800000000000000
internalID: -585094719026256277
@ -141,16 +141,16 @@ TextureImporter:
name: mobTrick_bg00_1
rect:
serializedVersion: 2
x: 890
y: 2520
width: 3513
height: 848
x: 1137
y: 3874
width: 4870
height: 1031
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 9b50477dbd4eae9d0800000000000000
internalID: -2744129390065220167
@ -162,16 +162,16 @@ TextureImporter:
name: mobTrick_bg00_2
rect:
serializedVersion: 2
x: 550
y: 1216
width: 4282
height: 940
x: 643
y: 1903
width: 5983
height: 1259
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 20dd28d0d9be71690800000000000000
internalID: -7631371983786943230
@ -183,16 +183,16 @@ TextureImporter:
name: mobTrick_bg00_3
rect:
serializedVersion: 2
x: 640
y: 266
width: 5226
height: 657
x: 774
y: 622
width: 7339
height: 760
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 5c3f9fb501ef0fad0800000000000000
internalID: -2670355232814664763

890
Assets/Resources/Sprites/Games/TrickClass/mobTrick_parts00.png.meta
View file

File diff suppressed because it is too large Load diff

9
Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs
View file

@ -123,11 +123,10 @@ namespace HeavenStudio.Games.Loaders
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "What ease will the gears speed up/slow down with?"),
}
},
}
// ,
// new List<string>() { "pco", "normal", "repeat" },
// "pcomeat", "en",
// new List<string>() { }
},
new List<string>() { "pco", "normal", "repeat" },
"pcomeat", "en",
new List<string>() { }
);
}
}

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

@ -10,29 +10,39 @@ namespace HeavenStudio.Games.Scripts_TrickClass
{
public class MobTrickObj : MonoBehaviour
{
public bool flyType;
public double startBeat;
[NonSerialized] public double startBeat;
bool miss = false;
float flyBeats;
float dodgeBeats;
public int type;
[SerializeField] public byte flyType;
[SerializeField] float flyBeats;
[SerializeField] float dodgeBeats;
[SerializeField] float gravity;
[SerializeField] int hitLayer;
[SerializeField] TrickClass.TrickObjType type;
[SerializeField] string justSound;
[SerializeField] string missSound;
[SerializeField] SpriteRenderer spriteRenderer;
[NonSerialized] public BezierCurve3D curve;
private TrickClass game;
private float grav;
private void Awake()
{
game = TrickClass.instance;
flyBeats = flyType ? 4f : 2f;
dodgeBeats = flyType ? 2f : 1f;
var cond = Conductor.instance;
float flyPos = cond.GetPositionFromBeat(startBeat, flyBeats);
transform.position = curve.GetPoint(flyPos);
game.ScheduleInput(startBeat, dodgeBeats, TrickClass.InputAction_FlickPress, DodgeJustOrNg, DodgeMiss, DodgeThrough, CanDodge);
if (type is not TrickClass.TrickObjType.Shock or TrickClass.TrickObjType.Plane)
{
transform.eulerAngles = new Vector3(0, 0, UnityEngine.Random.Range(0f, 360f));
}
Update();
}
// Update is called once per frame
@ -41,58 +51,72 @@ namespace HeavenStudio.Games.Scripts_TrickClass
var cond = Conductor.instance;
float flyPos = cond.GetPositionFromBeat(startBeat, flyBeats);
if (flyPos <= 1f)
if (curve == null)
{
if (!miss)
{
flyPos *= 0.95f;
}
Vector3 lastPos = transform.position;
Vector3 nextPos = curve.GetPoint(flyPos);
if (flyType)
{
Vector3 direction = (nextPos - lastPos).normalized;
float rotation = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
this.transform.eulerAngles = new Vector3(0, 0, rotation);
}
else
{
transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (360f * Time.deltaTime));
}
transform.position = nextPos;
grav += gravity * Time.deltaTime * cond.SongPitch;
transform.position += new Vector3(0, -grav * Time.deltaTime * cond.SongPitch, 0);
}
else
{
transform.position = curve.GetPoint(miss ? 1f : 0.95f);
if (flyPos <= 1f)
{
if (!miss)
{
flyPos *= 0.95f;
}
Vector3 lastPos = transform.position;
Vector3 nextPos = curve.GetPoint(flyPos);
switch (flyType)
{
case 1:
Vector3 direction = (nextPos - lastPos).normalized;
float rotation = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
transform.eulerAngles = new Vector3(0, 0, rotation);
break;
case 2:
transform.rotation = Quaternion.identity;
break;
default:
transform.eulerAngles = new Vector3(0, 0, transform.rotation.eulerAngles.z + (360f * Time.deltaTime * cond.SongPitch));
break;
}
transform.position = nextPos;
}
else
{
transform.position = curve.GetPoint(miss ? 1f : 0.95f);
}
}
if (flyPos > 1f)
{
if (Conductor.instance.GetPositionFromBeat(startBeat, flyBeats + 1f) >= 1f)
{
GameObject.Destroy(gameObject);
Destroy(gameObject);
return;
}
}
}
public string GetDodgeSound()
public string GetMissSound()
{
switch (type)
{
default:
return "trickClass/ball_impact";
}
return $"trickClass/{missSound}";
}
public void DoObjMiss()
public string GetJustSound()
{
return $"trickClass/{justSound}";
}
public void DoObjMiss(bool ng = false)
{
miss = true;
switch (type)
{
case (int) TrickClass.TrickObjType.Plane:
case TrickClass.TrickObjType.Plane:
startBeat += dodgeBeats;
curve = game.planeMissCurve;
flyBeats = 4f;
@ -104,12 +128,15 @@ namespace HeavenStudio.Games.Scripts_TrickClass
transform.position = nextPos;
break;
case TrickClass.TrickObjType.Shock:
Destroy(gameObject);
break;
default:
startBeat += dodgeBeats;
curve = game.ballMissCurve;
flyBeats = 1.25f;
break;
}
startBeat += dodgeBeats;
}
public bool CanDodge()
@ -122,32 +149,46 @@ namespace HeavenStudio.Games.Scripts_TrickClass
if (state <= -1f || state >= 1f)
{
//NG
game.PlayerDodgeNg();
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetDodgeSound(), startBeat + flyBeats, volume: 0.4f),
});
SoundByte.PlayOneShotGame(GetDodgeSound(), volume: 0.6f);
game.PlayerDodgeNg(type is TrickClass.TrickObjType.Shock);
if (type is not TrickClass.TrickObjType.Shock)
{
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetMissSound(), startBeat + flyBeats, volume: 0.4f),
});
}
SoundByte.PlayOneShotGame(GetMissSound(), volume: 0.6f);
SoundByte.PlayOneShot("miss");
DoObjMiss();
DoObjMiss(true);
}
else
{
//just
game.PlayerDodge();
SoundByte.PlayOneShotGame("trickClass/player_dodge_success", volume: 0.8f, pitch: UnityEngine.Random.Range(0.85f, 1.15f));
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetDodgeSound(), startBeat + flyBeats, volume: 0.4f),
bool phone = type is TrickClass.TrickObjType.Phone;
game.PlayerDodge(phone, phone);
SoundByte.PlayOneShotGame(GetJustSound(), volume: 0.8f, pitch: UnityEngine.Random.Range(0.85f, 1.15f));
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetMissSound(), startBeat + flyBeats, volume: 0.4f),
});
if (phone)
{
transform.position = curve.GetPoint(0.5f);
curve = null;
grav = 0f;
startBeat = Conductor.instance.songPositionInBeatsAsDouble;
flyBeats = 1f;
spriteRenderer.sortingOrder = hitLayer;
}
}
}
public void DodgeMiss(PlayerActionEvent caller)
{
SoundByte.PlayOneShotGame(GetDodgeSound());
DoObjMiss();
game.PlayerThrough();
SoundByte.PlayOneShotGame(GetMissSound());
DoObjMiss(false);
game.PlayerThrough(type is TrickClass.TrickObjType.Shock);
}
public void DodgeThrough(PlayerActionEvent caller) {}
public void DodgeThrough(PlayerActionEvent caller) { }
}
}

293
Assets/Scripts/Games/TrickClass/TrickClass.cs
View file

@ -12,16 +12,26 @@ namespace HeavenStudio.Games.Loaders
using static Minigames;
public static class MobTrickLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
public static Minigame AddGame(EventCaller eventCaller)
{
return new Minigame("trickClass", "Trick on the Class", "ecede4", false, false, new List<GameAction>()
{
new GameAction("toss", "Paper Ball")
new GameAction("toss", "Toss Object")
{
preFunction = delegate
{
TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Ball);
},
var e = eventCaller.currentEntity;
TrickClass.PreTossObject(e.beat, (int)e["obj"], e["nx"]);
},
defaultLength = 2,
parameters = new List<Param>()
{
new Param("obj", TrickClass.TrickObjTypeEditor.PaperBall, "Object", "Changes the object thrown at the player", new List<Param.CollapseParam>()
{
new Param.CollapseParam((x, _) => (int)x == (int)TrickClass.TrickObjTypeEditor.Phone, new string[] { "nx" }),
}),
new Param("nx", false, "Switch", "Replace the phone with a Switch"),
}
},
new GameAction("plane", "Plane")
{
@ -31,20 +41,59 @@ namespace HeavenStudio.Games.Loaders
},
defaultLength = 3,
},
new GameAction("blast", "Optic Blast")
{
preFunction = delegate
{
TrickClass.PreBlast(eventCaller.currentEntity.beat);
},
defaultLength = 4,
},
new GameAction("bop", "Bop")
{
function = delegate { var e = eventCaller.currentEntity; TrickClass.instance.Bop(e.beat, e.length, e["bop"], e["autoBop"]); },
resizable = true,
resizable = true,
parameters = new List<Param>()
{
new Param("bop", true, "Bop", "Should the girl and boy bop?"),
new Param("autoBop", false, "Bop (Auto)", "Should the girl and boy auto bop?")
}
},
new GameAction("chair", "Chair")
{
preFunction = delegate
{
TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Chair);
},
defaultLength = 2,
hidden = true,
},
new GameAction("phone", "Phone")
{
preFunction = delegate
{
TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Phone, eventCaller.currentEntity["nx"]);
},
defaultLength = 2,
hidden = true,
parameters = new List<Param>()
{
new Param("nx", false, "Switch", "Replace the phone with a Switch"),
}
},
new GameAction("shock", "Lightning Bolt")
{
preFunction = delegate
{
TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Shock);
},
defaultLength = 2,
hidden = true,
},
},
new List<string>() {"mob", "normal"},
new List<string>() { "mob", "normal" },
"mobtrick", "en",
new List<string>() {}
new List<string>() { }
);
}
}
@ -59,15 +108,29 @@ namespace HeavenStudio.Games
using Scripts_TrickClass;
public class TrickClass : Minigame
{
public enum TrickObjType {
public enum TrickObjTypeEditor : int
{
PaperBall,
Chair,
Lightning,
Phone,
}
public enum TrickObjType : int
{
Ball,
Chair,
Shock,
Phone,
Plane,
Blast
}
public struct QueuedObject
{
public double beat;
public int type;
public bool variant;
}
public static List<QueuedObject> queuedInputs = new List<QueuedObject>();
[Header("Objects")]
@ -76,9 +139,11 @@ namespace HeavenStudio.Games
public Animator warnAnim;
[Header("References")]
public GameObject ballPrefab;
public GameObject planePrefab;
public GameObject shockPrefab;
public GameObject[] objPrefab;
public GameObject[] objPrefabVariant;
public string[] objWarnAnim;
public string[] objWarnAnimVariant;
public string[] objThrowAnim;
public Transform objHolder;
[Header("Curves")]
@ -96,7 +161,7 @@ namespace HeavenStudio.Games
double playerBopStart = double.MinValue;
double girlBopStart = double.MinValue;
bool showBubble = true;
bool playerReady;
bool playerReady, girlBopEnable;
public static PlayerInput.InputAction InputAction_TouchPressing =
new("PcoTrickTouching", new int[] { IAEmptyCat, IAPressingCat, IAEmptyCat },
@ -115,6 +180,7 @@ namespace HeavenStudio.Games
{
instance = this;
SetupBopRegion("trickClass", "bop", "autoBop");
girlBopEnable = true;
}
public override void OnBeatPulse(double beat)
@ -124,7 +190,7 @@ namespace HeavenStudio.Games
if ((!playerReady) && cond.songPositionInBeatsAsDouble > playerBopStart)
playerAnim.DoScaledAnimationAsync("Bop");
if (cond.songPositionInBeatsAsDouble > girlBopStart)
if (cond.songPositionInBeatsAsDouble > girlBopStart && girlBopEnable)
girlAnim.DoScaledAnimationAsync("Bop");
}
@ -141,24 +207,16 @@ namespace HeavenStudio.Games
{
new BeatAction.Action(input.beat - 1f, delegate
{
switch (input.type)
{
case (int)TrickClass.TrickObjType.Ball:
warnAnim.Play("WarnBall", 0, 0);
break;
case (int)TrickClass.TrickObjType.Plane:
warnAnim.Play("WarnPlane", 0, 0);
break;
}
warnAnim.Play(input.variant ? objWarnAnimVariant[input.type] : objWarnAnim[input.type], 0, 0);
}),
new BeatAction.Action(input.beat, delegate
new BeatAction.Action(input.beat, delegate
{
warnAnim.Play("NoPose", 0, 0);
TossObject(input.beat, input.type);
TossObject(input.beat, input.type, input.variant);
})
});
}
queuedInputs.Clear();
queuedInputs.Clear();
}
}
@ -207,32 +265,24 @@ namespace HeavenStudio.Games
{
instance.showBubble = !instance.showBubble;
}
public static void PreTossObject(double beat, int type)
public static void PreTossObject(double beat, int type, bool variant = false)
{
if (GameManager.instance.currentGame == "trickClass")
{
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat - 1, delegate
new BeatAction.Action(beat - 1, delegate
{
if (instance.showBubble == true)
{
switch (type)
{
case (int)TrickClass.TrickObjType.Ball:
instance.warnAnim.Play("WarnBall", 0, 0);
break;
case (int)TrickClass.TrickObjType.Plane:
instance.warnAnim.Play("WarnPlane", 0, 0);
break;
}
instance.warnAnim.Play(variant ? instance.objWarnAnimVariant[type] : instance.objWarnAnim[type], 0, 0);
}
}),
new BeatAction.Action(beat, delegate
new BeatAction.Action(beat, delegate
{
instance.warnAnim.Play("NoPose", 0, 0);
instance.TossObject(beat, type);
instance.TossObject(beat, type, variant);
})
});
}
@ -242,78 +292,187 @@ namespace HeavenStudio.Games
{
beat = beat,
type = type,
variant = variant
});
}
switch (type)
{
case (int)TrickObjType.Plane:
PlaySoundSequence("trickClass", "planeThrow", beat);
break;
case (int)TrickObjType.Chair:
PlaySoundSequence("trickClass", "chairThrow", beat);
break;
case (int)TrickObjType.Shock:
PlaySoundSequence("trickClass", "shockThrow", beat);
break;
case (int)TrickObjType.Phone:
PlaySoundSequence("trickClass", "phoneThrow", beat);
break;
default:
PlaySoundSequence("trickClass", "ballThrow", beat);
break;
}
}
public void TossObject(double beat, int type)
public void TossObject(double beat, int type, bool variant = false)
{
switch (type)
{
case (int) TrickObjType.Plane:
SoundByte.PlayOneShotGame("trickClass/girl_toss_plane");
break;
default:
SoundByte.PlayOneShotGame("trickClass/girl_toss_ball");
break;
}
SpawnObject(beat, type);
SpawnObject(beat, type, variant);
girlAnim.DoScaledAnimationAsync("Throw");
girlAnim.DoScaledAnimationAsync(objThrowAnim[type]);
girlBopStart = Conductor.instance.songPositionInBeatsAsDouble + 0.75f;
}
public void SpawnObject(double beat, int type)
public void SpawnObject(double beat, int type, bool variant = false)
{
GameObject objectToSpawn;
BezierCurve3D curve;
bool isPlane = false;
switch (type)
{
case (int) TrickObjType.Plane:
objectToSpawn = planePrefab;
case (int)TrickObjType.Plane:
curve = planeTossCurve;
isPlane = true;
break;
case (int)TrickObjType.Shock:
curve = shockTossCurve;
break;
default:
objectToSpawn = ballPrefab;
curve = ballTossCurve;
break;
}
var mobj = GameObject.Instantiate(objectToSpawn, objHolder);
objectToSpawn = variant ? objPrefabVariant[type] : objPrefab[type];
var mobj = Instantiate(objectToSpawn, objHolder);
var thinker = mobj.GetComponent<MobTrickObj>();
thinker.startBeat = beat;
thinker.flyType = isPlane;
thinker.curve = curve;
thinker.type = type;
// thinker.type = type;
mobj.SetActive(true);
}
public void PlayerDodge(bool slow = false)
public static void PreBlast(double beat)
{
PlaySoundSequence("trickClass", "girlCharge", beat);
if (GameManager.instance.currentGame == "trickClass")
{
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate
{
instance.DoBlast(beat);
})
});
}
else
{
queuedInputs.Add(new QueuedObject
{
beat = beat,
type = (int)TrickObjType.Blast,
variant = false
});
}
}
public void DoBlast(double beat)
{
ScheduleInput(beat, 2, InputAction_FlickPress, BlastJustOrNg, BlastMiss, Through, CanDodge);
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate
{
girlBopEnable = false;
girlAnim.DoScaledAnimationAsync("Charge0");
}),
new BeatAction.Action(beat + 0.75, delegate
{
girlAnim.DoScaledAnimationAsync("Charge1");
}),
new BeatAction.Action(beat + 1.5, delegate
{
girlAnim.DoScaledAnimationAsync("Charge1");
}),
new BeatAction.Action(beat + 2, delegate
{
//test
// girlAnim.DoScaledAnimationAsync("BlastDodged", 0.5f);
}),
new BeatAction.Action(beat + 4, delegate
{
girlBopEnable = true;
}),
});
}
public bool CanDodge()
{
return playerCanDodge <= Conductor.instance.songPositionInBeatsAsDouble;
}
public void BlastJustOrNg(PlayerActionEvent caller, float state)
{
if (state <= -1f || state >= 1f)
{
SoundByte.PlayOneShotGame("trickClass/shock_impact");
girlAnim.DoScaledAnimationAsync("BlastNg", 0.5f);
PlayerDodgeNg(true);
return;
}
girlAnim.DoScaledAnimationAsync("BlastDodged", 0.5f);
if (playerCanDodge > Conductor.instance.songPositionInBeatsAsDouble) return;
SoundByte.PlayOneShotGame("trickClass/blast_dodge");
playerAnim.DoScaledAnimationAsync("DodgeBlast0", 1f);
playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 1.25;
playerCanDodge = Conductor.instance.songPositionInBeatsAsDouble + 1;
playerReady = false;
SoundByte.PlayOneShotGame("trickClass/blast_dodge_return", caller.startBeat + caller.timer + 1f);
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(caller.startBeat + caller.timer + 1, delegate
{
playerAnim.DoScaledAnimationAsync("DodgeBlast1", 1f);
}),
});
}
public void BlastMiss(PlayerActionEvent caller)
{
girlAnim.DoScaledAnimationAsync("BlastNg", 0.5f);
SoundByte.PlayOneShotGame("trickClass/blast_miss");
playerAnim.DoScaledAnimationAsync("ThroughBlast");
playerReady = false;
playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 1.5f;
playerCanDodge = Conductor.instance.songPositionInBeatsAsDouble + 0.5f;
}
public void Through(PlayerActionEvent caller) { }
public void PlayerDodge(bool slow = false, bool type = false)
{
if (playerCanDodge > Conductor.instance.songPositionInBeatsAsDouble) return;
//anim
SoundByte.PlayOneShotGame("trickClass/player_dodge");
playerAnim.DoScaledAnimationAsync("Dodge", slow ? 0.6f : 1f);
playerAnim.DoScaledAnimationAsync(type ? "DodgeAlt" : "Dodge", slow ? 0.6f : 1f);
playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 0.75f;
playerReady = false;
}
public void PlayerDodgeNg()
public void PlayerDodgeNg(bool shock = false)
{
playerAnim.DoScaledAnimationAsync("DodgeNg");
playerAnim.DoScaledAnimationAsync(shock ? "DodgeNgShock" : "DodgeNg");
playerReady = false;
playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 0.75f;
playerCanDodge = Conductor.instance.songPositionInBeatsAsDouble + 0.15f;
}
public void PlayerThrough()
public void PlayerThrough(bool shock = false)
{
playerAnim.DoScaledAnimationAsync("Through");
playerAnim.DoScaledAnimationAsync(shock ? "ThroughShock" : "Through");
playerReady = false;
playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 0.75f;
playerCanDodge = Conductor.instance.songPositionInBeatsAsDouble + 0.15f;

6
Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs
View file

@ -310,6 +310,7 @@ namespace HeavenStudio.Editor
new List<RectTransform>(),
new List<RectTransform>(),
new List<RectTransform>(),
new List<RectTransform>(),
};
for (int i = 0; i < mgs.Count; i++)
{
@ -321,10 +322,11 @@ namespace HeavenStudio.Editor
"ntr" => 1,
"rvl" => 2,
"ctr" => 3,
_ => 4,
"mob" => 4,
_ => 5,
}].Add(mgs[i]);
} else if (mg.inferred) {
systems[4].Add(mgs[i]);
systems[^1].Add(mgs[i]);
} else {
Debug.LogWarning($"Chronological sorting has failed, does \"{mg.displayName}\" ({mg.name}) have an asset bundle assigned to it?");
}