diff --git a/Assets/Prefabs/Items/BoosterPack.prefab b/Assets/Prefabs/Items/BoosterPack.prefab new file mode 100644 index 00000000..2828f60c --- /dev/null +++ b/Assets/Prefabs/Items/BoosterPack.prefab @@ -0,0 +1,180 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1192232787243676909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2473101330038538266} + - component: {fileID: 3707340055322249340} + - component: {fileID: 6929523442900823636} + - component: {fileID: 5148150843116358608} + m_Layer: 10 + m_Name: BoosterPack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2473101330038538266 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192232787243676909} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 73.19, y: 4.27, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3707340055322249340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192232787243676909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11629418bd2d44fa9da229ad62c04332, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Interactions.BoosterPackPickup + isOneTime: 0 + cooldown: -1 + characterToInteract: 2 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] + itemData: {fileID: 11400000, guid: c7fafa07afc3ea44598349d2a4777a8c, type: 2} + iconRenderer: {fileID: 6929523442900823636} + glowVisualPrefab: {fileID: 0} + zoomCamera: {fileID: 0} + boosterPackCount: 1 + cameraBlendWait: 0.3 + growDuration: 0.25 + pulseDuration: 0.3 + pulseCount: 3 + disappearDuration: 0.5 + growScale: 1.5 + pulseScale: 1.2 +--- !u!212 &6929523442900823636 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192232787243676909} + 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: 9dfc825aed78fcd4ba02077103263b40, 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_MaskInteraction: 0 + m_Sprite: {fileID: -1296148786, guid: b07c9a09f81cfa5428d6db01c6a36960, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3, y: 4.57} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!61 &5148150843116358608 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192232787243676909} + 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.100000024, y: 0.0050001144} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.53333336, y: 0.4989059} + oldSize: {x: 3, y: 4.57} + newSize: {x: 3, y: 4.57} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 4.25, y: 6.15} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Items/BoosterPack.prefab.meta b/Assets/Prefabs/Items/BoosterPack.prefab.meta new file mode 100644 index 00000000..b28e09a6 --- /dev/null +++ b/Assets/Prefabs/Items/BoosterPack.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9162beaeedfb184694b8ea7b99f19de +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index dfebdc73..2ee1a939 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -472525,6 +472525,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} +--- !u!1001 &7412702034506718418 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1192232787243676909, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_Name + value: BoosterPack + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalPosition.x + value: 73.19 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalPosition.y + value: 4.27 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3} --- !u!1001 &7530821580781571560 PrefabInstance: m_ObjectHideFlags: 0 @@ -473049,6 +473106,7 @@ SceneRoots: - {fileID: 523851908375903090} - {fileID: 341893679} - {fileID: 1373293420} + - {fileID: 7412702034506718418} - {fileID: 1073425384} - {fileID: 624616733} - {fileID: 1794862441} diff --git a/Assets/Settings/PlayerFollowerSettings.asset b/Assets/Settings/PlayerFollowerSettings.asset index a0306515..58ee3ea3 100644 --- a/Assets/Settings/PlayerFollowerSettings.asset +++ b/Assets/Settings/PlayerFollowerSettings.asset @@ -29,7 +29,7 @@ MonoBehaviour: manualMoveSmooth: 1 thresholdFar: 10 thresholdNear: 3 - stopThreshold: 0.1 + stopThreshold: 0.5 followUpdateInterval: 0.1 followerSpeedMultiplier: 0.9 heldIconDisplayHeight: 2