9cddcac247
* stache stuff (still needs more work but yeah) * new icon (TEMPORARY ICON!!!) * some placeholder animations * more two two jank fixed, almost there * superscroll + fixing early misses * made a few temporary changes to superscroll.cs, i will be modifying it further for ease of use but for now it isn't permanent * made real progress on stopping repeat inputs -game is basically broken for the time being, but i wanna push this so nothing theoretically breaks. ill fix it all tomorrow when im less tired * it's been a while since i've committed my changes * modifiers work again (idk if i broke that in this commit or it was already broken) * stacking logic is here!!! it always uses the latest objects' hit/miss/early function so it should be perfect. i might be able to improve on efficiency tho -FollowHand animation is broken again unfortunately :( * dumplings can now be individually colored, and are assigned their colors in Start(). the smear's colors are defined on Hit() (HitFunction() to be specific) , so that even when there are multiple stacked dumplings, they'll all be accurate. maybe some other stuff but i cannot remember * clean-up + integral fixes onto Monk Move and SingleSuperScroll i think ill add some more comments too * fixed some missing/early stuff + a check for whether you can hit or not * fixed FollowHand animation and the squishing/dumpling on top * cleaned up a ton of unused variables + checks + anims * added unused sound sequences -ig if somebody knows how to use them they can implement them but idk how to and it's not worth figuring out rn * more work on superscroll; there seems to be too many changes to the structure of the script to keep the single scrolling in with the tile scrolling, will combine if necessary tho * fanClub/arisa_dab * monk move!! still working on singlesuperscroll 😭 but i got the monk moving!! * a few optimizations + starting on new singlesuperscroll * ok ScrollObject is usable now oh my GOD i need to optimize how it looks and functions but rn it works like it will when it's done (theoretically) ev do ur work * a few things + new icon!! * scroll speeds are good now * finished except for the stache bop 😭 😭 😭 😭 😭 why isn't it working * im pring this now --------- Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
218 lines
5.9 KiB
Plaintext
218 lines
5.9 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1102 &-5472488506830438833
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: IdleOnTop
|
|
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: b9694bfc1724d9f41ba14506e0f061a4, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!91 &9100000
|
|
AnimatorController:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: DumplingsAnim
|
|
serializedVersion: 5
|
|
m_AnimatorParameters: []
|
|
m_AnimatorLayers:
|
|
- serializedVersion: 5
|
|
m_Name: Base Layer
|
|
m_StateMachine: {fileID: 4134388508170498296}
|
|
m_Mask: {fileID: 0}
|
|
m_Motions: []
|
|
m_Behaviours: []
|
|
m_BlendingMode: 0
|
|
m_SyncedLayerIndex: -1
|
|
m_DefaultWeight: 0
|
|
m_IKPass: 0
|
|
m_SyncedLayerAffectsTiming: 0
|
|
m_Controller: {fileID: 9100000}
|
|
--- !u!1102 &620191329184655588
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: FollowHand
|
|
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: 52c5d67df45ebce43a4be6760eb4791b, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1102 &640850646861270318
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: HitHead
|
|
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: 41cdd05618fde134f8618f2caf975664, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1107 &4134388508170498296
|
|
AnimatorStateMachine:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: Base Layer
|
|
m_ChildStates:
|
|
- serializedVersion: 1
|
|
m_State: {fileID: 620191329184655588}
|
|
m_Position: {x: 240, y: 0, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: 640850646861270318}
|
|
m_Position: {x: 235, y: 65, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: 5539309987236105817}
|
|
m_Position: {x: 270, y: 130, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: 7449569374710932826}
|
|
m_Position: {x: 30, y: 170, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: 5301262728624689923}
|
|
m_Position: {x: 280, y: 190, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: -5472488506830438833}
|
|
m_Position: {x: 280, y: 240, z: 0}
|
|
m_ChildStateMachines: []
|
|
m_AnyStateTransitions: []
|
|
m_EntryTransitions: []
|
|
m_StateMachineTransitions: {}
|
|
m_StateMachineBehaviours: []
|
|
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
|
m_EntryPosition: {x: 50, y: 120, z: 0}
|
|
m_ExitPosition: {x: 800, y: 120, z: 0}
|
|
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
|
m_DefaultState: {fileID: 7449569374710932826}
|
|
--- !u!1102 &5301262728624689923
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: Squish
|
|
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: dcf88489d2949f44e8a31406e3f76210, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1102 &5539309987236105817
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: FallOff
|
|
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: 9b689231e3814b54996ed105ac4fb830, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1102 &7449569374710932826
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: Idle
|
|
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: eeb495d1bb2bac347873446480d7bb20, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|