diff --git a/Assets/Resources/Games/lumbearjack.prefab b/Assets/Resources/Games/lumbearjack.prefab index de133326c..748011739 100644 --- a/Assets/Resources/Games/lumbearjack.prefab +++ b/Assets/Resources/Games/lumbearjack.prefab @@ -881,6 +881,20 @@ MonoBehaviour: _bigObjectPrefab: {fileID: 3578111811869010179, guid: b18b10a5fd5fd2c4ea91f7c44b775dfa, type: 3} _hugeObjectPrefab: {fileID: -3577666667379746924, guid: d971a00c5581d884b9658910cac762ad, type: 3} _cutObjectHolder: {fileID: 1521262164748977952} + _catRight: {fileID: 2259150297677717709} + _catRightObjectsSmall: + - {fileID: 8919816004362866721} + - {fileID: 8283341335121478951} + - {fileID: 5014475820465334175} + - {fileID: 2113061933880518983} + _catRightObjectsBig: + - {fileID: 6887175643397659595} + _catRightObjectsHuge: + - {fileID: 7195153636254270523} + - {fileID: 8599624938353215766} + - {fileID: 4673486003957519203} + _catAnimationOffsetStart: -0.5 + _catAnimationOffsetEnd: 0.5 --- !u!1 &3527631078867808426 GameObject: m_ObjectHideFlags: 0 @@ -2682,6 +2696,10 @@ PrefabInstance: propertyPath: m_FlipY value: 1 objectReference: {fileID: 0} + - target: {fileID: 6372873014407674976, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + propertyPath: m_Name + value: SmallLog + objectReference: {fileID: 0} - target: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_RootOrder value: 3 @@ -2764,6 +2782,51 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} +--- !u!1 &2113061933880518983 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4533552499156354310, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!95 &2259150297677717709 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 4387471827645615244, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4673486003957519203 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7161565195996790562, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5014475820465334175 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7363258296528702430, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6887175643397659595 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8947907653433374602, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7195153636254270523 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8283341335121478951 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5858378645934729574, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8599624938353215766 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6116295155612378455, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8919816004362866721 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6372873014407674976, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} --- !u!4 &8968276012044984537 stripped Transform: m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} diff --git a/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab index bfd19b659..94bca3d07 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab @@ -761,6 +761,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4533552499156354310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5227545378415712034} + - component: {fileID: 4790720146603136875} + m_Layer: 0 + m_Name: broom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5227545378415712034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533552499156354310} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.142, y: -0.205, z: 0} + m_LocalScale: {x: 0.6250915, y: 0.6250915, z: 0.6250915} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4790720146603136875 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533552499156354310} + 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: 70 + m_Sprite: {fileID: -900160324, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.41, y: 6.59} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4572998838560304297 GameObject: m_ObjectHideFlags: 0 @@ -790,9 +874,268 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5861693739167755245} + - {fileID: 2133922901918628158} + - {fileID: 8020402896500978802} + - {fileID: 5227545378415712034} + - {fileID: 1680047214655216868} + - {fileID: 1489891351633342076} + - {fileID: 9142406924768657724} + - {fileID: 8591551953226593321} m_Father: {fileID: 1829052152680050499} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4639588617581127802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1489891351633342076} + - component: {fileID: 4123127066797828317} + m_Layer: 0 + m_Name: HugeLog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1489891351633342076 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4639588617581127802} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.176, y: -0.105, z: 0} + m_LocalScale: {x: 0.6250915, y: 0.6250915, z: 0.6250915} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4123127066797828317 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4639588617581127802} + 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: 70 + m_Sprite: {fileID: 493259387, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.7, y: 6.09} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5858378645934729574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2133922901918628158} + - component: {fileID: 8843339730488359881} + m_Layer: 0 + m_Name: Can + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2133922901918628158 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5858378645934729574} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.145, y: -1.293, z: 0} + m_LocalScale: {x: 0.6250915, y: 0.6250915, z: 0.6250915} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8843339730488359881 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5858378645934729574} + 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: 70 + m_Sprite: {fileID: -258651881, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.39, y: 2.31} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6116295155612378455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9142406924768657724} + - component: {fileID: 704268889839616480} + m_Layer: 0 + m_Name: Freezer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &9142406924768657724 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6116295155612378455} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.15, y: -0.01, z: 0} + m_LocalScale: {x: 0.6250915, y: 0.6250915, z: 0.6250915} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &704268889839616480 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6116295155612378455} + 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: 70 + m_Sprite: {fileID: 334295907, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.83, y: 6.39} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6324651259807204320 GameObject: m_ObjectHideFlags: 0 @@ -888,12 +1231,12 @@ GameObject: - component: {fileID: 5861693739167755245} - component: {fileID: 7991420802792855905} m_Layer: 0 - m_Name: Sprite + m_Name: SmallLog m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5861693739167755245 Transform: m_ObjectHideFlags: 0 @@ -1129,6 +1472,174 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7161565195996790562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8591551953226593321} + - component: {fileID: 3826053839341317980} + m_Layer: 0 + m_Name: Peach + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8591551953226593321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7161565195996790562} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.21, y: -0.35, z: 0} + m_LocalScale: {x: 0.6250915, y: 0.6250915, z: 0.6250915} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3826053839341317980 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7161565195996790562} + 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: 70 + m_Sprite: {fileID: 1171210836, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.89, y: 5.34} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7363258296528702430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8020402896500978802} + - component: {fileID: 6603100556211832873} + m_Layer: 0 + m_Name: Bat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8020402896500978802 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7363258296528702430} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.15, y: -0.507, z: 0} + m_LocalScale: {x: 0.6250915, y: 0.6250915, z: 0.6250915} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6603100556211832873 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7363258296528702430} + 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: 70 + m_Sprite: {fileID: -1861877688, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, 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.81, y: 4.88} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &7537329938738626932 GameObject: m_ObjectHideFlags: 0 @@ -1477,3 +1988,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8947907653433374602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1680047214655216868} + - component: {fileID: 5550656414377755604} + m_Layer: 0 + m_Name: BigLog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1680047214655216868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8947907653433374602} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.282, y: -0.52, z: 0} + m_LocalScale: {x: 0.6250915, y: 0.6250915, z: 0.6250915} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5550656414377755604 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8947907653433374602} + 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: 70 + m_Sprite: {fileID: -1523423921, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.86, y: 4.7} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Beast.controller b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Beast.controller index da47be7fb..e4899e605 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Beast.controller +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Beast.controller @@ -54,6 +54,28 @@ AnimatorState: m_CycleOffsetParameter: m_TimeParameter: --- !u!1101 &-7380376842307841197 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5837131744991549186} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3888334668263109202 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -113,7 +135,7 @@ AnimatorStateMachine: m_Position: {x: 570, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: 1224244725139576399} - m_Position: {x: 605, y: 325, z: 0} + m_Position: {x: 90, y: -110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -205,7 +227,8 @@ AnimatorState: m_Name: BeastReady m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3888334668263109202} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastReady.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastReady.anim index ca13d75ac..7dddd178c 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastReady.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastReady.anim @@ -592,7 +592,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Cat.controller b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Cat.controller index dcf6a5803..546dc9eed 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Cat.controller +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/Cat.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8326465493289112986 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8804525083699094725} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4471910689245893060 AnimatorState: serializedVersion: 6 @@ -10,7 +32,8 @@ AnimatorState: m_Name: CatBop m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8326465493289112986} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatBop.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatBop.anim index 4784a2b29..dd7ebea43 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatBop.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatBop.anim @@ -286,7 +286,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatDance.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatDance.anim index bf00916b1..23b7c29bb 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatDance.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatDance.anim @@ -7840,7 +7840,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatGrab.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatGrab.anim index 646647dcb..83559c84c 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatGrab.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatGrab.anim @@ -19226,7 +19226,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatIdle.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatIdle.anim index a1182b282..fbbdcc568 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatIdle.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/CatIdle.anim @@ -36,7 +36,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Scripts/Games/LumBEARjack/LBJBear.cs b/Assets/Scripts/Games/LumBEARjack/LBJBear.cs index 43cbfe5e2..d3b4f509d 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJBear.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJBear.cs @@ -13,29 +13,33 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack private bool _rested = false; private bool _restSound = true; - public void SwingWhiff(bool sound = true, bool force = false) + public void SwingWhiff(bool sound = true) { - if ((_anim.IsPlayingAnimationNames("BeastWhiff", "BeastCut", "BeastCutMid", "BeastHalfCut", "BeastRest") || _rested) && !force) return; + if (_rested) return; if (sound) SoundByte.PlayOneShotGame("lumbearjack/swing", -1, SoundByte.GetPitchFromCents(Random.Range(-200, 201), false)); - _anim.DoScaledAnimationAsync("BeastWhiff", 0.5f); + _anim.DoScaledAnimationAsync("BeastWhiff", 0.75f); } public void Cut(double beat, bool huh, bool huhL) { - _anim.DoScaledAnimationAsync(huh ? "BeastHalfCut" : "BeastCut", 0.5f); + _anim.DoScaledAnimationAsync(huh ? "BeastHalfCut" : "BeastCut", 0.75f); if (!huh) return; BeatAction.New(this, new() { new(beat + 1, delegate { _anim.DoScaledAnimationAsync(huhL ? "BeastHuhL" : "BeastHuhR", 0.5f); + }), + new(beat + 2, delegate + { + _anim.DoScaledAnimationAsync("BeastReady", 0.75f); }) }); } public void CutMid() { - _anim.DoScaledAnimationAsync("BeastCutMid", 0.5f); + _anim.DoScaledAnimationAsync("BeastCutMid", 0.75f); } public void Bop() diff --git a/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs index 63fddb808..ed001b7a4 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs @@ -54,7 +54,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack { if (state >= 1f || state <= -1f) { - _bear.SwingWhiff(false, true); + _bear.SwingWhiff(false); Miss(caller); return; } @@ -77,7 +77,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack { if (state >= 1f || state <= -1f) { - _bear.SwingWhiff(false, true); + _bear.SwingWhiff(false); Miss(caller); return; } diff --git a/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs index 4ec362fb3..a8cdb73d7 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs @@ -129,7 +129,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack { if (state >= 1f || state <= -1f) { - _bear.SwingWhiff(false, true); + _bear.SwingWhiff(false); Miss(caller); return; } @@ -155,7 +155,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack { if (state >= 1f || state <= -1f) { - _bear.SwingWhiff(false, true); + _bear.SwingWhiff(false); Miss(caller); return; } diff --git a/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs index d83f2ae4d..5bfb9e257 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs @@ -76,7 +76,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack { if (state >= 1f || state <= -1f) { - _bear.SwingWhiff(false, true); + _bear.SwingWhiff(false); Miss(caller); return; } diff --git a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs index 961344518..6c2b44a31 100644 --- a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs +++ b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs @@ -220,6 +220,14 @@ namespace HeavenStudio.Games [SerializeField] private LBJBigObject _bigObjectPrefab; [SerializeField] private LBJHugeObject _hugeObjectPrefab; [SerializeField] private Transform _cutObjectHolder; + [SerializeField] private Animator _catRight; + [SerializeField] private GameObject[] _catRightObjectsSmall = new GameObject[4]; + [SerializeField] private GameObject[] _catRightObjectsBig = new GameObject[1]; + [SerializeField] private GameObject[] _catRightObjectsHuge = new GameObject[3]; + + [Header("Parameters")] + [SerializeField] private double _catAnimationOffsetStart = -0.5; + [SerializeField] private double _catAnimationOffsetEnd = 0.5; private List _bearNoBopBeats = new(); @@ -229,6 +237,7 @@ namespace HeavenStudio.Games { instance = this; SetupBopRegion("lumbearjack", "bop", "auto", false); + DisableAllCatRightObjects(); } #region Update @@ -289,12 +298,14 @@ namespace HeavenStudio.Games { PersistObjects(beat); HandleBops(beat); + HandleCatAnimation(beat); } public override void OnPlay(double beat) { PersistObjects(beat); HandleBops(beat); + HandleCatAnimation(beat); } private void PersistObjects(double beat) @@ -339,7 +350,11 @@ namespace HeavenStudio.Games case "small": case "smallS": _bearNoBopBeats.Add(e.beat + (e.length / 3 * 2)); - if ((SmallType)e["type"] != SmallType.log) _bearNoBopBeats.Add(e.beat + e.length); + if ((SmallType)e["type"] != SmallType.log) + { + _bearNoBopBeats.Add(e.beat + e.length); + _bearNoBopBeats.Add(e.beat + e.length + 1); + } break; case "big": case "bigS": @@ -364,6 +379,38 @@ namespace HeavenStudio.Games } } + private void HandleCatAnimation(double beat) + { + var allEvents = EventCaller.GetAllInGameManagerList("lumbearjack", new string[] { "small", "big", "huge", "smallS", "bigS", "hugeS" }); + var nextGameSwitch = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame" }).Find(x => x.beat > beat && x.datamodel.Split(2) != "lumbearjack"); + + double nextGameSwitchBeat = double.MaxValue; + if (nextGameSwitch != null) nextGameSwitchBeat = nextGameSwitch.beat; + + + foreach (var e in allEvents) + { + if (e.beat + _catAnimationOffsetStart < beat || e.beat < nextGameSwitchBeat) + { + switch (e.datamodel.Split(1)) + { + case "small": + case "smallS": + CatPutObject(e.beat, e.length, (SmallType)e["type"]); + break; + case "big": + case "bigS": + CatPutObject(e.beat, e.length, (BigType)e["type"]); + break; + case "huge": + case "hugeS": + CatPutObject(e.beat, e.length, (HugeType)e["type"]); + break; + } + } + } + } + #endregion #region Bop @@ -374,11 +421,15 @@ namespace HeavenStudio.Games { case WhoBops.Both: if (!_bearNoBopBeats.Contains(beat)) _bear.Bop(); + if (_catRight.IsPlayingAnimationNames("CatGrab")) break; + _catRight.DoScaledAnimationAsync("CatBop", 0.5f); break; case WhoBops.Bear: if (!_bearNoBopBeats.Contains(beat)) _bear.Bop(); break; case WhoBops.Cats: + if (_catRight.IsPlayingAnimationNames("CatGrab")) break; + _catRight.DoScaledAnimationAsync("CatBop", 0.5f); break; default: break; @@ -401,11 +452,15 @@ namespace HeavenStudio.Games { case WhoBops.Both: _bear.Bop(); + if (_catRight.IsPlayingAnimationNames("CatGrab")) break; + _catRight.DoScaledAnimationAsync("CatBop", 0.5f); break; case WhoBops.Bear: _bear.Bop(); break; case WhoBops.Cats: + if (_catRight.IsPlayingAnimationNames("CatGrab")) break; + _catRight.DoScaledAnimationAsync("CatBop", 0.5f); break; default: break; @@ -493,6 +548,87 @@ namespace HeavenStudio.Games #endregion + #region Cats + + private Coroutine _catRightCoroutine; + + public void CatPutObject(double beat, double length, SmallType type) + { + CatPutObjectExec(beat, length / 3, _catRightObjectsSmall[(int)type]); + } + + public void CatPutObject(double beat, double length, BigType type) + { + CatPutObjectExec(beat, length / 4, _catRightObjectsBig[(int)type]); + } + + public void CatPutObject(double beat, double length, HugeType type) + { + CatPutObjectExec(beat, length / 6, _catRightObjectsHuge[(int)type]); + } + + private void CatPutObjectExec(double beat, double effectiveLength, GameObject objectUsed) + { + BeatAction.New(this, new() + { + new(beat + (_catAnimationOffsetStart * effectiveLength), delegate + { + if (_catRightCoroutine != null) StopCoroutine(_catRightCoroutine); + DisableAllCatRightObjects(); + _catRightCoroutine = StartCoroutine(CatPutObjectCo(beat, effectiveLength)); + }), + new(beat, delegate + { + objectUsed.SetActive(true); + }), + new(beat + effectiveLength, delegate + { + DisableAllCatRightObjects(); + }) + }); + } + + private IEnumerator CatPutObjectCo(double beat, double effectiveLength) + { + double s = _catAnimationOffsetStart * effectiveLength; + double e = _catAnimationOffsetEnd * effectiveLength; + + float normalizedBeat = conductor.GetPositionFromBeat(beat + s, effectiveLength + e - s, false); + _catRight.DoNormalizedAnimation("CatGrab", Mathf.Clamp01(normalizedBeat)); + + while (normalizedBeat <= 1) + { + normalizedBeat = conductor.GetPositionFromBeat(beat + s, effectiveLength + e - s, false); + + _catRight.DoNormalizedAnimation("CatGrab", Mathf.Clamp01(normalizedBeat)); + + yield return null; + } + } + + private void DisableAllCatRightObjects() + { + foreach (var g in _catRightObjectsSmall) + { + if (g == null) continue; + g.SetActive(false); + } + + foreach (var g in _catRightObjectsBig) + { + if (g == null) continue; + g.SetActive(false); + } + + foreach (var g in _catRightObjectsHuge) + { + if (g == null) continue; + g.SetActive(false); + } + } + + #endregion + #region Misc public void RestBear(bool instant, bool sound)