diff --git a/Assets/Resources/Games/workingDough.prefab b/Assets/Resources/Games/workingDough.prefab index 8c4ac9fe..25f88a30 100644 --- a/Assets/Resources/Games/workingDough.prefab +++ b/Assets/Resources/Games/workingDough.prefab @@ -517,62 +517,6 @@ Transform: m_Father: {fileID: 3839262427627558499} m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -105.382} ---- !u!1 &317846157365368093 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8647614307582174740} - - component: {fileID: 4303798721264846725} - m_Layer: 0 - m_Name: PlayerMissCurveSecond - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8647614307582174740 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 317846157365368093} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3873686041927501948} - - {fileID: 2294706646645103657} - - {fileID: 3190698495774667102} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4303798721264846725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 317846157365368093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 2160521263295583415} - - {fileID: 4174348017822876863} - - {fileID: 697683622155973692} - normalizedTime: 0.5 --- !u!1 &528389382209703820 GameObject: m_ObjectHideFlags: 0 @@ -1078,54 +1022,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &734683592555493466 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8187490776826094954} - - component: {fileID: 6980535827494190384} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8187490776826094954 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734683592555493466} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.4460602, y: 3.159495, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7636698237834699611} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6980535827494190384 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734683592555493466} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 5083827629149980939} - handleType: 0 - leftHandleLocalPosition: {x: -0.32262447, y: 0.80561876, z: 0} - rightHandleLocalPosition: {x: 0.32262447, y: -0.80561876, z: -0} --- !u!1 &735680135897131853 GameObject: m_ObjectHideFlags: 0 @@ -1613,54 +1509,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1136667447565042960 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3406828340894435836} - - component: {fileID: 5786179012740815355} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3406828340894435836 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1136667447565042960} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.315241, y: 4.4597473, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 915100655504103976} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5786179012740815355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1136667447565042960} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 2815349102627779420} - handleType: 0 - leftHandleLocalPosition: {x: -0.2907396, y: -0.295116, z: -0} - rightHandleLocalPosition: {x: 0.2907396, y: 0.295116, z: 0} --- !u!1 &1139967859415940085 GameObject: m_ObjectHideFlags: 0 @@ -2198,108 +2046,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1412413540563893114 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7636698237834699611} - - component: {fileID: 5083827629149980939} - m_Layer: 0 - m_Name: PlayerExitDownCurve - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7636698237834699611 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412413540563893114} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.7200003, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8153171495126186041} - - {fileID: 8187490776826094954} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5083827629149980939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412413540563893114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 3661410907736242627} - - {fileID: 6980535827494190384} - normalizedTime: 0.5 ---- !u!1 &1510375794433616533 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1234614012930633599} - - component: {fileID: 8127602560730923833} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1234614012930633599 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1510375794433616533} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.372343, y: 4.472981, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 339712440083651917} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8127602560730923833 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1510375794433616533} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 3109352781688930449} - handleType: 0 - leftHandleLocalPosition: {x: -0.43435735, y: -0.39852077, z: -0} - rightHandleLocalPosition: {x: 0.43435735, y: 0.39852077, z: 0} --- !u!1 &1576905222322758540 GameObject: m_ObjectHideFlags: 0 @@ -2331,7 +2077,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8664857966238409550} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3058218426859594357 SpriteRenderer: @@ -2406,6 +2152,37 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1685452290991696129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2295743639765659419} + m_Layer: 0 + m_Name: MissFall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2295743639765659419 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1685452290991696129} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.52, y: -5.836, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 160995751921296168} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1691924537092321264 GameObject: m_ObjectHideFlags: 0 @@ -2742,6 +2519,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1960008560637170080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3728383953658790377} + m_Layer: 0 + m_Name: PlayerBallEndBarelyFall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3728383953658790377 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960008560637170080} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.769, y: -5.664, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 160995751921296168} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1960724902114768218 GameObject: m_ObjectHideFlags: 0 @@ -3079,54 +2887,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2192937251993014798 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3873686041927501948} - - component: {fileID: 2160521263295583415} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3873686041927501948 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2192937251993014798} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.7461355, y: -1.9321471, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8647614307582174740} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2160521263295583415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2192937251993014798} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 4303798721264846725} - handleType: 0 - leftHandleLocalPosition: {x: -0.40481356, y: -0.5692562, z: -0} - rightHandleLocalPosition: {x: 0.40481356, y: 0.5692562, z: 0} --- !u!1 &2198554264360514806 GameObject: m_ObjectHideFlags: 0 @@ -3211,62 +2971,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2246779773171465239 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 915100655504103976} - - component: {fileID: 2815349102627779420} - m_Layer: 0 - m_Name: PlayerBarelyCurveFirst - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &915100655504103976 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2246779773171465239} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5764314812948407955} - - {fileID: 3406828340894435836} - - {fileID: 8360015007955315944} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2815349102627779420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2246779773171465239} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 155477911538672269} - - {fileID: 5786179012740815355} - - {fileID: 3479850066752116594} - normalizedTime: 0.5 --- !u!1 &2276302074634566125 GameObject: m_ObjectHideFlags: 0 @@ -3406,108 +3110,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2322717689214915123 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8143872481622385456} - - component: {fileID: 4967848311778099039} - m_Layer: 0 - m_Name: PlayerWrongInputTooWeakCurveSecond - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8143872481622385456 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2322717689214915123} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5793400924267770470} - - {fileID: 2385921571894669065} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4967848311778099039 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2322717689214915123} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 2890700379947741735} - - {fileID: 4393664911240074220} - normalizedTime: 0.5 ---- !u!1 &2326262125212745733 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3845125901109371022} - - component: {fileID: 1779814683928860541} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3845125901109371022 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2326262125212745733} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.3473256, y: 0.43953764, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7152359084356618618} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1779814683928860541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2326262125212745733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 8607846603513681346} - handleType: 0 - leftHandleLocalPosition: {x: -0.13946886, y: -0.459842, z: -0} - rightHandleLocalPosition: {x: 0.13946886, y: 0.459842, z: 0} --- !u!1 &2381724555849182230 GameObject: m_ObjectHideFlags: 0 @@ -3677,7 +3279,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2421662666668732080 +--- !u!1 &2453527913116199009 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3685,86 +3287,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7300243984550199186} - - component: {fileID: 4206405240897349205} + - component: {fileID: 6352785748787418662} m_Layer: 0 - m_Name: Point 1 + m_Name: PlayerBallHit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7300243984550199186 +--- !u!4 &6352785748787418662 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2421662666668732080} + m_GameObject: {fileID: 2453527913116199009} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.490642, y: 0.59492743, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7152359084356618618} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4206405240897349205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2421662666668732080} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 8607846603513681346} - handleType: 0 - leftHandleLocalPosition: {x: -0.2584646, y: 0.38661402, z: -0} - rightHandleLocalPosition: {x: 0.2584646, y: -0.38661402, z: 0} ---- !u!1 &2480862097650250615 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7783840079727272764} - m_Layer: 0 - m_Name: PlayerCurves - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7783840079727272764 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2480862097650250615} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 3.368, y: 0.422, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4163366464383245483} - - {fileID: 18950412391582461} - - {fileID: 339712440083651917} - - {fileID: 7636698237834699611} - - {fileID: 2611159277867949147} - - {fileID: 8647614307582174740} - - {fileID: 915100655504103976} - - {fileID: 1644622483066383819} - - {fileID: 7152359084356618618} - - {fileID: 8143872481622385456} - m_Father: {fileID: 6649979826100345915} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 160995751921296168} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2604289907889550245 GameObject: @@ -3934,6 +3478,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2674440432262441285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6109906889177350440} + m_Layer: 0 + m_Name: PlayerBallEnd + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6109906889177350440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2674440432262441285} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.289, y: 3.142, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 160995751921296168} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2682384480975681187 GameObject: m_ObjectHideFlags: 0 @@ -4891,54 +4466,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3387628262679600308 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8153171495126186041} - - component: {fileID: 3661410907736242627} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8153171495126186041 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387628262679600308} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.3691301, y: 4.473701, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7636698237834699611} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3661410907736242627 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387628262679600308} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 5083827629149980939} - handleType: 0 - leftHandleLocalPosition: {x: -0.20989898, y: -0.30228782, z: -0} - rightHandleLocalPosition: {x: 0.20989898, y: 0.30228782, z: 0} --- !u!1 &3425304183280614907 GameObject: m_ObjectHideFlags: 0 @@ -5107,54 +4634,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3473869524494567377 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5764314812948407955} - - component: {fileID: 155477911538672269} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5764314812948407955 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3473869524494567377} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.3559732, y: 0.44484952, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 915100655504103976} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &155477911538672269 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3473869524494567377} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 2815349102627779420} - handleType: 0 - leftHandleLocalPosition: {x: -0.0077396506, y: -0.619982, z: -0} - rightHandleLocalPosition: {x: 0.0077396506, y: 0.619982, z: 0} --- !u!1 &3474513280877559083 GameObject: m_ObjectHideFlags: 0 @@ -5323,54 +4802,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3621217026564217667 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 311674539118372804} - - component: {fileID: 3925141610230844464} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &311674539118372804 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3621217026564217667} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.3665345, y: 0.4421756, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 339712440083651917} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3925141610230844464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3621217026564217667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 3109352781688930449} - handleType: 0 - leftHandleLocalPosition: {x: -0.0581168, y: -0.72874105, z: -0} - rightHandleLocalPosition: {x: 0.0581168, y: 0.72874105, z: 0} --- !u!1 &3630142587389562069 GameObject: m_ObjectHideFlags: 0 @@ -5623,37 +5054,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3690265041847459509 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7780114188057217086} - m_Layer: 0 - m_Name: NPCCurves - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7780114188057217086 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3690265041847459509} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6649979826100345915} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3742160956613915319 GameObject: m_ObjectHideFlags: 0 @@ -5943,93 +5343,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3885336978366137036 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6649979826100345915} - m_Layer: 0 - m_Name: Curves - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6649979826100345915 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3885336978366137036} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7780114188057217086} - - {fileID: 7783840079727272764} - m_Father: {fileID: 8664857966238409550} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3886824050635040507 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7152359084356618618} - - component: {fileID: 8607846603513681346} - m_Layer: 0 - m_Name: PlayerWrongInputTooWeakCurveFirst - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7152359084356618618 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3886824050635040507} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3845125901109371022} - - {fileID: 7300243984550199186} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8607846603513681346 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3886824050635040507} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 1779814683928860541} - - {fileID: 4206405240897349205} - normalizedTime: 0.5 --- !u!1 &4127796816753780064 GameObject: m_ObjectHideFlags: 0 @@ -6366,54 +5679,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4312487872632698891 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2473635718585767229} - - component: {fileID: 8460481197307721620} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2473635718585767229 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4312487872632698891} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.155543, y: 4.3510714, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4163366464383245483} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8460481197307721620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4312487872632698891} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 7569747594531042009} - handleType: 0 - leftHandleLocalPosition: {x: -0.30476934, y: 0.29347524, z: -0} - rightHandleLocalPosition: {x: 0.30476934, y: -0.29347524, z: 0} --- !u!1 &4463093469050328019 GameObject: m_ObjectHideFlags: 0 @@ -6583,54 +5848,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4605398670173052902 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8360015007955315944} - - component: {fileID: 3479850066752116594} - m_Layer: 0 - m_Name: Point 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8360015007955315944 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4605398670173052902} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.0878105, y: 3.4464834, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 915100655504103976} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3479850066752116594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4605398670173052902} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 2815349102627779420} - handleType: 0 - leftHandleLocalPosition: {x: -0.16532062, y: 0.62014055, z: -0} - rightHandleLocalPosition: {x: 0.16532062, y: -0.62014055, z: 0} --- !u!1 &4645724415892072949 GameObject: m_ObjectHideFlags: 0 @@ -6948,54 +6165,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4786879714712736201 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 506334474806219422} - - component: {fileID: 2110329128289933520} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &506334474806219422 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4786879714712736201} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.0971565, y: 3.4446452, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1644622483066383819} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2110329128289933520 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4786879714712736201} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 6348331742515097747} - handleType: 0 - leftHandleLocalPosition: {x: 1.5490236, y: -2.37632, z: 0} - rightHandleLocalPosition: {x: -1.5490236, y: 2.37632, z: -0} --- !u!1 &4868298082660752092 GameObject: m_ObjectHideFlags: 0 @@ -7537,7 +6706,7 @@ Transform: m_Father: {fileID: 3839262427627558499} m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -80.845} ---- !u!1 &5077428001058705160 +--- !u!1 &5071944921488414374 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7545,46 +6714,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3190698495774667102} - - component: {fileID: 697683622155973692} + - component: {fileID: 3186210222664968616} m_Layer: 0 - m_Name: Point 1 + m_Name: MissImpact m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3190698495774667102 +--- !u!4 &3186210222664968616 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5077428001058705160} + m_GameObject: {fileID: 5071944921488414374} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.5000267, y: -5.6528716, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} + m_LocalPosition: {x: 3.747, y: -1.951, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8647614307582174740} - m_RootOrder: 2 + m_Father: {fileID: 160995751921296168} + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &697683622155973692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5077428001058705160} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 4303798721264846725} - handleType: 0 - leftHandleLocalPosition: {x: -0.13375184, y: 1.089874, z: -0} - rightHandleLocalPosition: {x: 0.13375184, y: -1.089874, z: 0} --- !u!1 &5089234276602518314 GameObject: m_ObjectHideFlags: 0 @@ -7786,54 +6938,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &5208396420012534010 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6360332931268404433} - - component: {fileID: 5390601962849892087} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6360332931268404433 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5208396420012534010} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.365449, y: 0.44536385, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4163366464383245483} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5390601962849892087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5208396420012534010} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 7569747594531042009} - handleType: 0 - leftHandleLocalPosition: {x: -0.30644587, y: 1.7537379, z: -0} - rightHandleLocalPosition: {x: 0.30644587, y: -1.7537379, z: 0} --- !u!1 &5271784336268509046 GameObject: m_ObjectHideFlags: 0 @@ -7898,60 +7002,6 @@ Transform: m_Father: {fileID: 3901538524071612339} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5334387773013210775 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 18950412391582461} - - component: {fileID: 4677038328536771600} - m_Layer: 0 - m_Name: PlayerEnterUpCurve - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &18950412391582461 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5334387773013210775} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.7200007, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6094215904703124797} - - {fileID: 3776784192302853043} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4677038328536771600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5334387773013210775} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 5866831389832111959} - - {fileID: 4677679860326851275} - normalizedTime: 0.5 --- !u!1 &5369309633304206275 GameObject: m_ObjectHideFlags: 0 @@ -8659,6 +7709,14 @@ Transform: - {fileID: 1414146878655052017} - {fileID: 2950915037928140573} - {fileID: 3683868167554213922} + - {fileID: 7417620092316839188} + - {fileID: 6352785748787418662} + - {fileID: 6109906889177350440} + - {fileID: 2343112841751143705} + - {fileID: 3728383953658790377} + - {fileID: 2545254937096773809} + - {fileID: 3186210222664968616} + - {fileID: 2295743639765659419} m_Father: {fileID: 3491369334223495169} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9199,7 +8257,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6139239036923557578 +--- !u!1 &6219959128085394575 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9207,106 +8265,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4163366464383245483} - - component: {fileID: 7569747594531042009} + - component: {fileID: 7417620092316839188} m_Layer: 0 - m_Name: 'PlayerEnterDownCurve ' + m_Name: PlayerBallStart m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4163366464383245483 +--- !u!4 &7417620092316839188 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6139239036923557578} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.7200007, y: 0, z: 0} + m_GameObject: {fileID: 6219959128085394575} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.42, y: 3.146, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2473635718585767229} - - {fileID: 6360332931268404433} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 160995751921296168} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7569747594531042009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6139239036923557578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 8460481197307721620} - - {fileID: 5390601962849892087} - normalizedTime: 0.5 ---- !u!1 &6196199234994680671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 339712440083651917} - - component: {fileID: 3109352781688930449} - m_Layer: 0 - m_Name: PlayerExitUpCurve - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &339712440083651917 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6196199234994680671} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.7200007, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 311674539118372804} - - {fileID: 1234614012930633599} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3109352781688930449 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6196199234994680671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 3925141610230844464} - - {fileID: 8127602560730923833} - normalizedTime: 0.5 --- !u!1 &6228221319361193324 GameObject: m_ObjectHideFlags: 0 @@ -9391,54 +8372,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6240684586513503121 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5793400924267770470} - - component: {fileID: 2890700379947741735} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5793400924267770470 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6240684586513503121} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.489421, y: 0.5964288, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8143872481622385456} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2890700379947741735 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6240684586513503121} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 4967848311778099039} - handleType: 0 - leftHandleLocalPosition: {x: -0.75050807, y: 0.937541, z: -0} - rightHandleLocalPosition: {x: 0.75050807, y: -0.937541, z: 0} --- !u!1 &6278547609255102619 GameObject: m_ObjectHideFlags: 0 @@ -9556,60 +8489,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6454711984138343158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2611159277867949147} - - component: {fileID: 2585710245190304222} - m_Layer: 0 - m_Name: PlayerMissCurveFirst - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2611159277867949147 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6454711984138343158} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6759918959883080444} - - {fileID: 3136818324487038288} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2585710245190304222 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6454711984138343158} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 5916714868651647903} - - {fileID: 367772341545607604} - normalizedTime: 0.5 --- !u!1 &6504883005546643164 GameObject: m_ObjectHideFlags: 0 @@ -10730,60 +9609,6 @@ Transform: m_Father: {fileID: 3839262427627558499} m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -82.788} ---- !u!1 &7270962718849314288 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1644622483066383819} - - component: {fileID: 6348331742515097747} - m_Layer: 0 - m_Name: PlayerBarelyCurveSecond - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1644622483066383819 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7270962718849314288} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 506334474806219422} - - {fileID: 6321127610198793517} - m_Father: {fileID: 7783840079727272764} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6348331742515097747 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7270962718849314288} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - m_Name: - m_EditorClassIdentifier: - curveColor: {r: 0, g: 1, b: 0, a: 1} - startPointColor: {r: 1, g: 0, b: 0, a: 1} - endPointColor: {r: 0, g: 0, b: 1, a: 1} - sampling: 25 - keyPoints: - - {fileID: 2110329128289933520} - - {fileID: 9093600547120779704} - normalizedTime: 0.5 --- !u!1 &7300764452766650755 GameObject: m_ObjectHideFlags: 0 @@ -11726,7 +10551,6 @@ Transform: - {fileID: 3655014313607904575} - {fileID: 2357574740889550392} - {fileID: 5232656095193494954} - - {fileID: 6649979826100345915} - {fileID: 3491369334223495169} - {fileID: 2938443329441443770} - {fileID: 3423392819639917551} @@ -11786,16 +10610,16 @@ MonoBehaviour: shouldMiss: 1 spaceshipRisen: 0 spaceshipRising: 0 - playerEnterUpCurve: {fileID: 4677038328536771600} - playerEnterDownCurve: {fileID: 7569747594531042009} - playerExitUpCurve: {fileID: 3109352781688930449} - playerExitDownCurve: {fileID: 5083827629149980939} - playerMissCurveFirst: {fileID: 2585710245190304222} - playerMissCurveSecond: {fileID: 4303798721264846725} - playerBarelyCurveFirst: {fileID: 2815349102627779420} - playerBarelyCurveSecond: {fileID: 6348331742515097747} - playerWrongInputTooWeakFirstCurve: {fileID: 8607846603513681346} - playerWrongInputTooWeakSecondCurve: {fileID: 4967848311778099039} + playerEnterUpCurve: {fileID: 0} + playerEnterDownCurve: {fileID: 0} + playerExitUpCurve: {fileID: 0} + playerExitDownCurve: {fileID: 0} + playerMissCurveFirst: {fileID: 0} + playerMissCurveSecond: {fileID: 0} + playerBarelyCurveFirst: {fileID: 0} + playerBarelyCurveSecond: {fileID: 0} + playerWrongInputTooWeakFirstCurve: {fileID: 0} + playerWrongInputTooWeakSecondCurve: {fileID: 0} ballBouncePaths: - name: NPCBall preview: 1 @@ -11823,7 +10647,7 @@ MonoBehaviour: useLastRealPos: 0 values: [] - name: BGBall - preview: 1 + preview: 0 anchor: {fileID: 0} positions: - tag: @@ -11847,6 +10671,110 @@ MonoBehaviour: duration: 0 useLastRealPos: 0 values: [] + - name: PlayerEnter + preview: 1 + anchor: {fileID: 0} + positions: + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 7417620092316839188} + height: 2 + duration: 1 + useLastRealPos: 0 + values: [] + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 6352785748787418662} + height: 0 + duration: 0 + useLastRealPos: 0 + values: [] + - name: PlayerHit + preview: 1 + anchor: {fileID: 0} + positions: + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 6352785748787418662} + height: 2.5 + duration: 1 + useLastRealPos: 0 + values: [] + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 6109906889177350440} + height: 0 + duration: 0 + useLastRealPos: 0 + values: [] + - name: PlayerBarely + preview: 0 + anchor: {fileID: 0} + positions: + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 6352785748787418662} + height: 2.25 + duration: 1 + useLastRealPos: 0 + values: [] + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 2343112841751143705} + height: 3.5 + duration: 1 + useLastRealPos: 0 + values: [] + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 3728383953658790377} + height: 0 + duration: 0 + useLastRealPos: 0 + values: [] + - name: PlayerWeak + preview: 0 + anchor: {fileID: 0} + positions: + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 6352785748787418662} + height: 2.5 + duration: 1 + useLastRealPos: 0 + values: [] + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 2545254937096773809} + height: 0 + duration: 0 + useLastRealPos: 0 + values: [] + - name: PlayerMiss + preview: 1 + anchor: {fileID: 0} + positions: + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 6352785748787418662} + height: 0 + duration: 0.25 + useLastRealPos: 0 + values: [] + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 3186210222664968616} + height: 2.5 + duration: 0.75 + useLastRealPos: 0 + values: [] + - tag: + pos: {x: 0, y: 0, z: 0} + target: {fileID: 2295743639765659419} + height: 0 + duration: 0 + useLastRealPos: 0 + values: [] whiteArrowSprite: {fileID: 2459486580065207237, guid: 7d485aead8578964591aaea2653dec14, type: 3} redArrowSprite: {fileID: -2624536345262285176, guid: 7d485aead8578964591aaea2653dec14, type: 3} --- !u!1 &7902238381489812969 @@ -11879,7 +10807,7 @@ Transform: m_Children: - {fileID: 160995751921296168} m_Father: {fileID: 8664857966238409550} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7961625227087982507 GameObject: @@ -12195,54 +11123,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8106715541317775329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2385921571894669065} - - component: {fileID: 4393664911240074220} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2385921571894669065 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8106715541317775329} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.118283, y: -5.5189896, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8143872481622385456} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4393664911240074220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8106715541317775329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 4967848311778099039} - handleType: 0 - leftHandleLocalPosition: {x: -0.04068124, y: 0.45819384, z: -0} - rightHandleLocalPosition: {x: 0.04068124, y: -0.45819384, z: 0} --- !u!1 &8136029034988751351 GameObject: m_ObjectHideFlags: 0 @@ -12412,54 +11292,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8232188502012584666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3136818324487038288} - - component: {fileID: 367772341545607604} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3136818324487038288 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8232188502012584666} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.7473834, y: -1.9351656, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2611159277867949147} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &367772341545607604 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8232188502012584666} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 2585710245190304222} - handleType: 0 - leftHandleLocalPosition: {x: -0.052814946, y: 0.6983599, z: 0} - rightHandleLocalPosition: {x: 0.052814946, y: -0.6983599, z: -0} --- !u!1 &8291329675214913551 GameObject: m_ObjectHideFlags: 0 @@ -12515,54 +11347,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &8336874283566331191 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6321127610198793517} - - component: {fileID: 9093600547120779704} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6321127610198793517 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8336874283566331191} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.772492, y: -5.647245, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1644622483066383819} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9093600547120779704 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8336874283566331191} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 6348331742515097747} - handleType: 0 - leftHandleLocalPosition: {x: 0.049354088, y: 0.54134065, z: -0} - rightHandleLocalPosition: {x: -0.049354088, y: -0.54134065, z: 0} --- !u!1 &8366664867673554297 GameObject: m_ObjectHideFlags: 0 @@ -12612,7 +11396,7 @@ Transform: - {fileID: 3901538524071612339} - {fileID: 1030960646399742242} m_Father: {fileID: 8664857966238409550} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2613070465982707758 Animator: @@ -12635,54 +11419,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &8397963886048879667 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6759918959883080444} - - component: {fileID: 5916714868651647903} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6759918959883080444 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8397963886048879667} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.3549032, y: 0.4431952, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2611159277867949147} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5916714868651647903 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8397963886048879667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 2585710245190304222} - handleType: 0 - leftHandleLocalPosition: {x: -0.084014766, y: 0.5837196, z: 0} - rightHandleLocalPosition: {x: 0.084014766, y: -0.5837196, z: -0} --- !u!1 &8450850975469519049 GameObject: m_ObjectHideFlags: 0 @@ -13203,54 +11939,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8579862815669883576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6094215904703124797} - - component: {fileID: 5866831389832111959} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6094215904703124797 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8579862815669883576} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.315515, y: 3.1473956, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 18950412391582461} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5866831389832111959 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8579862815669883576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 4677038328536771600} - handleType: 0 - leftHandleLocalPosition: {x: -0.18039404, y: -0.4043522, z: -0} - rightHandleLocalPosition: {x: 0.18039404, y: 0.4043522, z: 0} --- !u!1 &8664274728945723262 GameObject: m_ObjectHideFlags: 0 @@ -13335,54 +12023,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8672511609939850519 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3776784192302853043} - - component: {fileID: 4677679860326851275} - m_Layer: 0 - m_Name: Point 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3776784192302853043 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8672511609939850519} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.157823, y: 4.350339, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 18950412391582461} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4677679860326851275 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8672511609939850519} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 4677038328536771600} - handleType: 0 - leftHandleLocalPosition: {x: -0.14865243, y: 0.452092, z: -0} - rightHandleLocalPosition: {x: 0.14865243, y: -0.452092, z: 0} --- !u!1 &8714274021258155895 GameObject: m_ObjectHideFlags: 0 @@ -13551,54 +12191,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8739572338679786561 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2294706646645103657} - - component: {fileID: 4174348017822876863} - m_Layer: 0 - m_Name: Point 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2294706646645103657 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8739572338679786561} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.9351816, y: -1.3013504, z: 0} - m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8647614307582174740} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4174348017822876863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8739572338679786561} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - m_Name: - m_EditorClassIdentifier: - curve: {fileID: 4303798721264846725} - handleType: 0 - leftHandleLocalPosition: {x: -0.5506031, y: 0.4502461, z: -0} - rightHandleLocalPosition: {x: 0.5506031, y: -0.4502461, z: 0} --- !u!1 &8743477896422201209 GameObject: m_ObjectHideFlags: 0 @@ -13800,6 +12392,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8924984926524429120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2343112841751143705} + m_Layer: 0 + m_Name: PlayerBallEndBarely + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2343112841751143705 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8924984926524429120} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.086, y: 3.43, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 160995751921296168} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9012092452911513656 GameObject: m_ObjectHideFlags: 0 @@ -13915,6 +12538,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9047876986366407061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2545254937096773809} + m_Layer: 0 + m_Name: WrongInputWeak + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2545254937096773809 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9047876986366407061} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.121, y: -5.539, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 160995751921296168} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9159990749478636517 GameObject: m_ObjectHideFlags: 0 @@ -13949,7 +12603,7 @@ Transform: - {fileID: 6818421548532227533} - {fileID: 1036993796492611867} m_Father: {fileID: 8664857966238409550} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2284918768942303106 Animator: diff --git a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs index 30bfccc1..d210347f 100644 --- a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs +++ b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs @@ -7,36 +7,190 @@ using HeavenStudio.Util; namespace HeavenStudio.Games.Scripts_WorkingDough { - public class PlayerEnterDoughBall : MonoBehaviour + public class PlayerEnterDoughBall : SuperCurveObject { - public double startBeat; - public float firstBeatsToTravel = 0.5f; - public float secondBeatsToTravel = 0.5f; - public bool goingDown = false; - public bool deletingAutomatically = true; - [NonSerialized] public BezierCurve3D firstCurve; - [NonSerialized] public BezierCurve3D secondCurve; + private enum State + { + None, + Entering, + Hit, + Barely, + Miss, + Weak + } + private State currentState; + + private double startBeat; + + private bool big; + + private Path enterPath; + private Path hitPath; + private Path barelyPath; + private Path missPath; + private Path weakPath; + + private WorkingDough game; + + private PlayerActionEvent wrongInput; + private PlayerActionEvent rightInput; + + private void Awake() + { + game = WorkingDough.instance; + } + + public void Init(double beat, bool isBig) + { + startBeat = beat; + big = isBig; + enterPath = game.GetPath("PlayerEnter"); + hitPath = game.GetPath("PlayerHit"); + barelyPath = game.GetPath("PlayerBarely"); + missPath = game.GetPath("PlayerMiss"); + weakPath = game.GetPath("PlayerWeak"); + rightInput = game.ScheduleInput(beat, 1, isBig ? InputType.STANDARD_ALT_DOWN : InputType.STANDARD_DOWN, Just, Miss, Empty); + wrongInput = game.ScheduleUserInput(beat, 1, isBig ? InputType.STANDARD_DOWN : InputType.STANDARD_ALT_DOWN, WrongInput, Empty, Empty); + currentState = State.Entering; + Update(); + } private void Update() { var cond = Conductor.instance; - float flyPos = 0f; - - if (goingDown) + if (cond.isPlaying && !cond.isPaused) { - flyPos = cond.GetPositionFromBeat(startBeat + firstBeatsToTravel, secondBeatsToTravel); + Vector3 pos = new Vector3(); + double beat = cond.songPositionInBeats; + switch (currentState) + { + case State.None: + break; + case State.Entering: + pos = GetPathPositionFromBeat(enterPath, Math.Max(beat, startBeat), startBeat); + break; + case State.Hit: + pos = GetPathPositionFromBeat(hitPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 1) + { + Destroy(gameObject); + } + break; + case State.Miss: + pos = GetPathPositionFromBeat(missPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 1) + { + Destroy(gameObject); + } + break; + case State.Weak: + pos = GetPathPositionFromBeat(weakPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 1) + { + Destroy(gameObject); + } + break; + case State.Barely: + pos = GetPathPositionFromBeat(barelyPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 2) + { + Destroy(gameObject); + } + break; + } + transform.position = pos; + } + } - transform.position = secondCurve.GetPoint(flyPos); - if (flyPos > 1f) if (deletingAutomatically) GameObject.Destroy(gameObject); + private void Just(PlayerActionEvent caller, float state) + { + wrongInput.Disable(); + double beat = Conductor.instance.songPositionInBeats; + startBeat = beat; + game.playerImpact.SetActive(true); + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(beat + 0.1f, delegate { game.playerImpact.SetActive(false); }), + }); + if (state >= 1f || state <= -1f) + { + currentState = State.Barely; + if (big) + { + SoundByte.PlayOneShotGame("workingDough/BigBarely"); + game.doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + } + else + { + SoundByte.PlayOneShotGame("workingDough/SmallBarely"); + game.doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + } + Update(); + return; + } + currentState = State.Hit; + if (big) + { + SoundByte.PlayOneShotGame("workingDough/rightBig"); + game.doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + game.backgroundAnimator.Play("BackgroundFlash", 0, 0); } else { - flyPos = cond.GetPositionFromBeat(startBeat, firstBeatsToTravel); - transform.position = firstCurve.GetPoint(flyPos); - if (flyPos > 1f) goingDown = true; + SoundByte.PlayOneShotGame("workingDough/rightSmall"); + game.doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + } + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(beat + 0.9f, delegate { game.arrowSRRightPlayer.sprite = game.redArrowSprite; }), + new BeatAction.Action(beat + 1f, delegate { game.arrowSRRightPlayer.sprite = game.whiteArrowSprite; }), + new BeatAction.Action(beat + 2f, delegate { game.SpawnBGBall(beat + 2f, big); }), + }); + Update(); + } + + private void WrongInput(PlayerActionEvent caller, float state) + { + double beat = Conductor.instance.songPositionInBeats; + rightInput.Disable(); + game.playerImpact.SetActive(true); + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(beat + 0.1f, delegate { game.playerImpact.SetActive(false); }), + }); + if (big) + { + currentState = State.Weak; + startBeat = beat; + game.doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + SoundByte.PlayOneShotGame("workingDough/BigBallTooWeak"); + Update(); + } + else + { + GameObject.Instantiate(game.breakParticleEffect, game.breakParticleHolder); + game.doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + SoundByte.PlayOneShotGame("workingDough/BreakBall"); + Destroy(gameObject); } } + + private void Miss(PlayerActionEvent caller) + { + double beat = caller.timer + caller.startBeat; + currentState = State.Miss; + startBeat = beat; + Update(); + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(beat + 0.25f, delegate { game.missImpact.SetActive(true); }), + new BeatAction.Action(beat + 0.25f, delegate { SoundByte.PlayOneShotGame("workingDough/BallMiss"); }), + new BeatAction.Action(beat + 0.35f, delegate { game.missImpact.SetActive(false); }), + }); + } + + private void Empty(PlayerActionEvent caller) { } } } diff --git a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs index aab302bd..a0037100 100644 --- a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs +++ b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs @@ -102,9 +102,7 @@ namespace HeavenStudio.Games.Loaders namespace HeavenStudio.Games { - using HeavenStudio.Games.Scripts_DoubleDate; using Scripts_WorkingDough; - using System.Net.Sockets; public class WorkingDough : Minigame { @@ -116,22 +114,22 @@ namespace HeavenStudio.Games [SerializeField] GameObject ballTransporterRightPlayer; //Close and open animations [SerializeField] GameObject ballTransporterLeftPlayer; //Close and open animations [SerializeField] GameObject npcImpact; - [SerializeField] GameObject playerImpact; + public GameObject playerImpact; [SerializeField] GameObject smallBallNPC; [SerializeField] GameObject bigBallNPC; [SerializeField] Transform ballHolder; [SerializeField] SpriteRenderer arrowSRLeftNPC; [SerializeField] SpriteRenderer arrowSRRightNPC; [SerializeField] SpriteRenderer arrowSRLeftPlayer; - [SerializeField] SpriteRenderer arrowSRRightPlayer; + public SpriteRenderer arrowSRRightPlayer; [SerializeField] GameObject NPCBallTransporters; [SerializeField] GameObject PlayerBallTransporters; [SerializeField] GameObject playerEnterSmallBall; [SerializeField] GameObject playerEnterBigBall; - [SerializeField] GameObject missImpact; - [SerializeField] Transform breakParticleHolder; - [SerializeField] GameObject breakParticleEffect; - [SerializeField] Animator backgroundAnimator; + public GameObject missImpact; + public Transform breakParticleHolder; + public GameObject breakParticleEffect; + public Animator backgroundAnimator; [SerializeField] Animator conveyerAnimator; [SerializeField] GameObject smallBGBall; [SerializeField] GameObject bigBGBall; @@ -164,8 +162,6 @@ namespace HeavenStudio.Games public double beat; public float interval; } - private List currentBalls = new List(); - public bool shouldMiss = true; public bool spaceshipRisen = false; public bool spaceshipRising = false; bool liftingDoughDudes; @@ -176,16 +172,6 @@ namespace HeavenStudio.Games string gandwMovingAnimName; [Header("Curves")] - public BezierCurve3D playerEnterUpCurve; - public BezierCurve3D playerEnterDownCurve; - public BezierCurve3D playerExitUpCurve; - public BezierCurve3D playerExitDownCurve; - public BezierCurve3D playerMissCurveFirst; - public BezierCurve3D playerMissCurveSecond; - public BezierCurve3D playerBarelyCurveFirst; - public BezierCurve3D playerBarelyCurveSecond; - public BezierCurve3D playerWrongInputTooWeakFirstCurve; - public BezierCurve3D playerWrongInputTooWeakSecondCurve; [SerializeField] SuperCurveObject.Path[] ballBouncePaths; new void OnDrawGizmos() { @@ -223,7 +209,6 @@ namespace HeavenStudio.Games void Start() { - shouldMiss = true; ballTriggerSetInterval = true; conveyerAnimator.Play("ConveyerBelt", 0, 0); doughDudesHolderAnim.Play("OnGround", 0, 0); @@ -401,11 +386,8 @@ namespace HeavenStudio.Games var spawnedBall = GameObject.Instantiate(objectToSpawn, ballHolder); var ballComponent = spawnedBall.GetComponent(); - ballComponent.startBeat = beat; - ballComponent.firstCurve = playerEnterUpCurve; - ballComponent.secondCurve = playerEnterDownCurve; - ballComponent.deletingAutomatically = false; - currentBalls.Add(spawnedBall); + spawnedBall.SetActive(true); + ballComponent.Init(beat, isBig); if (isBig && !bigModePlayer) { @@ -413,42 +395,13 @@ namespace HeavenStudio.Games bigModePlayer = true; } - //shouldMiss = true; - if (isBig) - { - ScheduleInput(beat, 1, InputType.STANDARD_ALT_DOWN, JustBig, MissBig, Nothing); - ScheduleUserInput(beat, 1, InputType.STANDARD_DOWN, WrongInputBig, Nothing, Nothing); - } - else - { - ScheduleInput(beat, 1, InputType.STANDARD_DOWN, JustSmall, MissSmall, Nothing); - ScheduleUserInput(beat, 1, InputType.STANDARD_ALT_DOWN, WrongInputSmall, Nothing, Nothing); - } - - BeatAction.New(doughDudesPlayer, new List() { - new BeatAction.Action(beat, delegate { spawnedBall.SetActive(true); }), new BeatAction.Action(beat, delegate { arrowSRLeftPlayer.sprite = redArrowSprite; }), new BeatAction.Action(beat + 0.1f, delegate { arrowSRLeftPlayer.sprite = whiteArrowSprite; }), }); } - public void SpawnPlayerBallResult(double beat, bool isBig, BezierCurve3D firstCurve, BezierCurve3D secondCurve, float firstBeatsToTravel, float secondBeatsToTravel) - { - var objectToSpawn = isBig ? playerEnterBigBall : playerEnterSmallBall; - var spawnedBall = GameObject.Instantiate(objectToSpawn, ballHolder); - - var ballComponent = spawnedBall.GetComponent(); - ballComponent.startBeat = beat; - ballComponent.firstCurve = firstCurve; - ballComponent.secondCurve = secondCurve; - ballComponent.firstBeatsToTravel = firstBeatsToTravel; - ballComponent.secondBeatsToTravel = secondBeatsToTravel; - - spawnedBall.SetActive(true); - } - public static void PreSetIntervalStart(double beat, float interval) { beat -= 1f; @@ -556,170 +509,7 @@ namespace HeavenStudio.Games } } - void WrongInputBig(PlayerActionEvent caller, float state) - { - double beat = caller.startBeat + caller.timer; - shouldMiss = false; - if (currentBalls.Count > 0) - { - GameObject currentBall = currentBalls[0]; - currentBalls.Remove(currentBall); - GameObject.Destroy(currentBall); - } - doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); - SoundByte.PlayOneShotGame("workingDough/BigBallTooWeak"); - SpawnPlayerBallResult(beat, true, playerWrongInputTooWeakFirstCurve, playerWrongInputTooWeakSecondCurve, 0.5f, 1f); - playerImpact.SetActive(true); - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + 0.1f, delegate { playerImpact.SetActive(false); }), - }); - } - - void WrongInputSmall(PlayerActionEvent caller, float state) - { - double beat = caller.startBeat + caller.timer; - shouldMiss = false; - if (currentBalls.Count > 0) - { - GameObject currentBall = currentBalls[0]; - currentBalls.Remove(currentBall); - GameObject.Destroy(currentBall); - } - GameObject.Instantiate(breakParticleEffect, breakParticleHolder); - doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); - SoundByte.PlayOneShotGame("workingDough/BreakBall"); - playerImpact.SetActive(true); - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + 0.1f, delegate { playerImpact.SetActive(false); }), - }); - } - - void MissBig(PlayerActionEvent caller) - { - if (!shouldMiss) - { - shouldMiss = true; - return; - } - if (currentBalls.Count > 0) - { - GameObject currentBall = currentBalls[0]; - currentBalls.Remove(currentBall); - GameObject.Destroy(currentBall); - } - - double beat = caller.startBeat + caller.timer; - SpawnPlayerBallResult(beat, true, playerMissCurveFirst, playerMissCurveSecond, 0.25f, 0.75f); - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + 0.25f, delegate { missImpact.SetActive(true); }), - new BeatAction.Action(beat + 0.25f, delegate { SoundByte.PlayOneShotGame("workingDough/BallMiss"); }), - new BeatAction.Action(beat + 0.35f, delegate { missImpact.SetActive(false); }), - }); - } - void MissSmall(PlayerActionEvent caller) - { - if (!shouldMiss) - { - shouldMiss = true; - return; - } - - if (currentBalls.Count > 0) - { - GameObject currentBall = currentBalls[0]; - currentBalls.Remove(currentBall); - GameObject.Destroy(currentBall); - } - double beat = caller.startBeat + caller.timer; - SpawnPlayerBallResult(beat, false, playerMissCurveFirst, playerMissCurveSecond, 0.25f, 0.75f); - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + 0.25f, delegate { missImpact.SetActive(true); }), - new BeatAction.Action(beat + 0.25f, delegate { SoundByte.PlayOneShotGame("workingDough/BallMiss"); }), - new BeatAction.Action(beat + 0.35f, delegate { missImpact.SetActive(false); }), - }); - } - - void JustSmall(PlayerActionEvent caller, float state) - { - if (GameManager.instance.currentGame != "workingDough") return; - double beat = caller.startBeat + caller.timer; - if (currentBalls.Count > 0) - { - GameObject currentBall = currentBalls[0]; - currentBalls.Remove(currentBall); - GameObject.Destroy(currentBall); - } - if (state >= 1f || state <= -1f) - { - SoundByte.PlayOneShotGame("workingDough/SmallBarely"); - doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); - - playerImpact.SetActive(true); - SpawnPlayerBallResult(beat, false, playerBarelyCurveFirst, playerBarelyCurveSecond, 0.75f, 1f); - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + 0.1f, delegate { playerImpact.SetActive(false); }), - }); - return; - } - Success(false, beat); - } - - void JustBig(PlayerActionEvent caller, float state) - { - if (GameManager.instance.currentGame != "workingDough") return; - double beat = caller.startBeat + caller.timer; - if (currentBalls.Count > 0) - { - GameObject currentBall = currentBalls[0]; - currentBalls.Remove(currentBall); - GameObject.Destroy(currentBall); - } - if (state >= 1f || state <= -1f) - { - SoundByte.PlayOneShotGame("workingDough/BigBarely"); - doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); - - playerImpact.SetActive(true); - SpawnPlayerBallResult(beat, true, playerBarelyCurveFirst, playerBarelyCurveSecond, 0.75f, 1f); - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + 0.1f, delegate { playerImpact.SetActive(false); }), - }); - return; - } - Success(true, beat); - } - - void Success(bool isBig, double beat) - { - if (isBig) - { - SoundByte.PlayOneShotGame("workingDough/rightBig"); - doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); - backgroundAnimator.Play("BackgroundFlash", 0, 0); - } - else - { - SoundByte.PlayOneShotGame("workingDough/rightSmall"); - doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); - } - playerImpact.SetActive(true); - SpawnPlayerBallResult(beat, isBig, playerExitUpCurve, playerExitDownCurve, 0.5f, 0.5f); - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + 0.1f, delegate { playerImpact.SetActive(false); }), - new BeatAction.Action(beat + 0.9f, delegate { arrowSRRightPlayer.sprite = redArrowSprite; }), - new BeatAction.Action(beat + 1f, delegate { arrowSRRightPlayer.sprite = whiteArrowSprite; }), - new BeatAction.Action(beat + 2f, delegate { SpawnBGBall(beat + 2f, isBig); }), - }); - } - - void SpawnBGBall(double beat, bool isBig) + public void SpawnBGBall(double beat, bool isBig) { var objectToSpawn = isBig ? bigBGBall : smallBGBall; var spawnedBall = GameObject.Instantiate(objectToSpawn, ballHolder); diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 89a257b6..8462b72b 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index c63f7bb4..b79e6745 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 1415167567 +CRC: 1948290001 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/rvldough/common b/Assets/StreamingAssets/rvldough/common index e7139233..d8d44715 100644 Binary files a/Assets/StreamingAssets/rvldough/common and b/Assets/StreamingAssets/rvldough/common differ diff --git a/Assets/StreamingAssets/rvldough/common.manifest b/Assets/StreamingAssets/rvldough/common.manifest index 481bd2fa..d1f962ed 100644 --- a/Assets/StreamingAssets/rvldough/common.manifest +++ b/Assets/StreamingAssets/rvldough/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 3596492217 +CRC: 2220090338 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 26fc96c0b54cb5ee3474b9ad21d4b9e0 + Hash: 06d5394e1d51faa84944419ebe2ca495 TypeTreeHash: serializedVersion: 2 - Hash: 3668fa81f90fca9e5e9f534bf7badde8 + Hash: 7188f40e1d00b452805d78c9f260c8d4 HashAppended: 0 ClassTypes: - Class: 1 @@ -29,12 +29,8 @@ ClassTypes: Script: {instanceID: 0} - Class: 95 Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} - Class: 114 Script: {fileID: 11500000, guid: f589a35cd43c5a146b78729182754157, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 90b8363d14ba26043977a371000195e9, type: 3} - Class: 114