diff --git a/Assets/Art/Animations/UI/ItemGlow.meta b/Assets/Art/Animations/UI/ItemGlow.meta new file mode 100644 index 00000000..0b225911 --- /dev/null +++ b/Assets/Art/Animations/UI/ItemGlow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20799ebbd4d1d8c4cbba25b565a07298 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/UI/ItemGlow/Glow.controller b/Assets/Art/Animations/UI/ItemGlow/Glow.controller new file mode 100644 index 00000000..11f54b30 --- /dev/null +++ b/Assets/Art/Animations/UI/ItemGlow/Glow.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8450745907374897634 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1204894715429142072} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1204894715429142072} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Glow + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8450745907374897634} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1204894715429142072 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ItemGlowAnim + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 6e431f84629a3ec408239aeaceb41d8b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Art/Animations/UI/ItemGlow/Glow.controller.meta b/Assets/Art/Animations/UI/ItemGlow/Glow.controller.meta new file mode 100644 index 00000000..bb2aa13b --- /dev/null +++ b/Assets/Art/Animations/UI/ItemGlow/Glow.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 625c4cf5003c069478057729a67f9f65 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/UI/ItemGlow/ItemGlowAnim.anim b/Assets/Art/Animations/UI/ItemGlow/ItemGlowAnim.anim new file mode 100644 index 00000000..8cd3ed26 --- /dev/null +++ b/Assets/Art/Animations/UI/ItemGlow/ItemGlowAnim.anim @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ItemGlowAnim + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.9, y: 0.9, z: 0.9} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, 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: 2 + value: {x: 1.3, y: 1.3, z: 1.3} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, 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: 4 + value: {x: 0.9, y: 0.9, z: 0.9} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 4 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/UI/ItemGlow/ItemGlowAnim.anim.meta b/Assets/Art/Animations/UI/ItemGlow/ItemGlowAnim.anim.meta new file mode 100644 index 00000000..ce658286 --- /dev/null +++ b/Assets/Art/Animations/UI/ItemGlow/ItemGlowAnim.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e431f84629a3ec408239aeaceb41d8b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Sprites/UI/BackgroundGlow.png b/Assets/Art/Sprites/UI/BackgroundGlow.png index 62932b8a..9ce6ca97 100644 Binary files a/Assets/Art/Sprites/UI/BackgroundGlow.png and b/Assets/Art/Sprites/UI/BackgroundGlow.png differ diff --git a/Assets/Art/Sprites/UI/BackgroundGlow.png.meta b/Assets/Art/Sprites/UI/BackgroundGlow.png.meta index 3657696f..7db36c7b 100644 --- a/Assets/Art/Sprites/UI/BackgroundGlow.png.meta +++ b/Assets/Art/Sprites/UI/BackgroundGlow.png.meta @@ -130,11 +130,11 @@ TextureImporter: rect: serializedVersion: 2 x: 137 - y: 61 + y: 31 width: 961 - height: 851 + height: 926 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: [] @@ -151,7 +151,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 03ba69e84969d9f43ac25f51b14a03dd internalID: 0 vertices: [] indices: diff --git a/Assets/Art/Sprites/UI/BackgroundGlow.png~ b/Assets/Art/Sprites/UI/BackgroundGlow.png~ new file mode 100644 index 00000000..62932b8a Binary files /dev/null and b/Assets/Art/Sprites/UI/BackgroundGlow.png~ differ diff --git a/Assets/Prefabs/Items/BasePickup.prefab b/Assets/Prefabs/Items/BasePickup.prefab index 9e0d61a2..512f8536 100644 --- a/Assets/Prefabs/Items/BasePickup.prefab +++ b/Assets/Prefabs/Items/BasePickup.prefab @@ -1,5 +1,37 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &90068231481037707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1123190335639748903} + m_Layer: 10 + m_Name: HighlightEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1123190335639748903 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90068231481037707} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 6822963659154049764} + m_Father: {fileID: 1730119453103664125} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7447346505753002421 GameObject: m_ObjectHideFlags: 0 @@ -32,7 +64,8 @@ Transform: m_LocalPosition: {x: 3.405, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 0.625} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 1123190335639748903} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7494677664706785084 @@ -180,3 +213,116 @@ MonoBehaviour: m_EditorClassIdentifier: itemData: {fileID: 11400000, guid: 0c6986639ca176a419c92f5a327d95ce, type: 2} iconRenderer: {fileID: 7494677664706785084} +--- !u!1 &8194379574951783525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6822963659154049764} + - component: {fileID: 859535282245879918} + - component: {fileID: 5647865483217344709} + m_Layer: 10 + m_Name: Glow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6822963659154049764 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8194379574951783525} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1123190335639748903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &859535282245879918 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8194379574951783525} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.61, y: 8.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &5647865483217344709 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8194379574951783525} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, type: 2} + 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 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index f31b6cfd..7a0eb0fc 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -1390,6 +1390,119 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 94815899} m_PrefabAsset: {fileID: 0} +--- !u!1 &103436379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 103436380} + - component: {fileID: 103436382} + - component: {fileID: 103436381} + m_Layer: 10 + m_Name: Glow (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &103436380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103436379} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 487113963} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &103436381 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103436379} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, type: 2} + 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!212 &103436382 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103436379} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.61, y: 8.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &104952029 PrefabInstance: m_ObjectHideFlags: 0 @@ -2447,6 +2560,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 898680540} m_Modifications: + - target: {fileID: 4774534086162962138, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5070378814342643473, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} propertyPath: m_Name value: BlueBall @@ -2514,7 +2631,10 @@ PrefabInstance: m_RemovedComponents: - {fileID: 8812271188036963294, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} + insertIndex: -1 + addedObject: {fileID: 925413038} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 5070378814342643473, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} insertIndex: -1 @@ -430045,7 +430165,7 @@ Transform: m_GameObject: {fileID: 230277922} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 4.47, z: 0} + m_LocalPosition: {x: 0, y: 6.48, z: 0} m_LocalScale: {x: 0.71428573, y: 0.71428573, z: 2.857143} m_ConstrainProportionsScale: 0 m_Children: @@ -433160,7 +433280,7 @@ Transform: m_GameObject: {fileID: 369578433} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.42, z: 0} + m_LocalPosition: {x: 0, y: 1.989, z: 0} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: @@ -434325,6 +434445,38 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 451686079} m_PrefabAsset: {fileID: 0} +--- !u!1 &456329680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 456329681} + m_Layer: 10 + m_Name: GlowEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &456329681 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 456329680} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1934418039} + m_Father: {fileID: 1838334756} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &457896102 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3606875748053192296, guid: 30285f2632211504484661965ed61c57, type: 3} @@ -434415,10 +434567,17 @@ PrefabInstance: propertyPath: m_Size.y value: 1.36 objectReference: {fileID: 0} + - target: {fileID: 4986096986936361008, guid: d677a46297a07994fa1b551de27f821c, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4272383251773444855, guid: d677a46297a07994fa1b551de27f821c, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} + insertIndex: -1 + addedObject: {fileID: 941637536} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 2331806108796329904, guid: d677a46297a07994fa1b551de27f821c, type: 3} insertIndex: -1 @@ -434519,6 +434678,119 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 459948550} m_PrefabAsset: {fileID: 0} +--- !u!1 &460684199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 460684200} + - component: {fileID: 460684202} + - component: {fileID: 460684201} + m_Layer: 10 + m_Name: Glow (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &460684200 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460684199} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 941637536} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &460684201 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460684199} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, type: 2} + 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!212 &460684202 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460684199} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.61, y: 8.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &463828468 PrefabInstance: m_ObjectHideFlags: 0 @@ -434941,6 +435213,38 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 486936930} m_PrefabAsset: {fileID: 0} +--- !u!1 &487113962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 487113963} + m_Layer: 10 + m_Name: GlowEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &487113963 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 487113962} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 103436380} + m_Father: {fileID: 2030009511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &487455851 GameObject: m_ObjectHideFlags: 0 @@ -435829,6 +436133,22 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.oldSize.y value: 3.96 objectReference: {fileID: 0} + - target: {fileID: 2368585209829502048, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2368585209829502048, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2368585209829502048, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2640541853039617321, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalScale.x value: 0.7 @@ -435921,10 +436241,34 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: -3811075571101519331, guid: 4a1a1ea0011e5644c917aaa7255ab48f, type: 3} + - target: {fileID: 5137140128224035451, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5193479583796800754, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_Name value: Chocolate objectReference: {fileID: 0} + - target: {fileID: 8212508905005311907, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8212508905005311907, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8212508905005311907, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8212508905005311907, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8212508905005311907, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -436831,15 +437175,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.x @@ -438894,15 +439238,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.x @@ -439850,7 +440194,7 @@ Transform: m_GameObject: {fileID: 713720583} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.36, y: 6.83, z: 0} + m_LocalPosition: {x: -3.36, y: 10.54, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -443171,6 +443515,38 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 923779306} m_PrefabAsset: {fileID: 0} +--- !u!1 &925413037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 925413038} + m_Layer: 10 + m_Name: GlowEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &925413038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 925413037} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.12, y: 0.12, z: 0.12} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1826363465} + m_Father: {fileID: 152724147} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &937132183 PrefabInstance: m_ObjectHideFlags: 0 @@ -443461,6 +443837,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 941275209} m_Mesh: {fileID: 4300000, guid: c0de5c847168f47b48791e9f1912e7c0, type: 3} +--- !u!1 &941637535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 941637536} + m_Layer: 10 + m_Name: GlowEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &941637536 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 941637535} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 460684200} + m_Father: {fileID: 459290201} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &942648382 stripped Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} @@ -448777,7 +449185,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stepData: {fileID: 11400000, guid: 8ac614a698631554ab8ac39aed04a189, type: 2} - puzzleIndicator: {fileID: 1974667227} + puzzleIndicator: {fileID: 0} drawPromptRangeGizmo: 1 --- !u!114 &1182494941 MonoBehaviour: @@ -449681,38 +450089,6 @@ Transform: m_Children: [] m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.957} ---- !u!1 &1230365908 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1230365909} - m_Layer: 10 - m_Name: AnimContainer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1230365909 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230365908} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.826, y: 1.333, z: 0} - m_LocalScale: {x: 0.1851852, y: 0.1851852, z: 0.1851852} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1974667228} - m_Father: {fileID: 7530821580781571561} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1230441486 GameObject: m_ObjectHideFlags: 0 @@ -450525,7 +450901,7 @@ Transform: m_GameObject: {fileID: 1289543736} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3.39, z: 0} + m_LocalPosition: {x: 0, y: 4.713, z: 0} m_LocalScale: {x: 0.6053269, y: 0.6053269, z: 2.4213076} m_ConstrainProportionsScale: 0 m_Children: @@ -450728,6 +451104,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 898680540} m_Modifications: + - target: {fileID: 856934202473432377, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 856934202473432377, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_LocalScale.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 856934202473432377, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} - target: {fileID: 1242278318846904640, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: puzzleIndicator value: @@ -450752,6 +451140,10 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 4419731015739629793, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4419731015739629793, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: m_SortingLayerID value: 0 @@ -450796,6 +451188,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6539833560503455482, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 6539833560503455482, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_LocalScale.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 6539833560503455482, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 6825722660981786547, guid: 30285f2632211504484661965ed61c57, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9209620026700166911, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 1.35 @@ -451194,15 +451602,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.x @@ -451389,6 +451797,18 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.oldSize.y value: 5.63 objectReference: {fileID: 0} + - target: {fileID: 2504621886160350801, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_LocalPosition.x + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: 2504621886160350801, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_LocalPosition.y + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 2790478271624144664, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalScale.x value: 0.45000002 @@ -451403,7 +451823,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.x - value: -20.83 + value: -20.839 objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.y @@ -451449,6 +451869,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 7029408211075050325, guid: 00637ce2d8f2923419b6ed4e91792dc0, type: 3} + - target: {fileID: 4996209826323415114, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4996209826323415114, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_SpriteSortPoint value: 1 @@ -451457,6 +451881,10 @@ PrefabInstance: propertyPath: m_Name value: BurgerBuns objectReference: {fileID: 0} + - target: {fileID: 8350908123362551186, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_LocalPosition.x + value: 2.03 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 200688012287672078, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} m_RemovedGameObjects: [] @@ -452181,7 +452609,7 @@ Transform: m_GameObject: {fileID: 1377880679} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.08, y: 4.01, z: 0} + m_LocalPosition: {x: 0.08, y: 4.33, z: 0} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: @@ -452678,22 +453106,6 @@ PrefabInstance: propertyPath: m_Name value: NextStepIndicator objectReference: {fileID: 0} - - target: {fileID: 5383276844808284485, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -452734,10 +453146,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -455543,15 +455951,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.x @@ -457527,15 +457935,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.x @@ -457543,7 +457951,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.y - value: 3.76 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} propertyPath: m_LocalPosition.z @@ -457619,7 +458027,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1682591185 Transform: m_ObjectHideFlags: 0 @@ -459904,7 +460312,7 @@ Transform: m_GameObject: {fileID: 1762415083} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 2.16, z: 0} + m_LocalPosition: {x: 0, y: 4.8, z: 0} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: @@ -460955,6 +461363,119 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1824578623} m_PrefabAsset: {fileID: 0} +--- !u!1 &1826363464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1826363465} + - component: {fileID: 1826363467} + - component: {fileID: 1826363466} + m_Layer: 10 + m_Name: Glow (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1826363465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826363464} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 925413038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1826363466 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826363464} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, type: 2} + 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!212 &1826363467 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826363464} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.61, y: 8.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1827605008 PrefabInstance: m_ObjectHideFlags: 0 @@ -461070,6 +461591,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4055726361761331703, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} propertyPath: m_LocalScale.x value: 2.7 @@ -461129,7 +461654,10 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3696625264308890211, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} + insertIndex: -1 + addedObject: {fileID: 456329681} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 2755476303005018105, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} insertIndex: -1 @@ -462331,6 +462859,119 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 6.3, y: 3.5} m_EdgeRadius: 0 +--- !u!1 &1934418038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1934418039} + - component: {fileID: 1934418041} + - component: {fileID: 1934418040} + m_Layer: 10 + m_Name: Glow (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1934418039 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934418038} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 456329681} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1934418040 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934418038} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, type: 2} + 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!212 &1934418041 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934418038} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.61, y: 8.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1939263931 GameObject: m_ObjectHideFlags: 0 @@ -463728,93 +464369,6 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 1.5, y: 1.5} m_EdgeRadius: 0 ---- !u!1001 &1974667226 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1230365909} - m_Modifications: - - target: {fileID: 5383276844808284485, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_Name - value: NextStepIndicator - objectReference: {fileID: 0} - - target: {fileID: 5383276844808284485, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} ---- !u!1 &1974667227 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5383276844808284485, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - m_PrefabInstance: {fileID: 1974667226} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1974667228 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} - m_PrefabInstance: {fileID: 1974667226} - m_PrefabAsset: {fileID: 0} --- !u!4 &1979553424 stripped Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} @@ -464482,6 +465036,10 @@ PrefabInstance: propertyPath: characterToInteract value: 2 objectReference: {fileID: 0} + - target: {fileID: 1700732733220603278, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1784002662241348359, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} propertyPath: m_Name value: Nails @@ -464538,6 +465096,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8074419084603501461, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 8074419084603501461, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 8074419084603501461, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 8391868573038338780, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -464705,10 +465279,17 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4266110216568578813, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8318004605383042340, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} + insertIndex: -1 + addedObject: {fileID: 487113963} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 825072831861764844, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} insertIndex: -1 @@ -467403,6 +467984,18 @@ PrefabInstance: propertyPath: bushAnimator value: objectReference: {fileID: 1476225951} + - target: {fileID: 1553783191186282222, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalScale.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1553783191186282222, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalScale.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1553783191186282222, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 2491802807835645092, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: characterToInteract value: 2 @@ -467411,6 +468004,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: -3550219642256907274, guid: 1df66fc312bec494f9c7ee17317ff1aa, type: 3} + - target: {fileID: 2531688711670838070, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3022736757165821944, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_LocalPosition.x value: 2.68 @@ -467503,6 +468100,30 @@ PrefabInstance: propertyPath: characterToInteract value: 2 objectReference: {fileID: 0} + - target: {fileID: 4669531401967178852, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951271765903072557, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalScale.x + value: 1.48 + objectReference: {fileID: 0} + - target: {fileID: 4951271765903072557, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalScale.y + value: 1.48 + objectReference: {fileID: 0} + - target: {fileID: 4951271765903072557, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalScale.z + value: 1.48 + objectReference: {fileID: 0} + - target: {fileID: 4951271765903072557, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalPosition.x + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 4951271765903072557, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_LocalPosition.y + value: -0.2 + objectReference: {fileID: 0} - target: {fileID: 5236930998804014616, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_Layer value: 10 @@ -467589,7 +468210,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6865758097422051095, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7042345690456335656, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_Size.x @@ -468004,7 +468625,8 @@ PrefabInstance: m_RemovedComponents: - {fileID: 5015123355472106337, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - {fileID: 2013850788445308701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 1059106599578386158, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} insertIndex: 0 @@ -468732,6 +469354,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 305861995533261809, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 305861995533261809, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 305861995533261809, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 305861995533261809, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_WrapMode value: 2 @@ -468820,6 +469458,10 @@ PrefabInstance: propertyPath: m_SceneBindings.Array.data[11].value value: objectReference: {fileID: 1974401592} + - target: {fileID: 2084964592986606867, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_LocalPosition.y + value: 1.68 + objectReference: {fileID: 0} - target: {fileID: 2720557426779044373, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_Sprite value: @@ -469006,10 +469648,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: ee609df51f47bd541a23d5425e289e30, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 4937390562043858043, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} - insertIndex: 0 - addedObject: {fileID: 1230365909} + m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7379304988657006554, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} insertIndex: -1 @@ -469024,11 +469663,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1182494942} m_SourcePrefab: {fileID: 100100000, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} ---- !u!4 &7530821580781571561 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4937390562043858043, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} - m_PrefabInstance: {fileID: 7530821580781571560} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7535757761066548300 PrefabInstance: m_ObjectHideFlags: 0 @@ -469412,7 +470046,8 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2944268128369172028, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 4439481655756498895, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} insertIndex: 0 diff --git a/Assets/Scripts/UI/TestIndicator.cs b/Assets/Scripts/UI/TestIndicator.cs index 2af0587a..2e739c88 100644 --- a/Assets/Scripts/UI/TestIndicator.cs +++ b/Assets/Scripts/UI/TestIndicator.cs @@ -19,12 +19,12 @@ public class TestIndicator : MonoBehaviour, PuzzleS.IPuzzlePrompt public void ShowClose() { - gameObject.transform.localScale = new Vector3(1f, 1f, 1f); + gameObject.transform.localScale = new Vector3(2f, 2f, 2f); } public void HideClose() { - gameObject.transform.localScale = new Vector3(0.5f, 0.5f, 0.5f); + gameObject.transform.localScale = new Vector3(1f, 1f, 1f); } public void HideFar()