From 1e565203679af16f121f77f57b6265b202676a0c Mon Sep 17 00:00:00 2001 From: Damian-Fools Date: Tue, 16 Dec 2025 15:18:28 +0100 Subject: [PATCH] Changes to cement Factory, adjusting colliders and sprite orders. --- .../machine_brokendown0040.png.meta | 21 +- .../BeltPuzzle/ForkLiftInteraction.prefab | 177 +++++++--- .../CardPrintingMachineInteractable.prefab | 276 +++++++++++++++- .../Puzzle_Cookie_KitchenCabinet.prefab | 7 +- .../FlowerPuzzle/Receptionist.prefab | 83 ++++- .../CementFactory/MuseumExhibition.prefab | 116 ++++++- Assets/Scenes/Levels/CementFactory.unity | 310 +++--------------- 7 files changed, 635 insertions(+), 355 deletions(-) diff --git a/Assets/Art/Levels/CementFactory/Animation/CementMachine/BrokenState/machine_brokendown0040.png.meta b/Assets/Art/Levels/CementFactory/Animation/CementMachine/BrokenState/machine_brokendown0040.png.meta index dd6f000b..64d9a8ac 100644 --- a/Assets/Art/Levels/CementFactory/Animation/CementMachine/BrokenState/machine_brokendown0040.png.meta +++ b/Assets/Art/Levels/CementFactory/Animation/CementMachine/BrokenState/machine_brokendown0040.png.meta @@ -49,8 +49,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 7 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.2} spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -135,6 +135,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -147,7 +160,7 @@ TextureImporter: width: 1800 height: 736 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -165,7 +178,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/Prefabs/Levels/CementFactory/BeltPuzzle/ForkLiftInteraction.prefab b/Assets/Prefabs/Levels/CementFactory/BeltPuzzle/ForkLiftInteraction.prefab index 1dc5a02a..9abb4aee 100644 --- a/Assets/Prefabs/Levels/CementFactory/BeltPuzzle/ForkLiftInteraction.prefab +++ b/Assets/Prefabs/Levels/CementFactory/BeltPuzzle/ForkLiftInteraction.prefab @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 368000730013689414} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.58, y: -0.66, z: -0.5} + m_LocalPosition: {x: -0.02, y: -3.3, z: -0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -112,6 +112,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7558457198582461538} + - component: {fileID: 172291823640169195} m_Layer: 6 m_Name: ForkLiftInteraction m_TagString: Untagged @@ -137,6 +138,52 @@ Transform: - {fileID: 2296390005725141326} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &172291823640169195 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522809001399822766} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 4.42, y: 2.68} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 13.2, y: 4.51} + m_EdgeRadius: 0 --- !u!1 &574363272279498006 GameObject: m_ObjectHideFlags: 0 @@ -268,7 +315,7 @@ Transform: m_GameObject: {fileID: 900570167655282311} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.30999947, y: 0.76, z: -0.5} + m_LocalPosition: {x: -4.5, y: 4.25, z: -0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -486,7 +533,7 @@ Transform: m_GameObject: {fileID: 1457748420256058179} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.11, y: -4.09, z: 0.5} + m_LocalPosition: {x: 46.59, y: -5.78, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -591,7 +638,7 @@ GameObject: - component: {fileID: 5354478377810568957} - component: {fileID: 9081591291185655284} m_Layer: 0 - m_Name: Anchor + m_Name: AnchorB m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -606,7 +653,7 @@ Transform: m_GameObject: {fileID: 1506551133505637708} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0000011920929, y: 0, z: 1.5} + m_LocalPosition: {x: -11.26, y: -1.2, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -726,7 +773,7 @@ Transform: m_GameObject: {fileID: 1719801741154906652} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.31, y: -0.76, z: 0.5} + m_LocalPosition: {x: 4.5, y: -4.249999, z: 0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -891,7 +938,7 @@ Transform: m_GameObject: {fileID: 2390996510251014407} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.5800009, y: 0.66000056, z: 0.5} + m_LocalPosition: {x: 0.019992828, y: 3.2999988, z: 0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -992,7 +1039,7 @@ Transform: m_GameObject: {fileID: 2554232885907879347} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -11.26, y: -1.2, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1041,7 +1088,7 @@ Transform: m_GameObject: {fileID: 2900540175342309955} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.79, y: -3.55, z: 0.5} + m_LocalPosition: {x: -17.84, y: 8.22, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1161,7 +1208,7 @@ Transform: m_GameObject: {fileID: 3470828948103699833} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.3999997, y: 1.3000008, z: 0.5} + m_LocalPosition: {x: -2.3899984, y: 5.34, z: 0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1383,7 +1430,7 @@ GameObject: - component: {fileID: 8115582888446723486} - component: {fileID: 8046589020141517420} m_Layer: 0 - m_Name: Anchor + m_Name: AnchorA m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1518,7 +1565,7 @@ Transform: m_GameObject: {fileID: 4324993119335168344} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.93, y: 2.93, z: 0.5} + m_LocalPosition: {x: 3.3, y: 11.78, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1638,7 +1685,7 @@ Transform: m_GameObject: {fileID: 4585964384653855942} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4, y: -1.3, z: -0.5} + m_LocalPosition: {x: 2.39, y: -5.34, z: -0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1741,7 +1788,7 @@ Transform: m_GameObject: {fileID: 4719122269627742037} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 17.21, y: -3.11, z: 0.5} + m_LocalPosition: {x: -12.62, y: -8.79, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1964,7 +2011,7 @@ Transform: m_GameObject: {fileID: 4934555001454875536} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.8399999, y: -3.0300002, z: 0.5} + m_LocalPosition: {x: -2.5599995, y: -6.249999, z: 0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2056,7 +2103,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3886934123545681228 Transform: m_ObjectHideFlags: 0 @@ -2066,7 +2113,7 @@ Transform: m_GameObject: {fileID: 5011845812302690511} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -8.9, y: -0.34, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2109,10 +2156,10 @@ MonoBehaviour: m_EditorClassIdentifier: '::' ReturningSpline: {fileID: 8922866730099550577} workerObjectTransform: {fileID: 4357190152722936295} - returnduration: 2 + returnduration: 1 returnDelay: 1 roamingWorker: {fileID: 5377715489692883818} - workerBeltObject: {fileID: 0} + workerBeltObject: {fileID: 5377715489692883818} workerAnimator: {fileID: 5383043036581615591} pantslessController: {fileID: 9100000, guid: fc3d5896722098d488aa4a8d74401ef7, type: 2} workerBeltStateMAchineRef: {fileID: 469746994189165090} @@ -2131,7 +2178,7 @@ GameObject: - component: {fileID: 5383043036581615591} - component: {fileID: 6101333632423197301} m_Layer: 0 - m_Name: RoamingWorkerSprites + m_Name: WalkingWorker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2146,7 +2193,7 @@ Transform: m_GameObject: {fileID: 5377715489692883818} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.2799988, y: -17.16, z: 0} + m_LocalPosition: {x: -11.040001, y: 6.3600006, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2199,7 +2246,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_MaskInteraction: 0 m_Sprite: {fileID: 443774957, guid: 1b395a58775c28d49bc10978be433fc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -2210,7 +2257,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 --- !u!95 &5383043036581615591 Animator: serializedVersion: 7 @@ -2221,7 +2268,7 @@ Animator: m_GameObject: {fileID: 5377715489692883818} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: fc3d5896722098d488aa4a8d74401ef7, type: 2} + m_Controller: {fileID: 9100000, guid: ee4c670ec56af694cad4fc30f78a057b, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -2572,7 +2619,7 @@ Transform: m_GameObject: {fileID: 6758421364007266492} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.28, y: -17.16, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2694,7 +2741,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4157393069671111901 Transform: m_ObjectHideFlags: 0 @@ -2704,9 +2751,9 @@ Transform: m_GameObject: {fileID: 7035779985758040736} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -14.32, y: 23.52, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7842440814220139303} - {fileID: 7508847384281937588} @@ -2754,7 +2801,7 @@ MonoBehaviour: roamDelay: 0 walkingRight: 0 pantsLess: 0 - workerBeltObject: {fileID: 0} + workerBeltObject: {fileID: 5377715489692883818} workerAnimator: {fileID: 5383043036581615591} midRoamPosition: {x: 0, y: 0, z: 0} --- !u!1 &7053579317131539631 @@ -2888,7 +2935,7 @@ Transform: m_GameObject: {fileID: 7348267223469318774} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.68, y: -0.02, z: -0.5} + m_LocalPosition: {x: 4.28, y: -3.46, z: -0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3044,9 +3091,9 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_MaskInteraction: 0 - m_Sprite: {fileID: 443774957, guid: 1b395a58775c28d49bc10978be433fc3, type: 3} + m_Sprite: {fileID: -772091242, guid: d031465f6fdffcd49b08f24a89b92062, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -3055,7 +3102,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 --- !u!95 &7488072885374278401 Animator: serializedVersion: 7 @@ -3066,7 +3113,7 @@ Animator: m_GameObject: {fileID: 7360871946912628879} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: ee4c670ec56af694cad4fc30f78a057b, type: 2} + m_Controller: {fileID: 9100000, guid: fd49be538e07fb744860136761ab144f, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -3529,7 +3576,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_MaskInteraction: 0 m_Sprite: {fileID: -226406174, guid: 87ed8034ddf5226469b6b96c93c645e7, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -3540,7 +3587,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 --- !u!95 &5900901198150943622 Animator: serializedVersion: 7 @@ -3710,7 +3757,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 --- !u!114 &279437471024764464 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3772,7 +3819,7 @@ BoxCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: 3.67} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.3693182, y: 0.1} @@ -3782,7 +3829,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 7, y: 6} + m_Size: {x: 13.03, y: 8.83} m_EdgeRadius: 0 --- !u!1 &8222326799254454920 GameObject: @@ -3915,7 +3962,7 @@ Transform: m_GameObject: {fileID: 8291636142539052674} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72, y: -2.53, z: 0} + m_LocalPosition: {x: -11.87, y: 0.26, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4035,7 +4082,7 @@ Transform: m_GameObject: {fileID: 8346415383973829723} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.84, y: 3.03, z: -0.5} + m_LocalPosition: {x: 2.56, y: 6.25, z: -0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4127,7 +4174,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4457123275831970415 Transform: m_ObjectHideFlags: 0 @@ -4159,12 +4206,12 @@ MonoBehaviour: m_EditorClassIdentifier: '::' ApproachingSpline: {fileID: 2651228037373578339} workerObjectTransform: {fileID: 4357190152722936295} - approachduration: 15 + approachduration: 3 approachDelay: 1 - workerBeltObject: {fileID: 0} + workerBeltObject: {fileID: 5377715489692883818} workerAnimator: {fileID: 5383043036581615591} - workerBeltRoamingRef: {fileID: 0} - workerBeltStateMAchineRef: {fileID: 0} + workerBeltRoamingRef: {fileID: 4844309227962071648} + workerBeltStateMAchineRef: {fileID: 469746994189165090} --- !u!114 &2651228037373578339 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4245,7 +4292,7 @@ Transform: m_GameObject: {fileID: 8739506559574568145} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.6799994, y: 0.020000696, z: 0.5} + m_LocalPosition: {x: -4.2799997, y: 3.460001, z: 0.5} m_LocalScale: {x: 0.13, y: 0.13, z: 0.13} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4361,23 +4408,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalScale.z - value: 0.125 + value: 1 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 2.34 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 4.27 objectReference: {fileID: 0} - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.z @@ -4411,10 +4458,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1441476127707699004, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3} + - target: {fileID: 1441476127707699004, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: itemData value: @@ -4503,10 +4558,18 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3} + - target: {fileID: 4806568215540268166, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5406218854466047989, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3} + - target: {fileID: 5406218854466047989, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5691805146112871981, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.y value: 0.1 @@ -4519,6 +4582,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3} + - target: {fileID: 6423747889074906943, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6913620511357318967, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_LocalPosition.x value: 0.1 @@ -4535,6 +4602,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3} + - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Name value: FancyBelt diff --git a/Assets/Prefabs/Levels/CementFactory/CardPrinter/CardPrintingMachineInteractable.prefab b/Assets/Prefabs/Levels/CementFactory/CardPrinter/CardPrintingMachineInteractable.prefab index 1d8292b8..0d3c6634 100644 --- a/Assets/Prefabs/Levels/CementFactory/CardPrinter/CardPrintingMachineInteractable.prefab +++ b/Assets/Prefabs/Levels/CementFactory/CardPrinter/CardPrintingMachineInteractable.prefab @@ -71,25 +71,23 @@ MonoBehaviour: slottedItemRenderers: - renderer: {fileID: 4363732810493563330} assignedItem: {fileID: 11400000, guid: f5a6df00a3840924a8e5b5052a8c9b05, type: 2} + displayType: 0 - renderer: {fileID: 4765283125670404640} assignedItem: {fileID: 11400000, guid: 0f94d1cbd3735424ea37b6125154ed37, type: 2} + displayType: 0 - renderer: {fileID: 6453868228671073978} assignedItem: {fileID: 11400000, guid: d0e8554a0463a924e803732e9209c92a, type: 2} + displayType: 0 - renderer: {fileID: 5502334101811892095} assignedItem: {fileID: 11400000, guid: 45c190ffad50b994ba53f64a9838751d, type: 2} + displayType: 0 onItemSlotted: m_PersistentCalls: m_Calls: [] - onItemSlotRemoved: - m_PersistentCalls: - m_Calls: [] onCorrectItemSlotted: m_PersistentCalls: m_Calls: [] - onIncorrectItemSlotted: - m_PersistentCalls: - m_Calls: [] - onForbiddenItemSlotted: + onWrongItemAttempted: m_PersistentCalls: m_Calls: [] --- !u!212 &1311388821310946158 @@ -379,6 +377,84 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 m_SpriteSortPoint: 0 +--- !u!1 &2887399999982874339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7564470332554766137} + - component: {fileID: 6132420137009971689} + m_Layer: 6 + m_Name: FireCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7564470332554766137 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2887399999982874339} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10.1, y: -19.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1858988612203349957} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &6132420137009971689 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2887399999982874339} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 7, y: 4} + m_EdgeRadius: 0 --- !u!1 &2889622702591889868 GameObject: m_ObjectHideFlags: 0 @@ -618,6 +694,7 @@ GameObject: - component: {fileID: 1858988612203349957} - component: {fileID: 8107165993532415765} - component: {fileID: 122742907268588378} + - component: {fileID: 6489000226021644401} m_Layer: 6 m_Name: CardPrintingMachineInteractable m_TagString: Untagged @@ -640,6 +717,7 @@ Transform: m_Children: - {fileID: 4355942933543779535} - {fileID: 8474381535300328579} + - {fileID: 7564470332554766137} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &8107165993532415765 @@ -710,6 +788,66 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 52.7, y: 4.48} m_EdgeRadius: 0 +--- !u!114 &6489000226021644401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8449696027466354713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalReceiver + m_Events: + m_Signals: + - {fileID: 11400000, guid: 624acdeeb1ef5d041945271eb29fb68f, type: 2} + - {fileID: 11400000, guid: 50cc58e8ee01bf841a920508fe336516, type: 2} + - {fileID: 11400000, guid: fc40e2ad40f81aa4595bdf7a53dc58b3, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1273721449607275699} + m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts + m_MethodName: ChangeState + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Exploding + m_BoolArgument: 0 + m_CallState: 2 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1273721449607275699} + m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts + m_MethodName: ChangeState + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Broken + m_BoolArgument: 0 + m_CallState: 2 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1273721449607275699} + m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts + m_MethodName: ChangeState + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Working + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &3311950488448821222 PrefabInstance: m_ObjectHideFlags: 0 @@ -718,6 +856,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1858988612203349957} m_Modifications: + - target: {fileID: 239658593309924751, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 239658593309924751, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SpriteSortPoint + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1262417946682301225, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} propertyPath: m_LocalScale.x value: 1.2 @@ -774,25 +920,139 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 1852366222342304007, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2200039860192678593, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_LocalPosition.y + value: 4.080006 + objectReference: {fileID: 0} - target: {fileID: 3083594724729558494, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} propertyPath: m_Name value: CardMachine objectReference: {fileID: 0} + - target: {fileID: 3111710571448952061, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 3953654171218162169, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.94000673 + objectReference: {fileID: 0} + - target: {fileID: 4016122581718493239, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4349144095261672277, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: defaultState + value: + objectReference: {fileID: 7820936471920159333} - target: {fileID: 4719742874103500163, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4837076380432796848, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4907884058974367606, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_LocalPosition.y + value: 5.620007 + objectReference: {fileID: 0} + - target: {fileID: 5007544549737395896, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5089514919501508623, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5589287127171019735, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5589287127171019735, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SpriteSortPoint + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5637859103962238792, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6381434641084294076, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7743535260057350024, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7865660038021731712, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8540979423276956300, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9076375528679299737, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + propertyPath: m_LocalPosition.y + value: 5.09 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5089514919501508623, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + insertIndex: -1 + addedObject: {fileID: 7872244739155912846} m_SourcePrefab: {fileID: 100100000, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} +--- !u!114 &1273721449607275699 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4349144095261672277, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + m_PrefabInstance: {fileID: 3311950488448821222} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine --- !u!4 &4355942933543779535 stripped Transform: m_CorrespondingSourceObject: {fileID: 1262417946682301225, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} m_PrefabInstance: {fileID: 3311950488448821222} m_PrefabAsset: {fileID: 0} +--- !u!1 &7734932022557956073 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5089514919501508623, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + m_PrefabInstance: {fileID: 3311950488448821222} + m_PrefabAsset: {fileID: 0} +--- !u!95 &7872244739155912846 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7734932022557956073} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &7820936471920159333 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4719742874103500163, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3} + m_PrefabInstance: {fileID: 3311950488448821222} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Levels/CementFactory/CookiePuzzle/Puzzle_Cookie_KitchenCabinet.prefab b/Assets/Prefabs/Levels/CementFactory/CookiePuzzle/Puzzle_Cookie_KitchenCabinet.prefab index f68d9a19..b078d776 100644 --- a/Assets/Prefabs/Levels/CementFactory/CookiePuzzle/Puzzle_Cookie_KitchenCabinet.prefab +++ b/Assets/Prefabs/Levels/CementFactory/CookiePuzzle/Puzzle_Cookie_KitchenCabinet.prefab @@ -655,6 +655,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!1 &3633505916120700489 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 689218690334993130} + m_PrefabAsset: {fileID: 0} --- !u!4 &4731012930784154469 stripped Transform: m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} @@ -925,7 +930,7 @@ MonoBehaviour: m_EditorClassIdentifier: AppleHillsScripts::CookieEatingBehavior cookieEatingSprites: {fileID: 3227046881050279041} consumedCookieSprites: {fileID: 684015267381189558} - cookieOutline: {fileID: 0} + cookieOutline: {fileID: 3633505916120700489} --- !u!114 &2258058195972808157 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Levels/CementFactory/FlowerPuzzle/Receptionist.prefab b/Assets/Prefabs/Levels/CementFactory/FlowerPuzzle/Receptionist.prefab index 2bc4b64a..5504e388 100644 --- a/Assets/Prefabs/Levels/CementFactory/FlowerPuzzle/Receptionist.prefab +++ b/Assets/Prefabs/Levels/CementFactory/FlowerPuzzle/Receptionist.prefab @@ -10,8 +10,8 @@ GameObject: m_Component: - component: {fileID: 4109193314185099672} - component: {fileID: 4374250469604688727} - - component: {fileID: 7494153951149241036} - - component: {fileID: 734847712741443827} + - component: {fileID: 6851146247714946527} + - component: {fileID: 4979019677279730818} m_Layer: 0 m_Name: ThrowAwayFlower m_TagString: Untagged @@ -46,7 +46,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} m_Name: m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState ---- !u!212 &7494153951149241036 +--- !u!212 &6851146247714946527 SpriteRenderer: serializedVersion: 2 m_ObjectHideFlags: 0 @@ -93,7 +93,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_MaskInteraction: 0 m_Sprite: {fileID: 1634509763, guid: 0134a9496e0e8b44baec4d115c04488a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -105,7 +105,7 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!95 &734847712741443827 +--- !u!95 &4979019677279730818 Animator: serializedVersion: 7 m_ObjectHideFlags: 0 @@ -430,7 +430,7 @@ BoxCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0.36175728, y: -1.0129216} + m_Offset: {x: 0.16, y: -0.01} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -440,7 +440,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 6.173443, y: 5.9058433} + m_Size: {x: 6.8, y: 6.79} m_EdgeRadius: 0 --- !u!1 &4922974723623378638 GameObject: @@ -452,8 +452,8 @@ GameObject: m_Component: - component: {fileID: 6225129152520501064} - component: {fileID: 2533331670105797438} - - component: {fileID: 2976850995464989583} - - component: {fileID: 1122079525894136574} + - component: {fileID: 4816017847960762268} + - component: {fileID: 7280052423934724492} m_Layer: 0 m_Name: StartCounting m_TagString: Untagged @@ -488,7 +488,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} m_Name: m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState ---- !u!212 &2976850995464989583 +--- !u!212 &4816017847960762268 SpriteRenderer: serializedVersion: 2 m_ObjectHideFlags: 0 @@ -535,7 +535,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_MaskInteraction: 0 m_Sprite: {fileID: 1634509763, guid: 0134a9496e0e8b44baec4d115c04488a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -547,7 +547,7 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!95 &1122079525894136574 +--- !u!95 &7280052423934724492 Animator: serializedVersion: 7 m_ObjectHideFlags: 0 @@ -640,7 +640,7 @@ Transform: m_GameObject: {fileID: 6453407225560981136} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.87, y: -2.32, z: 0} + m_LocalPosition: {x: -3.47, y: -1.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -740,7 +740,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_MaskInteraction: 0 m_Sprite: {fileID: 1634509763, guid: 0134a9496e0e8b44baec4d115c04488a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -853,7 +853,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_MaskInteraction: 0 m_Sprite: {fileID: 2580819557328107724, guid: 7a20cc249d7a091469fdf926cac26fb3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -944,7 +944,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_MaskInteraction: 0 m_Sprite: {fileID: 9337419, guid: ea808a25876f2f948914ae99b6ee84ff, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -966,7 +966,8 @@ GameObject: m_Component: - component: {fileID: 7498616185058313596} - component: {fileID: 7884978629675472303} - m_Layer: 0 + - component: {fileID: 8961969042133187994} + m_Layer: 6 m_Name: Receptionist m_TagString: Untagged m_Icon: {fileID: 0} @@ -1002,8 +1003,54 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 09b8ca1e43adc5d479def14f3927b5bb, type: 3} m_Name: m_EditorClassIdentifier: '::' - holdFlowerDuration: 2 + holdFlowerDuration: 3 flowerWasStolen: 0 +--- !u!61 &8961969042133187994 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8934859456622824256} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: -2.33, y: -5.05} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 19.49, y: 5.92} + m_EdgeRadius: 0 --- !u!1001 &589804470169594366 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Levels/CementFactory/MuseumExhibition.prefab b/Assets/Prefabs/Levels/CementFactory/MuseumExhibition.prefab index adf0d08b..39acc857 100644 --- a/Assets/Prefabs/Levels/CementFactory/MuseumExhibition.prefab +++ b/Assets/Prefabs/Levels/CementFactory/MuseumExhibition.prefab @@ -166,7 +166,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 2 m_MaskInteraction: 0 m_Sprite: {fileID: 21300000, guid: 1fdf70547e7f38944943efbb999801c3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -203,7 +203,7 @@ GameObject: - component: {fileID: 2572582986883531434} - component: {fileID: 6003643145791118478} - component: {fileID: 6143559876964956968} - m_Layer: 0 + m_Layer: 10 m_Name: MuseumInteractable m_TagString: Untagged m_Icon: {fileID: 0} @@ -385,6 +385,113 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!1 &4647193199128562709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 248580426826436935} + - component: {fileID: 8536861913325516688} + m_Layer: 6 + m_Name: Museum Walking Limits + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &248580426826436935 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4647193199128562709} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12.73, y: 1.65, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4577146593560193915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &8536861913325516688 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4647193199128562709} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 5.558792, y: 1.5056305} + - {x: 5.634819, y: 9.816341} + - {x: -1.4506226, y: 10.259354} + - {x: -7.042984, y: 10.330727} + - {x: -11.682144, y: 8.493572} + - {x: -20.455954, y: 4.3123703} + - {x: -20.002964, y: -3.6754265} + - {x: -5.0357037, y: -2.2835042} + - {x: 1.5148306, y: -0.16801071} + - - {x: 20.202492, y: 1.8875198} + - {x: 16.021309, y: 4.1010246} + - {x: 9.357468, y: 4.654274} + - {x: 8.286215, y: -1.7091026} + - {x: 12.075377, y: -5.8751717} + - {x: 12.4741535, y: -9.138477} + - {x: 12.083336, y: -11.183006} + - {x: 7.9925537, y: -13.972557} + - {x: -2.7120209, y: -13.055977} + - {x: -11.291389, y: -10.625977} + - {x: -21.226925, y: -15.422501} + - {x: -11.886345, y: -23.872566} + - {x: 5.0315323, y: -18.689537} + - {x: 22.162643, y: -18.383507} + - {x: 28.232323, y: -15.105881} + - {x: 32.255585, y: -11.937599} + - {x: 33.718163, y: -5.045006} + - {x: 28.311745, y: -3.074852} + - {x: 24.788017, y: 0.25663376} + m_UseDelaunayMesh: 1 --- !u!1 &6462491270683186527 GameObject: m_ObjectHideFlags: 0 @@ -466,7 +573,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 2 m_MaskInteraction: 0 m_Sprite: {fileID: 21300000, guid: 1fdf70547e7f38944943efbb999801c3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -593,7 +700,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 2 m_MaskInteraction: 0 m_Sprite: {fileID: 21300000, guid: 9d4730ac154f47f4cbbbab7316cf9679, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -647,6 +754,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7215953142613395562} + - {fileID: 248580426826436935} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3880191394412363918 diff --git a/Assets/Scenes/Levels/CementFactory.unity b/Assets/Scenes/Levels/CementFactory.unity index c1cc3665..4c9ad527 100644 --- a/Assets/Scenes/Levels/CementFactory.unity +++ b/Assets/Scenes/Levels/CementFactory.unity @@ -119,17 +119,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &14324897 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1273721449607275699, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - m_PrefabInstance: {fileID: 7905701319677686381} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3} - m_Name: - m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine --- !u!1 &18882508 GameObject: m_ObjectHideFlags: 0 @@ -314853,33 +314842,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &959043612 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - m_PrefabInstance: {fileID: 7905701319677686381} - m_PrefabAsset: {fileID: 0} ---- !u!95 &959043616 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959043612} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &964051269 GameObject: m_ObjectHideFlags: 0 @@ -316701,11 +316663,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &1132513019 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7820936471920159333, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - m_PrefabInstance: {fileID: 7905701319677686381} - m_PrefabAsset: {fileID: 0} --- !u!1 &1133819592 GameObject: m_ObjectHideFlags: 0 @@ -317381,84 +317338,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1795319160942683320, guid: 0d3410fed4070304a98dea321427e2ce, type: 3} m_PrefabInstance: {fileID: 1713626488053205516} m_PrefabAsset: {fileID: 0} ---- !u!1 &1181730029 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1181730030} - - component: {fileID: 1181730031} - m_Layer: 6 - m_Name: FireCollider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1181730030 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1181730029} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10.1, y: -19.33, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1375798238} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1181730031 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1181730029} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 7, y: 4} - m_EdgeRadius: 0 --- !u!1 &1187962677 GameObject: m_ObjectHideFlags: 0 @@ -319080,76 +318959,17 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &1375798233 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} +--- !u!114 &1375798237 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6489000226021644401, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} m_PrefabInstance: {fileID: 7905701319677686381} m_PrefabAsset: {fileID: 0} ---- !u!114 &1375798237 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375798233} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} m_Name: m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalReceiver - m_Events: - m_Signals: - - {fileID: 11400000, guid: 624acdeeb1ef5d041945271eb29fb68f, type: 2} - - {fileID: 11400000, guid: 50cc58e8ee01bf841a920508fe336516, type: 2} - - {fileID: 11400000, guid: fc40e2ad40f81aa4595bdf7a53dc58b3, type: 2} - m_Events: - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 14324897} - m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts - m_MethodName: ChangeState - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Exploding - m_BoolArgument: 0 - m_CallState: 2 - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 14324897} - m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts - m_MethodName: ChangeState - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Broken - m_BoolArgument: 0 - m_CallState: 2 - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 14324897} - m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts - m_MethodName: ChangeState - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Working - m_BoolArgument: 0 - m_CallState: 2 ---- !u!4 &1375798238 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1858988612203349957, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - m_PrefabInstance: {fileID: 7905701319677686381} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1376662052 PrefabInstance: m_ObjectHideFlags: 0 @@ -324825,33 +324645,34 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 5.1603775, y: 9.15213} + - - {x: 5.558792, y: 1.5056305} + - {x: 5.634819, y: 9.816341} - {x: -1.4506226, y: 10.259354} - {x: -7.042984, y: 10.330727} - {x: -11.682144, y: 8.493572} - - {x: -16.233465, y: 7.2538795} - - {x: -14.16739, y: -3.3433266} - - {x: -4.6087246, y: -1.3820684} - - {x: 5.262885, y: 0.44875717} - - - {x: 16.549332, y: -0.20000458} - - {x: 13.6491165, y: 0.6376343} - - {x: 10.780769, y: 2.898857} - - {x: 10.705847, y: -2.0886574} - - {x: 13.973121, y: -4.546749} - - {x: 20.966578, y: -8.284489} - - {x: 17.112373, y: -13.2230835} - - {x: 5.667816, y: -14.541885} - - {x: -5.273979, y: -12.866203} - - {x: -10.769512, y: -8.253792} - - {x: -11.311192, y: -12.148888} - - {x: -8.517841, y: -16.091797} + - {x: -20.455954, y: 4.3123703} + - {x: -20.002964, y: -3.6754265} + - {x: -5.0357037, y: -2.2835042} + - {x: 1.5148306, y: -0.16801071} + - - {x: 20.202492, y: 1.8875198} + - {x: 16.021309, y: 4.1010246} + - {x: 9.357468, y: 4.654274} + - {x: 8.286215, y: -1.7091026} + - {x: 12.075377, y: -5.8751717} + - {x: 12.4741535, y: -9.138477} + - {x: 12.083336, y: -11.183006} + - {x: 7.9925537, y: -13.972557} + - {x: -2.7120209, y: -13.055977} + - {x: -11.291389, y: -10.625977} + - {x: -21.226925, y: -15.422501} + - {x: -11.886345, y: -23.872566} - {x: 5.0315323, y: -18.689537} - {x: 22.162643, y: -18.383507} - {x: 28.232323, y: -15.105881} - {x: 32.255585, y: -11.937599} - {x: 33.718163, y: -5.045006} - {x: 28.311745, y: -3.074852} - - {x: 21.134857, y: -1.6411095} + - {x: 24.788017, y: 0.25663376} m_UseDelaunayMesh: 1 --- !u!4 &1919655035 stripped Transform: @@ -328449,7 +328270,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1816788760757037215, guid: 3ed87deee75bd9d4d9333a40985f72d4, type: 3} propertyPath: m_SortingOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4242724393814467592, guid: 3ed87deee75bd9d4d9333a40985f72d4, type: 3} propertyPath: m_Layer @@ -328580,10 +328401,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1273721449607275699, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: defaultState - value: - objectReference: {fileID: 1132513019} + - target: {fileID: 493545673386787611, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} + propertyPath: m_LocalPosition.y + value: 0.34 + objectReference: {fileID: 0} - target: {fileID: 1858988612203349957, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} propertyPath: m_LocalPosition.x value: 14.9 @@ -328624,83 +328445,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1894409461576830929, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 + - target: {fileID: 1956914018515899935, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} + propertyPath: m_LocalPosition.y + value: 0.94000673 objectReference: {fileID: 0} - - target: {fileID: 3361120543057640041, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 1 + - target: {fileID: 3710532830876431655, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} + propertyPath: m_LocalPosition.y + value: 4.080006 objectReference: {fileID: 0} - - target: {fileID: 3361120543057640041, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SpriteSortPoint - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3765717546524301025, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4674201271356961382, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5080334300755413102, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6589275206185622890, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6946602780561593393, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6946602780561593393, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SpriteSortPoint - value: 1 + - target: {fileID: 5765639000691195263, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} + propertyPath: m_LocalPosition.y + value: 5.09 objectReference: {fileID: 0} - target: {fileID: 7191082675790375086, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 7532330125638373726, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 + - target: {fileID: 7631956394112206992, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} + propertyPath: m_LocalPosition.y + value: 5.620007 objectReference: {fileID: 0} - target: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7820936471920159333, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 7986806546510998358, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} propertyPath: m_Name value: CardPrintingMachine objectReference: {fileID: 0} - - target: {fileID: 8464798714393773146, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1858988612203349957, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - insertIndex: -1 - addedObject: {fileID: 1181730030} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - insertIndex: -1 - addedObject: {fileID: 1375798237} - - targetCorrespondingSourceObject: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} - insertIndex: -1 - addedObject: {fileID: 959043616} + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3} --- !u!1001 &7974433369916253896 PrefabInstance: