diff --git a/Assets/Prefabs/Characters/PlayerCharacter.prefab b/Assets/Prefabs/Characters/PlayerCharacter.prefab index 9841d205..e8d6efc1 100644 --- a/Assets/Prefabs/Characters/PlayerCharacter.prefab +++ b/Assets/Prefabs/Characters/PlayerCharacter.prefab @@ -99,8 +99,8 @@ CapsuleCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: -0.039439917, y: -0.10845983} - m_Size: {x: 2.0788798, y: 3.4169195} + m_Offset: {x: 0.015692115, y: -0.20034671} + m_Size: {x: 3.6225784, y: 6.577825} m_Direction: 0 --- !u!114 &5148042112194028162 MonoBehaviour: @@ -158,10 +158,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 5 - radius: 1.5 + radius: 3 height: 2 canMove: 1 - maxSpeed: 7 + maxSpeed: 15 gravity: {x: NaN, y: NaN, z: NaN} groundMask: serializedVersion: 2 @@ -180,9 +180,9 @@ MonoBehaviour: targetCompatibility: {fileID: 0} maxAcceleration: -2.5 rotationSpeed: 360 - slowdownDistance: 0.6 + slowdownDistance: 3 pickNextWaypointDist: 2 - endReachedDistance: 0.2 + endReachedDistance: 1 alwaysDrawGizmos: 1 slowWhenNotFacingTarget: 1 whenCloseToDestination: 0 @@ -200,7 +200,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1 - smoothType: 2 + smoothType: 0 subdivisions: 2 iterations: 2 strength: 0.5 @@ -227,15 +227,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} propertyPath: m_LocalScale.z - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Prefabs/Characters/PulverCharacter.prefab b/Assets/Prefabs/Characters/PulverCharacter.prefab index ded86f1f..b0dca5fc 100644 --- a/Assets/Prefabs/Characters/PulverCharacter.prefab +++ b/Assets/Prefabs/Characters/PulverCharacter.prefab @@ -11,8 +11,8 @@ GameObject: - component: {fileID: 6668392923879433376} - component: {fileID: 2732140975288177209} - component: {fileID: 566650525959955209} - - component: {fileID: 2121127948713986199} - m_Layer: 0 + - component: {fileID: 7160527734420460260} + m_Layer: 8 m_Name: PulverCharacter m_TagString: Untagged m_Icon: {fileID: 0} @@ -28,8 +28,8 @@ Transform: m_GameObject: {fileID: 1102468210854536367} 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_LocalPosition: {x: -2.36, y: -0.35, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -115,7 +115,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -46950309, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + m_Sprite: {fileID: -2702071084747501952, guid: 77ab3d770c92d5344b36eee3293a0f94, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -126,25 +126,24 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &2121127948713986199 -Animator: - serializedVersion: 7 +--- !u!114 &7160527734420460260 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1102468210854536367} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f0d513a2c142eb84bbd66673a8849c0a, 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 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f82afe7b57bd4e0b9f51a1cca06765f1, type: 3} + m_Name: + m_EditorClassIdentifier: + followDistance: 3 + debugDrawTarget: 1 + followUpdateInterval: 0.1 + manualMoveSmooth: 5 + acceleration: 10 + deceleration: 12 + thresholdFar: 7 + thresholdNear: 5 + stopThreshold: 0.5 diff --git a/Assets/Prefabs/Items/ExamplePickup.prefab b/Assets/Prefabs/Items/ExamplePickup.prefab index 55c3f331..d0c0c64a 100644 --- a/Assets/Prefabs/Items/ExamplePickup.prefab +++ b/Assets/Prefabs/Items/ExamplePickup.prefab @@ -12,13 +12,21 @@ PrefabInstance: propertyPath: itemData value: objectReference: {fileID: 11400000, guid: 33e7ca06b22108d4e802486e08bcdfd1, type: 2} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 5.6 objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalPosition.z @@ -52,6 +60,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_SpriteTilingProperty.pivot.x value: 0.5 diff --git a/Assets/Prefabs/Levels/OverworldLevelSwitch.prefab b/Assets/Prefabs/Levels/OverworldLevelSwitch.prefab index 3dd2d077..4934ebe9 100644 --- a/Assets/Prefabs/Levels/OverworldLevelSwitch.prefab +++ b/Assets/Prefabs/Levels/OverworldLevelSwitch.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 841695541655102207, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} + propertyPath: m_Size.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 841695541655102207, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 841695541655102207, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} propertyPath: m_SpriteTilingProperty.pivot.x value: 0.5 @@ -44,6 +52,18 @@ PrefabInstance: propertyPath: m_Name value: AppleHillsOverworld objectReference: {fileID: 0} + - target: {fileID: 4428217320659622763, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4428217320659622763, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4428217320659622763, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4428217320659622763, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Prefabs/Levels/QuarryLevelSwitch.prefab b/Assets/Prefabs/Levels/QuarryLevelSwitch.prefab index 9bc62513..ad59f08b 100644 --- a/Assets/Prefabs/Levels/QuarryLevelSwitch.prefab +++ b/Assets/Prefabs/Levels/QuarryLevelSwitch.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 841695541655102207, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} + propertyPath: m_Size.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 841695541655102207, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 841695541655102207, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} propertyPath: m_SpriteTilingProperty.pivot.x value: 0.5 diff --git a/Assets/Scenes/AppleHillsOverworld.unity b/Assets/Scenes/AppleHillsOverworld.unity index 466e09d5..aa543532 100644 --- a/Assets/Scenes/AppleHillsOverworld.unity +++ b/Assets/Scenes/AppleHillsOverworld.unity @@ -162,7 +162,7 @@ MonoBehaviour: CustomLookAtTarget: 0 Lens: FieldOfView: 60 - OrthographicSize: 7.7550306 + OrthographicSize: 18.15416 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -222,13 +222,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 607326083758341586, guid: 539b408cd1191614abdcd99506f1157d, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 607326083758341586, guid: 539b408cd1191614abdcd99506f1157d, type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} - target: {fileID: 607326083758341586, guid: 539b408cd1191614abdcd99506f1157d, type: 3} propertyPath: m_LocalPosition.x - value: 5.46 + value: 9.59 objectReference: {fileID: 0} - target: {fileID: 607326083758341586, guid: 539b408cd1191614abdcd99506f1157d, type: 3} propertyPath: m_LocalPosition.y - value: -2.57 + value: -4.75 objectReference: {fileID: 0} - target: {fileID: 607326083758341586, guid: 539b408cd1191614abdcd99506f1157d, type: 3} propertyPath: m_LocalPosition.z @@ -319,93 +327,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 360f320f4d7a48e38f5fd7cdfa28144a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &574021860 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 574021862} - - component: {fileID: 574021861} - m_Layer: 0 - m_Name: tmp_target - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &574021861 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574021860} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 2092740789, guid: 8af0253099943e84e960c630bafbbdb4, 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.94, y: 4.61} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &574021862 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574021860} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 11.54, y: 3.28, z: 0} - m_LocalScale: {x: 0.5602, y: 0.4874, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &954512633 GameObject: m_ObjectHideFlags: 0 @@ -493,6 +414,14 @@ PrefabInstance: propertyPath: m_Name value: TestApple objectReference: {fileID: 0} + - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3} propertyPath: m_LocalPosition.x value: -8.54 @@ -612,6 +541,14 @@ PrefabInstance: propertyPath: m_Name value: TestApple objectReference: {fileID: 0} + - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3} propertyPath: m_LocalPosition.x value: -4.43 @@ -764,7 +701,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 7.7550306 + orthographic size: 18.15416 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -858,7 +795,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1 data: - dataString: UEsDBBQAAAgIAAAIIextQOSFWwIAABIFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQF1VE1z2jAQ/SuMzk0HEmigt5YE0gOBCe3k4ouQ1liDLHkkma8M/727so0dOj15ve/t7tsP+4Mp4wsQwbq5U3JhJbDvPUY2+9JrwRc48q01a3WGhvOuZMiIxCPnjQdl0T+gMG9zCE6JH2aridxHZ2lUal3+LLcwtT54dKdce0DI2UDRBl0fPXbEx92EQk5o3T+SdUZr0u9d0BRgAriW2hAbWsUqjdA8L0CS5JY86Dd0tCLRYDs1h6QLq7XytRYWTkXsdV1k4ICalYpja7H+A75moLZZoJevw270Mk09hFqV46cn5XBGVVr201aDy7nfVdL2XJdU6NswaqqyLv6B7wYRTp3NX5rCVUchU2L3xk+C+9AZbNf91CofxAEduN7xjYb3DMyrnTtbGolgcCWFlh7un9rXa2fTDMSu9VdSb5xl8f/1UA+X2PxxqlW+ISjODh1rbeO84/LB4WZ+oeB4Gr5OgV5S8cfDb77t3lANzJTzAaG6S0PyNrZ0RGUzNGjwogxT6wxEb625AMN1OK0wS7hd4A3WqXqDzDh9LHXtGmu+gZuQ6G75/f4NtLKH6658Zg8L8NmyDFoZaEUT8Ipjmlpjqvvyn0GKWpcu5aITtS2V/HxYbDIaj/kERn35+DAQo+HdAESajsZcblKZ8vGYxctTBtvkelXprKeDOzNtcoNX1vxCenPHi3jq0vHDXJ1z29GnTGrXwgGYZZWhmZAHh0Xwm5TPUuF81hCCMnHb7CNh2oodyOSaKImdPh+D40mbJWGF2ttAnoRN4z8jYeS+XvLKwV7BgYo3yS7s8hdQSwMEFAAACAgAAAgh7BGptFhtAAAAeAAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw0TPSMzTXUVBKL0osyCgGihiCOKWZKSB2tJKlqYVFomWqqUGKubFhsqmJrmFqclqaqUViSlJaSlqihYVSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAAgh7G1A5IVbAgAAEgUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAAgh7BGptFhtAAAAeAAAAAkAJAAAAAAAAAAAAAAAqAIAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAABgAwAAAAA= + dataString: UEsDBBQAAAgIAAAIIewb8cShXAIAABIFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQF1VE1z2jAQ/SuMzk3HkNBAby0E0gMJE9rJxRchrbEGWfJIcoBk+O/dlW3s0OnJ0nv78fZD/mDK+BJEsG7plFxZCez7gNGZfRl05CMc+c6ajXqH1uZVyZCTEY82Lzwoi/iQ3LwtIDglfpidJuMEwcqozLriQe5gZn3wCGdce0DK2UDeBqGPATvi52ZKLic8je7p9I6naTI441GACeA609awNautKiM0L0qQJLkzHiWXuEltaLCcxmZE0a3WyjdaWDiVsdZNmYMDKlYqjqXF/Ld4zUHt8kCXr3d97+cs8xAaVY6f5sphj+qw7KetG1dwv6+lvXFdUaJvd1FTHXX1D30zjHTmbPHYJh7GikKuxP6FnwT3odfYPjzvlA9jgw5c7/lWw2sO5skuna2MRDK4ilwrD6N5d71UNstB7Du8lnoFVuX/x0M1nGPxx5lWxZao2DsENtrGfsfhg8PJ/ELBcTV8EwJRUvHHw2++6+9QQyyU8wGppkpD8ra2cmTKFnigxosqzKwzENFGcwmG63BaY5RwPcArrpf1illweixN7oZr38CVS4Q7+yS5otb2cJmVz+1hBT5/roJWBjrRRDxhm2bWmHq//GeSvDaVy7joee0qJT8vFpuOJxM+hXEi72+HYnx3MwSRZeMJl9tMZnwyYXHzlMEyuV7XOpvu4MxMF9zglrW/kMHS8TKuunT8sFTvhe3pUyazG+EAzHMdoe2QB4dJ8E3KB6mwPxsIQZk4bfaRMm3FHmR6CZTGSh+OwfG0i5KyUr3ZQEjKZvGfkTKCL5u8dvCm4EDJ22Bndv4LUEsDBBQAAAgIAAAIIewRqbRYbQAAAHgAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNEz0jM011FQSi9KLMgoBooYgjilmSkgdrSSpamFRaJlqqlBirmxYbKpia5hanJamqlFYkpSWkpaooWFUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAAAIIewb8cShXAIAABIFAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAAAIIewRqbRYbQAAAHgAAAAJACQAAAAAAAAAAAAAAKkCAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAYQMAAAAA upgradeData: file_cachedStartup: {fileID: 0} data_cachedStartup: @@ -22858,5 +22795,4 @@ SceneRoots: - {fileID: 249343019} - {fileID: 535638824} - {fileID: 1880929595} - - {fileID: 574021862} - {fileID: 2939183354601295969} diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 82f42a33..e635bc98 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -49547,11 +49547,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8120286049716529935, guid: f49951cfa5be89540a4848c28fbb30f6, type: 3} propertyPath: m_LocalPosition.x - value: -5.6985006 + value: -9.02 objectReference: {fileID: 0} - target: {fileID: 8120286049716529935, guid: f49951cfa5be89540a4848c28fbb30f6, type: 3} propertyPath: m_LocalPosition.y - value: 0.6245073 + value: -0.95 objectReference: {fileID: 0} - target: {fileID: 8120286049716529935, guid: f49951cfa5be89540a4848c28fbb30f6, type: 3} propertyPath: m_LocalPosition.z @@ -49590,6 +49590,186 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f49951cfa5be89540a4848c28fbb30f6, type: 3} +--- !u!1 &624616731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 624616733} + - component: {fileID: 624616732} + m_Layer: 0 + m_Name: A* + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &624616732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624616731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78396926cbbfc4ac3b48fc5fc34a87d1, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + data: + dataString: UEsDBBQAAAgIAAAIIewb8cShXAIAABIFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQF1VE1z2jAQ/SuMzk3HkNBAby0E0gMJE9rJxRchrbEGWfJIcoBk+O/dlW3s0OnJ0nv78fZD/mDK+BJEsG7plFxZCez7gNGZfRl05CMc+c6ajXqH1uZVyZCTEY82Lzwoi/iQ3LwtIDglfpidJuMEwcqozLriQe5gZn3wCGdce0DK2UDeBqGPATvi52ZKLic8je7p9I6naTI441GACeA609awNautKiM0L0qQJLkzHiWXuEltaLCcxmZE0a3WyjdaWDiVsdZNmYMDKlYqjqXF/Ld4zUHt8kCXr3d97+cs8xAaVY6f5sphj+qw7KetG1dwv6+lvXFdUaJvd1FTHXX1D30zjHTmbPHYJh7GikKuxP6FnwT3odfYPjzvlA9jgw5c7/lWw2sO5skuna2MRDK4ilwrD6N5d71UNstB7Du8lnoFVuX/x0M1nGPxx5lWxZao2DsENtrGfsfhg8PJ/ELBcTV8EwJRUvHHw2++6+9QQyyU8wGppkpD8ra2cmTKFnigxosqzKwzENFGcwmG63BaY5RwPcArrpf1illweixN7oZr38CVS4Q7+yS5otb2cJmVz+1hBT5/roJWBjrRRDxhm2bWmHq//GeSvDaVy7joee0qJT8vFpuOJxM+hXEi72+HYnx3MwSRZeMJl9tMZnwyYXHzlMEyuV7XOpvu4MxMF9zglrW/kMHS8TKuunT8sFTvhe3pUyazG+EAzHMdoe2QB4dJ8E3KB6mwPxsIQZk4bfaRMm3FHmR6CZTGSh+OwfG0i5KyUr3ZQEjKZvGfkTKCL5u8dvCm4EDJ22Bndv4LUEsDBBQAAAgIAAAIIewRqbRYbQAAAHgAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNEz0jM011FQSi9KLMgoBooYgjilmSkgdrSSpamFRaJlqqlBirmxYbKpia5hanJamqlFYkpSWkpaooWFUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAAAIIewb8cShXAIAABIFAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAAAIIewRqbRYbQAAAHgAAAAJACQAAAAAAAAAAAAAAKkCAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAYQMAAAAA + upgradeData: + file_cachedStartup: {fileID: 0} + data_cachedStartup: + cacheStartup: 0 + showNavGraphs: 1 + showUnwalkableNodes: 1 + debugMode: 0 + debugFloor: 0 + debugRoof: 1 + manualDebugFloorRoof: 0 + showSearchTree: 0 + unwalkableNodeDebugSize: 0.3 + logPathResults: 1 + maxNearestNodeDistance: 100 + scanOnStartup: 1 + fullGetNearestSearch: 0 + prioritizeGraphs: 0 + prioritizeGraphsLimit: 1 + colorSettings: + _SolidColor: {r: 0.11764706, g: 0.4, b: 0.7882353, a: 0.9} + _UnwalkableNode: {r: 1, g: 0, b: 0, a: 0.5} + _BoundsHandles: {r: 0.29, g: 0.454, b: 0.741, a: 0.9} + _ConnectionLowLerp: {r: 0, g: 1, b: 0, a: 0.5} + _ConnectionHighLerp: {r: 1, g: 0, b: 0, a: 0.5} + _MeshEdgeColor: {r: 0, g: 0, b: 0, a: 0.5} + _AreaColors: + - {r: 0, g: 0, b: 0, a: 0} + tagNames: + - Basic Ground + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 + - 10 + - 11 + - 12 + - 13 + - 14 + - 15 + - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + heuristic: 2 + heuristicScale: 1 + threadCount: 1 + maxFrameTime: 1 + batchGraphUpdates: 0 + graphUpdateBatchingInterval: 0.2 + euclideanEmbedding: + mode: 0 + seed: 0 + pivotPointRoot: {fileID: 0} + spreadOutCount: 1 + showGraphs: 1 +--- !u!4 &624616733 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624616731} + 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: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &771371053 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1102468210854536367, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_Name + value: PulverCharacter + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalPosition.x + value: -3.65 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalPosition.y + value: -3.5 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6668392923879433376, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} --- !u!1 &1045750399 GameObject: m_ObjectHideFlags: 0 @@ -50011,3 +50191,5 @@ SceneRoots: - {fileID: 264885659} - {fileID: 1137411211} - {fileID: 312860098} + - {fileID: 624616733} + - {fileID: 771371053} diff --git a/Assets/Scripts/FollowerController.cs b/Assets/Scripts/FollowerController.cs index 51f880ed..e0ffa773 100644 --- a/Assets/Scripts/FollowerController.cs +++ b/Assets/Scripts/FollowerController.cs @@ -1,5 +1,6 @@ using UnityEngine; using Pathfinding; +using UnityEngine.SceneManagement; public class FollowerController : MonoBehaviour { @@ -32,15 +33,29 @@ public class FollowerController : MonoBehaviour aiPath = GetComponent(); } - void Start() + void OnEnable() + { + SceneManager.sceneLoaded += OnSceneLoaded; + FindPlayerReference(); + } + + void OnDisable() + { + SceneManager.sceneLoaded -= OnSceneLoaded; + } + + void OnSceneLoaded(Scene scene, LoadSceneMode mode) + { + FindPlayerReference(); + } + + void FindPlayerReference() { - // Find player by tag GameObject playerObj = GameObject.FindGameObjectWithTag("Player"); if (playerObj != null) { playerTransform = playerObj.transform; playerAIPath = playerObj.GetComponent(); - // Fetch player's max speed if (playerAIPath != null) { playerMaxSpeed = playerAIPath.maxSpeed; @@ -48,12 +63,25 @@ public class FollowerController : MonoBehaviour } else { - Debug.LogError("FollowerController: Player object with tag 'Player' not found."); + playerTransform = null; + playerAIPath = null; } } + void Start() + { + FindPlayerReference(); + } + void UpdateFollowTarget() { + if (playerTransform == null) + { + // Try to reacquire reference if lost + FindPlayerReference(); + if (playerTransform == null) + return; // Still missing, skip update + } // Determine direction: use player's velocity if available, else lastMoveDir Vector3 playerPos = playerTransform.position; Vector3 moveDir = Vector3.zero; @@ -81,7 +109,12 @@ public class FollowerController : MonoBehaviour void Update() { if (playerTransform == null) - return; + { + // Try to reacquire reference if lost + FindPlayerReference(); + if (playerTransform == null) + return; // Still missing, skip update + } timer += Time.deltaTime; if (timer >= followUpdateInterval)