General Fixes (#355)

* Somen Anims

* Icon Updates

* Slurp implemented

* Somen man now resets pose

* Spaceball is no longer too hd

* Spaceball bat fix

Fixed the position of the bat grip thing on air batter's idle

* Mage's upscale downscales

Note to self, do the pure downscale assets later

* Launch party bg upscale

forgot this one oops

* i forgor

changed ct2 bg from 2048 to 4096

* blue bear icon update. again.

help

---------

Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
This commit is contained in:
Seanski2 2023-03-20 18:20:34 -04:00 committed by GitHub
parent 77bfcfd3af
commit f1193bc6f3
23 changed files with 4004 additions and 1644 deletions

View File

@ -1330,6 +1330,7 @@ MonoBehaviour:
side: 0
barelyStart: 0
smile: 0
endSmile: 0
--- !u!95 &5454801828579266373
Animator:
serializedVersion: 3
@ -2816,6 +2817,7 @@ MonoBehaviour:
side: 0
barelyStart: 0
smile: 0
endSmile: 0
--- !u!95 &3687550532664276802
Animator:
serializedVersion: 3

View File

@ -112,7 +112,7 @@ Transform:
m_LocalScale: {x: 0.7296611, y: 0.7296611, z: 0.7296611}
m_Children: []
m_Father: {fileID: 2971715632653662141}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2481945916288395445
SpriteRenderer:
@ -540,7 +540,9 @@ Transform:
- {fileID: 8256350371370525118}
- {fileID: 4706686924426451117}
- {fileID: 3503673888879448189}
- {fileID: 5504364923579813032}
- {fileID: 5525442084705661400}
- {fileID: 5128961155538993370}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -563,6 +565,7 @@ MonoBehaviour:
splashEffect: {fileID: 3866088585294322855}
SomenPlayer: {fileID: 323788742195671692}
FrontArm: {fileID: 3890080847787247684}
backArm: {fileID: 4687640614165171169}
EffectHit: {fileID: 6703502151247883834}
EffectSweat: {fileID: 6947764285683485820}
EffectExclam: {fileID: 7263555389992937979}
@ -924,10 +927,9 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5128961155538993370}
m_Children: []
m_Father: {fileID: 1287756911582440882}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3443786574588438841
GameObject:
@ -1177,7 +1179,7 @@ Transform:
m_LocalScale: {x: 0.7296611, y: 0.7296611, z: 0.7296611}
m_Children: []
m_Father: {fileID: 2971715632653662141}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &829886669413092963
SpriteRenderer:
@ -1361,7 +1363,7 @@ Transform:
m_LocalScale: {x: 0.69996256, y: 0.69996256, z: 0.69996256}
m_Children: []
m_Father: {fileID: 2971715632653662141}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4341484254549224107
SpriteRenderer:
@ -1544,7 +1546,7 @@ Transform:
m_LocalScale: {x: 0.6774433, y: 0.6774433, z: 0.6774433}
m_Children: []
m_Father: {fileID: 2971715632653662141}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &890049657958585311
SpriteRenderer:
@ -1913,7 +1915,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5128961155538993370
Transform:
m_ObjectHideFlags: 0
@ -1925,8 +1927,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5525442084705661400}
m_RootOrder: 0
m_Father: {fileID: 1287756911582440882}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5971823856947114331
SpriteRenderer:
@ -2339,6 +2341,7 @@ Transform:
m_Children:
- {fileID: 111014669246158309}
- {fileID: 5703036087710906264}
- {fileID: 80301234266204684}
m_Father: {fileID: 1287756911582440882}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2442,7 +2445,6 @@ Transform:
m_Children:
- {fileID: 5437558850834214795}
- {fileID: 8993234263551288871}
- {fileID: 5504364923579813032}
- {fileID: 8735740002661005549}
- {fileID: 1215025143497935837}
- {fileID: 1242501341348014810}
@ -2469,6 +2471,88 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &8355165124040153163
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 80301234266204684}
- component: {fileID: 6987688048039209493}
m_Layer: 0
m_Name: noodleslurp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &80301234266204684
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8355165124040153163}
m_LocalRotation: {x: -0, y: -0, z: -0.028567065, w: 0.9995919}
m_LocalPosition: {x: 1.1580418, y: 3.579221, z: 0}
m_LocalScale: {x: 1.4761381, y: 1.4761381, z: 1.4761382}
m_Children: []
m_Father: {fileID: 3519712899751123359}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6987688048039209493
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8355165124040153163}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -15
m_Sprite: {fileID: 7090541522732950593, guid: b85c717e9ccd6e84f822edb98b70a0bd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.39, y: 0.9}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &8443148179856448950
GameObject:
m_ObjectHideFlags: 0
@ -7455,6 +7539,7 @@ GameObject:
m_Component:
- component: {fileID: 5504364923579813032}
- component: {fileID: 4491862472314829315}
- component: {fileID: 4687640614165171169}
m_Layer: 0
m_Name: BackArm
m_TagString: Untagged
@ -7470,11 +7555,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8969573239940161862}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -7.782632, y: -0.9738698, z: -6.670783}
m_LocalPosition: {x: -7.348, y: -7.153, z: 0}
m_LocalScale: {x: 0.6791434, y: 0.6791434, z: 0.6791434}
m_Children: []
m_Father: {fileID: 2971715632653662141}
m_RootOrder: 2
m_Father: {fileID: 1287756911582440882}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4491862472314829315
SpriteRenderer:
@ -7527,3 +7612,22 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &4687640614165171169
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8969573239940161862}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: c954b426f1ceaaa419309bec48429bae, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0

View File

