Highball added to Spaceball + event types added.
This commit is contained in:
Starpelly
parent
bd40c87b80
commit
23b897206b
|
|
@ -11,7 +11,10 @@ AnimatorStateMachine:
|
|||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 3473636476326518117}
|
||||
m_Position: {x: 200, y: 0, z: 0}
|
||||
m_Position: {x: 270, y: 190, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 6545529569560433763}
|
||||
m_Position: {x: 330, y: 100, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
|
|
@ -70,3 +73,29 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &6545529569560433763
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: BallHigh
|
||||
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: 713261c6f01b87848a426fd36209a2c9, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,588 @@
|
|||
%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: BallHigh
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: 0, y: 0, z: 68.401}
|
||||
inSlope: {x: 0, y: 0, z: -235.90063}
|
||||
outSlope: {x: 0, y: 0, z: -235.90063}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.08790741}
|
||||
- serializedVersion: 3
|
||||
time: 1.2333333
|
||||
value: {x: 0, y: 0, z: -227.969}
|
||||
inSlope: {x: 0, y: 0, z: -127.77611}
|
||||
outSlope: {x: 0, y: 0, z: -127.77611}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.08443604}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: BallHolder/SpriteRotHolder
|
||||
m_PositionCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: {x: -3.81, y: -1.77, z: 0}
|
||||
inSlope: {x: 0, y: 50.180645, z: 0}
|
||||
outSlope: {x: 4.2875676, y: 50.180645, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.17337073, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 0.6166667
|
||||
value: {x: -1.166, y: 11.959, z: 0}
|
||||
inSlope: {x: 4.2875676, y: -0.89189243, z: -0}
|
||||
outSlope: {x: 4.2908106, y: -0.89189243, 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: 1.2333333
|
||||
value: {x: 1.48, y: -3.6, z: 0}
|
||||
inSlope: {x: 4.2908106, y: -48.45791, z: -0}
|
||||
outSlope: {x: 0, y: -48.45791, z: 0}
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: {x: 0.33333334, y: 0.18418801, z: 0.33333334}
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
path: BallHolder
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- curve:
|
||||
- time: 0
|
||||
value: {fileID: 21300000, guid: 2cea76f67c644e34cb8387399d8162b4, type: 3}
|
||||
- time: 0.016666668
|
||||
value: {fileID: 21300000, guid: aba30dfb7f08f3d40a46a7537232403b, type: 3}
|
||||
- time: 0.033333335
|
||||
value: {fileID: 21300000, guid: 7c32b35e89afbed4897ebc603e02d7d8, type: 3}
|
||||
- time: 0.05
|
||||
value: {fileID: 21300000, guid: 23f618268fe68504ba58607e954d3c63, type: 3}
|
||||
- time: 0.06666667
|
||||
value: {fileID: 21300000, guid: 57d3954a2bd2e26419e8681020a328e6, type: 3}
|
||||
- time: 0.083333336
|
||||
value: {fileID: 21300000, guid: f4dc4c1ac0c4e2248931251544cf022c, type: 3}
|
||||
- time: 0.1
|
||||
value: {fileID: 21300000, guid: 826039a8faac9184399c1ac07383864a, type: 3}
|
||||
- time: 0.11666667
|
||||
value: {fileID: 21300000, guid: a528e5ebf65f1674fb423050f9ae1762, type: 3}
|
||||
- time: 0.13333334
|
||||
value: {fileID: 21300000, guid: 48bfdc094c20a9b4186b43ba45758210, type: 3}
|
||||
- time: 0.15
|
||||
value: {fileID: 21300000, guid: c92ff9cb30af54d468fbad2c767c6dab, type: 3}
|
||||
- time: 0.16666667
|
||||
value: {fileID: 21300000, guid: af57499ad35aa764cbf365222efab1b3, type: 3}
|
||||
- time: 0.18333334
|
||||
value: {fileID: 21300000, guid: 4cbee9bd590afe740bd475925cc64a4d, type: 3}
|
||||
- time: 0.2
|
||||
value: {fileID: 21300000, guid: cfb6267291f4f48438b20c6de4c338fc, type: 3}
|
||||
- time: 0.21666667
|
||||
value: {fileID: 21300000, guid: ef899cfeb6c62ca47a066a93c10f2f98, type: 3}
|
||||
- time: 0.23333333
|
||||
value: {fileID: 21300000, guid: f9e20e32f686b624aaa5965b9519fd61, type: 3}
|
||||
- time: 0.25
|
||||
value: {fileID: 21300000, guid: 870cac70acc46ec4290d0d286d13e619, type: 3}
|
||||
- time: 0.26666668
|
||||
value: {fileID: 21300000, guid: 41b7e32e7dcb2e544a84a224ecc778f2, type: 3}
|
||||
- time: 0.28333333
|
||||
value: {fileID: 21300000, guid: 2c777ead5a2b4404288ae1d586887f03, type: 3}
|
||||
- time: 0.3
|
||||
value: {fileID: 21300000, guid: b1a494a3821b4154b8fe8d6fcb5f0c8c, type: 3}
|
||||
- time: 0.31666666
|
||||
value: {fileID: 21300000, guid: 7919c9c8c0e4c4a4ea222f4196cd3785, type: 3}
|
||||
- time: 0.33333334
|
||||
value: {fileID: 21300000, guid: 88a483ad1d2af214eaa26aed89a3606c, type: 3}
|
||||
- time: 0.35
|
||||
value: {fileID: 21300000, guid: 42dc0861714f7c043906da378998270f, type: 3}
|
||||
- time: 0.36666667
|
||||
value: {fileID: 21300000, guid: 06fb65b4951e6b244999e674f10c3cf0, type: 3}
|
||||
- time: 0.38333333
|
||||
value: {fileID: 21300000, guid: f3961709fb752d14c801b9fec903bcdb, type: 3}
|
||||
- time: 0.4
|
||||
value: {fileID: 21300000, guid: 3a472aebbcccde640a0420e81da9ce42, type: 3}
|
||||
- time: 0.41666666
|
||||
value: {fileID: 21300000, guid: e19df95266ff31f4ea953a4e0974e33f, type: 3}
|
||||
- time: 0.43333334
|
||||
value: {fileID: 21300000, guid: 62f622e09a583fd47a256aaf99d40c28, type: 3}
|
||||
- time: 0.45
|
||||
value: {fileID: 21300000, guid: d17815e6997b4b247b61553752d540bb, type: 3}
|
||||
- time: 0.46666667
|
||||
value: {fileID: 21300000, guid: a4826d136ede6c94180fbbc4efa41ad0, type: 3}
|
||||
- time: 0.48333332
|
||||
value: {fileID: 21300000, guid: b9ecd922c419f7e4da1253a84c60fbc2, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 21300000, guid: 8c081021fed6aa049b09a764884a59bb, type: 3}
|
||||
- time: 0.51666665
|
||||
value: {fileID: 21300000, guid: ff11c0ede8b45c54f84731aff66e4b38, type: 3}
|
||||
- time: 0.53333336
|
||||
value: {fileID: 21300000, guid: 1f4e6059fc53ea64b83ce4bcdae6e89e, type: 3}
|
||||
- time: 0.55
|
||||
value: {fileID: 21300000, guid: aa35f653e92aed54caaceecfd75698da, type: 3}
|
||||
- time: 0.56666666
|
||||
value: {fileID: 21300000, guid: 26705d7f1e112d246918a6e769d6d7c7, type: 3}
|
||||
- time: 0.5833333
|
||||
value: {fileID: 21300000, guid: 92117ed5712f10f4cb75389cb1da531f, type: 3}
|
||||
- time: 0.6
|
||||
value: {fileID: 21300000, guid: 2d7406118ce678a4b8dff4d29870a8fb, type: 3}
|
||||
- time: 0.6166667
|
||||
value: {fileID: 21300000, guid: 7d0c10beff9a19b4eb0e584c6e88eb80, type: 3}
|
||||
- time: 0.6333333
|
||||
value: {fileID: 21300000, guid: 180333fa9f0fbae43b1f4e2847400b22, type: 3}
|
||||
- time: 0.65
|
||||
value: {fileID: 21300000, guid: 88275e74b32c1c3429ed39d45708a7cf, type: 3}
|
||||
- time: 0.6666667
|
||||
value: {fileID: 21300000, guid: 415c1e7c756742049bdcac8b5a2793eb, type: 3}
|
||||
- time: 0.68333334
|
||||
value: {fileID: 21300000, guid: 7d81193d67d35ac42acf72a978513dc4, type: 3}
|
||||
- time: 0.7
|
||||
value: {fileID: 21300000, guid: 9151c54110ae6de43a471d9d052cf468, type: 3}
|
||||
- time: 0.71666664
|
||||
value: {fileID: 21300000, guid: 1527cfc55153da143b28b329175a1e3b, type: 3}
|
||||
- time: 0.73333335
|
||||
value: {fileID: 21300000, guid: eeec54bd71ab890449455636e2e7aa9c, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: 21300000, guid: 4a95e996ffd2640498c359a5a8299c53, type: 3}
|
||||
- time: 0.76666665
|
||||
value: {fileID: 21300000, guid: aca6cc8800b41c644b7a107a545cbff2, type: 3}
|
||||
- time: 0.78333336
|
||||
value: {fileID: 21300000, guid: 46ad71cc701b1824fa72dd28c120a23e, type: 3}
|
||||
- time: 0.8
|
||||
value: {fileID: 21300000, guid: aaa273c0c8f44e54da3c2a9400909f0b, type: 3}
|
||||
- time: 0.81666666
|
||||
value: {fileID: 21300000, guid: 5048a6f02845461449b321fce429df3a, type: 3}
|
||||
- time: 0.8333333
|
||||
value: {fileID: 21300000, guid: 758cabedd159aa845b79278deb6e78bf, type: 3}
|
||||
- time: 0.85
|
||||
value: {fileID: 21300000, guid: 5c5f6da46bfbb9e4183e7977679f441c, type: 3}
|
||||
- time: 0.8666667
|
||||
value: {fileID: 21300000, guid: 4b4439a0569aedd48a3973cc252c51d5, type: 3}
|
||||
- time: 0.8833333
|
||||
value: {fileID: 21300000, guid: fd409e002f0d6ae408ce35b939a72673, type: 3}
|
||||
- time: 0.9
|
||||
value: {fileID: 21300000, guid: d564b0d9a605f1e4d8f4059404c003c6, type: 3}
|
||||
- time: 0.9166667
|
||||
value: {fileID: 21300000, guid: e0f29af1d64f412499afc2b11eb65bb3, type: 3}
|
||||
- time: 0.93333334
|
||||
value: {fileID: 21300000, guid: 28b9bef524e95c247b14ec04c8e8e1a9, type: 3}
|
||||
- time: 0.95
|
||||
value: {fileID: 21300000, guid: f73d6e3ce9822fa4bad69f1c5a8a726a, type: 3}
|
||||
- time: 0.96666664
|
||||
value: {fileID: 21300000, guid: 0eeaa333c8e0aec489af52402a4d20df, type: 3}
|
||||
- time: 0.98333335
|
||||
value: {fileID: 21300000, guid: a6abdc80bd3781e42968d118b972b95a, type: 3}
|
||||
- time: 1
|
||||
value: {fileID: 21300000, guid: 9f2f2030fca983c4e954fd9d0c012769, type: 3}
|
||||
- time: 1.0166667
|
||||
value: {fileID: 21300000, guid: 1bf4a9c2cb3917d499ad84b9707d7078, type: 3}
|
||||
- time: 1.0333333
|
||||
value: {fileID: 21300000, guid: 0eed230a9179a154c9d58025da65e9e1, type: 3}
|
||||
- time: 1.05
|
||||
value: {fileID: 21300000, guid: 0edfe607badb91149ac6829cbb93dde0, type: 3}
|
||||
- time: 1.0666667
|
||||
value: {fileID: 21300000, guid: d8d346c1ad1d34847bd50fcaecfe4eca, type: 3}
|
||||
- time: 1.0833334
|
||||
value: {fileID: 21300000, guid: 23754ee6b23813548b2da9e9a3091620, type: 3}
|
||||
- time: 1.1
|
||||
value: {fileID: 21300000, guid: 2d64ea5e3efe3af4683bbdc2f50bd512, type: 3}
|
||||
- time: 1.1166667
|
||||
value: {fileID: 21300000, guid: 1d633fa4a930cff4c8a176e31f77e519, type: 3}
|
||||
- time: 1.1333333
|
||||
value: {fileID: 21300000, guid: fabca51261d922940bdaa8ad0b355175, type: 3}
|
||||
- time: 1.15
|
||||
value: {fileID: 21300000, guid: 210e665cfa7887946bc9e2b7d9a7cb73, type: 3}
|
||||
- time: 1.1666666
|
||||
value: {fileID: 21300000, guid: 5afdbdd4dd4fd2040969b5ac68f67187, type: 3}
|
||||
- time: 1.1833333
|
||||
value: {fileID: 21300000, guid: 599efcf1d290e454cae226a65bb97b93, type: 3}
|
||||
- time: 1.2
|
||||
value: {fileID: 21300000, guid: 93eeb2b16934281458b5b3257e9e17e8, type: 3}
|
||||
- time: 1.2166667
|
||||
value: {fileID: 21300000, guid: c69fea2115e1472478ca38d04aa5bf54, type: 3}
|
||||
- time: 1.2333333
|
||||
value: {fileID: 21300000, guid: f886aa1b58751fb4ba6312147a377e6f, type: 3}
|
||||
attribute: m_Sprite
|
||||
path: spaceballtest0 (1)
|
||||
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: 2571728193
|
||||
attribute: 1
|
||||
script: {fileID: 0}
|
||||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 4074207776
|
||||
attribute: 4
|
||||
script: {fileID: 0}
|
||||
typeID: 4
|
||||
customType: 4
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 1808602102
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
pptrCurveMapping:
|
||||
- {fileID: 21300000, guid: 2cea76f67c644e34cb8387399d8162b4, type: 3}
|
||||
- {fileID: 21300000, guid: aba30dfb7f08f3d40a46a7537232403b, type: 3}
|
||||
- {fileID: 21300000, guid: 7c32b35e89afbed4897ebc603e02d7d8, type: 3}
|
||||
- {fileID: 21300000, guid: 23f618268fe68504ba58607e954d3c63, type: 3}
|
||||
- {fileID: 21300000, guid: 57d3954a2bd2e26419e8681020a328e6, type: 3}
|
||||
- {fileID: 21300000, guid: f4dc4c1ac0c4e2248931251544cf022c, type: 3}
|
||||
- {fileID: 21300000, guid: 826039a8faac9184399c1ac07383864a, type: 3}
|
||||
- {fileID: 21300000, guid: a528e5ebf65f1674fb423050f9ae1762, type: 3}
|
||||
- {fileID: 21300000, guid: 48bfdc094c20a9b4186b43ba45758210, type: 3}
|
||||
- {fileID: 21300000, guid: c92ff9cb30af54d468fbad2c767c6dab, type: 3}
|
||||
- {fileID: 21300000, guid: af57499ad35aa764cbf365222efab1b3, type: 3}
|
||||
- {fileID: 21300000, guid: 4cbee9bd590afe740bd475925cc64a4d, type: 3}
|
||||
- {fileID: 21300000, guid: cfb6267291f4f48438b20c6de4c338fc, type: 3}
|
||||
- {fileID: 21300000, guid: ef899cfeb6c62ca47a066a93c10f2f98, type: 3}
|
||||
- {fileID: 21300000, guid: f9e20e32f686b624aaa5965b9519fd61, type: 3}
|
||||
- {fileID: 21300000, guid: 870cac70acc46ec4290d0d286d13e619, type: 3}
|
||||
- {fileID: 21300000, guid: 41b7e32e7dcb2e544a84a224ecc778f2, type: 3}
|
||||
- {fileID: 21300000, guid: 2c777ead5a2b4404288ae1d586887f03, type: 3}
|
||||
- {fileID: 21300000, guid: b1a494a3821b4154b8fe8d6fcb5f0c8c, type: 3}
|
||||
- {fileID: 21300000, guid: 7919c9c8c0e4c4a4ea222f4196cd3785, type: 3}
|
||||
- {fileID: 21300000, guid: 88a483ad1d2af214eaa26aed89a3606c, type: 3}
|
||||
- {fileID: 21300000, guid: 42dc0861714f7c043906da378998270f, type: 3}
|
||||
- {fileID: 21300000, guid: 06fb65b4951e6b244999e674f10c3cf0, type: 3}
|
||||
- {fileID: 21300000, guid: f3961709fb752d14c801b9fec903bcdb, type: 3}
|
||||
- {fileID: 21300000, guid: 3a472aebbcccde640a0420e81da9ce42, type: 3}
|
||||
- {fileID: 21300000, guid: e19df95266ff31f4ea953a4e0974e33f, type: 3}
|
||||
- {fileID: 21300000, guid: 62f622e09a583fd47a256aaf99d40c28, type: 3}
|
||||
- {fileID: 21300000, guid: d17815e6997b4b247b61553752d540bb, type: 3}
|
||||
- {fileID: 21300000, guid: a4826d136ede6c94180fbbc4efa41ad0, type: 3}
|
||||
- {fileID: 21300000, guid: b9ecd922c419f7e4da1253a84c60fbc2, type: 3}
|
||||
- {fileID: 21300000, guid: 8c081021fed6aa049b09a764884a59bb, type: 3}
|
||||
- {fileID: 21300000, guid: ff11c0ede8b45c54f84731aff66e4b38, type: 3}
|
||||
- {fileID: 21300000, guid: 1f4e6059fc53ea64b83ce4bcdae6e89e, type: 3}
|
||||
- {fileID: 21300000, guid: aa35f653e92aed54caaceecfd75698da, type: 3}
|
||||
- {fileID: 21300000, guid: 26705d7f1e112d246918a6e769d6d7c7, type: 3}
|
||||
- {fileID: 21300000, guid: 92117ed5712f10f4cb75389cb1da531f, type: 3}
|
||||
- {fileID: 21300000, guid: 2d7406118ce678a4b8dff4d29870a8fb, type: 3}
|
||||
- {fileID: 21300000, guid: 7d0c10beff9a19b4eb0e584c6e88eb80, type: 3}
|
||||
- {fileID: 21300000, guid: 180333fa9f0fbae43b1f4e2847400b22, type: 3}
|
||||
- {fileID: 21300000, guid: 88275e74b32c1c3429ed39d45708a7cf, type: 3}
|
||||
- {fileID: 21300000, guid: 415c1e7c756742049bdcac8b5a2793eb, type: 3}
|
||||
- {fileID: 21300000, guid: 7d81193d67d35ac42acf72a978513dc4, type: 3}
|
||||
- {fileID: 21300000, guid: 9151c54110ae6de43a471d9d052cf468, type: 3}
|
||||
- {fileID: 21300000, guid: 1527cfc55153da143b28b329175a1e3b, type: 3}
|
||||
- {fileID: 21300000, guid: eeec54bd71ab890449455636e2e7aa9c, type: 3}
|
||||
- {fileID: 21300000, guid: 4a95e996ffd2640498c359a5a8299c53, type: 3}
|
||||
- {fileID: 21300000, guid: aca6cc8800b41c644b7a107a545cbff2, type: 3}
|
||||
- {fileID: 21300000, guid: 46ad71cc701b1824fa72dd28c120a23e, type: 3}
|
||||
- {fileID: 21300000, guid: aaa273c0c8f44e54da3c2a9400909f0b, type: 3}
|
||||
- {fileID: 21300000, guid: 5048a6f02845461449b321fce429df3a, type: 3}
|
||||
- {fileID: 21300000, guid: 758cabedd159aa845b79278deb6e78bf, type: 3}
|
||||
- {fileID: 21300000, guid: 5c5f6da46bfbb9e4183e7977679f441c, type: 3}
|
||||
- {fileID: 21300000, guid: 4b4439a0569aedd48a3973cc252c51d5, type: 3}
|
||||
- {fileID: 21300000, guid: fd409e002f0d6ae408ce35b939a72673, type: 3}
|
||||
- {fileID: 21300000, guid: d564b0d9a605f1e4d8f4059404c003c6, type: 3}
|
||||
- {fileID: 21300000, guid: e0f29af1d64f412499afc2b11eb65bb3, type: 3}
|
||||
- {fileID: 21300000, guid: 28b9bef524e95c247b14ec04c8e8e1a9, type: 3}
|
||||
- {fileID: 21300000, guid: f73d6e3ce9822fa4bad69f1c5a8a726a, type: 3}
|
||||
- {fileID: 21300000, guid: 0eeaa333c8e0aec489af52402a4d20df, type: 3}
|
||||
- {fileID: 21300000, guid: a6abdc80bd3781e42968d118b972b95a, type: 3}
|
||||
- {fileID: 21300000, guid: 9f2f2030fca983c4e954fd9d0c012769, type: 3}
|
||||
- {fileID: 21300000, guid: 1bf4a9c2cb3917d499ad84b9707d7078, type: 3}
|
||||
- {fileID: 21300000, guid: 0eed230a9179a154c9d58025da65e9e1, type: 3}
|
||||
- {fileID: 21300000, guid: 0edfe607badb91149ac6829cbb93dde0, type: 3}
|
||||
- {fileID: 21300000, guid: d8d346c1ad1d34847bd50fcaecfe4eca, type: 3}
|
||||
- {fileID: 21300000, guid: 23754ee6b23813548b2da9e9a3091620, type: 3}
|
||||
- {fileID: 21300000, guid: 2d64ea5e3efe3af4683bbdc2f50bd512, type: 3}
|
||||
- {fileID: 21300000, guid: 1d633fa4a930cff4c8a176e31f77e519, type: 3}
|
||||
- {fileID: 21300000, guid: fabca51261d922940bdaa8ad0b355175, type: 3}
|
||||
- {fileID: 21300000, guid: 210e665cfa7887946bc9e2b7d9a7cb73, type: 3}
|
||||
- {fileID: 21300000, guid: 5afdbdd4dd4fd2040969b5ac68f67187, type: 3}
|
||||
- {fileID: 21300000, guid: 599efcf1d290e454cae226a65bb97b93, type: 3}
|
||||
- {fileID: 21300000, guid: 93eeb2b16934281458b5b3257e9e17e8, type: 3}
|
||||
- {fileID: 21300000, guid: c69fea2115e1472478ca38d04aa5bf54, type: 3}
|
||||
- {fileID: 21300000, guid: f886aa1b58751fb4ba6312147a377e6f, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 1.25
|
||||
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:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -3.81
|
||||
inSlope: 0
|
||||
outSlope: 4.2875676
|
||||
tangentMode: 69
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.6166667
|
||||
value: -1.166
|
||||
inSlope: 4.2875676
|
||||
outSlope: 4.2908106
|
||||
tangentMode: 69
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.2333333
|
||||
value: 1.48
|
||||
inSlope: 4.2908106
|
||||
outSlope: 0
|
||||
tangentMode: 69
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.x
|
||||
path: BallHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -1.77
|
||||
inSlope: 50.180645
|
||||
outSlope: 50.180645
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.17337073
|
||||
- serializedVersion: 3
|
||||
time: 0.6166667
|
||||
value: 11.959
|
||||
inSlope: -0.89189243
|
||||
outSlope: -0.89189243
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.2333333
|
||||
value: -3.6
|
||||
inSlope: -48.45791
|
||||
outSlope: -48.45791
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.18418801
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.y
|
||||
path: BallHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 69
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.6166667
|
||||
value: 0
|
||||
inSlope: -0
|
||||
outSlope: 0
|
||||
tangentMode: 69
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.2333333
|
||||
value: 0
|
||||
inSlope: -0
|
||||
outSlope: 0
|
||||
tangentMode: 69
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalPosition.z
|
||||
path: BallHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.2333333
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: localEulerAnglesRaw.x
|
||||
path: BallHolder/SpriteRotHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.2333333
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: localEulerAnglesRaw.y
|
||||
path: BallHolder/SpriteRotHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 68.401
|
||||
inSlope: -235.90063
|
||||
outSlope: -235.90063
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.08790741
|
||||
- serializedVersion: 3
|
||||
time: 1.2333333
|
||||
value: -227.969
|
||||
inSlope: -127.77611
|
||||
outSlope: -127.77611
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.08443604
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: localEulerAnglesRaw.z
|
||||
path: BallHolder/SpriteRotHolder
|
||||
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: BallHolder/SpriteRotHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.y
|
||||
path: BallHolder/SpriteRotHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_LocalEulerAngles.z
|
||||
path: BallHolder/SpriteRotHolder
|
||||
classID: 4
|
||||
script: {fileID: 0}
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 713261c6f01b87848a426fd36209a2c9
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -157,8 +157,8 @@ Transform:
|
|||
- {fileID: 574625344}
|
||||
- {fileID: 1850992746}
|
||||
- {fileID: 1409967394}
|
||||
- {fileID: 843772669}
|
||||
- {fileID: 211847235}
|
||||
- {fileID: 1248149317}
|
||||
m_Father: {fileID: 1923614611}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -176,6 +176,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
firstEnable: 0
|
||||
Ball: {fileID: 843772668}
|
||||
BallsHolder: {fileID: 1248149316}
|
||||
Dispenser: {fileID: 1409967393}
|
||||
Dust: {fileID: 211847234}
|
||||
--- !u!1 &10060140
|
||||
|
|
@ -481,6 +482,80 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &79134725
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 79134726}
|
||||
- component: {fileID: 79134728}
|
||||
m_Layer: 3
|
||||
m_Name: CursorCam
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &79134726
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 79134725}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1070673218}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!20 &79134728
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 79134725}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 3
|
||||
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_projectionMatrixMode: 1
|
||||
m_GateFitMode: 2
|
||||
m_FOVAxisMode: 0
|
||||
m_SensorSize: {x: 36, y: 24}
|
||||
m_LensShift: {x: 0, y: 0}
|
||||
m_FocalLength: 50
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
field of view: 53.15
|
||||
orthographic: 1
|
||||
orthographic size: 5
|
||||
m_Depth: 1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 8
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
m_TargetEye: 0
|
||||
m_HDR: 1
|
||||
m_AllowMSAA: 0
|
||||
m_AllowDynamicResolution: 0
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 0
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!1 &96506772
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1252,7 +1327,7 @@ Transform:
|
|||
- {fileID: 770771952}
|
||||
- {fileID: 1522620880}
|
||||
m_Father: {fileID: 6433985}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &211847236
|
||||
Animator:
|
||||
|
|
@ -2027,7 +2102,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 389255204}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Cursor
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -2601,7 +2676,7 @@ Camera:
|
|||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_Bits: 55
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
|
|
@ -2620,11 +2695,11 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 519420028}
|
||||
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: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_Father: {fileID: 1070673218}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &536395133
|
||||
|
|
@ -2964,7 +3039,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 589315426}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: DSGUY
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -3980,14 +4055,14 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 843772668}
|
||||
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 867245233}
|
||||
- {fileID: 2007544425}
|
||||
m_Father: {fileID: 6433985}
|
||||
m_RootOrder: 6
|
||||
m_Father: {fileID: 1248149317}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &843772670
|
||||
Animator:
|
||||
|
|
@ -4021,6 +4096,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
startBeat: 0
|
||||
high: 0
|
||||
Holder: {fileID: 2007544424}
|
||||
--- !u!1 &848278997
|
||||
GameObject:
|
||||
|
|
@ -4205,8 +4281,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 867245232}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.0976, y: 0.3271, z: 0}
|
||||
m_LocalScale: {x: 1.0636054, y: 1.0614783, z: 1.0636054}
|
||||
m_LocalPosition: {x: -0.1653, y: 1.1467, z: 0}
|
||||
m_LocalScale: {x: 2.8601446, y: 2.8750157, z: 2.8264685}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 843772669}
|
||||
m_RootOrder: 0
|
||||
|
|
@ -4250,9 +4326,9 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: -186
|
||||
m_SortingOrder: -1
|
||||
m_Sprite: {fileID: 21300000, guid: dd41926c7de63174bb17d10b6810d670, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.5529412}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
|
|
@ -4272,7 +4348,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 882508662}
|
||||
- component: {fileID: 882508663}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: InnerCircle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -4911,7 +4987,7 @@ GameObject:
|
|||
- component: {fileID: 992902363}
|
||||
- component: {fileID: 992902364}
|
||||
- component: {fileID: 992902365}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Circle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -5078,6 +5154,38 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &1070673217
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1070673218}
|
||||
m_Layer: 0
|
||||
m_Name: Cameras
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1070673218
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1070673217}
|
||||
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: 519420032}
|
||||
- {fileID: 79134726}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1093240237
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5090,7 +5198,7 @@ GameObject:
|
|||
- component: {fileID: 1093240239}
|
||||
- component: {fileID: 1093240240}
|
||||
- component: {fileID: 1093240241}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Eyes
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -5361,7 +5469,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1136780966}
|
||||
- component: {fileID: 1136780967}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: InnerCircleFace
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -5834,7 +5942,7 @@ GameObject:
|
|||
- component: {fileID: 1183108284}
|
||||
- component: {fileID: 1183108286}
|
||||
- component: {fileID: 1183108285}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: SpriteHolder
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -5969,6 +6077,37 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &1248149316
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1248149317}
|
||||
m_Layer: 0
|
||||
m_Name: Balls
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1248149317
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1248149316}
|
||||
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: 843772669}
|
||||
m_Father: {fileID: 6433985}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1284248502
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6981,7 +7120,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1535493488}
|
||||
- component: {fileID: 1535493489}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: OuterCircle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -7309,7 +7448,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1604625201}
|
||||
- component: {fileID: 1604625203}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Sprite
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -7882,7 +8021,7 @@ GameObject:
|
|||
- component: {fileID: 1765874089}
|
||||
- component: {fileID: 1765874091}
|
||||
- component: {fileID: 1765874090}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Visual
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -8278,7 +8417,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1855769657}
|
||||
- component: {fileID: 1855769658}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Actual
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -9263,6 +9402,7 @@ MonoBehaviour:
|
|||
txt: {fileID: 4900000, guid: 50b54b23c06076c4598134813da27f18, type: 3}
|
||||
startOffset: 0
|
||||
GameCamera: {fileID: 519420031}
|
||||
CursorCam: {fileID: 79134728}
|
||||
--- !u!212 &2072389418
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace RhythmHeavenMania
|
|||
|
||||
private void Update()
|
||||
{
|
||||
Vector3 pos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
|
||||
Vector3 pos = GameManager.instance.CursorCam.ScreenToWorldPoint(Input.mousePosition);
|
||||
|
||||
if (follow)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,10 +16,11 @@ namespace RhythmHeavenMania
|
|||
private TMP_Text BPM;
|
||||
private TMP_Text currEvent;
|
||||
private TMP_Text eventLength;
|
||||
private TMP_Text eventType;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
for (int i = 0; i < 4; i++)
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
GameObject debug = Instantiate(Template, Template.transform.parent);
|
||||
debug.SetActive(true);
|
||||
|
|
@ -39,6 +40,9 @@ namespace RhythmHeavenMania
|
|||
case 3:
|
||||
eventLength = debug.transform.GetChild(0).GetComponent<TMP_Text>();
|
||||
break;
|
||||
case 4:
|
||||
eventType = debug.transform.GetChild(0).GetComponent<TMP_Text>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -52,11 +56,13 @@ namespace RhythmHeavenMania
|
|||
{
|
||||
currEvent.text = $"CurrentEvent: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent - 1].datamodel}";
|
||||
eventLength.text = $"Event Length: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent - 1].length}";
|
||||
}
|
||||
eventType.text = $"Event Type: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent - 1].type}";
|
||||
}
|
||||
else
|
||||
{
|
||||
currEvent.text = $"CurrentEvent: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].datamodel}";
|
||||
eventLength.text = $"Event Length: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].length}";
|
||||
eventType.text = $"Event Type: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].type}";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ namespace RhythmHeavenMania
|
|||
}),
|
||||
new MiniGame("spaceball", new List<GameAction>()
|
||||
{
|
||||
new GameAction("shoot", delegate { Spaceball.instance.Shoot(currentBeat); }, true )
|
||||
new GameAction("shoot", delegate { Spaceball.instance.Shoot(currentBeat, currentType); }, true )
|
||||
})
|
||||
};
|
||||
|
||||
|
|
@ -125,6 +125,7 @@ namespace RhythmHeavenMania
|
|||
try
|
||||
{
|
||||
currentLength = GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].length;
|
||||
currentType = GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].type;
|
||||
|
||||
if (details.Length > 2) currentSwitchGame = details[2];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace RhythmHeavenMania
|
|||
|
||||
public float startOffset;
|
||||
|
||||
public Camera GameCamera;
|
||||
public Camera GameCamera, CursorCam;
|
||||
|
||||
[Header("Games")]
|
||||
Coroutine currentGameSwitchIE;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ namespace RhythmHeavenMania.Games.Spaceball
|
|||
public class Spaceball : Minigame
|
||||
{
|
||||
public GameObject Ball;
|
||||
public GameObject BallsHolder;
|
||||
|
||||
public GameObject Dispenser;
|
||||
public GameObject Dust;
|
||||
|
|
@ -17,6 +18,8 @@ namespace RhythmHeavenMania.Games.Spaceball
|
|||
|
||||
public override void OnGameSwitch()
|
||||
{
|
||||
for (int i = 1; i < BallsHolder.transform.childCount; i++)
|
||||
Destroy(BallsHolder.transform.GetChild(i).gameObject);
|
||||
GameManager.instance.GameCamera.orthographic = false;
|
||||
}
|
||||
|
||||
|
|
@ -39,13 +42,21 @@ namespace RhythmHeavenMania.Games.Spaceball
|
|||
}
|
||||
}
|
||||
|
||||
public void Shoot(float beat)
|
||||
public void Shoot(float beat, string type)
|
||||
{
|
||||
Jukebox.PlayOneShotGame("spaceball/shoot");
|
||||
GameObject ball = Instantiate(Ball);
|
||||
ball.transform.parent = Ball.transform.parent;
|
||||
ball.SetActive(true);
|
||||
ball.GetComponent<SpaceballBall>().startBeat = beat;
|
||||
if (type == "high")
|
||||
{
|
||||
ball.GetComponent<SpaceballBall>().high = true;
|
||||
Jukebox.PlayOneShotGame("spaceball/longShoot");
|
||||
}
|
||||
else
|
||||
{
|
||||
Jukebox.PlayOneShotGame("spaceball/shoot");
|
||||
}
|
||||
|
||||
Dispenser.GetComponent<Animator>().Play("DispenserShoot", 0, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ namespace RhythmHeavenMania.Games.Spaceball
|
|||
private int lastState;
|
||||
private bool inList = false;
|
||||
|
||||
public bool high;
|
||||
|
||||
private Minigame.Eligible e = new Minigame.Eligible();
|
||||
|
||||
public GameObject Holder;
|
||||
|
|
@ -26,10 +28,17 @@ namespace RhythmHeavenMania.Games.Spaceball
|
|||
|
||||
private void Update()
|
||||
{
|
||||
float normalizedBeatAnim = Conductor.instance.GetLoopPositionFromBeat(startBeat, 1.25f);
|
||||
anim.Play("BallLow", -1, normalizedBeatAnim);
|
||||
float beatLength = 1f;
|
||||
if (high) beatLength = 2f;
|
||||
|
||||
float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(startBeat, 1f);
|
||||
float normalizedBeatAnim = Conductor.instance.GetLoopPositionFromBeat(startBeat, beatLength + 0.25f);
|
||||
|
||||
if (high)
|
||||
anim.Play("BallHigh", -1, normalizedBeatAnim);
|
||||
else
|
||||
anim.Play("BallLow", -1, normalizedBeatAnim);
|
||||
|
||||
float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(startBeat, beatLength);
|
||||
|
||||
if (normalizedBeat > Minigame.EarlyTime() && normalizedBeat < Minigame.PerfectTime() && lastState == 0)
|
||||
{
|
||||
|
|
@ -53,9 +62,12 @@ namespace RhythmHeavenMania.Games.Spaceball
|
|||
MakeInEligible();
|
||||
}
|
||||
|
||||
if (normalizedBeat > 1.25f && lastState == 3)
|
||||
// too lazy to make a proper fix for this
|
||||
float endTime = 1.25f;
|
||||
if (high) endTime = 1.15f;
|
||||
|
||||
if (normalizedBeat > endTime)
|
||||
{
|
||||
lastState++;
|
||||
Jukebox.PlayOneShotGame("spaceball/fall");
|
||||
Instantiate(Spaceball.instance.Dust, Spaceball.instance.Dust.transform.parent).SetActive(true);
|
||||
Destroy(this.gameObject);
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
{
|
||||
"bpm": 105,
|
||||
"entities": [
|
||||
{
|
||||
"beat": 1,
|
||||
"datamodel": "spaceball/shoot"
|
||||
},
|
||||
{
|
||||
"beat": 4,
|
||||
"datamodel": "spaceball/shoot"
|
||||
|
|
@ -24,6 +20,28 @@
|
|||
{
|
||||
"beat": 11,
|
||||
"datamodel": "gameManager/switchGame/spaceball"
|
||||
},
|
||||
{
|
||||
"beat": 14,
|
||||
"datamodel": "spaceball/shoot"
|
||||
},
|
||||
{
|
||||
"beat": 16,
|
||||
"datamodel": "gameManager/switchGame/clappyTrio"
|
||||
},
|
||||
{
|
||||
"beat": 16,
|
||||
"length": 2,
|
||||
"datamodel": "clappyTrio/clap"
|
||||
},
|
||||
{
|
||||
"beat": 21,
|
||||
"datamodel": "gameManager/switchGame/spaceball"
|
||||
},
|
||||
{
|
||||
"beat": 22,
|
||||
"type": "high",
|
||||
"datamodel": "spaceball/shoot"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ TagManager:
|
|||
- Default
|
||||
- TransparentFX
|
||||
- Ignore Raycast
|
||||
-
|
||||
- Cursor
|
||||
- Water
|
||||
- UI
|
||||
-
|
||||
|
|
|
|||
Loading…
Reference in New Issue