a few tweaks

committing to update the spritesheet
This commit is contained in:
AstrlJelly 2023-06-28 11:28:11 -04:00
parent e24378c58a
commit f92e003651
21 changed files with 1805 additions and 99 deletions

File diff suppressed because it is too large Load diff

View file

@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 7591110402097765485} - component: {fileID: 7591110402097765485}
m_Layer: 0 m_Layer: 0
m_Name: purpleMonkey m_Name: PurpleMonkey
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0

View file

@ -1,5 +1,89 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %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 --- !u!1 &3151069026564347634
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -10,7 +94,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 7591110402097765485} - component: {fileID: 7591110402097765485}
m_Layer: 0 m_Layer: 0
m_Name: yellowMonkey m_Name: YellowMonkey
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -27,7 +111,479 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 6142637501679039689}
- {fileID: 578644443856048843}
- {fileID: 3003040404107589154}
- {fileID: 3455820221676178794}
- {fileID: 8968149438632956816}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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}

View file

@ -193,8 +193,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6362594358788386174} m_GameObject: {fileID: 6362594358788386174}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.105, z: 0} m_LocalPosition: {x: 0, y: 0.0969, z: 0}
m_LocalScale: {x: 0.29385445, y: 0.29385445, z: 0.29385445} m_LocalScale: {x: 0.3001723, y: 0.3001723, z: 0.3001723}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2594505700513810575} m_Father: {fileID: 2594505700513810575}
@ -262,7 +262,7 @@ GameObject:
- component: {fileID: 2594505700513810575} - component: {fileID: 2594505700513810575}
- component: {fileID: 4157700164771259173} - component: {fileID: 4157700164771259173}
m_Layer: 0 m_Layer: 0
m_Name: watchHole m_Name: WatchHole
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0

View file

@ -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:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 494a75e98e10de447a1353e203d69049
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -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

View file

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

View file

@ -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:

View file

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

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a39ac93ad36320c4ea97b04236621d14
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 124 KiB

View file

@ -47,7 +47,7 @@ TextureImporter:
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 103.7
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
@ -1704,13 +1704,13 @@ TextureImporter:
name: YellowMonkey_76 name: YellowMonkey_76
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 921 x: 922
y: 452 y: 452
width: 21 width: 20
height: 41 height: 39
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} 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: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: 0

View file