@ -94,7 +94,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 800
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -113,7 +113,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -125,7 +125,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -142,16 +142,16 @@ TextureImporter:
name: wall_left
rect:
serializedVersion: 2
x: 1
y: 305
width: 173
height: 206
x: 8
y: 2440
width: 1384
height: 1648
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: fdffec3fbd3ef14d0800000000000000
internalID: -3161557879563026465
@ -163,16 +163,16 @@ TextureImporter:
name: railing
rect:
serializedVersion: 2
x: 8
y: 95
width: 163
height: 186
x: 64
y: 760
width: 1304
height: 1488
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 15c587d5e5c8a10a0800000000000000
internalID: -6910056341323621295
@ -184,16 +184,16 @@ TextureImporter:
name: wall_right
rect:
serializedVersion: 2
x: 186
y: 92
width: 171
height: 202
x: 1488
y: 736
width: 1368
height: 1616
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 9ba93325fd8876380800000000000000
internalID: -8978056839401596231
@ -205,16 +205,16 @@ TextureImporter:
name: background
rect:
serializedVersion: 2
x: 328
y: 414
width: 178
height: 93
x: 2624
y: 3312
width: 1424
height: 744
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 757d3bb8df1cce420800000000000000
internalID: 2660714774583826263
@ -226,16 +226,16 @@ TextureImporter:
name: step_01_rot_4
rect:
serializedVersion: 2
x: 437
y: 239
width: 70
height: 77
x: 3496
y: 1912
width: 560
height: 616
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 8021dc0e1e08ee250800000000000000
internalID: 5975855463194759688
@ -247,16 +247,16 @@ TextureImporter:
name: step_01_rot_5
rect:
serializedVersion: 2
x: 375
y: 238
width: 51
height: 77
x: 3000
y: 1904
width: 408
height: 616
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 7c03e70ce393e9060800000000000000
internalID: 6962065015641616583
@ -268,16 +268,16 @@ TextureImporter:
name: bush1
rect:
serializedVersion: 2
x: 433
y: 149
width: 69
height: 78
x: 3464
y: 1192
width: 552
height: 624
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: bd7ec356812be98e0800000000000000
internalID: -1684713392742537253
@ -289,16 +289,16 @@ TextureImporter:
name: bush2
rect:
serializedVersion: 2
x: 447
y: 61
width: 53
height: 62
x: 3576
y: 488
width: 424
height: 496
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: b36d4ad8372ff0a20800000000000000
internalID: 3030907652355184187
@ -310,16 +310,16 @@ TextureImporter:
name: bush3
rect:
serializedVersion: 2
x: 374
y: 150
width: 43
height: 47
x: 2992
y: 1200
width: 344
height: 376
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 90955317fa9e025d0800000000000000
internalID: -3089212404648290039
@ -331,16 +331,16 @@ TextureImporter:
name: bush4
rect:
serializedVersion: 2
x: 471
y: 326
width: 28
height: 32
x: 3768
y: 2608
width: 224
height: 256
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 9079541b04f5c0160800000000000000
internalID: 6993069052856211209
@ -352,16 +352,16 @@ TextureImporter:
name: step_01_rot_10
rect:
serializedVersion: 2
x: 3
y: 32
width: 222
height: 49
x: 24
y: 256
width: 1776
height: 392
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: d70fe46d0d0b3d330800000000000000
internalID: 3734522927015456893
@ -373,16 +373,16 @@ TextureImporter:
name: step_01_rot_11
rect:
serializedVersion: 2
x: 178
y: 319
width: 183
height: 74
x: 1424
y: 2552
width: 1464
height: 592
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 0e108d36884b69100800000000000000
internalID: 114477338428178912
@ -394,16 +394,16 @@ TextureImporter:
name: step_01_rot_12
rect:
serializedVersion: 2
x: 181
y: 403
width: 126
height: 55
x: 1448
y: 3224
width: 1008
height: 440
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 6404d8934057da670800000000000000
internalID: 8551619928452317254
@ -415,16 +415,16 @@ TextureImporter:
name: step_01_rot_13
rect:
serializedVersion: 2
x: 180
y: 469
width: 100
height: 38
x: 1440
y: 3752
width: 800
height: 304
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: f3a6ad29ff85acce0800000000000000
internalID: -1384196080759313857
@ -436,16 +436,16 @@ TextureImporter:
name: step_01_rot_14
rect:
serializedVersion: 2
x: 373
y: 361
width: 28
height: 39
x: 2984
y: 2888
width: 224
height: 312
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 9acdaf0a3b2a64890800000000000000
internalID: -7474107639191118679
@ -457,16 +457,16 @@ TextureImporter:
name: step_01_rot_15
rect:
serializedVersion: 2
x: 416
y: 344
width: 38
height: 56
x: 3328
y: 2752
width: 304
height: 448
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: e5cf963e7844e1700800000000000000
internalID: 512922757993462878

View File

