diff --git a/Assets/Resources/Games/monkeyWatch.prefab b/Assets/Resources/Games/monkeyWatch.prefab index 846e8e15e..4cc51eb21 100644 --- a/Assets/Resources/Games/monkeyWatch.prefab +++ b/Assets/Resources/Games/monkeyWatch.prefab @@ -25,7 +25,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 156114541413994899} m_LocalRotation: {x: -0, y: -0, z: -0.8662933, w: 0.4995357} - m_LocalPosition: {x: -3.6483045, y: -14.94068, z: 0} + m_LocalPosition: {x: -3.6483045, y: -14.959, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -109,7 +109,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 253777050029903901} m_LocalRotation: {x: -0, y: -0, z: -0.7128753, w: -0.7012908} - m_LocalPosition: {x: -4.2281895, y: 14.953458, z: 0} + m_LocalPosition: {x: -4.2281895, y: 14.935138, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -168,6 +168,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &592800256640762048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6735250992240119410} + - component: {fileID: 7608272421746937287} + m_Layer: 0 + m_Name: YellowMonkey_28 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6735250992240119410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592800256640762048} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5385705, y: 1.5385705, z: 2.6126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1686621416582726728} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7608272421746937287 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592800256640762048} + 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: 0 + m_Sprite: {fileID: 683105700, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.4821601, y: 0.4821601} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1093165643910593156 GameObject: m_ObjectHideFlags: 0 @@ -257,7 +341,7 @@ Transform: - {fileID: 161246764106563782} - {fileID: 37240736623304726} m_Father: {fileID: 1686621416582726728} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1171140317736181713 GameObject: @@ -289,7 +373,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5562978246931285597 SpriteRenderer: @@ -343,6 +427,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1284014777246453483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8780894261125288743} + - component: {fileID: 3461885701859348872} + m_Layer: 0 + m_Name: PlayerTail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8780894261125288743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284014777246453483} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.5673, y: 13.591699, z: 0} + m_LocalScale: {x: 1.6557397, y: 1.794776, z: 2.7171} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6857749598573628903} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3461885701859348872 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284014777246453483} + 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: 200 + m_Sprite: {fileID: -2092694573, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.4050145, y: 0.36644167} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1293908454457972224 GameObject: m_ObjectHideFlags: 0 @@ -415,7 +583,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -99 + m_SortingOrder: -30 m_Sprite: {fileID: 21300000, guid: 6faa141b7341553458d3535e756576c3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -541,7 +709,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5831099315923174886 SpriteRenderer: @@ -679,6 +847,39 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2079073155809214028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 609139906039373078} + m_Layer: 0 + m_Name: Clicker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &609139906039373078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079073155809214028} + 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: 6271887630250502503} + - {fileID: 5993038953420681816} + m_Father: {fileID: 6857749598573628903} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2081882596759050167 GameObject: m_ObjectHideFlags: 0 @@ -709,7 +910,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5367613348903352497 SpriteRenderer: @@ -774,7 +975,7 @@ GameObject: - component: {fileID: 5993038953420681816} - component: {fileID: 8955737251700282843} m_Layer: 0 - m_Name: YellowMonkey_76 + m_Name: ClickerArm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -788,11 +989,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2334397362798718387} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 4.625, z: 0} - m_LocalScale: {x: 1.669709, y: 1.6697091, z: 1} + m_LocalPosition: {x: 0.008, y: 4.6706, z: 0} + m_LocalScale: {x: 1.6697088, y: 1.669709, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6857749598573628903} + m_Father: {fileID: 609139906039373078} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8955737251700282843 @@ -835,13 +1036,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -100 m_Sprite: {fileID: -523591808, guid: ece735d14a3649247bd5b86a66019d14, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 0.21, y: 5.5092616} + m_Size: {x: 0.19224708, y: 5.595429} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -872,11 +1073,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367820749231898468} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 11.76, z: 0} - m_LocalScale: {x: 1.6697093, y: 1.6697093, z: 1} + m_LocalPosition: {x: 0, y: 11.8794, z: 0} + m_LocalScale: {x: 1.7178042, y: 1.7481207, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6857749598573628903} + m_Father: {fileID: 609139906039373078} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2387314989450282506 @@ -919,7 +1120,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -50 m_Sprite: {fileID: -564762824, guid: ece735d14a3649247bd5b86a66019d14, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -961,7 +1162,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2159345264992676150 SpriteRenderer: @@ -1177,7 +1378,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1147718863145115160 SpriteRenderer: @@ -1406,6 +1607,39 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: 0, y: 13, z: -0} rightHandleLocalPosition: {x: -0, y: -13, z: 0} +--- !u!1 &3748181812309650184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8942068904010798964} + m_Layer: 0 + m_Name: temp stuffs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8942068904010798964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3748181812309650184} + 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: 4782418002106772940} + - {fileID: 5278412575565414673} + m_Father: {fileID: 1686621416582726728} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4083551090923112138 GameObject: m_ObjectHideFlags: 0 @@ -1441,7 +1675,7 @@ Transform: - {fileID: 8941035294928859592} - {fileID: 3385939890402042842} m_Father: {fileID: 1686621416582726728} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.84} --- !u!114 &8661769715595319216 MonoBehaviour: @@ -1466,6 +1700,90 @@ MonoBehaviour: - {fileID: 6935418054945112298} - {fileID: 4335052544135725558} normalizedTime: 0.5 +--- !u!1 &4543285676734795338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7571079440285466234} + - component: {fileID: 7267817262236531716} + m_Layer: 0 + m_Name: PlayerBody + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7571079440285466234 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4543285676734795338} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0172, y: 13.536599, z: 0} + m_LocalScale: {x: 1.7306179, y: 1.7306179, z: 2.93871} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6857749598573628903} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7267817262236531716 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4543285676734795338} + 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: 100 + m_Sprite: {fileID: 440706406, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.42430088, y: 0.38572806} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4748793266959796018 GameObject: m_ObjectHideFlags: 0 @@ -1580,7 +1898,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8763064363709918995 SpriteRenderer: @@ -1748,7 +2066,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5181938697732512792 SpriteRenderer: @@ -1802,6 +2120,91 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5835830228640280674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3710552613722404842} + - component: {fileID: 7301157998668072044} + m_Layer: 0 + m_Name: Xendemo - Rhythm Heaven Fever Monkey Watch [Perfect] [4saLsULBgzY - 1147x645 + - 0m15s] + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3710552613722404842 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5835830228640280674} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.732, y: 14.001, z: 0} + m_LocalScale: {x: 1.1289809, y: 1.1289809, z: 0.8412674} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5278412575565414673} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7301157998668072044 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5835830228640280674} + 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: 0 + m_Sprite: {fileID: 21300000, guid: 16ddee6db5720024eb159360eebe2514, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 11.47, y: 6.45} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5867049997736846408 GameObject: m_ObjectHideFlags: 0 @@ -1832,7 +2235,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6240461511728878033 SpriteRenderer: @@ -1919,7 +2322,7 @@ Transform: - {fileID: 2661323725297967442} - {fileID: 1350481687627359037} m_Father: {fileID: 1686621416582726728} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5977093605341259449 GameObject: @@ -2119,7 +2522,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3470296300973884117 SpriteRenderer: @@ -2202,12 +2605,12 @@ Transform: m_LocalScale: {x: 1.3031, y: 1.3031, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8942068904010798964} - {fileID: 4831968824892514561} - {fileID: 5742479390175277464} - - {fileID: 4782418002106772940} - - {fileID: 5278412575565414673} - {fileID: 6857749598573628903} - {fileID: 3735448262030941676} + - {fileID: 6735250992240119410} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2227,10 +2630,10 @@ MonoBehaviour: EligibleHits: [] scheduledInputs: [] firstEnable: 0 - monkeyPlayer: {fileID: 0} + monkeyPlayer: {fileID: 5368117777341597701} watchHoleParent: {fileID: 3735448262030941676} - watchHole: {fileID: 8325540476350084961, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - watchHolesCurve: {fileID: 8661769715595319216} + yellowMonkey: {fileID: 3151069026564347634, guid: 224742d4a2c74034997943856f560054, type: 3} + purpleMonkey: {fileID: 3151069026564347634, guid: ee03844036eaebc479ce042d119d5cd2, type: 3} --- !u!1 &6250700901501120224 GameObject: m_ObjectHideFlags: 0 @@ -2315,6 +2718,174 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6539389666602189021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3410444831694215460} + - component: {fileID: 1265421471777553691} + m_Layer: 0 + m_Name: PlayerHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3410444831694215460 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6539389666602189021} + m_LocalRotation: {x: -0, y: -0, z: 0.5658727, w: 0.82449263} + m_LocalPosition: {x: -0.8804, y: 14.624, z: 0} + m_LocalScale: {x: 1.7237738, y: 1.7237738, z: 0.95869493} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6857749598573628903} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 68.926} +--- !u!212 &1265421471777553691 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6539389666602189021} + 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: 300 + m_Sprite: {fileID: -1233933164, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.23143685, y: 0.28929606} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6551626268420236709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 710596342594362836} + - component: {fileID: 7582590420113483295} + m_Layer: 0 + m_Name: PlayerHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &710596342594362836 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6551626268420236709} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0356, y: 14.113599, z: 0} + m_LocalScale: {x: 1.7449337, y: 1.7449337, z: 2.9630191} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6857749598573628903} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7582590420113483295 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6551626268420236709} + 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: 500 + m_Sprite: {fileID: 29727674, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.69431055, y: 0.44358727} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6571780553815766706 GameObject: m_ObjectHideFlags: 0 @@ -2388,7 +2959,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6614783093999779380} m_LocalRotation: {x: -0, y: -0, z: -0.968013, w: -0.25090015} - m_LocalPosition: {x: -14.626072, y: 3.7617562, z: 0} + m_LocalPosition: {x: -14.626072, y: 3.7434368, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2543,6 +3114,90 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: -13, y: 0, z: 0} rightHandleLocalPosition: {x: 13, y: -0, z: -0} +--- !u!1 &6796087565470159509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6838627173521912661} + - component: {fileID: 6880589601186314825} + m_Layer: 0 + m_Name: YellowMonkey_60 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6838627173521912661 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6796087565470159509} + m_LocalRotation: {x: -0, y: -0, z: -0.40354517, w: 0.9149597} + m_LocalPosition: {x: -0.512, y: 14.226999, z: 0} + m_LocalScale: {x: 1.723774, y: 1.723774, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6857749598573628903} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -47.6} +--- !u!212 &6880589601186314825 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6796087565470159509} + 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: 150 + m_Sprite: {fileID: -479455839, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 1 + m_DrawMode: 0 + m_Size: {x: 0.5400193, y: 0.17357764} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6834755543043645315 GameObject: m_ObjectHideFlags: 0 @@ -2573,7 +3228,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7653325416681495464 SpriteRenderer: @@ -2650,12 +3305,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7098018148536518346} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.3, z: 0} m_LocalScale: {x: 1.06, y: 1.06, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8933410290365592961} + - {fileID: 3710552613722404842} - {fileID: 5761781938020687976} - {fileID: 4389224782505009284} - {fileID: 2143492951294846680} @@ -2668,8 +3324,8 @@ Transform: - {fileID: 6067488354554747275} - {fileID: 4320555262758734133} - {fileID: 4751749522678915002} - m_Father: {fileID: 1686621416582726728} - m_RootOrder: 3 + m_Father: {fileID: 8942068904010798964} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7415731391529710915 GameObject: @@ -2680,6 +3336,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6857749598573628903} + - component: {fileID: 5368117777341597701} + - component: {fileID: 910339928251400446} m_Layer: 0 m_Name: WatchHand m_TagString: Untagged @@ -2699,11 +3357,50 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6271887630250502503} - - {fileID: 5993038953420681816} + - {fileID: 609139906039373078} + - {fileID: 710596342594362836} + - {fileID: 3410444831694215460} + - {fileID: 7571079440285466234} + - {fileID: 8780894261125288743} + - {fileID: 6838627173521912661} m_Father: {fileID: 1686621416582726728} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5368117777341597701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7415731391529710915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7855e771979ce7448c422fd15a506e1, type: 3} + m_Name: + m_EditorClassIdentifier: + rotation: 0 + anim: {fileID: 910339928251400446} +--- !u!95 &910339928251400446 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7415731391529710915} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7b252fc34669f4b4dbba542ae592d782, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8343086378342637247 GameObject: m_ObjectHideFlags: 0 @@ -2729,7 +3426,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8343086378342637247} m_LocalRotation: {x: -0, y: -0, z: -0.9999665, w: 0.008189243} - m_LocalPosition: {x: -14.401498, y: -4.45114, z: 0} + m_LocalPosition: {x: -14.401498, y: -4.4694595, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2813,7 +3510,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8420904038463819270} m_LocalRotation: {x: -0, y: -0, z: -0.8718059, w: -0.48985156} - m_LocalPosition: {x: -10.831672, y: 10.844826, z: 0} + m_LocalPosition: {x: -10.831672, y: 10.826506, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2902,8 +3599,8 @@ Transform: m_LocalScale: {x: 10, y: 10, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1686621416582726728} - m_RootOrder: 2 + m_Father: {fileID: 8942068904010798964} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2204014752877701783 SpriteRenderer: @@ -2987,7 +3684,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &46128562203911506 SpriteRenderer: @@ -3071,7 +3768,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5278412575565414673} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4509965350500699734 SpriteRenderer: @@ -3150,7 +3847,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8918308812907189968} m_LocalRotation: {x: -0, y: -0, z: -0.9700024, w: 0.24309543} - m_LocalPosition: {x: -10.711862, y: -10.810799, z: 0} + m_LocalPosition: {x: -10.711862, y: -10.829119, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Resources/Prefabs/Games/MonkeyWatch/PurpleMonkey.prefab b/Assets/Resources/Prefabs/Games/MonkeyWatch/PurpleMonkey.prefab index dd8b4fdfb..0deeb7bb4 100644 --- a/Assets/Resources/Prefabs/Games/MonkeyWatch/PurpleMonkey.prefab +++ b/Assets/Resources/Prefabs/Games/MonkeyWatch/PurpleMonkey.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 7591110402097765485} m_Layer: 0 - m_Name: purpleMonkey + m_Name: PurpleMonkey m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab b/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab index 5cc0699ee..ab5f93945 100644 --- a/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab +++ b/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab @@ -1,5 +1,89 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &687758037626901964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3455820221676178794} + - component: {fileID: 4757259206305383986} + m_Layer: 0 + m_Name: LeftHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3455820221676178794 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687758037626901964} + m_LocalRotation: {x: 0, y: 0, z: 0.095845714, w: 0.99539626} + m_LocalPosition: {x: 0.144, y: -0.2833, z: 0} + m_LocalScale: {x: 0.94, y: 0.73, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7591110402097765485} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11} +--- !u!212 &4757259206305383986 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687758037626901964} + 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: 500 + m_Sprite: {fileID: 2081031743, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.24, y: 0.22} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3151069026564347634 GameObject: m_ObjectHideFlags: 0 @@ -10,7 +94,7 @@ GameObject: m_Component: - component: {fileID: 7591110402097765485} m_Layer: 0 - m_Name: yellowMonkey + m_Name: YellowMonkey m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -27,7 +111,479 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6142637501679039689} + - {fileID: 578644443856048843} + - {fileID: 3003040404107589154} + - {fileID: 3455820221676178794} + - {fileID: 8968149438632956816} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4089771232471752769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5265099234145244097} + - component: {fileID: 2366047461711923922} + m_Layer: 0 + m_Name: inwatch_start + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5265099234145244097 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4089771232471752769} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.42, y: -1.274, z: 0} + m_LocalScale: {x: 0.8336579, y: 0.8336579, z: 0.8336579} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6142637501679039689} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2366047461711923922 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4089771232471752769} + 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: 200 + m_Sprite: {fileID: 21300000, guid: 6faa141b7341553458d3535e756576c3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.65, y: 5.43} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4387843619350040913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3003040404107589154} + - component: {fileID: 3314755753380406275} + m_Layer: 0 + m_Name: MonkeyBody + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3003040404107589154 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4387843619350040913} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.14, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7591110402097765485} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3314755753380406275 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4387843619350040913} + 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: 100 + m_Sprite: {fileID: -1651821594, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.3, y: 0.4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 1 + m_SpriteSortPoint: 0 +--- !u!1 &5844243359413133821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6142637501679039689} + m_Layer: 0 + m_Name: TEMPORARY (REFERENCE) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6142637501679039689 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5844243359413133821} + 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: 3166995515749266788} + - {fileID: 5265099234145244097} + m_Father: {fileID: 7591110402097765485} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6243094713370705484 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 578644443856048843} + - component: {fileID: 454223507615240516} + m_Layer: 0 + m_Name: MonkeyHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &578644443856048843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6243094713370705484} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7591110402097765485} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &454223507615240516 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6243094713370705484} + 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: 200 + m_Sprite: {fileID: 965511078, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8, y: 0.46} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8682960053982649928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8968149438632956816} + - component: {fileID: 6250790891827607859} + m_Layer: 0 + m_Name: RightHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8968149438632956816 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8682960053982649928} + m_LocalRotation: {x: 0, y: 0, z: -0.095845714, w: 0.99539626} + m_LocalPosition: {x: -0.149, y: -0.276, z: 0} + m_LocalScale: {x: 0.94, y: 0.73, z: 0.9891} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7591110402097765485} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -11} +--- !u!212 &6250790891827607859 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8682960053982649928} + 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: 500 + m_Sprite: {fileID: 2081031743, guid: ece735d14a3649247bd5b86a66019d14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.24, y: 0.22} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &1149232180709785067 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6142637501679039689} + m_Modifications: + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6362594358788386174, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7751086263875728498, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_MaskAlphaCutoff + value: 0.709 + objectReference: {fileID: 0} + - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8325540476350084961, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_Name + value: watchHole + objectReference: {fileID: 0} + - target: {fileID: 8325540476350084961, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} +--- !u!4 &3166995515749266788 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} + m_PrefabInstance: {fileID: 1149232180709785067} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab b/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab index 630d0b9d5..50a2e4584 100644 --- a/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab +++ b/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab @@ -193,8 +193,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6362594358788386174} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.105, z: 0} - m_LocalScale: {x: 0.29385445, y: 0.29385445, z: 0.29385445} + m_LocalPosition: {x: 0, y: 0.0969, z: 0} + m_LocalScale: {x: 0.3001723, y: 0.3001723, z: 0.3001723} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2594505700513810575} @@ -262,7 +262,7 @@ GameObject: - component: {fileID: 2594505700513810575} - component: {fileID: 4157700164771259173} m_Layer: 0 - m_Name: watchHole + m_Name: WatchHole m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/!ref/Xendemo - Rhythm Heaven Fever Monkey Watch [Perfect] [4saLsULBgzY - 1147x645 - 0m15s].png b/Assets/Resources/Sprites/Games/MonkeyWatch/!ref/Xendemo - Rhythm Heaven Fever Monkey Watch [Perfect] [4saLsULBgzY - 1147x645 - 0m15s].png new file mode 100644 index 000000000..0b79c2d95 Binary files /dev/null and b/Assets/Resources/Sprites/Games/MonkeyWatch/!ref/Xendemo - Rhythm Heaven Fever Monkey Watch [Perfect] [4saLsULBgzY - 1147x645 - 0m15s].png differ diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/!ref/Xendemo - Rhythm Heaven Fever Monkey Watch [Perfect] [4saLsULBgzY - 1147x645 - 0m15s].png.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/!ref/Xendemo - Rhythm Heaven Fever Monkey Watch [Perfect] [4saLsULBgzY - 1147x645 - 0m15s].png.meta new file mode 100644 index 000000000..b80318ce0 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/!ref/Xendemo - Rhythm Heaven Fever Monkey Watch [Perfect] [4saLsULBgzY - 1147x645 - 0m15s].png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 16ddee6db5720024eb159360eebe2514 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker.meta new file mode 100644 index 000000000..a8956759f --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 494a75e98e10de447a1353e203d69049 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim new file mode 100644 index 000000000..54fce0547 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Clap + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -5.71 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: rotation + path: + classID: 114 + script: {fileID: 11500000, guid: c7855e771979ce7448c422fd15a506e1, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 696031473 + script: {fileID: 11500000, guid: c7855e771979ce7448c422fd15a506e1, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -5.71 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: rotation + path: + classID: 114 + script: {fileID: 11500000, guid: c7855e771979ce7448c422fd15a506e1, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0 + functionName: UpdateRotation + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim.meta new file mode 100644 index 000000000..780b7308c --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf83bd7b64a2c86498891d2b6e711c8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/MonkeyClickerAnim.controller b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/MonkeyClickerAnim.controller new file mode 100644 index 000000000..cc7860b47 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/MonkeyClickerAnim.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-1618668153596642209 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 7801864362704695150} + m_Position: {x: 290, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1342921268367174585} + m_Position: {x: 30, y: 180, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1342921268367174585} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MonkeyClickerAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1618668153596642209} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1342921268367174585 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Nothing + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &7801864362704695150 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Clap + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: cf83bd7b64a2c86498891d2b6e711c8a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/MonkeyClickerAnim.controller.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/MonkeyClickerAnim.controller.meta new file mode 100644 index 000000000..fffa8a531 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/MonkeyClickerAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b252fc34669f4b4dbba542ae592d782 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole.meta new file mode 100644 index 000000000..c9a48c5a9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a39ac93ad36320c4ea97b04236621d14 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/HoleOpen.anim b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim similarity index 100% rename from Assets/Resources/Sprites/Games/MonkeyWatch/Animations/HoleOpen.anim rename to Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/HoleOpen.anim.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MonkeyWatch/Animations/HoleOpen.anim.meta rename to Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim.meta diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHoleAnim.controller b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/WatchHoleAnim.controller similarity index 100% rename from Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHoleAnim.controller rename to Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/WatchHoleAnim.controller diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHoleAnim.controller.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/WatchHoleAnim.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHoleAnim.controller.meta rename to Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/WatchHoleAnim.controller.meta diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkey.png b/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png similarity index 100% rename from Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkey.png rename to Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkey.png.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png.meta similarity index 99% rename from Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkey.png.meta rename to Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png.meta index b9adc6d8f..212d120ee 100644 --- a/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkey.png.meta +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 103.7 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -1704,13 +1704,13 @@ TextureImporter: name: YellowMonkey_76 rect: serializedVersion: 2 - x: 921 + x: 922 y: 452 - width: 21 - height: 41 + width: 20 + height: 39 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 5, z: 0, w: 0} + border: {x: 0, y: 7, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs new file mode 100644 index 000000000..d2e9c4d9c --- /dev/null +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs @@ -0,0 +1,51 @@ +using System.Collections; +using System.Collections.Generic; +using System; +using UnityEngine; +using NaughtyBezierCurves; + +using HeavenStudio.Util; + +namespace HeavenStudio.Games.Scripts_MonkeyWatch +{ + public class MonkeyClicker : MonoBehaviour + { + public float rotation; + + [Header("Animators")] + public Animator anim; + + private MonkeyWatch game; + + private void Awake() + { + game = MonkeyWatch.instance; + } + + private void Start() + { + + } + + private void Update() + { + + } + + // animation event + public void UpdateRotation() + { + gameObject.transform.localRotation = new Quaternion(0, 0, (gameObject.transform.localRotation.z - rotation), 0); + } + + private void Miss(PlayerActionEvent caller) + { + + } + + private void Out(PlayerActionEvent caller) + { + + } + } +} diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs.meta b/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs.meta new file mode 100644 index 000000000..d0b53af8f --- /dev/null +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c7855e771979ce7448c422fd15a506e1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index 0e73d7f9c..262440df4 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -16,13 +16,19 @@ namespace HeavenStudio.Games.Loaders { new GameAction("monkeysAppear", "Monkeys Appear") { - function = delegate {var e = eventCaller.currentEntity; MonkeyWatch.instance.MonkeysAppear(e.beat);}, + function = delegate { + var e = eventCaller.currentEntity; + MonkeyWatch.instance.MonkeysAppear(e.beat, e.length); + }, defaultLength = 2f, resizable = true }, new GameAction("startClapping", "Start Clapping") { - function = delegate {var e = eventCaller.currentEntity; MonkeyWatch.instance.Clapping(e.beat);}, + function = delegate { + var e = eventCaller.currentEntity; + MonkeyWatch.instance.Clapping(e.beat); + }, defaultLength = 2f, inactiveFunction = delegate {var e = eventCaller.currentEntity; MonkeyWatch.ClappingInactive(e.beat);}, }, @@ -32,10 +38,10 @@ namespace HeavenStudio.Games.Loaders parameters = new List() { new Param("mute", false, "Mute Cue", "Mute the offbeat monkeys's cue"), - new Param("custom", false, "Custom Cue", "Place the \"Custom\" "), + new Param("custom", false, "Custom Cue", "Place the \"Custom Monkey\" block 2 beats after the start of this one to create a custom purple monkey cue."), }, resizable = true, - inactiveFunction = delegate { var e = eventCaller.currentEntity; MonkeyWatch.WarnPurpleMonkeys(e.beat, e["mute"], e.length); }, + inactiveFunction = delegate { var e = eventCaller.currentEntity; MonkeyWatch.WarnPurpleMonkeys(e.beat, e.length, e["mute"]); }, }, new GameAction("customMonkey", "Custom Monkey") { @@ -44,7 +50,7 @@ namespace HeavenStudio.Games.Loaders { new Param("sfx", MonkeyWatch.SfxTypes.First, "Which SFX", "Choose between the first and second \"ki\" sfx") }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; MonkeyWatch.WarnPurpleMonkeys(e.beat, e["mute"], e.length); }, + inactiveFunction = delegate { var e = eventCaller.currentEntity; MonkeyWatch.WarnPurpleMonkeys(e.beat, e.length, e["mute"]); }, }, new GameAction("monkeyModifiers", "Monkey Modifiers") { @@ -67,11 +73,11 @@ namespace HeavenStudio.Games.Loaders namespace HeavenStudio.Games { - // using Scripts_MonkeyWatch; + using Scripts_MonkeyWatch; public class MonkeyWatch : Minigame { [Header("Animators")] - [SerializeField] Animator monkeyPlayer; + [SerializeField] MonkeyClicker monkeyPlayer; [Header("Objects")] [SerializeField] Transform watchHoleParent; @@ -81,8 +87,10 @@ namespace HeavenStudio.Games // unserialized variables below public enum SfxTypes { + None, First, Second, + Onbeat, } static List queuedInputs = new(); @@ -103,8 +111,9 @@ namespace HeavenStudio.Games public int sfx; } - static double wantClapping = Double.MinValue; - static bool startClapping; + static OffbeatMonkey wantOffbeat; + static double wantClapping = double.MinValue; + public static bool startedClapping; int lastMonkeyClapped; public static MonkeyWatch instance; @@ -120,15 +129,17 @@ namespace HeavenStudio.Games if (offbeatBeat >= Conductor.instance.songPositionInBeatsAsDouble) { var tempMonkeys = new List(); - for (int j = 0; j < customEvents.Count; j++) - { - if (customEvents[j].beat > offbeatBeat+2 - && customEvents[j].beat < offbeatBeat+offbeatEvents[i].length) + if (offbeatEvents[i]["custom"]) { + for (int j = 0; j < customEvents.Count; j++) { - tempMonkeys.Add(new CustomMonkey{ - beat = customEvents[j].beat, - sfx = customEvents[j]["sfx"] + 1, - }); + if (customEvents[j].beat > offbeatBeat+2 + && customEvents[j].beat < offbeatBeat+offbeatEvents[i].length) + { + tempMonkeys.Add(new CustomMonkey{ + beat = customEvents[j].beat, + sfx = customEvents[j]["sfx"], + }); + } } } offbeatMonkeys.Add(new OffbeatMonkey{ @@ -153,8 +164,17 @@ namespace HeavenStudio.Games public override void OnGameSwitch(double beat) { - if (wantClapping != double.MinValue) + if (wantOffbeat.length != 0) { + PurpleMonkeys(wantOffbeat.beat, wantOffbeat.length, wantOffbeat.mute); + wantOffbeat = new OffbeatMonkey{ + beat = 0, + length = 0, + mute = false, + monkeys = null, + }; + } + if (wantClapping != double.MinValue) { Clapping(wantClapping); wantClapping = double.MinValue; } @@ -165,6 +185,7 @@ namespace HeavenStudio.Games if (!Conductor.instance.NotStopped()) { if (queuedInputs.Count > 0) queuedInputs.Clear(); if (offbeatMonkeys.Count > 0) offbeatMonkeys.Clear(); + startedClapping = false; } foreach (var evt in scheduledInputs) @@ -178,7 +199,7 @@ namespace HeavenStudio.Games } - public void MonkeysAppear(double beat) + public void MonkeysAppear(double beat, float length) { } @@ -186,7 +207,7 @@ namespace HeavenStudio.Games public static void ClappingInactive(double beat) { wantClapping = beat; - startClapping = true; + startedClapping = true; } public void Clapping(double beat) @@ -201,8 +222,10 @@ namespace HeavenStudio.Games for (int i = 0; i < offbeatMonkeys.Count; i++) { - if (offbeatMonkeys[i].beat == beat) - PurpleMonkeys(beat, offbeatMonkeys[i].mute, offbeatMonkeys[i].monkeys); + if (offbeatMonkeys[i].beat == beat) { + PurpleMonkeys(beat, offbeatMonkeys[i].length, offbeatMonkeys[i].mute, offbeatMonkeys[i].monkeys); + PurpleMonkeySFX(beat, offbeatMonkeys[i].length, offbeatMonkeys[i].mute, offbeatMonkeys[i].monkeys); + } } BeatAction.New(gameObject, new List() { @@ -210,18 +233,26 @@ namespace HeavenStudio.Games }); } - public static void WarnPurpleMonkeys(double beat, bool mute, float length, CustomMonkey[] monkeys = null) + public static void WarnPurpleMonkeys(double beat, float length, bool mute) { - + wantOffbeat = new OffbeatMonkey{ + beat = beat, + length = length, + mute = mute, + }; + ClappingInactive(beat); + PurpleMonkeySFX(beat, length, mute); } - public static void PurpleMonkeySFX(double beat, bool mute, CustomMonkey[] monkeys = null) + public static void PurpleMonkeySFX(double beat, float length, bool mute, CustomMonkey[] monkeys = null) { - if (monkeys == null) - monkeys = new CustomMonkey[] { - new CustomMonkey{beat = beat + 2.5f, sfx = 1}, - new CustomMonkey{beat = beat + 3.5f, sfx = 2}, - }; + var tempMonkeys = new List(); + if (monkeys == null) { + for (int i = 2; i < length; i++) { + tempMonkeys.Add(new CustomMonkey{beat = beat + 0.5f + i, sfx = (i % 2 == 0 ? 1 : 2)}); + } + } + monkeys = tempMonkeys.ToArray(); var sfx = new List(); @@ -245,7 +276,7 @@ namespace HeavenStudio.Games MultiSound.Play(sfx.ToArray(), forcePlay: true); } - public void PurpleMonkeys(double beat, bool mute, CustomMonkey[] monkeys = null) + public void PurpleMonkeys(double beat, float length, bool mute, CustomMonkey[] monkeys = null) { if (monkeys == null) monkeys = new CustomMonkey[] { @@ -253,37 +284,36 @@ namespace HeavenStudio.Games new CustomMonkey{beat = beat + 3.5f, sfx = 2}, }; - PurpleMonkeySFX(beat, mute, monkeys); - for (int i = 0; i < monkeys.Length; i++) { - ScheduleInput(beat, monkeys[i].beat - beat, InputType.STANDARD_DOWN, JustPurple, Miss, Nothing); + ScheduleInput(beat, monkeys[i].beat - beat, InputType.STANDARD_DOWN, (monkeys[i].sfx == 3 ? JustYellow : JustPurple), Miss, Nothing); } } public void JustYellow(PlayerActionEvent caller, float state) { - lastMonkeyClapped++; - if (state >= 1f || state <= -1f) { - SoundByte.PlayOneShotGame("miss"); - } else { - SoundByte.PlayOneShotGame($"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 5)}"); - } + Just(state, true); } public void JustPurple(PlayerActionEvent caller, float state) + { + Just(state, false); + } + + void Just(float state, bool isYellow) { lastMonkeyClapped++; + monkeyPlayer.anim.DoScaledAnimationAsync("Clap", 0.5f); if (state >= 1f || state <= -1f) { - SoundByte.PlayOneShotGame("miss"); + SoundByte.PlayOneShot("miss"); } else { - SoundByte.PlayOneShotGame("monkeyWatch/clapOffbeat"); + SoundByte.PlayOneShotGame(isYellow ? $"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 5)}" : "monkeyWatch/clapOffbeat"); } } public void Miss(PlayerActionEvent caller) { - SoundByte.PlayOneShotGame("miss"); + SoundByte.PlayOneShot("miss"); } public void Nothing(PlayerActionEvent caller) {}