diff --git a/Assets/Resources/Games/holeInOne.prefab b/Assets/Resources/Games/holeInOne.prefab index 8f2eb2d63..60a98de32 100644 --- a/Assets/Resources/Games/holeInOne.prefab +++ b/Assets/Resources/Games/holeInOne.prefab @@ -2729,6 +2729,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1607601890976790793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2142611403677451511} + - component: {fileID: 6597112705859661764} + 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 &2142611403677451511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607601890976790793} + m_LocalRotation: {x: 0, y: -0.67559016, z: 0, w: 0.7372774} + m_LocalPosition: {x: 6.35, y: -1, z: 30} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4656712784730920898} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -85, z: 0} +--- !u!114 &6597112705859661764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607601890976790793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 6420911823280351630} + handleType: 1 + leftHandleLocalPosition: {x: -1, y: 4, z: 0} + rightHandleLocalPosition: {x: 0.056346416, y: 0.73250866, z: 0} --- !u!1 &1610868463735896651 GameObject: m_ObjectHideFlags: 0 @@ -3065,6 +3113,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1704392712012921621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2963023434199100905} + - component: {fileID: 8525341335454303946} + 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 &2963023434199100905 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704392712012921621} + m_LocalRotation: {x: 0, y: -0.67559016, z: 0, w: 0.7372774} + m_LocalPosition: {x: 2.52, y: -3.13, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4656712784730920898} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -85, z: 0} +--- !u!114 &8525341335454303946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704392712012921621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 6420911823280351630} + handleType: 0 + leftHandleLocalPosition: {x: -1, y: -4, z: -0} + rightHandleLocalPosition: {x: 1, y: 4, z: 0} --- !u!1 &1765198128412016064 GameObject: m_ObjectHideFlags: 0 @@ -3642,6 +3738,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1951247466490062912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8265414545834111624} + - component: {fileID: 9164498598057993766} + m_Layer: 0 + m_Name: holeinonetemplate01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8265414545834111624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951247466490062912} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.09, y: 1.09, z: 1.09} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 636659541992093527} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &9164498598057993766 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951247466490062912} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1098 + m_Sprite: {fileID: 21300000, guid: f71e9c7d93a5e5c499da8e822ffe9b2c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 16.31, y: 9.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1976950562738600384 GameObject: m_ObjectHideFlags: 0 @@ -4421,6 +4601,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2351421268806171371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7690258814147639330} + - component: {fileID: 4607595400578525357} + m_Layer: 0 + m_Name: Point 5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7690258814147639330 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351421268806171371} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.832326, y: -10.615572, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1648200461975715686} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4607595400578525357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351421268806171371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3694819167149003539} + handleType: 0 + leftHandleLocalPosition: {x: 0, y: 0, z: 0} + rightHandleLocalPosition: {x: -0, y: -0, z: -0} --- !u!1 &2368784442615812358 GameObject: m_ObjectHideFlags: 0 @@ -5876,6 +6104,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3063259220594795026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9182666988805246944} + - component: {fileID: 5466931812515423327} + 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 &9182666988805246944 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063259220594795026} + m_LocalRotation: {x: 0, y: -0.67559016, z: 0, w: 0.7372774} + m_LocalPosition: {x: 2.52, y: -3.13, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4622195704056432987} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -85, z: 0} +--- !u!114 &5466931812515423327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063259220594795026} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4469941964774129089} + handleType: 0 + leftHandleLocalPosition: {x: -1, y: -4, z: -0} + rightHandleLocalPosition: {x: 1, y: 4, z: 0} --- !u!1 &3066682295002551920 GameObject: m_ObjectHideFlags: 0 @@ -6947,6 +7223,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3828585555983453898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5640354663916970622} + - component: {fileID: 7968289823961152998} + 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 &5640354663916970622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3828585555983453898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.04, y: -2.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1648200461975715686} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7968289823961152998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3828585555983453898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3694819167149003539} + handleType: 0 + leftHandleLocalPosition: {x: -0.5, y: -1, z: -0} + rightHandleLocalPosition: {x: 0.5, y: 1, z: 0} --- !u!1 &3851867466914541856 GameObject: m_ObjectHideFlags: 0 @@ -7873,6 +8197,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4341295236703401772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8657955742988574439} + - component: {fileID: 1914983247931917111} + 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 &8657955742988574439 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4341295236703401772} + m_LocalRotation: {x: 0, y: -0.67559016, z: 0, w: 0.7372774} + m_LocalPosition: {x: 4.56, y: 9.6, z: 15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4622195704056432987} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -85, z: 0} +--- !u!114 &1914983247931917111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4341295236703401772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4469941964774129089} + handleType: 0 + leftHandleLocalPosition: {x: -10, y: 0, z: 0} + rightHandleLocalPosition: {x: 10, y: -0, z: -0} --- !u!1 &4354891621362784151 GameObject: m_ObjectHideFlags: 0 @@ -8125,6 +8497,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4395053732119754670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5175220986144006878} + - component: {fileID: 1081517112233421212} + m_Layer: 0 + m_Name: Point 4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5175220986144006878 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4395053732119754670} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.31, y: -3.58, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1648200461975715686} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1081517112233421212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4395053732119754670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3694819167149003539} + handleType: 1 + leftHandleLocalPosition: {x: -0.5, y: 1, z: 0} + rightHandleLocalPosition: {x: 0, y: 0, z: 0} --- !u!1 &4418373608848068111 GameObject: m_ObjectHideFlags: 0 @@ -8895,6 +9315,40 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4855879272077742761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8357211325251673414} + m_Layer: 0 + m_Name: Curves + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8357211325251673414 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4855879272077742761} + 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: 1648200461975715686} + - {fileID: 4656712784730920898} + - {fileID: 4622195704056432987} + m_Father: {fileID: 636659541992093527} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4907677937887375153 GameObject: m_ObjectHideFlags: 0 @@ -8979,6 +9433,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4944950006134969415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6946514253142099977} + - component: {fileID: 1041231151215378450} + 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 &6946514253142099977 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4944950006134969415} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.22, y: -0.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1648200461975715686} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1041231151215378450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4944950006134969415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3694819167149003539} + handleType: 0 + leftHandleLocalPosition: {x: -0.5, y: 0, z: -0} + rightHandleLocalPosition: {x: 0.5, y: -0, z: 0} --- !u!1 &4953150470076979894 GameObject: m_ObjectHideFlags: 0 @@ -9063,6 +9565,106 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4975743608865464519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2703913284981951096} + - component: {fileID: 2904760388703718264} + - component: {fileID: 1624201428776536869} + m_Layer: 0 + m_Name: Golfball + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2703913284981951096 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4975743608865464519} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.35, y: -1, z: 30} + m_LocalScale: {x: 0.52502996, y: 0.52502996, z: 0.52502996} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 636659541992093527} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2904760388703718264 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4975743608865464519} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3606 + m_Sprite: {fileID: -599296320, guid: 6a97c44914e3eef419dcacfaf9513069, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.35, y: 5.08} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1624201428776536869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4975743608865464519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae79da0792289be4d8e1d58a85b7534f, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: + - {fileID: 3694819167149003539} + - {fileID: 6420911823280351630} --- !u!1 &5036242904328752933 GameObject: m_ObjectHideFlags: 0 @@ -9433,6 +10035,62 @@ Transform: m_Father: {fileID: 4903132462735974546} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5322482517188817583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4656712784730920898} + - component: {fileID: 6420911823280351630} + m_Layer: 0 + m_Name: MonkeyHitCurve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4656712784730920898 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5322482517188817583} + 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: 2963023434199100905} + - {fileID: 3659220466966571557} + - {fileID: 2142611403677451511} + m_Father: {fileID: 8357211325251673414} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6420911823280351630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5322482517188817583} + 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: 100 + keyPoints: + - {fileID: 8525341335454303946} + - {fileID: 7345200466558056777} + - {fileID: 6597112705859661764} + normalizedTime: 0.5 --- !u!1 &5385393719903914169 GameObject: m_ObjectHideFlags: 0 @@ -11553,6 +12211,68 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6746411198498727226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1648200461975715686} + - component: {fileID: 3694819167149003539} + m_Layer: 0 + m_Name: MonkeyThrowCurve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1648200461975715686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6746411198498727226} + 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: 5640354663916970622} + - {fileID: 6946514253142099977} + - {fileID: 595468978381890626} + - {fileID: 2773403379580152402} + - {fileID: 5175220986144006878} + - {fileID: 7690258814147639330} + m_Father: {fileID: 8357211325251673414} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3694819167149003539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6746411198498727226} + 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: 100 + keyPoints: + - {fileID: 7968289823961152998} + - {fileID: 1041231151215378450} + - {fileID: 4313321448683805788} + - {fileID: 4378353263514397354} + - {fileID: 1081517112233421212} + - {fileID: 4607595400578525357} + normalizedTime: 0.24 --- !u!1 &6750300643412248885 GameObject: m_ObjectHideFlags: 0 @@ -11838,6 +12558,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6864707319807643595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3659220466966571557} + - component: {fileID: 7345200466558056777} + 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 &3659220466966571557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6864707319807643595} + m_LocalRotation: {x: 0, y: -0.67559016, z: 0, w: 0.7372774} + m_LocalPosition: {x: 4.56, y: 9.6, z: 15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4656712784730920898} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -85, z: 0} +--- !u!114 &7345200466558056777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6864707319807643595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 6420911823280351630} + handleType: 0 + leftHandleLocalPosition: {x: -10, y: 0, z: 0} + rightHandleLocalPosition: {x: 10, y: -0, z: -0} --- !u!1 &6880473131782831052 GameObject: m_ObjectHideFlags: 0 @@ -12902,6 +13670,62 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7219420599284781521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4622195704056432987} + - component: {fileID: 4469941964774129089} + m_Layer: 0 + m_Name: WhaleHitCurve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4622195704056432987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7219420599284781521} + 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: 9182666988805246944} + - {fileID: 8657955742988574439} + - {fileID: 3932939299116462442} + m_Father: {fileID: 8357211325251673414} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4469941964774129089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7219420599284781521} + 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: 100 + keyPoints: + - {fileID: 5466931812515423327} + - {fileID: 1914983247931917111} + - {fileID: 8687044772084021743} + normalizedTime: 0.5 --- !u!1 &7230235724437797140 GameObject: m_ObjectHideFlags: 0 @@ -14787,6 +15611,9 @@ Transform: - {fileID: 4788019320808320700} - {fileID: 4903132462735974546} - {fileID: 8428162823760281723} + - {fileID: 8357211325251673414} + - {fileID: 8265414545834111624} + - {fileID: 2703913284981951096} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14804,6 +15631,7 @@ MonoBehaviour: m_EditorClassIdentifier: SoundSequences: [] scheduledInputs: [] + baseBall: {fileID: 4975743608865464519} MonkeyAnim: {fileID: 1030266998071523622} MonkeyHeadAnim: {fileID: 705573325190657106} MandrillAnim: {fileID: 7328032147480881436} @@ -15064,6 +15892,102 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8262222652987112771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 595468978381890626} + - component: {fileID: 4313321448683805788} + 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 &595468978381890626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8262222652987112771} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.52, y: -3.13, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1648200461975715686} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4313321448683805788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8262222652987112771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3694819167149003539} + handleType: 1 + leftHandleLocalPosition: {x: -0.5, y: 1, z: 0} + rightHandleLocalPosition: {x: 0.5, y: 1, z: 0} +--- !u!1 &8273035080299877642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3932939299116462442} + - component: {fileID: 8687044772084021743} + 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 &3932939299116462442 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8273035080299877642} + m_LocalRotation: {x: 0, y: -0.67559016, z: 0, w: 0.7372774} + m_LocalPosition: {x: 6.35, y: -0.2, z: 30} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4622195704056432987} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -85, z: 0} +--- !u!114 &8687044772084021743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8273035080299877642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4469941964774129089} + handleType: 1 + leftHandleLocalPosition: {x: -1, y: 4, z: 0} + rightHandleLocalPosition: {x: 0.056346416, y: 0.73250866, z: 0} --- !u!1 &8298379171508914106 GameObject: m_ObjectHideFlags: 0 @@ -16030,6 +16954,54 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8937208307448163839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2773403379580152402} + - component: {fileID: 4378353263514397354} + m_Layer: 0 + m_Name: Point 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2773403379580152402 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8937208307448163839} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.45, y: -2.07, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1648200461975715686} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4378353263514397354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8937208307448163839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3694819167149003539} + handleType: 0 + leftHandleLocalPosition: {x: -0.25, y: 0, z: 0} + rightHandleLocalPosition: {x: 0.25, y: -0, z: -0} --- !u!1 &8939842727410465661 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/HoleInOne/Ball.cs b/Assets/Scripts/Games/HoleInOne/Ball.cs new file mode 100644 index 000000000..e14cb246e --- /dev/null +++ b/Assets/Scripts/Games/HoleInOne/Ball.cs @@ -0,0 +1,91 @@ +using System.Collections.Generic; +using UnityEngine; +using NaughtyBezierCurves; + +namespace HeavenStudio.Games.Scripts_HoleInOne +{ + using HeavenStudio.Util; + public class Ball : MonoBehaviour + { + [System.NonSerialized] public double startBeat; + private double currentBeat; + + public BezierCurve3D[] curve; + private BezierCurve3D currentCurve; + + private HoleInOne game; + + public void Init() + { + game = HoleInOne.instance; + currentCurve = curve[0]; + currentBeat = startBeat + 1; + game.ScheduleInput(startBeat, 2f, HoleInOne.InputAction_FlickPress, MonkeySuccess, MonkeyMiss, Empty); + } + void Update() + { + var cond = Conductor.instance; + + if (currentCurve is not null) + { + if (currentCurve == curve[0]) + { + float curveProg = cond.GetPositionFromBeat(currentBeat, 3); + if (curveProg > 0.55f) curveProg = (curveProg - 0.55f)/4 + 0.55f; + transform.position = currentCurve.GetPoint(curveProg); + } + else if (currentCurve == curve[1]) + { + float curveProg = cond.GetPositionFromBeat(currentBeat, 2); + transform.position = currentCurve.GetPoint(curveProg); + } + } + } + + public void MonkeySuccess(PlayerActionEvent caller, float state) + { + if (state >= 1f || state <= -1f) + { + double beat = caller.startBeat + caller.timer; + + SoundByte.PlayOneShotGame("holeInOne/mandrill1"); // temp should be barely + SoundByte.PlayOneShotGame("holeInOne/hole2", beat + 1f); // temp should be splash + + game.MonkeyHeadAnim.DoScaledAnimationAsync("MonkeyMissHead", 1f); + game.GolferAnim.Play("GolferWhiff", 0, 0); + } + else + { + double beat = caller.startBeat + caller.timer; + int randomSuccess = UnityEngine.Random.Range(1,4); + + currentCurve = curve[1]; + currentBeat = beat; + + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound("holeInOne/monkey3", beat), + new MultiSound.Sound((game.isWhale) ? "holeInOne/whale" : ("holeInOne/hole" + randomSuccess), beat + 2f) + }); + + BeatAction.New(game, new List() + { + new BeatAction.Action(beat, delegate { game.MonkeyHeadAnim.DoScaledAnimationAsync("MonkeyJustHead", 1f);}), + new BeatAction.Action(beat, delegate { game.GolferAnim.Play("GolferJust", 0, 0);}), + new BeatAction.Action(beat + 1.5f, delegate { game.Hole.SetActive(true);}), + new BeatAction.Action(beat + 2f, delegate { + game.HoleAnim.DoScaledAnimationAsync("ZoomSmall" + randomSuccess, 1f); + Destroy(gameObject); + }), + }); + } + } + + public void MonkeyMiss(PlayerActionEvent caller) + { + SoundByte.PlayOneShotGame("holeInOne/whale"); + game.MonkeyHeadAnim.DoScaledAnimationAsync("MonkeySadHead", 1f); + } + + public void Empty(PlayerActionEvent caller) {} + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/HoleInOne/Ball.cs.meta b/Assets/Scripts/Games/HoleInOne/Ball.cs.meta new file mode 100644 index 000000000..742429ae0 --- /dev/null +++ b/Assets/Scripts/Games/HoleInOne/Ball.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ae79da0792289be4d8e1d58a85b7534f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index a90954fe0..33f7f3c38 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -60,8 +60,11 @@ namespace HeavenStudio.Games.Loaders namespace HeavenStudio.Games { + using Scripts_HoleInOne; public class HoleInOne : Minigame { + [SerializeField] GameObject baseBall; + public Animator MonkeyAnim; public Animator MonkeyHeadAnim; public Animator MandrillAnim; @@ -74,7 +77,7 @@ namespace HeavenStudio.Games double whaleStartBeat; float whaleLength; Util.EasingFunction.Ease lastEase; - bool isWhale; + public bool isWhale { get; private set; } public static HoleInOne instance; @@ -151,7 +154,7 @@ namespace HeavenStudio.Games public void DoMonkey(double beat) { //Monkey Multisound - ScheduleInput(beat, 2f, InputAction_FlickPress, MonkeySuccess, MonkeyMiss, Empty); + // ScheduleInput(beat, 2f, InputAction_FlickPress, MonkeySuccess, MonkeyMiss, Empty); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("holeInOne/monkey1", beat), new MultiSound.Sound("holeInOne/monkey2", beat + 1f) @@ -170,7 +173,7 @@ namespace HeavenStudio.Games } }), }); - + SpawnBall(beat); } public void DoMandrill(double beat) @@ -203,6 +206,20 @@ namespace HeavenStudio.Games }); } + public void SpawnBall(double beat) + { + var newBall = Instantiate(baseBall, transform).GetComponent(); + newBall.startBeat = beat; + + BeatAction.New(instance, new List() + { + new BeatAction.Action(beat + 1f, delegate { + newBall.gameObject.SetActive(true); + newBall.Init(); + }), + }); + } + public void MonkeySuccess(PlayerActionEvent caller, float state) { if (state >= 1f || state <= -1f)