@ -79,7 +79,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 81.92
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -98,7 +98,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -110,7 +110,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -140,15 +140,15 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
y: 2650
width: 1859
height: 2350
y: 2170.88
width: 1522.8928
height: 1925.12
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 1665c53d4488ef080800000000000000
internalID: -9151727563585071519
@ -160,16 +160,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_1
rect:
serializedVersion: 2
x: 2230
y: 3729
width: 813
height: 1206
x: 1826.8159
y: 3054.7966
width: 666.0096
height: 987.9552
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 337820a14164e20c0800000000000000
internalID: -4598661117349034189
@ -181,16 +181,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_2
rect:
serializedVersion: 2
x: 3302
y: 4332
width: 1340
height: 564
x: 2704.9983
y: 3548.7744
width: 1097.728
height: 462.02878
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: d5190852c8cbf8ce0800000000000000
internalID: -1400693648978308771
@ -202,16 +202,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_3
rect:
serializedVersion: 2
x: 4760
y: 2650
width: 240
height: 2350
x: 3899.3918
y: 2170.88
width: 196.608
height: 1925.12
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: a4fe2f4b719107210800000000000000
internalID: 1328589479685058378
@ -223,16 +223,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_4
rect:
serializedVersion: 2
x: 3722
y: 3603
width: 908
height: 304
x: 3049.0623
y: 2951.5776
width: 743.83356
height: 249.03679
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: fafae9b5ed80360e0800000000000000
internalID: -2277967235406450769
@ -244,16 +244,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_5
rect:
serializedVersion: 2
x: 1801
y: 1176
width: 549
height: 1779
x: 1475.3792
y: 963.37915
width: 449.74078
height: 1457.3568
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 595391f46ec960770800000000000000
internalID: 8576715053357151637
@ -265,16 +265,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_6
rect:
serializedVersion: 2
x: 3441
y: 2943
width: 1189
height: 481
x: 2818.8672
y: 2410.9055
width: 974.02875
height: 394.0352
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: c384869f600ca0490800000000000000
internalID: -7779194270142412740
@ -287,15 +287,15 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
y: 373
width: 1566
height: 2053
y: 305.56158
width: 1282.8672
height: 1681.8175
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 38728ee471644b220800000000000000
internalID: 2500700759019497347
@ -307,16 +307,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_8
rect:
serializedVersion: 2
x: 2916
y: 2138
width: 1716
height: 632
x: 2388.787
y: 1751.4496
width: 1405.7472
height: 517.7344
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 6e8f71a8427621010800000000000000
internalID: 1158101460820949222
@ -328,16 +328,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_9
rect:
serializedVersion: 2
x: 2531
y: 1503
width: 2106
height: 432
x: 2073.3953
y: 1231.2576
width: 1725.2351
height: 353.89438
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 6d4e22afb5e189da0800000000000000
internalID: -5937962728300550954
@ -349,16 +349,16 @@ TextureImporter:
name: Catchy_Tune_-_Long_Version_Background_10
rect:
serializedVersion: 2
x: 2909
y: 1063
width: 2091
height: 242
x: 2383.0527
y: 870.8096
width: 1712.9471
height: 198.2464
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 5258687c2fc1cf930800000000000000
internalID: 4178246383348122917

View File