@ -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)
{
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c7855e771979ce7448c422fd15a506e1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -16,13 +16,19 @@ namespace HeavenStudio.Games.Loaders
{ {
new GameAction("monkeysAppear", "Monkeys Appear") 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, defaultLength = 2f,
resizable = true resizable = true
}, },
new GameAction("startClapping", "Start Clapping") 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, defaultLength = 2f,
inactiveFunction = delegate {var e = eventCaller.currentEntity; MonkeyWatch.ClappingInactive(e.beat);}, inactiveFunction = delegate {var e = eventCaller.currentEntity; MonkeyWatch.ClappingInactive(e.beat);},
}, },
@ -32,10 +38,10 @@ namespace HeavenStudio.Games.Loaders
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("mute", false, "Mute Cue", "Mute the offbeat monkeys's cue"), 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, 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") 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") 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") new GameAction("monkeyModifiers", "Monkey Modifiers")
{ {
@ -67,11 +73,11 @@ namespace HeavenStudio.Games.Loaders
namespace HeavenStudio.Games namespace HeavenStudio.Games
{ {
// using Scripts_MonkeyWatch; using Scripts_MonkeyWatch;
public class MonkeyWatch : Minigame public class MonkeyWatch : Minigame
{ {
[Header("Animators")] [Header("Animators")]
[SerializeField] Animator monkeyPlayer; [SerializeField] MonkeyClicker monkeyPlayer;
[Header("Objects")] [Header("Objects")]
[SerializeField] Transform watchHoleParent; [SerializeField] Transform watchHoleParent;
@ -81,8 +87,10 @@ namespace HeavenStudio.Games
// unserialized variables below // unserialized variables below
public enum SfxTypes public enum SfxTypes
{ {
None,
First, First,
Second, Second,
Onbeat,
} }
static List<double> queuedInputs = new(); static List<double> queuedInputs = new();
@ -103,8 +111,9 @@ namespace HeavenStudio.Games
public int sfx; public int sfx;
} }
static double wantClapping = Double.MinValue; static OffbeatMonkey wantOffbeat;
static bool startClapping; static double wantClapping = double.MinValue;
public static bool startedClapping;
int lastMonkeyClapped; int lastMonkeyClapped;
public static MonkeyWatch instance; public static MonkeyWatch instance;
@ -120,6 +129,7 @@ namespace HeavenStudio.Games
if (offbeatBeat >= Conductor.instance.songPositionInBeatsAsDouble) if (offbeatBeat >= Conductor.instance.songPositionInBeatsAsDouble)
{ {
var tempMonkeys = new List<CustomMonkey>(); var tempMonkeys = new List<CustomMonkey>();
if (offbeatEvents[i]["custom"]) {
for (int j = 0; j < customEvents.Count; j++) for (int j = 0; j < customEvents.Count; j++)
{ {
if (customEvents[j].beat > offbeatBeat+2 if (customEvents[j].beat > offbeatBeat+2
@ -127,10 +137,11 @@ namespace HeavenStudio.Games
{ {
tempMonkeys.Add(new CustomMonkey{ tempMonkeys.Add(new CustomMonkey{
beat = customEvents[j].beat, beat = customEvents[j].beat,
sfx = customEvents[j]["sfx"] + 1, sfx = customEvents[j]["sfx"],
}); });
} }
} }
}
offbeatMonkeys.Add(new OffbeatMonkey{ offbeatMonkeys.Add(new OffbeatMonkey{
beat = offbeatBeat, beat = offbeatBeat,
mute = offbeatEvents[i]["mute"], mute = offbeatEvents[i]["mute"],
@ -153,8 +164,17 @@ namespace HeavenStudio.Games
public override void OnGameSwitch(double beat) 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); Clapping(wantClapping);
wantClapping = double.MinValue; wantClapping = double.MinValue;
} }
@ -165,6 +185,7 @@ namespace HeavenStudio.Games
if (!Conductor.instance.NotStopped()) { if (!Conductor.instance.NotStopped()) {
if (queuedInputs.Count > 0) queuedInputs.Clear(); if (queuedInputs.Count > 0) queuedInputs.Clear();
if (offbeatMonkeys.Count > 0) offbeatMonkeys.Clear(); if (offbeatMonkeys.Count > 0) offbeatMonkeys.Clear();
startedClapping = false;
} }
foreach (var evt in scheduledInputs) 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) public static void ClappingInactive(double beat)
{ {
wantClapping = beat; wantClapping = beat;
startClapping = true; startedClapping = true;
} }
public void Clapping(double beat) public void Clapping(double beat)
@ -201,8 +222,10 @@ namespace HeavenStudio.Games
for (int i = 0; i < offbeatMonkeys.Count; i++) for (int i = 0; i < offbeatMonkeys.Count; i++)
{ {
if (offbeatMonkeys[i].beat == beat) if (offbeatMonkeys[i].beat == beat) {
PurpleMonkeys(beat, offbeatMonkeys[i].mute, offbeatMonkeys[i].monkeys); 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<BeatAction.Action>() { BeatAction.New(gameObject, new List<BeatAction.Action>() {
@ -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) var tempMonkeys = new List<CustomMonkey>();
monkeys = new CustomMonkey[] { if (monkeys == null) {
new CustomMonkey{beat = beat + 2.5f, sfx = 1}, for (int i = 2; i < length; i++) {
new CustomMonkey{beat = beat + 3.5f, sfx = 2}, tempMonkeys.Add(new CustomMonkey{beat = beat + 0.5f + i, sfx = (i % 2 == 0 ? 1 : 2)});
}; }
}
monkeys = tempMonkeys.ToArray();
var sfx = new List<MultiSound.Sound>(); var sfx = new List<MultiSound.Sound>();
@ -245,7 +276,7 @@ namespace HeavenStudio.Games
MultiSound.Play(sfx.ToArray(), forcePlay: true); 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) if (monkeys == null)
monkeys = new CustomMonkey[] { monkeys = new CustomMonkey[] {
@ -253,37 +284,36 @@ namespace HeavenStudio.Games
new CustomMonkey{beat = beat + 3.5f, sfx = 2}, new CustomMonkey{beat = beat + 3.5f, sfx = 2},
}; };
PurpleMonkeySFX(beat, mute, monkeys);
for (int i = 0; i < monkeys.Length; i++) 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) public void JustYellow(PlayerActionEvent caller, float state)
{ {
lastMonkeyClapped++; Just(state, true);
if (state >= 1f || state <= -1f) {
SoundByte.PlayOneShotGame("miss");
} else {
SoundByte.PlayOneShotGame($"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 5)}");
}
} }
public void JustPurple(PlayerActionEvent caller, float state) public void JustPurple(PlayerActionEvent caller, float state)
{
Just(state, false);
}
void Just(float state, bool isYellow)
{ {
lastMonkeyClapped++; lastMonkeyClapped++;
monkeyPlayer.anim.DoScaledAnimationAsync("Clap", 0.5f);
if (state >= 1f || state <= -1f) { if (state >= 1f || state <= -1f) {
SoundByte.PlayOneShotGame("miss"); SoundByte.PlayOneShot("miss");
} else { } else {
SoundByte.PlayOneShotGame("monkeyWatch/clapOffbeat"); SoundByte.PlayOneShotGame(isYellow ? $"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 5)}" : "monkeyWatch/clapOffbeat");
} }
} }
public void Miss(PlayerActionEvent caller) public void Miss(PlayerActionEvent caller)
{ {
SoundByte.PlayOneShotGame("miss"); SoundByte.PlayOneShot("miss");
} }
public void Nothing(PlayerActionEvent caller) {} public void Nothing(PlayerActionEvent caller) {}