From 3d3b72f04d48cc36fd04f305d543a19e4072f95b Mon Sep 17 00:00:00 2001 From: Michal Pikulski Date: Tue, 2 Sep 2025 10:42:11 +0200 Subject: [PATCH] [Player] Stack the player prefab with Trafalgar art --- .../Characters/Trafalgar/Trafalgar.prefab | 66 -------- Assets/Prefabs/Player/Player.prefab | 147 ++++++++++-------- 2 files changed, 84 insertions(+), 129 deletions(-) diff --git a/Assets/Art/Prefabs/Characters/Trafalgar/Trafalgar.prefab b/Assets/Art/Prefabs/Characters/Trafalgar/Trafalgar.prefab index 01953c84..484e601f 100644 --- a/Assets/Art/Prefabs/Characters/Trafalgar/Trafalgar.prefab +++ b/Assets/Art/Prefabs/Characters/Trafalgar/Trafalgar.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 7877460049793670011} - component: {fileID: 6109476811019011833} - component: {fileID: 3714001194702331617} - - component: {fileID: 8336393878422790354} - - component: {fileID: 3730348785006820544} m_Layer: 0 m_Name: Trafalgar m_TagString: Untagged @@ -112,67 +110,3 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!50 &8336393878422790354 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 784715772773378889} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!70 &3730348785006820544 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 784715772773378889} - 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.05450535, y: -0.21802068} - m_Size: {x: 4.434355, y: 6.6199994} - m_Direction: 0 diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index c3a4cccd..1a654113 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -9,9 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3823830588451517910} - - component: {fileID: 1680501259880348988} - component: {fileID: 5561047086518554858} - - component: {fileID: 1029242719786036324} + - component: {fileID: 8910846343857380832} - component: {fileID: 5148042112194028162} m_Layer: 0 m_Name: Player @@ -30,66 +29,12 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3792254836612903466} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1680501259880348988 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4157358163210553531} - 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: 1530891998073934057, guid: 77ab3d770c92d5344b36eee3293a0f94, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.53125, y: 0.53125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!50 &5561047086518554858 Rigidbody2D: serializedVersion: 5 @@ -117,8 +62,8 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!58 &1029242719786036324 -CircleCollider2D: +--- !u!70 &8910846343857380832 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -151,8 +96,9 @@ CircleCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_Radius: 0.35 + m_Offset: {x: -0.039439917, y: -0.10845983} + m_Size: {x: 2.0788798, y: 3.4169195} + m_Direction: 0 --- !u!114 &5148042112194028162 MonoBehaviour: m_ObjectHideFlags: 0 @@ -168,3 +114,78 @@ MonoBehaviour: moveSpeed: 5 stopDistance: 0.1 useRigidbody: 1 +--- !u!1001 &6481409403749263697 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3823830588451517910} + m_Modifications: + - target: {fileID: 784715772773378889, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_Name + value: Trafalgar + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8336393878422790354, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} +--- !u!4 &3792254836612903466 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3} + m_PrefabInstance: {fileID: 6481409403749263697} + m_PrefabAsset: {fileID: 0}