@ -187,7 +187,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 317.3828
spritePixelsToUnits: 200
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -247,10 +247,10 @@ TextureImporter:
name: sargeBody
rect:
serializedVersion: 2
x: 5789.0625
y: 50.78125
width: 660.15625
height: 1269.5312
x: 3648
y: 32
width: 416
height: 800
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -268,10 +268,10 @@ TextureImporter:
name: sargeHeadNormal
rect:
serializedVersion: 2
x: 5738.2812
y: 1421.875
width: 710.9375
height: 660.15625
x: 3616
y: 896
width: 448
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -289,10 +289,10 @@ TextureImporter:
name: sargeHeadTalk
rect:
serializedVersion: 2
x: 5738.2812
y: 3757.8125
width: 710.9375
height: 710.9375
x: 3616
y: 2368
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -310,10 +310,10 @@ TextureImporter:
name: sargeHeadAngry
rect:
serializedVersion: 2
x: 5738.2812
y: 2183.5938
width: 710.9375
height: 660.15625
x: 3616
y: 1376
width: 448
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -331,10 +331,10 @@ TextureImporter:
name: sargeHeadIrritate
rect:
serializedVersion: 2
x: 5738.2812
y: 2945.3125
width: 710.9375
height: 710.9375
x: 3616
y: 1856
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -352,10 +352,10 @@ TextureImporter:
name: steam0
rect:
serializedVersion: 2
x: 1675.7812
y: 2945.3125
width: 710.9375
height: 710.9375
x: 1056
y: 1856
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -373,10 +373,10 @@ TextureImporter:
name: steam1
rect:
serializedVersion: 2
x: 50.78125
y: 3751.4648
width: 710.9375
height: 710.9375
x: 32
y: 2364
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -394,10 +394,10 @@ TextureImporter:
name: steam2
rect:
serializedVersion: 2
x: 863.28125
y: 3757.8125
width: 710.9375
height: 710.9375
x: 544
y: 2368
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -415,10 +415,10 @@ TextureImporter:
name: steam3
rect:
serializedVersion: 2
x: 1675.7812
y: 3757.8125
width: 710.9375
height: 710.9375
x: 1056
y: 2368
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -436,10 +436,10 @@ TextureImporter:
name: steam4
rect:
serializedVersion: 2
x: 50.78125
y: 2945.3125
width: 710.9375
height: 710.9375
x: 32
y: 1856
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -457,10 +457,10 @@ TextureImporter:
name: steam5
rect:
serializedVersion: 2
x: 863.28125
y: 2945.3125
width: 710.9375
height: 710.9375
x: 544
y: 1856
width: 448
height: 448
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -478,10 +478,10 @@ TextureImporter:
name: torsoNormal
rect:
serializedVersion: 2
x: 50.78125
y: 50.78125
width: 406.25
height: 609.375
x: 32
y: 32
width: 256
height: 384
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -499,10 +499,10 @@ TextureImporter:
name: torsoRaiseUp
rect:
serializedVersion: 2
x: 558.59375
y: 50.78125
width: 406.25
height: 609.375
x: 352
y: 32
width: 256
height: 384
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -520,10 +520,10 @@ TextureImporter:
name: torsoPoint
rect:
serializedVersion: 2
x: 1066.4062
y: 50.78125
width: 406.25
height: 609.375
x: 672
y: 32
width: 256
height: 384
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -541,10 +541,10 @@ TextureImporter:
name: cadetLegNormal
rect:
serializedVersion: 2
x: 50.78125
y: 761.71875
width: 304.6875
height: 660.15625
x: 32
y: 480
width: 192
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -562,10 +562,10 @@ TextureImporter:
name: cadetLegRaiseUp0
rect:
serializedVersion: 2
x: 457.03125
y: 761.71875
width: 304.6875
height: 660.15625
x: 288
y: 480
width: 192
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -583,10 +583,10 @@ TextureImporter:
name: cadetLegRaiseUp1
rect:
serializedVersion: 2
x: 863.28125
y: 761.71875
width: 304.6875
height: 609.375
x: 544
y: 480
width: 192
height: 384
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -604,10 +604,10 @@ TextureImporter:
name: cadetLegRaiseUp2
rect:
serializedVersion: 2
x: 1269.5312
y: 761.71875
width: 355.46875
height: 558.59375
x: 800
y: 480
width: 224
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -625,10 +625,10 @@ TextureImporter:
name: cadetLegRaiseUp3
rect:
serializedVersion: 2
x: 1726.5625
y: 761.71875
width: 406.25
height: 507.8125
x: 1088
y: 480
width: 256
height: 320
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -646,10 +646,10 @@ TextureImporter:
name: cadetLegRaiseUp4
rect:
serializedVersion: 2
x: 2234.375
y: 761.71875
width: 406.25
height: 457.03125
x: 1408
y: 480
width: 256
height: 288
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -667,10 +667,10 @@ TextureImporter:
name: cadetLegBeat2
rect:
serializedVersion: 2
x: 2742.1875
y: 761.71875
width: 406.25
height: 660.15625
x: 1728
y: 480
width: 256
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -688,10 +688,10 @@ TextureImporter:
name: cadetLegBeat1
rect:
serializedVersion: 2
x: 3250
y: 761.71875
width: 406.25
height: 660.15625
x: 2048
y: 480
width: 256
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -709,10 +709,10 @@ TextureImporter:
name: cadetLegBeat0
rect:
serializedVersion: 2
x: 3757.8125
y: 761.71875
width: 406.25
height: 660.15625
x: 2368
y: 480
width: 256
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -730,10 +730,10 @@ TextureImporter:
name: cadetLegBeat3
rect:
serializedVersion: 2
x: 4265.625
y: 761.71875
width: 406.25
height: 761.71875
x: 2688
y: 480
width: 256
height: 480
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -751,10 +751,10 @@ TextureImporter:
name: cadetArmNormal
rect:
serializedVersion: 2
x: 53.95508
y: 1523.4375
width: 304.6875
height: 660.15625
x: 34
y: 960
width: 192
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -772,10 +772,10 @@ TextureImporter:
name: cadetArmRaiseUpA0
rect:
serializedVersion: 2
x: 457.03125
y: 1675.7812
width: 304.6875
height: 507.8125
x: 288
y: 1056
width: 192
height: 320
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -793,10 +793,10 @@ TextureImporter:
name: cadetArrmRaiseUpA1
rect:
serializedVersion: 2
x: 863.28125
y: 1675.7812
width: 406.25
height: 355.46875
x: 544
y: 1056
width: 256
height: 224
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -814,10 +814,10 @@ TextureImporter:
name: cadetNeck
rect:
serializedVersion: 2
x: 1371.0938
y: 1523.4375
width: 203.125
height: 203.125
x: 864
y: 960
width: 128
height: 128
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -835,10 +835,10 @@ TextureImporter:
name: cadetArmRaiseUpB
rect:
serializedVersion: 2
x: 1675.7812
y: 1523.4375
width: 304.6875
height: 304.6875
x: 1056
y: 960
width: 192
height: 192
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -856,10 +856,10 @@ TextureImporter:
name: cadetArmRaiseUpC
rect:
serializedVersion: 2
x: 2082.0312
y: 1523.4375
width: 304.6875
height: 304.6875
x: 1312
y: 960
width: 192
height: 192
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -877,10 +877,10 @@ TextureImporter:
name: cadetArmPointA2
rect:
serializedVersion: 2
x: 2488.2812
y: 1929.6875
width: 507.8125
height: 253.90625
x: 1568
y: 1216
width: 320
height: 160
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -898,10 +898,10 @@ TextureImporter:
name: cadetArmPointA3
rect:
serializedVersion: 2
x: 2488.2812
y: 1523.4375
width: 406.25
height: 304.6875
x: 1568
y: 960
width: 256
height: 192
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -919,10 +919,10 @@ TextureImporter:
name: cadetArmPointC
rect:
serializedVersion: 2
x: 2996.0938
y: 1523.4375
width: 304.6875
height: 304.6875
x: 1888
y: 960
width: 192
height: 192
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -940,10 +940,10 @@ TextureImporter:
name: cadetArmPointB
rect:
serializedVersion: 2
x: 3402.3438
y: 1523.4375
width: 304.6875
height: 304.6875
x: 2144
y: 960
width: 192
height: 192
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -961,10 +961,10 @@ TextureImporter:
name: cadetArmPointA0
rect:
serializedVersion: 2
x: 3808.5938
y: 1523.4375
width: 304.6875
height: 406.25
x: 2400
y: 960
width: 192
height: 256
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -982,10 +982,10 @@ TextureImporter:
name: cadetArmClapA
rect:
serializedVersion: 2
x: 4214.8438
y: 1625
width: 253.90625
height: 304.6875
x: 2656
y: 1024
width: 160
height: 192
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1003,10 +1003,10 @@ TextureImporter:
name: cadetArmClapB
rect:
serializedVersion: 2
x: 4570.3125
y: 1625
width: 304.6875
height: 355.46875
x: 2880
y: 1024
width: 192
height: 224
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1024,10 +1024,10 @@ TextureImporter:
name: legPointA
rect:
serializedVersion: 2
x: 2488.2812
y: 2945.3125
width: 457.03125
height: 609.375
x: 1568
y: 1856
width: 288
height: 384
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1045,10 +1045,10 @@ TextureImporter:
name: legPointB
rect:
serializedVersion: 2
x: 3046.875
y: 2945.3125
width: 304.6875
height: 660.15625
x: 1920
y: 1856
width: 192
height: 416
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1066,10 +1066,10 @@ TextureImporter:
name: shadow
rect:
serializedVersion: 2
x: 3453.125
y: 2945.3125
width: 761.71875
height: 253.90625
x: 2176
y: 1856
width: 480
height: 160
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1087,10 +1087,10 @@ TextureImporter:
name: cadetHeadLeft2
rect:
serializedVersion: 2
x: 50.78125
y: 2285.1562
width: 660.15625
height: 558.59375
x: 32
y: 1440
width: 416
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1108,10 +1108,10 @@ TextureImporter:
name: cadetHeadLeft1
rect:
serializedVersion: 2
x: 3960.9375
y: 2285.1562
width: 660.15625
height: 558.59375
x: 2496
y: 1440
width: 416
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1129,10 +1129,10 @@ TextureImporter:
name: cadetHeadLeft0
rect:
serializedVersion: 2
x: 812.5
y: 2285.1562
width: 660.15625
height: 558.59375
x: 512
y: 1440
width: 416
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1150,10 +1150,10 @@ TextureImporter:
name: cadetHeadNormal
rect:
serializedVersion: 2
x: 1574.2188
y: 2285.1562
width: 761.71875
height: 558.59375
x: 992
y: 1440
width: 480
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1171,10 +1171,10 @@ TextureImporter:
name: cadetHeadRight0
rect:
serializedVersion: 2
x: 2437.5
y: 2285.1562
width: 660.15625
height: 558.59375
x: 1536
y: 1440
width: 416
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1192,10 +1192,10 @@ TextureImporter:
name: cadetHeadRight1
rect:
serializedVersion: 2
x: 4722.6562
y: 2285.1562
width: 660.15625
height: 558.59375
x: 2976
y: 1440
width: 416
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1213,10 +1213,10 @@ TextureImporter:
name: cadetHeadRight2
rect:
serializedVersion: 2
x: 3199.2188
y: 2285.1562
width: 660.15625
height: 558.59375
x: 2016
y: 1440
width: 416
height: 352
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}

