diff --git a/Assets/Resources/Games/lumbearjack.prefab b/Assets/Resources/Games/lumbearjack.prefab index c15578ec9..de133326c 100644 --- a/Assets/Resources/Games/lumbearjack.prefab +++ b/Assets/Resources/Games/lumbearjack.prefab @@ -283,7 +283,8 @@ Transform: m_LocalPosition: {x: 0.004, y: -3.44, z: 0} m_LocalScale: {x: 0.65269417, y: 0.65269417, z: 0.65269417} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1521262164748977952} m_Father: {fileID: 5426823713711891276} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -879,6 +880,7 @@ MonoBehaviour: _smallObjectPrefab: {fileID: -5173722026323445984, guid: 3d44370bfd973e34ea21a4b1cfff8ca6, type: 3} _bigObjectPrefab: {fileID: 3578111811869010179, guid: b18b10a5fd5fd2c4ea91f7c44b775dfa, type: 3} _hugeObjectPrefab: {fileID: -3577666667379746924, guid: d971a00c5581d884b9658910cac762ad, type: 3} + _cutObjectHolder: {fileID: 1521262164748977952} --- !u!1 &3527631078867808426 GameObject: m_ObjectHideFlags: 0 @@ -1869,12 +1871,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 70 - m_Sprite: {fileID: 594893204, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + m_Sprite: {fileID: 1656505061, 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.08, y: 3.08} + m_Size: {x: 4.42, y: 1.63} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2553,6 +2555,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9018834698848321095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1521262164748977952} + m_Layer: 0 + m_Name: ObjectHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1521262164748977952 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9018834698848321095} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.24, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8003342604478868877} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9203844207924926116 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab index dc2391237..f577186a5 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab @@ -28,7 +28,8 @@ 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: 7773712820662594969} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -44,3 +45,92 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2402aaa1d4e67df479cc626100110795, type: 3} m_Name: m_EditorClassIdentifier: + _rotationStart: -22 + _rotationEnd: 22 + _ease: 4 + _logSR: {fileID: 8098522755323641548} + _logCutSprite: {fileID: 192267312, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} +--- !u!1 &3051440580972758910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7773712820662594969} + - component: {fileID: 8098522755323641548} + m_Layer: 0 + m_Name: log + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7773712820662594969 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3051440580972758910} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.33, y: 1.9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6707971432346881136} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8098522755323641548 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3051440580972758910} + 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/Prefabs/Games/Lumbearjack/HugeObject.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/HugeObject.prefab index c5a465088..7eb1ee25c 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/HugeObject.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/HugeObject.prefab @@ -1,5 +1,173 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &498660110985084067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6881175763873126838} + - component: {fileID: 7519666748332247453} + m_Layer: 0 + m_Name: peach + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6881175763873126838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498660110985084067} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.006128445, y: 2.14, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1592825473973314041} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7519666748332247453 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498660110985084067} + 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 &2882691843822496395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4937915693495104335} + - component: {fileID: 1927534326053448559} + m_Layer: 0 + m_Name: freezer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4937915693495104335 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2882691843822496395} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.03, y: 2.72, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1592825473973314041} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1927534326053448559 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2882691843822496395} + 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 &7090769993121559202 GameObject: m_ObjectHideFlags: 0 @@ -28,7 +196,10 @@ 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: 6021178669303329105} + - {fileID: 4937915693495104335} + - {fileID: 6881175763873126838} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -44,3 +215,105 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c24e5872094ce204ababcbfdc6db7b9d, type: 3} m_Name: m_EditorClassIdentifier: + _rotationStart: -22 + _rotationEnd: 22 + _ease: 4 + _logSR: {fileID: 4676914009505337857} + _logCutSprites: + - {fileID: -2116300429, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + - {fileID: 2142870294, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + - {fileID: -284960356, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + _freezerSR: {fileID: 1927534326053448559} + _freezerCutSprites: + - {fileID: -1036669530, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + - {fileID: -1870457107, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + - {fileID: 1721460179, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + _peachSR: {fileID: 7519666748332247453} + _peachCutSprites: + - {fileID: -541436295, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + - {fileID: 1835824123, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + - {fileID: 1740038524, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} +--- !u!1 &9210976111911403815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6021178669303329105} + - component: {fileID: 4676914009505337857} + m_Layer: 0 + m_Name: log + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6021178669303329105 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9210976111911403815} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.05, y: 2.51, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1592825473973314041} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4676914009505337857 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9210976111911403815} + 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 diff --git a/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab index 4631f051b..12c457cc0 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab @@ -1,5 +1,257 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &719662512238027404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2854676978937244060} + - component: {fileID: 76834188599190117} + m_Layer: 0 + m_Name: can + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2854676978937244060 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719662512238027404} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7609283403775189878} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &76834188599190117 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719662512238027404} + 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 &954934415611220420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2941363410568922942} + - component: {fileID: 1395431397079265704} + m_Layer: 0 + m_Name: bat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2941363410568922942 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954934415611220420} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.188, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7609283403775189878} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1395431397079265704 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954934415611220420} + 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 &5920352441626343011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4398076241187744673} + - component: {fileID: 805072134013713919} + m_Layer: 0 + m_Name: broom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4398076241187744673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920352441626343011} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.55, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7609283403775189878} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &805072134013713919 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920352441626343011} + 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 &6310831636379568479 GameObject: m_ObjectHideFlags: 0 @@ -28,7 +280,11 @@ 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: 1948694922747606563} + - {fileID: 2854676978937244060} + - {fileID: 2941363410568922942} + - {fileID: 4398076241187744673} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -44,3 +300,94 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a375355ce9643dd40a371b496e3fc9ee, type: 3} m_Name: m_EditorClassIdentifier: + _rotationStart: -22 + _rotationEnd: 22 + _ease: 4 + _log: {fileID: 7082049777098498031} + _can: {fileID: 719662512238027404} + _bat: {fileID: 954934415611220420} + _broom: {fileID: 5920352441626343011} +--- !u!1 &7082049777098498031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1948694922747606563} + - component: {fileID: 353050597064922801} + m_Layer: 0 + m_Name: log + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1948694922747606563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082049777098498031} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.006128445, y: 0.95, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7609283403775189878} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &353050597064922801 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082049777098498031} + 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: -2141446451, 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.56, y: 2.39} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/lumbearjackobjects.png.meta b/Assets/Resources/Sprites/Games/Lumbearjack/lumbearjackobjects.png.meta index dfc500c9a..916bdf3da 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/lumbearjackobjects.png.meta +++ b/Assets/Resources/Sprites/Games/Lumbearjack/lumbearjackobjects.png.meta @@ -113,7 +113,7 @@ TextureImporter: width: 386 height: 470 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -134,7 +134,7 @@ TextureImporter: width: 141 height: 659 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -155,7 +155,7 @@ TextureImporter: width: 383 height: 639 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -176,7 +176,7 @@ TextureImporter: width: 427 height: 469 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -197,7 +197,7 @@ TextureImporter: width: 401 height: 641 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -218,7 +218,7 @@ TextureImporter: width: 689 height: 534 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -239,7 +239,7 @@ TextureImporter: width: 689 height: 524 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -260,7 +260,7 @@ TextureImporter: width: 223 height: 223 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -281,7 +281,7 @@ TextureImporter: width: 81 height: 488 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -302,7 +302,7 @@ TextureImporter: width: 156 height: 239 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -323,7 +323,7 @@ TextureImporter: width: 383 height: 640 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -344,7 +344,7 @@ TextureImporter: width: 689 height: 524 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -365,7 +365,7 @@ TextureImporter: width: 689 height: 523 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -386,7 +386,7 @@ TextureImporter: width: 282 height: 410 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -407,7 +407,7 @@ TextureImporter: width: 139 height: 231 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -428,7 +428,7 @@ TextureImporter: width: 570 height: 609 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -449,7 +449,7 @@ TextureImporter: width: 410 height: 639 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -470,7 +470,7 @@ TextureImporter: width: 425 height: 435 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -491,7 +491,7 @@ TextureImporter: width: 407 height: 198 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -512,7 +512,7 @@ TextureImporter: width: 167 height: 148 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -533,7 +533,7 @@ TextureImporter: width: 97 height: 160 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -554,7 +554,7 @@ TextureImporter: width: 53 height: 426 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -575,7 +575,7 @@ TextureImporter: width: 55 height: 427 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -596,7 +596,7 @@ TextureImporter: width: 112 height: 112 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -617,7 +617,7 @@ TextureImporter: width: 112 height: 112 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -638,7 +638,7 @@ TextureImporter: width: 161 height: 544 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -659,7 +659,7 @@ TextureImporter: width: 102 height: 279 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -680,7 +680,7 @@ TextureImporter: width: 68 height: 361 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -701,7 +701,7 @@ TextureImporter: width: 70 height: 73 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -722,7 +722,7 @@ TextureImporter: width: 569 height: 605 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -743,7 +743,7 @@ TextureImporter: width: 569 height: 605 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -760,11 +760,11 @@ TextureImporter: rect: serializedVersion: 2 x: 1245 - y: -3 + y: 1 width: 570 height: 608 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -785,7 +785,7 @@ TextureImporter: width: 129 height: 95 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -806,7 +806,7 @@ TextureImporter: width: 162 height: 159 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -827,7 +827,7 @@ TextureImporter: width: 98 height: 146 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -848,7 +848,7 @@ TextureImporter: width: 70 height: 344 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -869,7 +869,7 @@ TextureImporter: width: 64 height: 333 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -890,7 +890,7 @@ TextureImporter: width: 127 height: 251 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -911,7 +911,7 @@ TextureImporter: width: 134 height: 252 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -932,7 +932,7 @@ TextureImporter: width: 72 height: 231 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -953,7 +953,7 @@ TextureImporter: width: 124 height: 91 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -974,7 +974,7 @@ TextureImporter: width: 159 height: 149 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -995,7 +995,7 @@ TextureImporter: width: 94 height: 73 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1016,7 +1016,7 @@ TextureImporter: width: 450 height: 242 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1037,7 +1037,7 @@ TextureImporter: width: 179 height: 52 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1058,7 +1058,7 @@ TextureImporter: width: 228 height: 149 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1079,7 +1079,7 @@ TextureImporter: width: 442 height: 163 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1100,7 +1100,7 @@ TextureImporter: width: 154 height: 143 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1121,7 +1121,7 @@ TextureImporter: width: 95 height: 95 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1142,7 +1142,7 @@ TextureImporter: width: 95 height: 95 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1163,7 +1163,7 @@ TextureImporter: width: 95 height: 95 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs index 8da4e3220..8babab94d 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs @@ -7,17 +7,41 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack { public class LBJBigObject : MonoBehaviour { + [Header("Parameters")] + [SerializeField] private float _rotationStart = -22f; + [SerializeField] private float _rotationEnd = 22f; + [SerializeField] private EasingFunction.Ease _ease = EasingFunction.Ease.EaseInOutQuad; + + [Header("Components")] + [SerializeField] private SpriteRenderer _logSR; + [SerializeField] private Sprite _logCutSprite; + private LBJBear _bear; private LumBEARjack.BigType _type; private PlayerActionEvent _cutActionEvent; + private double _rotationBeat; + public void Init(LBJBear bear, double beat, double length, LumBEARjack.BigType type, double startUpBeat = -1) { _bear = bear; _type = type; + _rotationBeat = beat + (length / 4 * 2); if (startUpBeat <= beat + (length / 4 * 2)) LumBEARjack.instance.ScheduleInput(beat, length / 4 * 2, Minigame.InputAction_BasicPress, JustHit, Miss, Blank); + else _rotationBeat = beat + (length / 4 * 3); _cutActionEvent = LumBEARjack.instance.ScheduleInput(beat, length / 4 * 3, Minigame.InputAction_BasicPress, JustCut, Miss, Blank); + Update(); + } + + private void Update() + { + float normalized = Conductor.instance.GetPositionFromBeat(_rotationBeat - 1, 2); + + var func = EasingFunction.GetEasingFunction(_ease); + + float newRotation = func(_rotationStart, _rotationEnd, normalized); + transform.localEulerAngles = new Vector3(0, 0, newRotation); } private void JustHit(PlayerActionEvent caller, float state) @@ -39,6 +63,8 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack }; SoundByte.PlayOneShotGame("lumbearjack/" + hitSound); _bear.CutMid(); + _rotationBeat = _cutActionEvent.startBeat + _cutActionEvent.timer; + _logSR.sprite = _logCutSprite; } private void JustCut(PlayerActionEvent caller, float state) diff --git a/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs index d828ff7fc..644f97e77 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs @@ -7,19 +7,74 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack { public class LBJHugeObject : MonoBehaviour { + [Header("Parameters")] + [SerializeField] private float _rotationStart = -22f; + [SerializeField] private float _rotationEnd = 22f; + [SerializeField] private EasingFunction.Ease _ease = EasingFunction.Ease.EaseInOutQuad; + + [Header("Components")] + [SerializeField] private SpriteRenderer _logSR; + [SerializeField] private Sprite[] _logCutSprites = new Sprite[3]; + [SerializeField] private SpriteRenderer _freezerSR; + [SerializeField] private Sprite[] _freezerCutSprites = new Sprite[3]; + [SerializeField] private SpriteRenderer _peachSR; + [SerializeField] private Sprite[] _peachCutSprites = new Sprite[3]; + private LBJBear _bear; private LumBEARjack.HugeType _type; private PlayerActionEvent[] _soundsToDeleteIfMiss = new PlayerActionEvent[3]; + private double _rotationBeat; + + private void Awake() + { + _logSR.gameObject.SetActive(false); + _freezerSR.gameObject.SetActive(false); + _peachSR.gameObject.SetActive(false); + } + public void Init(LBJBear bear, double beat, double length, LumBEARjack.HugeType type, double startUpBeat = -1) { _bear = bear; _type = type; + switch (type) + { + case LumBEARjack.HugeType.log: + _logSR.gameObject.SetActive(true); + break; + case LumBEARjack.HugeType.freezer: + _freezerSR.gameObject.SetActive(true); + break; + case LumBEARjack.HugeType.peach: + _peachSR.gameObject.SetActive(true); + break; + default: + break; + } + + _rotationBeat = beat + (length / 6 * 2); if (startUpBeat <= beat + (length / 6 * 2)) LumBEARjack.instance.ScheduleInput(beat, length / 6 * 2, Minigame.InputAction_BasicPress, JustHit1, Miss, Blank); + else _rotationBeat = beat + (length / 6 * 3); + if (startUpBeat <= beat + (length / 6 * 3)) _soundsToDeleteIfMiss[0] = LumBEARjack.instance.ScheduleInput(beat, length / 6 * 3, Minigame.InputAction_BasicPress, JustHit2, Miss, Blank); + else _rotationBeat = beat + (length / 6 * 4); + if (startUpBeat <= beat + (length / 6 * 4)) _soundsToDeleteIfMiss[1] = LumBEARjack.instance.ScheduleInput(beat, length / 6 * 4, Minigame.InputAction_BasicPress, JustHit3, Miss, Blank); + else _rotationBeat = beat + (length / 6 * 5); + _soundsToDeleteIfMiss[2] = LumBEARjack.instance.ScheduleInput(beat, length / 6 * 5, Minigame.InputAction_BasicPress, JustCut, Miss, Blank); + Update(); + } + + private void Update() + { + float normalized = Conductor.instance.GetPositionFromBeat(_rotationBeat - 1, 2); + + var func = EasingFunction.GetEasingFunction(_ease); + + float newRotation = func(_rotationStart, _rotationEnd, normalized); + transform.localEulerAngles = new Vector3(0, 0, newRotation); } private void JustHit1(PlayerActionEvent caller, float state) @@ -58,6 +113,22 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack }; SoundByte.PlayOneShotGame("lumbearjack/" + hitSound); _bear.CutMid(); + _rotationBeat = _soundsToDeleteIfMiss[step - 1].startBeat + _soundsToDeleteIfMiss[step - 1].timer; + + switch (_type) + { + case LumBEARjack.HugeType.log: + _logSR.sprite = _logCutSprites[step - 1]; + break; + case LumBEARjack.HugeType.freezer: + _freezerSR.sprite = _freezerCutSprites[step - 1]; + break; + case LumBEARjack.HugeType.peach: + _peachSR.sprite = _peachCutSprites[step - 1]; + break; + default: + break; + } } private void JustCut(PlayerActionEvent caller, float state) diff --git a/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs index ef1c8d880..5fc52aca4 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs @@ -2,20 +2,72 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using HeavenStudio.Util; +using Starpelly; namespace HeavenStudio.Games.Scripts_LumBEARjack { public class LBJSmallObject : MonoBehaviour { + [Header("Parameters")] + [SerializeField] private float _rotationStart = -22f; + [SerializeField] private float _rotationEnd = 22f; + [SerializeField] private EasingFunction.Ease _ease = EasingFunction.Ease.EaseInOutQuad; + + [Header("Components")] + [SerializeField] private GameObject _log; + [SerializeField] private GameObject _can; + [SerializeField] private GameObject _bat; + [SerializeField] private GameObject _broom; + private LBJBear _bear; private LumBEARjack.SmallType _type; + private double _rotationBeat; + + private void Awake() + { + _log.SetActive(false); + _can.SetActive(false); + _bat.SetActive(false); + _broom.SetActive(false); + } + public void Init(LBJBear bear, double beat, double length, LumBEARjack.SmallType type, double startUpBeat = -1) { _bear = bear; _type = type; + switch (type) + { + case LumBEARjack.SmallType.log: + _log.SetActive(true); + break; + case LumBEARjack.SmallType.can: + _can.SetActive(true); + break; + case LumBEARjack.SmallType.bat: + _bat.SetActive(true); + break; + case LumBEARjack.SmallType.broom: + _broom.SetActive(true); + break; + default: + break; + } + + _rotationBeat = beat + (length / 3 * 2); LumBEARjack.instance.ScheduleInput(beat, length / 3 * 2, Minigame.InputAction_BasicPress, Just, Miss, Blank); + Update(); + } + + private void Update() + { + float normalized = Conductor.instance.GetPositionFromBeat(_rotationBeat - 1, 2); + + var func = EasingFunction.GetEasingFunction(_ease); + + float newRotation = func(_rotationStart, _rotationEnd, normalized); + transform.localEulerAngles = new Vector3(0, 0, newRotation); } private void Just(PlayerActionEvent caller, float state) diff --git a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs index 07665e9aa..961344518 100644 --- a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs +++ b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs @@ -219,6 +219,7 @@ namespace HeavenStudio.Games [SerializeField] private LBJSmallObject _smallObjectPrefab; [SerializeField] private LBJBigObject _bigObjectPrefab; [SerializeField] private LBJHugeObject _hugeObjectPrefab; + [SerializeField] private Transform _cutObjectHolder; private List _bearNoBopBeats = new(); @@ -250,7 +251,7 @@ namespace HeavenStudio.Games { new(beat + (length / 3), delegate { - LBJSmallObject spawnedObject = Instantiate(_smallObjectPrefab, transform); + LBJSmallObject spawnedObject = Instantiate(_smallObjectPrefab, _cutObjectHolder); spawnedObject.Init(_bear, beat, length, type, startUpBeat); }) }); @@ -262,7 +263,7 @@ namespace HeavenStudio.Games { new(beat + (length / 4), delegate { - LBJBigObject spawnedObject = Instantiate(_bigObjectPrefab, transform); + LBJBigObject spawnedObject = Instantiate(_bigObjectPrefab, _cutObjectHolder); spawnedObject.Init(_bear, beat, length, type, startUpBeat); }) }); @@ -274,7 +275,7 @@ namespace HeavenStudio.Games { new(beat + (length / 6), delegate { - LBJHugeObject spawnedObject = Instantiate(_hugeObjectPrefab, transform); + LBJHugeObject spawnedObject = Instantiate(_hugeObjectPrefab, _cutObjectHolder); spawnedObject.Init(_bear, beat, length, type, startUpBeat); }) });