diff --git a/Assets/Resources/Games/cannery.prefab b/Assets/Resources/Games/cannery.prefab index a0a399cc1..5519b89f6 100644 --- a/Assets/Resources/Games/cannery.prefab +++ b/Assets/Resources/Games/cannery.prefab @@ -156,7 +156,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 1889760313, guid: b64cfec8043c654448ab0c49ed5143bd, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -356,7 +356,7 @@ Transform: - {fileID: 3324936689865554164} - {fileID: 7819539421109718628} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1449546577012781603 GameObject: @@ -442,6 +442,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1619364761099045987 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2999101928407020040} + - component: {fileID: 24952475312249176} + m_Layer: 0 + m_Name: BackgroundColor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2999101928407020040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1619364761099045987} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0184, y: -0.0319, z: 0} + m_LocalScale: {x: 22.970453, y: 12.896601, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5813499711186931250} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &24952475312249176 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1619364761099045987} + 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: -5000 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.07058824, g: 0.05882353, b: 0.12941177, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1681142449906937503 GameObject: m_ObjectHideFlags: 0 @@ -473,7 +557,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6125547534641406382 SpriteRenderer: @@ -656,15 +740,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2659786308152561463} - m_LocalRotation: {x: 0, y: 0, z: 0.008726558, w: 0.999962} - m_LocalPosition: {x: 1.88, y: 3.13, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0.018761232, w: 0.99982405} + m_LocalPosition: {x: 1.87, y: 3.84, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 29811434204870614} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.15} --- !u!95 &2491713825135125463 Animator: serializedVersion: 5 @@ -1010,7 +1094,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 1889760313, guid: b64cfec8043c654448ab0c49ed5143bd, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1047,13 +1131,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3428754964196628754} m_LocalRotation: {x: 0, y: 0, z: 0.01745245, w: 0.99984777} - m_LocalPosition: {x: 1.99, y: -1.69, z: 0} + m_LocalPosition: {x: 1.99, y: -1.62, z: 0} m_LocalScale: {x: 1.3, y: 1.3, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7262351254813021217} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2} --- !u!95 &4980712815265515627 Animator: @@ -1412,90 +1496,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3943847481565297819 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4493887983664527898} - - component: {fileID: 5948254459511631684} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4493887983664527898 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3943847481565297819} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 80, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5948254459511631684 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3943847481565297819} - 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4180844408507531855 GameObject: m_ObjectHideFlags: 0 @@ -1584,7 +1584,7 @@ Transform: m_Children: - {fileID: 5580018271579296069} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4725308375333961366 SpriteRenderer: @@ -2185,7 +2185,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 1889760313, guid: b64cfec8043c654448ab0c49ed5143bd, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2224,12 +2224,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5272204876918726455} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.8743, y: -4.782, z: 0} + m_LocalPosition: {x: 0.8743, y: -5.124, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8770960321447769814 SpriteRenderer: @@ -2277,7 +2277,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 100, y: 0.45} + m_Size: {x: 100, y: 1.15} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2345,15 +2345,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5698069872256704531} - m_LocalRotation: {x: 0, y: 0, z: -0.026176924, w: 0.99965733} - m_LocalPosition: {x: 0.69, y: 0.86, z: 0} + m_LocalRotation: {x: 0, y: 0, z: -0.038823802, w: 0.99924606} + m_LocalPosition: {x: 0.73, y: 1.08, z: 0} m_LocalScale: {x: -1.15, y: 1.15, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8981334154278727145} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -3} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -4.45} --- !u!95 &4489137636915631815 Animator: serializedVersion: 5 @@ -2405,7 +2405,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6037561163425648047} - - {fileID: 4493887983664527898} - {fileID: 3518197126032361880} - {fileID: 1162120192388305590} - {fileID: 7749978682834264286} @@ -2415,6 +2414,7 @@ Transform: - {fileID: 3578108882218100712} - {fileID: 7301854396171564631} - {fileID: 8615374414734561705} + - {fileID: 2999101928407020040} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2435,7 +2435,7 @@ MonoBehaviour: can: {fileID: 5205926063367497593} blackout: {fileID: 6779319467216197044} alarmMat: {fileID: 2100000, guid: cffd715f1564d4440881c6fe148baa9c, type: 2} - bgPlaneSR: {fileID: 5948254459511631684} + bgPlaneSR: {fileID: 0} conveyorBeltAnim: {fileID: 3839135881600344077} alarmAnim: {fileID: 3637100343128600021} dingAnim: {fileID: 7386547292618809648} @@ -2476,7 +2476,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4683389141483827878 SpriteRenderer: @@ -2834,7 +2834,7 @@ Transform: - {fileID: 7139055832760186831} - {fileID: 9693112950544323} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6832360348601931960 GameObject: @@ -2908,7 +2908,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 1889760313, guid: b64cfec8043c654448ab0c49ed5143bd, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim index 4ce5f134e..51b52fffc 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim @@ -22,15 +22,15 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: -5.380748, y: 0, z: 0} + outSlope: {x: -1.5339131, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.9166666 - value: {x: -10.3131, y: 0, z: 0} - inSlope: {x: -5.380748, y: -0, z: -0} + value: {x: -2.94, y: 0, z: 0} + inSlope: {x: -1.5339131, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -86,15 +86,15 @@ AnimationClip: time: 0 value: 0 inSlope: 0 - outSlope: -5.380748 + outSlope: -1.5339131 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.9166666 - value: -10.3131 - inSlope: -5.380748 + value: -2.94 + inSlope: -1.5339131 outSlope: 0 tangentMode: 69 weightedMode: 0 diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim index a0b5058b6..e96d4223c 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim @@ -22,15 +22,15 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: -5.0038958, y: 0, z: 0} + outSlope: {x: -1.5391304, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.9166666 - value: {x: -9.5908, y: 0, z: 0} - inSlope: {x: -5.0038958, y: -0, z: -0} + value: {x: -2.95, y: 0, z: 0} + inSlope: {x: -1.5391304, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -86,15 +86,15 @@ AnimationClip: time: 0 value: 0 inSlope: 0 - outSlope: -5.0038958 + outSlope: -1.5391304 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.9166666 - value: -9.5908 - inSlope: -5.0038958 + value: -2.95 + inSlope: -1.5391304 outSlope: 0 tangentMode: 69 weightedMode: 0 diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim index b768bed12..494d19c69 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim @@ -20,17 +20,17 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -10.583, y: -4.782, z: 0} + value: {x: -10.763, y: -4.831, z: 0} inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 132.498, y: 0, z: 0} + outSlope: {x: 133.578, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 11.5, y: -4.782, z: 0} - inSlope: {x: 132.498, y: 0, z: 0} + value: {x: 11.5, y: -4.831, z: 0} + inSlope: {x: 133.578, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -84,9 +84,9 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -10.583 + value: -10.763 inSlope: 0 - outSlope: 132.498 + outSlope: 133.578 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 @@ -94,7 +94,7 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: 11.5 - inSlope: 132.498 + inSlope: 133.578 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4.782 + value: -4.831 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -4.782 + value: -4.831 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/Cannery/Cannery.png b/Assets/Resources/Sprites/Games/Cannery/Cannery.png index cda91feaa..8142d811e 100644 Binary files a/Assets/Resources/Sprites/Games/Cannery/Cannery.png and b/Assets/Resources/Sprites/Games/Cannery/Cannery.png differ diff --git a/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta b/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta index 75b85fed5..7a2653c0d 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta @@ -171,10 +171,10 @@ TextureImporter: name: Cannery_3 rect: serializedVersion: 2 - x: 965 - y: 1893 - width: 174 - height: 90 + x: 1152 + y: 1810 + width: 554 + height: 226 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Sprites/Games/Cannery/cans.png b/Assets/Resources/Sprites/Games/Cannery/cans.png index 6f2b24fdf..2f11e1c20 100644 Binary files a/Assets/Resources/Sprites/Games/Cannery/cans.png and b/Assets/Resources/Sprites/Games/Cannery/cans.png differ