fixed the animations, committing one last time before the upscale

This commit is contained in:
playinful 2024-05-19 15:07:01 -04:00
parent 25cb32046f
commit a0e2fb9ef5
7 changed files with 10213 additions and 10 deletions

View file

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

View file

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

View file

@ -44,13 +44,13 @@ AnimatorStateMachine:
m_Position: {x: 250, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: 5444674113483754503}
m_Position: {x: 250, y: 150, z: 0}
m_Position: {x: 250, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: 6087527129450089231}
m_Position: {x: 250, y: 200, z: 0}
m_Position: {x: 250, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -3481407283309479541}
m_Position: {x: 480, y: 200, z: 0}
m_Position: {x: 480, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -3044003933807299578}
m_Position: {x: 250, y: 250, z: 0}
@ -71,19 +71,19 @@ AnimatorStateMachine:
m_Position: {x: 480, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: 4356963092261834522}
m_Position: {x: 710, y: -10, z: 0}
m_Position: {x: 710, y: -60, z: 0}
- serializedVersion: 1
m_State: {fileID: -7755883792344508314}
m_Position: {x: 710, y: 50, z: 0}
m_Position: {x: 710, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -6929494436564138092}
m_Position: {x: 710, y: 100, z: 0}
m_Position: {x: 710, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: 1808387700593548855}
m_Position: {x: 710, y: 150, z: 0}
m_Position: {x: 710, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: 2073938479257593203}
m_Position: {x: 710, y: 200, z: 0}
m_Position: {x: 710, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -6188104657850371234}
m_Position: {x: 710, y: 250, z: 0}
@ -95,7 +95,7 @@ AnimatorStateMachine:
m_Position: {x: 710, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: 4586150421227050101}
m_Position: {x: 940, y: 200, z: 0}
m_Position: {x: 940, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: 1449823165430474521}
m_Position: {x: 940, y: 250, z: 0}
@ -141,6 +141,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 6195784825912013836}
m_Position: {x: 480, y: 410, z: 0}
- serializedVersion: 1
m_State: {fileID: -8431802180753770814}
m_Position: {x: 250, y: 200, z: 0}
- serializedVersion: 1
m_State: {fileID: -3027920554451827922}
m_Position: {x: 710, y: 200, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -151,6 +157,33 @@ AnimatorStateMachine:
m_ExitPosition: {x: 40, y: 150, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 2635217359475157101}
--- !u!1102 &-8431802180753770814
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fish1_JustM
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1484694533059393672}
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: 6dbfdd7288e1f7248bc33e6399af1c1d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-8410977862906674950
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -565,6 +598,33 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3027920554451827922
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fish2_JustM
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1009147449646688414}
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: d0085a3172e614742968f6d0015257bb, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-1611024120095190332
AnimatorState:
serializedVersion: 6
@ -667,6 +727,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-1009147449646688414
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4586150421227050101}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-983314641931359044
AnimatorState:
serializedVersion: 6
@ -846,6 +928,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &1484694533059393672
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3481407283309479541}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1808387700593548855
AnimatorState:
serializedVersion: 6

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 KiB

After

Width:  |  Height:  |  Size: 194 KiB

View file

@ -1625,7 +1625,7 @@ TextureImporter:
width: 225
height: 118
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: []
@ -1637,6 +1637,48 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: fish02_hook01m
rect:
serializedVersion: 2
x: 473
y: 1
width: 166
height: 118
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2e06a04d8fd4d014c81722ae14d8428f
internalID: 1854878303
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fish01_hook01m
rect:
serializedVersion: 2
x: 641
y: 1
width: 126
height: 110
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 302cf4eef490eff4d86fbe62ce86077b
internalID: -850896915
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@ -1678,6 +1720,7 @@ TextureImporter:
fin03_07: 369149539
fin03_08: 1770331907
fish01_hook01: -1937665821
fish01_hook01m: -850896915
fish01_hook02: -650927591
fish01_out01: -633689759
fish01_out02: -1578983422
@ -1687,6 +1730,7 @@ TextureImporter:
fish01_wait03: -113083632
fish02_bite: -1276106060
fish02_hook01: -1447049888
fish02_hook01m: 1854878303
fish02_hook02: -291158108
fish02_pick01: -580183698
fish02_pick02: 2068174086