Crowd Stuff but More

Made bops low priority animations for the crowd.
Added the jumping animation holy fuck that was a headache please send hlep.
This commit is contained in:
ThePurpleAnon 2024-02-06 23:31:09 -06:00
parent 83f768d49a
commit f6719e0982
14 changed files with 1481 additions and 301 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -240,7 +240,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1 m_FlipX: 1
@ -324,7 +324,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -361,8 +361,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 145737076522044112} m_GameObject: {fileID: 145737076522044112}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1086730109615807079} - {fileID: 1086730109615807079}
@ -897,7 +897,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 1 m_SortingOrder: 21
m_Sprite: {fileID: -1469594001, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1469594001, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -981,7 +981,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1 m_FlipX: 1
@ -1098,7 +1098,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 20
m_Sprite: {fileID: 160549070, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 160549070, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -1268,7 +1268,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 20
m_Sprite: {fileID: -1225194204, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1225194204, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -1436,7 +1436,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 22
m_Sprite: {fileID: -137195813, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -137195813, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -1688,7 +1688,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 22
m_Sprite: {fileID: -218688172, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -218688172, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -1856,7 +1856,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 22
m_Sprite: {fileID: -992601819, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -992601819, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -2481,7 +2481,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 4 m_SortingOrder: 24
m_Sprite: {fileID: 766301249, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 766301249, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -2909,6 +2909,7 @@ MonoBehaviour:
PivotL: {fileID: 5699949445852837137} PivotL: {fileID: 5699949445852837137}
PivotR: {fileID: 8717251280108068553} PivotR: {fileID: 8717251280108068553}
PivotD: {fileID: 8915294292827649975} PivotD: {fileID: 8915294292827649975}
CrowdPos: {fileID: 8341294927622063532}
--- !u!1 &3076469919417271298 --- !u!1 &3076469919417271298
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4146,7 +4147,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 22
m_Sprite: {fileID: 1048699212, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 1048699212, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -4315,7 +4316,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 20
m_Sprite: {fileID: -357828823, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -357828823, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -4399,7 +4400,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 22
m_Sprite: {fileID: 365342161, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 365342161, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -4621,7 +4622,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1 m_FlipX: 1
@ -4789,7 +4790,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 6 m_SortingOrder: 26
m_Sprite: {fileID: -557429226, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -557429226, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -5125,7 +5126,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -6319,7 +6320,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 22
m_Sprite: {fileID: 961105262, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 961105262, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -6677,7 +6678,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 4 m_SortingOrder: 24
m_Sprite: {fileID: 707776918, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 707776918, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -7099,7 +7100,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 20
m_Sprite: {fileID: -63098412, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -63098412, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -7308,7 +7309,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1 m_FlipX: 1
@ -7683,7 +7684,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 2 m_SortingOrder: 22
m_Sprite: {fileID: 2071141286, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 2071141286, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -7767,7 +7768,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -7991,7 +7992,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 20
m_Sprite: {fileID: 303899096, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 303899096, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -8243,7 +8244,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 20
m_Sprite: {fileID: 1038473437, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: 1038473437, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -8421,7 +8422,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 20
m_Sprite: {fileID: -716390247, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -716390247, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -8621,7 +8622,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 10 m_SortingOrder: 30
m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3} m_Sprite: {fileID: -1808832674, guid: a7e2f6ba068969b42b53497f4d384f4e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0

View file

@ -73,9 +73,6 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -5122083434829711582} m_State: {fileID: -5122083434829711582}
m_Position: {x: 300, y: 100, z: 0} m_Position: {x: 300, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: -3892166599699998972}
m_Position: {x: 600, y: 200, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -8192043373122095533} m_State: {fileID: -8192043373122095533}
m_Position: {x: 600, y: 100, z: 0} m_Position: {x: 600, y: 100, z: 0}
@ -89,7 +86,7 @@ AnimatorStateMachine:
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0} m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 300, y: 300, z: 0} m_ExitPosition: {x: 600, y: 200, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 9098812033871683046} m_DefaultState: {fileID: 9098812033871683046}
--- !u!1102 &-5122083434829711582 --- !u!1102 &-5122083434829711582
@ -118,32 +115,6 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &-3892166599699998972
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump
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: 969a69e2e8b93234ea4f77bbacb9b409, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -20,27 +20,27 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.06666667 time: 0.06666667
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -1061,43 +1061,6 @@ AnimationClip:
path: path:
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
@ -2638,6 +2601,25 @@ AnimationClip:
path: CrowdHolder/Bird3/Mouth3 path: CrowdHolder/Bird3/Mouth3
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: [] m_EulerEditorCurves: []
m_HasGenericRootTransform: 1 m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0

View file

@ -54,27 +54,27 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: -0.06, z: 0} value: {x: 0, y: -0.06, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.05 time: 0.05
value: {x: 0, y: -0.03, z: 0} value: {x: 0, y: -0.03, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.1 time: 0.1
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -319,31 +319,13 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0 value: -2
inSlope: Infinity inSlope: 0
outSlope: Infinity outSlope: 0
tangentMode: 103 tangentMode: 136
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0
outWeight: 0.33333334 outWeight: 0
- serializedVersion: 3
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4

View file

@ -292,27 +292,27 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.06666667 time: 0.06666667
value: {x: 0, y: 0.03, z: 0} value: {x: 0, y: 0.03, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -1812,31 +1812,13 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0 value: -2
inSlope: Infinity inSlope: 0
outSlope: Infinity outSlope: 0
tangentMode: 103 tangentMode: 136
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0
outWeight: 0.33333334 outWeight: 0
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4

View file

@ -36,7 +36,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: 0, z: 0} inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -193,13 +193,13 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0 value: -2
inSlope: Infinity inSlope: 0
outSlope: Infinity outSlope: 0
tangentMode: 103 tangentMode: 136
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0
outWeight: 0.33333334 outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4

View file

@ -1,53 +0,0 @@
%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: CrowdJump
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: []
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: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

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

View file

@ -45,18 +45,18 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: -0.03, z: 0} value: {x: 0, y: -0.03, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 1 time: 1
value: {x: 0, y: 0, z: 0} value: {x: 0, y: 0, z: -2}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -778,22 +778,13 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0 value: -2
inSlope: Infinity inSlope: 0
outSlope: Infinity outSlope: 0
tangentMode: 103 tangentMode: 136
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0
outWeight: 0.33333334 outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4

View file

@ -167,6 +167,7 @@ namespace HeavenStudio.Games
[SerializeField] Transform PivotL; [SerializeField] Transform PivotL;
[SerializeField] Transform PivotR; [SerializeField] Transform PivotR;
[SerializeField] Transform PivotD; [SerializeField] Transform PivotD;
[SerializeField] Transform CrowdPos;
bool ravenBop = true; bool ravenBop = true;
bool vultureBop = true; bool vultureBop = true;
@ -209,6 +210,15 @@ namespace HeavenStudio.Games
bool crowdCanCheerSound = true; bool crowdCanCheerSound = true;
bool crowdCanCheerAnimation = true; bool crowdCanCheerAnimation = true;
bool crowdIsCheering = false; bool crowdIsCheering = false;
double crowdLastMissAnimation = double.MinValue;
bool jumpUp = false;
bool jumpDown = false;
float jumpStart;
float jumpApex;
float jumpLength;
double startJumpTime = double.MinValue;
float jumpHeight = 1;
public enum WhoBops public enum WhoBops
@ -499,6 +509,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
} }
else else
@ -580,6 +591,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
//SoundByte.PlayOneShotGame("manzai/hai"); //SoundByte.PlayOneShotGame("manzai/hai");
@ -720,6 +732,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
} }
else else
@ -775,6 +788,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
} }
@ -825,7 +839,6 @@ namespace HeavenStudio.Games
public void CrowdAnimation(double beat, double length, int animation, int loop) public void CrowdAnimation(double beat, double length, int animation, int loop)
{ {
var crowdAnimation= Enum.GetName(typeof(CrowdAnimationList), animation);
double loopAsDouble = loop * 0.25; double loopAsDouble = loop * 0.25;
var actions = new List<BeatAction.Action>(); var actions = new List<BeatAction.Action>();
@ -833,15 +846,57 @@ namespace HeavenStudio.Games
{ {
actions.Add(new(beat - 0.25, delegate { crowdCanCheerAnimation = false; })); actions.Add(new(beat - 0.25, delegate { crowdCanCheerAnimation = false; }));
} }
for (int i = 0; i * loopAsDouble < length; i++) if (animation != 1 && animation != 5)
{ {
actions.Add(new(beat + i * loopAsDouble, delegate { CrowdAnim.DoScaledAnimationAsync($"{crowdAnimation}", 0.5f); })); actions.Add(new(beat, delegate { doCrowdAnimation(animation, loopAsDouble, beat); }));
actions.Add(new(beat + length, delegate { CrowdAnim.DoScaledAnimationAsync("Idle"); }));
}
else
{
for (int i = 0; i * loopAsDouble < length; i++)
{
actions.Add(new(beat + i * loopAsDouble, delegate { doCrowdAnimation(animation, loopAsDouble, beat); }));
}
} }
actions.Add(new(beat + length, delegate { crowdCanCheerAnimation = true; })); actions.Add(new(beat + length, delegate { crowdCanCheerAnimation = true; }));
actions.Add(new(beat + length, delegate { CrowdAnim.DoScaledAnimationAsync("Idle"); }));
BeatAction.New(this, actions); BeatAction.New(this, actions);
} }
public void doCrowdAnimation(int animation, double loop, double beat)
{
var crowdAnimation= Enum.GetName(typeof(CrowdAnimationList), animation);
if (!crowdIsCheering && ((crowdLastMissAnimation + 2) < conductor.songPositionInBeatsAsDouble) && animation == 1)
{
CrowdAnim.DoScaledAnimationAsync($"{crowdAnimation}", 0.5f);
}
if (animation == 5)
{
jumpHeight = Math.Min((float)loop, 2f);
jumpLength = (float)loop;
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate { startJumpTime = conductor.songPositionInBeatsAsDouble; }),
});
}
if (animation != 1 && animation != 5)
{
CrowdAnim.DoScaledAnimationAsync($"{crowdAnimation}", 0.5f);
}
}
public void crowdJumpAnimation()
{
float jumpPos = Conductor.instance.GetPositionFromBeat(startJumpTime, jumpLength);
if (jumpPos >= 0 && jumpPos <= 1f)
{
float yMul = jumpPos * 2f - 1f;
float yWeight = -(yMul * yMul) + 1f;
CrowdPos.transform.localPosition = new Vector3(0, jumpHeight * yWeight, -2);
}
}
public void crowdAnimReset() public void crowdAnimReset()
{ {
if (crowdIsCheering) if (crowdIsCheering)
@ -896,6 +951,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
} }
} }
@ -909,6 +965,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
} }
} }
@ -935,6 +992,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
} }
@ -954,6 +1012,7 @@ namespace HeavenStudio.Games
{ {
CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f); CrowdAnim.DoScaledAnimationAsync("Angry", 0.5f);
crowdIsCheering = false; crowdIsCheering = false;
crowdLastMissAnimation = conductor.songPositionInBeatsAsDouble;
} }
} }
@ -1011,6 +1070,11 @@ namespace HeavenStudio.Games
} }
} }
public void LateUpdate()
{
crowdJumpAnimation();
}
public override void OnGameSwitch(double beat) public override void OnGameSwitch(double beat)
{ {
foreach(var entity in GameManager.instance.Beatmap.Entities) foreach(var entity in GameManager.instance.Beatmap.Entities)