View File

@ -46,7 +46,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 81.92
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -13,7 +13,32 @@ AnimationClip:
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: -3.274}
inSlope: {x: 0, y: 0, z: 0}
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}
- serializedVersion: 3
time: 0.21666667
value: {x: 0, y: 0, z: -3.274}
inSlope: {x: 0, y: 0, z: 0}
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: noodleslurp
m_PositionCurves:
- curve:
serializedVersion: 2
@ -67,6 +92,31 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.75, y: 2.9, z: 0}
inSlope: {x: 0, y: 0, z: 0}
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}
- serializedVersion: 3
time: 0.21666667
value: {x: 1.1580418, y: 3.579221, z: 0}
inSlope: {x: 0, y: 0, z: 0}
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: noodleslurp
m_ScaleCurves: []
m_FloatCurves:
- curve:
@ -107,6 +157,34 @@ AnimationClip:
path: woosh
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.21666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: noodleslurp
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@ -137,6 +215,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1512642868
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2883240411
attribute: 2086281974
@ -151,6 +236,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1512642868
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@ -158,6 +250,13 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 1512642868
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 4759820726130029815, guid: b85c717e9ccd6e84f822edb98b70a0bd, type: 3}
- {fileID: 6971618357792909585, guid: b85c717e9ccd6e84f822edb98b70a0bd, type: 3}
@ -388,7 +487,233 @@ AnimationClip:
path: woosh
classID: 1
script: {fileID: 0}
m_EulerEditorCurves: []
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.75
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 1.1580418
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: noodleslurp
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2.9
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 3.579221
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: noodleslurp
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: noodleslurp
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.21666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: noodleslurp
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: noodleslurp
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: noodleslurp
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.274
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: -3.274
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: noodleslurp
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: noodleslurp
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: noodleslurp
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: noodleslurp
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -0,0 +1,101 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-1796363019479411598
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BackArmNothing
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: fac9aebf7d9571a429423f9891e792d8, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-463848508615823169
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: -1796363019479411598}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 5141675491192459810}
m_Position: {x: 235, y: 65, 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: -1796363019479411598}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BackArm
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -463848508615823169}
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 &5141675491192459810
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BackArmLift
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: fa1c0ace814aeba49ad3d5b770cffabc, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

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

View File

@ -0,0 +1,148 @@
%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: BackArmLift
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -7.23, y: -6.59, z: 0}
inSlope: {x: 0, y: 0, z: 0}
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:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -6208428328633203412, guid: b85c717e9ccd6e84f822edb98b70a0bd, type: 3}
attribute: m_Sprite
path:
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: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: -6208428328633203412, guid: b85c717e9ccd6e84f822edb98b70a0bd, 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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -7.23
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -6.59
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
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}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

View File

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

View File

@ -0,0 +1,53 @@
%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: BackArmNothing
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: 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: []

View File

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

View File

