From 534de11e5d03216b8feb5d208cca110a307d1c47 Mon Sep 17 00:00:00 2001 From: Joywayer Date: Thu, 21 May 2026 22:37:38 +0800 Subject: [PATCH] Refactor ability types and update tags - Updated AbilityTypeDrawer to replace "Dive" with "DownDash" in the movement abilities section. - Modified GMToolWindow to reflect the change from "Dive" to "DownDash" in the ability list. - Changed AbilityType enum to rename "Dive" to "DownDash" with updated description. - Adjusted AllMovement mask in AbilityType to include "DownDash" instead of "Dive". - Corrected tag from "OneWayPlatforms" to "OneWayPlatform" in TagManager settings. --- .../Player/PLY_PlayerMovementConfig.asset | 13 +- .../_Game/Data/Player/PLY_PlayerStats.asset | 2 +- Assets/_Game/Scenes/Testings/TestRoomA.unity | 1093 ++++++++++++++++- .../Editor/Equipment/AbilityTypeDrawer.cs | 4 +- .../Scripts/Editor/Tools/GMToolWindow.cs | 4 +- Assets/_Game/Scripts/Player/AbilityType.cs | 4 +- ProjectSettings/TagManager.asset | 2 +- 7 files changed, 1102 insertions(+), 20 deletions(-) diff --git a/Assets/_Game/Data/Player/PLY_PlayerMovementConfig.asset b/Assets/_Game/Data/Player/PLY_PlayerMovementConfig.asset index 8ce1e6e..851bc1f 100644 --- a/Assets/_Game/Data/Player/PLY_PlayerMovementConfig.asset +++ b/Assets/_Game/Data/Player/PLY_PlayerMovementConfig.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 81da55e0fcf99d34693cbc5a348225c3, type: 3} m_Name: PLY_PlayerMovementConfig m_EditorClassIdentifier: - RunSpeed: 10 + RunSpeed: 8 AirDragFactor: 1 JumpForce: 24 CoyoteTime: 0.12 @@ -26,18 +26,17 @@ MonoBehaviour: DashSpeed: 20 DashDuration: 0.25 DashCooldown: 0.4 - MaxAerialDashes: 1 DashInvincibilityDuration: 0.2 DashInvincibilityCooldown: 0.9 WallSlideSpeed: 2 - WallJumpForceX: 12 - WallJumpForceY: 16 + WallHangSpeed: 1 WallRayLength: 0.37 WallRayOffsetY: 0.2 - WallGrabMaxHeightGain: 0.5 - WallGrabReleaseDelay: 0.08 - WallJumpBackForceX: 14 + WallGrabHeightTolerance: 0.05 + WallCoyoteTime: 0.12 WallJumpAwayForceX: 10 WallJumpAwayForceY: 18 + WallJumpTowardForceX: -6 + WallJumpTowardForceY: 18 WallJumpInputLockDuration: 0.15 DefaultGravityScale: 6 diff --git a/Assets/_Game/Data/Player/PLY_PlayerStats.asset b/Assets/_Game/Data/Player/PLY_PlayerStats.asset index 7f5e317..d448f37 100644 --- a/Assets/_Game/Data/Player/PLY_PlayerStats.asset +++ b/Assets/_Game/Data/Player/PLY_PlayerStats.asset @@ -21,4 +21,4 @@ MonoBehaviour: SpringKillThreshold: 4 InvincibilityDuration: 0.6 InitialLingZhu: 0 - InitialAbilities: 524279 + InitialAbilities: 0 diff --git a/Assets/_Game/Scenes/Testings/TestRoomA.unity b/Assets/_Game/Scenes/Testings/TestRoomA.unity index 962af60..805b3d2 100644 --- a/Assets/_Game/Scenes/Testings/TestRoomA.unity +++ b/Assets/_Game/Scenes/Testings/TestRoomA.unity @@ -2842,6 +2842,83 @@ PolygonCollider2D: - {x: 3.5, y: 6.5} - {x: -15.5, y: 6.5} m_UseDelaunayMesh: 0 +--- !u!1 &147475844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 147475846} + - component: {fileID: 147475845} + m_Layer: 0 + m_Name: PassengerSensor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &147475845 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147475844} + m_Enabled: 1 + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.06424427, y: 0.33} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.7309284, y: 0.25} + m_EdgeRadius: 0 +--- !u!4 &147475846 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147475844} + 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: 1077748573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &148166884 GameObject: m_ObjectHideFlags: 0 @@ -7875,6 +7952,37 @@ MonoBehaviour: _noiseFrequency: 1 _dedicatedCamera: {fileID: 1059402937} _dedicatedPriority: 20 +--- !u!1 &405300252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 405300253} + m_Layer: 0 + m_Name: WaypointB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &405300253 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405300252} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.74, 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!1 &406872835 GameObject: m_ObjectHideFlags: 0 @@ -8468,6 +8576,37 @@ Transform: m_Children: [] m_Father: {fileID: 403908581} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &441303664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 441303665} + m_Layer: 0 + m_Name: GroundCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &441303665 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441303664} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.902, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1995033591} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &442277258 GameObject: m_ObjectHideFlags: 0 @@ -10651,6 +10790,37 @@ Transform: m_Children: [] m_Father: {fileID: 501567084} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &583248657 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 583248658} + m_Layer: 0 + m_Name: '[WeaponSocket]' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &583248658 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 583248657} + 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: 1995033591} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &587241065 GameObject: m_ObjectHideFlags: 0 @@ -11074,6 +11244,98 @@ PolygonCollider2D: - {x: -5, y: 1.5} - {x: -2.5, y: 1.5} m_UseDelaunayMesh: 0 +--- !u!1 &591304754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 591304757} + - component: {fileID: 591304756} + - component: {fileID: 591304755} + m_Layer: 15 + m_Name: HurtBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &591304755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591304754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7b7a233d7f70aa4f86b473412b826de, type: 3} + m_Name: + m_EditorClassIdentifier: + _onDamageDealt: {fileID: 0} + _onHitConfirmed: {fileID: 11400000, guid: a67d56f5124e0db4f98f326c74be8091, type: 2} +--- !u!61 &591304756 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591304754} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.07} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 8, y: 8} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.6, y: 1.7} + m_EdgeRadius: 0 +--- !u!4 &591304757 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591304754} + 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: 1995033591} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &592306985 GameObject: m_ObjectHideFlags: 0 @@ -17909,6 +18171,224 @@ Transform: - {fileID: 194069122} m_Father: {fileID: 113908853} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1077748568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1077748573} + - component: {fileID: 1077748572} + - component: {fileID: 1077748571} + - component: {fileID: 1077748570} + - component: {fileID: 1077748569} + - component: {fileID: 1077748575} + - component: {fileID: 1077748574} + m_Layer: 8 + m_Name: MovingPlatform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1077748569 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077748568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae997ac2469ff6b4cb58cf825ed67397, type: 3} + m_Name: + m_EditorClassIdentifier: + _moveType: 0 + _wayPoints: + - {fileID: 1112983964} + - {fileID: 405300253} + _speed: 3 + _waitAtEndpoint: 0.5 + _activationChannel: {fileID: 0} + _passengerSensor: {fileID: 147475845} + _passengerLayer: + serializedVersion: 2 + m_Bits: 8704 +--- !u!212 &1077748570 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077748568} + m_Enabled: 0 + 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_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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &1077748571 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077748568} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4, y: 0.4} + m_EdgeRadius: 0 +--- !u!50 &1077748572 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077748568} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 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: 1 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!4 &1077748573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077748568} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -16.74, y: 4.27, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 147475846} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1077748574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077748568} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1483f09f23da6b469f288d63b2f52b5, type: 3} + m_Name: + m_EditorClassIdentifier: + _allowDropThrough: 1 + _dropDisableDuration: 0.3 +--- !u!251 &1077748575 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077748568} + m_Enabled: 0 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 150.47 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 --- !u!1 &1078913098 GameObject: m_ObjectHideFlags: 0 @@ -18166,6 +18646,37 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.1, y: 7} m_EdgeRadius: 0 +--- !u!1 &1101161865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1101161866} + m_Layer: 0 + m_Name: SkillHitBox_Slot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1101161866 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101161865} + 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: 1995033591} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1101506716 GameObject: m_ObjectHideFlags: 0 @@ -18259,6 +18770,37 @@ Transform: m_Children: [] m_Father: {fileID: 1658705856} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1112983963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1112983964} + m_Layer: 0 + m_Name: WaypointA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1112983964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1112983963} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.74, 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!1 &1113400486 GameObject: m_ObjectHideFlags: 0 @@ -20277,6 +20819,37 @@ MonoBehaviour: _noiseFrequency: 1 _dedicatedCamera: {fileID: 1544799091} _dedicatedPriority: 20 +--- !u!1 &1298478595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1298478596} + m_Layer: 0 + m_Name: CameraFollowTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1298478596 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298478595} + 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: 1995033591} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1305733697 GameObject: m_ObjectHideFlags: 0 @@ -21339,7 +21912,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!61 &1354690326 BoxCollider2D: m_ObjectHideFlags: 0 @@ -29076,8 +29649,9 @@ GameObject: - component: {fileID: 1813702093} - component: {fileID: 1813702092} - component: {fileID: 1813702091} - m_Layer: 1 - m_Name: GroundPlatform + - component: {fileID: 1813702096} + m_Layer: 8 + m_Name: OneWayPlatform m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29098,7 +29672,7 @@ PlatformEffector2D: m_RotationalOffset: 0 m_UseOneWay: 1 m_UseOneWayGrouping: 0 - m_SurfaceArc: 180 + m_SurfaceArc: 150.47 m_UseSideFriction: 0 m_UseSideBounce: 0 m_SideArc: 1 @@ -29241,6 +29815,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1813702096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813702090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1483f09f23da6b469f288d63b2f52b5, type: 3} + m_Name: + m_EditorClassIdentifier: + _allowDropThrough: 1 + _dropDisableDuration: 0.3 --- !u!1 &1823787685 GameObject: m_ObjectHideFlags: 0 @@ -29519,7 +30107,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!61 &1865796629 BoxCollider2D: m_ObjectHideFlags: 0 @@ -31428,6 +32016,497 @@ MonoBehaviour: _noiseFrequency: 1 _dedicatedCamera: {fileID: 461181080} _dedicatedPriority: 20 +--- !u!1 &1995033570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1995033591} + - component: {fileID: 1995033590} + - component: {fileID: 1995033589} + - component: {fileID: 1995033588} + - component: {fileID: 1995033587} + - component: {fileID: 1995033586} + - component: {fileID: 1995033585} + - component: {fileID: 1995033584} + - component: {fileID: 1995033583} + - component: {fileID: 1995033582} + - component: {fileID: 1995033581} + - component: {fileID: 1995033580} + - component: {fileID: 1995033579} + - component: {fileID: 1995033578} + - component: {fileID: 1995033577} + - component: {fileID: 1995033576} + - component: {fileID: 1995033575} + - component: {fileID: 1995033574} + - component: {fileID: 1995033573} + - component: {fileID: 1995033572} + - component: {fileID: 1995033571} + m_Layer: 9 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1995033571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e20d2200567c4ca4d8fa1a047c7bbd58, type: 3} + m_Name: + m_EditorClassIdentifier: + _movementConfig: {fileID: 11400000, guid: aaeed7ed77ef4834ab211f378120f275, type: 2} + _animConfig: {fileID: 11400000, guid: 01fef0a964bfffd478226e04bbe3aeef, type: 2} + _inputReader: {fileID: 11400000, guid: 88fadef8bc554e04483edd7418d20aa2, type: 2} + _formConfig: {fileID: 11400000, guid: 8f33c49c9bd20ac47a6867f1f19f24a9, type: 2} + _combat: {fileID: 1995033583} + _formController: {fileID: 1995033582} + _weaponManager: {fileID: 1995033581} + _skillManager: {fileID: 1995033580} + _springSystem: {fileID: 1995033579} + _parrySystem: {fileID: 1995033578} + _hurtBox: {fileID: 591304755} + _shield: {fileID: 1995033577} + _wallDetector: {fileID: 1995033576} + _onPlayerDied: {fileID: 11400000, guid: 7e1624bde83886d40b32f43e84a65a75, type: 2} + _onPlayerSpawned: {fileID: 11400000, guid: 7e2c7e614f6627b449a244ab44443adf, type: 2} + _debugValidateTransitions: 1 + _dbg_CurrentState: + _dbg_IsGrounded: 0 + _dbg_AirJumpsLeft: 0 + _dbg_CanDash: 0 + _dbg_IsInvincible: 0 +--- !u!114 &1995033572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 323fa3d8339022e4bbd37c12332f151a, type: 3} + m_Name: + m_EditorClassIdentifier: + _jumpBufferDuration: 0.15 + _attackBufferDuration: 0.12 + _dashBufferDuration: 0.1 + _dbg_JumpBuffer: 0 + _dbg_AttackBuffer: 0 + _dbg_DashBuffer: 0 +--- !u!114 &1995033573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 708938b7c3d75b244abcbd30ed589461, type: 3} + m_Name: + m_EditorClassIdentifier: + _onStatusEffectApplied: {fileID: 11400000, guid: c997085e0266fa54b9fa0af69e233acf, type: 2} + _onStatusEffectExpired: {fileID: 11400000, guid: 22c7ddc89ed054845951143148cd3671, type: 2} +--- !u!114 &1995033574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fab214bcdee30844bb3399c3b487cffa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1995033575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04d451c14acfa56429344271570fa468, type: 3} + m_Name: + m_EditorClassIdentifier: + _config: {fileID: 11400000, guid: f167dd4c0f40ff7499127f917066994a, type: 2} + _charmCatalog: {fileID: 11400000, guid: 62b057558c311d649ba7d5d91633b544, type: 2} + _onCharmEquipped: {fileID: 11400000, guid: ee78daff0aae5d64786323b1924fa103, type: 2} + _onCharmUnequipped: {fileID: 11400000, guid: d0a080ccb93b4cb4e9a4cbe8e96a7007, type: 2} + _onEquipmentChanged: {fileID: 11400000, guid: 29e6d061ce1f5c84d97e7c922de612b5, type: 2} + _onAchievementNotchGranted: {fileID: 11400000, guid: 80a81891f339dce4096ac6ea88b3de84, type: 2} +--- !u!114 &1995033576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03bafd68d1793e44f9650296d658a4aa, type: 3} + m_Name: + m_EditorClassIdentifier: + _config: {fileID: 11400000, guid: aaeed7ed77ef4834ab211f378120f275, type: 2} + _wallLayer: + serializedVersion: 2 + m_Bits: 8388864 +--- !u!114 &1995033577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f362045054d7c1945841c4ccbcb356e8, type: 3} + m_Name: + m_EditorClassIdentifier: + _config: {fileID: 11400000, guid: 3550acd79ad72c743942cbacb3c25c97, type: 2} + _onShieldBrokenChannel: {fileID: 11400000, guid: 7a0c8af06b9f6cd43a91c5bebf16c02e, type: 2} + _onShieldRestoredChannel: {fileID: 11400000, guid: 06d4a7d44ce8bb0499aabf79ba7c556c, type: 2} +--- !u!114 &1995033578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 14872ec0b53eece49a121f13ca519009, type: 3} + m_Name: + m_EditorClassIdentifier: + _config: {fileID: 11400000, guid: f65119f9e65b51b4db2b17a0ae3d0fd3, type: 2} + _onParrySuccess: {fileID: 11400000, guid: 076c05f6f5c5cf6459a804ed2e61dc1b, type: 2} +--- !u!114 &1995033579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f57bdff3327d2d478779d844b114c83, type: 3} + m_Name: + m_EditorClassIdentifier: + _stats: {fileID: 1995033585} + _onEnemyDied: {fileID: 11400000, guid: def849e2c5ec8204eae6b083b02307aa, type: 2} +--- !u!114 &1995033580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb39b928827b10245aeab5ea41f862a5, type: 3} + m_Name: + m_EditorClassIdentifier: + _stats: {fileID: 1995033585} + _animancer: {fileID: 1995033587} + _input: {fileID: 11400000, guid: 88fadef8bc554e04483edd7418d20aa2, type: 2} + _formController: {fileID: 1995033582} + _modifiers: {fileID: 1995033574} + _skillSocket: {fileID: 1101161866} + _formSkillSets: [] +--- !u!114 &1995033581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6620d87234b5a9b4c811905861cd32fd, type: 3} + m_Name: + m_EditorClassIdentifier: + _formController: {fileID: 1995033582} + _startingWeapon: {fileID: 0} + _weaponSocket: {fileID: 583248658} +--- !u!114 &1995033582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbcc6974256e3fb40879694b4bf2d2dc, type: 3} + m_Name: + m_EditorClassIdentifier: + _config: {fileID: 11400000, guid: 8f33c49c9bd20ac47a6867f1f19f24a9, type: 2} + _input: {fileID: 11400000, guid: 88fadef8bc554e04483edd7418d20aa2, type: 2} + _onFormChanged: {fileID: 11400000, guid: 9e1af94c61bb1c04ebc829f3838714f4, type: 2} + _onSkillSetChanged: {fileID: 11400000, guid: 249630b7ebe7a094299413cc67c4f3d1, type: 2} +--- !u!114 &1995033583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d978725c6a901c4da85041223e2b0ee, type: 3} + m_Name: + m_EditorClassIdentifier: + _weaponManager: {fileID: 1995033581} +--- !u!114 &1995033584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 263a07a0eb148924cbcf284def379a3f, type: 3} + m_Name: + m_EditorClassIdentifier: + _config: {fileID: 11400000, guid: aaeed7ed77ef4834ab211f378120f275, type: 2} + _groundCheck: {fileID: 441303665} + _groundCheckSize: {x: 0.58, y: 0.05} + _groundLayer: + serializedVersion: 2 + m_Bits: 1313024 + _dbg_Position: + _dbg_VelocityX: 0 + _dbg_VelocityY: 0 + _dbg_IsGrounded: 0 + _dbg_OnOneWayPlatform: 0 + _dbg_HasCoyoteTime: 0 + _dbg_HasWallCoyoteTime: 0 + _dbg_IsWallLeft: 0 + _dbg_IsWallRight: 0 + _dbg_CancelWindowOpen: 0 + _dbg_FacingDirection: 0 +--- !u!114 &1995033585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: edd28a350d3cebe46a72e7550ffb1b93, type: 3} + m_Name: + m_EditorClassIdentifier: + _config: {fileID: 11400000, guid: eaaee0817c0cc9e449142241ad75827e, type: 2} + _onHPChanged: {fileID: 11400000, guid: b5a2264ba6cf6544ebc53a67b5074d89, type: 2} + _onMaxHPChanged: {fileID: 11400000, guid: 34f14924fad74884aac7b2bd6fbad649, type: 2} + _onSoulPowerChanged: {fileID: 11400000, guid: 3694bb359f4ba5f40a6cba067478578c, type: 2} + _onSpiritPowerChanged: {fileID: 11400000, guid: 0f20a330a4808d24e808e6978151dbc4, type: 2} + _onSpringChargesChanged: {fileID: 11400000, guid: bb26bdee697c4b64682cf30d02579ca4, type: 2} + _onLingZhuChanged: {fileID: 11400000, guid: c83ba0a4579d72c449930ee9c57318df, type: 2} + _onAbilityUnlocked: {fileID: 11400000, guid: a8b3a59db23ed8d48970b73c8c2e3092, type: 2} + _onDifficultyChanged: {fileID: 11400000, guid: 156874a2ffc17694e91e949abbf97fee, type: 2} + _dbg_HP: + _dbg_Soul: + _dbg_Spirit: + _dbg_Spring: + _dbg_IsInvincible: 0 + _dbg_InvincibleTimer: 0 + _dbg_GodMode: 0 + _dbg_Abilities: +--- !u!212 &1995033586 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + 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_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_SortingLayerID: -1628607475 + m_SortingLayer: -5 + m_SortingOrder: 0 + m_Sprite: {fileID: -1365394928, guid: 4f33dde89ac3c6f40b4935f077434214, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1995033587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3} + m_Name: + m_EditorClassIdentifier: + _Animator: {fileID: 1995033588} + _Transitions: {fileID: 0} + _ActionOnDisable: 0 +--- !u!95 &1995033588 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!61 &1995033589 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.07} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 8, y: 8} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.6, y: 1.7} + m_EdgeRadius: 0 +--- !u!50 &1995033590 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 2 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 4 +--- !u!4 &1995033591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995033570} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.78, y: 8.32, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 591304757} + - {fileID: 583248658} + - {fileID: 441303665} + - {fileID: 1101161866} + - {fileID: 1298478596} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1997649651 GameObject: m_ObjectHideFlags: 0 @@ -34278,3 +35357,7 @@ SceneRoots: - {fileID: 1354690328} - {fileID: 783576435} - {fileID: 1813702095} + - {fileID: 1995033591} + - {fileID: 1077748573} + - {fileID: 1112983964} + - {fileID: 405300253} diff --git a/Assets/_Game/Scripts/Editor/Equipment/AbilityTypeDrawer.cs b/Assets/_Game/Scripts/Editor/Equipment/AbilityTypeDrawer.cs index 4f274ea..58ff0e5 100644 --- a/Assets/_Game/Scripts/Editor/Equipment/AbilityTypeDrawer.cs +++ b/Assets/_Game/Scripts/Editor/Equipment/AbilityTypeDrawer.cs @@ -11,7 +11,7 @@ namespace BaseGames.Editor /// 将枚举按能力类别分组，以可读的复选框网格呈现，替代默认的 MaskField。 /// /// 分组： - /// 移动能力 — WallCling / WallJump / Dash / AirDash / DoubleJump / SuperJump / Swim / Dive + /// 移动能力 — WallCling / WallJump / Dash / AirDash / DoubleJump / SuperJump / Swim / DownDash /// 法术能力 — Spell1 / Spell2 / Spell3 /// 形态能力 — SpiritForm / SpiritDash /// 战斗能力 — Parry / ChargeAttack / DownSlash @@ -33,7 +33,7 @@ namespace BaseGames.Editor (AbilityType.DoubleJump, "二段跳"), (AbilityType.SuperJump, "超级跳"), (AbilityType.Swim, "游泳"), - (AbilityType.Dive, "下劈"), + (AbilityType.DownDash, "下冲刺"), }), ("法术能力", new[] { diff --git a/Assets/_Game/Scripts/Editor/Tools/GMToolWindow.cs b/Assets/_Game/Scripts/Editor/Tools/GMToolWindow.cs index 49ff962..878d05f 100644 --- a/Assets/_Game/Scripts/Editor/Tools/GMToolWindow.cs +++ b/Assets/_Game/Scripts/Editor/Tools/GMToolWindow.cs @@ -47,7 +47,7 @@ namespace BaseGames.Editor AbilityType.WallCling, AbilityType.WallJump, AbilityType.Dash, AbilityType.Dash, AbilityType.DoubleJump, AbilityType.SuperJump, - AbilityType.Swim, AbilityType.Dive, + AbilityType.Swim, AbilityType.DownDash, }), ("法术能力", new[] { AbilityType.Spell1, AbilityType.Spell2, AbilityType.Spell3 }), ("灵魄形态", new[] { AbilityType.SpiritForm, AbilityType.SpiritDash }), @@ -458,7 +458,7 @@ namespace BaseGames.Editor AbilityType.DoubleJump => "二段跳", AbilityType.SuperJump => "超级跳", AbilityType.Swim => "游泳", - AbilityType.Dive => "下劈", + AbilityType.DownDash => "下冲刺", AbilityType.Spell1 => "法术槽 1", AbilityType.Spell2 => "法术槽 2", AbilityType.Spell3 => "法术槽 3", diff --git a/Assets/_Game/Scripts/Player/AbilityType.cs b/Assets/_Game/Scripts/Player/AbilityType.cs index a9d6e13..4458124 100644 --- a/Assets/_Game/Scripts/Player/AbilityType.cs +++ b/Assets/_Game/Scripts/Player/AbilityType.cs @@ -19,7 +19,7 @@ namespace BaseGames.Player DoubleJump = 1u << 4, // 二段跳 SuperJump = 1u << 5, // 超级跳（聚气跳） Swim = 1u << 6, // 游泳（液体中自由移动） - Dive = 1u << 7, // 下劈（空中下突） + DownDash = 1u << 7, // 向下冲刺（空中下+冲刺） // ── 法术能力 ────────────────────────────────────────────────────── Spell1 = 1u << 8, // 法术槽 1（策划自定义） @@ -48,7 +48,7 @@ namespace BaseGames.Player InvincibleDash = 1u << 18, // ── 组合掩码 ───────────────────────────────────────────────────────── - AllMovement = WallCling | WallJump | Dash | DoubleJump | SuperJump | Swim | Dive | InvincibleDash, + AllMovement = WallCling | WallJump | Dash | DoubleJump | SuperJump | Swim | DownDash | InvincibleDash, AllSpells = Spell1 | Spell2 | Spell3, AllSpirit = SpiritForm | SpiritDash, } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a9b128c..29c8bf9 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -16,7 +16,7 @@ TagManager: - Platform - Player - Volume - - OneWayPlatforms + - OneWayPlatform - EnemyProjectile - Enemy - PlayerHitBox