@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-5620979861437552813
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ArmSlurp
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: a557001731426e946871b6dbef0654ff, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-5382498480314571452
AnimatorStateMachine:
serializedVersion: 6
@ -21,6 +47,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 7986906781981003602}
m_Position: {x: 305, y: 195, z: 0}
- serializedVersion: 1
m_State: {fileID: -5620979861437552813}
m_Position: {x: 340, y: 260, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

View File

@ -68,6 +68,24 @@ TextureImporter:
- first:
213: -3836040944532565682
second: shock
- first:
213: -6734121049520657110
second: arm6
- first:
213: 8183284956366725300
second: arm7
- first:
213: 7090541522732950593
second: noodleslurp
- first:
213: -4249224250603463877
second: arm9
- first:
213: -4590715547382143413
second: arm8
- first:
213: -6208428328633203412
second: arm10
externalObjects: {}
serializedVersion: 11
mipmaps:
@ -165,7 +183,7 @@ TextureImporter:
width: 468
height: 567
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: []
@ -186,7 +204,7 @@ TextureImporter:
width: 346
height: 749
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: []
@ -207,7 +225,7 @@ TextureImporter:
width: 51
height: 87
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: []
@ -228,7 +246,7 @@ TextureImporter:
width: 254
height: 226
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: []
@ -249,7 +267,7 @@ TextureImporter:
width: 139
height: 686
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: []
@ -270,7 +288,7 @@ TextureImporter:
width: 2184
height: 122
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: []
@ -291,7 +309,7 @@ TextureImporter:
width: 806
height: 56
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: []
@ -312,7 +330,7 @@ TextureImporter:
width: 402
height: 582
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: []
@ -333,7 +351,7 @@ TextureImporter:
width: 95
height: 272
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: []
@ -354,7 +372,7 @@ TextureImporter:
width: 36
height: 277
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: []
@ -375,7 +393,7 @@ TextureImporter:
width: 189
height: 402
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: []
@ -396,7 +414,7 @@ TextureImporter:
width: 203
height: 404
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: []
@ -417,7 +435,7 @@ TextureImporter:
width: 108
height: 68
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: []
@ -438,7 +456,7 @@ TextureImporter:
width: 115
height: 76
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: []
@ -459,7 +477,7 @@ TextureImporter:
width: 582
height: 542
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: []
@ -480,7 +498,7 @@ TextureImporter:
width: 534
height: 454
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: []
@ -501,7 +519,7 @@ TextureImporter:
width: 558
height: 455
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: []
@ -522,7 +540,7 @@ TextureImporter:
width: 637
height: 448
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: []
@ -543,7 +561,7 @@ TextureImporter:
width: 691
height: 430
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: []
@ -564,7 +582,7 @@ TextureImporter:
width: 718
height: 424
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: []
@ -580,12 +598,12 @@ TextureImporter:
name: exclam
rect:
serializedVersion: 2
x: 1402
y: 3206
width: 95
height: 232
x: 1378
y: 3188
width: 158
height: 262
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: []
@ -606,7 +624,7 @@ TextureImporter:
width: 218
height: 245
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: []
@ -618,6 +636,132 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: arm6
rect:
serializedVersion: 2
x: 78
y: 861
width: 471
height: 449
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a2d27d895989b82a0800000000000000
internalID: -6734121049520657110
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: arm7
rect:
serializedVersion: 2
x: 712
y: 888
width: 438
height: 464
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 4b069089f4ed09170800000000000000
internalID: 8183284956366725300
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: noodleslurp
rect:
serializedVersion: 2
x: 2539
y: 1314
width: 139
height: 90
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 144a7a792f9a66260800000000000000
internalID: 7090541522732950593
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: arm9
rect:
serializedVersion: 2
x: 1976
y: 852
width: 431
height: 459
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b3b1ec3be09b705c0800000000000000
internalID: -4249224250603463877
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: arm8
rect:
serializedVersion: 2
x: 1346
y: 891
width: 486
height: 516
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b46ac6548808a40c0800000000000000
internalID: -4590715547382143413
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: arm10
rect:
serializedVersion: 2
x: 2097
y: 1553
width: 616
height: 470
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c25885a245b37d9a0800000000000000
internalID: -6208428328633203412
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []

View File

@ -142,7 +142,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 39.984295
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -215,15 +215,15 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
y: 7419
width: 1470
height: 1746
y: 2966.435
width: 587.76917
height: 698.12604
alignment: 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: ce999548263e12df0800000000000000
internalID: -206634095615567380
@ -235,16 +235,16 @@ TextureImporter:
name: spaceball_player_1
rect:
serializedVersion: 2
x: 1470
y: 7417
width: 1470
height: 1748
x: 587.76917
y: 2965.6355
width: 587.76917
height: 698.92554
alignment: 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: 73c9ea76718b45880800000000000000
internalID: -8623064975844402121
@ -256,16 +256,16 @@ TextureImporter:
name: spaceball_player_2
rect:
serializedVersion: 2
x: 2940
y: 7417
width: 1470
height: 1748
x: 1175.5383
y: 2965.6355
width: 587.76917
height: 698.92554
alignment: 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: 2c4889597c78c3630800000000000000
internalID: 3908147867928790210
@ -277,16 +277,16 @@ TextureImporter:
name: spaceball_player_3
rect:
serializedVersion: 2
x: 4410
y: 7417
width: 1470
height: 1748
x: 1763.3079
y: 2965.6355
width: 587.76917
height: 698.92554
alignment: 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: 45525068bc00f0ba0800000000000000
internalID: -6120672494446369452
@ -298,16 +298,16 @@ TextureImporter:
name: spaceball_player_4
rect:
serializedVersion: 2
x: 5880
y: 7417
width: 1658
height: 1748
x: 2351.0767
y: 2965.6355
width: 662.9397
height: 698.92554
alignment: 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: 8b5a5f56da6215870800000000000000
internalID: 8669753283846710712
@ -319,16 +319,16 @@ TextureImporter:
name: spaceball_dispenser_0
rect:
serializedVersion: 2
x: 3407
y: 5720
width: 409
height: 484
x: 1362.2649
y: 2287.1018
width: 163.5358
height: 193.52403
alignment: 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: f9153545c58335750800000000000000
internalID: 6292435073569608095
@ -340,16 +340,16 @@ TextureImporter:
name: spaceball_dispenser_1
rect:
serializedVersion: 2
x: 4022
y: 5721
width: 440
height: 366
x: 1608.1687
y: 2287.5017
width: 175.93091
height: 146.34256
alignment: 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: 3a4773bbffd913440800000000000000
internalID: 4913882390121116835
@ -361,16 +361,16 @@ TextureImporter:
name: spaceball_dispenser_2
rect:
serializedVersion: 2
x: 4631
y: 5720
width: 478
height: 484
x: 1851.6731
y: 2287.1018
width: 191.12495
height: 193.52403
alignment: 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: b6baf928263999020800000000000000
internalID: 2349070731958004587
@ -383,15 +383,15 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
y: 5708
width: 534
height: 534
y: 2282.3037
width: 213.51617
height: 213.51617
alignment: 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: 6349aca48ade19df0800000000000000
internalID: -175097603425659850
@ -403,16 +403,16 @@ TextureImporter:
name: spaceball_riceball
rect:
serializedVersion: 2
x: 685
y: 5708
width: 534
height: 534
x: 273.89243
y: 2282.3037
width: 213.51617
height: 213.51617
alignment: 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: 307b0a32c6ceb3940800000000000000
internalID: 5277071337593026307
@ -424,16 +424,16 @@ TextureImporter:
name: spaceball_room
rect:
serializedVersion: 2
x: 1287
x: 514.5979
y: 0
width: 5330
height: 5300
width: 2131.1628
height: 2119.1685
alignment: 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: a61498abf7915add0800000000000000
internalID: -2475544383789121174
@ -445,16 +445,16 @@ TextureImporter:
name: spaceball_hole
rect:
serializedVersion: 2
x: 5339
y: 5802
width: 981
height: 319
x: 2134.7622
y: 2319.8887
width: 392.24594
height: 127.54993
alignment: 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: 023deca07be5ecaa0800000000000000
internalID: -6138865101806054624
@ -466,16 +466,16 @@ TextureImporter:
name: spaceball_player_shadow
rect:
serializedVersion: 2
x: 6565
y: 5812
width: 292
height: 305
x: 2624.9692
y: 2323.8872
width: 116.754166
height: 121.952126
alignment: 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: 732b0f68bbc672590800000000000000
internalID: -7699065485287968201
@ -488,15 +488,15 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
y: 9165
width: 1470
height: 1077
y: 3664.561
width: 587.76917
height: 430.63092
alignment: 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: 56b9d457498625a80800000000000000
internalID: -8479600161552753819
@ -508,16 +508,16 @@ TextureImporter:
name: spaceball_bat_1
rect:
serializedVersion: 2
x: 1470
y: 9165
width: 1459
height: 1077
x: 587.76917
y: 3664.561
width: 583.3709
height: 430.63092
alignment: 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: ecdc9b7fa8b0023e0800000000000000
internalID: -2080650336355627570
@ -529,16 +529,16 @@ TextureImporter:
name: spaceball_bat_2
rect:
serializedVersion: 2
x: 2929
y: 9165
width: 1647
height: 1077
x: 1171.1403
y: 3664.561
width: 658.5414
height: 430.63092
alignment: 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: d912095e4706a22b0800000000000000
internalID: -5608564330752630371
@ -550,16 +550,16 @@ TextureImporter:
name: spaceball_bat_3
rect:
serializedVersion: 2
x: 4576
y: 9165
width: 1393
height: 1077
x: 1829.6818
y: 3664.561
width: 556.98114
height: 430.63092
alignment: 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: 40c591b1116186650800000000000000
internalID: 6226250747564612612
@ -571,16 +571,16 @@ TextureImporter:
name: spaceball_bat_4
rect:
serializedVersion: 2
x: 5969
y: 9165
width: 1569
height: 1077
x: 2386.6633
y: 3664.561
width: 627.35364
height: 430.63092
alignment: 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: f851d591863984970800000000000000
internalID: 8739397152223860111
@ -592,16 +592,16 @@ TextureImporter:
name: spaceball_umpire_0
rect:
serializedVersion: 2
x: 4200
y: 6477
width: 730
height: 624
x: 1679.3406
y: 2589.7832
width: 291.8854
height: 249.50203
alignment: 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: 1ecd59eb5778ab900800000000000000
internalID: 701021631787949281
@ -613,16 +613,16 @@ TextureImporter:
name: spaceball_umpire_1
rect:
serializedVersion: 2
x: 5029
y: 6477
width: 730
height: 624
x: 2010.8107
y: 2589.7832
width: 291.8854
height: 249.50203
alignment: 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: b3d8af5875a591180800000000000000
internalID: -9144178236442636997
@ -634,16 +634,16 @@ TextureImporter:
name: spaceball_umpire_2
rect:
serializedVersion: 2
x: 5858
y: 6477
width: 730
height: 624
x: 2342.2805
y: 2589.7832
width: 291.8854
height: 249.50203
alignment: 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: 33659eca17c03f270800000000000000
internalID: 8282977822036284979
@ -655,16 +655,16 @@ TextureImporter:
name: spaceball_umpire_3
rect:
serializedVersion: 2
x: 6691
y: 6478
width: 730
height: 624
x: 2675.3496
y: 2590.1829
width: 291.8854
height: 249.50203
alignment: 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: 0b6e573eaf57736d0800000000000000
internalID: -3010808105455458640
@ -676,16 +676,16 @@ TextureImporter:
name: spaceball_hat_0_0
rect:
serializedVersion: 2
x: 259
y: 6408
width: 373
height: 779
x: 103.55933
y: 2562.194
width: 149.14145
height: 311.47766
alignment: 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: 097a71c9b2f685ee0800000000000000
internalID: -1272144661639092336
@ -697,16 +697,16 @@ TextureImporter:
name: spaceball_hat_1_0
rect:
serializedVersion: 2
x: 863
y: 6561
width: 473
height: 474
x: 345.06458
y: 2623.37
width: 189.12573
height: 189.52559
alignment: 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: 49e04255390a69020800000000000000
internalID: 2348240810369355412
@ -718,16 +718,16 @@ TextureImporter:
name: spaceball_hat_1_1
rect:
serializedVersion: 2
x: 1510
y: 6561
width: 473
height: 474
x: 603.7629
y: 2623.37
width: 189.12573
height: 189.52559
alignment: 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: 76cfe965c9c6e2fe0800000000000000
internalID: -1211911830992126873
@ -739,16 +739,16 @@ TextureImporter:
name: spaceball_hat_1_2
rect:
serializedVersion: 2
x: 2167
y: 6561
width: 473
height: 474
x: 866.4598
y: 2623.37
width: 189.12573
height: 189.52559
alignment: 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: 75aeff9487b2be220800000000000000
internalID: 2516152612454132311
@ -760,16 +760,16 @@ TextureImporter:
name: spaceball_hat_1_3
rect:
serializedVersion: 2
x: 2802
y: 6561
width: 473
height: 474
x: 1120.3602
y: 2623.37
width: 189.12573
height: 189.52559
alignment: 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: 0044b2be087e40890800000000000000
internalID: -7492609339150351360
@ -781,16 +781,16 @@ TextureImporter:
name: spaceball_hat_1_4
rect:
serializedVersion: 2
x: 3432
y: 6561
width: 473
height: 474
x: 1372.2612
y: 2623.37
width: 189.12573
height: 189.52559
alignment: 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: 5d767d7cdeb601c80800000000000000
internalID: -8354058639768066091
@ -802,16 +802,16 @@ TextureImporter:
name: spaceball_umpire_shadow
rect:
serializedVersion: 2
x: 7080
y: 5897
width: 458
height: 183
x: 2830.8882
y: 2357.8743
width: 183.12811
height: 73.17128
alignment: 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: 74d1820eaf99f0390800000000000000
internalID: -7849886322701886137
@ -823,16 +823,16 @@ TextureImporter:
name: spaceball_dust_0
rect:
serializedVersion: 2
x: 2026
y: 5768
width: 308
height: 345
x: 810.08203
y: 2306.2944
width: 123.15165
height: 137.94586
alignment: 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: 34bc1a2bff55f7ec0800000000000000
internalID: -3567037823152174269
@ -844,16 +844,16 @@ TextureImporter:
name: spaceball_dust_1
rect:
serializedVersion: 2
x: 2493
y: 5772
width: 308
height: 345
x: 996.8087
y: 2307.8938
width: 123.15165
height: 137.94586
alignment: 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: e6182f32095581340800000000000000
internalID: 4834708277548974446
@ -865,16 +865,16 @@ TextureImporter:
name: spaceball_dust_2
rect:
serializedVersion: 2
x: 2946
y: 5772
width: 308
height: 345
x: 1177.9374
y: 2307.8938
width: 123.15165
height: 137.94586
alignment: 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: 8fc3a1ff9f3c11b90800000000000000
internalID: -7272816444732457736

View File

@ -46,7 +46,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 85.333336
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -31,6 +31,10 @@ namespace HeavenStudio.Games.Loaders
{
function = delegate { RhythmSomen.instance.DoBell(eventCaller.currentEntity.beat); },
},
new GameAction("slurp", "Slurp")
{
function = delegate { RhythmSomen.instance.Slurp(eventCaller.currentEntity.beat); }
},
new GameAction("bop", "Bop")
{
function = delegate { var e = eventCaller.currentEntity; RhythmSomen.instance.ToggleBop(e.beat, e.length, e["toggle2"], e["toggle"]); },
@ -54,6 +58,7 @@ namespace HeavenStudio.Games
[SerializeField] ParticleSystem splashEffect;
public Animator SomenPlayer;
public Animator FrontArm;
[SerializeField] Animator backArm;
public Animator EffectHit;
public Animator EffectSweat;
public Animator EffectExclam;
@ -62,6 +67,8 @@ namespace HeavenStudio.Games
public Animator FarCrane;
public GameObject Player;
private bool shouldBop = true;
private bool missed;
private bool hasSlurped;
public GameEvent bop = new GameEvent();
@ -86,11 +93,34 @@ namespace HeavenStudio.Games
{
Jukebox.PlayOneShotGame("rhythmSomen/somen_mistake");
FrontArm.Play("ArmPluck", -1, 0);
backArm.Play("BackArmNothing", 0, 0);
hasSlurped = false;
EffectSweat.Play("BlobSweating", -1, 0);
ScoreMiss();
}
}
public void Slurp(float beat)
{
if (!missed)
{
backArm.Play("BackArmLift", 0, 0);
FrontArm.DoScaledAnimationAsync("ArmSlurp", 0.5f);
hasSlurped = true;
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 1f, delegate
{
if (hasSlurped)
{
backArm.Play("BackArmNothing", 0, 0);
FrontArm.Play("ArmNothing", 0, 0);
}
})
});
}
}
public void ToggleBop(float beat, float length, bool bopOrNah, bool autoBop)
{
shouldBop = autoBop;
@ -185,22 +215,27 @@ namespace HeavenStudio.Games
public void CatchSuccess(PlayerActionEvent caller, float state)
{
backArm.Play("BackArmNothing", 0, 0);
hasSlurped = false;
splashEffect.Play();
if (state >= 1f || state <= -1f)
{
Jukebox.PlayOneShotGame("rhythmSomen/somen_splash");
FrontArm.Play("ArmPluckNG", -1, 0);
EffectSweat.Play("BlobSweating", -1, 0);
missed = true;
return;
}
Jukebox.PlayOneShotGame("rhythmSomen/somen_catch");
Jukebox.PlayOneShotGame("rhythmSomen/somen_catch_old", volume: 0.25f);
FrontArm.Play("ArmPluckOK", -1, 0);
EffectHit.Play("HitAppear", -1, 0);
missed = false;
}
public void CatchMiss(PlayerActionEvent caller)
{
missed = true;
EffectShock.Play("ShockAppear", -1, 0);
}